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

[Yannick Vaucher @ Camptocamp]

[Nhomar - Vauxoo (nhomar)]

Approve.

Just Code Review. No test.

review: Approve

[Daniel Reis (dreis-pt)]

Hmmm ... my tests return an error message when installing.
Maybe this happens because I don't have multicompany installed?

2013-07-15 16:57:25,471 26929 ERROR dept7-dev openerp.tools.convert: Parse error in /opt/openerp/dept7/dev/department-mgmt/invoice_department/invoice_view.xml:16:
<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>
(...)
2013-07-15 16:57:25,475 26929 ERROR dept7-dev openerp.netsvc: ValidateError
Error occurred while validating the field(s) arch: Invalid XML for View Architecture!

review: Needs Information

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

This issue doesn't seems to come from sale_department but from its dependency invoice_department which conflicts with portal_sale (auto installed with portal and sale thus with sale_department).

To complete install of sale_department from scratch I had to do those steps:

- comment invoice_form and invoice_supplier_form in invoice_department/invoice_view.xml
- comment invoice_form_payment in portal_sale/portal_sale_view.xml
- launch OpenERP with --update=all
- uncomment view in portal_sale
- launch OpenERP with --update=portal_sale
- uncomment view in invoice_department
- launch OpenERP with --update=invoice_department

I guess this is due to some OpenERP bug in view inheritance...

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

Somehow, on update of portal_sale, it uses some cached view trying to read department_id before it has been defined by invoice_department.

We cannot make invoice_department depending on portal_sale as it doesn't make sense. Let's see if a new bug report on view inheritance bring us some solution to this.

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

Finally it seems it is simply in invoice_department that we try to add the field department_id before company_id of invoice line instead of doing it before the company_id of invoice. Funny I could install invoice_department anyway...

[Daniel Reis (dreis-pt)]

As a suggestion for future improvement:
From a usability PoV, the widget "selection" is only appropriate for small lists of items (less than a handfull).
In this case, when the Department list grows significantly (in my case, many dozens of records) it gets harder to use.
So, the default v7 search-as-you-type list widget will probably be more adequate here.

review: Approve (tested install, no errors.)

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

Thanks for the review.

You are right using completion instead of selection makes sense with dozens of departments.
I kept it like this as we haven't such case with that many departments but to be more generic it would be a good improvement.

Actually we have half of department-mgmt using selection and half using default completion.

So we will have to change it in the following modules:
crm_department
invoice_department
sale_department

=== modified file 'sale_department/__init__.py'
--- sale_department/__init__.py	2011-08-12 12:53:16 +0000
+++ sale_department/__init__.py	2013-06-19 06:55:30 +0000
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
-# Copyright (c) 2011 Camptocamp SA (http://www.camptocamp.com) 
+# Copyright (c) 2011 Camptocamp SA (http://www.camptocamp.com)
 # All Right Reserved
 #
 # Author : Joel Grand-guillaume (Camptocamp)
@@ -30,3 +30,5 @@
 ##############################################################################
 
 import sale
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

=== modified file 'sale_department/__openerp__.py'
--- sale_department/__openerp__.py	2013-01-04 10:32:58 +0000
+++ sale_department/__openerp__.py	2013-06-19 06:55:30 +0000
@@ -1,55 +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 2011 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" : "Sales Order with Department Categorization",
-    "version" : "1.0",
-    "author" : "Camptocamp",
-    "category" : "Generic Modules/Sales & Purchases",
-    "description":
-"""
+    'name' : 'Sales Order with Department Categorization',
+    'version' : '1.0',
+    'category' : 'Generic Modules/Sales & Purchases',
+    'description':
+'''
     Add the department on Sales Order and Customer Invoices as well as the related filter and button in the search form.
-    
-""",
-    "website": "http://camptocamp.com",
-    "depends" : [
-        "sale",
-        "invoice_department",
-        "hr"
-                ],
-    "init_xml" : [],
-    "demo_xml" : [],
-    "update_xml" : [
-        "sale_view.xml",
+
+''',
+    'author' : 'Camptocamp',
+    'website': 'http://camptocamp.com',
+    'depends' : ['sale', 'invoice_department', 'hr'],
+    'data' : [
+        'sale_view.xml',
     ],
-    "active": False,
-    'installable': False
+    'demo' : [],
+    'installable': True,
+    'auto_install': False,
+    'application': False,
 }
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'sale_department/sale.py'
--- sale_department/sale.py	2011-08-12 12:53:16 +0000
+++ sale_department/sale.py	2013-06-19 06:55:30 +0000
@@ -1,51 +1,57 @@
 # -*- 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 sale_order(osv.osv):
-    _inherit = "sale.order"
-
+from openerp.osv import orm, fields
+
+class SaleOrder(orm.Model):
+    _inherit = 'sale.order'
     _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)],
+                context=context)
+        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,
+        }
+
     def _make_invoice(self, cr, uid, order, lines, context=None):
-        res = super(sale_order,self)._make_invoice(cr,uid,order,lines,context)
-        self.pool.get('account.invoice').write(cr,uid,res,{'department_id':order.department_id.id},context)
+        invoice_obj = self.pool.get('account.invoice')
+        res = super(SaleOrder, self)._make_invoice(
+                cr, uid, order,
+                lines, context=context)
+        invoice_obj.write(
+                cr, uid, res,
+                {'department_id': order.department_id.id},
+                context=context)
         return res
-        
 
-sale_order()
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'sale_department/sale_view.xml' (properties changed: +x to -x)
--- sale_department/sale_view.xml	2011-08-12 12:53:16 +0000
+++ sale_department/sale_view.xml	2013-06-19 06:55:30 +0000
@@ -1,45 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data>
-        
-        <record id="view_order_tree" model="ir.ui.view">
-            <field name="name">sale.order.tree</field>
-            <field name="model">sale.order</field>
-            <field name="type">tree</field>
-            <field name="inherit_id" ref="sale.view_order_tree" />
-            <field name="arch" type="xml">
-                <xpath expr="/tree/field[@name='user_id']" position="after">
-                    <field name="department_id" />
-                </xpath>
-            </field>
-        </record>
-        
-        <record id="view_order_form" model="ir.ui.view">
-            <field name="name">sale.order.form</field>
-            <field name="model">sale.order</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="sale.view_order_form" />
-            <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page[@string='Other Information']/group/field[@name='user_id']" position="after">
-                    <field name="department_id" widget="selection"/>
-                </xpath>
-            </field>
-        </record>
-        
-        <record id="view_sales_order_filter" model="ir.ui.view">
-            <field name="name">sale.order.list.select</field>
-            <field name="model">sale.order</field>
-            <field name="type">search</field>
-            <field name="inherit_id" ref="sale.view_sales_order_filter" />
-            <field name="arch" type="xml">
-                <xpath expr="/search/group/filter[@string='Salesman']" position="after">
-                    <filter string="Department" icon="terp-folder-orange" domain="[]" context="{'group_by':'department_id'}"/>
-                </xpath>
-                <xpath expr="/search/field[@name='partner_id']" position="after">
-                    <field name="department_id" select="1" widget="selection"/>
-                </xpath>
-            </field>
-        </record>
-        
-
-    </data>
-</openerp>
\ No newline at end of file
+  <data>
+
+    <record id="view_quotation_tree" model="ir.ui.view">
+      <field name="name">sale.order.tree</field>
+      <field name="model">sale.order</field>
+      <field name="inherit_id" ref="sale.view_quotation_tree" />
+      <field name="arch" type="xml">
+        <field name="user_id" position="after">
+          <field name="department_id" />
+        </field>
+      </field>
+    </record>
+
+    <record id="view_order_tree" model="ir.ui.view">
+      <field name="name">sale.order.tree</field>
+      <field name="model">sale.order</field>
+      <field name="inherit_id" ref="sale.view_order_tree" />
+      <field name="arch" type="xml">
+        <field name="user_id" position="after">
+          <field name="department_id" />
+        </field>
+      </field>
+    </record>
+
+    <record id="view_order_form" model="ir.ui.view">
+      <field name="name">sale.order.form</field>
+      <field name="model">sale.order</field>
+      <field name="inherit_id" ref="sale.view_order_form" />
+      <field name="arch" type="xml">
+        <field name="user_id" position="after">
+          <field name="department_id" widget="selection"/>
+        </field>
+      </field>
+    </record>
+
+    <record id="view_sales_order_filter" model="ir.ui.view">
+      <field name="name">sale.order.list.select</field>
+      <field name="model">sale.order</field>
+      <field name="inherit_id" ref="sale.view_sales_order_filter" />
+      <field name="arch" type="xml">
+        <xpath expr="//filter[@string='Salesperson']" position="after">
+          <filter string="Department" icon="terp-folder-orange" domain="[]" context="{'group_by':'department_id'}"/>
+        </xpath>
+        <field name="partner_id" position="after">
+          <field name="department_id"  widget="selection"/>
+        </field>
+      </field>
+    </record>
+
+  </data>
+</openerp>