diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index eafc2c3f605..7f86f86420d 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -113,7 +113,7 @@ class account_move_line(osv.osv):
                         account = journal_obj.default_debit_account_id
 
 
-                if account and ((not fields) or ('debit' in fields) or ('credit' in fields)) and 'partner_id' in data:
+                if account and ((not fields) or ('debit' in fields) or ('credit' in fields)) and 'partner_id' in data and (data['partner_id']):
                     part = self.pool.get('res.partner').browse(cr, uid, data['partner_id'])
                     account = self.pool.get('account.fiscal.position').map_account(cr, uid, part and part.property_account_position or False, account.id)
                     account = self.pool.get('account.account').browse(cr, uid, account)
@@ -707,6 +707,7 @@ class account_move_line(osv.osv):
         return result
 
     def unlink(self, cr, uid, ids, context={}, check=True):
+        print "CC"
         self._update_check(cr, uid, ids, context)
         result = False
         for line in self.browse(cr, uid, ids, context):
diff --git a/addons/account/report/invoice.rml b/addons/account/report/invoice.rml
index c38a1b39623..3542841e7b4 100644
--- a/addons/account/report/invoice.rml
+++ b/addons/account/report/invoice.rml
@@ -326,7 +326,7 @@
             <para style="terp_default_9">[[ l.name ]]</para>
           </td>
           <td>
-            <para style="terp_default_9">[[ ', '.join([lt.name for lt in l.invoice_line_tax_id]) ]]</para>
+            <para style="terp_default_9">[[ ', '.join([ lt.description or '' for lt in l.invoice_line_tax_id ]) ]]</para>
           </td>
           <td>
             <para style="terp_default_Right_9">[[ formatLang(l.quantity)]]</para>
@@ -489,7 +489,7 @@
           <blockTable colWidths="53.0,60.0,65.0" style="Table_Tax_Content">
             <tr>
               <td>
-                <para style="terp_default_Centre_8">[[ t.name ]]</para>
+                <para style="terp_default_Centre_8">[[ lt.description and lt.description + ' - ' + t.name or t.name ]] </para>
               </td>
               <td>
                 <para style="terp_default_Right_8">[[ formatLang(t.base) ]]</para>
diff --git a/addons/account_followup/__terp__.py b/addons/account_followup/__terp__.py
index 6a297ec668f..d626ccdd459 100644
--- a/addons/account_followup/__terp__.py
+++ b/addons/account_followup/__terp__.py
@@ -45,8 +45,8 @@
     'update_xml': [
         'security/ir.model.access.csv',
         'wizard/wizard_view.xml',
+        'followup_report_view.xml',
         'followup_view.xml',
-        'followup_report_view.xml'
     ],
     'demo_xml': ['followup_demo.xml'],
     'installable': True,
diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index b0ca8c8aef3..4364965cce6 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 ##############################################################################
 #
-#    OpenERP, Open Source Management Solution	
+#    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
 #    $Id$
 #
@@ -181,7 +181,7 @@ class crm_case_section(osv.osv):
                     'object': True
                 })
         return True
-    
+
     def name_get(self, cr, uid, ids, context={}):
         if not len(ids):
             return []
@@ -295,7 +295,7 @@ class crm_case_rule(osv.osv):
                 except (ValueError, KeyError, TypeError):
                     return False
         return True
-            
+
     _constraints = [
         (_check_mail, 'Error: The mail is not well formated', ['act_mail_body']),
     ]
@@ -505,7 +505,7 @@ class crm_case(osv.osv):
             action_ids = newactions
             level -= 1
         return True
-    
+
     def format_body(self, body):
         return tools.ustr(body.encode('ascii', 'replace'))
 
@@ -614,11 +614,11 @@ class crm_case(osv.osv):
 
                 # Send an email
                 tools.email_send(
-                    src, 
-                    dest, 
+                    src,
+                    dest,
                     "Reminder: [%s] %s" % (str(case.id), case.name, ),
                     self.format_body(body),
-                    reply_to=case.section_id.reply_to, 
+                    reply_to=case.section_id.reply_to,
                     tinycrm=str(case.id),
                     attach=attach_to_send
                 )
@@ -646,6 +646,9 @@ class crm_case(osv.osv):
             if not case.email_from:
                 raise osv.except_osv(_('Error!'),
                         _('You must put a Partner eMail to use this action!'))
+            if not case.description:
+                raise osv.except_osv(_('Error!'),
+                        _('Can not send mail with empty body,you should have description in the body'))
         self.__history(cr, uid, cases, _('Send'), history=True, email=False)
         for case in cases:
             self.write(cr, uid, [case.id], {
@@ -655,15 +658,15 @@ class crm_case(osv.osv):
                 })
             emails = [case.email_from] + (case.email_cc or '').split(',')
             emails = filter(None, emails)
-            body = case.description
+            body = case.description or ''
             if case.user_id.signature:
                 body += '\n\n%s' % (case.user_id.signature)
             tools.email_send(
-                case.user_id.address_id.email, 
+                case.user_id.address_id.email,
                 emails,
-                '['+str(case.id)+'] '+case.name, 
+                '['+str(case.id)+'] '+case.name,
                 self.format_body(body),
-                reply_to=case.section_id.reply_to, 
+                reply_to=case.section_id.reply_to,
                 tinycrm=str(case.id)
             )
         return True
diff --git a/addons/hr_expense/__terp__.py b/addons/hr_expense/__terp__.py
index a326191b0b1..fd7ad9d2530 100644
--- a/addons/hr_expense/__terp__.py
+++ b/addons/hr_expense/__terp__.py
@@ -51,7 +51,7 @@
         'hr_expense_report.xml',
         'process/hr_expense_process.xml'
     ],
-    'demo_xml': ['hr_expense_demo.xml', 'hr.expense.expense.csv'],
+    'demo_xml': ['hr.expense.expense.csv'],
     'installable': True,
     'active': False,
     'certificate': '0062479841789',
diff --git a/addons/l10n_be/account_pcmn_belgium.xml b/addons/l10n_be/account_pcmn_belgium.xml
index ccae720c08b..b5d183565c9 100644
--- a/addons/l10n_be/account_pcmn_belgium.xml
+++ b/addons/l10n_be/account_pcmn_belgium.xml
@@ -6628,6 +6628,16 @@
             <!-- VAT  Template -->
     <!-- Régime National -->
     <!-- Sales VAT -->
+        <record id="vat_0_co" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nbe_chart_template"/>
+            <field name="name">Cocontractants 0%</field>
+            <field name="description">NSCS 0</field>
+            <field eval="0.00" name="amount"/>
+            <field name="type">percent</field>
+            <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>
+        </record>
         <record id="vat_0" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
             <field name="name">TVA 0%</field>
@@ -6638,16 +6648,6 @@
             <field name="ref_base_code_id" ref="vat_code_a49"/>
             <field name="type_tax_use">sale</field>
         </record>
-        <record id="vat_0_co" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nbe_chart_template"/>
-            <field name="name">Cocontractants 0%</field>
-            <field name="description">NSS 0</field>
-            <field eval="0.00" name="amount"/>
-            <field name="type">percent</field>
-            <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>
-        </record>
         <record id="vat_6" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
             <field name="name">TVA 6%</field>
@@ -6655,7 +6655,7 @@
             <field eval="0.06" name="amount"/>
             <field name="type">percent</field>
             <field name="account_collected_id" ref="vat_payable06"/>
-            <field name="account_paid_id" ref="vat_refund06"/>
+            <field name="account_paid_id" ref="vat_payable06"/>
             <field name="base_code_id" ref="vat_code_a01"/>
             <field name="tax_code_id" ref="vat_code_a54"/>
             <field name="ref_base_code_id" ref="vat_code_a49"/>
@@ -6669,7 +6669,7 @@
             <field eval="0.12" name="amount"/>
             <field name="type">percent</field>
             <field name="account_collected_id" ref="vat_payable12"/>
-            <field name="account_paid_id" ref="vat_refund12"/>
+            <field name="account_paid_id" ref="vat_payable12"/>
             <field name="base_code_id" ref="vat_code_a02"/>
             <field name="tax_code_id" ref="vat_code_a54"/>
             <field name="ref_base_code_id" ref="vat_code_a49"/>
@@ -6683,7 +6683,7 @@
             <field eval="0.21" name="amount"/>
             <field name="type">percent</field>
             <field name="account_collected_id" ref="vat_payable21"/>
-            <field name="account_paid_id" ref="vat_refund21"/>
+            <field name="account_paid_id" ref="vat_payable21"/>
             <field name="base_code_id" ref="vat_code_a03"/>
             <field name="tax_code_id" ref="vat_code_a54"/>
             <field name="ref_base_code_id" ref="vat_code_a49"/>
@@ -6705,7 +6705,7 @@
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
             <field name="parent_id" ref="vat_0_buy_bsd"/>
             <field name="name">Biens et Services Divers Déductibles 0% (1)</field>
-            <field eval="0.06" name="amount"/>
+            <field eval="0.00" name="amount"/>
             <field name="type">percent</field>
             <field name="base_code_id" ref="vat_code_a82"/>
             <field name="ref_base_code_id" ref="vat_code_a85"/>
@@ -6715,7 +6715,7 @@
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
             <field name="parent_id" ref="vat_0_buy_bsd"/>
             <field name="name">Biens et Services Divers Déductibles 0% (2)</field>
-            <field eval="1.00" name="amount"/>
+            <field eval="0.00" name="amount"/>
             <field name="type">percent</field>
             <field name="ref_base_code_id" ref="vat_code_a82"/>
             <field eval="-1" name="ref_base_sign"/>
@@ -6724,7 +6724,7 @@
         <record id="vat_0_buy_mar" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
             <field name="name">Marchandises Déductibles 0%</field>
-            <field name="description">NSGSD 0</field>
+            <field name="description">NSTF 0</field>
             <field eval="1.00" name="amount"/>
             <field name="type">percent</field>
             <field eval="1" name="child_depend"/>
@@ -6744,23 +6744,12 @@
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
             <field name="parent_id" ref="vat_0_buy_mar"/>
             <field name="name">Marchandises Déductibles 0% (2)</field>
-            <field eval="1.00" name="amount"/>
+            <field eval="0.00" name="amount"/>
             <field name="type">percent</field>
             <field name="ref_base_code_id" ref="vat_code_a81"/>
             <field eval="-1" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
         </record>
-
-        <record id="vat_0_co_buy" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nbe_chart_template"/>
-            <field name="name">Cocontractants 0%</field>
-            <field name="description">NSS 0</field>
-            <field eval="0.00" name="amount"/>
-            <field name="type">percent</field>
-            <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>
-        </record>
         <record id="vat_6_buy_bsd" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
             <field name="name">Biens et Services Divers Déductibles 6%</field>
@@ -6776,7 +6765,7 @@
             <field name="name">Biens et Services Divers Déductibles 6% (1)</field>
             <field eval="0.06" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_paid_id" ref="vat_payable06"/>
+            <field name="account_paid_id" ref="vat_refund06"/>
             <field name="account_collected_id" ref="vat_refund06"/>
             <field name="base_code_id" ref="vat_code_a82"/>
             <field name="tax_code_id" ref="vat_code_a59"/>
@@ -6788,7 +6777,7 @@
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
             <field name="parent_id" ref="vat_6_buy_bsd"/>
             <field name="name">Biens et Services Divers Déductibles 6% (2)</field>
-            <field eval="1.00" name="amount"/>
+            <field eval="0.00" name="amount"/>
             <field name="type">percent</field>
             <field name="ref_base_code_id" ref="vat_code_a82"/>
             <field eval="-1" name="ref_base_sign"/>
@@ -6809,7 +6798,7 @@
             <field name="name">Biens et Services Divers Déductibles 12% (1)</field>
             <field eval="0.12" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_paid_id" ref="vat_payable12"/>
+            <field name="account_paid_id" ref="vat_refund12"/>
             <field name="account_collected_id" ref="vat_refund12"/>
             <field name="base_code_id" ref="vat_code_a82"/>
             <field name="tax_code_id" ref="vat_code_a59"/>
@@ -6821,7 +6810,7 @@
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
             <field name="parent_id" ref="vat_12_buy_bsd"/>
             <field name="name">Biens et Services Divers Déductibles 12% (2)</field>
-            <field eval="1.00" name="amount"/>
+            <field eval="0.00" name="amount"/>
             <field name="type">percent</field>
             <field name="ref_base_code_id" ref="vat_code_a82"/>
             <field eval="-1" name="ref_base_sign"/>
@@ -6842,7 +6831,7 @@
             <field name="name">Biens Déductibles 21% (1)</field>
             <field eval="0.21" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_paid_id" ref="vat_payable21"/>
+            <field name="account_paid_id" ref="vat_refund21"/>
             <field name="account_collected_id" ref="vat_refund21"/>
             <field name="base_code_id" ref="vat_code_a82"/>
             <field name="tax_code_id" ref="vat_code_a59"/>
@@ -6854,7 +6843,7 @@
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
             <field name="parent_id" ref="vat_21_buy_bsd"/>
             <field name="name">Biens Déductibles 21% (2)</field>
-            <field eval="1.00" name="amount"/>
+            <field eval="0.00" name="amount"/>
             <field name="type">percent</field>
             <field name="ref_base_code_id" ref="vat_code_a82"/>
             <field eval="-1" name="ref_base_sign"/>
@@ -6875,7 +6864,7 @@
             <field name="name">Services Divers Déductibles 21% (1)</field>
             <field eval="0.21" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_paid_id" ref="vat_payable21"/>
+            <field name="account_paid_id" ref="vat_refund21"/>
             <field name="account_collected_id" ref="vat_refund21"/>
             <field name="base_code_id" ref="vat_code_a82"/>
             <field name="tax_code_id" ref="vat_code_a59"/>
@@ -6887,7 +6876,7 @@
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
             <field name="parent_id" ref="vat_21_buy_ser"/>
             <field name="name">Services Divers Déductibles 21% (2)</field>
-            <field eval="1.00" name="amount"/>
+            <field eval="0.00" name="amount"/>
             <field name="type">percent</field>
             <field name="ref_base_code_id" ref="vat_code_a82"/>
             <field eval="-1" name="ref_base_sign"/>
@@ -6910,7 +6899,7 @@
             <field name="name">Marchandises Déductibles 6% (1)</field>
             <field eval="0.06" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_paid_id" ref="vat_payable06"/>
+            <field name="account_paid_id" ref="vat_refund06"/>
             <field name="account_collected_id" ref="vat_refund06"/>
             <field name="base_code_id" ref="vat_code_a81"/>
             <field name="tax_code_id" ref="vat_code_a59"/>
@@ -6922,7 +6911,7 @@
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
             <field name="parent_id" ref="vat_6_buy_mar"/>
             <field name="name">Marchandises Déductibles 6% (2)</field>
-            <field eval="1.00" name="amount"/>
+            <field eval="0.00" name="amount"/>
             <field name="type">percent</field>
             <field name="ref_base_code_id" ref="vat_code_a81"/>
             <field eval="-1" name="ref_base_sign"/>
@@ -6943,7 +6932,7 @@
             <field name="name">Marchandises Déductibles 12% (1)</field>
             <field eval="0.12" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_paid_id" ref="vat_payable12"/>
+            <field name="account_paid_id" ref="vat_refund12"/>
             <field name="account_collected_id" ref="vat_refund12"/>
             <field name="base_code_id" ref="vat_code_a81"/>
             <field name="tax_code_id" ref="vat_code_a59"/>
@@ -6955,7 +6944,7 @@
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
             <field name="parent_id" ref="vat_12_buy_mar"/>
             <field name="name">Marchandises Déductibles 12% (2)</field>
-            <field eval="1.00" name="amount"/>
+            <field eval="0.00" name="amount"/>
             <field name="type">percent</field>
             <field name="ref_base_code_id" ref="vat_code_a81"/>
             <field eval="-1" name="ref_base_sign"/>
@@ -6976,7 +6965,7 @@
             <field name="name">Marchandises Déductibles 21% (1)</field>
             <field eval="0.21" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_paid_id" ref="vat_payable21"/>
+            <field name="account_paid_id" ref="vat_refund21"/>
             <field name="account_collected_id" ref="vat_refund21"/>
             <field name="base_code_id" ref="vat_code_a81"/>
             <field name="tax_code_id" ref="vat_code_a59"/>
@@ -6988,7 +6977,7 @@
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
             <field name="parent_id" ref="vat_21_buy_mar"/>
             <field name="name">Marchandises Déductibles 21% (2)</field>
-            <field eval="1.00" name="amount"/>
+            <field eval="0.00" name="amount"/>
             <field name="type">percent</field>
             <field name="ref_base_code_id" ref="vat_code_a81"/>
             <field eval="-1" name="ref_base_sign"/>
@@ -6999,9 +6988,9 @@
     <!-- Sales VAT -->
         <record id="vat_XO" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
-            <field name="name">VAT 0% Exportations</field>
+            <field name="name">TVA 0% Exportations</field>
             <field name="description">ISEXP 0</field>
-            <field eval="1.00" name="amount"/>
+            <field eval="0.00" name="amount"/>
             <field name="type">percent</field>
             <field name="base_code_id" ref="vat_code_a47"/>
             <field name="ref_base_code_id" ref="vat_code_a49"/>
@@ -7028,9 +7017,9 @@
     <!-- Sales VAT -->
         <record id="vat_IO" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
-            <field name="name">VAT 0% Intracommunautaire</field>
+            <field name="name">TVA 0% Intracommunautaire</field>
             <field name="description">VI 0</field>
-            <field eval="1.00" name="amount"/>
+            <field eval="0.00" name="amount"/>
             <field name="type">percent</field>
             <field name="base_code_id" ref="vat_code_a47"/>
             <field name="ref_base_code_id" ref="vat_code_a49"/>
@@ -7052,7 +7041,7 @@
             <field name="name">Biens Déductibles 21% (1)</field>
             <field eval="0.21" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_paid_id" ref="vat_payable21"/>
+            <field name="account_paid_id" ref="vat_refund21"/>
             <field name="account_collected_id" ref="vat_refund21"/>
             <field name="base_code_id" ref="vat_code_a82"/>
             <field name="tax_code_id" ref="vat_code_a55"/>
@@ -7063,10 +7052,13 @@
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
             <field name="parent_id" ref="vat_IO_buy_21b"/>
             <field name="name">Biens Déductibles 21% (2)</field>
-            <field eval="0.21" name="amount"/>
+            <field eval="-0.21" name="amount"/>
             <field name="type">percent</field>
+            <field name="account_paid_id" ref="vat_payable21"/>
+            <field name="account_collected_id" ref="vat_payable21"/>
             <field name="base_code_id" ref="vat_code_a86"/>
             <field name="tax_code_id" ref="vat_code_a59"/>
+            <field eval="-1" name="tax_sign"/>
             <field name="ref_base_code_id" ref="vat_code_a82"/>
             <field eval="-1" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
@@ -7075,7 +7067,7 @@
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
             <field name="parent_id" ref="vat_IO_buy_21b"/>
             <field name="name">Biens Déductibles 21% (3)</field>
-            <field eval="0.21" name="amount"/>
+            <field eval="0.00" name="amount"/>
             <field name="type">percent</field>
             <field name="ref_base_code_id" ref="vat_code_a86"/>
             <field eval="-1" name="ref_base_sign"/>
@@ -7096,7 +7088,7 @@
             <field name="name">Marchandises Déductibles 21% (1)</field>
             <field eval="0.21" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_paid_id" ref="vat_payable21"/>
+            <field name="account_paid_id" ref="vat_refund21"/>
             <field name="account_collected_id" ref="vat_refund21"/>
             <field name="base_code_id" ref="vat_code_a81"/>
             <field name="tax_code_id" ref="vat_code_a55"/>
@@ -7107,10 +7099,13 @@
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
             <field name="parent_id" ref="vat_IO_buy_21m"/>
             <field name="name">Marchandises Déductibles 21% (2)</field>
-            <field eval="0.21" name="amount"/>
+            <field eval="-0.21" name="amount"/>
             <field name="type">percent</field>
+            <field name="account_paid_id" ref="vat_payable21"/>
+            <field name="account_collected_id" ref="vat_payable21"/>
             <field name="base_code_id" ref="vat_code_a86"/>
             <field name="tax_code_id" ref="vat_code_a59"/>
+            <field eval="-1" name="tax_sign"/>
             <field name="ref_base_code_id" ref="vat_code_a81"/>
             <field eval="-1" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
@@ -7119,7 +7114,7 @@
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
             <field name="parent_id" ref="vat_IO_buy_21m"/>
             <field name="name">Marchandises Déductibles 21% (3)</field>
-            <field eval="0.21" name="amount"/>
+            <field eval="0.00" name="amount"/>
             <field name="type">percent</field>
             <field name="ref_base_code_id" ref="vat_code_a86"/>
             <field eval="-1" name="ref_base_sign"/>
@@ -7140,10 +7135,10 @@
             <field name="name">Services Divers Déductibles 21% (1)</field>
             <field eval="0.21" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_paid_id" ref="vat_payable21"/>
+            <field name="account_paid_id" ref="vat_refund21"/>
             <field name="account_collected_id" ref="vat_refund21"/>
             <field name="base_code_id" ref="vat_code_a82"/>
-            <field name="tax_code_id" ref="vat_code_a56"/>
+            <field name="tax_code_id" ref="vat_code_a59"/>
             <field name="ref_base_code_id" ref="vat_code_a85"/>
             <field name="type_tax_use">purchase</field>
         </record>
@@ -7151,10 +7146,13 @@
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
             <field name="parent_id" ref="vat_IO_buy_21s"/>
             <field name="name">Services Divers Déductibles 21% (2)</field>
-            <field eval="0.21" name="amount"/>
+            <field eval="-0.21" name="amount"/>
             <field name="type">percent</field>
+            <field name="account_paid_id" ref="vat_payable21"/>
+            <field name="account_collected_id" ref="vat_payable21"/>
             <field name="base_code_id" ref="vat_code_a87"/>
-            <field name="tax_code_id" ref="vat_code_a59"/>
+            <field name="tax_code_id" ref="vat_code_a56"/>
+            <field eval="-1" name="tax_sign"/>
             <field name="ref_base_code_id" ref="vat_code_a82"/>
             <field eval="-1" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
@@ -7163,7 +7161,7 @@
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
             <field name="parent_id" ref="vat_IO_buy_21s"/>
             <field name="name">Services Divers Déductibles 21% (3)</field>
-            <field eval="0.21" name="amount"/>
+            <field eval="0.00" name="amount"/>
             <field name="type">percent</field>
             <field name="ref_base_code_id" ref="vat_code_a87"/>
             <field eval="-1" name="ref_base_sign"/>
diff --git a/addons/l10n_be/fiscal_templates.xml b/addons/l10n_be/fiscal_templates.xml
index 99a564b1a37..ff7b0e82f49 100644
--- a/addons/l10n_be/fiscal_templates.xml
+++ b/addons/l10n_be/fiscal_templates.xml
@@ -91,11 +91,6 @@
             <field name="tax_src_id" ref="l10n_be.vat_0_buy_mar" />
             <field name="tax_dest_id" ref="l10n_be.vat_XO_buy" />
 	</record>
-    <record id="fiscal_position_tax_template_14" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fiscal_position_template_2"  />
-            <field name="tax_src_id" ref="l10n_be.vat_0_co_buy" />
-            <field name="tax_dest_id" ref="l10n_be.vat_XO_buy" />
-	</record>
     <record id="fiscal_position_tax_template_15" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fiscal_position_template_3"  />
             <field name="tax_src_id" ref="l10n_be.vat_21" />
diff --git a/addons/l10n_fr/__terp__.py b/addons/l10n_fr/__terp__.py
index 6d9bccc590d..b3a1f507ce1 100644
--- a/addons/l10n_fr/__terp__.py
+++ b/addons/l10n_fr/__terp__.py
@@ -51,7 +51,7 @@ Credits: Sistheo Zeekom CrysaLEAD
         "security/ir.model.access.csv",
     ],
     "demo_xml" : [],
-    "certificate" : "435321693876313629",
+    "certificate" : "00435321693876313629",
     "active": False,
     "installable": True
 }