From: Sébastien Grignard <seb@amakaze.org>
Date: Wed, 15 Jan 2014 22:02:44 +0000 (+0100)
Subject: Merged with master
X-Git-Url: http://git.cyclocoop.org/?a=commitdiff_plain;h=dbb7f37bebc1372c2a57460f16bf8e6e742dae93;hp=809106bb9b0096961893df8d3daa3ca6de544667;p=burette%2Fbikecoop.git

Merged with master
---

diff --git a/__init__.py b/__init__.py
index eb3a9e9..2bd0168 100644
--- a/__init__.py
+++ b/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    Bikecoop module for OpenERP, Custom module for bike coop'
-#    Copyright (C) 2012-2013 L'Heureux Cyclage (<http://www.heureux-cyclage.org>)
+#    Copyright (C) 2012-2014 L'Heureux Cyclage (<http://www.heureux-cyclage.org>)
 #
 #    This file is a part of Bikecoop
 #
@@ -22,5 +22,6 @@
 ##############################################################################
 
 import bikecoop
+import wizard
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/__openerp__.py b/__openerp__.py
index 3311772..9e2db3a 100644
--- a/__openerp__.py
+++ b/__openerp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    Bikecoop module for OpenERP, Custom module for bike coop'
-#    Copyright (C) 2012-2013 L'Heureux Cyclage (<http://www.heureux-cyclage.org>)
+#    Copyright (C) 2012-2014 L'Heureux Cyclage (<http://www.heureux-cyclage.org>)
 #
 #    This file is a part of Bikecoop
 #
diff --git a/bikecoop.py b/bikecoop.py
index 20af8f5..91ca5e2 100644
--- a/bikecoop.py
+++ b/bikecoop.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    Bikecoop module for OpenERP, Custom module for bike coop'
-#    Copyright (C) 2012-2013 L'Heureux Cyclage (<http://www.heureux-cyclage.org>)
+#    Copyright (C) 2012-2014 L'Heureux Cyclage (<http://www.heureux-cyclage.org>)
 #
 #    This file is a part of Bikecoop
 #
diff --git a/wizard/__init__.py b/wizard/__init__.py
new file mode 100644
index 0000000..0e5ab72
--- /dev/null
+++ b/wizard/__init__.py
@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Bikecoop module for OpenERP, Custom module for bike coop'
+#    Copyright (C) 2012-2014 L'Heureux Cyclage (<http://www.heureux-cyclage.org>)
+#
+#    This file is a part of Bikecoop
+#
+#    Bikecoop is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Bikecoop is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import pos_payment
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/wizard/pos_payment.py b/wizard/pos_payment.py
new file mode 100644
index 0000000..be58eab
--- /dev/null
+++ b/wizard/pos_payment.py
@@ -0,0 +1,36 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Bikecoop module for OpenERP, Custom module for bike coop'
+#    Copyright (C) 2012-2014 L'Heureux Cyclage (<http://www.heureux-cyclage.org>)
+#
+#    This file is a part of Bikecoop
+#
+#    Bikecoop is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Bikecoop is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp.osv import osv
+
+
+class pos_make_payment(osv.osv_memory):
+    _inherit = 'pos.make.payment'
+
+    _defaults = {
+        'journal_id': None,
+    }
+
+pos_make_payment()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: