From 59dfff33519db1bfa7bd7a0ce68feb6a67aa0231 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Tue, 28 Aug 2012 09:48:35 +0200
Subject: [PATCH 1/2] [FIX] account, generation of objects from templates: the
 set of taxes by default should be done as super user

bzr revid: qdp-launchpad@openerp.com-20120828074835-od3blsdpgmzecbih
---
 addons/account/account.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index 70731d1dbe1..72ce11f05ea 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -3333,10 +3333,10 @@ class wizard_multi_charts_accounts(osv.osv_memory):
 
         # write values of default taxes for product
         if obj_wizard.sale_tax and taxes_ref:
-            ir_values_obj.set(cr, uid, key='default', key2=False, name="taxes_id", company=company_id,
+            ir_values_obj.set(cr, 1, key='default', key2=False, name="taxes_id", company=company_id,
                                 models =[('product.product',False)], value=[taxes_ref[obj_wizard.sale_tax.id]])
         if obj_wizard.purchase_tax and taxes_ref:
-                ir_values_obj.set(cr, uid, key='default', key2=False, name="supplier_taxes_id", company=company_id,
+            ir_values_obj.set(cr, 1, key='default', key2=False, name="supplier_taxes_id", company=company_id,
                                 models =[('product.product',False)], value=[taxes_ref[obj_wizard.purchase_tax.id]])
 
         # Create Bank journals

From 4731e8e38795e7bcff2955312c83ee25e14f97ef Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Tue, 28 Aug 2012 11:29:46 +0200
Subject: [PATCH 2/2] [FIX] sale/purchase: uniform the domains on the analytic
 account field on sale.order and purchase.order, to match the same domain than
 in invoices

bzr revid: qdp-launchpad@openerp.com-20120828092946-4h63436hf9vvmnua
---
 addons/purchase/purchase_view.xml | 6 +++---
 addons/sale/sale.py               | 3 ++-
 addons/sale/sale_view.xml         | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 1c936055aff..dd325486b52 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -177,7 +177,7 @@
                             <field domain="[('type','=','purchase')]" name="pricelist_id" groups="base.group_extended"/>
                             <field name="origin" groups="base.group_extended"/>
                             <newline/>
-                            <field colspan="4" name="order_line" nolabel="1" mode="tree,form">
+                            <field colspan="4" name="order_line" nolabel="1" mode="tree,form" context="{'default_company_id': company_id}">
                                 <tree string="Purchase Order Lines">
                                     <field name="date_planned"/>
                                     <field name="name"/>
@@ -366,7 +366,7 @@
                             <field name="date_planned" widget="date"/>
                             <field name="price_unit"/>
                             <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                            <field name="account_analytic_id" colspan="4" groups="analytic.group_analytic_accounting" domain="[('parent_id','!=',False)]" />
+                            <field name="account_analytic_id" colspan="4" groups="analytic.group_analytic_accounting" domain="[('type','&lt;&gt;','view'), ('company_id', '=', company_id), ('parent_id', '!=', False)]" />
                             <group colspan="4" col="4" groups="base.group_extended">
                                 <separator colspan="4" string="Taxes"/>
                                 <field colspan="4" nolabel="1" name="taxes_id"
@@ -429,7 +429,7 @@
                             <field name="date_planned" widget="date"  readonly="1"/>
                             <field name="price_unit"/>
                             <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                            <field name="account_analytic_id" colspan="4" groups="analytic.group_analytic_accounting" domain="[('parent_id','!=',False)]"/>
+                            <field name="account_analytic_id" colspan="4" groups="analytic.group_analytic_accounting" domain="[('type','&lt;&gt;','view'), ('company_id', '=', company_id), ('parent_id', '!=', False)]"/>
                             <group colspan="4" col="4" groups="base.group_extended">
                                 <separator colspan="4" string="Taxes"/>
                                 <field colspan="4" nolabel="1" name="taxes_id"
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 82bfda7b580..e41e9810279 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -304,7 +304,8 @@ class sale_order(osv.osv):
         if shop_id:
             shop = self.pool.get('sale.shop').browse(cr, uid, shop_id)
             v['project_id'] = shop.project_id.id
-            # Que faire si le client a une pricelist a lui ?
+            v['company_id'] = shop.company_id.id
+            # overriden by the customer priceslist if existing
             if shop.pricelist_id.id:
                 v['pricelist_id'] = shop.pricelist_id.id
         return {'value': v}
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 90d3838f5a0..4313925aaa6 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -120,7 +120,7 @@
                             <field domain="[('partner_id','=',partner_id)]" name="partner_invoice_id" groups="base.group_extended" options='{"quick_create": false}'/>
                             <field domain="[('partner_id','=',partner_id)]" name="partner_shipping_id" groups="base.group_extended" options='{"quick_create": false}'/>
                             <field domain="[('type','=','sale')]" name="pricelist_id" groups="base.group_extended" on_change="onchange_pricelist_id(pricelist_id,order_line)"/>
-                            <field name="project_id" context="{'partner_id':partner_id, 'contact_id':partner_order_id, 'pricelist_id':pricelist_id, 'default_name':name}" groups="analytic.group_analytic_accounting" domain="[('parent_id','!=',False)]"/>
+                            <field name="project_id" context="{'partner_id':partner_id, 'contact_id':partner_order_id, 'pricelist_id':pricelist_id, 'default_name':name}" groups="analytic.group_analytic_accounting" domain="[('type','&lt;&gt;','view'), ('company_id', '=', company_id), ('parent_id', '!=', False)]"/>
                             <newline/>
                             <field colspan="4" name="order_line" nolabel="1" widget="one2many_list">
                                 <form string="Sales Order Lines">