Merge lp:~openerp-dev/openobject-addons/7.0-fix-contact-company-handling into lp:openobject-addons/7.0

[Olivier Dony (Odoo)]

This branch contains the specific addons changes that are necessary to implement all parts of the solution described on bug 1160365. It depends on the changes brought by lp:~openerp-dev/openobject-server/7.0-fix-contact-company-handling in the `base` module.

More specifically it contains:
- module-specific overrides of _commercial_fields() for all modules adding accounting/invoicing-related fields to res.partner [Part B of the solution]

- corresponding changes to inherited views of res.partner form to hide these commercial fields when they are in fact "related fields" of their parent commercial entity. This mainly concerns 2 sections of the Partner form: the whole Accounting tab, and the bottom of the Sales&Purchase tabs with the pricelists and invoicing fields. These sections are replaced by a short message and a button to open the commercial entity to view/edit the fields. [Part B of the solution]

- a few fixes to properly delegate the resolution of various contact/address types to the corrected res.partner.address_get() [Part C of the solution]

- [REVERTED on 2013-04-11] a change of the domain for the `partner_id` field on invoices so that it only allows selecting commercial entities when creating invoices manually (in addition to the `supplier` or `customer` flag depending on the invoice type)

- changes to search views of the main business documents so that searching for a company name will also match its contacts [Part E of the solution]

- a fix of the _find_accounting_partner() method that the account module uses to locate the partner to which journal entries must be linked - it will now use the same semantics for "commercial entity" as what is specified on bug 1160365 [Part F of the solution]

# UPDATE 2013-04-11:

- revert the modified domain set on the partner field of Invoices - this was inconsistent with the rest of the system: it must be possible to invoice a contact everywhere

- change inherited partner form view in sale module to hide `use_parent_address` and `type` fields in all places unless advanced address management is enabled via the "Allow a different address for delivery and invoicing" option in Sales settings.

- fix issue detected by Joël Grand-Guillaume in comment #34 of bug 1160365: when invoicing after delivery, the invoicing contact/address must be used rather than the main customer. Tests updated accordingly.

- add new 7.0 module "account_report_company": this module adds an extra stored field "parent_commercial_id" on Invoices to make reporting/aggregating by partner easier in the Invoice list and in the Invoice Analysis report. This module is expected to be merged in the main account module in the next major release. The module can be installed without any risk on any existing 7.0 database.

Note: a series of important changes were done on the server branch as well, see updated description on https://code.launchpad.net/~openerp-dev/openobject-server/7.0-fix-contact-company-handling/+merge/157577

# UPDATE 2013-04-20:

- fixed unique constraints definition on some commercial fields on res.partner (l10n_ro)

- renamed fields pointing to commercial entity to `commercial_partner_id`, so the fact that it is a FK to res.partner is clearer, and the same name can be used everywhere without confusion (it was also changed on res.partner itself)

- improve group_by issues on all models by adding a new stored function field `display_name` on res.partner that contains the name_get() result in the form "ACME, John Doe" and set it as the default _order for res.partner. This ensures that group_by entries for the same company will always be next to each other on all documents: "ACME" is directly followed by "ACME, John Doe", "ACME, John Anderson", etc. This field also replaces the `name` field in the list and kanban views of Partners, so that the display order matches the display labels.

- fixed remaining search views where Partner search should have been using the "child of" operator to match contacts (Analysis views too):
 - Analytic Accounts
 - Assets
 - CRM Leads, Opportunities, Phone Calls
 - CRM Claims
 - CRM Helpdesk
 - MRP Repairs
 - Projects
 - Project Issues
 - Stock Pickings
 - Vouchers (somes search views had not been fixed yet)

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

Hi,

First thanks for that work Olivier! My comments are here : https://bugs.launchpad.net/openobject-addons/+bug/1160365/comments/34

Regards,

Joël

[Stefan Rijnhart (Opener) (stefan-opener)]

We favour the approach of having a link between business documents and both company partner (partner_id) and contact partner (contact_id), and not having to copy the financial data from company partners to its contacts. See the comments by Raphaël Valyi and others on the bug discussion thread.

review: Disapprove

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

Forbid to set it as "Need fixing", refer to this post for details:

https://bugs.launchpad.net/openobject-addons/+bug/1160365/comments/34

review: Needs Fixing (test, no code review)

[Olivier Dony (Odoo) (odo-openerp)]

Thanks everyone for the tests and feedback. The branch has just been updated with 3 main changes (see updated description):

- revert the modified domain set on the partner field of Invoices - this was inconsistent with the rest of the system: it must be possible to invoice a contact everywhere.
- fix issue detected by Joël Grand-Guillaume in comment #34 of bug 1160365: when invoicing after delivery, the invoicing contact/address must be used rather than the main customer. Tests updated accordingly.
- add new 7.0 module "account_report_company": this module adds an extra stored field "parent_commercial_id" on Invoices to make reporting/aggregating by partner easier in the Invoice list and in the Invoice Analysis report. This module is expected to be merged in the main account module in the next major release. The module can be installed without any risk on any existing 7.0 database.

Concerning the first item, please note that Fabien's explanation in comment #50 was incorrect because we want to be able to create invoices for any contact. What happens is that you can configure the contact type on your partners so that the correct "invoice contact/department" is automatically selected regardless of the contact to which you sell. But you can still manually invoice any contact and the rest of the accounting flows will still be correct (and the reporting too)

I'll try to answer other specific questions asked by people who commented on both merge proposals in further comments.

[Nhomar - Vauxoo (nhomar)]

Hello Oliver.

My comments about views and mixed modules like sales and purchase in this case the sale module brake what you make in accounting.

See the video for more info.

2 Main points here:

1.- The vie on create a contact is broken.
2.- One improve in term of the meaning of the is_company == True field by default and the Customer and Supplier menu.

http://www.youtube.com/watch?v=hjhsCPQn9xA

Regards.

review: Needs Information

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

Hi Olivier,

For what I've tested today, and from a functional point of view here, it remains one big issue (may be miss some still...) : all the group by features.

I don't know if you think about providing a new module (same feature than you did for invoice) for other objects ? At least on invoices (and accounting entries but that was already mostly ok), it works as expected.

So I suggest that you take care of the following objects as well here (as this was the default behavior in 6.1, and we agree this wouldn't have to change for the end user):

 - PO (group by "supplier" should group on commercial entity by default here)
 - SO (group by "customer" should group on commercial entity by default here)
 - Analytic Account (group by "Associated partner" should group on commercial entity here)
 - Project (IMO here, it may be interesting to have both contact and commercial_entity_id. Main reason you labeled the existing group by "contact", so having both contact and Commercial entity sounds goods here)
 - Opportunity (group by "customer" should group on commercial entity by default here)
 - Repair order (group by "partner" should group on commercial entity by default here)

Special cases:
--------------

 - Lead :

Make a lead on Agrolait, and one on Michel Fletcher (Agrolait). On the Michel one, you see:

Company Name : Michel Fletcher
Customer : Agrolait, Michel Fletcher

Group by "Customer" show 2 occurrence: one for Agrolait, one for Michel. No way to group them all in one occurrence which will be honestly asked by everyone. I would like to see a way to group by commercial entity here as well. IMO we can fulfill "Company Name" of the lead with the commercial entity and add a "group by" on it. In any case, as it was in 6.1, I want to be able to group on the commercial entity.

 - Incomming shipment and Delivery Order : no group by here by default, but making to incoming shipment for Agrolait and one on Michel Fletcher (Agrolait), I would expect I can at least search on "Agrolait" and find all picking related to them. Not finding them is really sad...

That's all for today ;)

Regards,

Joël

review: Needs Fixing (test, no code review)

[Olivier Dony (Odoo) (odo-openerp)]

On 2013-04-16, Nhomar wrote:
> 2 Main points here:
>
> 1.- The view on create a contact is broken.

Thanks for the tests and feedback!
In your video you mention 2 issues regarding contact creation. They're not bugs but they certainly deserve an explanation:

A) The fact that 'use parent address' and 'address type' fields are hidden after installing Sales

This is the expected behavior, although I agree it needs to be improved in the future. The idea is: both the "use company address" flag and the "address type" are advanced features that are not needed by all users, and are meant to be hidden by default. The "contact/address type" only makes sense in combination with multiple partner fields on Sales Orders. The "use company address" makes the address fields readonly on contacts so it is more complicated to edit addresses, and only useful when users require strict synchronization of the addresses.

In 7.0 these features are currently enabled by checking the "Allow a different address for delivery and invoicing" option in the Sales Settings (under Quotations and Sales Orders / Customer Features), which also makes the extra partner fields visible on Sales Orders. For various reasons these features are in `base` but the option to hide/show them is in the sale (actually sale_stock) module, and it was chosen to keep them visible until `sale` is installed.

So just enable this settings and you will see what you expect when editing contacts.

B) The fact that when you create the first contact for a company, the address is copied to the company.

This is done on purpose but only when the company has *no other contact* and *no address* yet. No copy will happen later or in other cases. The goal is to be able to create a new Customer with a parent Company on-the-fly while creating a Sales Order in B2B mode. When you use the "Create and Edit..." option in the Customer field of the Sales Order you are likely to type the name of the contact's company without taking the time to fill in the whole company details, and then you'll enter the company address in the contact's details. This is OK but in most cases the address you type is also a valid address for the company, you just don't take the time to fill in all details.
So in this case (new contact with address created for a new company without address) we do 2 things:
  - set "is_company" on the company record (via context defaults)
  - copy the address fields from contact to company
because that's very likely to be what the user meant.

This avoids having a new company without address and will also mean that new contacts created later for this company will receive the same address via on_change, easing the task of filling in details (remember that the "use company address" feature is advanced and not enabled by default)

> 2.- One improve in term of the meaning of the is_company == True field by
> default and the Customer and Supplier menu.

Really we can't make the "is_company" field default to True because the meaning of "is_company" is meant to be strict: when checked it really means that this partner is a company, not an individual. For B2C the value must *not* be checked on customers, so we must n...

[Nhomar - Vauxoo (nhomar)]

Oliver.

About B.

Dont you think the fact of COPY DATA brake all simple Database management rules in the world?

One of the arguments of the new model is "Avoid Data duplication and Inconsistencies".

Page 18 of the Fabiens presentation:

"We just removed redundancies in v6.1 model, e.g. on invoices:"

Do you REALLY think is different redundancy between Partner and Contacts PERFECTLY separated by a DBID than duplicate some Fields?

IMHO in any case, and I repeat, In any case data can be duplicated.

Important:

My sarcastic questions are regarding the fact you are duplicating data, no datamodel itself.

Can i offer to you a more elegant solution? and you will consider that, or you will insist at least ONE more time in duplicate fields?, I make this question my friend because i dont want waste badly my time.

About A.

I really dont understand this, in databases i shown you the hidden fields this option is already selected my friend.

But BTW....

You Install Just Accounting... Field shown.... You Installa a ore advanced module "Sales" .... Fields hidden, I think it is confusing.

Other point my friend you afirm:

=====
both the "use company address" flag and the "address type" are advanced features that are not needed by all users, and are meant to be hidden by default.
=====

At least that you use OpenERP for a .... I dont know event in a Gas Station you need say "THis is the Fiscal address for a Customer".

But the configuration is inconsistent....

Sales depends of account_voucher this of account.... then sales convert in Advanced a Basic feature of a base module :-s I am lost.

More comment comming dude.

review: Needs Information

[Nhomar - Vauxoo (nhomar)]

About A.

I just want to confirm, if we enable, use different addresses on config it works, it is IMHO just a problem with configuration order.

[Olivier Dony (Odoo) (odo-openerp)]

On 2013-04-18, Joël Grand-Guillaume wrote:
> For what I've tested today, and from a functional point of view here, it
> remains one big issue (may be miss some still...) : all the group by features.
>
> I don't know if you think about providing a new module (same feature than you
> did for invoice) for other objects ? At least on invoices (and accounting
> entries but that was already mostly ok), it works as expected.

Yes the group by issue is the main problem that remained, and we've now tried to find a way to improve the situation globally, via 2 changes:
 - the partner display name (name_get) was changed to "Company, Contact" to make the choice of the company very clear
 - this display name name is now also used as the default ordering for res.partner (when account_report_company) is installed

This is not a perfect solution but its mitigate the problem and will ensure that results are always consistent when searching/filtering/sorting by partners: the Company and its Contacts will always be physically grouped (as successive rows) everywhere:
 - in name_search results when trying to choose a partner
 - in the list/kanban views of partners
 - whenever any list of business documents is ordered by Customers/Supplier/Partner/Contact
 - in any view using "group by" res.partner (regular lists and analysis views)

Even if all fields are not directly summed/aggregated together in all cases like for invoices, at least the data will be impossible to miss, e.g:
  - Agrolait
  - Agrolait, Michel Fletcher
  - Agrolait, Thomas Passot
  - Axelor
  - Axelor, Laith Jubair
  - etc.

With this change I think the merge proposals are in a correct state to be merged in the 7.0 branch, and they represent quite an improvement in correctness and usability as compared to the current 7.0, thanks to all the feedback that was provided by everyone.

Then if we notice that this is *really* insufficient for a certain case, we may add another module similar to account_report_company. However this really needs to be experienced in practice with real users in their daily use, not simply compared with what was possible in 6.1. For example POs have very limited address management (no delivery/invoice address like SO), and partners are filtered by default on the "supplier" flag, so in practice users should not tend to use different contacts for different orders to the same supplier. For Deliveries/Shipments grouping by partner has little use as there's not much to aggregate in the list view except the row count.

> - Incomming shipment and Delivery Order : no group by here by default, but
> making to incoming shipment for Agrolait and one on Michel Fletcher
> (Agrolait), I would expect I can at least search on "Agrolait" and find all
> picking related to them. Not finding them is really sad...

For some reason the partner_id field was simply missing from the search view on Incoming Shipments and Delivery Orders, while it was in the one for Internal Moves as well as "Incoming/Outgoing Products".
This has been corrected and the proper field (with child_of operator to match contact) was added to these search views.
A number of remaining relevant search views were also fixed ...

[Nhomar - Vauxoo (nhomar)]

About This My friend.

>>>
With this change I think the merge proposals are in a correct state to be merged in the 7.0 branch, and they represent quite an improvement in correctness and usability as compared to the current 7.0, thanks to all the feedback that was provided by everyone.
>>>

Let me tell you something.

If one Vauxoo's programmer for an error of design "Copy" Data for "Useability" Reasons, I send again to University and study DataBase Management. Even Wikipedia Knows :-( http://en.wikipedia.org/wiki/Data_redundancy

The fact that your branch has been tested is not reason enought to be merged, it is not all bad, but i think we need more feedback My friend, for first time in several years with OpenERP i think well not think I am TOTALLY sure this approach is wrong.

review: Needs Fixing

=== modified file 'account/account_invoice.py'
--- account/account_invoice.py	2013-03-29 15:59:38 +0000
+++ account/account_invoice.py	2013-04-20 02:28:27 +0000
@@ -1260,9 +1260,7 @@
             ref = invoice.reference
         else:
             ref = self._convert_ref(cr, uid, invoice.number)
-        partner = invoice.partner_id
-        if partner.parent_id and not partner.is_company:
-            partner = partner.parent_id
+        partner = self.pool['res.partner']._find_accounting_partner(invoice.partner_id)
         # Pay attention to the sign for both debit/credit AND amount_currency
         l1 = {
             'debit': direction * pay_amount>0 and direction * pay_amount,
@@ -1733,15 +1731,17 @@
         'invoice_ids': fields.one2many('account.invoice.line', 'partner_id', 'Invoices', readonly=True),
     }
 
-    def _find_accounting_partner(self, part):
+    def _find_accounting_partner(self, partner):
         '''
         Find the partner for which the accounting entries will be created
         '''
+        # FIXME: after 7.0, to replace by function field partner.commercial_partner_id
+
         #if the chosen partner is not a company and has a parent company, use the parent for the journal entries
         #because you want to invoice 'Agrolait, accounting department' but the journal items are for 'Agrolait'
-        if part.parent_id and not part.is_company:
-            part = part.parent_id
-        return part
+        while not partner.is_company and partner.parent_id:
+            partner = partner.parent_id
+        return partner
 
     def copy(self, cr, uid, id, default=None, context=None):
         default = default or {}

=== modified file 'account/account_invoice_view.xml'
--- account/account_invoice_view.xml	2013-03-13 12:43:17 +0000
+++ account/account_invoice_view.xml	2013-04-20 02:28:27 +0000
@@ -320,7 +320,8 @@
                             <field string="Customer" name="partner_id"
                                 on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)"
                                 groups="base.group_user" context="{'search_default_customer':1, 'show_address': 1}"
-                                options='{"always_reload": True}'/>
+                                options='{"always_reload": True}'
+                                domain="[('customer', '=', True)]"/>
                             <field name="fiscal_position" widget="selection" />
                         </group>
                         <group>
@@ -447,14 +448,14 @@
             <field name="model">account.invoice</field>
             <field name="arch" type="xml">
                 <search string="Search Invoice">
-                    <field name="number" string="Invoice" filter_domain="['|','|','|', ('number','ilike',self), ('origin','ilike',self), ('supplier_invoice_number', 'ilike', self), ('partner_id', 'ilike', self)]"/>
+                    <field name="number" string="Invoice" filter_domain="['|','|','|', ('number','ilike',self), ('origin','ilike',self), ('supplier_invoice_number', 'ilike', self), ('partner_id', 'child_of', self)]"/>
                     <filter name="draft" string="Draft" domain="[('state','=','draft')]" help="Draft Invoices"/>
                     <filter name="proforma" string="Proforma" domain="[('state','=','proforma2')]" help="Proforma Invoices" groups="account.group_proforma_invoices"/>
                     <filter name="invoices" string="Invoices" domain="[('state','not in',['draft','cancel'])]" help="Proforma/Open/Paid Invoices"/>
                     <filter name="unpaid" string="Unpaid" domain="[('state','=','open')]" help="Unpaid Invoices"/>
                     <separator/>
                     <filter domain="[('user_id','=',uid)]" help="My Invoices" icon="terp-personal"/>
-                    <field name="partner_id"/>
+                    <field name="partner_id" filter_domain="[('partner_id', 'child_of', self)]"/>
                     <field name="user_id" string="Salesperson"/>
                     <field name="period_id" string="Period"/>
                     <group expand="0" string="Group By...">

=== modified file 'account/partner.py'
--- account/partner.py	2013-03-20 13:50:52 +0000
+++ account/partner.py	2013-04-20 02:28:27 +0000
@@ -236,6 +236,11 @@
         'last_reconciliation_date': fields.datetime('Latest Full Reconciliation Date', help='Date on which the partner accounting entries were fully reconciled last time. It differs from the last date where a reconciliation has been made for this partner, as here we depict the fact that nothing more was to be reconciled at this date. This can be achieved in 2 different ways: either the last unreconciled debit/credit entry of this partner was reconciled, either the user pressed the button "Nothing more to reconcile" during the manual reconciliation process.')
     }
 
+    def _commercial_fields(self, cr, uid, context=None):
+        return super(res_partner, self)._commercial_fields(cr, uid, context=context) + \
+            ['debit_limit', 'property_account_payable', 'property_account_receivable', 'property_account_position',
+             'property_payment_term', 'property_supplier_payment_term', 'last_reconciliation_date']
+
 res_partner()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'account/partner_view.xml'
--- account/partner_view.xml	2013-02-25 14:10:14 +0000
+++ account/partner_view.xml	2013-04-20 02:28:27 +0000
@@ -73,7 +73,7 @@
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
                 <page string="History" position="before" version="7.0">
-                <page string="Accounting" col="4">
+                <page string="Accounting" col="4" name="accounting" attrs="{'invisible': [('is_company','=',False),('parent_id','!=',False)]}">
                     <group>
                         <group>
                             <field name="property_account_position" widget="selection"/>
@@ -103,6 +103,11 @@
                         </tree>
                     </field>
                 </page>
+                <page string="Accounting" name="accounting_disabled" attrs="{'invisible': ['|',('is_company','=',True),('parent_id','=',False)]}">
+                    <div>
+                        <p>Accounting-related settings are managed on <button name="open_commercial_entity" type="object" string="the parent company" class="oe_link"/></p>
+                    </div>
+                </page>
                 </page>
             </field>
         </record>

=== modified file 'account/project/project_view.xml'
--- account/project/project_view.xml	2013-03-12 12:33:21 +0000
+++ account/project/project_view.xml	2013-04-20 02:28:27 +0000
@@ -31,7 +31,7 @@
                 <search string="Analytic Account">
                     <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Analytic Account"/>
                     <field name="date"/>
-                    <field name="partner_id"/>
+                    <field name="partner_id" filter_domain="[('partner_id','child_of',self)]"/>
                     <field name="manager_id"/>
                     <field name="parent_id"/>
                     <field name="user_id"/>

=== modified file 'account_analytic_analysis/account_analytic_analysis_view.xml'
--- account_analytic_analysis/account_analytic_analysis_view.xml	2013-03-14 16:13:27 +0000
+++ account_analytic_analysis/account_analytic_analysis_view.xml	2013-04-20 02:28:27 +0000
@@ -186,7 +186,7 @@
                 <search string="Contracts">
                     <field name="name" filter_domain="['|', ('name','ilike',self),('code','ilike',self)]" string="Contract"/>
                     <field name="date"/>
-                    <field name="partner_id"/>
+                    <field name="partner_id" filter_domain="[('partner_id','child_of',self)]"/>
                     <field name="manager_id"/>
                     <field name="parent_id"/>
                     <filter name="open" string="In Progress" domain="[('state','in',('open','draft'))]" help="Contracts in progress (open, draft)"/>

=== modified file 'account_asset/account_asset_view.xml'
--- account_asset/account_asset_view.xml	2012-12-08 10:33:38 +0000
+++ account_asset/account_asset_view.xml	2013-04-20 02:28:27 +0000
@@ -223,7 +223,7 @@
                 <filter icon="terp-check" string="Current" domain="[('state','in', ('draft','open'))]" help="Assets in draft and open states"/>
                 <filter icon="terp-dialog-close" string="Closed" domain="[('state','=', 'close')]" help="Assets in closed state"/>
                 <field name="category_id"/>
-                <field name="partner_id"/>
+                <field name="partner_id" filter_domain="[('partner_id','child_of',self)]"/>
             </search>
         </field>
     </record>

=== modified file 'account_asset/report/account_asset_report_view.xml'
--- account_asset/report/account_asset_report_view.xml	2012-11-29 22:26:45 +0000
+++ account_asset/report/account_asset_report_view.xml	2013-04-20 02:28:27 +0000
@@ -49,7 +49,7 @@
                 <field name="asset_id"/>
                 <field name="asset_category_id"/>
                 <group expand="0" string="Extended Filters...">
-                    <field name="partner_id"/>
+                    <field name="partner_id" filter_domain="[('partner_id','child_of',self)]"/>
                     <field name="company_id" groups="base.group_multi_company"/>
                 </group>
                 <group expand="1" string="Group By...">

=== added directory 'account_report_company'
=== added file 'account_report_company/__init__.py'
--- account_report_company/__init__.py	1970-01-01 00:00:00 +0000
+++ account_report_company/__init__.py	2013-04-20 02:28:27 +0000
@@ -0,0 +1,25 @@
+# -*- 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 account_report_company
+import report
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'account_report_company/__openerp__.py'
--- account_report_company/__openerp__.py	1970-01-01 00:00:00 +0000
+++ account_report_company/__openerp__.py	2013-04-20 02:28:27 +0000
@@ -0,0 +1,57 @@
+# -*- 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': 'Invoice Analysis per Company',
+    'version': '1.0',
+    'category': 'Accounting & Finance',
+    'description': """
+Add an extra Company dimension on Invoices for consolidated Invoice Analysis
+============================================================================
+
+By default Customer and Supplier invoices can be linked to a contact within
+a company, but the company is not a direct reference in the database structure for
+invoices. Journal Entries are however always linked to the company and not to
+contacts, so that Accounts Payable and Receivable are always correct and consolidated
+at company level.
+
+When many different contacts/departments need to be invoiced within the same parent company,
+this can make reporting by Company more difficult: reports are directly based on the
+database structure and would not provide an aggregated company dimension.
+
+This modules solves the problem by adding an explicit company reference on invoices,
+automatically computed from the invoice contact, and use this new dimension
+when grouping the list of Invoices or the Invoice Analysis report by Partner. 
+
+Note: this module will likely be removed for the next major OpenERP version and
+directly integrated in the core accounting. 
+""",
+    'author': 'OpenERP SA',
+    'website': 'http://www.openerp.com',
+    'depends': ['account'],
+    'data': [
+        'account_invoice_view.xml',
+        'res_partner_view.xml',
+        'report/account_invoice_report_view.xml',
+    ],
+    'auto_install': True,
+}
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'account_report_company/account_invoice_view.xml'
--- account_report_company/account_invoice_view.xml	1970-01-01 00:00:00 +0000
+++ account_report_company/account_invoice_view.xml	2013-04-20 02:28:27 +0000
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+        <record model="ir.ui.view" id="account_report_company_tree_view">
+            <field name="model">account.invoice</field>
+            <field name="inherit_id" ref="account.invoice_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="account_report_company_search_view">
+            <field name="model">account.invoice</field>
+            <field name="inherit_id" ref="account.view_account_invoice_filter"/>
+            <field name="arch" type="xml">
+                <filter string="Partner" position="replace">
+                    <filter name="commercial_partner_id" string="Partner" domain="[]" context="{'group_by':'commercial_partner_id'}"/>
+                </filter>
+            </field>
+        </record>
+    </data>
+</openerp>
\ No newline at end of file

=== added file 'account_report_company/account_report_company.py'
--- account_report_company/account_report_company.py	1970-01-01 00:00:00 +0000
+++ account_report_company/account_report_company.py	2013-04-20 02:28:27 +0000
@@ -0,0 +1,51 @@
+# -*- 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 res_partner(osv.Model):
+    _inherit = 'res.partner'
+    _order = 'display_name'
+
+    def _display_name_compute(self, cr, uid, ids, name, args, context=None):
+        return dict(self.name_get(cr, uid, ids, context=context))
+
+    _display_name_store_triggers = {
+        'res.partner': (lambda self,cr,uid,ids,context=None: self.search(cr, uid, [('id','child_of',ids)]),
+                        ['parent_id', 'is_company'], 10)
+    }
+
+    # indirection to avoid passing a copy of the overridable method when declaring the function field
+    _display_name = lambda self, *args, **kwargs: self._display_name_compute(*args, **kwargs)
+
+    _columns = {
+        # extra field to allow ORDER BY to match visible names
+        'display_name': fields.function(_display_name, type='char', string='Name', store=_display_name_store_triggers),
+    }
+
+class account_invoice(osv.Model):
+    _inherit = 'account.invoice'
+
+    _columns = {
+        'commercial_partner_id': fields.related('partner_id', 'commercial_partner_id', string='Commercial Entity', type='many2one',
+                                                relation='res.partner', store=True, readonly=True,
+                                                help="The commercial entity that will be used on Journal Entries for this invoice")
+    }

=== added directory 'account_report_company/report'
=== added file 'account_report_company/report/__init__.py'
--- account_report_company/report/__init__.py	1970-01-01 00:00:00 +0000
+++ account_report_company/report/__init__.py	2013-04-20 02:28:27 +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 account_invoice_report
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'account_report_company/report/account_invoice_report.py'
--- account_report_company/report/account_invoice_report.py	1970-01-01 00:00:00 +0000
+++ account_report_company/report/account_invoice_report.py	2013-04-20 02:28:27 +0000
@@ -0,0 +1,36 @@
+# -*- 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/>.
+#
+##############################################################################
+from openerp.osv import osv, fields
+
+class account_invoice_report(osv.Model):
+    _inherit = 'account.invoice.report'
+    _columns = {
+        'commercial_partner_id': fields.many2one('res.partner', 'Partner Company', help="Commercial Entity"),
+    }
+
+    def _select(self):
+        return  super(account_invoice_report, self)._select() + ", sub.commercial_partner_id as commercial_partner_id"
+
+    def _sub_select(self):
+        return  super(account_invoice_report, self)._sub_select() + ", ai.commercial_partner_id as commercial_partner_id"
+
+    def _group_by(self):
+        return super(account_invoice_report, self)._group_by() + ", ai.commercial_partner_id"

=== added file 'account_report_company/report/account_invoice_report_view.xml'
--- account_report_company/report/account_invoice_report_view.xml	1970-01-01 00:00:00 +0000
+++ account_report_company/report/account_invoice_report_view.xml	2013-04-20 02:28:27 +0000
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+        <record model="ir.ui.view" id="account_report_company_invoice_report_tree_view">
+            <field name="model">account.invoice.report</field>
+            <field name="inherit_id" ref="account.view_account_invoice_report_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="account_report_company_invoice_report_search_view">
+            <field name="model">account.invoice.report</field>
+            <field name="inherit_id" ref="account.view_account_invoice_report_search"/>
+            <field name="arch" type="xml">
+                <filter name="partner" position="replace">
+                    <filter string="Partner" name="commercial_partner_id" context="{'group_by':'commercial_partner_id','residual_visible':True}"/>
+                </filter>
+            </field>
+        </record>
+    </data>
+</openerp>
\ No newline at end of file

=== added file 'account_report_company/res_partner_view.xml'
--- account_report_company/res_partner_view.xml	1970-01-01 00:00:00 +0000
+++ account_report_company/res_partner_view.xml	2013-04-20 02:28:27 +0000
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+        <record model="ir.ui.view" id="account_report_copmany_partner_tree_view">
+            <field name="model">res.partner</field>
+            <field name="inherit_id" ref="base.view_partner_tree"/>
+            <field name="arch" type="xml">
+                <field name="name" position="replace">
+                    <field name="display_name"/>
+                </field>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="account_report_copmany_partner_kanban_view">
+            <field name="model">res.partner</field>
+            <field name="inherit_id" ref="base.res_partner_kanban_view"/>
+            <field name="arch" type="xml">
+                <xpath expr="//templates//field[@name='name']" position="replace">
+                    <field name="display_name"/>
+                </xpath>
+            </field>
+        </record>
+    </data>
+</openerp>
\ No newline at end of file

=== modified file 'account_voucher/account_voucher_view.xml'
--- account_voucher/account_voucher_view.xml	2013-02-25 13:38:04 +0000
+++ account_voucher/account_voucher_view.xml	2013-04-20 02:28:27 +0000
@@ -129,7 +129,7 @@
                     <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
                     <separator/>
                     <filter icon="terp-gtk-jump-to-ltr" string="To Review" domain="[('state','=','posted'), ('audit','=',False)]" help="To Review"/>
-                    <field name="partner_id"/>
+                    <field name="partner_id" filter_domain="[('partner_id', 'child_of', self)]"/>
                     <field name="journal_id" context="{'journal_id': self, 'set_visible':False}" />
                     <field name="period_id"/>
                     <group expand="0" string="Group By...">

=== modified file 'account_voucher/voucher_payment_receipt_view.xml'
--- account_voucher/voucher_payment_receipt_view.xml	2013-02-25 13:38:04 +0000
+++ account_voucher/voucher_payment_receipt_view.xml	2013-04-20 02:28:27 +0000
@@ -11,7 +11,7 @@
                     <field name="date"/>
                     <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
                     <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
-                    <field name="partner_id" string="Customer"/>
+                    <field name="partner_id" string="Customer" filter_domain="[('partner_id','child_of',self)]"/>
                     <field name="journal_id" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('bank','cash'))]"/>
                     <field name="period_id"/>
                     <group expand="0" string="Group By...">
@@ -34,7 +34,7 @@
                     <field name="date"/>
                     <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
                     <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
-                    <field name="partner_id" string="Supplier"/>
+                    <field name="partner_id" string="Supplier" filter_domain="[('partner_id','child_of',self)]"/>
                     <field name="journal_id" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('bank','cash'))]"/>
                     <field name="period_id"/>
                     <group expand="0" string="Group By...">

=== modified file 'account_voucher/voucher_sales_purchase_view.xml'
--- account_voucher/voucher_sales_purchase_view.xml	2013-02-25 14:20:35 +0000
+++ account_voucher/voucher_sales_purchase_view.xml	2013-04-20 02:28:27 +0000
@@ -10,7 +10,7 @@
                     <field name="date"/>
                     <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
                     <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
-                    <field name="partner_id" string="Supplier"/>
+                    <field name="partner_id" string="Supplier" filter_domain="[('partner_id','child_of',self)]"/>
                     <field name="journal_id" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('purchase','purchase_refund'))]"/>
                     <field name="period_id"/>
                     <group expand="0" string="Group By...">
@@ -32,7 +32,7 @@
                     <field name="date"/>
                     <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
                     <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
-                    <field name="partner_id" string="Customer"/>
+                    <field name="partner_id" string="Customer" filter_domain="[('partner_id','child_of',self)]"/>
                     <field name="journal_id" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('sale','sale_refund'))]"/>
                     <field name="period_id"/>
                     <group expand="0" string="Group By...">

=== modified file 'base_vat/base_vat.py'
--- base_vat/base_vat.py	2012-12-18 17:55:47 +0000
+++ base_vat/base_vat.py	2013-04-20 02:28:27 +0000
@@ -134,6 +134,9 @@
         'vat_subjected': fields.boolean('VAT Legal Statement', help="Check this box if the partner is subjected to the VAT. It will be used for the VAT legal statement.")
     }
 
+    def _commercial_fields(self, cr, uid, context=None):
+        return super(res_partner, self)._commercial_fields(cr, uid, context=context) + ['vat_subjected']
+
     def _construct_constraint_msg(self, cr, uid, ids, context=None):
         def default_vat_check(cn, vn):
             # by default, a VAT number is valid if:

=== modified file 'crm/crm_lead_view.xml'
--- crm/crm_lead_view.xml	2013-04-11 12:33:56 +0000
+++ crm/crm_lead_view.xml	2013-04-20 02:28:27 +0000
@@ -328,7 +328,7 @@
                     <field name="categ_ids" string="Category" filter_domain="[('categ_ids','ilike',self)]"/>
                     <field name="section_id" context="{'invisible_section': False, 'default_section_id': self}"/>
                     <field name="user_id"/>
-                    <field name="partner_id"/>
+                    <field name="partner_id" filter_domain="[('partner_id','child_of',self)]"/>
                     <field name="create_date"/>
                     <field name="country_id" context="{'invisible_country': False}"/>
                     <separator/>
@@ -546,7 +546,7 @@
                     <field name="categ_ids" string="Category" filter_domain="[('categ_ids','ilike', self)]"/>
                     <field name="section_id" context="{'invisible_section': False, 'default_section_id': self}"/>
                     <field name="user_id"/>
-                    <field name="partner_id"/>
+                    <field name="partner_id" filter_domain="[('partner_id','child_of',self)]"/>
                     <separator/>
                     <filter string="New" name="new" domain="[('state','=','draft')]" help="New Opportunities"/>
                     <filter string="In Progress" name="open" domain="[('state','=','open')]" help="Open Opportunities"/>

=== modified file 'crm/crm_phonecall_view.xml'
--- crm/crm_phonecall_view.xml	2013-03-04 18:44:31 +0000
+++ crm/crm_phonecall_view.xml	2013-04-20 02:28:27 +0000
@@ -185,7 +185,7 @@
                <separator/>
                <filter string="Phone Calls Assigned to Me or My Team(s)" icon="terp-personal+" domain="['|', ('section_id.user_id','=',uid), ('user_id', '=', uid)]"
                        help="Phone Calls Assigned to the current user or with a team having the current user as team leader"/>
-               <field name="partner_id"/>
+               <field name="partner_id" filter_domain="[('partner_id','child_of',self)]"/>
                <field name="user_id"/>
                <field name="section_id" string="Sales Team"/>
                <group expand="0" string="Group By...">

=== modified file 'crm/report/crm_lead_report_view.xml'
--- crm/report/crm_lead_report_view.xml	2012-11-29 22:26:45 +0000
+++ crm/report/crm_lead_report_view.xml	2013-04-20 02:28:27 +0000
@@ -80,7 +80,7 @@
                     <field name="section_id" context="{'invisible_section': False}"/>
                     <field name="user_id" string="Salesperson"/>
                     <group expand="0" string="Extended Filters...">
-                        <field name="partner_id"/>
+                        <field name="partner_id" filter_domain="[('partner_id','child_of',self)]"/>
                         <field name="stage_id" domain="[('section_ids', '=', 'section_id')]" />
                         <field name="type_id"/>
                         <field name="channel_id"/>

=== modified file 'crm/report/crm_phonecall_report_view.xml'
--- crm/report/crm_phonecall_report_view.xml	2012-11-29 22:26:45 +0000
+++ crm/report/crm_phonecall_report_view.xml	2013-04-20 02:28:27 +0000
@@ -62,7 +62,7 @@
                     <field name="section_id" string="Sales Team" context="{'invisible_section': False}"/>
                     <field name="user_id" string="Salesperson"/>
                     <group expand="0" string="Extended Filters...">
-                        <field name="partner_id"/>
+                        <field name="partner_id" filter_domain="[('partner_id','child_of',self)]"/>
                         <field name="company_id" groups="base.group_multi_company"/>
                         <field name="creation_date"/>
                         <field name="opening_date"/>

=== modified file 'crm_claim/crm_claim_view.xml'
--- crm_claim/crm_claim_view.xml	2013-03-04 12:55:34 +0000
+++ crm_claim/crm_claim_view.xml	2013-04-20 02:28:27 +0000
@@ -201,7 +201,7 @@
                     <filter icon="terp-gtk-media-pause" string="Pending" domain="[('state','=','pending')]"/>
                     <separator/>
                     <filter string="Unassigned Claims" icon="terp-personal-" domain="[('user_id','=', False)]" help="Unassigned Claims" />
-                    <field name="partner_id"/>
+                    <field name="partner_id" filter_domain="[('partner_id','child_of',self)]"/>
                     <field name="user_id"/>
                     <group expand="0" string="Group By...">
                         <filter string="Partner" icon="terp-partner" domain="[]" help="Partner" context="{'group_by':'partner_id'}"/>

=== modified file 'crm_claim/report/crm_claim_report_view.xml'
--- crm_claim/report/crm_claim_report_view.xml	2012-11-29 22:26:45 +0000
+++ crm_claim/report/crm_claim_report_view.xml	2013-04-20 02:28:27 +0000
@@ -63,7 +63,7 @@
                     <field name="user_id" string="Salesperson"/>
                     <field name="section_id" string="Sales Team" context="{'invisible_section': False}"/>
                     <group  expand="0" string="Extended Filters...">
-                        <field name="partner_id"/>
+                        <field name="partner_id" filter_domain="[('partner_id','child_of',self)]"/>
                         <field name="stage_id" domain="[('section_ids', '=', 'section_id')]"/>
                         <field name="categ_id" domain="[('object_id.model', '=', 'crm.claim')]"/>
                         <field name="priority"/>

=== modified file 'crm_helpdesk/crm_helpdesk_view.xml'
--- crm_helpdesk/crm_helpdesk_view.xml	2013-03-04 18:44:31 +0000
+++ crm_helpdesk/crm_helpdesk_view.xml	2013-04-20 02:28:27 +0000
@@ -152,7 +152,7 @@
                     <separator/>
                     <filter string="Assigned to Me or My Sales Team(s)" icon="terp-personal+" domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
                             help="Helpdesk requests that are assigned to me or to one of the sale teams I manage" />
-                    <field name="partner_id" />
+                    <field name="partner_id" filter_domain="[('partner_id','child_of',self)]"/>
                     <field name="user_id"/>
                     <field name="section_id" string="Sales Team"/>
                     <group expand="0" string="Group By...">

=== modified file 'crm_helpdesk/report/crm_helpdesk_report_view.xml'
--- crm_helpdesk/report/crm_helpdesk_report_view.xml	2012-11-29 22:26:45 +0000
+++ crm_helpdesk/report/crm_helpdesk_report_view.xml	2013-04-20 02:28:27 +0000
@@ -62,6 +62,7 @@
                     <field name="user_id" string="Salesperson"/>
                     <field name="section_id" string="Sales Team" context="{'invisible_section': False}"/>   
                     <field name="company_id" groups="base.group_multi_company"/>
+                    <field name="partner_id" filter_domain="[('partner_id','child_of',self)]"/>
                     <group expand="0" string="Extended Filters..."  groups="base.group_no_one">
                         <field name="priority" string="Priority"/>
                         <field name="categ_id"/>

=== modified file 'l10n_be_invoice_bba/partner.py'
--- l10n_be_invoice_bba/partner.py	2012-12-06 14:56:32 +0000
+++ l10n_be_invoice_bba/partner.py	2013-04-20 02:28:27 +0000
@@ -44,6 +44,11 @@
             help='Select Algorithm to generate the Structured Communication on Outgoing Invoices.' ),
     }
 
+    def _commercial_fields(self, cr, uid, context=None):
+        return super(res_partner, self)._commercial_fields(cr, uid, context=context) + \
+            ['out_inv_comm_type', 'out_inv_comm_algorithm']
+
+
     _default = {
         'out_inv_comm_type': 'none',
     }

=== modified file 'l10n_ro/res_partner.py'
--- l10n_ro/res_partner.py	2012-12-19 14:11:55 +0000
+++ l10n_ro/res_partner.py	2013-04-20 02:28:27 +0000
@@ -28,10 +28,33 @@
     _columns = {
         'nrc' : fields.char('NRC', size=16, help='Registration number at the Registry of Commerce'),
     }
+
+    # The SQL constraints are no-ops but present only to display the right error message to the
+    # user when the partial unique indexes defined below raise errors/  
+    # The real constraints need to be implemented with PARTIAL UNIQUE INDEXES (see auto_init),
+    # due to the way accounting data is delegated by contacts to their companies in OpenERP 7.0.
     _sql_constraints = [
-       ('vat_uniq', 'unique (vat)', 'The vat of the partner must be unique !'),
-       ('nrc_uniq', 'unique (nrc)', 'The code of the partner must be unique !')
+       ('vat_uniq', 'unique (id)', 'The vat of the partner must be unique !'),
+       ('nrc_uniq', 'unique (id)', 'The code of the partner must be unique !')
     ]
+
+    def _auto_init(self, cr, context=None):
+        result = super(res_partner, self)._auto_init(cr, context=context)
+        # Real implementation of the vat/nrc constraints: only "commercial entities" need to have
+        # unique numbers, and the condition for being a commercial entity is "is_company or parent_id IS NULL".
+        # Contacts inside a company automatically have a copy of the company's commercial fields
+        # (see _commercial_fields()), so they are automatically consistent.
+        cr.execute("""
+            DROP INDEX IF EXISTS res_partner_vat_uniq_for_companies;
+            DROP INDEX IF EXISTS res_partner_nrc_uniq_for_companies;
+            CREATE UNIQUE INDEX res_partner_vat_uniq_for_companies ON res_partner (vat) WHERE is_company OR parent_id IS NULL;
+            CREATE UNIQUE INDEX res_partner_nrc_uniq_for_companies ON res_partner (nrc) WHERE is_company OR parent_id IS NULL;
+        """)
+        return result
+
+    def _commercial_fields(self, cr, uid, context=None):
+        return super(res_partner, self)._commercial_fields(cr, uid, context=context) + ['nrc']
+
 res_partner()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'mrp_repair/mrp_repair_view.xml'
--- mrp_repair/mrp_repair_view.xml	2012-12-15 16:31:01 +0000
+++ mrp_repair/mrp_repair_view.xml	2013-04-20 02:28:27 +0000
@@ -210,7 +210,7 @@
                   <separator/>
                   <filter icon="terp-dolar" string="Invoiced" domain="[('invoiced','=',True)]"/>
                   <field name="product_id"/>
-                  <field name="partner_id"/>
+                  <field name="partner_id" filter_domain="[('partner_id', 'child_of', self)]"/>
                   <group expand="0" string="Group By...">
                       <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
                       <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>

=== modified file 'product/partner.py'
--- product/partner.py	2012-12-06 14:56:32 +0000
+++ product/partner.py	2013-04-20 02:28:27 +0000
@@ -36,6 +36,9 @@
             help="This pricelist will be used, instead of the default one, for sales to the current partner"),
     }
 
+    def _commercial_fields(self, cr, uid, context=None):
+        return super(res_partner, self)._commercial_fields(cr, uid, context=context) + ['property_product_pricelist']
+
 res_partner()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'product/partner_view.xml'
--- product/partner_view.xml	2012-11-29 22:26:45 +0000
+++ product/partner_view.xml	2013-04-20 02:28:27 +0000
@@ -8,9 +8,12 @@
             <field name="arch" type="xml">
                 <page string="Sales &amp; Purchases" position="inside">
                     <group>
-                        <group name="pricelists" groups="product.group_sale_pricelist">
+                        <group name="pricelists" groups="product.group_sale_pricelist" attrs="{'invisible': [('is_company','=',False),('parent_id','!=',False)]}">
                             <field name="property_product_pricelist"/>
                         </group>
+                        <div name="parent_pricelists" groups="product.group_sale_pricelist" attrs="{'invisible': ['|',('is_company','=',True),('parent_id','=',False)]}">
+                            <p>Pricelists are managed on <button name="open_commercial_entity" type="object" string="the parent company" class="oe_link"/></p>
+                        </div>
                     </group>
                 </page>
             </field>

=== modified file 'project/project_view.xml'
--- project/project_view.xml	2013-03-04 18:44:31 +0000
+++ project/project_view.xml	2013-04-20 02:28:27 +0000
@@ -182,7 +182,7 @@
                     <separator/>
                     <filter string="Project(s) Manager" domain="[('user_id','=',uid)]" help="Projects in which I am a manager" icon="terp-personal"/>
                     <field name="user_id" string="Project Manager"/>
-                    <field name="partner_id" string="Contact"/>
+                    <field name="partner_id" string="Contact" filter_domain="[('partner_id', 'child_of', self)]"/>
                     <group expand="0" string="Group By...">
                         <filter string="Manager" name="Manager" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                         <filter string="Contact" name="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>

=== modified file 'project/report/project_report_view.xml'
--- project/report/project_report_view.xml	2012-11-29 22:26:45 +0000
+++ project/report/project_report_view.xml	2013-04-20 02:28:27 +0000
@@ -69,7 +69,7 @@
                     <filter icon="terp-personal-" string="Non Assigned Tasks to users" help="Non Assigned Tasks to users" domain="[('user_id','=',False)]"/>
                     <field name="project_id"/>
                     <field name="user_id"/>
-                    <field name="partner_id" />
+                    <field name="partner_id" filter_domain="[('partner_id', 'child_of', self)]"/>
                     <group expand="0" string="Extended Filters...">
                         <field name="priority"/>
                         <field name="company_id" groups="base.group_multi_company"/>

=== modified file 'project_issue/project_issue_view.xml'
--- project_issue/project_issue_view.xml	2013-02-26 15:16:04 +0000
+++ project_issue/project_issue_view.xml	2013-04-20 02:28:27 +0000
@@ -139,7 +139,7 @@
             <field name="model">project.issue</field>
             <field name="arch" type="xml">
                 <search string="Issue Tracker Search">
-                    <field name="name" string="Issue" filter_domain="['|', '|',('partner_id','ilike',self),('email_from','ilike',self),('name','ilike',self)]"/>
+                    <field name="name" string="Issue" filter_domain="['|', '|',('partner_id','child_of',self),('email_from','ilike',self),('name','ilike',self)]"/>
                     <field name="id"/>
                     <filter icon="terp-mail-message-new" string="Unread Messages" name="message_unread" domain="[('message_unread','=',True)]"/>
                     <separator/>
@@ -150,6 +150,7 @@
                     <field name="user_id"/>
                     <field name="project_id"/>
                     <field name="categ_ids"/>
+                    <field name="partner_id" filter_domain="[('partner_id', 'child_of', self)]"/>
                     <group expand="0" string="Group By..." >
                         <filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                         <filter string="Contact" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>

=== modified file 'project_issue/report/project_issue_report_view.xml'
--- project_issue/report/project_issue_report_view.xml	2012-11-29 22:26:45 +0000
+++ project_issue/report/project_issue_report_view.xml	2013-04-20 02:28:27 +0000
@@ -55,7 +55,7 @@
                     <filter icon="terp-dialog-close" string="Done" domain="[('state','=','done')]"/>
                     <field name="project_id"/>
                     <field name="user_id"/>
-                    <field name="partner_id"/>
+                    <field name="partner_id" filter_domain="[('partner_id', 'child_of', self)]"/>
                     <field name="version_id"/>
                     <group  expand="1" string="Group By...">
                         <filter string="Assigned to" name="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" />

=== modified file 'purchase/partner.py'
--- purchase/partner.py	2012-12-06 14:56:32 +0000
+++ purchase/partner.py	2013-04-20 02:28:27 +0000
@@ -43,6 +43,9 @@
 
         super(res_partner, self).copy(cr, uid, id, default=default, context=context)
 
+    def _commercial_fields(self, cr, uid, context=None):
+        return super(res_partner, self)._commercial_fields(cr, uid, context=context) + ['property_product_pricelist_purchase']
+
     _columns = {
         'property_product_pricelist_purchase': fields.property(
           'product.pricelist',

=== modified file 'purchase/purchase_view.xml'
--- purchase/purchase_view.xml	2013-04-17 10:00:49 +0000
+++ purchase/purchase_view.xml	2013-04-20 02:28:27 +0000
@@ -270,7 +270,7 @@
                     <filter icon="terp-emblem-important" name="exception" string="Exception" domain="[('state','in',('except_invoice','except_picking'))]" help="Purchase order which are in the exception state"/>
                     <separator/>
                     <filter icon="terp-gtk-go-back-rtl" name="not_invoiced" string="Not Invoiced" domain="[('invoice_ids','=', False)]" help="Purchase orders that include lines not invoiced."/>
-                    <field name="partner_id"/>
+                    <field name="partner_id" filter_domain="[('partner_id', 'child_of', self)]"/>
                     <field name="product_id"/>
                     <field name="create_uid"/>
                     <group expand="0" string="Group By...">
@@ -297,7 +297,7 @@
                     <filter icon="terp-emblem-important" name="exception" string="Exception" domain="[('state','in',('except_invoice','except_picking'))]" help="Purchase orders which are in exception state"/>
                     <separator/>
                     <filter icon="terp-gtk-go-back-rtl" name="not_invoiced" string="Not Invoiced" domain="[('invoice_ids','=', False)]" help="Purchase orders that include lines not invoiced."/>
-                    <field name="partner_id"/>
+                    <field name="partner_id" filter_domain="[('partner_id', 'child_of', self)]"/>
                     <field name="product_id"/>
                     <field name="create_uid"/>
                     <group expand="0" string="Group By...">
@@ -481,7 +481,7 @@
                 <search string="Search Purchase Order">
                     <field name="order_id"/>
                     <field name="product_id"/>
-                    <field name="partner_id" string="Supplier"/>
+                    <field name="partner_id" string="Supplier" filter_domain="[('partner_id', 'child_of', self)]"/>
                     <group expand="0" string="Group By...">
                         <filter string="Supplier" icon="terp-partner" domain="[]" context="{'group_by' : 'partner_id'}" />
                         <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by' : 'product_id'}" />

=== modified file 'sale/res_partner_view.xml'
--- sale/res_partner_view.xml	2012-12-20 11:43:56 +0000
+++ sale/res_partner_view.xml	2013-04-20 02:28:27 +0000
@@ -63,14 +63,34 @@
             <field name="arch" type="xml">
                 <xpath expr="//label[@for='type']" position="attributes">
                     <attribute name="groups">sale.group_delivery_invoice_address</attribute>
-                </xpath>
-                <xpath expr="//label[@for='type']" position="attributes">
-                    <attribute name="invisible">False</attribute>
-                </xpath>
-                <xpath expr="//div[@name='div_type']" position="attributes">
-                    <attribute name="invisible">False</attribute>
-                </xpath>
-                <xpath expr="//div[@name='div_type']" position="attributes">
+                    <attribute name="invisible">False</attribute>
+                </xpath>
+                <xpath expr="//div[@name='div_type']" position="attributes">
+                    <attribute name="invisible">False</attribute>
+                    <attribute name="groups">sale.group_delivery_invoice_address</attribute>
+                </xpath>
+                <xpath expr="//field[@name='use_parent_address']" position="attributes">
+                    <attribute name="invisible">False</attribute>
+                    <attribute name="groups">sale.group_delivery_invoice_address</attribute>
+                </xpath>
+                <xpath expr="//label[@for='use_parent_address']" position="attributes">
+                    <attribute name="invisible">False</attribute>
+                    <attribute name="groups">sale.group_delivery_invoice_address</attribute>
+                </xpath>
+                <xpath expr="//field[@name='child_ids']//field[@name='use_parent_address']" position="attributes">
+                    <attribute name="invisible">False</attribute>
+                    <attribute name="groups">sale.group_delivery_invoice_address</attribute>
+                </xpath>
+                <xpath expr="//field[@name='child_ids']//label[@for='use_parent_address']" position="attributes">
+                    <attribute name="invisible">False</attribute>
+                    <attribute name="groups">sale.group_delivery_invoice_address</attribute>
+                </xpath>
+                <xpath expr="//field[@name='child_ids']//div[@name='div_type']" position="attributes">
+                    <attribute name="invisible">False</attribute>
+                    <attribute name="groups">sale.group_delivery_invoice_address</attribute>
+                </xpath>
+                <xpath expr="//field[@name='child_ids']//label[@for='type']" position="attributes">
+                    <attribute name="invisible">False</attribute>
                     <attribute name="groups">sale.group_delivery_invoice_address</attribute>
                 </xpath>
             </field>

=== modified file 'sale/sale.py'
--- sale/sale.py	2013-04-18 16:36:16 +0000
+++ sale/sale.py	2013-04-20 02:28:27 +0000
@@ -314,10 +314,6 @@
             return {'value': {'partner_invoice_id': False, 'partner_shipping_id': False,  'payment_term': False, 'fiscal_position': False}}
 
         part = self.pool.get('res.partner').browse(cr, uid, part, context=context)
-        #if the chosen partner is not a company and has a parent company, use the parent to choose the delivery, the 
-        #invoicing addresses and all the fields related to the partner.
-        if part.parent_id and not part.is_company:
-            part = part.parent_id
         addr = self.pool.get('res.partner').address_get(cr, uid, [part.id], ['delivery', 'invoice', 'contact'])
         pricelist = part.property_product_pricelist and part.property_product_pricelist.id or False
         payment_term = part.property_payment_term and part.property_payment_term.id or False

=== modified file 'sale/sale_view.xml'
--- sale/sale_view.xml	2013-04-18 17:20:22 +0000
+++ sale/sale_view.xml	2013-04-20 02:28:27 +0000
@@ -156,7 +156,7 @@
                             <field name="partner_id" on_change="onchange_partner_id(partner_id, context)" domain="[('customer','=',True)]" context="{'search_default_customer':1, 'show_address': 1}" options='{"always_reload": True}'/>
                             <field name="partner_invoice_id" groups="sale.group_delivery_invoice_address" context="{'default_type':'invoice'}"/>
                             <field name="partner_shipping_id" groups="sale.group_delivery_invoice_address" context="{'default_type':'delivery'}"/>
-                            <field name="project_id" context="{'partner_id':partner_id, 'default_pricelist_id':pricelist_id, 'default_name':name, 'default_type': 'contract'}" groups="sale.group_analytic_accounting" domain="[('type','in',['view','normal','contract'])]"/>
+                            <field name="project_id" context="{'partner_id':partner_invoice_id, 'default_pricelist_id':pricelist_id, 'default_name':name, 'default_type': 'contract'}" groups="sale.group_analytic_accounting" domain="[('type','in',['view','normal','contract'])]"/>
                         </group>
                         <group>
                             <field name="date_order"/>
@@ -308,7 +308,7 @@
                     <filter icon="terp-dolar_ok!" string="Done" domain="[('state','=','done')]" help="Sales Order done"/>
                     <separator/>
                     <filter string="My Sales Orders" domain="[('user_id','=',uid)]" help="My Sales Orders" icon="terp-personal" name="my_sale_orders_filter"/>
-                    <field name="partner_id"/>
+                    <field name="partner_id" filter_domain="[('partner_id', 'child_of', self)]"/>
                     <field name="user_id"/>
                     <field name="project_id"/>
                     <group expand="0" string="Group By...">
@@ -472,7 +472,7 @@
                     <separator/>
                     <filter string="My Sales Order Lines" icon="terp-personnal" domain="[('salesman_id','=',uid)]" help="Sales Order Lines related to a Sales Order of mine"/>
                     <field name="order_id"/>
-                    <field name="order_partner_id"/>
+                    <field name="order_partner_id" filter_domain="[('order_partner_id', 'child_of', self)]"/>
                     <field name="product_id"/>
                     <field name="salesman_id"/>
                     <group expand="0" string="Group By...">
@@ -498,7 +498,7 @@
                     <separator/>
                     <filter string="My Sales Order Lines" icon="terp-personal" domain="[('salesman_id','=',uid)]" help="My Sales Order Lines"/>
                     <field name="order_id"/>
-                    <field name="order_partner_id"/>
+                    <field name="order_partner_id" filter_domain="[('order_partner_id', 'child_of', self)]"/>
                     <field name="product_id"/>
                     <field name="salesman_id"/>
                     <group expand="0" string="Group By...">

=== modified file 'sale_journal/sale_journal.py'
--- sale_journal/sale_journal.py	2012-12-06 14:56:32 +0000
+++ sale_journal/sale_journal.py	2013-04-20 02:28:27 +0000
@@ -52,6 +52,10 @@
             group_name = "Accounting Properties",
             help = "This invoicing type will be used, by default, to invoice the current partner."),
     }
+
+    def _commercial_fields(self, cr, uid, context=None):
+        return super(res_partner, self)._commercial_fields(cr, uid, context=context) + ['property_invoice_type']
+
 res_partner()
 
 class picking(osv.osv):

=== modified file 'sale_journal/sale_journal_view.xml'
--- sale_journal/sale_journal_view.xml	2012-12-16 15:58:43 +0000
+++ sale_journal/sale_journal_view.xml	2013-04-20 02:28:27 +0000
@@ -146,7 +146,7 @@
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
                 <page string="Sales &amp; Purchases" position="inside">
-                    <group colspan="2" col="2">
+                    <group colspan="2" col="2" attrs="{'invisible': [('is_company','=',False),('parent_id','!=',False)]}">
                         <separator string="Invoicing" colspan="2"/>
                         <field name="property_invoice_type"/>
                     </group>

=== modified file 'sale_stock/stock.py'
--- sale_stock/stock.py	2012-12-21 16:48:08 +0000
+++ sale_stock/stock.py	2013-04-20 02:28:27 +0000
@@ -53,7 +53,7 @@
             We select the partner of the sales order as the partner of the customer invoice
         """
         if picking.sale_id:
-            return picking.sale_id.partner_id
+            return picking.sale_id.partner_invoice_id
         return super(stock_picking, self)._get_partner_to_invoice(cr, uid, picking, context=context)
 
     def _get_comment_invoice(self, cursor, user, picking):

=== modified file 'sale_stock/test/picking_order_policy.yml'
--- sale_stock/test/picking_order_policy.yml	2013-04-04 12:31:54 +0000
+++ sale_stock/test/picking_order_policy.yml	2013-04-20 02:28:27 +0000
@@ -5,6 +5,12 @@
 -
   !assert {model: sale.order, id: sale.sale_order_6, string: The amount of the Quotation is not correctly computed}:
     - sum([l.price_subtotal for l in order_line]) == amount_untaxed
+- 
+  I set an explicit invoicing partner that is different from the main SO Customer
+-
+  !python {model: sale.order, id: sale.sale_order_6}: |
+    order = self.browse(cr, uid, ref("sale.sale_order_6"))
+    order.write({'partner_invoice_id': ref('base.res_partner_address_29')})
 -
   I confirm the quotation with Invoice based on deliveries policy.
 -
@@ -110,13 +116,13 @@
   !python {model: sale.order}: |
     order = self.browse(cr, uid, ref("sale.sale_order_6"))
     assert order.invoice_ids, "Invoice is not created."
-    ac = order.partner_id.property_account_receivable.id
+    ac = order.partner_invoice_id.property_account_receivable.id
     journal_ids = self.pool.get('account.journal').search(cr, uid, [('type', '=', 'sale'), ('company_id', '=', order.company_id.id)])
     for invoice in order.invoice_ids:
         assert invoice.type == 'out_invoice',"Invoice should be Customer Invoice."
         assert invoice.account_id.id == ac,"Invoice account is not correspond."
         assert invoice.reference == order.client_order_ref or order.name,"Reference is not correspond."
-        assert invoice.partner_id.id == order.partner_id.id,"Customer is not correspond."
+        assert invoice.partner_id.id == order.partner_invoice_id.id,"Customer does not correspond."
         assert invoice.currency_id.id == order.pricelist_id.currency_id.id, "Currency is not correspond."
         assert invoice.comment == (order.note or ''),"Note is not correspond."
         assert invoice.journal_id.id in journal_ids,"Sales Journal is not link on Invoice."

=== modified file 'stock/report/report_stock_move_view.xml'
--- stock/report/report_stock_move_view.xml	2012-11-29 22:26:45 +0000
+++ stock/report/report_stock_move_view.xml	2013-04-20 02:28:27 +0000
@@ -149,7 +149,7 @@
                 <field name="location_id" filter_domain="[('location_id', 'child_of', self)]"/>
                 <field name="company_id" groups="base.group_multi_company"/>
                 <group expand="0" string="Extended Filters...">
-                    <field name="partner_id" context="{'contact_display':'partner'}"/>
+                    <field name="partner_id" context="{'contact_display':'partner'}" filter_domain="[('partner_id', 'child_of', self)]"/>
                     <field name="product_categ_id" />
                     <field name="prodlot_id"/>
                     <field name="state"/>

=== modified file 'stock/stock_view.xml'
--- stock/stock_view.xml	2013-03-18 13:43:43 +0000
+++ stock/stock_view.xml	2013-04-20 02:28:27 +0000
@@ -807,7 +807,7 @@
                     <filter icon="terp-check" name="available" string="Ready" domain="[('state','=','assigned')]" help="Assigned Internal Moves"/>
                     <filter icon="terp-camera_test" name="confirmed" string="Waiting" domain="[('state','=','confirmed')]" help="Confirmed Internal Moves"/>
                     <filter icon="terp-dialog-close" name="done" string="Done" domain="[('state','=','done')]" help="Pickings already processed"/>
-                    <field name="partner_id"/>
+                    <field name="partner_id" filter_domain="[('partner_id','child_of',self)]"/>
                     <field name="product_id"/>
                     <field name="stock_journal_id"/>
                     <group expand="0" string="Group By...">
@@ -934,6 +934,7 @@
                     <filter icon="terp-accessories-archiver-minus" string="Back Orders" domain="[('backorder_id', '!=', False)]" help="Is a Back Order"/>
                     <separator/>
                     <filter icon="terp-dolar" name="to_invoice" string="To Invoice" domain="[('invoice_state','=','2binvoiced')]" help="Delivery orders to invoice"/>
+                    <field name="partner_id" filter_domain="[('partner_id','child_of',self)]"/>
                     <field name="stock_journal_id"/>
                     <field name="company_id" groups="base.group_multi_company"/>
                     <group expand="0" string="Group By...">
@@ -1059,6 +1060,7 @@
                     <filter icon="terp-accessories-archiver-minus" string="Back Orders" domain="[('backorder_id', '!=', False)]" help="Is a Back Order"/>
                     <separator/>
                     <filter string="To Invoice" name="to_invoice" icon="terp-dolar" domain="[('invoice_state', '=', '2binvoiced')]"/>
+                    <field name="partner_id" filter_domain="[('partner_id','child_of',self)]"/>
                     <field name="stock_journal_id"/>
                     <field name="product_id"/>
                     <group expand="0" string="Group By...">
@@ -1370,7 +1372,7 @@
                     <filter icon="terp-go-today" string="Today" domain="[('date','&lt;=',time.strftime('%%Y-%%m-%%d 23:59:59')),('date','&gt;=',time.strftime('%%Y-%%m-%%d 00:00:00'))]" help="Orders processed Today or planned for Today"/>
                     <field name="product_id"/>
                     <field name="name" string="Location" filter_domain="['|',('location_id','ilike',self),('location_dest_id','ilike',self)]"/>
-                    <field name="partner_id" string="Partner"  filter_domain="[('picking_id.partner_id','ilike',self)]"/>
+                    <field name="partner_id" string="Partner"  filter_domain="[('picking_id.partner_id','child_of',self)]"/>
                     <field name="prodlot_id"/>
                     <group expand="0" string="Group By...">
                         <filter string="Product" name="by_product" icon="terp-accessories-archiver" domain="[]"  context="{'group_by':'product_id'}"/>