Merge lp:~camptocamp/account-invoicing/7.0-port-invoice_validation_wkfl into lp:~account-core-editors/account-invoicing/7.0

[Yannick Vaucher @ Camptocamp]

[Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c)]

line 134: s/add/adds/

line 229: remove space before ':'

review: Needs Fixing (code review, no test)

[lp:~camptocamp/account-invoicing/7.0-port-invoice_validation_wkfl]

22. By Yannick Vaucher @ Camptocamp on 2013-05-13

[IMP] invoice_validation_wkfl - __openerp__ spelling and formating

23. By Yannick Vaucher @ Camptocamp on 2013-05-13

[IMP] invoice_validation_wkfl - remove space before ':'

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

correction made

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

Small typo fix : l.137 typo : s/incoices/invoices ( + no space before : )

Apart that LGTM

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

Fixed the typo.
LGTM

review: Approve (code review, no test)

[lp:~camptocamp/account-invoicing/7.0-port-invoice_validation_wkfl]

24. By Guewen Baconnier @ Camptocamp on 2013-06-17

[FIX] typo, no space before colon

[Maxime Chambreuil (http://www.savoirfairelinux.com) (max3903)]

review: Approve

=== modified file 'invoice_validation_wkfl/__init__.py'
--- invoice_validation_wkfl/__init__.py	2011-08-12 12:35:23 +0000
+++ invoice_validation_wkfl/__init__.py	2013-06-17 09:44:27 +0000
@@ -1,29 +1,23 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
-# Copyright (c) 2010 Camtocamp SA
-# @author Joël Grand-Guillaume
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsability of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# garantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# This program 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 2
-# of the License, or (at your option) any later version.
-#
-# This program 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, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#    Author: Joël Grand-Guillaume
+#    Copyright 2010 Camptocamp SA
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program 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 Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-import invoice
\ No newline at end of file
+import invoice
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'invoice_validation_wkfl/__openerp__.py'
--- invoice_validation_wkfl/__openerp__.py	2013-04-03 14:37:57 +0000
+++ invoice_validation_wkfl/__openerp__.py	2013-06-17 09:44:27 +0000
@@ -1,57 +1,45 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
-# Copyright (c) 2011 Camptocamp SA (http://www.camptocamp.com) 
-# All Right Reserved
-#
-# Author : Joël Grand-Guillaume (Camptocamp)
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsability of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# garantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# This program 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 2
-# of the License, or (at your option) any later version.
-#
-# This program 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, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#    Author: Joël Grand-Guillaume (Camptocamp)
+#    Copyright 2010 Camptocamp SA
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program 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 Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-
 {
-     "name" : "Add 'To Send' and 'To Validate' states in Invoices",
-     "version" : "1.0",
-     "author" : "Camptocamp",
-     "category" : "Generic Modules/Invoicing",
-     "description":
-"""
-This module adds 2 states between Draft and Open states in Invoices:
-
-- To Validate: for invoices which need a validation
-- To Send: for invoices that need to be sent
-
-""",
-     "website": "http://camptocamp.com",
-     "depends" : [
-            "account",
-                ],
-     "init_xml" : [],
-     "demo_xml" : [],
-     "update_xml" : [
-            "invoice_wkf.xml",
-            "invoice_view.xml",
-     ],
-     "active": False,
-     "installable": False
+    'name': 'Add "To Send" and "To Validate" states in Invoices',
+    'version': '1.0',
+    'category': 'Generic Modules/Invoicing',
+    'description':
+'''
+This module adds 2 states between draft and open state in invoices:
+
+- To Validate: For invoices which need a validation
+- To Send: For all invoices that need to be sent
+
+''',
+    'author': 'Camptocamp',
+    'website': 'http://camptocamp.com',
+    'depends': ['account'],
+    'data': [
+        'invoice_wkf.xml',
+        'invoice_view.xml',
+    ],
+    'demo': [],
+    'test': [],
+    'installable': True,
+    'auto_install': False,
+    'application': False
 }

=== modified file 'invoice_validation_wkfl/invoice.py'
--- invoice_validation_wkfl/invoice.py	2012-02-23 09:24:17 +0000
+++ invoice_validation_wkfl/invoice.py	2013-06-17 09:44:27 +0000
@@ -1,41 +1,30 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
-# Copyright (c) 2010 Camtocamp SA
-# @author Joël Grand-Guillaume
-# $Id: $
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsability of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# garantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# This program 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 2
-# of the License, or (at your option) any later version.
-#
-# This program 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, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#    Author: Joël Grand-Guillaume
+#    Copyright 2010 Camptocamp SA
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program 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 Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-
-from osv import fields
-from osv import osv
+from openerp.osv import orm, fields, osv
 from tools.translate import _
 import netsvc
 
-class account_invoice(osv.osv):
+class AccountInvoice(orm.Model):
     _inherit = "account.invoice"
-    
+
     def action_to_valid(self, cr, uid, ids):
         """Check if analytic account of each lines is not closed"""
         inv_ids = isinstance(ids, list) and ids[:] or [ids]
@@ -45,16 +34,16 @@
            for line in inv.invoice_line:
               if line.account_analytic_id and line.account_analytic_id.state in ['close', 'cancelled']:
                   str_error_lines += "\n- %s" %(line.name)
-                  errors = True 
-           if errors:        
+                  errors = True
+           if errors:
               raise osv.except_osv(_('UserError'),
                                    _("You are trying to validate invoice lines linked to a closed or cancelled Analytic Account."
-                                     "\n\nCheck the following lines :")
+                                     "\n\nCheck the following lines:")
                                      + str_error_lines)
-        
+
         self.write(cr, uid, inv_ids, {'state': 'to_valid'})
         return True
-    
+
     _columns = {
         'state': fields.selection([
                 ('draft','Draft'),
@@ -64,13 +53,12 @@
                 ('open','Open'),
                 ('paid','Paid'),
                 ('cancel','Canceled')],'State', select=True, readonly=True),
-    }
-
-account_invoice()
-
-class account_invoice_refund(osv.osv_memory):
+        }
+
+
+class AccountInvoiceRefund(orm.TransientModel):
     _inherit = "account.invoice.refund"
-    
+
     def compute_refund(self, cr, uid, ids, mode='refund', context=None):
         """
         @param cr: the current row, from the database cursor,
@@ -95,8 +83,11 @@
             date = False
             period = False
             description = False
+            journal_id = False
             company = res_users_obj.browse(cr, uid, uid, context=context).company_id
-            journal_id = form.get('journal_id', False)
+            if form.get('journal_id', False):
+                journal_id = form['journal_id'][0]
+
             for inv in inv_obj.browse(cr, uid, context.get('active_ids'), context=context):
                 if inv.state in ['draft', 'proforma2', 'cancel']:
                     raise osv.except_osv(_('Error !'), _('Can not %s draft/proforma/cancel invoice.') % (mode))
@@ -217,4 +208,6 @@
             invoice_domain.append(('id', 'in', created_inv))
             result['domain'] = invoice_domain
             return result
-account_invoice_refund()
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'invoice_validation_wkfl/invoice_view.xml'
--- invoice_validation_wkfl/invoice_view.xml	2011-08-29 11:34:30 +0000
+++ invoice_validation_wkfl/invoice_view.xml	2013-06-17 09:44:27 +0000
@@ -1,62 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
 <openerp>
-<data>
-    
+  <data>
+
     <record model="ir.ui.view" id="invoice_supplier_formc2c">
-            <field name="name">account.invoice.supplier.formc2c</field>
-            <field name="model">account.invoice</field>
-            <field name="inherit_id" ref="account.invoice_supplier_form"/>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page/group/group[1]" position="replace">
-                    <group col="12" colspan="4">
-                        <button name="invoice_cancel" states="draft,to_valid,to_send,proforma2,sale,open" string="Cancel" icon="gtk-cancel"/>
-                        <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
-                        <button name="%(account.action_account_invoice_refund)d" type='action' string='Refund' states='open,paid' icon="gtk-execute"/>
-                        <button name="%(account.action_account_state_open)d" type='action' string='Re-Open' states='paid' icon="gtk-convert" groups="account.group_account_user"/>
-                        <button name="invoice_open" states="to_send,proforma2" string="Approve" icon="terp-camera_test"/>
-                        <button name="invoice_to_valid" states="draft" string="To Validation" icon="terp-camera_test"/>
-                        <button name="invoice_to_send" states="to_valid" string="Invoice to send" icon="terp-camera_test"/>
-                    </group>
-                </xpath>
-            </field>
+      <field name="name">account.invoice.supplier.formc2c</field>
+      <field name="model">account.invoice</field>
+      <field name="inherit_id" ref="account.invoice_supplier_form"/>
+      <field name="arch" type="xml">
+        <xpath expr="/form/header" position="replace">
+          <header>
+            <button name="invoice_cancel" states="draft,to_valid,to_send,proforma2,sale,open" string="Cancel" icon="gtk-cancel"/>
+            <button name="action_cancel_draft" states="cancel" string="Set to Drafttttt" type="object" icon="terp-stock_effects-object-colorize"/>
+            <button name="%(account.action_account_invoice_refund)d" type='action' string='Refund' states='open,paid' icon="gtk-execute"/>
+            <button name="%(account.action_account_state_open)d" type='action' string='Re-Open' states='paid' icon="gtk-convert" groups="account.group_account_user"/>
+            <button name="invoice_open" states="to_send,proforma2" string="Approve" icon="terp-camera_test"/>
+            <button name="invoice_to_valid" states="draft" string="To Validation" icon="terp-camera_test"/>
+            <button name="invoice_to_send" states="to_valid" string="Invoice to send" icon="terp-camera_test"/>
+            <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open,paid" statusbar_colors='{"proforma":"blue","proforma2":"blue"}'/>
+          </header>
+        </xpath>
+      </field>
     </record>
 
     <record model="ir.ui.view" id="invoice_formc2c">
-        <field name="name">account.invoice.formc2c</field>
-        <field name="model">account.invoice</field>
-        <field name="inherit_id" ref="account.invoice_form"/>
-        <field name="type">form</field>
-        <field name="arch" type="xml">
-            <xpath expr="/form/notebook/page/group/group[@groups='base.group_user']" position="replace">
-                <group col="12" colspan="4" groups="base.group_user">
-                    <button name="invoice_cancel" states="to_send,to_valid,draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel"/>
-                    <button name="action_cancel_draft" states="cancel" string="Reset to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
-                    <button name="invoice_to_send" states="to_valid" string="Invoice To Send" icon="gtk-go-forward"/>
-                    <button name="invoice_to_valid" states="draft" string="To Validation" icon="terp-gtk-media-pause"/>
-                    <button name="%(account.action_account_invoice_refund)d" type='action' string='Refund' states='open,paid' icon="gtk-execute"/>
-                    <button name='%(account.action_account_state_open)d' type='action' string='Re-Open' states='paid' icon="gtk-convert" groups="account.group_account_user"/>
-                    <button name="invoice_proforma2" states="to_send" string="PRO-FORMA" icon="terp-gtk-media-pause" />
-                    <button name="invoice_open" states="to_send,proforma2" string="Validate" icon="gtk-go-forward"/>
-                    <button name="%(account.account_invoices)d" string="Print Invoice" type="action" icon="gtk-print" states="open,paid,proforma,sale,proforma2"/>
-                </group>
-            </xpath>
-        </field>
+      <field name="name">account.invoice.formc2c</field>
+      <field name="model">account.invoice</field>
+      <field name="inherit_id" ref="account.invoice_form"/>
+      <field name="arch" type="xml">
+        <xpath expr="/form/header" position="replace">
+          <header>
+            <button name="invoice_cancel" states="to_send,to_valid,draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel"/>
+            <button name="action_cancel_draft" states="cancel" string="Reset to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
+            <button name="invoice_to_send" states="to_valid" string="Invoice To Send" icon="gtk-go-forward"/>
+            <button name="invoice_to_valid" states="draft" string="To Validation" icon="terp-gtk-media-pause"/>
+            <button name="%(account.action_account_invoice_refund)d" type='action' string='Refund' states='open,paid' icon="gtk-execute"/>
+            <button name='%(account.action_account_state_open)d' type='action' string='Re-Open' states='paid' icon="gtk-convert" groups="account.group_account_user"/>
+            <button name="invoice_proforma2" states="to_send" string="PRO-FORMA" icon="terp-gtk-media-pause" />
+            <button name="invoice_open" states="to_send,proforma2" string="Validate" icon="gtk-go-forward"/>
+            <button name="%(account.account_invoices)d" string="Print Invoice" type="action" icon="gtk-print" states="open,paid,proforma,sale,proforma2"/>
+            <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open,paid" statusbar_colors='{"proforma":"blue","proforma2":"blue"}'/>
+          </header>
+        </xpath>
+      </field>
     </record>
 
-
     <record id="view_account_invoice_filter" model="ir.ui.view">
-        <field name="name">account.invoice.valid_wkf.select</field>
-        <field name="model">account.invoice</field>
-        <field name="type">search</field>
-        <field name="inherit_id" ref="account.view_account_invoice_filter" />
-        <field name="arch" type="xml">
-            <xpath expr="/search/group/filter[@name='proforma']" position="after">
-                <filter name="to_valid" icon="terp-camera_test" string="To Validate" domain="[('state','=','to_valid')]" help="To Validate Invoices"/>
-                <filter name="to_send" icon="terp-check" string="To Send" domain="[('state','=','to_send')]" help="To Send Invoices"/>
-            </xpath>
-        </field>
+      <field name="name">account.invoice.valid_wkf.select</field>
+      <field name="model">account.invoice</field>
+      <field name="inherit_id" ref="account.view_account_invoice_filter" />
+      <field name="arch" type="xml">
+        <xpath expr="/search/filter[@name='proforma']" position="after">
+          <filter name="to_valid" icon="terp-camera_test" string="To Validate" domain="[('state','=','to_valid')]" help="To Validate Invoices"/>
+          <filter name="to_send" icon="terp-check" string="To Send" domain="[('state','=','to_send')]" help="To Send Invoices"/>
+        </xpath>
+      </field>
     </record>
 
- 
-    </data>
+  </data>
 </openerp>

=== modified file 'invoice_validation_wkfl/invoice_wkf.xml'
--- invoice_validation_wkfl/invoice_wkf.xml	2012-02-23 09:24:17 +0000
+++ invoice_validation_wkfl/invoice_wkf.xml	2013-06-17 09:44:27 +0000
@@ -1,53 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
 <openerp>
-<data>
-    
+  <data>
+
     <record model="workflow.activity" id="act_to_send">
-        <field name="wkf_id" ref="account.wkf"/>
-        <field name="name">to_send</field>
-        <field name="action">write({'state':'to_send'})</field>
-        <field name="kind">function</field>
+      <field name="wkf_id" ref="account.wkf"/>
+      <field name="name">to_send</field>
+      <field name="action">write({'state':'to_send'})</field>
+      <field name="kind">function</field>
     </record>
-    
+
     <record model="workflow.activity" id="act_to_valid">
-        <field name="wkf_id" ref="account.wkf"/>
-        <field name="name">to_valid</field>
-        <field name="action">action_to_valid()</field>
-        <field name="kind">function</field>
+      <field name="wkf_id" ref="account.wkf"/>
+      <field name="name">to_valid</field>
+      <field name="action">action_to_valid()</field>
+      <field name="kind">function</field>
     </record>
-    
+
     <record model="workflow.transition" id="t_draft_to_valid">
-        <field name="act_from" ref="account.act_draft"/>
-        <field name="act_to" ref="act_to_valid"/>
-        <field name="signal">invoice_to_valid</field>
+      <field name="act_from" ref="account.act_draft"/>
+      <field name="act_to" ref="act_to_valid"/>
+      <field name="signal">invoice_to_valid</field>
     </record>
 
     <record model="workflow.transition" id="t_valid_to_send">
-        <field name="act_from" ref="act_to_valid"/>
-        <field name="act_to" ref="act_to_send"/>
-        <field name="signal">invoice_to_send</field>
+      <field name="act_from" ref="act_to_valid"/>
+      <field name="act_to" ref="act_to_send"/>
+      <field name="signal">invoice_to_send</field>
     </record>
 
     <record model="workflow.transition" id="t_send_to_pro2">
-        <field name="act_from" ref="act_to_send"/>
-        <field name="act_to" ref="account.act_proforma2"/>
-        <field name="signal">invoice_proforma2</field>
+      <field name="act_from" ref="act_to_send"/>
+      <field name="act_to" ref="account.act_proforma2"/>
+      <field name="signal">invoice_proforma2</field>
     </record>
     <record model="workflow.transition" id="account.t4">
-        <field name="act_from" ref="act_to_send"/>
-        <field name="act_to" ref="account.act_open"/>
-        <field name="signal">invoice_open</field>
+      <field name="act_from" ref="act_to_send"/>
+      <field name="act_to" ref="account.act_open"/>
+      <field name="signal">invoice_open</field>
     </record>
-    
+
     <record model="workflow.transition" id="account.t9">
-        <field name="act_from" ref="act_to_send"/>
-        <field name="act_to" ref="account.act_cancel"/>
-        <field name="signal">invoice_cancel</field>
+      <field name="act_from" ref="act_to_send"/>
+      <field name="act_to" ref="account.act_cancel"/>
+      <field name="signal">invoice_cancel</field>
     </record>
+
     <record model="workflow.transition" id="t_valid_to_cancel">
-        <field name="act_from" ref="act_to_valid"/>
-        <field name="act_to" ref="account.act_cancel"/>
-        <field name="signal">invoice_cancel</field>
+      <field name="act_from" ref="act_to_valid"/>
+      <field name="act_to" ref="account.act_cancel"/>
+      <field name="signal">invoice_cancel</field>
     </record>
 
-</data>
+  </data>
 </openerp>