From 412561c37bf814ac11b16de60135256b89cef155 Mon Sep 17 00:00:00 2001
From: niv <niv@niv-laptop>
Date: Mon, 18 Oct 2010 12:35:57 +0200
Subject: [PATCH 1/6] [IMP] Modified Belgian accounting localization to have
 correct default tax account

bzr revid: niv@niv-laptop-20101018103557-au9q9mzcf6ei8ijb
---
 addons/account/account.py               | 10 +++--
 addons/l10n_be/account_pcmn_belgium.xml | 50 +++++++++++++++++++++++++
 2 files changed, 56 insertions(+), 4 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index f65f8edd56f..3f0784247cd 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -2874,10 +2874,12 @@ class wizard_multi_charts_accounts(osv.osv_memory):
                     obj_ac_fp.create(cr, uid, vals_acc)
         
         ir_values = self.pool.get('ir.values')
-        ir_values.set(cr, uid, key='default', key2=False, name="taxes_id", company=obj_multi.company_id.id
-                      , models =[('product.product',False)], value=[tax_template_to_tax[obj_multi.sale_tax.id]])
-        ir_values.set(cr, uid, key='default', key2=False, name="supplier_taxes_id", company=obj_multi.company_id.id
-                      , models =[('product.product',False)], value=[tax_template_to_tax[obj_multi.purchase_tax.id]])
+        if obj_multi.sale_tax:
+            ir_values.set(cr, uid, key='default', key2=False, name="taxes_id", company=obj_multi.company_id.id
+                          , models =[('product.product',False)], value=[tax_template_to_tax[obj_multi.sale_tax.id]])
+        if obj_multi.purchase_tax:
+            ir_values.set(cr, uid, key='default', key2=False, name="supplier_taxes_id", company=obj_multi.company_id.id
+                          , models =[('product.product',False)], value=[tax_template_to_tax[obj_multi.purchase_tax.id]])
 
 wizard_multi_charts_accounts()
 
diff --git a/addons/l10n_be/account_pcmn_belgium.xml b/addons/l10n_be/account_pcmn_belgium.xml
index dc6c86fc9fa..7482250db8d 100644
--- a/addons/l10n_be/account_pcmn_belgium.xml
+++ b/addons/l10n_be/account_pcmn_belgium.xml
@@ -6666,6 +6666,7 @@
             <field name="base_code_id" ref="vat_code_a45"/>
             <field name="ref_base_code_id" ref="vat_code_a49"/>
             <field name="type_tax_use">sale</field>
+            <field name="sequence">5</field>
         </record>
         <record id="vat_0" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6676,6 +6677,7 @@
             <field name="base_code_id" ref="vat_code_a00"/>
             <field name="ref_base_code_id" ref="vat_code_a49"/>
             <field name="type_tax_use">sale</field>
+            <field name="sequence">2</field>
         </record>
         <record id="vat_6" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6690,6 +6692,7 @@
             <field name="ref_base_code_id" ref="vat_code_a49"/>
             <field name="ref_tax_code_id" ref="vat_code_a64"/>
             <field name="type_tax_use">sale</field>
+            <field name="sequence">3</field>
         </record>
         <record id="vat_12" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6704,6 +6707,7 @@
             <field name="ref_base_code_id" ref="vat_code_a49"/>
             <field name="ref_tax_code_id" ref="vat_code_a64"/>
             <field name="type_tax_use">sale</field>
+            <field name="sequence">4</field>
         </record>
         <record id="vat_21" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6718,6 +6722,7 @@
             <field name="ref_base_code_id" ref="vat_code_a49"/>
             <field name="ref_tax_code_id" ref="vat_code_a64"/>
             <field name="type_tax_use">sale</field>
+            <field name="sequence">1</field>
         </record>
         <record id="vat_21_s" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6732,6 +6737,7 @@
             <field name="ref_base_code_id" ref="vat_code_a49"/>
             <field name="ref_tax_code_id" ref="vat_code_a64"/>
             <field name="type_tax_use">sale</field>
+            <field name="sequence">6</field>
         </record>
 
 
@@ -6744,6 +6750,7 @@
             <field name="type">percent</field>
             <field eval="1" name="child_depend"/>
             <field name="type_tax_use">purchase</field>
+            <field name="sequence">7</field>
         </record>
         <record id="vat_0_buy_bsd_1" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6754,6 +6761,7 @@
             <field name="base_code_id" ref="vat_code_a82"/>
             <field name="ref_base_code_id" ref="vat_code_a85"/>
             <field name="type_tax_use">purchase</field>
+            <field name="sequence">8</field>
         </record>
         <record id="vat_0_buy_bsd_2" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6764,6 +6772,7 @@
             <field name="ref_base_code_id" ref="vat_code_a82"/>
             <field eval="-1" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
+            <field name="sequence">9</field>
         </record>
         <record id="vat_0_buy_mar" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6773,6 +6782,7 @@
             <field name="type">percent</field>
             <field eval="1" name="child_depend"/>
             <field name="type_tax_use">purchase</field>
+            <field name="sequence">10</field>
         </record>
         <record id="vat_0_buy_mar_1" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6783,6 +6793,7 @@
             <field name="base_code_id" ref="vat_code_a81"/>
             <field name="ref_base_code_id" ref="vat_code_a85"/>
             <field name="type_tax_use">purchase</field>
+            <field name="sequence">11</field>
         </record>
         <record id="vat_0_buy_mar_2" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6793,6 +6804,7 @@
             <field name="ref_base_code_id" ref="vat_code_a81"/>
             <field eval="-1" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
+            <field name="sequence">12</field>
         </record>
         <record id="vat_6_buy_bsd" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6802,6 +6814,7 @@
             <field name="type">percent</field>
             <field eval="1" name="child_depend"/>
             <field name="type_tax_use">purchase</field>
+            <field name="sequence">13</field>
         </record>
         <record id="vat_6_buy_bsd_1" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6816,6 +6829,7 @@
             <field name="ref_base_code_id" ref="vat_code_a85"/>
             <field name="ref_tax_code_id" ref="vat_code_a63"/>
             <field name="type_tax_use">purchase</field>
+            <field name="sequence">14</field>
         </record>
         <record id="vat_6_buy_bsd_2" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6826,6 +6840,7 @@
             <field name="ref_base_code_id" ref="vat_code_a82"/>
             <field eval="-1" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
+            <field name="sequence">15</field>
         </record>
         <record id="vat_12_buy_bsd" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6835,6 +6850,7 @@
             <field name="type">percent</field>
             <field eval="1" name="child_depend"/>
             <field name="type_tax_use">purchase</field>
+            <field name="sequence">16</field>
         </record>
         <record id="vat_12_buy_bsd_1" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6849,6 +6865,7 @@
             <field name="ref_base_code_id" ref="vat_code_a85"/>
             <field name="ref_tax_code_id" ref="vat_code_a63"/>
             <field name="type_tax_use">purchase</field>
+            <field name="sequence">17</field>
         </record>
         <record id="vat_12_buy_bsd_2" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6859,6 +6876,7 @@
             <field name="ref_base_code_id" ref="vat_code_a82"/>
             <field eval="-1" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
+            <field name="sequence">18</field>
         </record>
         <record id="vat_21_buy_bsd" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6868,6 +6886,7 @@
             <field name="type">percent</field>
             <field eval="1" name="child_depend"/>
             <field name="type_tax_use">purchase</field>
+            <field name="sequence">19</field>
         </record>
         <record id="vat_21_buy_bsd_1" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6882,6 +6901,7 @@
             <field name="ref_base_code_id" ref="vat_code_a85"/>
             <field name="ref_tax_code_id" ref="vat_code_a63"/>
             <field name="type_tax_use">purchase</field>
+            <field name="sequence">20</field>
         </record>
         <record id="vat_21_buy_bsd_2" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6892,6 +6912,7 @@
             <field name="ref_base_code_id" ref="vat_code_a82"/>
             <field eval="-1" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
+            <field name="sequence">21</field>
         </record>
         <record id="vat_21_buy_ser" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6901,6 +6922,7 @@
             <field name="type">percent</field>
             <field eval="1" name="child_depend"/>
             <field name="type_tax_use">purchase</field>
+            <field name="sequence">22</field>
         </record>
         <record id="vat_21_buy_ser_1" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6915,6 +6937,7 @@
             <field name="ref_base_code_id" ref="vat_code_a85"/>
             <field name="ref_tax_code_id" ref="vat_code_a63"/>
             <field name="type_tax_use">purchase</field>
+            <field name="sequence">23</field>
         </record>
         <record id="vat_21_buy_ser_2" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6925,6 +6948,7 @@
             <field name="ref_base_code_id" ref="vat_code_a82"/>
             <field eval="-1" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
+            <field name="sequence">24</field>
         </record>
 
 
@@ -6936,6 +6960,7 @@
             <field name="type">percent</field>
             <field eval="1" name="child_depend"/>
             <field name="type_tax_use">purchase</field>
+            <field name="sequence">25</field>
         </record>
         <record id="vat_6_buy_mar_1" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6950,6 +6975,7 @@
             <field name="ref_base_code_id" ref="vat_code_a85"/>
             <field name="ref_tax_code_id" ref="vat_code_a63"/>
             <field name="type_tax_use">purchase</field>
+            <field name="sequence">26</field>
         </record>
         <record id="vat_6_buy_mar_2" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6960,6 +6986,7 @@
             <field name="ref_base_code_id" ref="vat_code_a81"/>
             <field eval="-1" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
+            <field name="sequence">27</field>
         </record>
         <record id="vat_12_buy_mar" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6969,6 +6996,7 @@
             <field name="type">percent</field>
             <field eval="1" name="child_depend"/>
             <field name="type_tax_use">purchase</field>
+            <field name="sequence">28</field>
         </record>
         <record id="vat_12_buy_mar_1" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6983,6 +7011,7 @@
             <field name="ref_base_code_id" ref="vat_code_a85"/>
             <field name="ref_tax_code_id" ref="vat_code_a63"/>
             <field name="type_tax_use">purchase</field>
+            <field name="sequence">29</field>
         </record>
         <record id="vat_12_buy_mar_2" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6993,6 +7022,7 @@
             <field name="ref_base_code_id" ref="vat_code_a81"/>
             <field eval="-1" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
+            <field name="sequence">30</field>
         </record>
         <record id="vat_21_buy_mar" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -7002,6 +7032,7 @@
             <field name="type">percent</field>
             <field eval="1" name="child_depend"/>
             <field name="type_tax_use">purchase</field>
+            <field name="sequence">31</field>
         </record>
         <record id="vat_21_buy_mar_1" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -7016,6 +7047,7 @@
             <field name="ref_base_code_id" ref="vat_code_a85"/>
             <field name="ref_tax_code_id" ref="vat_code_a63"/>
             <field name="type_tax_use">purchase</field>
+            <field name="sequence">32</field>
         </record>
         <record id="vat_21_buy_mar_2" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -7026,6 +7058,7 @@
             <field name="ref_base_code_id" ref="vat_code_a81"/>
             <field eval="-1" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
+            <field name="sequence">33</field>
         </record>
 
     <!-- Régime Extra-Communautaire -->
@@ -7039,6 +7072,7 @@
             <field name="base_code_id" ref="vat_code_a46"/>
             <field name="ref_base_code_id" ref="vat_code_a48"/>
             <field name="type_tax_use">sale</field>
+            <field name="sequence">34</field>
         </record>
     <!-- Purchases VAT -->
         <record id="vat_XO_buy" model="account.tax.template">
@@ -7054,6 +7088,7 @@
             <field name="ref_base_code_id" ref="vat_code_a87"/>
             <field eval="-1" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
+            <field name="sequence">35</field>
         </record>
 
 
@@ -7068,6 +7103,7 @@
             <field name="base_code_id" ref="vat_code_a46"/>
             <field name="ref_base_code_id" ref="vat_code_a48"/>
             <field name="type_tax_use">sale</field>
+            <field name="sequence">36</field>
         </record>
         <record id="vat_IO_S" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -7078,6 +7114,7 @@
             <field name="base_code_id" ref="vat_code_a44a"/>
             <field name="ref_base_code_id" ref="vat_code_a48"/>
             <field name="type_tax_use">sale</field>
+            <field name="sequence">37</field>
         </record>
         <record id="vat_IO_abc" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -7088,6 +7125,7 @@
             <field name="base_code_id" ref="vat_code_a44b"/>
             <field name="ref_base_code_id" ref="vat_code_a48"/>
             <field name="type_tax_use">sale</field>
+            <field name="sequence">38</field>
         </record>
 
 
@@ -7100,6 +7138,7 @@
             <field name="type">percent</field>
             <field eval="1" name="child_depend"/>
             <field name="type_tax_use">purchase</field>
+            <field name="sequence">39</field>
         </record>
         <record id="vat_IO_buy_21b_1" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -7113,6 +7152,7 @@
             <field name="tax_code_id" ref="vat_code_a55"/>
             <field name="ref_base_code_id" ref="vat_code_a84"/>
             <field name="type_tax_use">purchase</field>
+            <field name="sequence">40</field>
         </record>
         <record id="vat_IO_buy_21b_2" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -7128,6 +7168,7 @@
             <field name="ref_base_code_id" ref="vat_code_a82"/>
             <field eval="-1" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
+            <field name="sequence">41</field>
         </record>
         <record id="vat_IO_buy_21b_3" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -7138,6 +7179,7 @@
             <field name="ref_base_code_id" ref="vat_code_a86"/>
             <field eval="-1" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
+            <field name="sequence">42</field>
         </record>
        <record id="vat_IO_buy_21m" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -7147,6 +7189,7 @@
             <field name="type">percent</field>
             <field eval="1" name="child_depend"/>
             <field name="type_tax_use">purchase</field>
+            <field name="sequence">43</field>
         </record>
         <record id="vat_IO_buy_21m_1" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -7160,6 +7203,7 @@
             <field name="tax_code_id" ref="vat_code_a55"/>
             <field name="ref_base_code_id" ref="vat_code_a84"/>
             <field name="type_tax_use">purchase</field>
+            <field name="sequence">44</field>
         </record>
         <record id="vat_IO_buy_21m_2" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -7175,6 +7219,7 @@
             <field name="ref_base_code_id" ref="vat_code_a81"/>
             <field eval="-1" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
+            <field name="sequence">45</field>
         </record>
         <record id="vat_IO_buy_21m_3" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -7185,6 +7230,7 @@
             <field name="ref_base_code_id" ref="vat_code_a86"/>
             <field eval="-1" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
+            <field name="sequence">46</field>
         </record>
        <record id="vat_IO_buy_21s" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -7194,6 +7240,7 @@
             <field name="type">percent</field>
             <field eval="1" name="child_depend"/>
             <field name="type_tax_use">purchase</field>
+            <field name="sequence">47</field>
         </record>
         <record id="vat_IO_buy_21s_1" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -7207,6 +7254,7 @@
             <field name="tax_code_id" ref="vat_code_a59"/>
             <field name="ref_base_code_id" ref="vat_code_a84"/>
             <field name="type_tax_use">purchase</field>
+            <field name="sequence">48</field>
         </record>
         <record id="vat_IO_buy_21s_2" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -7222,6 +7270,7 @@
             <field name="ref_base_code_id" ref="vat_code_a82"/>
             <field eval="-1" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
+            <field name="sequence">49</field>
         </record>
         <record id="vat_IO_buy_21s_3" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -7232,6 +7281,7 @@
             <field name="ref_base_code_id" ref="vat_code_a88"/>
             <field eval="-1" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
+            <field name="sequence">50</field>
         </record>
 
 

From a5f271f50de72282bbaaac624d14295eef7d51f4 Mon Sep 17 00:00:00 2001
From: nvi-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 19 Oct 2010 16:48:45 +0200
Subject: [PATCH 2/6] [FIX] Fixed problem with hr when we use a addons_path
 with multiple paths

bzr revid: nicolas.vanhoren@openerp.com-20101019144845-xaln01cug0hw8ykv
---
 addons/hr/hr.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index 240511a03a0..d3cb41fc89d 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -184,9 +184,12 @@ class hr_employee(osv.osv):
         return {'value': {'work_email':mail.user_email}}
 
     def _get_photo(self, cr, uid, context=None):
-        return open(os.path.join(
-            tools.config['addons_path'], 'hr/image', 'photo.png'),
-                    'rb') .read().encode('base64')
+        paths = tools.config['addons_path'].split(",")
+        for path in paths:
+            full_path = os.path.join(path, 'hr/image', 'photo.png')
+            if os.path.exists(full_path):
+                return open(full_path,'rb') .read().encode('base64')
+        raise Exception("photo.png could not be found")
 
     _defaults = {
         'active': 1,

From 53d9dc8d8119728a7091d7c99eba83c1065ac7be Mon Sep 17 00:00:00 2001
From: nvi-openerp <nicolas.vanhoren@openerp.com>
Date: Mon, 25 Oct 2010 12:05:42 +0200
Subject: [PATCH 3/6] [FIX] Fixed hr get_photo issue.

bzr revid: nicolas.vanhoren@openerp.com-20101025100542-bfee6qo0t4e28269
---
 addons/hr/hr.py | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index f173e7f04ec..0f499c43ddd 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -25,6 +25,8 @@ from osv import fields, osv
 import tools
 from tools.translate import _
 
+import addons
+
 class hr_employee_category(osv.osv):
 
     def name_get(self, cr, uid, ids, context=None):
@@ -180,12 +182,8 @@ class hr_employee(osv.osv):
         return {'value': {'work_email' : work_email}}
 
     def _get_photo(self, cr, uid, context=None):
-        paths = tools.config['addons_path'].split(",")
-        for path in paths:
-            full_path = os.path.join(path, 'hr/image', 'photo.png')
-            if os.path.exists(full_path):
-                return open(full_path,'rb') .read().encode('base64')
-        raise Exception("photo.png could not be found")
+        res_path = addons.get_module_resource("hr","image/photo.png")
+        return open(res_path,'rb').read().encode('base64')
 
     _defaults = {
         'active': 1,

From e6a27d1f4faa773335d586f2bf2852c338101ead Mon Sep 17 00:00:00 2001
From: nvi-openerp <nicolas.vanhoren@openerp.com>
Date: Mon, 25 Oct 2010 13:40:45 +0200
Subject: [PATCH 4/6] [IMP] Changed sequences in belgian accouting

bzr revid: nicolas.vanhoren@openerp.com-20101025114045-onrpl83ngufo5lmt
---
 addons/l10n_be/account_pcmn_belgium.xml | 51 +------------------------
 1 file changed, 1 insertion(+), 50 deletions(-)

diff --git a/addons/l10n_be/account_pcmn_belgium.xml b/addons/l10n_be/account_pcmn_belgium.xml
index 7482250db8d..3471a184d62 100644
--- a/addons/l10n_be/account_pcmn_belgium.xml
+++ b/addons/l10n_be/account_pcmn_belgium.xml
@@ -6666,7 +6666,6 @@
             <field name="base_code_id" ref="vat_code_a45"/>
             <field name="ref_base_code_id" ref="vat_code_a49"/>
             <field name="type_tax_use">sale</field>
-            <field name="sequence">5</field>
         </record>
         <record id="vat_0" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6677,7 +6676,6 @@
             <field name="base_code_id" ref="vat_code_a00"/>
             <field name="ref_base_code_id" ref="vat_code_a49"/>
             <field name="type_tax_use">sale</field>
-            <field name="sequence">2</field>
         </record>
         <record id="vat_6" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6692,7 +6690,6 @@
             <field name="ref_base_code_id" ref="vat_code_a49"/>
             <field name="ref_tax_code_id" ref="vat_code_a64"/>
             <field name="type_tax_use">sale</field>
-            <field name="sequence">3</field>
         </record>
         <record id="vat_12" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6707,7 +6704,6 @@
             <field name="ref_base_code_id" ref="vat_code_a49"/>
             <field name="ref_tax_code_id" ref="vat_code_a64"/>
             <field name="type_tax_use">sale</field>
-            <field name="sequence">4</field>
         </record>
         <record id="vat_21" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6722,7 +6718,7 @@
             <field name="ref_base_code_id" ref="vat_code_a49"/>
             <field name="ref_tax_code_id" ref="vat_code_a64"/>
             <field name="type_tax_use">sale</field>
-            <field name="sequence">1</field>
+            <field name="sequence">0</field>
         </record>
         <record id="vat_21_s" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6737,7 +6733,6 @@
             <field name="ref_base_code_id" ref="vat_code_a49"/>
             <field name="ref_tax_code_id" ref="vat_code_a64"/>
             <field name="type_tax_use">sale</field>
-            <field name="sequence">6</field>
         </record>
 
 
@@ -6750,7 +6745,6 @@
             <field name="type">percent</field>
             <field eval="1" name="child_depend"/>
             <field name="type_tax_use">purchase</field>
-            <field name="sequence">7</field>
         </record>
         <record id="vat_0_buy_bsd_1" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6761,7 +6755,6 @@
             <field name="base_code_id" ref="vat_code_a82"/>
             <field name="ref_base_code_id" ref="vat_code_a85"/>
             <field name="type_tax_use">purchase</field>
-            <field name="sequence">8</field>
         </record>
         <record id="vat_0_buy_bsd_2" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6772,7 +6765,6 @@
             <field name="ref_base_code_id" ref="vat_code_a82"/>
             <field eval="-1" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
-            <field name="sequence">9</field>
         </record>
         <record id="vat_0_buy_mar" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6782,7 +6774,6 @@
             <field name="type">percent</field>
             <field eval="1" name="child_depend"/>
             <field name="type_tax_use">purchase</field>
-            <field name="sequence">10</field>
         </record>
         <record id="vat_0_buy_mar_1" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6793,7 +6784,6 @@
             <field name="base_code_id" ref="vat_code_a81"/>
             <field name="ref_base_code_id" ref="vat_code_a85"/>
             <field name="type_tax_use">purchase</field>
-            <field name="sequence">11</field>
         </record>
         <record id="vat_0_buy_mar_2" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6804,7 +6794,6 @@
             <field name="ref_base_code_id" ref="vat_code_a81"/>
             <field eval="-1" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
-            <field name="sequence">12</field>
         </record>
         <record id="vat_6_buy_bsd" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6814,7 +6803,6 @@
             <field name="type">percent</field>
             <field eval="1" name="child_depend"/>
             <field name="type_tax_use">purchase</field>
-            <field name="sequence">13</field>
         </record>
         <record id="vat_6_buy_bsd_1" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6829,7 +6817,6 @@
             <field name="ref_base_code_id" ref="vat_code_a85"/>
             <field name="ref_tax_code_id" ref="vat_code_a63"/>
             <field name="type_tax_use">purchase</field>
-            <field name="sequence">14</field>
         </record>
         <record id="vat_6_buy_bsd_2" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6840,7 +6827,6 @@
             <field name="ref_base_code_id" ref="vat_code_a82"/>
             <field eval="-1" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
-            <field name="sequence">15</field>
         </record>
         <record id="vat_12_buy_bsd" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6850,7 +6836,6 @@
             <field name="type">percent</field>
             <field eval="1" name="child_depend"/>
             <field name="type_tax_use">purchase</field>
-            <field name="sequence">16</field>
         </record>
         <record id="vat_12_buy_bsd_1" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6865,7 +6850,6 @@
             <field name="ref_base_code_id" ref="vat_code_a85"/>
             <field name="ref_tax_code_id" ref="vat_code_a63"/>
             <field name="type_tax_use">purchase</field>
-            <field name="sequence">17</field>
         </record>
         <record id="vat_12_buy_bsd_2" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6876,7 +6860,6 @@
             <field name="ref_base_code_id" ref="vat_code_a82"/>
             <field eval="-1" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
-            <field name="sequence">18</field>
         </record>
         <record id="vat_21_buy_bsd" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6886,7 +6869,6 @@
             <field name="type">percent</field>
             <field eval="1" name="child_depend"/>
             <field name="type_tax_use">purchase</field>
-            <field name="sequence">19</field>
         </record>
         <record id="vat_21_buy_bsd_1" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6901,7 +6883,6 @@
             <field name="ref_base_code_id" ref="vat_code_a85"/>
             <field name="ref_tax_code_id" ref="vat_code_a63"/>
             <field name="type_tax_use">purchase</field>
-            <field name="sequence">20</field>
         </record>
         <record id="vat_21_buy_bsd_2" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6912,7 +6893,6 @@
             <field name="ref_base_code_id" ref="vat_code_a82"/>
             <field eval="-1" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
-            <field name="sequence">21</field>
         </record>
         <record id="vat_21_buy_ser" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6922,7 +6902,6 @@
             <field name="type">percent</field>
             <field eval="1" name="child_depend"/>
             <field name="type_tax_use">purchase</field>
-            <field name="sequence">22</field>
         </record>
         <record id="vat_21_buy_ser_1" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6937,7 +6916,6 @@
             <field name="ref_base_code_id" ref="vat_code_a85"/>
             <field name="ref_tax_code_id" ref="vat_code_a63"/>
             <field name="type_tax_use">purchase</field>
-            <field name="sequence">23</field>
         </record>
         <record id="vat_21_buy_ser_2" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6948,7 +6926,6 @@
             <field name="ref_base_code_id" ref="vat_code_a82"/>
             <field eval="-1" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
-            <field name="sequence">24</field>
         </record>
 
 
@@ -6960,7 +6937,6 @@
             <field name="type">percent</field>
             <field eval="1" name="child_depend"/>
             <field name="type_tax_use">purchase</field>
-            <field name="sequence">25</field>
         </record>
         <record id="vat_6_buy_mar_1" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6975,7 +6951,6 @@
             <field name="ref_base_code_id" ref="vat_code_a85"/>
             <field name="ref_tax_code_id" ref="vat_code_a63"/>
             <field name="type_tax_use">purchase</field>
-            <field name="sequence">26</field>
         </record>
         <record id="vat_6_buy_mar_2" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6986,7 +6961,6 @@
             <field name="ref_base_code_id" ref="vat_code_a81"/>
             <field eval="-1" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
-            <field name="sequence">27</field>
         </record>
         <record id="vat_12_buy_mar" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6996,7 +6970,6 @@
             <field name="type">percent</field>
             <field eval="1" name="child_depend"/>
             <field name="type_tax_use">purchase</field>
-            <field name="sequence">28</field>
         </record>
         <record id="vat_12_buy_mar_1" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -7011,7 +6984,6 @@
             <field name="ref_base_code_id" ref="vat_code_a85"/>
             <field name="ref_tax_code_id" ref="vat_code_a63"/>
             <field name="type_tax_use">purchase</field>
-            <field name="sequence">29</field>
         </record>
         <record id="vat_12_buy_mar_2" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -7022,7 +6994,6 @@
             <field name="ref_base_code_id" ref="vat_code_a81"/>
             <field eval="-1" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
-            <field name="sequence">30</field>
         </record>
         <record id="vat_21_buy_mar" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -7032,7 +7003,6 @@
             <field name="type">percent</field>
             <field eval="1" name="child_depend"/>
             <field name="type_tax_use">purchase</field>
-            <field name="sequence">31</field>
         </record>
         <record id="vat_21_buy_mar_1" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -7047,7 +7017,6 @@
             <field name="ref_base_code_id" ref="vat_code_a85"/>
             <field name="ref_tax_code_id" ref="vat_code_a63"/>
             <field name="type_tax_use">purchase</field>
-            <field name="sequence">32</field>
         </record>
         <record id="vat_21_buy_mar_2" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -7058,7 +7027,6 @@
             <field name="ref_base_code_id" ref="vat_code_a81"/>
             <field eval="-1" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
-            <field name="sequence">33</field>
         </record>
 
     <!-- Régime Extra-Communautaire -->
@@ -7072,7 +7040,6 @@
             <field name="base_code_id" ref="vat_code_a46"/>
             <field name="ref_base_code_id" ref="vat_code_a48"/>
             <field name="type_tax_use">sale</field>
-            <field name="sequence">34</field>
         </record>
     <!-- Purchases VAT -->
         <record id="vat_XO_buy" model="account.tax.template">
@@ -7088,7 +7055,6 @@
             <field name="ref_base_code_id" ref="vat_code_a87"/>
             <field eval="-1" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
-            <field name="sequence">35</field>
         </record>
 
 
@@ -7103,7 +7069,6 @@
             <field name="base_code_id" ref="vat_code_a46"/>
             <field name="ref_base_code_id" ref="vat_code_a48"/>
             <field name="type_tax_use">sale</field>
-            <field name="sequence">36</field>
         </record>
         <record id="vat_IO_S" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -7114,7 +7079,6 @@
             <field name="base_code_id" ref="vat_code_a44a"/>
             <field name="ref_base_code_id" ref="vat_code_a48"/>
             <field name="type_tax_use">sale</field>
-            <field name="sequence">37</field>
         </record>
         <record id="vat_IO_abc" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -7125,7 +7089,6 @@
             <field name="base_code_id" ref="vat_code_a44b"/>
             <field name="ref_base_code_id" ref="vat_code_a48"/>
             <field name="type_tax_use">sale</field>
-            <field name="sequence">38</field>
         </record>
 
 
@@ -7138,7 +7101,6 @@
             <field name="type">percent</field>
             <field eval="1" name="child_depend"/>
             <field name="type_tax_use">purchase</field>
-            <field name="sequence">39</field>
         </record>
         <record id="vat_IO_buy_21b_1" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -7152,7 +7114,6 @@
             <field name="tax_code_id" ref="vat_code_a55"/>
             <field name="ref_base_code_id" ref="vat_code_a84"/>
             <field name="type_tax_use">purchase</field>
-            <field name="sequence">40</field>
         </record>
         <record id="vat_IO_buy_21b_2" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -7168,7 +7129,6 @@
             <field name="ref_base_code_id" ref="vat_code_a82"/>
             <field eval="-1" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
-            <field name="sequence">41</field>
         </record>
         <record id="vat_IO_buy_21b_3" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -7179,7 +7139,6 @@
             <field name="ref_base_code_id" ref="vat_code_a86"/>
             <field eval="-1" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
-            <field name="sequence">42</field>
         </record>
        <record id="vat_IO_buy_21m" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -7189,7 +7148,6 @@
             <field name="type">percent</field>
             <field eval="1" name="child_depend"/>
             <field name="type_tax_use">purchase</field>
-            <field name="sequence">43</field>
         </record>
         <record id="vat_IO_buy_21m_1" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -7203,7 +7161,6 @@
             <field name="tax_code_id" ref="vat_code_a55"/>
             <field name="ref_base_code_id" ref="vat_code_a84"/>
             <field name="type_tax_use">purchase</field>
-            <field name="sequence">44</field>
         </record>
         <record id="vat_IO_buy_21m_2" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -7219,7 +7176,6 @@
             <field name="ref_base_code_id" ref="vat_code_a81"/>
             <field eval="-1" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
-            <field name="sequence">45</field>
         </record>
         <record id="vat_IO_buy_21m_3" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -7230,7 +7186,6 @@
             <field name="ref_base_code_id" ref="vat_code_a86"/>
             <field eval="-1" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
-            <field name="sequence">46</field>
         </record>
        <record id="vat_IO_buy_21s" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -7240,7 +7195,6 @@
             <field name="type">percent</field>
             <field eval="1" name="child_depend"/>
             <field name="type_tax_use">purchase</field>
-            <field name="sequence">47</field>
         </record>
         <record id="vat_IO_buy_21s_1" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -7254,7 +7208,6 @@
             <field name="tax_code_id" ref="vat_code_a59"/>
             <field name="ref_base_code_id" ref="vat_code_a84"/>
             <field name="type_tax_use">purchase</field>
-            <field name="sequence">48</field>
         </record>
         <record id="vat_IO_buy_21s_2" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -7270,7 +7223,6 @@
             <field name="ref_base_code_id" ref="vat_code_a82"/>
             <field eval="-1" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
-            <field name="sequence">49</field>
         </record>
         <record id="vat_IO_buy_21s_3" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -7281,7 +7233,6 @@
             <field name="ref_base_code_id" ref="vat_code_a88"/>
             <field eval="-1" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
-            <field name="sequence">50</field>
         </record>
 
 

From 3d8cbbdaaf9d7b4d6a2460a062cbfda634ec77b7 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Mon, 25 Oct 2010 16:38:47 +0200
Subject: [PATCH 5/6] [IMP] share: corrected typo in share URL formatting
 patterns

bzr revid: odo@openerp.com-20101025143847-lhcdroeyayydh71t
---
 addons/share/wizard/share_wizard.py       | 4 ++--
 addons/share/wizard/share_wizard_view.xml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/share/wizard/share_wizard.py b/addons/share/wizard/share_wizard.py
index 2d1fd252ecf..9349980933f 100644
--- a/addons/share/wizard/share_wizard.py
+++ b/addons/share/wizard/share_wizard.py
@@ -290,7 +290,7 @@ class share_create(osv.osv_memory):
         user_obj = self.pool.get('res.users')
         result_obj = self.pool.get('share.wizard.result.line')
         share_root_url = wizard_data.share_root_url
-        format_url = '%(login)' in share_root_url and '%(password)' in share_root_url
+        format_url = '%(login)s' in share_root_url and '%(password)s' in share_root_url
         existing_passwd_str = _('*usual password*')
         if wizard_data.user_type == 'new':
             for email in wizard_data.new_users.split('\n'):
@@ -430,7 +430,7 @@ class share_create(osv.osv_memory):
                 else:
                     body += _("This additional data has been automatically added to your current access.\n")
                     body += _("You may use your existing login and password to view it. As a reminder, your login is %s.\n") % result_line.login
-    
+
                 if not tools.email_send(
                                             user.user_email,
                                             email_to,
diff --git a/addons/share/wizard/share_wizard_view.xml b/addons/share/wizard/share_wizard_view.xml
index e6cade91c84..95fbc983c84 100644
--- a/addons/share/wizard/share_wizard_view.xml
+++ b/addons/share/wizard/share_wizard_view.xml
@@ -90,7 +90,7 @@
                     - 'action_id' (id of action)
                     - 'domain' (string expression for full domain to apply as sent to server, 
                                with dynamic data like 'uid' replaced by actual value (i.e. after eval)!)
-                    - 'share_root_url' : URL for direct access to share page (may include %(login) and %(password) placeholders)
+                    - 'share_root_url' : URL for direct access to share page (may include %(login)s and %(password)s placeholders)
          -->
         <record id="action_share_wizard" model="ir.actions.act_window">
             <field name="name">Share Wizard</field>
@@ -106,7 +106,7 @@
                     - 'action_id' (id of action)
                     - 'domain' (string expression for full domain to apply as sent to server, 
                                with dynamic data like 'uid' replaced by actual value (i.e. after eval)!)
-                    - 'share_root_url' : URL for direct access to share page (may include %(login) and %(password) placeholders)
+                    - 'share_root_url' : URL for direct access to share page (may include %(login)s and %(password)s placeholders)
          -->
         <record id="action_share_wizard_step1" model="ir.actions.act_window">
             <field name="name">Share Wizard</field>

From 3572ed909a2294a876fa6329593d976dd94594bb Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Mon, 25 Oct 2010 16:54:45 +0200
Subject: [PATCH 6/6] [IMP] project: avoid access rights issue when reading
 time_mode (uom) for fields_view_get

bzr revid: odo@openerp.com-20101025145445-ccgvic2uyqd50hi6
---
 addons/project/project.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/addons/project/project.py b/addons/project/project.py
index 294c711eaac..6c9f66dd009 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -483,7 +483,10 @@ class task(osv.osv):
 
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
         users_obj = self.pool.get('res.users')
-        obj_tm = users_obj.browse(cr, uid, uid, context).company_id.project_time_mode_id
+
+        # read uom as admin to avoid access rights issues, e.g. for portal/share users,
+        # this should be safe (no context passed to avoid side-effects)
+        obj_tm = users_obj.browse(cr, 1, uid).company_id.project_time_mode_id
         tm = obj_tm and obj_tm.name or 'Hours'
 
         res = super(task, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar, submenu=submenu)