From 02224a3f112426c9e15a8af7cde2e7a5406d1885 Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (Open ERP)" <dhr@tinyerp.com>
Date: Thu, 12 Dec 2013 10:55:44 +0530
Subject: [PATCH 1/4] [FIX]Added the refernce of the supplier in price_get
 method while creating purchase order from purchase requisition, as without
 supplier the price unit in PO was 0 when the pricelist item was based on
 Supplier Price in the product form

bzr revid: dhr@tinyerp.com-20131212052544-skljxsrxea4o8efm
---
 addons/purchase_requisition/purchase_requisition.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/purchase_requisition/purchase_requisition.py b/addons/purchase_requisition/purchase_requisition.py
index c1d80c7bf46..c31f8a69a37 100644
--- a/addons/purchase_requisition/purchase_requisition.py
+++ b/addons/purchase_requisition/purchase_requisition.py
@@ -109,7 +109,7 @@ class purchase_requisition(osv.osv):
                 seller_delay = product_supplier.delay
                 seller_qty = product_supplier.qty
         supplier_pricelist = supplier.property_product_pricelist_purchase or False
-        seller_price = pricelist.price_get(cr, uid, [supplier_pricelist.id], product.id, qty, False, {'uom': default_uom_po_id})[supplier_pricelist.id]
+        seller_price = pricelist.price_get(cr, uid, [supplier_pricelist.id], product.id, qty, supplier.id, {'uom': default_uom_po_id})[supplier_pricelist.id]
         if seller_qty:
             qty = max(qty,seller_qty)
         date_planned = self._planned_date(requisition_line.requisition_id, seller_delay)

From 262a405b0ab1018bde19e61d38a4525582831a16 Mon Sep 17 00:00:00 2001
From: Alexis de Lattre <alexis@via.ecp.fr>
Date: Fri, 3 Jan 2014 14:07:03 +0100
Subject: [PATCH 2/4] Remove old FR VAT taxes 19.6% and 7.0%. Remove the FR VAT
 tax 5.0% that has never seen the light !

bzr revid: alexis@via.ecp.fr-20140103130703-kpf5rojc4azwq8w1
---
 addons/l10n_fr/fr_fiscal_templates.xml |  79 -----
 addons/l10n_fr/fr_tax.xml              | 387 -------------------------
 2 files changed, 466 deletions(-)

diff --git a/addons/l10n_fr/fr_fiscal_templates.xml b/addons/l10n_fr/fr_fiscal_templates.xml
index bf49d15e08c..cca96422c22 100644
--- a/addons/l10n_fr/fr_fiscal_templates.xml
+++ b/addons/l10n_fr/fr_fiscal_templates.xml
@@ -40,11 +40,6 @@
             <field name="tax_src_id" ref="tva_normale" />
             <field name="tax_dest_id" ref="tva_intra_0" />
         </record>
-        <record id="fp_tax_template_intraeub2b_vt_normale_temp" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fiscal_position_template_intraeub2b" />
-            <field name="tax_src_id" ref="tva_normale_temp" />
-            <field name="tax_dest_id" ref="tva_intra_0" />
-        </record>        
 <!-- Taux DOM-TOM -->
         <record id="fp_tax_template_intraeub2b_vt_specifique" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fiscal_position_template_intraeub2b" />
@@ -57,22 +52,12 @@
             <field name="tax_src_id" ref="tva_intermediaire" />
             <field name="tax_dest_id" ref="tva_intra_0" />
         </record>
-        <record id="fp_tax_template_intraeub2b_vt_intermediaire_temp" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fiscal_position_template_intraeub2b" />
-            <field name="tax_src_id" ref="tva_intermediaire_temp" />
-            <field name="tax_dest_id" ref="tva_intra_0" />
-        </record>        
 <!-- Taux réduit -->
         <record id="fp_tax_template_intraeub2b_vt_reduite" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fiscal_position_template_intraeub2b" />
             <field name="tax_src_id" ref="tva_reduite" />
             <field name="tax_dest_id" ref="tva_intra_0" />
         </record>
-        <record id="fp_tax_template_intraeub2b_vt_reduite_temp" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fiscal_position_template_intraeub2b" />
-            <field name="tax_src_id" ref="tva_reduite_temp" />
-            <field name="tax_dest_id" ref="tva_intra_0" />
-        </record>        
 <!-- Taux super réduit -->
         <record id="fp_tax_template_intraeub2b_vt_super_reduite" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fiscal_position_template_intraeub2b" />
@@ -91,17 +76,6 @@
             <field name="tax_src_id" ref="tva_acq_normale" />
             <field name="tax_dest_id" ref="tva_acq_intra_normale" />
         </record>
-        <record id="fp_tax_template_intraeub2b_ha_normale_deduc_temp" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fiscal_position_template_intraeub2b" />
-            <field name="tax_src_id" ref="tva_acq_normale_temp" />
-            <field name="tax_dest_id" ref="tva_intra_normale_temp" />
-        </record>
-        <record id="fp_tax_template_intraeub2b_ha_normale_acq_temp" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fiscal_position_template_intraeub2b" />
-            <field name="tax_src_id" ref="tva_acq_normale_temp" />
-            <field name="tax_dest_id" ref="tva_acq_intra_normale_temp" />
-        </record>        
-        
 <!-- Taux DOM-TOM -->
         <record id="fp_tax_template_intraeub2b_ha_specifique_deduc" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fiscal_position_template_intraeub2b" />
@@ -124,17 +98,6 @@
             <field name="tax_src_id" ref="tva_acq_intermediaire" />
             <field name="tax_dest_id" ref="tva_acq_intra_intermediaire" />
         </record>
-        <record id="fp_tax_template_intraeub2b_ha_intermediaire_deduc_temp" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fiscal_position_template_intraeub2b" />
-            <field name="tax_src_id" ref="tva_acq_intermediaire_temp" />
-            <field name="tax_dest_id" ref="tva_intra_intermediaire_temp" />
-        </record>
-        <record id="fp_tax_template_intraeub2b_ha_intermediaire_acq_temp" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fiscal_position_template_intraeub2b" />
-            <field name="tax_src_id" ref="tva_acq_intermediaire_temp" />
-            <field name="tax_dest_id" ref="tva_acq_intra_intermediaire_temp" />
-        </record>        
-        
 <!-- Taux réduit -->
         <record id="fp_tax_template_intraeub2b_ha_reduite_deduc" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fiscal_position_template_intraeub2b" />
@@ -146,17 +109,6 @@
             <field name="tax_src_id" ref="tva_acq_reduite" />
             <field name="tax_dest_id" ref="tva_acq_intra_reduite" />
         </record>
-        <record id="fp_tax_template_intraeub2b_ha_reduite_deduc_temp" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fiscal_position_template_intraeub2b" />
-            <field name="tax_src_id" ref="tva_acq_reduite_temp" />
-            <field name="tax_dest_id" ref="tva_intra_reduite_temp" />
-        </record>
-        <record id="fp_tax_template_intraeub2b_ha_reduite_acq_temp" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fiscal_position_template_intraeub2b" />
-            <field name="tax_src_id" ref="tva_acq_reduite_temp" />
-            <field name="tax_dest_id" ref="tva_acq_intra_reduite_temp" />
-        </record>        
-        
 <!-- Taux super réduit -->
         <record id="fp_tax_template_intraeub2b_ha_super_reduite_deduc" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fiscal_position_template_intraeub2b" />
@@ -177,11 +129,6 @@
             <field name="tax_src_id" ref="tva_normale" />
             <field name="tax_dest_id" ref="tva_export_0" />
         </record>
-        <record id="fp_tax_template_impexp_vt_normale_temp" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fiscal_position_template_import_export" />
-            <field name="tax_src_id" ref="tva_normale_temp" />
-            <field name="tax_dest_id" ref="tva_export_0" />
-        </record>        
 <!-- Taux DOM-TOM -->
         <record id="fp_tax_template_impexp_vt_specifique" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fiscal_position_template_import_export" />
@@ -194,22 +141,12 @@
             <field name="tax_src_id" ref="tva_intermediaire" />
             <field name="tax_dest_id" ref="tva_export_0" />
         </record>
-        <record id="fp_tax_template_impexp_vt_intermediaire_temp" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fiscal_position_template_import_export" />
-            <field name="tax_src_id" ref="tva_intermediaire_temp" />
-            <field name="tax_dest_id" ref="tva_export_0" />
-        </record>        
 <!-- Taux Réduit -->
         <record id="fp_tax_template_impexp_vt_reduite" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fiscal_position_template_import_export" />
             <field name="tax_src_id" ref="tva_reduite" />
             <field name="tax_dest_id" ref="tva_export_0" />
         </record>
-        <record id="fp_tax_template_impexp_vt_reduite_temp" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fiscal_position_template_import_export" />
-            <field name="tax_src_id" ref="tva_reduite_temp" />
-            <field name="tax_dest_id" ref="tva_export_0" />
-        </record>        
 <!-- Taux super réduit -->
         <record id="fp_tax_template_impexp_vt_super_reduite" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fiscal_position_template_import_export" />
@@ -224,11 +161,6 @@
             <field name="tax_src_id" ref="tva_acq_normale" />
             <field name="tax_dest_id" ref="tva_import_0" />
         </record>
-        <record id="fp_tax_template_impexp_ha_normale_temp" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fiscal_position_template_import_export" />
-            <field name="tax_src_id" ref="tva_acq_normale_temp" />
-            <field name="tax_dest_id" ref="tva_import_0" />
-        </record>        
 <!-- Taux DOM-TOM -->
         <record id="fp_tax_template_impexp_ha_specifique" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fiscal_position_template_import_export" />
@@ -241,23 +173,12 @@
             <field name="tax_src_id" ref="tva_acq_intermediaire" />
             <field name="tax_dest_id" ref="tva_import_0" />
         </record>
-        <record id="fp_tax_template_impexp_ha_intermediaire_temp" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fiscal_position_template_import_export" />
-            <field name="tax_src_id" ref="tva_acq_intermediaire_temp" />
-            <field name="tax_dest_id" ref="tva_import_0" />
-        </record>        
 <!-- Taux Réduit -->
         <record id="fp_tax_template_impexp_ha_reduite" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fiscal_position_template_import_export" />
             <field name="tax_src_id" ref="tva_acq_reduite" />
             <field name="tax_dest_id" ref="tva_import_0" />
         </record>
-        <record id="fp_tax_template_impexp_ha_reduite_temp" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fiscal_position_template_import_export" />
-            <field name="tax_src_id" ref="tva_acq_reduite_temp" />
-            <field name="tax_dest_id" ref="tva_import_0" />
-        </record>        
-        
 <!-- Taux super réduit -->
         <record id="fp_tax_template_impexp_ha_super_reduite" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fiscal_position_template_import_export" />
diff --git a/addons/l10n_fr/fr_tax.xml b/addons/l10n_fr/fr_tax.xml
index 8633cca7141..22e1e12f03c 100644
--- a/addons/l10n_fr/fr_tax.xml
+++ b/addons/l10n_fr/fr_tax.xml
@@ -29,28 +29,6 @@
       <field name="sequence" eval="1"/>
       <field name="type_tax_use">sale</field>
     </record>
-    
-    <record model="account.tax.template" id="tva_normale_temp">
-      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-      <field name="name">TVA collectée (vente) 19,6%</field>
-      <field name="description">19.6</field>
-      <field name="amount" eval="0.196"/>
-      <field name="type">percent</field>
-      <field name="base_code_id" ref="tax_col_196_ht"/>
-      <field name="base_sign" eval="1"/>
-      <field name="tax_code_id" ref="tax_col_196"/>
-      <field name="tax_sign" eval="1"/>
-
-      <field name="account_collected_id" ref="pcg_445711"/>
-      <field name="account_paid_id" ref="pcg_445711"/>
-
-      <field name="ref_base_code_id" ref="tax_col_196_ht"/>
-      <field name="ref_base_sign" eval="-1"/>
-      <field name="ref_tax_code_id" ref="tax_col_196"/>
-      <field name="ref_tax_sign" eval="-1"/>
-      <field name="sequence" eval="10"/>
-      <field name="type_tax_use">sale</field>
-    </record>
 
     <record model="account.tax.template" id="tva_specifique">
       <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
@@ -96,51 +74,7 @@
       <field name="type_tax_use">sale</field>
     </record>
 
-    <record model="account.tax.template" id="tva_intermediaire_temp">
-      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-      <field name="name">TVA collectée (vente) 7,0%</field>
-      <field name="description">7.0</field>
-      <field name="amount" eval="0.07"/>
-      <field name="type">percent</field>
-      <field name="base_code_id" ref="tax_col_70_ht"/>
-      <field name="base_sign" eval="1"/>
-      <field name="tax_code_id" ref="tax_col_70"/>
-      <field name="tax_sign" eval="1"/>
-
-      <field name="account_collected_id" ref="pcg_445712"/>
-      <field name="account_paid_id" ref="pcg_445712"/>
-
-      <field name="ref_base_code_id" ref="tax_col_70_ht"/>
-      <field name="ref_base_sign" eval="-1"/>
-      <field name="ref_tax_code_id" ref="tax_col_70"/>
-      <field name="ref_tax_sign" eval="-1"/>
-      <field name="sequence" eval="10"/>
-      <field name="type_tax_use">sale</field>
-    </record>
-
     <record model="account.tax.template" id="tva_reduite">
-      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-      <field name="name">TVA collectée (vente) 5,0%</field>
-      <field name="description">5.0</field>
-      <field name="amount" eval="0.050"/>
-      <field name="type">percent</field>
-      <field name="base_code_id" ref="tax_col_50_ht"/>
-      <field name="base_sign" eval="1"/>
-      <field name="tax_code_id" ref="tax_col_50"/>
-      <field name="tax_sign" eval="1"/>
-
-      <field name="account_collected_id" ref="pcg_445713"/>
-      <field name="account_paid_id" ref="pcg_445713"/>
-
-      <field name="ref_base_code_id" ref="tax_col_50_ht"/>
-      <field name="ref_base_sign" eval="-1"/>
-      <field name="ref_tax_code_id" ref="tax_col_50"/>
-      <field name="ref_tax_sign" eval="-1"/>
-      <field name="sequence" eval="10"/>
-      <field name="type_tax_use">sale</field>
-    </record>
-
-    <record model="account.tax.template" id="tva_reduite_temp">
       <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
       <field name="name">TVA collectée (vente) 5,5%</field>
       <field name="description">5.5</field>
@@ -208,28 +142,6 @@
       <field name="type_tax_use">purchase</field>
     </record>
 
-    <record model="account.tax.template" id="tva_acq_normale_temp">
-      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-      <field name="name">TVA déductible (achat) 19,6%</field>
-      <field name="description">ACH-19.6</field>
-      <field name="amount" eval="0.196"/>
-      <field name="type">percent</field>
-      <field name="base_code_id" ref="tax_acq_196_ht"/>
-      <field name="base_sign" eval="-1"/>
-      <field name="tax_code_id" ref="tax_acq_196"/>
-      <field name="tax_sign" eval="-1"/>
-
-      <field name="account_collected_id" ref="pcg_44566"/>
-      <field name="account_paid_id" ref="pcg_44566"/>
-
-      <field name="ref_base_code_id" ref="tax_acq_196_ht"/>
-      <field name="ref_base_sign" eval="1"/>
-      <field name="ref_tax_code_id" ref="tax_acq_196"/>
-      <field name="ref_tax_sign" eval="1"/>
-      <field name="sequence" eval="10"/>
-      <field name="type_tax_use">purchase</field>
-    </record>
-
     <record model="account.tax.template" id="tva_acq_specifique">
       <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
       <field name="name">TVA déductible (achat) 8,5%</field>
@@ -274,51 +186,7 @@
       <field name="type_tax_use">purchase</field>
     </record>
 
-    <record model="account.tax.template" id="tva_acq_intermediaire_temp">
-      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-      <field name="name">TVA déductible (achat) 7,0%</field>
-      <field name="description">ACH-7.0</field>
-      <field name="amount" eval="0.07"/>
-      <field name="type">percent</field>
-      <field name="base_code_id" ref="tax_acq_70_ht"/>
-      <field name="base_sign" eval="-1"/>
-      <field name="tax_code_id" ref="tax_acq_70"/>
-      <field name="tax_sign" eval="-1"/>
-
-      <field name="account_collected_id" ref="pcg_44566"/>
-      <field name="account_paid_id" ref="pcg_44566"/>
-
-      <field name="ref_base_code_id" ref="tax_acq_70_ht"/>
-      <field name="ref_base_sign" eval="1"/>
-      <field name="ref_tax_code_id" ref="tax_acq_70"/>
-      <field name="ref_tax_sign" eval="1"/>
-      <field name="sequence" eval="10"/>
-      <field name="type_tax_use">purchase</field>
-    </record>
-
     <record model="account.tax.template" id="tva_acq_reduite">
-      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-      <field name="name">TVA déductible (achat) 5,0%</field>
-      <field name="description">ACH-5.0</field>
-      <field name="amount" eval="0.050"/>
-      <field name="type">percent</field>
-      <field name="base_code_id" ref="tax_acq_50_ht"/>
-      <field name="base_sign" eval="-1"/>
-      <field name="tax_code_id" ref="tax_acq_50"/>
-      <field name="tax_sign" eval="-1"/>
-
-      <field name="account_collected_id" ref="pcg_44566"/>
-      <field name="account_paid_id" ref="pcg_44566"/>
-
-      <field name="ref_base_code_id" ref="tax_acq_50_ht"/>
-      <field name="ref_base_sign" eval="1"/>
-      <field name="ref_tax_code_id" ref="tax_acq_50"/>
-      <field name="ref_tax_sign" eval="1"/>
-      <field name="sequence" eval="10"/>
-      <field name="type_tax_use">purchase</field>
-    </record>
-
-    <record model="account.tax.template" id="tva_acq_reduite_temp">
       <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
       <field name="name">TVA déductible (achat) 5,5%</field>
       <field name="description">ACH-5.5</field>
@@ -387,29 +255,6 @@
       <field name="type_tax_use">purchase</field>
     </record>
 
-    <record model="account.tax.template" id="tva_acq_normale_TTC_temp">
-      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-      <field name="name">TVA déductible (achat) 19,6% TTC</field>
-      <field name="description">ACH-19.6-TTC</field>
-      <field name="price_include" eval="1"/>
-      <field name="amount" eval="0.196"/>
-      <field name="type">percent</field>
-      <field name="base_code_id" ref="tax_acq_196_ht"/>
-      <field name="base_sign" eval="-1"/>
-      <field name="tax_code_id" ref="tax_acq_196"/>
-      <field name="tax_sign" eval="-1"/>
-
-      <field name="account_collected_id" ref="pcg_44566"/>
-      <field name="account_paid_id" ref="pcg_44566"/>
-
-      <field name="ref_base_code_id" ref="tax_acq_196_ht"/>
-      <field name="ref_base_sign" eval="1"/>
-      <field name="ref_tax_code_id" ref="tax_acq_196"/>
-      <field name="ref_tax_sign" eval="1"/>
-      <field name="sequence" eval="10"/>
-      <field name="type_tax_use">purchase</field>
-    </record>
-
     <record model="account.tax.template" id="tva_acq_specifique_TTC">
       <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
       <field name="name">TVA déductible (achat) 8,5% TTC</field>
@@ -456,53 +301,7 @@
       <field name="type_tax_use">purchase</field>
     </record>
 
-    <record model="account.tax.template" id="tva_acq_intermediaire_TTC_temp">
-      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-      <field name="name">TVA déductible (achat) 7,0% TTC</field>
-      <field name="description">ACH-7.0-TTC</field>
-      <field name="price_include" eval="1"/>
-      <field name="amount" eval="0.07"/>
-      <field name="type">percent</field>
-      <field name="base_code_id" ref="tax_acq_70_ht"/>
-      <field name="base_sign" eval="-1"/>
-      <field name="tax_code_id" ref="tax_acq_70"/>
-      <field name="tax_sign" eval="-1"/>
-
-      <field name="account_collected_id" ref="pcg_44566"/>
-      <field name="account_paid_id" ref="pcg_44566"/>
-
-      <field name="ref_base_code_id" ref="tax_acq_70_ht"/>
-      <field name="ref_base_sign" eval="1"/>
-      <field name="ref_tax_code_id" ref="tax_acq_70"/>
-      <field name="ref_tax_sign" eval="1"/>
-      <field name="sequence" eval="10"/>
-      <field name="type_tax_use">purchase</field>
-    </record>
-
     <record model="account.tax.template" id="tva_acq_reduite_TTC">
-      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-      <field name="name">TVA déductible (achat) 5,0% TTC</field>
-      <field name="description">ACH-5.0-TTC</field>
-      <field name="price_include" eval="1"/>
-      <field name="amount" eval="0.050"/>
-      <field name="type">percent</field>
-      <field name="base_code_id" ref="tax_acq_50_ht"/>
-      <field name="base_sign" eval="-1"/>
-      <field name="tax_code_id" ref="tax_acq_50"/>
-      <field name="tax_sign" eval="-1"/>
-
-      <field name="account_collected_id" ref="pcg_44566"/>
-      <field name="account_paid_id" ref="pcg_44566"/>
-
-      <field name="ref_base_code_id" ref="tax_acq_50_ht"/>
-      <field name="ref_base_sign" eval="1"/>
-      <field name="ref_tax_code_id" ref="tax_acq_50"/>
-      <field name="ref_tax_sign" eval="1"/>
-      <field name="sequence" eval="10"/>
-      <field name="type_tax_use">purchase</field>
-    </record>
-
-    <record model="account.tax.template" id="tva_acq_reduite_TTC_temp">
       <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
       <field name="name">TVA déductible (achat) 5,5% TTC</field>
       <field name="description">ACH-5.5-TTC</field>
@@ -573,28 +372,6 @@
       <field name="type_tax_use">purchase</field>
     </record>
 
-    <record model="account.tax.template" id="tva_imm_normale_temp">
-      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-      <field name="name">TVA déd./immobilisation (achat) 19,6%</field>
-      <field name="description">IMMO-19.6</field>
-      <field name="amount" eval="0.196"/>
-      <field name="type">percent</field>
-      <field name="base_code_id" ref="tax_imm_196_ht"/>
-      <field name="base_sign" eval="-1"/>
-      <field name="tax_code_id" ref="tax_imm_196"/>
-      <field name="tax_sign" eval="-1"/>
-
-      <field name="account_collected_id" ref="pcg_44562"/>
-      <field name="account_paid_id" ref="pcg_44562"/>
-
-      <field name="ref_base_code_id" ref="tax_imm_196_ht"/>
-      <field name="ref_base_sign" eval="1"/>
-      <field name="ref_tax_code_id" ref="tax_imm_196"/>
-      <field name="ref_tax_sign" eval="1"/>
-      <field name="sequence" eval="10"/>
-      <field name="type_tax_use">purchase</field>
-    </record>
-
     <record model="account.tax.template" id="tva_imm_specifique">
       <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
       <field name="name">TVA déd./immobilisation (achat) 8,5%</field>
@@ -639,51 +416,7 @@
       <field name="type_tax_use">purchase</field>
     </record>
 
-    <record model="account.tax.template" id="tva_imm_intermediaire_temp">
-      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-      <field name="name">TVA déd./immobilisation (achat) 7,0%</field>
-      <field name="description">IMMO-7.0</field>
-      <field name="amount" eval="0.07"/>
-      <field name="type">percent</field>
-      <field name="base_code_id" ref="tax_imm_70_ht"/>
-      <field name="base_sign" eval="-1"/>
-      <field name="tax_code_id" ref="tax_imm_70"/>
-      <field name="tax_sign" eval="-1"/>
-
-      <field name="account_collected_id" ref="pcg_44562"/>
-      <field name="account_paid_id" ref="pcg_44562"/>
-
-      <field name="ref_base_code_id" ref="tax_imm_70_ht"/>
-      <field name="ref_base_sign" eval="1"/>
-      <field name="ref_tax_code_id" ref="tax_imm_70"/>
-      <field name="ref_tax_sign" eval="1"/>
-      <field name="sequence" eval="10"/>
-      <field name="type_tax_use">purchase</field>
-    </record>
-
     <record model="account.tax.template" id="tva_imm_reduite">
-      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-      <field name="name">TVA déd./immobilisation (achat) 5,0%</field>
-      <field name="description">IMMO-5.0</field>
-      <field name="amount" eval="0.050"/>
-      <field name="type">percent</field>
-      <field name="base_code_id" ref="tax_imm_50_ht"/>
-      <field name="base_sign" eval="-1"/>
-      <field name="tax_code_id" ref="tax_imm_50"/>
-      <field name="tax_sign" eval="-1"/>
-
-      <field name="account_collected_id" ref="pcg_44562"/>
-      <field name="account_paid_id" ref="pcg_44562"/>
-
-      <field name="ref_base_code_id" ref="tax_imm_50_ht"/>
-      <field name="ref_base_sign" eval="1"/>
-      <field name="ref_tax_code_id" ref="tax_imm_50"/>
-      <field name="ref_tax_sign" eval="1"/>
-      <field name="sequence" eval="10"/>
-      <field name="type_tax_use">purchase</field>
-    </record>
-
-    <record model="account.tax.template" id="tva_imm_reduite_temp">
       <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
       <field name="name">TVA déd./immobilisation (achat) 5,5%</field>
       <field name="description">IMMO-5.5</field>
@@ -751,28 +484,6 @@
       <field name="type_tax_use">purchase</field>
     </record>
 
-    <record model="account.tax.template" id="tva_intra_normale_temp">
-      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-      <field name="name">TVA due s/ acq. intracommunautaire (achat) 19,6%</field>   <!-- ventes -->
-      <field name="description">ACH_UE_due-19.6</field>
-      <field name="amount" eval="-0.196"/>
-      <field name="type">percent</field>
-      <field name="base_code_id" ref="tax_intra_196_ht"/>
-      <field name="base_sign" eval="-1" />
-      <field name="tax_code_id" ref="tax_intra_196"/>
-      <field name="tax_sign" eval="-1" />
-
-      <field name="account_collected_id" ref="pcg_445201"/>
-      <field name="account_paid_id" ref="pcg_445201"/>
-
-      <field name="ref_base_code_id" ref="tax_intra_196_ht"/>
-      <field name="ref_base_sign" eval="1"/>
-      <field name="ref_tax_code_id" ref="tax_intra_196"/>
-      <field name="ref_tax_sign" eval="1"/>
-      <field name="sequence" eval="10"/>
-      <field name="type_tax_use">purchase</field>
-    </record>
-
     <record model="account.tax.template" id="tva_intra_specifique">
       <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
       <field name="name">TVA due s/ acq. intracommunautaire (achat) 8,5%</field>
@@ -817,51 +528,7 @@
       <field name="type_tax_use">purchase</field>
     </record>
 
-    <record model="account.tax.template" id="tva_intra_intermediaire_temp">
-      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-      <field name="name">TVA due s/ acq. intracommunautaire (achat) 7,0%</field>
-      <field name="description">ACH_UE_due-7.0</field>
-      <field name="amount" eval="-0.07"/>
-      <field name="type">percent</field>
-      <field name="base_code_id" ref="tax_intra_70_ht"/>
-      <field name="base_sign" eval="-1" />
-      <field name="tax_code_id" ref="tax_intra_70"/>
-      <field name="tax_sign" eval="-1" />
-
-      <field name="account_collected_id" ref="pcg_445202"/>
-      <field name="account_paid_id" ref="pcg_445202"/>
-
-      <field name="ref_base_code_id" ref="tax_intra_70_ht"/>
-      <field name="ref_base_sign" eval="1"/>
-      <field name="ref_tax_code_id" ref="tax_intra_70"/>
-      <field name="ref_tax_sign" eval="1"/>
-      <field name="sequence" eval="10"/>
-      <field name="type_tax_use">purchase</field>
-    </record>
-
     <record model="account.tax.template" id="tva_intra_reduite">
-      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-      <field name="name">TVA due s/ acq. intracommunautaire (achat) 5,0%</field>
-      <field name="description">ACH_UE_due-5.0</field>
-      <field name="amount" eval="-0.050"/>
-      <field name="type">percent</field>
-      <field name="base_code_id" ref="tax_intra_50_ht"/>
-      <field name="base_sign" eval="-1" />
-      <field name="tax_code_id" ref="tax_intra_50"/>
-      <field name="tax_sign" eval="-1" />
-
-      <field name="account_collected_id" ref="pcg_445203"/>
-      <field name="account_paid_id" ref="pcg_445203"/>
-
-      <field name="ref_base_code_id" ref="tax_intra_50_ht"/>
-      <field name="ref_base_sign" eval="1"/>
-      <field name="ref_tax_code_id" ref="tax_intra_50"/>
-      <field name="ref_tax_sign" eval="1"/>
-      <field name="sequence" eval="10"/>
-      <field name="type_tax_use">purchase</field>
-    </record>
-
-    <record model="account.tax.template" id="tva_intra_reduite_temp">
       <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
       <field name="name">TVA due s/ acq. intracommunautaire (achat) 5,5%</field>
       <field name="description">ACH_UE_due-5.5</field>
@@ -925,24 +592,6 @@
       <field name="type_tax_use">purchase</field>
     </record>
 
-    <record model="account.tax.template" id="tva_acq_intra_normale_temp">
-      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-      <field name="name">TVA déd. s/ acq. intracommunautaire (achat) 19,6%</field>
-      <field name="description">ACH_UE_ded.-19.6</field>
-      <field name="amount" eval="0.196"/>
-      <field name="type">percent</field>
-      <field name="tax_code_id" ref="tax_intra_acq_196"/>
-      <field name="tax_sign" eval="-1"/>
-
-      <field name="account_collected_id" ref="pcg_445662"/>
-      <field name="account_paid_id" ref="pcg_445662"/>
-
-      <field name="ref_tax_code_id" ref="tax_intra_acq_196"/>
-      <field name="ref_tax_sign" eval="1"/>
-      <field name="sequence" eval="10"/>
-      <field name="type_tax_use">purchase</field>
-    </record>
-
     <record model="account.tax.template" id="tva_acq_intra_specifique">
       <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
       <field name="name">TVA déd. s/ acq. intracommunautaire (achat) 8,5%</field>
@@ -979,43 +628,7 @@
       <field name="type_tax_use">purchase</field>
     </record>
 
-    <record model="account.tax.template" id="tva_acq_intra_intermediaire_temp">
-      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-      <field name="name">TVA déd. s/ acq. intracommunautaire (achat) 7,0%</field>
-      <field name="description">ACH_UE_ded.-7.0</field>
-      <field name="amount" eval="0.07"/>
-      <field name="type">percent</field>
-      <field name="tax_code_id" ref="tax_intra_acq_70"/>
-      <field name="tax_sign" eval="-1"/>
-
-      <field name="account_collected_id" ref="pcg_445662"/>
-      <field name="account_paid_id" ref="pcg_445662"/>
-
-      <field name="ref_tax_code_id" ref="tax_intra_acq_70"/>
-      <field name="ref_tax_sign" eval="1"/>
-      <field name="sequence" eval="10"/>
-      <field name="type_tax_use">purchase</field>
-    </record>
-
     <record model="account.tax.template" id="tva_acq_intra_reduite">
-      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-      <field name="name">TVA déd. s/ acq. intracommunautaire (achat) 5,0%</field>
-      <field name="description">ACH_UE_ded.-5.0</field>
-      <field name="amount" eval="0.050"/>
-      <field name="type">percent</field>
-      <field name="tax_code_id" ref="tax_intra_acq_50"/>
-      <field name="tax_sign" eval="-1"/>
-
-      <field name="account_collected_id" ref="pcg_445662"/>
-      <field name="account_paid_id" ref="pcg_445662"/>
-
-      <field name="ref_tax_code_id" ref="tax_intra_acq_50"/>
-      <field name="ref_tax_sign" eval="1"/>
-      <field name="sequence" eval="10"/>
-      <field name="type_tax_use">purchase</field>
-    </record>
-
-    <record model="account.tax.template" id="tva_acq_intra_reduite_temp">
       <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
       <field name="name">TVA déd. s/ acq. intracommunautaire (achat) 5,5%</field>
       <field name="description">ACH_UE_ded.-5.5</field>

From 8310cd19203ab8e90eca1e7c4ee5ba49c31b2e4a Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Tue, 25 Mar 2014 11:32:26 +0100
Subject: [PATCH 3/4] [FIX] sale: make invoice for SO grouped by partner based
 on partner_invoice_id instead of just partner_id

For two sale order, if the partner_id were different but the partner_invoice_id were identical, the make invoice grouped by partner created two different invoices

bzr revid: dle@openerp.com-20140325103226-vusygdpd74yha91m
---
 addons/sale/sale.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index bdadc4489da..364ca36b1c2 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -515,7 +515,7 @@ class sale_order(osv.osv):
                     lines.append(line.id)
             created_lines = obj_sale_order_line.invoice_line_create(cr, uid, lines)
             if created_lines:
-                invoices.setdefault(o.partner_id.id, []).append((o, created_lines))
+                invoices.setdefault(o.partner_invoice_id.id or o.partner_id.id, []).append((o, created_lines))
         if not invoices:
             for o in self.browse(cr, uid, ids, context=context):
                 for i in o.invoice_ids:

From 6d60e0ee29fc13da70a480fb247dd61baae4701c Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Tue, 25 Mar 2014 11:49:21 +0100
Subject: [PATCH 4/4] [FIX] project: on project template duplication, keep
 original tasks stages

bzr revid: dle@openerp.com-20140325104921-x8zjx5p71l1o3uif
---
 addons/project/project.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/addons/project/project.py b/addons/project/project.py
index d7bc7113818..219f42c9696 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -737,9 +737,10 @@ class task(base_stage, osv.osv):
             context = {}
         if default is None:
             default = {}
-        stage = self._get_default_stage_id(cr, uid, context=context)
-        if stage:
-            default['stage_id'] = stage
+        if not context.get('copy', False):
+            stage = self._get_default_stage_id(cr, uid, context=context)
+            if stage:
+                default['stage_id'] = stage
         return super(task, self).copy(cr, uid, id, default, context)
 
     def _is_template(self, cr, uid, ids, field_name, arg, context=None):