Merge lp:~openerp-dev/openobject-addons/7.0-extra-report-company into lp:openobject-addons/7.0

[Olivier Dony (Odoo)]

Adds compatibility modules for storing denormalized 'commercial_partner_id' fields in the following objects:
 - Contracts (account.analytic.account) -> module analytic_report_company
 - Sales Orders (sale.order) -> module sale_report_company
 - Purchase Orders (purchase.order) -> module purchase_report_company
 - Stock Pickings (stock.picking) -> module stock_report_company
 - Leads/Opportunities (crm.lead) -> module crm_report_company

[Alexis de Lattre (alexis-via)]

I have deployed in production sale_report_company and purchase_report_company and they work well. Code is fine.

review: Approve

[Joël Grand-Guillaume @ camptocamp (jgrandguillaume-c2c)]

Hi Olivier,

Finally I discover that one ! We already did some custo to have in production. Our project was about to take off and we needed them. I though you had forgotten :)

This is a must have for reporting in v7.0 and I'm glad to see it here. It is really necessary for medium and large company size.

It LGTM, thanks for the work.

Regards,

Joël

review: Approve (code review + test)

[Raphaël Valyi - http://www.akretion.com (rvalyi)]

Hello Olivier,

a few remark about your MP. You already know my position about the semantic shift contact_id, partner_id to partner_id, commercial_entity_id and I already know OpenERP SA wants to keep this shift from now on. So please keep in mind I'm NOT talking about this as we may adapt to the shift once the addons codebase is adapted to it in a credible way (not too far finally even if there are still a few open regressions about this).

So my point in your MP is:

1) I think a crm.claim object also deserves such a commercial_entity_id.
Until 6.1, you could filter claims by commercial entity. I think there is no reason you couldn't not do it anymore in v7. Adding the field in crm.claim you would be on par with what I did in the RS-OCB branch (except I preserved the partner_id semantic).

2) I think this is not good to put the commercial_entity_id at save time. I think that in many situations you want to have the commercial entity BEFORE saving a new record to allow you filtering other fields of the form.
For example you create a new incoming picking and you want to relate it to a claim (RMA situation). Before your picking is save, you may want to select the claim related to the proper commercial entity. Doing that if commercial entity is set at save time is really cumbersome.

3) Instead I suggest to set commercial_entity_id when the contact (partner_d in your case) is changed in the form. This is what I do in the RS-OCB tracking branch for instance here:
https://github.com/akretion/openerp-server/blob/rs-ocb-7.0/openerp/addons/base/res/res_partner.py#L209
You could very well do it in a simpler way when you ca refactor the addons (talking about v8 which is what matters anyway). My point is that instead of doing it an arbitrary way, if you use some on_change (you should), then you should implement the on_change in a mixin. This way we know deterministically that all documents including this mixin support both a contact field (called partner_d in your case) and a commercial_entity_id and support it consistently.

This is like Java programs would implement a HasContact "interface" or Ruby programs a HasContact "module". This is the idea of "design by contract" http://en.wikipedia.org/wiki/Design_by_contract
Something that I think is required when you build an ERP and that is currently missing too much in the OpenERP culture, leading to brittle code breaking from customization to customization and from version to version. At the end of the road this lack of architecture largely explains why OpenERP market has its growth limited by its slow learning curve, both for us partners and for you OpenERP SA.

4) In the same idea of consistence, I think that in v8, these fields should NOT come from such arbitrary patchy extra modules but these fields should be present natively.
The risk with these fixes in modules is that 3rd party modules won't deal with them consistently and this is really hard to build a sustainable eco-system this way. For instance, in current v8 you would present that BI module filter tour sale orders or purchase orders by customer or supplier. But this is not, this is by contact. Some module will not notice the issue and will be...

review: Needs Fixing

[Joël Grand-Guillaume @ camptocamp (jgrandguillaume-c2c)]

Hi,

I'm also in favor of including the crm.claim in those modules please. Didn't though about that when posting my review, but I'gonna need it as well. It's not that painful to add it here in the meanwhile.

For the rest of Raphaël's comments, I don't want to enter too deep in that debate ! I must admit having it on an on_change would be great for v8, but I also agree with you that for v7 it's not possible regarding your policies (or at a high cost).

Thanks in advance for adding crm-claim in there.

Joël

review: Needs Fixing (code review, test)

[Raphaël Valyi - http://www.akretion.com (rvalyi)]

Yes, I also just ask for on_change in v8, as for v7 I don't care; I use RS-OCB and is works well and if it just to add fields like that, I'm sure people can do it too on their own.

[Alexis de Lattre (alexis-via)]

By the way, I upgraded to the latest server/web/addons and made an "-u all" on an installation that has the module sale_report_company, and it fails :

2014-03-27 21:13:14,365 914 INFO prod_erp openerp.modules.module: module sale_report_company: creating or updating database tables
2014-03-27 21:13:14,443 914 ERROR prod_erp openerp.sql_db: bad query: ALTER TABLE "sale_order" ADD FOREIGN KEY ("commercial_partner_id") REFERENCES "res_partner" ON DELETE set null
Traceback (most recent call last):
  File "/home/erp_super/erp/prod/src/server/openerp/sql_db.py", line 226, in execute
    res = self._obj.execute(query, params)
IntegrityError: insert or update on table "sale_order" violates foreign key constraint "sale_order_commercial_partner_id_fkey"
DETAIL: Key (commercial_partner_id)=(506) is not present in table "res_partner".

Unmerged revisions

9397. By Olivier Dony (Odoo) on 2013-09-06

[ADD] New compatibility modules for adding the denormalized commercial_partner_id dimension on main documents

      - `analytic_report_company` for analytic accounts, contracts and projects
      - `crm_report_company` for leads and opportunities
      - `purchase_report_company` for quotations and purchase orders
      - `sale_report_company` for quotations and sales orders
      - `stock_report_company` for delivery orders dans incoming shipments

=== modified file 'account_report_company/__openerp__.py'
--- account_report_company/__openerp__.py	2013-04-19 17:18:53 +0000
+++ account_report_company/__openerp__.py	2014-01-29 13:26:54 +0000
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 {
-    'name': 'Invoice Analysis per Company',
+    'name': 'Invoice Consolidation per Partner Company',
     'version': '1.0',
     'category': 'Accounting & Finance',
     'description': """

=== added directory 'analytic_report_company'
=== added file 'analytic_report_company/__init__.py'
--- analytic_report_company/__init__.py	1970-01-01 00:00:00 +0000
+++ analytic_report_company/__init__.py	2014-01-29 13:26:54 +0000
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (c) 2013 OpenERP S.A. <http://openerp.com>
+#
+#    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 analytic_report_company
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'analytic_report_company/__openerp__.py'
--- analytic_report_company/__openerp__.py	1970-01-01 00:00:00 +0000
+++ analytic_report_company/__openerp__.py	2014-01-29 13:26:54 +0000
@@ -0,0 +1,49 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (c) 2013 OpenERP S.A. <http://openerp.com>
+#
+#    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': 'Contracts Consolidation per Partner Company',
+    'version': '1.0',
+    'category': 'Hidden/Dependency',
+    'description': """
+Add an extra Partner Company dimension on Contracts lists
+=========================================================
+
+By default Contracts can be associated with any given Partner
+or any Partner Contact. When using contacts, the company these
+contacts belong to is not directly available as a grouping
+dimension in Contracts lists.
+This modules adds an extra "group by" dimension labelled "Partner Company".
+
+For B2C cases where the Partner is a natural person, the Partner Company
+value will be that person herself. 
+
+Note: this module will likely be removed in OpenERP 8.0, and may be
+directly integrated in the core Contracts Management module. 
+""",
+    'author': 'OpenERP SA',
+    'website': 'http://www.openerp.com',
+    'depends': ['account_analytic_analysis'],
+    'data': [
+        'analytic_view.xml',
+    ],
+}
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'analytic_report_company/analytic_report_company.py'
--- analytic_report_company/analytic_report_company.py	1970-01-01 00:00:00 +0000
+++ analytic_report_company/analytic_report_company.py	2014-01-29 13:26:54 +0000
@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (c) 2013 S.A. <http://openerp.com>
+#
+#    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 openerp.osv import osv, fields
+
+class contract(osv.Model):
+    _inherit = 'account.analytic.account'
+    _columns = {
+        'commercial_partner_id': fields.related('partner_id', 'commercial_partner_id', string='Partner Company', type='many2one',
+                                                relation='res.partner', store=True, readonly=True,
+                                                help="The commercial entity the partner belongs to, sometimes useful for reporting")
+    }

=== added file 'analytic_report_company/analytic_view.xml'
--- analytic_report_company/analytic_view.xml	1970-01-01 00:00:00 +0000
+++ analytic_report_company/analytic_view.xml	2014-01-29 13:26:54 +0000
@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+        <record model="ir.ui.view" id="view_account_analytic_account_list">
+            <field name="model">account.analytic.account</field>
+            <field name="inherit_id" ref="account.view_account_analytic_account_list"/>
+            <field name="arch" type="xml">
+                <field name="partner_id" position="after">
+                    <field name="commercial_partner_id" invisible="1"/>
+                </field>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="view_account_analytic_account_overdue_search">
+            <field name="model">account.analytic.account</field>
+            <field name="inherit_id" ref="account_analytic_analysis.view_account_analytic_account_overdue_search"/>
+            <field name="arch" type="xml">
+                <filter string="Partner" position="after">
+                    <filter name="commercial_partner_id" string="Partner Company"
+                            domain="[]" context="{'group_by': 'commercial_partner_id'}"/>
+                </filter>
+            </field>
+        </record>
+        <record model="ir.ui.view" id="view_account_analytic_account_search">
+            <field name="model">account.analytic.account</field>
+            <field name="inherit_id" ref="account.view_account_analytic_account_search"/>
+            <field name="arch" type="xml">
+                <filter string="Associated Partner" position="after">
+                    <filter name="commercial_partner_id" string="Partner Company"
+                            domain="[]" context="{'group_by': 'commercial_partner_id'}"/>
+                </filter>
+            </field>
+        </record>
+    </data>
+</openerp>
\ No newline at end of file

=== added directory 'crm_report_company'
=== added file 'crm_report_company/__init__.py'
--- crm_report_company/__init__.py	1970-01-01 00:00:00 +0000
+++ crm_report_company/__init__.py	2014-01-29 13:26:54 +0000
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (c) 2013 OpenERP S.A. <http://openerp.com>
+#
+#    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 crm_report_company
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'crm_report_company/__openerp__.py'
--- crm_report_company/__openerp__.py	1970-01-01 00:00:00 +0000
+++ crm_report_company/__openerp__.py	2014-01-29 13:26:54 +0000
@@ -0,0 +1,49 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (c) 2013 OpenERP S.A. <http://openerp.com>
+#
+#    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': 'CRM Consolidation per Partner Company',
+    'version': '1.0',
+    'category': 'Hidden/Dependency',
+    'description': """
+Add an extra Partner Company dimension on Leads/Opportunities lists
+===================================================================
+
+By default Leads and Opportunities can be associated with any given Partner
+or any Partner Contact. When using contacts, the company these contacts
+belong to is not directly available as a grouping dimension in Leads
+and Opportunities lists.
+This modules adds an extra "group by" dimension labelled "Partner Company".
+
+For B2C cases where the Partner is a natural person, the Partner Company
+value will be that person herself. 
+
+Note: this module will likely be removed in OpenERP 8.0, and may be
+directly integrated in the core CRM module. 
+""",
+    'author': 'OpenERP SA',
+    'website': 'http://www.openerp.com',
+    'depends': ['crm'],
+    'data': [
+        'crm_view.xml',
+    ],
+}
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'crm_report_company/crm_report_company.py'
--- crm_report_company/crm_report_company.py	1970-01-01 00:00:00 +0000
+++ crm_report_company/crm_report_company.py	2014-01-29 13:26:54 +0000
@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (c) 2013 S.A. <http://openerp.com>
+#
+#    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 openerp.osv import osv, fields
+
+class crm_lead(osv.Model):
+    _inherit = 'crm.lead'
+    _columns = {
+        'commercial_partner_id': fields.related('partner_id', 'commercial_partner_id', string='Partner Company', type='many2one',
+                                                relation='res.partner', store=True, readonly=True,
+                                                help="The commercial entity the partner belongs to, sometimes useful for reporting")
+    }

=== added file 'crm_report_company/crm_view.xml'
--- crm_report_company/crm_view.xml	1970-01-01 00:00:00 +0000
+++ crm_report_company/crm_view.xml	2014-01-29 13:26:54 +0000
@@ -0,0 +1,46 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+        <!-- LEADS -->
+        <record model="ir.ui.view" id="crm_case_tree_view_leads">
+            <field name="model">crm.lead</field>
+            <field name="inherit_id" ref="crm.crm_case_tree_view_leads"/>
+            <field name="arch" type="xml">
+                <field name="partner_id" position="after">
+                    <field name="commercial_partner_id" invisible="1"/>
+                </field>
+            </field>
+        </record>
+        <record model="ir.ui.view" id="view_crm_case_leads_filter">
+            <field name="model">crm.lead</field>
+            <field name="inherit_id" ref="crm.view_crm_case_leads_filter"/>
+            <field name="arch" type="xml">
+                <filter string="Customer" position="after">
+                    <filter name="commercial_partner_id" string="Partner Company"
+                            domain="[]" context="{'group_by': 'commercial_partner_id'}"/>
+                </filter>
+            </field>
+        </record>
+        
+        <!-- OPPORTUNITIES -->
+        <record model="ir.ui.view" id="crm_case_tree_view_oppor">
+            <field name="model">crm.lead</field>
+            <field name="inherit_id" ref="crm.crm_case_tree_view_oppor"/>
+            <field name="arch" type="xml">
+                <field name="partner_id" position="after">
+                    <field name="commercial_partner_id" invisible="1"/>
+                </field>
+            </field>
+        </record>
+        <record model="ir.ui.view" id="view_crm_case_opportunities_filter">
+            <field name="model">crm.lead</field>
+            <field name="inherit_id" ref="crm.view_crm_case_opportunities_filter"/>
+            <field name="arch" type="xml">
+                <filter string="Customer" position="after">
+                    <filter name="commercial_partner_id" string="Partner Company"
+                            domain="[]" context="{'group_by': 'commercial_partner_id'}"/>
+                </filter>
+            </field>
+        </record>
+    </data>
+</openerp>
\ No newline at end of file

=== added directory 'purchase_report_company'
=== added file 'purchase_report_company/__init__.py'
--- purchase_report_company/__init__.py	1970-01-01 00:00:00 +0000
+++ purchase_report_company/__init__.py	2014-01-29 13:26:54 +0000
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (c) 2013 OpenERP S.A. <http://openerp.com>
+#
+#    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 purchase_report_company
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'purchase_report_company/__openerp__.py'
--- purchase_report_company/__openerp__.py	1970-01-01 00:00:00 +0000
+++ purchase_report_company/__openerp__.py	2014-01-29 13:26:54 +0000
@@ -0,0 +1,49 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (c) 2013 OpenERP S.A. <http://openerp.com>
+#
+#    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': 'Purchase Consolidation per Supplier Company',
+    'version': '1.0',
+    'category': 'Hidden/Dependency',
+    'description': """
+Add an extra Supplier Company dimension on Quotations/Orders lists
+==================================================================
+
+By Quotations and Purchase Orders can be associated with any given Supplier
+or any Supplier Contact. When using contacts, the company these contacts
+belong to is not directly available as a grouping dimension in
+Quotations and Purchase Orders lists.
+This modules adds an extra "group by" dimension labelled "Supplier Company".
+
+In case the Supplier is a natural person, the Supplier Company
+value will be that person herself. 
+
+Note: this module will likely be removed in OpenERP 8.0, and may be
+directly integrated in the core Purchase Management module. 
+""",
+    'author': 'OpenERP SA',
+    'website': 'http://www.openerp.com',
+    'depends': ['purchase'],
+    'data': [
+        'purchase_view.xml',
+    ],
+}
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'purchase_report_company/purchase_report_company.py'
--- purchase_report_company/purchase_report_company.py	1970-01-01 00:00:00 +0000
+++ purchase_report_company/purchase_report_company.py	2014-01-29 13:26:54 +0000
@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (c) 2013 S.A. <http://openerp.com>
+#
+#    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 openerp.osv import osv, fields
+
+class purchase_order(osv.Model):
+    _inherit = 'purchase.order'
+    _columns = {
+        'commercial_partner_id': fields.related('partner_id', 'commercial_partner_id', string='Supplier Company', type='many2one',
+                                                relation='res.partner', store=True, readonly=True,
+                                                help="The commercial entity the supplier belongs to, sometimes useful for reporting")
+    }

=== added file 'purchase_report_company/purchase_view.xml'
--- purchase_report_company/purchase_view.xml	1970-01-01 00:00:00 +0000
+++ purchase_report_company/purchase_view.xml	2014-01-29 13:26:54 +0000
@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+        <record model="ir.ui.view" id="purchase_order_tree">
+            <field name="model">purchase.order</field>
+            <field name="inherit_id" ref="purchase.purchase_order_tree"/>
+            <field name="arch" type="xml">
+                <field name="partner_id" position="after">
+                    <field name="commercial_partner_id" invisible="1"/>
+                </field>
+            </field>
+        </record>
+        <record model="ir.ui.view" id="view_request_for_quotation_filter">
+            <field name="model">purchase.order</field>
+            <field name="inherit_id" ref="purchase.view_request_for_quotation_filter"/>
+            <field name="arch" type="xml">
+                <filter string="Supplier" position="after">
+                    <filter name="commercial_partner_id" string="Supplier Company"
+                            domain="[]" context="{'group_by': 'commercial_partner_id'}"/>
+                </filter>
+            </field>
+        </record>
+        <record model="ir.ui.view" id="view_purchase_order_filter">
+            <field name="model">purchase.order</field>
+            <field name="inherit_id" ref="purchase.view_purchase_order_filter"/>
+            <field name="arch" type="xml">
+                <filter string="Supplier" position="after">
+                    <filter name="commercial_partner_id" string="Supplier Company"
+                            domain="[]" context="{'group_by': 'commercial_partner_id'}"/>
+                </filter>
+            </field>
+        </record>        
+    </data>
+</openerp>
\ No newline at end of file

=== added directory 'sale_report_company'
=== added file 'sale_report_company/__init__.py'
--- sale_report_company/__init__.py	1970-01-01 00:00:00 +0000
+++ sale_report_company/__init__.py	2014-01-29 13:26:54 +0000
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (c) 2013 OpenERP S.A. <http://openerp.com>
+#
+#    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 sale_report_company
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'sale_report_company/__openerp__.py'
--- sale_report_company/__openerp__.py	1970-01-01 00:00:00 +0000
+++ sale_report_company/__openerp__.py	2014-01-29 13:26:54 +0000
@@ -0,0 +1,49 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (c) 2013 OpenERP S.A. <http://openerp.com>
+#
+#    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 Consolidation per Customer Company',
+    'version': '1.0',
+    'category': 'Hidden/Dependency',
+    'description': """
+Add an extra Customer Company dimension on Quotations/Orders lists
+==================================================================
+
+By Quotations and Sales Orders can be associated with any given Customer
+or any Customer Contact. When using contacts, the company these contacts
+belong to is not directly available as a grouping dimension in
+Quotations and Sales Orders lists.
+This modules adds an extra "group by" dimension labelled "Customer Company".
+
+For B2C where the Customer is a natural person, the Customer Company
+value will be that person herself. 
+
+Note: this module will likely be removed in OpenERP 8.0, and may be
+directly integrated in the core Sales Management module. 
+""",
+    'author': 'OpenERP SA',
+    'website': 'http://www.openerp.com',
+    'depends': ['sale'],
+    'data': [
+        'sale_view.xml',
+    ],
+}
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'sale_report_company/sale_report_company.py'
--- sale_report_company/sale_report_company.py	1970-01-01 00:00:00 +0000
+++ sale_report_company/sale_report_company.py	2014-01-29 13:26:54 +0000
@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (c) 2013 S.A. <http://openerp.com>
+#
+#    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 openerp.osv import osv, fields
+
+class sale_order(osv.Model):
+    _inherit = 'sale.order'
+    _columns = {
+        'commercial_partner_id': fields.related('partner_id', 'commercial_partner_id', string='Customer Company', type='many2one',
+                                                relation='res.partner', store=True, readonly=True,
+                                                help="The commercial entity the customer belongs to, sometimes useful for reporting")
+    }

=== added file 'sale_report_company/sale_view.xml'
--- sale_report_company/sale_view.xml	1970-01-01 00:00:00 +0000
+++ sale_report_company/sale_view.xml	2014-01-29 13:26:54 +0000
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+        <record model="ir.ui.view" id="view_order_tree">
+            <field name="model">sale.order</field>
+            <field name="inherit_id" ref="sale.view_order_tree"/>
+            <field name="arch" type="xml">
+                <field name="partner_id" position="after">
+                    <field name="commercial_partner_id" invisible="1"/>
+                </field>
+            </field>
+        </record>
+        <record model="ir.ui.view" id="view_quotation_tree">
+            <field name="model">sale.order</field>
+            <field name="inherit_id" ref="sale.view_quotation_tree"/>
+            <field name="arch" type="xml">
+                <field name="partner_id" position="after">
+                    <field name="commercial_partner_id" invisible="1"/>
+                </field>
+            </field>
+        </record>
+        <record model="ir.ui.view" id="view_sales_order_filter">
+            <field name="model">sale.order</field>
+            <field name="inherit_id" ref="sale.view_sales_order_filter"/>
+            <field name="arch" type="xml">
+                <filter string="Customer" position="after">
+                    <filter name="commercial_partner_id" string="Customer Company"
+                            domain="[]" context="{'group_by': 'commercial_partner_id'}"/>
+                </filter>
+            </field>
+        </record>
+    </data>
+</openerp>
\ No newline at end of file

=== added directory 'stock_report_company'
=== added file 'stock_report_company/__init__.py'
--- stock_report_company/__init__.py	1970-01-01 00:00:00 +0000
+++ stock_report_company/__init__.py	2014-01-29 13:26:54 +0000
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (c) 2013 OpenERP S.A. <http://openerp.com>
+#
+#    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 stock_report_company
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'stock_report_company/__openerp__.py'
--- stock_report_company/__openerp__.py	1970-01-01 00:00:00 +0000
+++ stock_report_company/__openerp__.py	2014-01-29 13:26:54 +0000
@@ -0,0 +1,50 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (c) 2013 OpenERP S.A. <http://openerp.com>
+#
+#    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': 'Stock Consolidation per Partner Company',
+    'version': '1.0',
+    'category': 'Hidden/Dependency',
+    'description': """
+Add an extra Partner Company dimension on Delivery Orders and Incoming Shipments lists
+======================================================================================
+
+By default Delivery Orders and Incoming Shipments can be associated with any given Partner
+or any Partner Contact. When using contacts, the company these contacts belong to is
+not directly available as a grouping dimension in Delivery Orders and Incoming Shipments
+lists.
+This modules adds an extra "group by" dimension labelled "Customer Company" or
+"Supplier Company".
+
+For cases where the Partner is a natural person, the Partner Company
+value will be that person herself. 
+
+Note: this module will likely be removed in OpenERP 8.0, and may be
+directly integrated in the core CRM module. 
+""",
+    'author': 'OpenERP SA',
+    'website': 'http://www.openerp.com',
+    'depends': ['stock'],
+    'data': [
+        'stock_view.xml',
+    ],
+}
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'stock_report_company/stock_report_company.py'
--- stock_report_company/stock_report_company.py	1970-01-01 00:00:00 +0000
+++ stock_report_company/stock_report_company.py	2014-01-29 13:26:54 +0000
@@ -0,0 +1,49 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (c) 2013 S.A. <http://openerp.com>
+#
+#    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 openerp.osv import osv, fields
+
+# Due to the outstanding inheritance limitation explained in bug 996816 the
+# field has to be defined for each "virtual copy" of the stock.picking model.
+
+class stock_picking(osv.Model):
+    _inherit = 'stock.picking'
+    _columns = {
+        'commercial_partner_id': fields.related('partner_id', 'commercial_partner_id', string='Partner Company', type='many2one',
+                                                relation='res.partner', store=True, readonly=True,
+                                                help="The commercial entity the partner belongs to, sometimes useful for reporting")
+    }
+
+class stock_picking_out(osv.Model):
+    _inherit = 'stock.picking.out'
+    _columns = {
+        'commercial_partner_id': fields.related('partner_id', 'commercial_partner_id', string='Customer Company', type='many2one',
+                                                relation='res.partner', store=True, readonly=True,
+                                                help="The commercial entity the partner belongs to, sometimes useful for reporting")
+    }
+
+class stock_picking_in(osv.Model):
+    _inherit = 'stock.picking.in'
+    _columns = {
+        'commercial_partner_id': fields.related('partner_id', 'commercial_partner_id', string='Supplier Company', type='many2one',
+                                                relation='res.partner', store=True, readonly=True,
+                                                help="The commercial entity the partner belongs to, sometimes useful for reporting")
+    }
\ No newline at end of file

=== added file 'stock_report_company/stock_view.xml'
--- stock_report_company/stock_view.xml	1970-01-01 00:00:00 +0000
+++ stock_report_company/stock_view.xml	2014-01-29 13:26:54 +0000
@@ -0,0 +1,46 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+        <!-- DELIVERY ORDERS -->
+        <record model="ir.ui.view" id="view_picking_out_tree">
+            <field name="model">stock.picking.out</field>
+            <field name="inherit_id" ref="stock.view_picking_out_tree"/>
+            <field name="arch" type="xml">
+                <field name="partner_id" position="after">
+                    <field name="commercial_partner_id" invisible="1"/>
+                </field>
+            </field>
+        </record>
+        <record model="ir.ui.view" id="view_picking_out_search">
+            <field name="model">stock.picking.out</field>
+            <field name="inherit_id" ref="stock.view_picking_out_search"/>
+            <field name="arch" type="xml">
+                <filter string="Journal" position="after">
+                    <filter name="commercial_partner_id" string="Customer Company"
+                            domain="[]" context="{'group_by': 'commercial_partner_id'}"/>
+                </filter>
+            </field>
+        </record>
+
+        <!-- INCOMING SHIPMENTS -->
+        <record model="ir.ui.view" id="view_picking_in_tree">
+            <field name="model">stock.picking.in</field>
+            <field name="inherit_id" ref="stock.view_picking_in_tree"/>
+            <field name="arch" type="xml">
+                <field name="partner_id" position="after">
+                    <field name="commercial_partner_id" invisible="1"/>
+                </field>
+            </field>
+        </record>
+        <record model="ir.ui.view" id="view_picking_in_search">
+            <field name="model">stock.picking.in</field>
+            <field name="inherit_id" ref="stock.view_picking_in_search"/>
+            <field name="arch" type="xml">
+                <filter string="Journal" position="after">
+                    <filter name="commercial_partner_id" string="Supplier Company"
+                            domain="[]" context="{'group_by': 'commercial_partner_id'}"/>
+                </filter>
+            </field>
+        </record>
+    </data>
+</openerp>
\ No newline at end of file