Merge lp:~camptocamp/department-mgmt/7.0-port-invoice_department into lp:~department-core-editors/department-mgmt/7.0

[Yannick Vaucher @ Camptocamp]

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

LGTM

review: Approve (code review, no test)

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

LGTM

review: Approve (code review, no test)

=== modified file 'invoice_department/__init__.py'
--- invoice_department/__init__.py	2011-08-12 13:27:15 +0000
+++ invoice_department/__init__.py	2013-05-02 15:54:00 +0000
@@ -1,31 +1,23 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
-# Copyright (c) 2011 Camptocamp SA (http://www.camptocamp.com) 
-# All Right Reserved
-#
-# Author : Joel 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/>.
 #
 ##############################################################################
 import invoice
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'invoice_department/__openerp__.py'
--- invoice_department/__openerp__.py	2013-01-04 10:32:58 +0000
+++ invoice_department/__openerp__.py	2013-05-02 15:54:00 +0000
@@ -1,53 +1,42 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
-# Copyright (c) 2011 Camptocamp SA (http://www.camptocamp.com) 
-# All Right Reserved
-#
-# Author : Joel 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" : "Invoices with Department Categorization",
-    "version" : "1.0",
-    "author" : "Camptocamp",
-    "category" : "Generic Modules/Sales & Purchases",
-    "description":
-"""Add the department on Invoices.
+    'name' : 'Invoices with Department Categorization',
+    'version' : '1.0',
+    'category' : 'Generic Modules/Sales & Purchases',
+    'description':
+'''
+    Add the department on Invoices as well as the related filter and button in the search form.
 
-The views are adapted to use the information in the search form.""",
-    "website": "http://camptocamp.com",
-    "depends" : [
-        "account",
-        "hr"
-                ],
-    "init_xml" : [],
-    "demo_xml" : [],
-    "update_xml" : [
-        "invoice_view.xml",
-    ],
-    "active": False,
-    'installable': False
+''',
+    'author' : 'Camptocamp',
+    'website': 'http://camptocamp.com',
+    'depends' : ['account', 'hr'],
+    'data' : ['invoice_view.xml',],
+    'demo' : [],
+    'test': [],
+    'installable': True,
+    'auto_install': False,
+    'application': False
 }
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'invoice_department/invoice.py'
--- invoice_department/invoice.py	2011-08-12 13:27:15 +0000
+++ invoice_department/invoice.py	2013-05-02 15:54:00 +0000
@@ -1,45 +1,41 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
-# Copyright (c) 2010 Camptocamp SA (http://www.camptocamp.com) 
-# All Right Reserved
-#
-# Author : Joel 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/>.
 #
 ##############################################################################
-
-from osv import osv
-from osv import fields
-
-class account_invoice(osv.osv):
+from openerp.osv import orm, fields
+
+class AccountInvoice(orm.Model):
     _inherit = "account.invoice"
-
     _columns = {
         'department_id': fields.many2one('hr.department', 'Department'),
-    }
+        }
+
+    def _get_department(self, cr, uid, ids, context=None):
+        employee_obj = self.pool.get('hr.employee')
+        department_id = False
+        employee_ids = employee_obj.search(cr, uid, [('user_id','=', uid)])
+        if employee_ids:
+            department_id = employee_obj.browse(cr, uid, employee_ids[0], context=context).department_id.id
+        return department_id
+
     _defaults = {
-        'department_id': lambda s,cr,uid,c: s.pool.get('res.users').browse(cr,uid,uid).context_department_id.id,
-    }
+        'department_id': _get_department,
+        }
 
-account_invoice()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'invoice_department/invoice_view.xml'
--- invoice_department/invoice_view.xml	2011-08-12 13:27:15 +0000
+++ invoice_department/invoice_view.xml	2013-05-02 15:54:00 +0000
@@ -1,60 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data>
-        <record id="invoice_tree" model="ir.ui.view">
-            <field name="name">account.invoice.tree</field>
-            <field name="model">account.invoice</field>
-            <field name="inherit_id" ref="account.invoice_tree" />
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <xpath expr="/tree/field[@name='company_id']" position="before">
-                    <field name="department_id" />
-                </xpath>
-            </field>
-        </record>
-    
-        <record id="invoice_form" model="ir.ui.view">
-            <field name="name">account.invoice.form</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[@string='Other Info']/field[@name='company_id']" position="before">
-                    <field name="department_id" widget="selection"/>
-                </xpath>
-            </field>
-        </record>
-        
-        <record id="view_account_invoice_filter" model="ir.ui.view">
-            <field name="name">account.invoice.select</field>
-            <field name="model">account.invoice</field>
-            <field name="inherit_id" ref="account.view_account_invoice_filter" />
-            <field name="type">search</field>
-            <field name="arch" type="xml">
-                <xpath expr="/search/group[2]" position="replace">
-                    <group col="10" colspan="4">
-                        <field name="journal_id" widget="selection" select='1'/>
-                        <field name="department_id" select="1" widget="selection"/>
-                        <field name="period_id" select='1' string="Period"/>
-                    </group>
-                </xpath>
-                <xpath expr="/search/group/filter[@string='Partner']" position="after">
-                        <filter string="Department" icon="terp-folder-orange" domain="[]"  context="{'group_by':'department_id'}"/>
-                </xpath>
-            </field>
-        </record>
-
-        <record id="invoice_supplier_form" model="ir.ui.view">
-            <field name="name">account.invoice.supplier.form</field>
-            <field name="model">account.invoice</field>
-            <field name="inherit_id" ref="account.invoice_supplier_form" />
-            <field name="type">form</field>
-            <field name="priority">2</field>
-            <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page[@string='Other Info']/field[@name='company_id']" position="before">
-                    <field name="department_id" widget="selection"/>
-                </xpath>
-            </field>
-        </record>
-
-    </data>
-</openerp>
\ No newline at end of file
+  <data>
+
+    <record id="invoice_tree" model="ir.ui.view">
+      <field name="name">account.invoice.tree</field>
+      <field name="model">account.invoice</field>
+      <field name="inherit_id" ref="account.invoice_tree" />
+      <field name="arch" type="xml">
+        <field name="company_id" position="before">
+          <field name="department_id" />
+        </field>
+      </field>
+    </record>
+
+    <record id="invoice_form" model="ir.ui.view">
+      <field name="name">account.invoice.form</field>
+      <field name="model">account.invoice</field>
+      <field name="inherit_id" ref="account.invoice_form" />
+      <field name="arch" type="xml">
+        <field name="company_id" position="before">
+          <field name="department_id" widget="selection"/>
+        </field>
+      </field>
+    </record>
+
+    <record id="view_account_invoice_filter" model="ir.ui.view">
+      <field name="name">account.invoice.select</field>
+      <field name="model">account.invoice</field>
+      <field name="inherit_id" ref="account.view_account_invoice_filter" />
+      <field name="arch" type="xml">
+        <field name="period_id" position="replace">
+          <field name="journal_id" widget="selection"/>
+          <field name="department_id" widget="selection"/>
+          <field name="period_id" string="Period"/>
+        </field>
+        <filter string="Partner" position="after">
+          <filter string="Department" icon="terp-folder-orange" domain="[]" context="{'group_by':'department_id'}"/>
+        </filter>
+      </field>
+    </record>
+
+    <record id="invoice_supplier_form" model="ir.ui.view">
+      <field name="name">account.invoice.supplier.form</field>
+      <field name="model">account.invoice</field>
+      <field name="inherit_id" ref="account.invoice_supplier_form" />
+      <field name="priority">2</field>
+      <field name="arch" type="xml">
+        <field name="company_id" position="before">
+          <field name="department_id" widget="selection"/>
+        </field>
+      </field>
+    </record>
+
+  </data>
+</openerp>