diff --git a/addons/account/account.py b/addons/account/account.py
index b1c19476548..625bcd1a6a8 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -2361,7 +2361,7 @@ class account_chart_template(osv.osv):
         'property_account_income_categ': fields.many2one('account.account.template','Income Category Account'),
         'property_account_expense': fields.many2one('account.account.template','Expense Account on Product Template'),
         'property_account_income': fields.many2one('account.account.template','Income Account on Product Template'),
-        'property_reserve_and_surplus_account': fields.many2one('account.account.template', 'Reserve and Surplus Account', domain=[('type', '=', 'payable')] , help='This Account is used for transferring Profit/Loss(If It is Profit : Amount will be added, Loss : Amount will be deducted.), Which is calculated from Profilt & Loss Report'),
+        'property_reserve_and_surplus_account': fields.many2one('account.account.template', 'Reserve and Profit/Loss Account', domain=[('type', '=', 'payable')] , help='This Account is used for transferring Profit/Loss(If It is Profit : Amount will be added, Loss : Amount will be deducted.), Which is calculated from Profilt & Loss Report'),
     }
 
 account_chart_template()
@@ -2442,14 +2442,14 @@ class account_tax_template(osv.osv):
 
 account_tax_template()
 
-# Fiscal Position Templates
+# Fiscal Mapping Templates
 
 class account_fiscal_position_template(osv.osv):
     _name = 'account.fiscal.position.template'
-    _description = 'Template for Fiscal Position'
+    _description = 'Template for Fiscal Mapping'
 
     _columns = {
-        'name': fields.char('Fiscal Position Template', size=64, translate=True, required=True),
+        'name': fields.char('Fiscal Mapping Template', size=64, translate=True, required=True),
         'chart_template_id': fields.many2one('account.chart.template', 'Chart Template', required=True),
         'account_ids': fields.one2many('account.fiscal.position.account.template', 'position_id', 'Account Mapping'),
         'tax_ids': fields.one2many('account.fiscal.position.tax.template', 'position_id', 'Tax Mapping')
@@ -2459,11 +2459,11 @@ account_fiscal_position_template()
 
 class account_fiscal_position_tax_template(osv.osv):
     _name = 'account.fiscal.position.tax.template'
-    _description = 'Fiscal Position Template Tax Mapping'
+    _description = 'Template Tax Fiscal Mapping'
     _rec_name = 'position_id'
 
     _columns = {
-        'position_id': fields.many2one('account.fiscal.position.template', 'Fiscal Position', required=True, ondelete='cascade'),
+        'position_id': fields.many2one('account.fiscal.position.template', 'Fiscal Mapping', required=True, ondelete='cascade'),
         'tax_src_id': fields.many2one('account.tax.template', 'Tax Source', required=True),
         'tax_dest_id': fields.many2one('account.tax.template', 'Replacement Tax')
     }
@@ -2472,10 +2472,10 @@ account_fiscal_position_tax_template()
 
 class account_fiscal_position_account_template(osv.osv):
     _name = 'account.fiscal.position.account.template'
-    _description = 'Fiscal Position Template Account Mapping'
+    _description = 'Template Account Fiscal Mapping'
     _rec_name = 'position_id'
     _columns = {
-        'position_id': fields.many2one('account.fiscal.position.template', 'Fiscal Position', required=True, ondelete='cascade'),
+        'position_id': fields.many2one('account.fiscal.position.template', 'Fiscal Mapping', required=True, ondelete='cascade'),
         'account_src_id': fields.many2one('account.account.template', 'Account Source', domain=[('type','<>','view')], required=True),
         'account_dest_id': fields.many2one('account.account.template', 'Account Destination', domain=[('type','<>','view')], required=True)
     }
diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index 7ddd4ad42f0..990dd277d65 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -1202,7 +1202,7 @@ class account_move_line(osv.osv):
                 tax_sign = 'tax_sign'
 
             tmp_cnt = 0
-            for tax in tax_obj.compute(cr, uid, [tax_id], total, 1.00):
+            for tax in tax_obj.compute_all(cr, uid, [tax_id], total, 1.00).get('taxes'):
                 #create the base movement
                 if tmp_cnt == 0:
                     if tax[base_code]:
diff --git a/addons/account/account_report.xml b/addons/account/account_report.xml
index be0569fa65f..14efecf350d 100644
--- a/addons/account/account_report.xml
+++ b/addons/account/account_report.xml
@@ -4,7 +4,7 @@
         <report auto="False" id="account_general_ledger" menu="False" model="account.account" name="account.general.ledger" rml="account/report/account_general_ledger.rml" string="General Ledger"/>
         <report auto="False" id="account_3rdparty_ledger" menu="False" model="res.partner" name="account.third_party_ledger" rml="account/report/account_partner_ledger.rml" string="Partner Ledger"/>
         <report auto="False" id="account_3rdparty_ledger_other" menu="False" model="res.partner" name="account.third_party_ledger_other" rml="account/report/account_partner_ledger_other.rml" string="Partner Other Ledger"/>
-        <report auto="False" id="account_account_balance" menu="False" model="account.account" name="account.account.balance" rml="account/report/account_balance.rml" string="Account Balance"/>
+        <report auto="False" id="account_account_balance" menu="False" model="account.account" name="account.account.balance" rml="account/report/account_balance.rml" string="Trial Balance"/>
         <report auto="False" id="account_3rdparty_account_balance" menu="False" model="account.account" name="account.partner.balance" rml="account/report/account_partner_balance.rml" string="Partner Balance"/>
         <report auto="False" id="account_central_journal" model="account.journal.period" name="account.central.journal" rml="account/report/account_central_journal.rml" string="Central Journals" header="False"/>
         <report auto="False" id="account_general_journal" model="account.journal.period" name="account.general.journal" rml="account/report/account_general_journal.rml" string="General Journals" header="False"/>
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 9496be9916e..bcd5d8b233b 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -566,6 +566,42 @@
                 </form>
             </field>
         </record>
+
+        <record id="view_bank_statement_periodic_form" model="ir.ui.view">
+            <field name="name">account.bank.statement.form</field>
+            <field name="model">account.bank.statement</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Bank Statement">
+                    <group col="7" colspan="4">
+                        <field name="name" select="1"/>
+                        <field name="date" select="1" on_change="onchange_date(date)"/>
+                        <field name="journal_id" domain="[('type', '=', 'bank')]" on_change="onchange_journal_id(journal_id)" select="1"/>
+                        <newline/>
+                        <field name="period_id"/>
+                        <field name="balance_start"/>
+                        <field name="balance_end_real"/>
+                        <field name="currency" invisible="1"/>
+                        <button name="%(action_view_account_statement_from_invoice_lines)d"
+                            string="Import Invoices" type="action" icon="gtk-execute"
+                            attrs="{'invisible':[('state','=','confirm')]}"/>
+                    </group>
+                    <notebook colspan="4">
+                        <page string="Journal Entries">
+                            <field colspan="4" name="move_line_ids" nolabel="1" widget="many2many"/>
+                        </page>
+                    </notebook>
+                    <group col="8" colspan="4">
+                        <field name="state"/>
+                        <field name="balance_end"/>
+                        <button name="button_dummy" states="draft" string="Compute" type="object" icon="terp-stock_format-scientific"/>
+                        <button name="button_confirm_bank" states="draft" string="Confirm" type="object"  icon="terp-camera_test"/>
+                        <button name="button_cancel" states="confirm" string="Cancel" type="object" icon="gtk-cancel"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+
         <record id="action_bank_statement_tree" model="ir.actions.act_window">
             <field name="name">Bank Statements</field>
             <field name="res_model">account.bank.statement</field>
@@ -586,8 +622,30 @@
             <field name="view_id" ref="view_bank_statement_form"/>
             <field name="act_window_id" ref="action_bank_statement_tree"/>
         </record>
+
+		<record id="action_bank_statement_periodic_tree" model="ir.actions.act_window">
+            <field name="name">Bank Statements</field>
+            <field name="res_model">account.bank.statement</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form,graph</field>
+            <field name="domain">[('journal_id.type', '=', 'bank')]</field>
+            <field name="context">{'journal_type':'bank'}</field>
+        </record>
+        <record model="ir.actions.act_window.view" id="action_bank_statement_periodic_tree_bank">
+            <field name="sequence" eval="1"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="view_bank_statement_tree"/>
+            <field name="act_window_id" ref="action_bank_statement_periodic_tree"/>
+        </record>
+        <record model="ir.actions.act_window.view" id="action_bank_statement_periodic_form_bank">
+            <field name="sequence" eval="1"/>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="view_bank_statement_periodic_form"/>
+            <field name="act_window_id" ref="action_bank_statement_periodic_tree"/>
+        </record>
+
         <menuitem string="Bank Statements" action="action_bank_statement_tree" id="menu_bank_statement_tree" parent="menu_finance_bank_and_cash" sequence="7"/>
-        <menuitem name="Statements Reconciliation" action="action_bank_statement_tree" id="menu_menu_Bank_process" parent="menu_finance_periodical_processing_bank" sequence="7"/>
+        <menuitem name="Statements Reconciliation" action="action_bank_statement_periodic_tree" id="menu_menu_Bank_process" parent="menu_finance_periodical_processing_bank" sequence="7"/>
 
 
         <record id="action_bank_statement_draft_tree" model="ir.actions.act_window">
@@ -2378,14 +2436,14 @@
             </field>
          </record>
 
-         <!-- Fiscal Position Templates -->
+         <!-- Fiscal Mapping Templates -->
 
         <record id="view_account_position_template_form" model="ir.ui.view">
             <field name="name">account.fiscal.position.template.form</field>
             <field name="model">account.fiscal.position.template</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Fiscal Position Template">
+                <form string="Fiscal Mapping Template">
                     <field name="name" select="1"/>
                     <field name="chart_template_id"/>
                     <newline/>
@@ -2417,14 +2475,14 @@
             <field name="model">account.fiscal.position.template</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Fiscal Position">
+                <tree string="Fiscal Mapping">
                     <field name="name"/>
                 </tree>
             </field>
         </record>
 
         <record id="action_account_fiscal_position_template_form" model="ir.actions.act_window">
-            <field name="name">Fiscal Position Templates</field>
+            <field name="name">Fiscal Mapping Templates</field>
             <field name="res_model">account.fiscal.position.template</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
diff --git a/addons/account/company.py b/addons/account/company.py
index 0fe56fca859..873a65c415e 100644
--- a/addons/account/company.py
+++ b/addons/account/company.py
@@ -29,7 +29,7 @@ class res_company(osv.osv):
             'account.account',
             type='many2one',
             relation='account.account',
-            string="Reserve and Surplus Account",
+            string="Reserve and Profit/Loss Account",
             method=True,
             view_load=True,
             domain="[('type', '=', 'payable')]",
diff --git a/addons/account/company_view.xml b/addons/account/company_view.xml
index 692c7960bbf..a9e6815f975 100644
--- a/addons/account/company_view.xml
+++ b/addons/account/company_view.xml
@@ -15,7 +15,7 @@
                 </notebook>
             </field>
         </record>
-        
+
         <record model="ir.ui.view" id="view_company_inherit_1_form">
             <field name="name">res.company.form.inherit</field>
             <field name="inherit_id" ref="base.view_company_form"/>
@@ -24,7 +24,7 @@
             <field name="arch" type="xml">
                 <page string="Configuration" position="inside">
                   <group col="2" colspan="2">
-                      <separator string="Reserve And Surplus Account" colspan="2"/>
+                      <separator string="Reserve And Profit/Loss Account" colspan="2"/>
                       <field name="property_reserve_and_surplus_account" colspan="2"/>
                   </group>
                 </page>
diff --git a/addons/account/configurable_account_chart.xml b/addons/account/configurable_account_chart.xml
index dee402d7f5d..c0c898d4987 100644
--- a/addons/account/configurable_account_chart.xml
+++ b/addons/account/configurable_account_chart.xml
@@ -125,7 +125,7 @@
             <field name="type">view</field>
             <field name="user_type" ref="conf_account_type_view"/>
         </record>
-	
+
 	        <record id="conf_fas" model="account.account.template">
 	            <field name="code">10</field>
 	            <field name="name">Fixed Assets</field>
@@ -133,7 +133,7 @@
 	            <field name="type">view</field>
 	            <field name="user_type" ref="account_type_asset_view1"/>
 	        </record>
-	
+
 		        <record id="conf_xfa" model="account.account.template">
 		            <field name="code">100</field>
 		            <field name="name">Fixed Asset Account</field>
@@ -141,7 +141,7 @@
 		            <field name="type">other</field>
 		            <field name="user_type" ref="account_type_asset_view1"/>
 		        </record>
-		
+
 	        <record id="conf_nca" model="account.account.template">
 	            <field name="code">11</field>
 	            <field name="name">Net Current Assets</field>
@@ -149,7 +149,7 @@
 	            <field name="type">view</field>
 	            <field name="user_type" ref="account_type_asset_view1"/>
 	        </record>
-		
+
 		        <record id="conf_cas" model="account.account.template">
 		            <field name="code">110</field>
 		            <field name="name">Current Assets</field>
@@ -157,7 +157,7 @@
 		            <field name="type">view</field>
 		            <field name="user_type" ref="account_type_asset_view1"/>
 		        </record>
-			
+
 			        <record id="conf_stk" model="account.account.template">
 			            <field name="code">1101</field>
 			            <field name="name">Purchased Stocks</field>
@@ -165,7 +165,7 @@
 			            <field name="type">other</field>
 			            <field name="user_type" ref="conf_account_type_asset"/>
 			        </record>
-			
+
 			        <record id="conf_a_recv" model="account.account.template">
 			            <field name="code">1102</field>
 			            <field name="name">Debtors</field>
@@ -174,7 +174,7 @@
 			            <field eval="True" name="reconcile"/>
 			            <field name="user_type" ref="conf_account_type_asset"/>
 			        </record>
-				
+
 			        <record id="conf_ova" model="account.account.template">
 			            <field name="code">1103</field>
 			            <field name="name">Tax Paid</field>
@@ -182,15 +182,15 @@
 			            <field name="type">other</field>
 			            <field name="user_type" ref="conf_account_type_asset"/>
 			        </record>
-			
+
 			        <record id="conf_bnk" model="account.account.template">
 			            <field name="code">1104</field>
 			            <field name="name">Bank Current Account</field>
 			            <field ref="conf_cas" name="parent_id"/>
-			            <field name="type">other</field>
-			            <field name="user_type" ref="conf_account_type_bnk"/>
+			            <field name="type">view</field>
+			            <field name="user_type" ref="account_type_asset_view1"/>
 			        </record>
-			
+
 		        <record id="conf_cli" model="account.account.template">
 		            <field name="code">111</field>
 		            <field name="name">Current Liabilities</field>
@@ -198,7 +198,7 @@
 		            <field name="type">view</field>
 		            <field name="user_type" ref="account_type_liability_view1"/>
 		        </record>
-		
+
 			        <record id="conf_a_pay" model="account.account.template">
 			            <field name="code">1111</field>
 			            <field name="name">Creditors</field>
@@ -207,7 +207,7 @@
 			            <field eval="True" name="reconcile"/>
 			            <field name="user_type" ref="conf_account_type_liability"/>
 			        </record>
-			
+
 			        <record id="conf_iva" model="account.account.template">
 			            <field name="code">1112</field>
 			            <field name="name">Tax Received</field>
@@ -215,17 +215,17 @@
 			            <field name="type">other</field>
 			            <field name="user_type" ref="conf_account_type_liability"/>
 			        </record>
-			
+
 			        <record id="conf_a_reserve_and_surplus" model="account.account.template">
 			            <field name="code">1113</field>
-			            <field name="name">Reserve and Surplus Account</field>
+			            <field name="name">Reserve and Profit/Loss Account</field>
 			            <field ref="conf_cli" name="parent_id"/>
 			            <field name="type">payable</field>
 			            <field eval="True" name="reconcile"/>
 			            <field name="user_type" ref="conf_account_type_liability"/>
 			        </record>
-	
-	
+
+
         <!-- Profit and Loss -->
 
         <record id="conf_gpf" model="account.account.template">
@@ -243,7 +243,7 @@
 	            <field name="type">view</field>
 	            <field name="user_type" ref="account_type_income_view1"/>
 	        </record>
-	
+
 		        <record id="conf_a_sale" model="account.account.template">
 		            <field name="code">200</field>
 		            <field name="name">Product Sales</field>
@@ -251,7 +251,7 @@
 		            <field name="type">other</field>
 		            <field name="user_type" ref="conf_account_type_income"/>
 		        </record>
-	
+
 	        <record id="conf_cos" model="account.account.template">
 	            <field name="code">21</field>
 	            <field name="name">Cost of Sales</field>
@@ -259,7 +259,7 @@
 	            <field name="type">view</field>
 	            <field name="user_type" ref="account_type_income_view1"/>
 	        </record>
-	
+
 		        <record id="conf_cog" model="account.account.template">
 		            <field name="code">210</field>
 		            <field name="name">Cost of Goods Sold</field>
@@ -267,7 +267,7 @@
 		            <field name="type">other</field>
 		            <field name="user_type" ref="conf_account_type_expense"/>
 		        </record>
-	
+
 	        <record id="conf_ovr" model="account.account.template">
 	            <field name="code">22</field>
 	            <field name="name">Overheads</field>
@@ -275,7 +275,7 @@
 	            <field name="type">view</field>
 	            <field name="user_type" ref="account_type_expense_view1"/>
 	        </record>
-	
+
 		        <record id="conf_a_expense" model="account.account.template">
 		            <field name="code">220</field>
 		            <field name="name">Expenses</field>
@@ -317,7 +317,7 @@
 		            <field name="name">Tax Received Rate S (15%)</field>
 		            <field name="parent_id" ref="tax_code_input"/>
 		        </record>
-	
+
 		        <record id="tax_code_input_R" model="account.tax.code.template">
 		            <field name="name">Tax Received Rate R (5%)</field>
 		            <field name="parent_id" ref="tax_code_input"/>
@@ -327,14 +327,14 @@
 		            <field name="name">Tax Received Rate X (Exempt)</field>
 		            <field name="parent_id" ref="tax_code_input"/>
 		        </record>
-	
+
 		        <record id="tax_code_input_O" model="account.tax.code.template">
 		            <field name="name">Tax Received Rate O (Out of scope)</field>
 		            <field name="parent_id" ref="tax_code_input"/>
 		        </record>
 
 	        <!-- Output TAX -->
-	
+
 	        <record id="tax_code_output" model="account.tax.code.template">
 	            <field name="name">Tax Paid</field>
 	            <field name="parent_id" ref="tax_code_balance_net"/>
@@ -344,7 +344,7 @@
 		            <field name="name">Tax Paid Rate S (15%)</field>
 		            <field name="parent_id" ref="tax_code_output"/>
 		        </record>
-		
+
 		        <record id="tax_code_output_R" model="account.tax.code.template">
 		            <field name="name">Tax Paid Rate R (5%)</field>
 		            <field name="parent_id" ref="tax_code_output"/>
@@ -354,7 +354,7 @@
 		            <field name="name">Tax Paid Rate X (Exempt)</field>
 		            <field name="parent_id" ref="tax_code_output"/>
 		        </record>
-		
+
 		        <record id="tax_code_output_O" model="account.tax.code.template">
 		            <field name="name">Tax Paid Rate O (Out of scope)</field>
 		            <field name="parent_id" ref="tax_code_output"/>
@@ -362,9 +362,9 @@
 
 
 	        <!-- Invoiced Base of TAX -->
-	
+
 	        <!-- Purchases -->
-	
+
 	        <record id="tax_code_base_net" model="account.tax.code.template">
 	            <field name="name">Tax Bases</field>
 	            <field name="parent_id" ref="tax_code_chart_root"/>
@@ -379,7 +379,7 @@
 			            <field name="name">Taxable Purchases Rated S (15%)</field>
 			            <field name="parent_id" ref="tax_code_base_purchases"/>
 			        </record>
-	
+
 			        <record id="tax_code_purch_R" model="account.tax.code.template">
 			            <field name="name">Taxable Purchases Rated R (5%)</field>
 			            <field name="parent_id" ref="tax_code_base_purchases"/>
@@ -389,34 +389,34 @@
 			            <field name="name">Taxable Purchases Type X (Exempt)</field>
 			            <field name="parent_id" ref="tax_code_base_purchases"/>
 			        </record>
-			
+
 			        <record id="tax_code_purch_O" model="account.tax.code.template">
 			            <field name="name">Taxable Purchases Type O (Out of scope)</field>
 			            <field name="parent_id" ref="tax_code_base_purchases"/>
 			        </record>
 
 		        <!-- Sales -->
-		
+
 		        <record id="tax_code_base_sales" model="account.tax.code.template">
 		            <field name="name">Base of Taxable Sales</field>
 		            <field name="parent_id" ref="tax_code_base_net"/>
 		        </record>
-	
+
 			        <record id="tax_code_sales_S" model="account.tax.code.template">
 			            <field name="name">Taxable Sales Rated S (15%)</field>
 			            <field name="parent_id" ref="tax_code_base_sales"/>
 			        </record>
-			
+
 			        <record id="tax_code_sales_R" model="account.tax.code.template">
 			            <field name="name">Taxable Sales Rated R (5%)</field>
 			            <field name="parent_id" ref="tax_code_base_sales"/>
 			        </record>
-			
+
 			        <record id="tax_code_sales_X" model="account.tax.code.template">
 			            <field name="name">Taxable Sales Type X (Exempt)</field>
 			            <field name="parent_id" ref="tax_code_base_sales"/>
 			        </record>
-			
+
 			        <record id="tax_code_sales_O" model="account.tax.code.template">
 			            <field name="name">Taxable Sales Type O (Out of scope)</field>
 			            <field name="parent_id" ref="tax_code_base_sales"/>
@@ -550,19 +550,19 @@
             <field name="ref_tax_code_id" ref="tax_code_input_O"/>
             <field name="type_tax_use">sale</field>
         </record>
-        
-        
-        
+
+
+
 	    <!-- = = = = = = = = = = = = = = = -->
-	     <!-- Fiscal Position Templates     -->
+	     <!-- Fiscal Mapping Templates     -->
 	    <!-- = = = = = = = = = = = = = = = -->
-        
-        
+
+
         <record id="fiscal_position_normal_taxes_template1" model="account.fiscal.position.template">
             <field name="name">Normal Taxes</field>
             <field name="chart_template_id" ref="configurable_chart_template"/>
         </record>
-        
+
         <record id="fiscal_position_tax_exempt_template2" model="account.fiscal.position.template">
             <field name="name">Tax Exempt</field>
             <field name="chart_template_id" ref="configurable_chart_template"/>
@@ -587,7 +587,7 @@
 
 
 		<!--  Assigned Default Taxes For Different Account -->
-		
+
 		<record id="conf_a_sale" model="account.account.template">
 			<field name="tax_ids" eval="[(6,0,[ref('itaxs')])]"/>
 		</record>
@@ -595,7 +595,7 @@
 		<record id="conf_a_expense" model="account.account.template">
 			<field name="tax_ids" eval="[(6,0,[ref('otaxs')])]"/>
 		</record>
-		
-		
+
+
     </data>
 </openerp>
diff --git a/addons/account/demo/account_minimal.xml b/addons/account/demo/account_minimal.xml
index 9a60eebced5..d925dfa02ed 100644
--- a/addons/account/demo/account_minimal.xml
+++ b/addons/account/demo/account_minimal.xml
@@ -199,7 +199,7 @@
 
         <record id="rsa" model="account.account">
             <field name="code">X1113</field>
-            <field name="name">Reserve and Surplus - (test)</field>
+            <field name="name">Reserve and Profit/Loss - (test)</field>
             <field ref="cli" name="parent_id"/>
             <field name="type">payable</field>
             <field name="user_type" ref="account_type_liability"/>
diff --git a/addons/account/i18n/account.pot b/addons/account/i18n/account.pot
index caf8fe9ab5c..0e98916b75e 100644
--- a/addons/account/i18n/account.pot
+++ b/addons/account/i18n/account.pot
@@ -590,7 +590,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account
-msgid "Fiscal Position Accounts Mapping"
+msgid "Accounts Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -981,7 +981,7 @@ msgstr ""
 #: field:account.invoice,fiscal_position:0
 #: model:ir.model,name:account.model_account_fiscal_position
 #: field:res.partner,property_account_position:0
-msgid "Fiscal Position"
+msgid "Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1003,7 +1003,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax
-msgid "Fiscal Position Taxes Mapping"
+msgid "Taxes Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1088,7 +1088,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
-msgid "Fiscal Position Templates"
+msgid "Fiscal Mapping Templates"
 msgstr ""
 
 #. module: account
@@ -1120,7 +1120,7 @@ msgstr ""
 #. module: account
 #: view:account.fiscal.position.template:0
 #: field:account.fiscal.position.template,name:0
-msgid "Fiscal Position Template"
+msgid "Fiscal Mapping Template"
 msgstr ""
 
 #. module: account
@@ -1181,7 +1181,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account_template
-msgid "Fiscal Position Template Account Mapping"
+msgid "Template Account Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1755,7 +1755,7 @@ msgstr ""
 
 #. module: account
 #: help:res.partner,property_account_position:0
-msgid "The fiscal position will determine taxes and the accounts used for the the partner."
+msgid "The fiscal mapping will determine taxes and the accounts used for the partner."
 msgstr ""
 
 #. module: account
@@ -2020,7 +2020,7 @@ msgstr ""
 
 #. module: account
 #: rml:account.invoice:0
-msgid "Fiscal Position Remark :"
+msgid "Fiscal Mapping Remark :"
 msgstr ""
 
 #. module: account
@@ -3551,7 +3551,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_template
-msgid "Template for Fiscal Position"
+msgid "Template for Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -3654,7 +3654,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax_template
-msgid "Fiscal Position Template Tax Mapping"
+msgid "Template Tax Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -5741,7 +5741,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
-msgid "Fiscal Positions"
+msgid "Fiscal Mappings"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/ar.po b/addons/account/i18n/ar.po
index 9fd0cd38185..7694c65eea2 100644
--- a/addons/account/i18n/ar.po
+++ b/addons/account/i18n/ar.po
@@ -610,7 +610,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account
-msgid "Fiscal Position Accounts Mapping"
+msgid "Accounts Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1004,7 +1004,7 @@ msgstr ""
 #: field:account.invoice,fiscal_position:0
 #: model:ir.model,name:account.model_account_fiscal_position
 #: field:res.partner,property_account_position:0
-msgid "Fiscal Position"
+msgid "Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1026,7 +1026,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax
-msgid "Fiscal Position Taxes Mapping"
+msgid "Taxes Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1113,7 +1113,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
-msgid "Fiscal Position Templates"
+msgid "Fiscal Mapping Templates"
 msgstr ""
 
 #. module: account
@@ -1145,7 +1145,7 @@ msgstr ""
 #. module: account
 #: view:account.fiscal.position.template:0
 #: field:account.fiscal.position.template,name:0
-msgid "Fiscal Position Template"
+msgid "Fiscal Mapping Template"
 msgstr ""
 
 #. module: account
@@ -1211,7 +1211,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account_template
-msgid "Fiscal Position Template Account Mapping"
+msgid "Template Account Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1789,8 +1789,7 @@ msgstr ""
 #. module: account
 #: help:res.partner,property_account_position:0
 msgid ""
-"The fiscal position will determine taxes and the accounts used for the the "
-"partner."
+"The fiscal mapping will determine taxes and the accounts used for the partner."
 msgstr ""
 
 #. module: account
@@ -2060,7 +2059,7 @@ msgstr ""
 
 #. module: account
 #: rml:account.invoice:0
-msgid "Fiscal Position Remark :"
+msgid "Fiscal Mapping Remark :"
 msgstr ""
 
 #. module: account
@@ -3626,7 +3625,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_template
-msgid "Template for Fiscal Position"
+msgid "Template for Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -3731,7 +3730,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax_template
-msgid "Fiscal Position Template Tax Mapping"
+msgid "Template Tax Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -5866,7 +5865,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
-msgid "Fiscal Positions"
+msgid "Fiscal Mappings"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/bg.po b/addons/account/i18n/bg.po
index a212cb15d7b..8a1883ae76b 100644
--- a/addons/account/i18n/bg.po
+++ b/addons/account/i18n/bg.po
@@ -624,7 +624,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account
-msgid "Fiscal Position Accounts Mapping"
+msgid "Accounts Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1018,7 +1018,7 @@ msgstr ""
 #: field:account.invoice,fiscal_position:0
 #: model:ir.model,name:account.model_account_fiscal_position
 #: field:res.partner,property_account_position:0
-msgid "Fiscal Position"
+msgid "Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1040,7 +1040,7 @@ msgstr "Деца"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax
-msgid "Fiscal Position Taxes Mapping"
+msgid "Taxes Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1129,7 +1129,7 @@ msgstr "Нова аналитична сметка"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
-msgid "Fiscal Position Templates"
+msgid "Fiscal Mapping Templates"
 msgstr ""
 
 #. module: account
@@ -1161,7 +1161,7 @@ msgstr ""
 #. module: account
 #: view:account.fiscal.position.template:0
 #: field:account.fiscal.position.template,name:0
-msgid "Fiscal Position Template"
+msgid "Fiscal Mapping Template"
 msgstr ""
 
 #. module: account
@@ -1227,7 +1227,7 @@ msgstr "Валута на компанията"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account_template
-msgid "Fiscal Position Template Account Mapping"
+msgid "Template Account Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1807,8 +1807,7 @@ msgstr ""
 #. module: account
 #: help:res.partner,property_account_position:0
 msgid ""
-"The fiscal position will determine taxes and the accounts used for the the "
-"partner."
+"The fiscal mapping will determine taxes and the accounts used for the partner."
 msgstr ""
 
 #. module: account
@@ -2078,7 +2077,7 @@ msgstr ""
 
 #. module: account
 #: rml:account.invoice:0
-msgid "Fiscal Position Remark :"
+msgid "Fiscal Mapping Remark :"
 msgstr ""
 
 #. module: account
@@ -3654,7 +3653,7 @@ msgstr "Последователност"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_template
-msgid "Template for Fiscal Position"
+msgid "Template for Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -3759,7 +3758,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax_template
-msgid "Fiscal Position Template Tax Mapping"
+msgid "Template Tax Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -5908,8 +5907,8 @@ msgstr "Условие за плащане"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
-msgid "Fiscal Positions"
-msgstr "Фискални позиции"
+msgid "Fiscal Mappings"
+msgstr ""
 
 #. module: account
 #: model:process.process,name:account.process_process_statementprocess0
diff --git a/addons/account/i18n/bs.po b/addons/account/i18n/bs.po
index 400f621331a..23a36c984cf 100644
--- a/addons/account/i18n/bs.po
+++ b/addons/account/i18n/bs.po
@@ -630,8 +630,8 @@ msgstr "(Zadržite prazno da biste otvorili tekuće stanje)"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account
-msgid "Fiscal Position Accounts Mapping"
-msgstr "Mapiranje fiskalne pozicije računa"
+msgid "Accounts Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: field:account.analytic.account,contact_id:0
@@ -1028,7 +1028,7 @@ msgstr "Ukupno netto:"
 #: field:account.invoice,fiscal_position:0
 #: model:ir.model,name:account.model_account_fiscal_position
 #: field:res.partner,property_account_position:0
-msgid "Fiscal Position"
+msgid "Fiscal Mapping"
 msgstr "Fiskalna pozicija"
 
 #. module: account
@@ -1050,8 +1050,8 @@ msgstr "Potomci"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax
-msgid "Fiscal Position Taxes Mapping"
-msgstr "Mapiranje poreza fiskalne pozicije"
+msgid "Taxes Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree2_new
@@ -1139,8 +1139,8 @@ msgstr "Novo analitičko konto"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
-msgid "Fiscal Position Templates"
-msgstr "Predlošci fiskalne pozicije"
+msgid "Fiscal Mapping Templates"
+msgstr ""
 
 #. module: account
 #: rml:account.invoice:0
@@ -1171,8 +1171,8 @@ msgstr "Iznos izražen u alternativnoj drugoj valuti."
 #. module: account
 #: view:account.fiscal.position.template:0
 #: field:account.fiscal.position.template,name:0
-msgid "Fiscal Position Template"
-msgstr "Predložak fiskalne pozicije"
+msgid "Fiscal Mapping Template"
+msgstr ""
 
 #. module: account
 #: field:account.payment.term,line_ids:0
@@ -1242,8 +1242,8 @@ msgstr "Valuta preduzeća"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account_template
-msgid "Fiscal Position Template Account Mapping"
-msgstr "Mapiranje fiskalne pozicije na konto predloška"
+msgid "Template Account Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: field:account.analytic.account,parent_id:0
@@ -1824,9 +1824,8 @@ msgstr "Slijedeći"
 #. module: account
 #: help:res.partner,property_account_position:0
 msgid ""
-"The fiscal position will determine taxes and the accounts used for the the "
-"partner."
-msgstr "Fiskalna pozicija će odrediti poreze i račune korištene za partnera."
+"The fiscal mapping will determine taxes and the accounts used for the partner."
+msgstr ""
 
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
@@ -2098,8 +2097,8 @@ msgstr "Proces fakturiranja kupcu"
 
 #. module: account
 #: rml:account.invoice:0
-msgid "Fiscal Position Remark :"
-msgstr "Napomena za fiskalnu poziciju"
+msgid "Fiscal Mapping Remark :"
+msgstr ""
 
 #. module: account
 #: wizard_field:account.fiscalyear.close,init,period_id:0
@@ -3697,8 +3696,8 @@ msgstr "Redoslijed"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_template
-msgid "Template for Fiscal Position"
-msgstr "Predložak za fiskalnu poziciju"
+msgid "Template for Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: view:account.bank.statement:0
@@ -3804,8 +3803,8 @@ msgstr "Fakture u pripremi"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax_template
-msgid "Fiscal Position Template Tax Mapping"
-msgstr "Mapiranje fiskalne pozicije na predložak poreza"
+msgid "Template Tax Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: rml:account.invoice:0
@@ -5992,8 +5991,8 @@ msgstr "Uslovi plaćanja"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
-msgid "Fiscal Positions"
-msgstr "Fiskalne pozicije"
+msgid "Fiscal Mappings"
+msgstr ""
 
 #. module: account
 #: model:process.process,name:account.process_process_statementprocess0
diff --git a/addons/account/i18n/ca.po b/addons/account/i18n/ca.po
index 3250cc604a9..d9ca69a0107 100644
--- a/addons/account/i18n/ca.po
+++ b/addons/account/i18n/ca.po
@@ -634,8 +634,8 @@ msgstr "(deixar-lo buit per a obrir la situació actual)"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account
-msgid "Fiscal Position Accounts Mapping"
-msgstr "Mapa de relacions comptes posició fiscal"
+msgid "Accounts Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: field:account.analytic.account,contact_id:0
@@ -1032,8 +1032,8 @@ msgstr "Base:"
 #: field:account.invoice,fiscal_position:0
 #: model:ir.model,name:account.model_account_fiscal_position
 #: field:res.partner,property_account_position:0
-msgid "Fiscal Position"
-msgstr "Posició fiscal"
+msgid "Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: field:account.analytic.line,product_uom_id:0
@@ -1054,8 +1054,8 @@ msgstr "Fills"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax
-msgid "Fiscal Position Taxes Mapping"
-msgstr "Mapa de relacions d'impostos posició fiscal"
+msgid "Taxes Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree2_new
@@ -1143,8 +1143,8 @@ msgstr "Nou compte analític"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
-msgid "Fiscal Position Templates"
-msgstr "Plantilles de posicions fiscals"
+msgid "Fiscal Mapping Templates"
+msgstr ""
 
 #. module: account
 #: rml:account.invoice:0
@@ -1175,8 +1175,8 @@ msgstr "L'import expressat en una altra divisa opcional."
 #. module: account
 #: view:account.fiscal.position.template:0
 #: field:account.fiscal.position.template,name:0
-msgid "Fiscal Position Template"
-msgstr "Plantilla de posició fiscal"
+msgid "Fiscal Mapping Template"
+msgstr ""
 
 #. module: account
 #: field:account.payment.term,line_ids:0
@@ -1246,8 +1246,8 @@ msgstr "Divisa de la companyia"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account_template
-msgid "Fiscal Position Template Account Mapping"
-msgstr "Mapa comptes plantilla posició fiscal"
+msgid "Template Account Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: field:account.analytic.account,parent_id:0
@@ -1830,11 +1830,9 @@ msgstr "Següent"
 #. module: account
 #: help:res.partner,property_account_position:0
 msgid ""
-"The fiscal position will determine taxes and the accounts used for the the "
-"partner."
+"The fiscal mapping will determine taxes and the accounts used for the partner."
 msgstr ""
-"La posició fiscal determinarà els impostos i els comptes utilitzats per la "
-"empresa."
+""
 
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
@@ -2107,8 +2105,8 @@ msgstr "Procés de factura de client"
 
 #. module: account
 #: rml:account.invoice:0
-msgid "Fiscal Position Remark :"
-msgstr "Observació posició fiscal :"
+msgid "Fiscal Mapping Remark :"
+msgstr ""
 
 #. module: account
 #: wizard_field:account.fiscalyear.close,init,period_id:0
@@ -3711,8 +3709,8 @@ msgstr "Seqüència"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_template
-msgid "Template for Fiscal Position"
-msgstr "Plantilla per posició fiscal"
+msgid "Template for Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: view:account.bank.statement:0
@@ -3818,8 +3816,8 @@ msgstr "Factures esborrany"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax_template
-msgid "Fiscal Position Template Tax Mapping"
-msgstr "Mapa impostos plantilla posició fiscal"
+msgid "Template Tax Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: rml:account.invoice:0
@@ -6015,8 +6013,8 @@ msgstr "Termini de pagament"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
-msgid "Fiscal Positions"
-msgstr "Posicions fiscals"
+msgid "Fiscal Mappings"
+msgstr ""
 
 #. module: account
 #: model:process.process,name:account.process_process_statementprocess0
diff --git a/addons/account/i18n/cs.po b/addons/account/i18n/cs.po
index 7da8a9817f1..f05122661be 100644
--- a/addons/account/i18n/cs.po
+++ b/addons/account/i18n/cs.po
@@ -612,7 +612,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account
-msgid "Fiscal Position Accounts Mapping"
+msgid "Accounts Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1006,8 +1006,8 @@ msgstr "Čistá celkem:"
 #: field:account.invoice,fiscal_position:0
 #: model:ir.model,name:account.model_account_fiscal_position
 #: field:res.partner,property_account_position:0
-msgid "Fiscal Position"
-msgstr "Fiskální pozice"
+msgid "Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: field:account.analytic.line,product_uom_id:0
@@ -1028,7 +1028,7 @@ msgstr "Děti"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax
-msgid "Fiscal Position Taxes Mapping"
+msgid "Taxes Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1115,8 +1115,8 @@ msgstr "Nový analitickiý účet"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
-msgid "Fiscal Position Templates"
-msgstr "Fiskální pozice Šablony"
+msgid "Fiscal Mapping Templates"
+msgstr ""
 
 #. module: account
 #: rml:account.invoice:0
@@ -1147,8 +1147,8 @@ msgstr ""
 #. module: account
 #: view:account.fiscal.position.template:0
 #: field:account.fiscal.position.template,name:0
-msgid "Fiscal Position Template"
-msgstr "Fiskální pozice šablony"
+msgid "Fiscal Mapping Template"
+msgstr ""
 
 #. module: account
 #: field:account.payment.term,line_ids:0
@@ -1213,7 +1213,7 @@ msgstr "Společnost měny"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account_template
-msgid "Fiscal Position Template Account Mapping"
+msgid "Template Account Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1791,8 +1791,7 @@ msgstr ""
 #. module: account
 #: help:res.partner,property_account_position:0
 msgid ""
-"The fiscal position will determine taxes and the accounts used for the the "
-"partner."
+"The fiscal mapping will determine taxes and the accounts used for the partner."
 msgstr ""
 
 #. module: account
@@ -2062,7 +2061,7 @@ msgstr ""
 
 #. module: account
 #: rml:account.invoice:0
-msgid "Fiscal Position Remark :"
+msgid "Fiscal Mapping Remark :"
 msgstr ""
 
 #. module: account
@@ -3628,7 +3627,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_template
-msgid "Template for Fiscal Position"
+msgid "Template for Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -3733,7 +3732,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax_template
-msgid "Fiscal Position Template Tax Mapping"
+msgid "Template Tax Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -5868,7 +5867,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
-msgid "Fiscal Positions"
+msgid "Fiscal Mappings"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/da.po b/addons/account/i18n/da.po
index 141eadeb106..3567c9b1db1 100644
--- a/addons/account/i18n/da.po
+++ b/addons/account/i18n/da.po
@@ -616,7 +616,7 @@ msgstr "(Holdes tom for at åbne nuværende situation)"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account
-msgid "Fiscal Position Accounts Mapping"
+msgid "Accounts Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1010,8 +1010,8 @@ msgstr "Net Total:"
 #: field:account.invoice,fiscal_position:0
 #: model:ir.model,name:account.model_account_fiscal_position
 #: field:res.partner,property_account_position:0
-msgid "Fiscal Position"
-msgstr "Nuværende position"
+msgid "Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: field:account.analytic.line,product_uom_id:0
@@ -1032,7 +1032,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax
-msgid "Fiscal Position Taxes Mapping"
+msgid "Taxes Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1119,7 +1119,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
-msgid "Fiscal Position Templates"
+msgid "Fiscal Mapping Templates"
 msgstr ""
 
 #. module: account
@@ -1151,7 +1151,7 @@ msgstr "Det beløb udtrykt i anden valgfri valuta."
 #. module: account
 #: view:account.fiscal.position.template:0
 #: field:account.fiscal.position.template,name:0
-msgid "Fiscal Position Template"
+msgid "Fiscal Mapping Template"
 msgstr ""
 
 #. module: account
@@ -1223,7 +1223,7 @@ msgstr "Firma valuta"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account_template
-msgid "Fiscal Position Template Account Mapping"
+msgid "Template Account Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1803,7 +1803,7 @@ msgstr ""
 #. module: account
 #: help:res.partner,property_account_position:0
 msgid ""
-"The fiscal position will determine taxes and the accounts used for the the "
+"The fiscal mapping will determine taxes and the accounts used for the  "
 "partner."
 msgstr ""
 
@@ -2074,7 +2074,7 @@ msgstr ""
 
 #. module: account
 #: rml:account.invoice:0
-msgid "Fiscal Position Remark :"
+msgid "Fiscal Mapping Remark :"
 msgstr ""
 
 #. module: account
@@ -3640,7 +3640,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_template
-msgid "Template for Fiscal Position"
+msgid "Template for Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -3745,7 +3745,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax_template
-msgid "Fiscal Position Template Tax Mapping"
+msgid "Template Tax Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -5880,7 +5880,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
-msgid "Fiscal Positions"
+msgid "Fiscal Mappings"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/de.po b/addons/account/i18n/de.po
index 6e5177a78b8..30d50919b92 100644
--- a/addons/account/i18n/de.po
+++ b/addons/account/i18n/de.po
@@ -629,8 +629,8 @@ msgstr "(frei lassen um aktuelle Einstellung zu verwenden)"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account
-msgid "Fiscal Position Accounts Mapping"
-msgstr "Summen und Salden Zuordnung"
+msgid "Accounts Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: field:account.analytic.account,contact_id:0
@@ -1029,8 +1029,8 @@ msgstr "Nettosumme:"
 #: field:account.invoice,fiscal_position:0
 #: model:ir.model,name:account.model_account_fiscal_position
 #: field:res.partner,property_account_position:0
-msgid "Fiscal Position"
-msgstr "Position"
+msgid "Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: field:account.analytic.line,product_uom_id:0
@@ -1051,8 +1051,8 @@ msgstr "(Sub-)"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax
-msgid "Fiscal Position Taxes Mapping"
-msgstr "Summen- & Saldenliste Zuordnung Steuern"
+msgid "Taxes Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree2_new
@@ -1140,8 +1140,8 @@ msgstr "Neues Analytisches Konto"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
-msgid "Fiscal Position Templates"
-msgstr "Summen- & Saldenliste Vorlagen"
+msgid "Fiscal Mapping Templates"
+msgstr ""
 
 #. module: account
 #: rml:account.invoice:0
@@ -1172,8 +1172,8 @@ msgstr "optionaler Betrag in anderer Währung"
 #. module: account
 #: view:account.fiscal.position.template:0
 #: field:account.fiscal.position.template,name:0
-msgid "Fiscal Position Template"
-msgstr "Summen- & Saldenliste Vorlage"
+msgid "Fiscal Mapping Template"
+msgstr ""
 
 #. module: account
 #: field:account.payment.term,line_ids:0
@@ -1243,8 +1243,8 @@ msgstr "Betriebl. Währung"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account_template
-msgid "Fiscal Position Template Account Mapping"
-msgstr "Steuerliche Position Vorlage für Kontenzuordnung"
+msgid "Template Account Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: field:account.analytic.account,parent_id:0
@@ -1825,11 +1825,9 @@ msgstr "Weiter"
 #. module: account
 #: help:res.partner,property_account_position:0
 msgid ""
-"The fiscal position will determine taxes and the accounts used for the the "
-"partner."
+"The fiscal mapping will determine taxes and the accounts used for the partner."
 msgstr ""
-"Die Position in der Saldenliste bestimmt Steuern- und Finanzkonten für den "
-"Partner."
+""
 
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
@@ -2103,8 +2101,8 @@ msgstr "Prozess Abrechnung von Kundenaufträgen"
 
 #. module: account
 #: rml:account.invoice:0
-msgid "Fiscal Position Remark :"
-msgstr "Hinweis Steuermapping"
+msgid "Fiscal Mapping Remark :"
+msgstr ""
 
 #. module: account
 #: wizard_field:account.fiscalyear.close,init,period_id:0
@@ -3702,8 +3700,8 @@ msgstr "Sequenzer"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_template
-msgid "Template for Fiscal Position"
-msgstr "Summen- und Saldenliste Vorlage"
+msgid "Template for Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: view:account.bank.statement:0
@@ -3809,8 +3807,8 @@ msgstr "Entwurf Rechnungen"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax_template
-msgid "Fiscal Position Template Tax Mapping"
-msgstr "Steuerliche Position Vorlage Steuerzuordnung"
+msgid "Template Tax Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: rml:account.invoice:0
@@ -6008,8 +6006,8 @@ msgstr "Zahlungsbedingung"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
-msgid "Fiscal Positions"
-msgstr "Positionen Summen & Salden"
+msgid "Fiscal Mappings"
+msgstr ""
 
 #. module: account
 #: model:process.process,name:account.process_process_statementprocess0
diff --git a/addons/account/i18n/el.po b/addons/account/i18n/el.po
index 57f77b6d9fd..8a40f4a673c 100644
--- a/addons/account/i18n/el.po
+++ b/addons/account/i18n/el.po
@@ -634,8 +634,8 @@ msgstr "(Διατηρήστε κενό για να ανοίξετε την τρ
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account
-msgid "Fiscal Position Accounts Mapping"
-msgstr "Χάρτης Λογαριασμών Φορολογικής Θέσης"
+msgid "Accounts Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: field:account.analytic.account,contact_id:0
@@ -1032,8 +1032,8 @@ msgstr "Καθαρό Σύνολο:"
 #: field:account.invoice,fiscal_position:0
 #: model:ir.model,name:account.model_account_fiscal_position
 #: field:res.partner,property_account_position:0
-msgid "Fiscal Position"
-msgstr "Φορολογική Θέση"
+msgid "Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: field:account.analytic.line,product_uom_id:0
@@ -1054,8 +1054,8 @@ msgstr "Υποκατηγορίες"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax
-msgid "Fiscal Position Taxes Mapping"
-msgstr "Χάρτογράφηση Φόρων Φορολογικής Θέσης"
+msgid "Taxes Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree2_new
@@ -1143,8 +1143,8 @@ msgstr "Νέος Λογαριασμός Αναλυτικής"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
-msgid "Fiscal Position Templates"
-msgstr "Πρότυπα Φορολογικής Θέσης"
+msgid "Fiscal Mapping Templates"
+msgstr ""
 
 #. module: account
 #: rml:account.invoice:0
@@ -1175,8 +1175,8 @@ msgstr "Το ποσό, εκφρασμένο σε ένα (προαιρετικό)
 #. module: account
 #: view:account.fiscal.position.template:0
 #: field:account.fiscal.position.template,name:0
-msgid "Fiscal Position Template"
-msgstr "Πρότυπο Φορολογικής Θέσης"
+msgid "Fiscal Mapping Template"
+msgstr ""
 
 #. module: account
 #: field:account.payment.term,line_ids:0
@@ -1247,8 +1247,8 @@ msgstr "Νόμισμα Εταιρίας"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account_template
-msgid "Fiscal Position Template Account Mapping"
-msgstr "Χάρτης Λογαριασμών Προτύπων Φορολογικής Θέσης"
+msgid "Template Account Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: field:account.analytic.account,parent_id:0
@@ -1832,11 +1832,9 @@ msgstr "Επόμενο"
 #. module: account
 #: help:res.partner,property_account_position:0
 msgid ""
-"The fiscal position will determine taxes and the accounts used for the the "
-"partner."
+"The fiscal mapping will determine taxes and the accounts used for the partner."
 msgstr ""
-"Η φορολογική θέση θα καθορίσει τους φόρους και τους λογαριασμούς που θα "
-"χρησιμοποιηθούν για αυτόν τον συνεργάτη."
+""
 
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
@@ -2109,8 +2107,8 @@ msgstr "Επεξεργασία Τιμολογίου Πελάτη"
 
 #. module: account
 #: rml:account.invoice:0
-msgid "Fiscal Position Remark :"
-msgstr "Σχόλιο Φορολογικής Θέσης:"
+msgid "Fiscal Mapping Remark :"
+msgstr ""
 
 #. module: account
 #: wizard_field:account.fiscalyear.close,init,period_id:0
@@ -3713,8 +3711,8 @@ msgstr "Ιεράρχηση"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_template
-msgid "Template for Fiscal Position"
-msgstr "Πρότυπο για Φορολογική Θέση"
+msgid "Template for Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: view:account.bank.statement:0
@@ -3820,8 +3818,8 @@ msgstr "Πρόχειρα Τιμολόγια"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax_template
-msgid "Fiscal Position Template Tax Mapping"
-msgstr "Χάρτογράφηση Φόρων Προτύπου Φορολογικής Θέσης"
+msgid "Template Tax Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: rml:account.invoice:0
@@ -6024,8 +6022,8 @@ msgstr "Όρος Πληρωμής"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
-msgid "Fiscal Positions"
-msgstr "Φορολογικές Θέσεις"
+msgid "Fiscal Mappings"
+msgstr ""
 
 #. module: account
 #: model:process.process,name:account.process_process_statementprocess0
diff --git a/addons/account/i18n/es.po b/addons/account/i18n/es.po
index f7e8230bf5a..cb522b2d3eb 100644
--- a/addons/account/i18n/es.po
+++ b/addons/account/i18n/es.po
@@ -634,8 +634,8 @@ msgstr "(dejarlo vacío para abrir la situación actual)"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account
-msgid "Fiscal Position Accounts Mapping"
-msgstr "Mapeo cuentas posición fiscal"
+msgid "Accounts Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: field:account.analytic.account,contact_id:0
@@ -1032,8 +1032,8 @@ msgstr "Base:"
 #: field:account.invoice,fiscal_position:0
 #: model:ir.model,name:account.model_account_fiscal_position
 #: field:res.partner,property_account_position:0
-msgid "Fiscal Position"
-msgstr "Posición fiscal"
+msgid "Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: field:account.analytic.line,product_uom_id:0
@@ -1054,8 +1054,8 @@ msgstr "Hijos"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax
-msgid "Fiscal Position Taxes Mapping"
-msgstr "Mapeo de impuestos posición fiscal"
+msgid "Taxes Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree2_new
@@ -1143,8 +1143,8 @@ msgstr "Nueva cuenta analítica"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
-msgid "Fiscal Position Templates"
-msgstr "Plantillas de posiciones fiscales"
+msgid "Fiscal Mapping Templates"
+msgstr ""
 
 #. module: account
 #: rml:account.invoice:0
@@ -1175,8 +1175,8 @@ msgstr "El importe expresado en otra divisa opcional."
 #. module: account
 #: view:account.fiscal.position.template:0
 #: field:account.fiscal.position.template,name:0
-msgid "Fiscal Position Template"
-msgstr "Plantilla de posición fiscal"
+msgid "Fiscal Mapping Template"
+msgstr ""
 
 #. module: account
 #: field:account.payment.term,line_ids:0
@@ -1247,8 +1247,8 @@ msgstr "Divisa de la compañía"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account_template
-msgid "Fiscal Position Template Account Mapping"
-msgstr "Mapeo cuentas plantilla posición fiscal"
+msgid "Template Account Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: field:account.analytic.account,parent_id:0
@@ -1831,11 +1831,8 @@ msgstr "Siguiente"
 #. module: account
 #: help:res.partner,property_account_position:0
 msgid ""
-"The fiscal position will determine taxes and the accounts used for the the "
-"partner."
+"The fiscal mapping will determine taxes and the accounts used for the partner."
 msgstr ""
-"La posición fiscal determinará los impuestos y las cuentas utilizadas para "
-"la empresa."
 
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
@@ -2109,8 +2106,8 @@ msgstr "Proceso de factura de cliente"
 
 #. module: account
 #: rml:account.invoice:0
-msgid "Fiscal Position Remark :"
-msgstr "Observación posición fiscal :"
+msgid "Fiscal Mapping Remark :"
+msgstr ""
 
 #. module: account
 #: wizard_field:account.fiscalyear.close,init,period_id:0
@@ -3712,8 +3709,8 @@ msgstr "Secuencia"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_template
-msgid "Template for Fiscal Position"
-msgstr "Plantilla para posición fiscal"
+msgid "Template for Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: view:account.bank.statement:0
@@ -3819,8 +3816,8 @@ msgstr "Facturas borrador"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax_template
-msgid "Fiscal Position Template Tax Mapping"
-msgstr "Mapeo de impuestos en plantilla posiciones fiscales"
+msgid "Template Tax Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: rml:account.invoice:0
@@ -6017,8 +6014,8 @@ msgstr "Plazo de pago"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
-msgid "Fiscal Positions"
-msgstr "Posiciones fiscales"
+msgid "Fiscal Mappings"
+msgstr ""
 
 #. module: account
 #: model:process.process,name:account.process_process_statementprocess0
diff --git a/addons/account/i18n/es_AR.po b/addons/account/i18n/es_AR.po
index 914842fdefb..5e9b3969365 100644
--- a/addons/account/i18n/es_AR.po
+++ b/addons/account/i18n/es_AR.po
@@ -632,8 +632,8 @@ msgstr "(dejar vacío para abrir el estado actual)"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account
-msgid "Fiscal Position Accounts Mapping"
-msgstr "Mapeo de cuentas y posición fiscal"
+msgid "Accounts Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: field:account.analytic.account,contact_id:0
@@ -1030,8 +1030,8 @@ msgstr "Total Neto:"
 #: field:account.invoice,fiscal_position:0
 #: model:ir.model,name:account.model_account_fiscal_position
 #: field:res.partner,property_account_position:0
-msgid "Fiscal Position"
-msgstr "Posición fiscal"
+msgid "Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: field:account.analytic.line,product_uom_id:0
@@ -1052,8 +1052,8 @@ msgstr "Hijos"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax
-msgid "Fiscal Position Taxes Mapping"
-msgstr "Cruce de posición de impuestos fiscales"
+msgid "Taxes Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree2_new
@@ -1141,8 +1141,8 @@ msgstr "Nueva cuenta analítica"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
-msgid "Fiscal Position Templates"
-msgstr "Plantillas de posiciones fiscales"
+msgid "Fiscal Mapping Templates"
+msgstr ""
 
 #. module: account
 #: rml:account.invoice:0
@@ -1173,8 +1173,8 @@ msgstr "El importe expresado en otra moneda opcional."
 #. module: account
 #: view:account.fiscal.position.template:0
 #: field:account.fiscal.position.template,name:0
-msgid "Fiscal Position Template"
-msgstr "Plantilla de posición fiscal"
+msgid "Fiscal Mapping Template"
+msgstr ""
 
 #. module: account
 #: field:account.payment.term,line_ids:0
@@ -1245,8 +1245,8 @@ msgstr "Moneda de la compañía"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account_template
-msgid "Fiscal Position Template Account Mapping"
-msgstr "Asociación de cuentas Planilla posición fiscal"
+msgid "Template Account Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: field:account.analytic.account,parent_id:0
@@ -1828,11 +1828,8 @@ msgstr "Siguiente"
 #. module: account
 #: help:res.partner,property_account_position:0
 msgid ""
-"The fiscal position will determine taxes and the accounts used for the the "
-"partner."
+"The fiscal mapping will determine taxes and the accounts used for the partner."
 msgstr ""
-"La posición fiscal determinará los impuestos y las cuentas utilizadas por el "
-"partner"
 
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
@@ -2106,7 +2103,7 @@ msgstr "Proceso de factura de cliente"
 
 #. module: account
 #: rml:account.invoice:0
-msgid "Fiscal Position Remark :"
+msgid "Fiscal Mapping Remark :"
 msgstr ""
 
 #. module: account
@@ -3710,8 +3707,8 @@ msgstr "Secuencia"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_template
-msgid "Template for Fiscal Position"
-msgstr "Plantilla para posición fiscal"
+msgid "Template for Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: view:account.bank.statement:0
@@ -3817,8 +3814,8 @@ msgstr "Facturas en borrador"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax_template
-msgid "Fiscal Position Template Tax Mapping"
-msgstr "Asociación de impuestos plantilla posición fiscal"
+msgid "Template Tax Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: rml:account.invoice:0
@@ -6015,8 +6012,8 @@ msgstr "Términos de Pago"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
-msgid "Fiscal Positions"
-msgstr "Posiciones fiscales"
+msgid "Fiscal Mappings"
+msgstr ""
 
 #. module: account
 #: model:process.process,name:account.process_process_statementprocess0
diff --git a/addons/account/i18n/es_EC.po b/addons/account/i18n/es_EC.po
index 4795afbce56..b2cbed66cd8 100644
--- a/addons/account/i18n/es_EC.po
+++ b/addons/account/i18n/es_EC.po
@@ -634,8 +634,8 @@ msgstr "(dejarlo vacío para abrir la situación actual)"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account
-msgid "Fiscal Position Accounts Mapping"
-msgstr "Mapeo de cuentas por tipo de Contribuyentes"
+msgid "Accounts Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: field:account.analytic.account,contact_id:0
@@ -1032,8 +1032,8 @@ msgstr "Total neto:"
 #: field:account.invoice,fiscal_position:0
 #: model:ir.model,name:account.model_account_fiscal_position
 #: field:res.partner,property_account_position:0
-msgid "Fiscal Position"
-msgstr "Posición fiscal"
+msgid "Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: field:account.analytic.line,product_uom_id:0
@@ -1054,8 +1054,8 @@ msgstr "Hijos"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax
-msgid "Fiscal Position Taxes Mapping"
-msgstr "Mapeo de Impuestos segun tipo de Contribuyente"
+msgid "Taxes Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree2_new
@@ -1143,8 +1143,8 @@ msgstr "Nueva cuenta analítica"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
-msgid "Fiscal Position Templates"
-msgstr "Plantillas de Tipos de Contribuyentes"
+msgid "Fiscal Mapping Templates"
+msgstr ""
 
 #. module: account
 #: rml:account.invoice:0
@@ -1175,8 +1175,8 @@ msgstr "El importe expresado en otra divisa opcional."
 #. module: account
 #: view:account.fiscal.position.template:0
 #: field:account.fiscal.position.template,name:0
-msgid "Fiscal Position Template"
-msgstr "Plantilla de Tipo de Contribuyente"
+msgid "Fiscal Mapping Template"
+msgstr ""
 
 #. module: account
 #: field:account.payment.term,line_ids:0
@@ -1247,8 +1247,8 @@ msgstr "Moneda de la compañía"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account_template
-msgid "Fiscal Position Template Account Mapping"
-msgstr "Mapeo cuentas plantilla posición fiscal"
+msgid "Template Account Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: field:account.analytic.account,parent_id:0
@@ -1831,11 +1831,9 @@ msgstr "Siguiente"
 #. module: account
 #: help:res.partner,property_account_position:0
 msgid ""
-"The fiscal position will determine taxes and the accounts used for the the "
-"partner."
+"The fiscal mapping will determine taxes and the accounts used for the partner."
 msgstr ""
-"La posición fiscal determinará los impuestos y las cuentas utilizadas para "
-"la empresa."
+""
 
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
@@ -2109,8 +2107,8 @@ msgstr "Proceso de factura de cliente"
 
 #. module: account
 #: rml:account.invoice:0
-msgid "Fiscal Position Remark :"
-msgstr "Observación posición fiscal :"
+msgid "Fiscal Mapping Remark :"
+msgstr ""
 
 #. module: account
 #: wizard_field:account.fiscalyear.close,init,period_id:0
@@ -3712,8 +3710,8 @@ msgstr "Secuencia"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_template
-msgid "Template for Fiscal Position"
-msgstr "Plantilla para posición fiscal"
+msgid "Template for Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: view:account.bank.statement:0
@@ -3819,8 +3817,8 @@ msgstr "Facturas borrador"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax_template
-msgid "Fiscal Position Template Tax Mapping"
-msgstr "Mapeo de impuestos en plantilla posiciones fiscales"
+msgid "Template Tax Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: rml:account.invoice:0
@@ -5977,7 +5975,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
-msgid "Fiscal Positions"
+msgid "Fiscal Mappings"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/et.po b/addons/account/i18n/et.po
index 3cde725de86..5bd23493492 100644
--- a/addons/account/i18n/et.po
+++ b/addons/account/i18n/et.po
@@ -615,8 +615,8 @@ msgstr "(Jätke tühjaks, et avada praegune seis)"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account
-msgid "Fiscal Position Accounts Mapping"
-msgstr "Finantspositsioonide kontode kaardistamine"
+msgid "Accounts Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: field:account.analytic.account,contact_id:0
@@ -1009,8 +1009,8 @@ msgstr "Netosumma:"
 #: field:account.invoice,fiscal_position:0
 #: model:ir.model,name:account.model_account_fiscal_position
 #: field:res.partner,property_account_position:0
-msgid "Fiscal Position"
-msgstr "Finantspositsioon"
+msgid "Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: field:account.analytic.line,product_uom_id:0
@@ -1031,7 +1031,7 @@ msgstr "Alam"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax
-msgid "Fiscal Position Taxes Mapping"
+msgid "Taxes Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1118,8 +1118,8 @@ msgstr "Uus analüütiline konto"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
-msgid "Fiscal Position Templates"
-msgstr "Finantspositsioonide mallid"
+msgid "Fiscal Mapping Templates"
+msgstr ""
 
 #. module: account
 #: rml:account.invoice:0
@@ -1150,8 +1150,8 @@ msgstr ""
 #. module: account
 #: view:account.fiscal.position.template:0
 #: field:account.fiscal.position.template,name:0
-msgid "Fiscal Position Template"
-msgstr "Finantspositsiooni mall"
+msgid "Fiscal Mapping Template"
+msgstr ""
 
 #. module: account
 #: field:account.payment.term,line_ids:0
@@ -1216,7 +1216,7 @@ msgstr "Ettevõtte valuuta"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account_template
-msgid "Fiscal Position Template Account Mapping"
+msgid "Template Account Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1794,8 +1794,7 @@ msgstr "Järgmine"
 #. module: account
 #: help:res.partner,property_account_position:0
 msgid ""
-"The fiscal position will determine taxes and the accounts used for the the "
-"partner."
+"The fiscal mapping will determine taxes and the accounts used for the partner."
 msgstr ""
 
 #. module: account
@@ -2065,7 +2064,7 @@ msgstr "Kliendi arve protsess"
 
 #. module: account
 #: rml:account.invoice:0
-msgid "Fiscal Position Remark :"
+msgid "Fiscal Mapping Remark :"
 msgstr ""
 
 #. module: account
@@ -3631,8 +3630,8 @@ msgstr "Järjekord"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_template
-msgid "Template for Fiscal Position"
-msgstr "Mall finantspositsioonile"
+msgid "Template for Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: view:account.bank.statement:0
@@ -3736,7 +3735,7 @@ msgstr "Mustandarved"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax_template
-msgid "Fiscal Position Template Tax Mapping"
+msgid "Template Tax Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -5873,8 +5872,8 @@ msgstr "Maksetingimus"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
-msgid "Fiscal Positions"
-msgstr "Finantspositsioonid"
+msgid "Fiscal Mappings"
+msgstr ""
 
 #. module: account
 #: model:process.process,name:account.process_process_statementprocess0
diff --git a/addons/account/i18n/eu.po b/addons/account/i18n/eu.po
index bc21eddacc3..4b6b179ae94 100644
--- a/addons/account/i18n/eu.po
+++ b/addons/account/i18n/eu.po
@@ -611,7 +611,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account
-msgid "Fiscal Position Accounts Mapping"
+msgid "Accounts Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1005,7 +1005,7 @@ msgstr ""
 #: field:account.invoice,fiscal_position:0
 #: model:ir.model,name:account.model_account_fiscal_position
 #: field:res.partner,property_account_position:0
-msgid "Fiscal Position"
+msgid "Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1027,7 +1027,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax
-msgid "Fiscal Position Taxes Mapping"
+msgid "Taxes Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1114,7 +1114,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
-msgid "Fiscal Position Templates"
+msgid "Fiscal Mapping Templates"
 msgstr ""
 
 #. module: account
@@ -1146,7 +1146,7 @@ msgstr ""
 #. module: account
 #: view:account.fiscal.position.template:0
 #: field:account.fiscal.position.template,name:0
-msgid "Fiscal Position Template"
+msgid "Fiscal Mapping Template"
 msgstr ""
 
 #. module: account
@@ -1212,7 +1212,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account_template
-msgid "Fiscal Position Template Account Mapping"
+msgid "Template Account Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1790,7 +1790,7 @@ msgstr ""
 #. module: account
 #: help:res.partner,property_account_position:0
 msgid ""
-"The fiscal position will determine taxes and the accounts used for the the "
+"The fiscal mapping will determine taxes and the accounts used for the  "
 "partner."
 msgstr ""
 
@@ -2061,7 +2061,7 @@ msgstr ""
 
 #. module: account
 #: rml:account.invoice:0
-msgid "Fiscal Position Remark :"
+msgid "Fiscal Mapping Remark :"
 msgstr ""
 
 #. module: account
@@ -3627,7 +3627,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_template
-msgid "Template for Fiscal Position"
+msgid "Template for Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -3732,7 +3732,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax_template
-msgid "Fiscal Position Template Tax Mapping"
+msgid "Template Tax Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -5867,7 +5867,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
-msgid "Fiscal Positions"
+msgid "Fiscal Mappings"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/fa.po b/addons/account/i18n/fa.po
index 832d5c239ff..e17099e629f 100644
--- a/addons/account/i18n/fa.po
+++ b/addons/account/i18n/fa.po
@@ -611,7 +611,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account
-msgid "Fiscal Position Accounts Mapping"
+msgid "Accounts Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1005,7 +1005,7 @@ msgstr ""
 #: field:account.invoice,fiscal_position:0
 #: model:ir.model,name:account.model_account_fiscal_position
 #: field:res.partner,property_account_position:0
-msgid "Fiscal Position"
+msgid "Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1027,7 +1027,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax
-msgid "Fiscal Position Taxes Mapping"
+msgid "Taxes Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1114,7 +1114,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
-msgid "Fiscal Position Templates"
+msgid "Fiscal Mapping Templates"
 msgstr ""
 
 #. module: account
@@ -1146,7 +1146,7 @@ msgstr ""
 #. module: account
 #: view:account.fiscal.position.template:0
 #: field:account.fiscal.position.template,name:0
-msgid "Fiscal Position Template"
+msgid "Fiscal Mapping Template"
 msgstr ""
 
 #. module: account
@@ -1212,7 +1212,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account_template
-msgid "Fiscal Position Template Account Mapping"
+msgid "Template Account Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1790,7 +1790,7 @@ msgstr ""
 #. module: account
 #: help:res.partner,property_account_position:0
 msgid ""
-"The fiscal position will determine taxes and the accounts used for the the "
+"The fiscal mapping will determine taxes and the accounts used for the  "
 "partner."
 msgstr ""
 
@@ -2061,7 +2061,7 @@ msgstr ""
 
 #. module: account
 #: rml:account.invoice:0
-msgid "Fiscal Position Remark :"
+msgid "Fiscal Mapping Remark :"
 msgstr ""
 
 #. module: account
@@ -3627,7 +3627,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_template
-msgid "Template for Fiscal Position"
+msgid "Template for Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -3732,7 +3732,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax_template
-msgid "Fiscal Position Template Tax Mapping"
+msgid "Template Tax Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -5867,7 +5867,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
-msgid "Fiscal Positions"
+msgid "Fiscal Mappings"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/fi.po b/addons/account/i18n/fi.po
index bbf45ada7cb..2be36ee1188 100644
--- a/addons/account/i18n/fi.po
+++ b/addons/account/i18n/fi.po
@@ -631,8 +631,8 @@ msgstr "Jätä tyhjäksi avataksesi nykyisen tilanteen"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account
-msgid "Fiscal Position Accounts Mapping"
-msgstr "Talouskannan tilien kartoitus"
+msgid "Accounts Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: field:account.analytic.account,contact_id:0
@@ -1029,8 +1029,8 @@ msgstr "Netto:"
 #: field:account.invoice,fiscal_position:0
 #: model:ir.model,name:account.model_account_fiscal_position
 #: field:res.partner,property_account_position:0
-msgid "Fiscal Position"
-msgstr "Talouskanta"
+msgid "Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: field:account.analytic.line,product_uom_id:0
@@ -1051,8 +1051,8 @@ msgstr "Alatilit"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax
-msgid "Fiscal Position Taxes Mapping"
-msgstr "Talouskannan verojen kartoitus"
+msgid "Taxes Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree2_new
@@ -1140,8 +1140,8 @@ msgstr "Uusi analyyttinen tili"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
-msgid "Fiscal Position Templates"
-msgstr "Talouskantojen mallit"
+msgid "Fiscal Mapping Templates"
+msgstr ""
 
 #. module: account
 #: rml:account.invoice:0
@@ -1172,8 +1172,8 @@ msgstr "Summa ilmoitettuna valinnaisessa toisessa valuutassa."
 #. module: account
 #: view:account.fiscal.position.template:0
 #: field:account.fiscal.position.template,name:0
-msgid "Fiscal Position Template"
-msgstr "Talouskannan malli"
+msgid "Fiscal Mapping Template"
+msgstr ""
 
 #. module: account
 #: field:account.payment.term,line_ids:0
@@ -1243,8 +1243,8 @@ msgstr "Yritysvaluutta"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account_template
-msgid "Fiscal Position Template Account Mapping"
-msgstr "Talouskannan mallin tilien kartoitukset"
+msgid "Template Account Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: field:account.analytic.account,parent_id:0
@@ -1825,9 +1825,8 @@ msgstr "Seuraava"
 #. module: account
 #: help:res.partner,property_account_position:0
 msgid ""
-"The fiscal position will determine taxes and the accounts used for the the "
-"partner."
-msgstr "Talouskanta määrittelee kumppaniin sovellettavat verot ja tilit."
+"The fiscal mapping will determine taxes and the accounts used for the partner."
+msgstr ""
 
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
@@ -2098,7 +2097,7 @@ msgstr "Asiakaslaskutusprosessi"
 
 #. module: account
 #: rml:account.invoice:0
-msgid "Fiscal Position Remark :"
+msgid "Fiscal Mapping Remark :"
 msgstr ""
 
 #. module: account
@@ -3690,8 +3689,8 @@ msgstr "Sarja"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_template
-msgid "Template for Fiscal Position"
-msgstr "Malli talouskannalle"
+msgid "Template for Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: view:account.bank.statement:0
@@ -3797,8 +3796,8 @@ msgstr "Luonnoslaskut"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax_template
-msgid "Fiscal Position Template Tax Mapping"
-msgstr "Talouskannan mallin veron kartoitukset"
+msgid "Template Tax Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: rml:account.invoice:0
@@ -5982,8 +5981,8 @@ msgstr "Maksuehto"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
-msgid "Fiscal Positions"
-msgstr "Talouskannat"
+msgid "Fiscal Mappings"
+msgstr ""
 
 #. module: account
 #: model:process.process,name:account.process_process_statementprocess0
diff --git a/addons/account/i18n/fr.po b/addons/account/i18n/fr.po
index 43477c007c9..ec7e651f34a 100644
--- a/addons/account/i18n/fr.po
+++ b/addons/account/i18n/fr.po
@@ -693,8 +693,8 @@ msgstr "(Laisser vide pour consulter la situation courrante)"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account
-msgid "Fiscal Position Accounts Mapping"
-msgstr "Affectation des comptes par régime fiscal"
+msgid "Accounts Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: field:account.analytic.account,contact_id:0
@@ -1084,8 +1084,8 @@ msgstr "Total net :"
 #: field:account.invoice,fiscal_position:0
 #: model:ir.model,name:account.model_account_fiscal_position
 #: field:res.partner,property_account_position:0
-msgid "Fiscal Position"
-msgstr "Régime fiscal"
+msgid "Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: field:account.analytic.line,product_uom_id:0
@@ -1106,8 +1106,8 @@ msgstr "Enfant"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax
-msgid "Fiscal Position Taxes Mapping"
-msgstr "Affectation des taxes par régime fiscal"
+msgid "Taxes Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree2_new
@@ -1195,8 +1195,8 @@ msgstr "Nouveau compte analytique"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
-msgid "Fiscal Position Templates"
-msgstr "Modèles de régimes fiscaux"
+msgid "Fiscal Mapping Templates"
+msgstr ""
 
 #. module: account
 #: rml:account.invoice:0
@@ -1227,8 +1227,8 @@ msgstr "Le montant exprimé dans une autre devise optionelle."
 #. module: account
 #: view:account.fiscal.position.template:0
 #: field:account.fiscal.position.template,name:0
-msgid "Fiscal Position Template"
-msgstr "Modèle de régime fiscal"
+msgid "Fiscal Mapping Template"
+msgstr ""
 
 #. module: account
 #: field:account.payment.term,line_ids:0
@@ -1299,8 +1299,8 @@ msgstr "Devise société"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account_template
-msgid "Fiscal Position Template Account Mapping"
-msgstr "Affectation des comptes suivant le modèle de régime fiscal"
+msgid "Template Account Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: field:account.analytic.account,parent_id:0
@@ -1880,12 +1880,9 @@ msgstr "Suivant"
 
 #. module: account
 #: help:res.partner,property_account_position:0
-msgid ""
-"The fiscal position will determine taxes and the accounts used for the the "
-"partner."
+msgid 
+"The fiscal mapping will determine taxes and the accounts used for the partner."
 msgstr ""
-"Le régime fiscal déterminera les taxes et les comptes utilisés pour le "
-"partenaire."
 
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
@@ -2159,8 +2156,8 @@ msgstr "Processus de la facture client"
 
 #. module: account
 #: rml:account.invoice:0
-msgid "Fiscal Position Remark :"
-msgstr "Remarque position fiscale :"
+msgid "Fiscal Mapping Remark :"
+msgstr ""
 
 #. module: account
 #: wizard_field:account.fiscalyear.close,init,period_id:0
@@ -3748,8 +3745,8 @@ msgstr "Séquence"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_template
-msgid "Template for Fiscal Position"
-msgstr "Modèle de régime fiscal"
+msgid "Template for Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: view:account.bank.statement:0
@@ -3855,8 +3852,8 @@ msgstr "Factures en brouillon"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax_template
-msgid "Fiscal Position Template Tax Mapping"
-msgstr "Affectation des taxes dans le modèle de régime fiscal"
+msgid "Template Tax Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: rml:account.invoice:0
@@ -6024,8 +6021,8 @@ msgstr "Condition de paiement"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
-msgid "Fiscal Positions"
-msgstr "Régimes fiscaux"
+msgid "Fiscal Mappings"
+msgstr ""
 
 #. module: account
 #: model:process.process,name:account.process_process_statementprocess0
diff --git a/addons/account/i18n/gl.po b/addons/account/i18n/gl.po
index 3b2d63f421a..60ee6a8f288 100644
--- a/addons/account/i18n/gl.po
+++ b/addons/account/i18n/gl.po
@@ -611,7 +611,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account
-msgid "Fiscal Position Accounts Mapping"
+msgid "Accounts Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1005,7 +1005,7 @@ msgstr ""
 #: field:account.invoice,fiscal_position:0
 #: model:ir.model,name:account.model_account_fiscal_position
 #: field:res.partner,property_account_position:0
-msgid "Fiscal Position"
+msgid "Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1027,7 +1027,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax
-msgid "Fiscal Position Taxes Mapping"
+msgid "Taxes Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1114,7 +1114,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
-msgid "Fiscal Position Templates"
+msgid "Fiscal Mapping Templates"
 msgstr ""
 
 #. module: account
@@ -1146,7 +1146,7 @@ msgstr ""
 #. module: account
 #: view:account.fiscal.position.template:0
 #: field:account.fiscal.position.template,name:0
-msgid "Fiscal Position Template"
+msgid "Fiscal Mapping Template"
 msgstr ""
 
 #. module: account
@@ -1212,7 +1212,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account_template
-msgid "Fiscal Position Template Account Mapping"
+msgid "Template Account Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1790,8 +1790,7 @@ msgstr ""
 #. module: account
 #: help:res.partner,property_account_position:0
 msgid ""
-"The fiscal position will determine taxes and the accounts used for the the "
-"partner."
+"The fiscal mapping will determine taxes and the accounts used for the partner."
 msgstr ""
 
 #. module: account
@@ -2061,7 +2060,7 @@ msgstr ""
 
 #. module: account
 #: rml:account.invoice:0
-msgid "Fiscal Position Remark :"
+msgid "Fiscal Mapping Remark :"
 msgstr ""
 
 #. module: account
@@ -3627,7 +3626,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_template
-msgid "Template for Fiscal Position"
+msgid "Template for Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -3732,7 +3731,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax_template
-msgid "Fiscal Position Template Tax Mapping"
+msgid "Template Tax Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -5869,7 +5868,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
-msgid "Fiscal Positions"
+msgid "Fiscal Mappings"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/gu.po b/addons/account/i18n/gu.po
index 15e457c25c4..51dc6467109 100644
--- a/addons/account/i18n/gu.po
+++ b/addons/account/i18n/gu.po
@@ -611,7 +611,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account
-msgid "Fiscal Position Accounts Mapping"
+msgid "Accounts Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1005,7 +1005,7 @@ msgstr ""
 #: field:account.invoice,fiscal_position:0
 #: model:ir.model,name:account.model_account_fiscal_position
 #: field:res.partner,property_account_position:0
-msgid "Fiscal Position"
+msgid "Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1027,7 +1027,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax
-msgid "Fiscal Position Taxes Mapping"
+msgid "Taxes Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1114,7 +1114,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
-msgid "Fiscal Position Templates"
+msgid "Fiscal Mapping Templates"
 msgstr ""
 
 #. module: account
@@ -1146,7 +1146,7 @@ msgstr ""
 #. module: account
 #: view:account.fiscal.position.template:0
 #: field:account.fiscal.position.template,name:0
-msgid "Fiscal Position Template"
+msgid "Fiscal Mapping Template"
 msgstr ""
 
 #. module: account
@@ -1212,7 +1212,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account_template
-msgid "Fiscal Position Template Account Mapping"
+msgid "Template Account Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1790,8 +1790,7 @@ msgstr "આગળ"
 #. module: account
 #: help:res.partner,property_account_position:0
 msgid ""
-"The fiscal position will determine taxes and the accounts used for the the "
-"partner."
+"The fiscal mapping will determine taxes and the accounts used for the partner."
 msgstr ""
 
 #. module: account
@@ -2061,7 +2060,7 @@ msgstr ""
 
 #. module: account
 #: rml:account.invoice:0
-msgid "Fiscal Position Remark :"
+msgid "Fiscal Mapping Remark :"
 msgstr ""
 
 #. module: account
@@ -3627,7 +3626,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_template
-msgid "Template for Fiscal Position"
+msgid "Template for Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -3732,7 +3731,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax_template
-msgid "Fiscal Position Template Tax Mapping"
+msgid "Template Tax Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -5867,7 +5866,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
-msgid "Fiscal Positions"
+msgid "Fiscal Mappings"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/hr.po b/addons/account/i18n/hr.po
index f712180a3c4..329ae8fa080 100644
--- a/addons/account/i18n/hr.po
+++ b/addons/account/i18n/hr.po
@@ -623,8 +623,8 @@ msgstr "(Zadržite prazno da biste otvorili trenutno stanje)"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account
-msgid "Fiscal Position Accounts Mapping"
-msgstr "Fiskalne pozicije - mapiranje konta"
+msgid "Accounts Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: field:account.analytic.account,contact_id:0
@@ -1017,8 +1017,8 @@ msgstr "Ukupno netto:"
 #: field:account.invoice,fiscal_position:0
 #: model:ir.model,name:account.model_account_fiscal_position
 #: field:res.partner,property_account_position:0
-msgid "Fiscal Position"
-msgstr "Porezna grupa"
+msgid "Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: field:account.analytic.line,product_uom_id:0
@@ -1039,8 +1039,8 @@ msgstr "Podređeni"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax
-msgid "Fiscal Position Taxes Mapping"
-msgstr "Mapiranje poreza fiskalne pozicije"
+msgid "Taxes Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree2_new
@@ -1128,8 +1128,8 @@ msgstr "Novi analitički konto"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
-msgid "Fiscal Position Templates"
-msgstr "Predlošci knjigovodstvenih grupa"
+msgid "Fiscal Mapping Templates"
+msgstr ""
 
 #. module: account
 #: rml:account.invoice:0
@@ -1160,8 +1160,8 @@ msgstr "Iznos u drugoj valuti."
 #. module: account
 #: view:account.fiscal.position.template:0
 #: field:account.fiscal.position.template,name:0
-msgid "Fiscal Position Template"
-msgstr "Predložak fiskalne pozicije"
+msgid "Fiscal Mapping Template"
+msgstr ""
 
 #. module: account
 #: field:account.payment.term,line_ids:0
@@ -1226,8 +1226,8 @@ msgstr "Valuta tvrtke"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account_template
-msgid "Fiscal Position Template Account Mapping"
-msgstr "Predložak mapiranja konta za fiskalnu poziciju"
+msgid "Template Account Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: field:account.analytic.account,parent_id:0
@@ -1808,10 +1808,9 @@ msgstr "Slijedeći"
 #. module: account
 #: help:res.partner,property_account_position:0
 msgid ""
-"The fiscal position will determine taxes and the accounts used for the the "
-"partner."
+"The fiscal mapping will determine taxes and the accounts used for the partner."
 msgstr ""
-"Fiskalna pozicija definira poreze i konta knjiženja računa za partnera."
+""
 
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
@@ -2081,8 +2080,8 @@ msgstr "Proces izlacnog računa"
 
 #. module: account
 #: rml:account.invoice:0
-msgid "Fiscal Position Remark :"
-msgstr "Komentar fiskalne pozicije:"
+msgid "Fiscal Mapping Remark :"
+msgstr ""
 
 #. module: account
 #: wizard_field:account.fiscalyear.close,init,period_id:0
@@ -3668,8 +3667,8 @@ msgstr "Sekvenca"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_template
-msgid "Template for Fiscal Position"
-msgstr "Predložak za fiskalnu poziciju"
+msgid "Template for Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: view:account.bank.statement:0
@@ -3775,7 +3774,7 @@ msgstr "Neodobreni računi"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax_template
-msgid "Fiscal Position Template Tax Mapping"
+msgid "Template Tax Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -5932,8 +5931,8 @@ msgstr "Uvjet plaćanja"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
-msgid "Fiscal Positions"
-msgstr "Fiskalne pozicije"
+msgid "Fiscal Mappings"
+msgstr ""
 
 #. module: account
 #: model:process.process,name:account.process_process_statementprocess0
diff --git a/addons/account/i18n/hu.po b/addons/account/i18n/hu.po
index 5d055d98eb8..3d50620e23d 100644
--- a/addons/account/i18n/hu.po
+++ b/addons/account/i18n/hu.po
@@ -610,7 +610,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account
-msgid "Fiscal Position Accounts Mapping"
+msgid "Accounts Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1004,7 +1004,7 @@ msgstr "Nettó összesen:"
 #: field:account.invoice,fiscal_position:0
 #: model:ir.model,name:account.model_account_fiscal_position
 #: field:res.partner,property_account_position:0
-msgid "Fiscal Position"
+msgid "Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1026,7 +1026,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax
-msgid "Fiscal Position Taxes Mapping"
+msgid "Taxes Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1113,7 +1113,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
-msgid "Fiscal Position Templates"
+msgid "Fiscal Mapping Templates"
 msgstr ""
 
 #. module: account
@@ -1145,7 +1145,7 @@ msgstr ""
 #. module: account
 #: view:account.fiscal.position.template:0
 #: field:account.fiscal.position.template,name:0
-msgid "Fiscal Position Template"
+msgid "Fiscal Mapping Template"
 msgstr ""
 
 #. module: account
@@ -1211,7 +1211,7 @@ msgstr "Cég pénzneme"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account_template
-msgid "Fiscal Position Template Account Mapping"
+msgid "Template Account Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1789,8 +1789,7 @@ msgstr "Tovább"
 #. module: account
 #: help:res.partner,property_account_position:0
 msgid ""
-"The fiscal position will determine taxes and the accounts used for the the "
-"partner."
+"The fiscal mapping will determine taxes and the accounts used for the partner."
 msgstr ""
 
 #. module: account
@@ -2060,7 +2059,7 @@ msgstr "Vevői számla folyamat"
 
 #. module: account
 #: rml:account.invoice:0
-msgid "Fiscal Position Remark :"
+msgid "Fiscal Mapping Remark :"
 msgstr ""
 
 #. module: account
@@ -3628,7 +3627,7 @@ msgstr "Sorszám"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_template
-msgid "Template for Fiscal Position"
+msgid "Template for Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -3733,7 +3732,7 @@ msgstr "Számla tervezetek"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax_template
-msgid "Fiscal Position Template Tax Mapping"
+msgid "Template Tax Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -5870,7 +5869,7 @@ msgstr "Fizetési feltétel"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
-msgid "Fiscal Positions"
+msgid "Fiscal Mappings"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/id.po b/addons/account/i18n/id.po
index 09e02ee69a7..cfa660a7867 100644
--- a/addons/account/i18n/id.po
+++ b/addons/account/i18n/id.po
@@ -611,7 +611,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account
-msgid "Fiscal Position Accounts Mapping"
+msgid "Accounts Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1005,7 +1005,7 @@ msgstr ""
 #: field:account.invoice,fiscal_position:0
 #: model:ir.model,name:account.model_account_fiscal_position
 #: field:res.partner,property_account_position:0
-msgid "Fiscal Position"
+msgid "Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1027,7 +1027,7 @@ msgstr "Anak"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax
-msgid "Fiscal Position Taxes Mapping"
+msgid "Taxes Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1114,7 +1114,7 @@ msgstr "Akun Analisis Baru"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
-msgid "Fiscal Position Templates"
+msgid "Fiscal Mapping Templates"
 msgstr ""
 
 #. module: account
@@ -1146,7 +1146,7 @@ msgstr ""
 #. module: account
 #: view:account.fiscal.position.template:0
 #: field:account.fiscal.position.template,name:0
-msgid "Fiscal Position Template"
+msgid "Fiscal Mapping Template"
 msgstr ""
 
 #. module: account
@@ -1212,7 +1212,7 @@ msgstr "Mata uang perusahaan"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account_template
-msgid "Fiscal Position Template Account Mapping"
+msgid "Template Account Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1790,8 +1790,7 @@ msgstr ""
 #. module: account
 #: help:res.partner,property_account_position:0
 msgid ""
-"The fiscal position will determine taxes and the accounts used for the the "
-"partner."
+"The fiscal mapping will determine taxes and the accounts used for the partner."
 msgstr ""
 
 #. module: account
@@ -2061,7 +2060,7 @@ msgstr ""
 
 #. module: account
 #: rml:account.invoice:0
-msgid "Fiscal Position Remark :"
+msgid "Fiscal Mapping Remark :"
 msgstr ""
 
 #. module: account
@@ -3627,7 +3626,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_template
-msgid "Template for Fiscal Position"
+msgid "Template for Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -3732,7 +3731,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax_template
-msgid "Fiscal Position Template Tax Mapping"
+msgid "Template Tax Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -5869,7 +5868,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
-msgid "Fiscal Positions"
+msgid "Fiscal Mappings"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/it.po b/addons/account/i18n/it.po
index 4b028ca2aff..1c05616dfd0 100644
--- a/addons/account/i18n/it.po
+++ b/addons/account/i18n/it.po
@@ -633,7 +633,7 @@ msgstr "(Tenere vuoto per aprire la situazione corrente)"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account
-msgid "Fiscal Position Accounts Mapping"
+msgid "Accounts Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1031,8 +1031,8 @@ msgstr "Totale imponibile"
 #: field:account.invoice,fiscal_position:0
 #: model:ir.model,name:account.model_account_fiscal_position
 #: field:res.partner,property_account_position:0
-msgid "Fiscal Position"
-msgstr "Posizione fiscale"
+msgid "Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: field:account.analytic.line,product_uom_id:0
@@ -1053,7 +1053,7 @@ msgstr "Sottoconto"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax
-msgid "Fiscal Position Taxes Mapping"
+msgid "Taxes Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1142,8 +1142,8 @@ msgstr "Nuovo conto analitico"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
-msgid "Fiscal Position Templates"
-msgstr "Modelli di \"posizioni fiscali\""
+msgid "Fiscal Mapping Templates"
+msgstr ""
 
 #. module: account
 #: rml:account.invoice:0
@@ -1174,8 +1174,8 @@ msgstr "L'importo espresso in un'altra valuta opzionale"
 #. module: account
 #: view:account.fiscal.position.template:0
 #: field:account.fiscal.position.template,name:0
-msgid "Fiscal Position Template"
-msgstr "Modelli di \"posizioni fiscali\""
+msgid "Fiscal Mapping Template"
+msgstr ""
 
 #. module: account
 #: field:account.payment.term,line_ids:0
@@ -1240,7 +1240,7 @@ msgstr "Valuta società"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account_template
-msgid "Fiscal Position Template Account Mapping"
+msgid "Template Account Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1820,10 +1820,9 @@ msgstr "Prossimo"
 #. module: account
 #: help:res.partner,property_account_position:0
 msgid ""
-"The fiscal position will determine taxes and the accounts used for the the "
-"partner."
+"The fiscal mapping will determine taxes and the accounts used for the partner."
 msgstr ""
-"La posizione fiscale determinerà tasse e il conto da usarsi per il partner."
+""
 
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
@@ -2095,7 +2094,7 @@ msgstr "Processo di fatturazione cliente"
 
 #. module: account
 #: rml:account.invoice:0
-msgid "Fiscal Position Remark :"
+msgid "Fiscal Mapping Remark :"
 msgstr ""
 
 #. module: account
@@ -3677,7 +3676,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_template
-msgid "Template for Fiscal Position"
+msgid "Template for Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -3784,7 +3783,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax_template
-msgid "Fiscal Position Template Tax Mapping"
+msgid "Template Tax Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -5925,8 +5924,8 @@ msgstr "Modalità di pagamento"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
-msgid "Fiscal Positions"
-msgstr "Posizioni fiscali"
+msgid "Fiscal Mappings"
+msgstr ""
 
 #. module: account
 #: model:process.process,name:account.process_process_statementprocess0
diff --git a/addons/account/i18n/kab.po b/addons/account/i18n/kab.po
index 0bfcb83987e..52d85d4b9e1 100644
--- a/addons/account/i18n/kab.po
+++ b/addons/account/i18n/kab.po
@@ -611,7 +611,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account
-msgid "Fiscal Position Accounts Mapping"
+msgid "Accounts Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1005,7 +1005,7 @@ msgstr ""
 #: field:account.invoice,fiscal_position:0
 #: model:ir.model,name:account.model_account_fiscal_position
 #: field:res.partner,property_account_position:0
-msgid "Fiscal Position"
+msgid "Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1027,7 +1027,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax
-msgid "Fiscal Position Taxes Mapping"
+msgid "Taxes Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1114,7 +1114,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
-msgid "Fiscal Position Templates"
+msgid "Fiscal Mapping Templates"
 msgstr ""
 
 #. module: account
@@ -1146,7 +1146,7 @@ msgstr ""
 #. module: account
 #: view:account.fiscal.position.template:0
 #: field:account.fiscal.position.template,name:0
-msgid "Fiscal Position Template"
+msgid "Fiscal Mapping Template"
 msgstr ""
 
 #. module: account
@@ -1212,7 +1212,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account_template
-msgid "Fiscal Position Template Account Mapping"
+msgid "Template Account Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1790,8 +1790,7 @@ msgstr ""
 #. module: account
 #: help:res.partner,property_account_position:0
 msgid ""
-"The fiscal position will determine taxes and the accounts used for the the "
-"partner."
+"The fiscal mapping will determine taxes and the accounts used for the partner."
 msgstr ""
 
 #. module: account
@@ -2061,7 +2060,7 @@ msgstr ""
 
 #. module: account
 #: rml:account.invoice:0
-msgid "Fiscal Position Remark :"
+msgid "Fiscal Mapping Remark :"
 msgstr ""
 
 #. module: account
@@ -3627,7 +3626,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_template
-msgid "Template for Fiscal Position"
+msgid "Template for Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -3732,7 +3731,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax_template
-msgid "Fiscal Position Template Tax Mapping"
+msgid "Template Tax Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -5867,7 +5866,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
-msgid "Fiscal Positions"
+msgid "Fiscal Mappings"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/ko.po b/addons/account/i18n/ko.po
index 360535cc687..7856d66f9a2 100644
--- a/addons/account/i18n/ko.po
+++ b/addons/account/i18n/ko.po
@@ -611,7 +611,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account
-msgid "Fiscal Position Accounts Mapping"
+msgid "Accounts Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1005,7 +1005,7 @@ msgstr ""
 #: field:account.invoice,fiscal_position:0
 #: model:ir.model,name:account.model_account_fiscal_position
 #: field:res.partner,property_account_position:0
-msgid "Fiscal Position"
+msgid "Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1027,7 +1027,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax
-msgid "Fiscal Position Taxes Mapping"
+msgid "Taxes Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1114,7 +1114,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
-msgid "Fiscal Position Templates"
+msgid "Fiscal Mapping Templates"
 msgstr ""
 
 #. module: account
@@ -1146,7 +1146,7 @@ msgstr "다른 통화 단위로 환산된 금액"
 #. module: account
 #: view:account.fiscal.position.template:0
 #: field:account.fiscal.position.template,name:0
-msgid "Fiscal Position Template"
+msgid "Fiscal Mapping Template"
 msgstr ""
 
 #. module: account
@@ -1212,7 +1212,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account_template
-msgid "Fiscal Position Template Account Mapping"
+msgid "Template Account Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1790,8 +1790,7 @@ msgstr ""
 #. module: account
 #: help:res.partner,property_account_position:0
 msgid ""
-"The fiscal position will determine taxes and the accounts used for the the "
-"partner."
+"The fiscal mapping will determine taxes and the accounts used for the partner."
 msgstr ""
 
 #. module: account
@@ -2061,7 +2060,7 @@ msgstr ""
 
 #. module: account
 #: rml:account.invoice:0
-msgid "Fiscal Position Remark :"
+msgid "Fiscal Mapping Remark :"
 msgstr ""
 
 #. module: account
@@ -3627,7 +3626,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_template
-msgid "Template for Fiscal Position"
+msgid "Template for Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -3732,7 +3731,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax_template
-msgid "Fiscal Position Template Tax Mapping"
+msgid "Template Tax Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -5867,7 +5866,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
-msgid "Fiscal Positions"
+msgid "Fiscal Mappings"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/lt.po b/addons/account/i18n/lt.po
index 98d920746b3..5635b426fa3 100644
--- a/addons/account/i18n/lt.po
+++ b/addons/account/i18n/lt.po
@@ -614,8 +614,8 @@ msgstr "(palikti tusčią tam, kad atidarytumėte einamąją situaciją)"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account
-msgid "Fiscal Position Accounts Mapping"
-msgstr "Sąskaitų fiskalinė pozicija"
+msgid "Accounts Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: field:account.analytic.account,contact_id:0
@@ -1010,8 +1010,8 @@ msgstr "Iš viso be mokesčių:"
 #: field:account.invoice,fiscal_position:0
 #: model:ir.model,name:account.model_account_fiscal_position
 #: field:res.partner,property_account_position:0
-msgid "Fiscal Position"
-msgstr "Fiskalinė pozicija"
+msgid "Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: field:account.analytic.line,product_uom_id:0
@@ -1032,8 +1032,8 @@ msgstr "Žemesnysis"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax
-msgid "Fiscal Position Taxes Mapping"
-msgstr "Fiskalinė pozicija mokesčiams"
+msgid "Taxes Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree2_new
@@ -1121,8 +1121,8 @@ msgstr "Nauja analitinė sąskaita"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
-msgid "Fiscal Position Templates"
-msgstr "Fiskalinės pozicijos šablonai"
+msgid "Fiscal Mapping Templates"
+msgstr ""
 
 #. module: account
 #: rml:account.invoice:0
@@ -1153,8 +1153,8 @@ msgstr "Suma pasirinktinai gali būti įrašyta kita valiuta."
 #. module: account
 #: view:account.fiscal.position.template:0
 #: field:account.fiscal.position.template,name:0
-msgid "Fiscal Position Template"
-msgstr "Fiskalinės pozicijos šablonas"
+msgid "Fiscal Mapping Template"
+msgstr ""
 
 #. module: account
 #: field:account.payment.term,line_ids:0
@@ -1219,8 +1219,8 @@ msgstr "Įmonės naudojama valiuta"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account_template
-msgid "Fiscal Position Template Account Mapping"
-msgstr "Sąskaitų fiskalinės pozicijos nustatymai"
+msgid "Template Account Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: field:account.analytic.account,parent_id:0
@@ -1799,10 +1799,8 @@ msgstr "Toliau"
 #. module: account
 #: help:res.partner,property_account_position:0
 msgid ""
-"The fiscal position will determine taxes and the accounts used for the the "
-"partner."
+"The fiscal mapping will determine taxes and the accounts used for the partner."
 msgstr ""
-"Fiskalinė pozicija padės nustatyti mokesčius ir apskaitą kontrahentams."
 
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
@@ -2075,7 +2073,7 @@ msgstr ""
 
 #. module: account
 #: rml:account.invoice:0
-msgid "Fiscal Position Remark :"
+msgid "Fiscal Mapping Remark :"
 msgstr ""
 
 #. module: account
@@ -3659,8 +3657,8 @@ msgstr "Seka"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_template
-msgid "Template for Fiscal Position"
-msgstr "Fiskalinės pozicijos šablonas"
+msgid "Template for Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: view:account.bank.statement:0
@@ -3766,8 +3764,8 @@ msgstr "Sąskaitų faktūrų juodraščiai"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax_template
-msgid "Fiscal Position Template Tax Mapping"
-msgstr "Fiskalinės pozicijos mokesčiams nustatymai"
+msgid "Template Tax Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: rml:account.invoice:0
@@ -5933,8 +5931,8 @@ msgstr "Mokėjimo terminas"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
-msgid "Fiscal Positions"
-msgstr "Fiskalinė pozicija"
+msgid "Fiscal Mappings"
+msgstr ""
 
 #. module: account
 #: model:process.process,name:account.process_process_statementprocess0
diff --git a/addons/account/i18n/lv.po b/addons/account/i18n/lv.po
index 1e6badc7cac..04d98c4f99a 100644
--- a/addons/account/i18n/lv.po
+++ b/addons/account/i18n/lv.po
@@ -623,7 +623,7 @@ msgstr "(Atstāt tukšu, lai atvērtu esošo stāvokli)"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account
-msgid "Fiscal Position Accounts Mapping"
+msgid "Accounts Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1017,8 +1017,8 @@ msgstr ""
 #: field:account.invoice,fiscal_position:0
 #: model:ir.model,name:account.model_account_fiscal_position
 #: field:res.partner,property_account_position:0
-msgid "Fiscal Position"
-msgstr "Fiskālā Pozīcija"
+msgid "Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: field:account.analytic.line,product_uom_id:0
@@ -1039,7 +1039,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax
-msgid "Fiscal Position Taxes Mapping"
+msgid "Taxes Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1126,7 +1126,7 @@ msgstr "Jauns Analītiskais Konts"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
-msgid "Fiscal Position Templates"
+msgid "Fiscal Mapping Templates"
 msgstr ""
 
 #. module: account
@@ -1158,7 +1158,7 @@ msgstr ""
 #. module: account
 #: view:account.fiscal.position.template:0
 #: field:account.fiscal.position.template,name:0
-msgid "Fiscal Position Template"
+msgid "Fiscal Mapping Template"
 msgstr ""
 
 #. module: account
@@ -1224,7 +1224,7 @@ msgstr "Uzņēmuma valūta"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account_template
-msgid "Fiscal Position Template Account Mapping"
+msgid "Template Account Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1802,8 +1802,7 @@ msgstr "Nākamais"
 #. module: account
 #: help:res.partner,property_account_position:0
 msgid ""
-"The fiscal position will determine taxes and the accounts used for the the "
-"partner."
+"The fiscal mapping will determine taxes and the accounts used for the partner."
 msgstr ""
 
 #. module: account
@@ -2073,7 +2072,7 @@ msgstr ""
 
 #. module: account
 #: rml:account.invoice:0
-msgid "Fiscal Position Remark :"
+msgid "Fiscal Mapping Remark :"
 msgstr ""
 
 #. module: account
@@ -3639,7 +3638,7 @@ msgstr "Secība"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_template
-msgid "Template for Fiscal Position"
+msgid "Template for Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -3744,7 +3743,7 @@ msgstr "Neapstiprināti Rēķini"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax_template
-msgid "Fiscal Position Template Tax Mapping"
+msgid "Template Tax Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -5879,8 +5878,8 @@ msgstr "Apmaksas Termiņš"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
-msgid "Fiscal Positions"
-msgstr "Fiskālās Pozīcijas"
+msgid "Fiscal Mappings"
+msgstr ""
 
 #. module: account
 #: model:process.process,name:account.process_process_statementprocess0
diff --git a/addons/account/i18n/mn.po b/addons/account/i18n/mn.po
index d1f1ba6ddd3..abb1d381255 100644
--- a/addons/account/i18n/mn.po
+++ b/addons/account/i18n/mn.po
@@ -619,7 +619,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account
-msgid "Fiscal Position Accounts Mapping"
+msgid "Accounts Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1015,8 +1015,8 @@ msgstr "Цэвэр дүн"
 #: field:account.invoice,fiscal_position:0
 #: model:ir.model,name:account.model_account_fiscal_position
 #: field:res.partner,property_account_position:0
-msgid "Fiscal Position"
-msgstr "Фискал посишион"
+msgid "Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: field:account.analytic.line,product_uom_id:0
@@ -1037,8 +1037,8 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax
-msgid "Fiscal Position Taxes Mapping"
-msgstr "Санхүүгийн байршил татварын зурагжуулалт"
+msgid "Taxes Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree2_new
@@ -1124,8 +1124,8 @@ msgstr "Шинэ аналитик данс"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
-msgid "Fiscal Position Templates"
-msgstr "Загвар фискал посишион"
+msgid "Fiscal Mapping Templates"
+msgstr ""
 
 #. module: account
 #: rml:account.invoice:0
@@ -1156,7 +1156,7 @@ msgstr "Гүйлгээний валютаар илэрхийлэгдэх дүн"
 #. module: account
 #: view:account.fiscal.position.template:0
 #: field:account.fiscal.position.template,name:0
-msgid "Fiscal Position Template"
+msgid "Fiscal Mapping Template"
 msgstr ""
 
 #. module: account
@@ -1227,7 +1227,7 @@ msgstr "Компаны валют"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account_template
-msgid "Fiscal Position Template Account Mapping"
+msgid "Template Account Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1809,10 +1809,8 @@ msgstr "Цааш нь"
 #. module: account
 #: help:res.partner,property_account_position:0
 msgid ""
-"The fiscal position will determine taxes and the accounts used for the the "
-"partner."
+"The fiscal mapping will determine taxes and the accounts used for the partner."
 msgstr ""
-"Зөвхөн тухайн харилцагчид зориулагдсан татвар, дансуудыг тодорхойлно."
 
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
@@ -2083,8 +2081,8 @@ msgstr "Худалдан авагчийн нэхэмжлэлийн явц"
 
 #. module: account
 #: rml:account.invoice:0
-msgid "Fiscal Position Remark :"
-msgstr "Фискал посишион тайлбар :"
+msgid "Fiscal Mapping Remark :"
+msgstr ""
 
 #. module: account
 #: wizard_field:account.fiscalyear.close,init,period_id:0
@@ -3673,8 +3671,8 @@ msgstr "Дугаарлалт"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_template
-msgid "Template for Fiscal Position"
-msgstr "Санхүүгийн байршилын загвар"
+msgid "Template for Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: view:account.bank.statement:0
@@ -3780,7 +3778,7 @@ msgstr "Ноорог нэхэмжлэлүүд"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax_template
-msgid "Fiscal Position Template Tax Mapping"
+msgid "Template Tax Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -5964,7 +5962,7 @@ msgstr "Төлбөрийн нөхцөл"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
-msgid "Fiscal Positions"
+msgid "Fiscal Mappings"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/nb.po b/addons/account/i18n/nb.po
index 3332fc2eccb..497c9019b39 100644
--- a/addons/account/i18n/nb.po
+++ b/addons/account/i18n/nb.po
@@ -611,7 +611,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account
-msgid "Fiscal Position Accounts Mapping"
+msgid "Accounts Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1005,7 +1005,7 @@ msgstr ""
 #: field:account.invoice,fiscal_position:0
 #: model:ir.model,name:account.model_account_fiscal_position
 #: field:res.partner,property_account_position:0
-msgid "Fiscal Position"
+msgid "Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1027,7 +1027,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax
-msgid "Fiscal Position Taxes Mapping"
+msgid "Taxes Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1114,7 +1114,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
-msgid "Fiscal Position Templates"
+msgid "Fiscal Mapping Templates"
 msgstr ""
 
 #. module: account
@@ -1146,7 +1146,7 @@ msgstr ""
 #. module: account
 #: view:account.fiscal.position.template:0
 #: field:account.fiscal.position.template,name:0
-msgid "Fiscal Position Template"
+msgid "Fiscal Mapping Template"
 msgstr ""
 
 #. module: account
@@ -1212,7 +1212,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account_template
-msgid "Fiscal Position Template Account Mapping"
+msgid "Template Account Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1790,7 +1790,7 @@ msgstr ""
 #. module: account
 #: help:res.partner,property_account_position:0
 msgid ""
-"The fiscal position will determine taxes and the accounts used for the the "
+"The fiscal mapping will determine taxes and the accounts used for the  "
 "partner."
 msgstr ""
 
@@ -2061,7 +2061,7 @@ msgstr ""
 
 #. module: account
 #: rml:account.invoice:0
-msgid "Fiscal Position Remark :"
+msgid "Fiscal Mapping Remark :"
 msgstr ""
 
 #. module: account
@@ -3627,7 +3627,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_template
-msgid "Template for Fiscal Position"
+msgid "Template for Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -3732,7 +3732,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax_template
-msgid "Fiscal Position Template Tax Mapping"
+msgid "Template Tax Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -5867,7 +5867,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
-msgid "Fiscal Positions"
+msgid "Fiscal Mappings"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/nl.po b/addons/account/i18n/nl.po
index 82671b988fb..c6b166d9e0b 100644
--- a/addons/account/i18n/nl.po
+++ b/addons/account/i18n/nl.po
@@ -631,8 +631,8 @@ msgstr "(laat leeg om de huidige situatie te behouden)"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account
-msgid "Fiscal Position Accounts Mapping"
-msgstr "Fiscale toewijzing grootboekrekeningen"
+msgid "Accounts Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: field:account.analytic.account,contact_id:0
@@ -1030,8 +1030,8 @@ msgstr "Netto totaal"
 #: field:account.invoice,fiscal_position:0
 #: model:ir.model,name:account.model_account_fiscal_position
 #: field:res.partner,property_account_position:0
-msgid "Fiscal Position"
-msgstr "Fiscale positie"
+msgid "Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: field:account.analytic.line,product_uom_id:0
@@ -1052,8 +1052,8 @@ msgstr "Kinderen"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax
-msgid "Fiscal Position Taxes Mapping"
-msgstr "Toewijzing belastingen"
+msgid "Taxes Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree2_new
@@ -1141,8 +1141,8 @@ msgstr "Nieuwe kostenplaats"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
-msgid "Fiscal Position Templates"
-msgstr "Fiscale situatie sjablonen"
+msgid "Fiscal Mapping Templates"
+msgstr ""
 
 #. module: account
 #: rml:account.invoice:0
@@ -1173,8 +1173,8 @@ msgstr "Het bedrag uitgedrukt in een optionele andere valuta."
 #. module: account
 #: view:account.fiscal.position.template:0
 #: field:account.fiscal.position.template,name:0
-msgid "Fiscal Position Template"
-msgstr "Fiscale situatie sjabloon"
+msgid "Fiscal Mapping Template"
+msgstr ""
 
 #. module: account
 #: field:account.payment.term,line_ids:0
@@ -1244,8 +1244,8 @@ msgstr "Bedrijfsvaluta"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account_template
-msgid "Fiscal Position Template Account Mapping"
-msgstr "Vervangingstabel belastingpositie-sjabloon"
+msgid "Template Account Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: field:account.analytic.account,parent_id:0
@@ -1827,10 +1827,9 @@ msgstr "Volgend"
 #. module: account
 #: help:res.partner,property_account_position:0
 msgid ""
-"The fiscal position will determine taxes and the accounts used for the the "
+"The fiscal mapping will determine taxes and the accounts used for the  "
 "partner."
 msgstr ""
-"De fiscale positie bepaald de belastingen op verkopen bij de huidige relatie."
 
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
@@ -2104,8 +2103,8 @@ msgstr "Verkoopfactuur proces"
 
 #. module: account
 #: rml:account.invoice:0
-msgid "Fiscal Position Remark :"
-msgstr "Opmerking fiscale positie :"
+msgid "Fiscal Mapping Remark :"
+msgstr ""
 
 #. module: account
 #: wizard_field:account.fiscalyear.close,init,period_id:0
@@ -3710,8 +3709,8 @@ msgstr "Reeks"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_template
-msgid "Template for Fiscal Position"
-msgstr "Sjabloon voor fiscale situatie"
+msgid "Template for Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: view:account.bank.statement:0
@@ -3817,8 +3816,8 @@ msgstr "Concept-facturen"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax_template
-msgid "Fiscal Position Template Tax Mapping"
-msgstr "Vervangingstabel belastingpositie belastingsjabloon"
+msgid "Template Tax Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: rml:account.invoice:0
@@ -6017,8 +6016,8 @@ msgstr "Betalingsconditie"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
-msgid "Fiscal Positions"
-msgstr "Fiscale positie"
+msgid "Fiscal Mappings"
+msgstr ""
 
 #. module: account
 #: model:process.process,name:account.process_process_statementprocess0
diff --git a/addons/account/i18n/nl_BE.po b/addons/account/i18n/nl_BE.po
index cabc0c629c7..3296654dfe4 100644
--- a/addons/account/i18n/nl_BE.po
+++ b/addons/account/i18n/nl_BE.po
@@ -633,8 +633,8 @@ msgstr "(leeg om de huidige situatie te openen)"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account
-msgid "Fiscal Position Accounts Mapping"
-msgstr "Rekeningkoppeling fiscale positie"
+msgid "Accounts Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: field:account.analytic.account,contact_id:0
@@ -1031,8 +1031,8 @@ msgstr "Nettototaal:"
 #: field:account.invoice,fiscal_position:0
 #: model:ir.model,name:account.model_account_fiscal_position
 #: field:res.partner,property_account_position:0
-msgid "Fiscal Position"
-msgstr "Fiscale positie"
+msgid "Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: field:account.analytic.line,product_uom_id:0
@@ -1053,8 +1053,8 @@ msgstr "Afhankel."
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax
-msgid "Fiscal Position Taxes Mapping"
-msgstr "Btw-koppeling fiscale positie"
+msgid "Taxes Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree2_new
@@ -1142,8 +1142,8 @@ msgstr "Nieuwe analytische rekening"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
-msgid "Fiscal Position Templates"
-msgstr "Sjablonen fiscale posities"
+msgid "Fiscal Mapping Templates"
+msgstr ""
 
 #. module: account
 #: rml:account.invoice:0
@@ -1174,8 +1174,8 @@ msgstr "Het bedrag uitgedrukt in een optionele andere munt."
 #. module: account
 #: view:account.fiscal.position.template:0
 #: field:account.fiscal.position.template,name:0
-msgid "Fiscal Position Template"
-msgstr "Sjabloon fiscale posities"
+msgid "Fiscal Mapping Template"
+msgstr ""
 
 #. module: account
 #: field:account.payment.term,line_ids:0
@@ -1248,8 +1248,8 @@ msgstr "Firmamunt"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account_template
-msgid "Fiscal Position Template Account Mapping"
-msgstr "Rekeningkoppeling sjabloon fiscale positie"
+msgid "Template Account Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: field:account.analytic.account,parent_id:0
@@ -1830,9 +1830,9 @@ msgstr "Volgende"
 #. module: account
 #: help:res.partner,property_account_position:0
 msgid ""
-"The fiscal position will determine taxes and the accounts used for the the "
+"The fiscal mapping will determine taxes and the accounts used for the  "
 "partner."
-msgstr "Fiscale positie bepaalt btw en rekeningen voor de relatie."
+msgstr ""
 
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
@@ -2106,8 +2106,8 @@ msgstr "Verkoopfactuurprocedure"
 
 #. module: account
 #: rml:account.invoice:0
-msgid "Fiscal Position Remark :"
-msgstr "Opmerking fiscale positie:"
+msgid "Fiscal Mapping Remark :"
+msgstr ""
 
 #. module: account
 #: wizard_field:account.fiscalyear.close,init,period_id:0
@@ -3687,7 +3687,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_template
-msgid "Template for Fiscal Position"
+msgid "Template for Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -3792,7 +3792,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax_template
-msgid "Fiscal Position Template Tax Mapping"
+msgid "Template Tax Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -5928,7 +5928,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
-msgid "Fiscal Positions"
+msgid "Fiscal Mappings"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/oc.po b/addons/account/i18n/oc.po
index 6e9a67e6755..de2c41178ec 100644
--- a/addons/account/i18n/oc.po
+++ b/addons/account/i18n/oc.po
@@ -613,7 +613,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account
-msgid "Fiscal Position Accounts Mapping"
+msgid "Accounts Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1007,7 +1007,7 @@ msgstr "Total net :"
 #: field:account.invoice,fiscal_position:0
 #: model:ir.model,name:account.model_account_fiscal_position
 #: field:res.partner,property_account_position:0
-msgid "Fiscal Position"
+msgid "Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1029,7 +1029,7 @@ msgstr "Enfant"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax
-msgid "Fiscal Position Taxes Mapping"
+msgid "Taxes Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1116,7 +1116,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
-msgid "Fiscal Position Templates"
+msgid "Fiscal Mapping Templates"
 msgstr ""
 
 #. module: account
@@ -1148,7 +1148,7 @@ msgstr ""
 #. module: account
 #: view:account.fiscal.position.template:0
 #: field:account.fiscal.position.template,name:0
-msgid "Fiscal Position Template"
+msgid "Fiscal Mapping Template"
 msgstr ""
 
 #. module: account
@@ -1214,7 +1214,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account_template
-msgid "Fiscal Position Template Account Mapping"
+msgid "Template Account Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1792,7 +1792,7 @@ msgstr "Seguent"
 #. module: account
 #: help:res.partner,property_account_position:0
 msgid ""
-"The fiscal position will determine taxes and the accounts used for the the "
+"The fiscal mapping will determine taxes and the accounts used for the  "
 "partner."
 msgstr ""
 
@@ -2063,7 +2063,7 @@ msgstr ""
 
 #. module: account
 #: rml:account.invoice:0
-msgid "Fiscal Position Remark :"
+msgid "Fiscal Mapping Remark :"
 msgstr ""
 
 #. module: account
@@ -3629,7 +3629,7 @@ msgstr "Sequéncia"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_template
-msgid "Template for Fiscal Position"
+msgid "Template for Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -3734,7 +3734,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax_template
-msgid "Fiscal Position Template Tax Mapping"
+msgid "Template Tax Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -5869,7 +5869,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
-msgid "Fiscal Positions"
+msgid "Fiscal Mappings"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/pl.po b/addons/account/i18n/pl.po
index 8a603d047b7..a21b3092609 100644
--- a/addons/account/i18n/pl.po
+++ b/addons/account/i18n/pl.po
@@ -630,8 +630,8 @@ msgstr "(Pozostaw puste, aby otworzyć bieżącą sytuację)"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account
-msgid "Fiscal Position Accounts Mapping"
-msgstr "Mapowanie kont obszarów podatkowych"
+msgid "Accounts Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: field:account.analytic.account,contact_id:0
@@ -1028,8 +1028,8 @@ msgstr "Suma netto:"
 #: field:account.invoice,fiscal_position:0
 #: model:ir.model,name:account.model_account_fiscal_position
 #: field:res.partner,property_account_position:0
-msgid "Fiscal Position"
-msgstr "Obszar podatkowy"
+msgid "Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: field:account.analytic.line,product_uom_id:0
@@ -1050,8 +1050,8 @@ msgstr "Podrzędne"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax
-msgid "Fiscal Position Taxes Mapping"
-msgstr "Mapowanie podatków wg obszarów podatkowych"
+msgid "Taxes Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree2_new
@@ -1139,8 +1139,8 @@ msgstr "Nowe konto analityczne"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
-msgid "Fiscal Position Templates"
-msgstr "Szablony obszarów podatkowych"
+msgid "Fiscal Mapping Templates"
+msgstr ""
 
 #. module: account
 #: rml:account.invoice:0
@@ -1171,8 +1171,8 @@ msgstr "Wartość wyrażona w ewentualnej innej walucie."
 #. module: account
 #: view:account.fiscal.position.template:0
 #: field:account.fiscal.position.template,name:0
-msgid "Fiscal Position Template"
-msgstr "Szablon obszaru podatkowego"
+msgid "Fiscal Mapping Template"
+msgstr ""
 
 #. module: account
 #: field:account.payment.term,line_ids:0
@@ -1242,8 +1242,8 @@ msgstr "Waluta firmy"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account_template
-msgid "Fiscal Position Template Account Mapping"
-msgstr "Mapowanie szablonów kont obszarów podatkowych"
+msgid "Template Account Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: field:account.analytic.account,parent_id:0
@@ -1824,9 +1824,9 @@ msgstr "Następne"
 #. module: account
 #: help:res.partner,property_account_position:0
 msgid ""
-"The fiscal position will determine taxes and the accounts used for the the "
+"The fiscal mapping will determine taxes and the accounts used for the  "
 "partner."
-msgstr "Obszar podatkowy określa podatki i konta stosowane dla partnera."
+msgstr ""
 
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
@@ -2098,8 +2098,8 @@ msgstr "Proces faktury dla klienta"
 
 #. module: account
 #: rml:account.invoice:0
-msgid "Fiscal Position Remark :"
-msgstr "Uwaga do obszaru podatkowego :"
+msgid "Fiscal Mapping Remark :"
+msgstr ""
 
 #. module: account
 #: wizard_field:account.fiscalyear.close,init,period_id:0
@@ -3697,8 +3697,8 @@ msgstr "Numeracja"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_template
-msgid "Template for Fiscal Position"
-msgstr "Szablon dla obszaru podatkowego"
+msgid "Template for Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: view:account.bank.statement:0
@@ -3804,8 +3804,8 @@ msgstr "Projekty faktur"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax_template
-msgid "Fiscal Position Template Tax Mapping"
-msgstr "Mapowanie podatków wg szablonów obszarów podatkowych"
+msgid "Template Tax Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: rml:account.invoice:0
@@ -5996,8 +5996,8 @@ msgstr "Warunki płatności"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
-msgid "Fiscal Positions"
-msgstr "Obszary podatkowe"
+msgid "Fiscal Mappings"
+msgstr ""
 
 #. module: account
 #: model:process.process,name:account.process_process_statementprocess0
diff --git a/addons/account/i18n/pt.po b/addons/account/i18n/pt.po
index a772f0234ee..fbab2b78ddc 100644
--- a/addons/account/i18n/pt.po
+++ b/addons/account/i18n/pt.po
@@ -628,8 +628,8 @@ msgstr "(Manter vazio para abrir a situação actual)"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account
-msgid "Fiscal Position Accounts Mapping"
-msgstr "Mapeamento de contas da posição fiscal"
+msgid "Accounts Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: field:account.analytic.account,contact_id:0
@@ -1026,8 +1026,8 @@ msgstr "Neto total:"
 #: field:account.invoice,fiscal_position:0
 #: model:ir.model,name:account.model_account_fiscal_position
 #: field:res.partner,property_account_position:0
-msgid "Fiscal Position"
-msgstr "Posição fiscal"
+msgid "Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: field:account.analytic.line,product_uom_id:0
@@ -1048,8 +1048,8 @@ msgstr "Contas-filho"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax
-msgid "Fiscal Position Taxes Mapping"
-msgstr "Mapeamento de impostos de posições fiscais"
+msgid "Taxes Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree2_new
@@ -1137,8 +1137,8 @@ msgstr "Nova conta da contabilidade analítica"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
-msgid "Fiscal Position Templates"
-msgstr "Modelos de posição fiscal"
+msgid "Fiscal Mapping Templates"
+msgstr ""
 
 #. module: account
 #: rml:account.invoice:0
@@ -1169,8 +1169,8 @@ msgstr "Montante apresentado numa outra moeda, opcional."
 #. module: account
 #: view:account.fiscal.position.template:0
 #: field:account.fiscal.position.template,name:0
-msgid "Fiscal Position Template"
-msgstr "Modelo de posição fiscal"
+msgid "Fiscal Mapping Template"
+msgstr ""
 
 #. module: account
 #: field:account.payment.term,line_ids:0
@@ -1240,8 +1240,8 @@ msgstr "Moeda da empresa"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account_template
-msgid "Fiscal Position Template Account Mapping"
-msgstr "Mapeamento do Modelo de Posição Fiscal."
+msgid "Template Account Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: field:account.analytic.account,parent_id:0
@@ -1822,10 +1822,9 @@ msgstr "Seguinte"
 #. module: account
 #: help:res.partner,property_account_position:0
 msgid ""
-"The fiscal position will determine taxes and the accounts used for the the "
+"The fiscal mapping will determine taxes and the accounts used for the  "
 "partner."
 msgstr ""
-"A posição fiscal determinará os impostos e as contas usados para o parceiro."
 
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
@@ -2097,8 +2096,8 @@ msgstr "Processo de facturação a clientes"
 
 #. module: account
 #: rml:account.invoice:0
-msgid "Fiscal Position Remark :"
-msgstr "Nota da posição fiscal"
+msgid "Fiscal Mapping Remark :"
+msgstr ""
 
 #. module: account
 #: wizard_field:account.fiscalyear.close,init,period_id:0
@@ -3699,8 +3698,8 @@ msgstr "Sequência"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_template
-msgid "Template for Fiscal Position"
-msgstr "Modelo de posição fiscal"
+msgid "Template for Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: view:account.bank.statement:0
@@ -3806,8 +3805,8 @@ msgstr "Facturas em rascunhos"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax_template
-msgid "Fiscal Position Template Tax Mapping"
-msgstr "Mapeamento de imposto e modelos de posição fiscal"
+msgid "Template Tax Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: rml:account.invoice:0
@@ -5999,8 +5998,8 @@ msgstr "Termo do Pagamento"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
-msgid "Fiscal Positions"
-msgstr "Posições fiscais"
+msgid "Fiscal Mappings"
+msgstr ""
 
 #. module: account
 #: model:process.process,name:account.process_process_statementprocess0
diff --git a/addons/account/i18n/pt_BR.po b/addons/account/i18n/pt_BR.po
index c3f68709355..5d2937a5629 100644
--- a/addons/account/i18n/pt_BR.po
+++ b/addons/account/i18n/pt_BR.po
@@ -631,8 +631,8 @@ msgstr "(Manter vazia para abrir a situação atual)"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account
-msgid "Fiscal Position Accounts Mapping"
-msgstr "Mapa da posição fiscal das contas"
+msgid "Accounts Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: field:account.analytic.account,contact_id:0
@@ -1029,8 +1029,8 @@ msgstr "Total líquido:"
 #: field:account.invoice,fiscal_position:0
 #: model:ir.model,name:account.model_account_fiscal_position
 #: field:res.partner,property_account_position:0
-msgid "Fiscal Position"
-msgstr "Posição fiscal"
+msgid "Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: field:account.analytic.line,product_uom_id:0
@@ -1051,8 +1051,8 @@ msgstr "Filhos"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax
-msgid "Fiscal Position Taxes Mapping"
-msgstr "Mapeamento das posições Fiscais"
+msgid "Taxes Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree2_new
@@ -1140,8 +1140,8 @@ msgstr "Nova conta analítica"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
-msgid "Fiscal Position Templates"
-msgstr "Modelo de posição fiscal"
+msgid "Fiscal Mapping Templates"
+msgstr ""
 
 #. module: account
 #: rml:account.invoice:0
@@ -1172,8 +1172,8 @@ msgstr "O valor expresso em outra moeda opcional"
 #. module: account
 #: view:account.fiscal.position.template:0
 #: field:account.fiscal.position.template,name:0
-msgid "Fiscal Position Template"
-msgstr "Modelo de posição fiscal"
+msgid "Fiscal Mapping Template"
+msgstr ""
 
 #. module: account
 #: field:account.payment.term,line_ids:0
@@ -1243,8 +1243,8 @@ msgstr "Moeda da empresa"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account_template
-msgid "Fiscal Position Template Account Mapping"
-msgstr "Mapeamento contábil dos Modelos para Posição Fiscal"
+msgid "Template Account Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: field:account.analytic.account,parent_id:0
@@ -1826,11 +1826,9 @@ msgstr "Próximo"
 #. module: account
 #: help:res.partner,property_account_position:0
 msgid ""
-"The fiscal position will determine taxes and the accounts used for the the "
+"The fiscal mapping will determine taxes and the accounts used for the  "
 "partner."
 msgstr ""
-"A posição fiscal irá determinar os impostos e as contas usadas para o "
-"parceiro."
 
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
@@ -2103,8 +2101,8 @@ msgstr "Processo de faturamento de clientes"
 
 #. module: account
 #: rml:account.invoice:0
-msgid "Fiscal Position Remark :"
-msgstr "Ressalva de Posição Fiscal"
+msgid "Fiscal Mapping Remark :"
+msgstr ""
 
 #. module: account
 #: wizard_field:account.fiscalyear.close,init,period_id:0
@@ -3706,8 +3704,8 @@ msgstr "Sequencia"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_template
-msgid "Template for Fiscal Position"
-msgstr "Modelo para posição fiscal"
+msgid "Template for Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: view:account.bank.statement:0
@@ -3813,8 +3811,8 @@ msgstr "Faturas Provisórias"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax_template
-msgid "Fiscal Position Template Tax Mapping"
-msgstr "Modelo para Mapeamento do Imposto na Posição Fiscal"
+msgid "Template Tax Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: rml:account.invoice:0
@@ -6011,8 +6009,8 @@ msgstr "Forma de Pagamento"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
-msgid "Fiscal Positions"
-msgstr "Posições fiscais"
+msgid "Fiscal Mappings"
+msgstr ""
 
 #. module: account
 #: model:process.process,name:account.process_process_statementprocess0
diff --git a/addons/account/i18n/ro.po b/addons/account/i18n/ro.po
index c0fb242ba37..3d6da4304c0 100644
--- a/addons/account/i18n/ro.po
+++ b/addons/account/i18n/ro.po
@@ -631,8 +631,8 @@ msgstr "(Lasati necompletat pentru a deschide situaţia curentă)"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account
-msgid "Fiscal Position Accounts Mapping"
-msgstr "Corespondenţa conturilor de poziţie fiscală"
+msgid "Accounts Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: field:account.analytic.account,contact_id:0
@@ -1030,8 +1030,8 @@ msgstr "Total net :"
 #: field:account.invoice,fiscal_position:0
 #: model:ir.model,name:account.model_account_fiscal_position
 #: field:res.partner,property_account_position:0
-msgid "Fiscal Position"
-msgstr "Poziţie fiscală"
+msgid "Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: field:account.analytic.line,product_uom_id:0
@@ -1052,8 +1052,8 @@ msgstr "Descendenţi"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax
-msgid "Fiscal Position Taxes Mapping"
-msgstr "Corespondenţa taxelor pentru poziţiile fiscale"
+msgid "Taxes Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree2_new
@@ -1141,8 +1141,8 @@ msgstr "Cont analitic nou"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
-msgid "Fiscal Position Templates"
-msgstr "Şabloane poziţii fiscale"
+msgid "Fiscal Mapping Templates"
+msgstr ""
 
 #. module: account
 #: rml:account.invoice:0
@@ -1173,8 +1173,8 @@ msgstr "Suma exprimată întro altă monedă opţională"
 #. module: account
 #: view:account.fiscal.position.template:0
 #: field:account.fiscal.position.template,name:0
-msgid "Fiscal Position Template"
-msgstr "Şablon poziţie fiscală"
+msgid "Fiscal Mapping Template"
+msgstr ""
 
 #. module: account
 #: field:account.payment.term,line_ids:0
@@ -1245,8 +1245,8 @@ msgstr "Moneda companiei"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account_template
-msgid "Fiscal Position Template Account Mapping"
-msgstr "Corespondenţa conturilor cu şabloanele de poziţii fiscale"
+msgid "Template Account Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: field:account.analytic.account,parent_id:0
@@ -1828,10 +1828,9 @@ msgstr "Înainte"
 #. module: account
 #: help:res.partner,property_account_position:0
 msgid ""
-"The fiscal position will determine taxes and the accounts used for the the "
+"The fiscal mapping will determine taxes and the accounts used for the  "
 "partner."
 msgstr ""
-"Poziţia fiscală va determina taxele şi conturile utilizate pentru partener."
 
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
@@ -2103,8 +2102,8 @@ msgstr "Proces facturare clienţi"
 
 #. module: account
 #: rml:account.invoice:0
-msgid "Fiscal Position Remark :"
-msgstr "Comentariu poziţie fiscală"
+msgid "Fiscal Mapping Remark :"
+msgstr ""
 
 #. module: account
 #: wizard_field:account.fiscalyear.close,init,period_id:0
@@ -3708,8 +3707,8 @@ msgstr "Secvenţă"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_template
-msgid "Template for Fiscal Position"
-msgstr "Şablon pentru poziţia fiscală"
+msgid "Template for Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: view:account.bank.statement:0
@@ -3815,8 +3814,8 @@ msgstr "Facturi ciornă"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax_template
-msgid "Fiscal Position Template Tax Mapping"
-msgstr "Corespondenţa taxelor pentru şablonul poziţiei fiscale"
+msgid "Template Tax Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: rml:account.invoice:0
@@ -6005,8 +6004,8 @@ msgstr "Termen de plată"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
-msgid "Fiscal Positions"
-msgstr "Poziţii fiscale"
+msgid "Fiscal Mappings"
+msgstr ""
 
 #. module: account
 #: model:process.process,name:account.process_process_statementprocess0
diff --git a/addons/account/i18n/ru.po b/addons/account/i18n/ru.po
index c238fc8b7bd..0f049317f86 100644
--- a/addons/account/i18n/ru.po
+++ b/addons/account/i18n/ru.po
@@ -629,7 +629,7 @@ msgstr "(Оставить пустым для отображения текущ
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account
-msgid "Fiscal Position Accounts Mapping"
+msgid "Accounts Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1027,8 +1027,8 @@ msgstr "Итог нетто"
 #: field:account.invoice,fiscal_position:0
 #: model:ir.model,name:account.model_account_fiscal_position
 #: field:res.partner,property_account_position:0
-msgid "Fiscal Position"
-msgstr "Налоговая позиция"
+msgid "Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: field:account.analytic.line,product_uom_id:0
@@ -1049,8 +1049,8 @@ msgstr "Потомки"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax
-msgid "Fiscal Position Taxes Mapping"
-msgstr "Структура налогов финансовой области"
+msgid "Taxes Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree2_new
@@ -1138,7 +1138,7 @@ msgstr "Новый счет аналитики"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
-msgid "Fiscal Position Templates"
+msgid "Fiscal Mapping Templates"
 msgstr ""
 
 #. module: account
@@ -1170,8 +1170,8 @@ msgstr "Сумма выраженная в дополнительной друг
 #. module: account
 #: view:account.fiscal.position.template:0
 #: field:account.fiscal.position.template,name:0
-msgid "Fiscal Position Template"
-msgstr "Шаблон финансовой области"
+msgid "Fiscal Mapping Template"
+msgstr ""
 
 #. module: account
 #: field:account.payment.term,line_ids:0
@@ -1241,8 +1241,8 @@ msgstr "Валюта компании"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account_template
-msgid "Fiscal Position Template Account Mapping"
-msgstr "Шаблон структуры счетов финансовой области"
+msgid "Template Account Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: field:account.analytic.account,parent_id:0
@@ -1820,11 +1820,9 @@ msgstr "Далее"
 #. module: account
 #: help:res.partner,property_account_position:0
 msgid ""
-"The fiscal position will determine taxes and the accounts used for the the "
+"The fiscal mapping will determine taxes and the accounts used for the  "
 "partner."
 msgstr ""
-"Финансовая область будет определять налоги и счета, используемые для "
-"контрагента."
 
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
@@ -2093,7 +2091,7 @@ msgstr ""
 
 #. module: account
 #: rml:account.invoice:0
-msgid "Fiscal Position Remark :"
+msgid "Fiscal Mapping Remark :"
 msgstr ""
 
 #. module: account
@@ -3663,7 +3661,7 @@ msgstr "Последовательность"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_template
-msgid "Template for Fiscal Position"
+msgid "Template for Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -3768,8 +3766,8 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax_template
-msgid "Fiscal Position Template Tax Mapping"
-msgstr "Структура налоговых шаблонов для финансовой области"
+msgid "Template Tax Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: rml:account.invoice:0
@@ -5908,7 +5906,7 @@ msgstr "Условия оплаты"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
-msgid "Fiscal Positions"
+msgid "Fiscal Mappings"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/si.po b/addons/account/i18n/si.po
index f130a5946b6..0a6fbd2280b 100644
--- a/addons/account/i18n/si.po
+++ b/addons/account/i18n/si.po
@@ -611,7 +611,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account
-msgid "Fiscal Position Accounts Mapping"
+msgid "Accounts Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1005,7 +1005,7 @@ msgstr ""
 #: field:account.invoice,fiscal_position:0
 #: model:ir.model,name:account.model_account_fiscal_position
 #: field:res.partner,property_account_position:0
-msgid "Fiscal Position"
+msgid "Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1027,7 +1027,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax
-msgid "Fiscal Position Taxes Mapping"
+msgid "Taxes Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1114,7 +1114,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
-msgid "Fiscal Position Templates"
+msgid "Fiscal Mapping Templates"
 msgstr ""
 
 #. module: account
@@ -1146,7 +1146,7 @@ msgstr ""
 #. module: account
 #: view:account.fiscal.position.template:0
 #: field:account.fiscal.position.template,name:0
-msgid "Fiscal Position Template"
+msgid "Fiscal Mapping Template"
 msgstr ""
 
 #. module: account
@@ -1212,7 +1212,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account_template
-msgid "Fiscal Position Template Account Mapping"
+msgid "Template Account Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1790,7 +1790,7 @@ msgstr ""
 #. module: account
 #: help:res.partner,property_account_position:0
 msgid ""
-"The fiscal position will determine taxes and the accounts used for the the "
+"The fiscal mapping will determine taxes and the accounts used for the  "
 "partner."
 msgstr ""
 
@@ -2061,7 +2061,7 @@ msgstr ""
 
 #. module: account
 #: rml:account.invoice:0
-msgid "Fiscal Position Remark :"
+msgid "Fiscal Mapping Remark :"
 msgstr ""
 
 #. module: account
@@ -3627,7 +3627,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_template
-msgid "Template for Fiscal Position"
+msgid "Template for Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -3732,7 +3732,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax_template
-msgid "Fiscal Position Template Tax Mapping"
+msgid "Template Tax Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -5867,7 +5867,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
-msgid "Fiscal Positions"
+msgid "Fiscal Mappings"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/sk.po b/addons/account/i18n/sk.po
index 1e778a79cb8..e2ddb61ae90 100644
--- a/addons/account/i18n/sk.po
+++ b/addons/account/i18n/sk.po
@@ -614,7 +614,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account
-msgid "Fiscal Position Accounts Mapping"
+msgid "Accounts Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1008,7 +1008,7 @@ msgstr ""
 #: field:account.invoice,fiscal_position:0
 #: model:ir.model,name:account.model_account_fiscal_position
 #: field:res.partner,property_account_position:0
-msgid "Fiscal Position"
+msgid "Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1030,7 +1030,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax
-msgid "Fiscal Position Taxes Mapping"
+msgid "Taxes Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1117,7 +1117,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
-msgid "Fiscal Position Templates"
+msgid "Fiscal Mapping Templates"
 msgstr ""
 
 #. module: account
@@ -1149,7 +1149,7 @@ msgstr ""
 #. module: account
 #: view:account.fiscal.position.template:0
 #: field:account.fiscal.position.template,name:0
-msgid "Fiscal Position Template"
+msgid "Fiscal Mapping Template"
 msgstr ""
 
 #. module: account
@@ -1215,7 +1215,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account_template
-msgid "Fiscal Position Template Account Mapping"
+msgid "Template Account Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1793,7 +1793,7 @@ msgstr ""
 #. module: account
 #: help:res.partner,property_account_position:0
 msgid ""
-"The fiscal position will determine taxes and the accounts used for the the "
+"The fiscal mapping will determine taxes and the accounts used for the  "
 "partner."
 msgstr ""
 
@@ -2064,7 +2064,7 @@ msgstr ""
 
 #. module: account
 #: rml:account.invoice:0
-msgid "Fiscal Position Remark :"
+msgid "Fiscal Mapping Remark :"
 msgstr ""
 
 #. module: account
@@ -3630,7 +3630,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_template
-msgid "Template for Fiscal Position"
+msgid "Template for Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -3735,7 +3735,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax_template
-msgid "Fiscal Position Template Tax Mapping"
+msgid "Template Tax Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -5870,7 +5870,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
-msgid "Fiscal Positions"
+msgid "Fiscal Mappings"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/sl.po b/addons/account/i18n/sl.po
index d9fcc7ec19c..417fd5e7387 100644
--- a/addons/account/i18n/sl.po
+++ b/addons/account/i18n/sl.po
@@ -623,8 +623,8 @@ msgstr "(Postite prazno da se odpre terenutno stanje)"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account
-msgid "Fiscal Position Accounts Mapping"
-msgstr "Preslikava kontov glede na davčno pozicijo"
+msgid "Accounts Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: field:account.analytic.account,contact_id:0
@@ -1019,8 +1019,8 @@ msgstr "Skupaj (brez davkov):"
 #: field:account.invoice,fiscal_position:0
 #: model:ir.model,name:account.model_account_fiscal_position
 #: field:res.partner,property_account_position:0
-msgid "Fiscal Position"
-msgstr "Davčna pozicija"
+msgid "Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: field:account.analytic.line,product_uom_id:0
@@ -1041,8 +1041,8 @@ msgstr "Otroci"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax
-msgid "Fiscal Position Taxes Mapping"
-msgstr "Preslikava davkov glede na davčno pozicijo"
+msgid "Taxes Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree2_new
@@ -1130,8 +1130,8 @@ msgstr "Nov analitičen konto"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
-msgid "Fiscal Position Templates"
-msgstr "Predloge davčnih pozicij"
+msgid "Fiscal Mapping Templates"
+msgstr ""
 
 #. module: account
 #: rml:account.invoice:0
@@ -1162,8 +1162,8 @@ msgstr "Znesek izražen v poljubni drugi valuti"
 #. module: account
 #: view:account.fiscal.position.template:0
 #: field:account.fiscal.position.template,name:0
-msgid "Fiscal Position Template"
-msgstr "Vzorec za davčno pozicijo"
+msgid "Fiscal Mapping Template"
+msgstr ""
 
 #. module: account
 #: field:account.payment.term,line_ids:0
@@ -1228,8 +1228,8 @@ msgstr "Valute družba"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account_template
-msgid "Fiscal Position Template Account Mapping"
-msgstr "Preslikava kontov za vzorec za davčno pozicijo"
+msgid "Template Account Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: field:account.analytic.account,parent_id:0
@@ -1810,11 +1810,9 @@ msgstr "Naslednji"
 #. module: account
 #: help:res.partner,property_account_position:0
 msgid ""
-"The fiscal position will determine taxes and the accounts used for the the "
+"The fiscal mapping will determine taxes and the accounts used for the  "
 "partner."
 msgstr ""
-"Davčna pozicija bo določila davke in konte, ki se bodo uporabljali za tega "
-"partnerja."
 
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
@@ -2087,8 +2085,8 @@ msgstr "Proces računa stranke"
 
 #. module: account
 #: rml:account.invoice:0
-msgid "Fiscal Position Remark :"
-msgstr "Opomba za davčno pozicijo"
+msgid "Fiscal Mapping Remark :"
+msgstr ""
 
 #. module: account
 #: wizard_field:account.fiscalyear.close,init,period_id:0
@@ -3657,7 +3655,7 @@ msgstr "Zaporedje"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_template
-msgid "Template for Fiscal Position"
+msgid "Template for Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -3762,7 +3760,7 @@ msgstr "Osnutki računov"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax_template
-msgid "Fiscal Position Template Tax Mapping"
+msgid "Template Tax Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -5906,7 +5904,7 @@ msgstr "Plačilni pogoj"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
-msgid "Fiscal Positions"
+msgid "Fiscal Mappings"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/sq.po b/addons/account/i18n/sq.po
index ac97daad807..ddce4ab958a 100644
--- a/addons/account/i18n/sq.po
+++ b/addons/account/i18n/sq.po
@@ -633,8 +633,8 @@ msgstr "(Mbaje zbrazët për të hapur gjenden aktuale)"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account
-msgid "Fiscal Position Accounts Mapping"
-msgstr "Hartimi i Pozicionit Aktual Fiskal"
+msgid "Accounts Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: field:account.analytic.account,contact_id:0
@@ -1031,7 +1031,7 @@ msgstr ""
 #: field:account.invoice,fiscal_position:0
 #: model:ir.model,name:account.model_account_fiscal_position
 #: field:res.partner,property_account_position:0
-msgid "Fiscal Position"
+msgid "Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1053,7 +1053,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax
-msgid "Fiscal Position Taxes Mapping"
+msgid "Taxes Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1140,7 +1140,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
-msgid "Fiscal Position Templates"
+msgid "Fiscal Mapping Templates"
 msgstr ""
 
 #. module: account
@@ -1172,7 +1172,7 @@ msgstr ""
 #. module: account
 #: view:account.fiscal.position.template:0
 #: field:account.fiscal.position.template,name:0
-msgid "Fiscal Position Template"
+msgid "Fiscal Mapping Template"
 msgstr ""
 
 #. module: account
@@ -1238,7 +1238,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account_template
-msgid "Fiscal Position Template Account Mapping"
+msgid "Template Account Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1816,7 +1816,7 @@ msgstr ""
 #. module: account
 #: help:res.partner,property_account_position:0
 msgid ""
-"The fiscal position will determine taxes and the accounts used for the the "
+"The fiscal mapping will determine taxes and the accounts used for the  "
 "partner."
 msgstr ""
 
@@ -2087,7 +2087,7 @@ msgstr ""
 
 #. module: account
 #: rml:account.invoice:0
-msgid "Fiscal Position Remark :"
+msgid "Fiscal Mapping Remark :"
 msgstr ""
 
 #. module: account
@@ -3653,7 +3653,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_template
-msgid "Template for Fiscal Position"
+msgid "Template for Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -3758,7 +3758,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax_template
-msgid "Fiscal Position Template Tax Mapping"
+msgid "Template Tax Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -5893,7 +5893,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
-msgid "Fiscal Positions"
+msgid "Fiscal Mappings"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/sr.po b/addons/account/i18n/sr.po
index 876daa88d08..12a682b9991 100644
--- a/addons/account/i18n/sr.po
+++ b/addons/account/i18n/sr.po
@@ -614,7 +614,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account
-msgid "Fiscal Position Accounts Mapping"
+msgid "Accounts Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1008,7 +1008,7 @@ msgstr ""
 #: field:account.invoice,fiscal_position:0
 #: model:ir.model,name:account.model_account_fiscal_position
 #: field:res.partner,property_account_position:0
-msgid "Fiscal Position"
+msgid "Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1030,7 +1030,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax
-msgid "Fiscal Position Taxes Mapping"
+msgid "Taxes Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1117,7 +1117,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
-msgid "Fiscal Position Templates"
+msgid "Fiscal Mapping Templates"
 msgstr ""
 
 #. module: account
@@ -1149,7 +1149,7 @@ msgstr ""
 #. module: account
 #: view:account.fiscal.position.template:0
 #: field:account.fiscal.position.template,name:0
-msgid "Fiscal Position Template"
+msgid "Fiscal Mapping Template"
 msgstr ""
 
 #. module: account
@@ -1215,7 +1215,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account_template
-msgid "Fiscal Position Template Account Mapping"
+msgid "Template Account Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1793,7 +1793,7 @@ msgstr ""
 #. module: account
 #: help:res.partner,property_account_position:0
 msgid ""
-"The fiscal position will determine taxes and the accounts used for the the "
+"The fiscal mapping will determine taxes and the accounts used for the  "
 "partner."
 msgstr ""
 
@@ -2064,7 +2064,7 @@ msgstr ""
 
 #. module: account
 #: rml:account.invoice:0
-msgid "Fiscal Position Remark :"
+msgid "Fiscal Mapping Remark :"
 msgstr ""
 
 #. module: account
@@ -3630,7 +3630,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_template
-msgid "Template for Fiscal Position"
+msgid "Template for Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -3735,7 +3735,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax_template
-msgid "Fiscal Position Template Tax Mapping"
+msgid "Template Tax Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -5870,7 +5870,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
-msgid "Fiscal Positions"
+msgid "Fiscal Mappings"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/sv.po b/addons/account/i18n/sv.po
index dd9617244a4..4db6fb70f01 100644
--- a/addons/account/i18n/sv.po
+++ b/addons/account/i18n/sv.po
@@ -620,8 +620,8 @@ msgstr "(Tomt öppnar med aktuella värden)"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account
-msgid "Fiscal Position Accounts Mapping"
-msgstr "Mappning av momsredovisningskonton"
+msgid "Accounts Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: field:account.analytic.account,contact_id:0
@@ -1018,8 +1018,8 @@ msgstr "Nettototal:"
 #: field:account.invoice,fiscal_position:0
 #: model:ir.model,name:account.model_account_fiscal_position
 #: field:res.partner,property_account_position:0
-msgid "Fiscal Position"
-msgstr "Momsredovisningsnummer"
+msgid "Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: field:account.analytic.line,product_uom_id:0
@@ -1040,8 +1040,8 @@ msgstr "Barn"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax
-msgid "Fiscal Position Taxes Mapping"
-msgstr "Mappning av momsredovisningsnummer"
+msgid "Taxes Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree2_new
@@ -1127,8 +1127,8 @@ msgstr "Nytt objektkonto"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
-msgid "Fiscal Position Templates"
-msgstr "Förlaga för momsredovisningsnummer"
+msgid "Fiscal Mapping Templates"
+msgstr ""
 
 #. module: account
 #: rml:account.invoice:0
@@ -1159,8 +1159,8 @@ msgstr ""
 #. module: account
 #: view:account.fiscal.position.template:0
 #: field:account.fiscal.position.template,name:0
-msgid "Fiscal Position Template"
-msgstr "Förlaga för momsredovisningsnummer"
+msgid "Fiscal Mapping Template"
+msgstr ""
 
 #. module: account
 #: field:account.payment.term,line_ids:0
@@ -1230,7 +1230,7 @@ msgstr "Företagets valuta"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account_template
-msgid "Fiscal Position Template Account Mapping"
+msgid "Template Account Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1808,7 +1808,7 @@ msgstr "Nästa"
 #. module: account
 #: help:res.partner,property_account_position:0
 msgid ""
-"The fiscal position will determine taxes and the accounts used for the the "
+"The fiscal mapping will determine taxes and the accounts used for the  "
 "partner."
 msgstr ""
 
@@ -2079,7 +2079,7 @@ msgstr ""
 
 #. module: account
 #: rml:account.invoice:0
-msgid "Fiscal Position Remark :"
+msgid "Fiscal Mapping Remark :"
 msgstr ""
 
 #. module: account
@@ -3658,7 +3658,7 @@ msgstr "Sekvens"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_template
-msgid "Template for Fiscal Position"
+msgid "Template for Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -3763,7 +3763,7 @@ msgstr "Utkastfakturor"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax_template
-msgid "Fiscal Position Template Tax Mapping"
+msgid "Template Tax Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -5917,8 +5917,8 @@ msgstr "Betalningsvillkor"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
-msgid "Fiscal Positions"
-msgstr "Momsredovisningsnummer"
+msgid "Fiscal Mappings"
+msgstr ""
 
 #. module: account
 #: model:process.process,name:account.process_process_statementprocess0
diff --git a/addons/account/i18n/ta.po b/addons/account/i18n/ta.po
index 89291e61eec..c82520b3ed6 100644
--- a/addons/account/i18n/ta.po
+++ b/addons/account/i18n/ta.po
@@ -611,7 +611,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account
-msgid "Fiscal Position Accounts Mapping"
+msgid "Accounts Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1005,7 +1005,7 @@ msgstr ""
 #: field:account.invoice,fiscal_position:0
 #: model:ir.model,name:account.model_account_fiscal_position
 #: field:res.partner,property_account_position:0
-msgid "Fiscal Position"
+msgid "Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1027,7 +1027,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax
-msgid "Fiscal Position Taxes Mapping"
+msgid "Taxes Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1114,7 +1114,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
-msgid "Fiscal Position Templates"
+msgid "Fiscal Mapping Templates"
 msgstr ""
 
 #. module: account
@@ -1146,7 +1146,7 @@ msgstr ""
 #. module: account
 #: view:account.fiscal.position.template:0
 #: field:account.fiscal.position.template,name:0
-msgid "Fiscal Position Template"
+msgid "Fiscal Mapping Template"
 msgstr ""
 
 #. module: account
@@ -1212,7 +1212,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account_template
-msgid "Fiscal Position Template Account Mapping"
+msgid "Template Account Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1790,7 +1790,7 @@ msgstr ""
 #. module: account
 #: help:res.partner,property_account_position:0
 msgid ""
-"The fiscal position will determine taxes and the accounts used for the the "
+"The fiscal mapping will determine taxes and the accounts used for the  "
 "partner."
 msgstr ""
 
@@ -2061,7 +2061,7 @@ msgstr ""
 
 #. module: account
 #: rml:account.invoice:0
-msgid "Fiscal Position Remark :"
+msgid "Fiscal Mapping Remark :"
 msgstr ""
 
 #. module: account
@@ -3627,7 +3627,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_template
-msgid "Template for Fiscal Position"
+msgid "Template for Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -3732,7 +3732,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax_template
-msgid "Fiscal Position Template Tax Mapping"
+msgid "Template Tax Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -5867,7 +5867,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
-msgid "Fiscal Positions"
+msgid "Fiscal Mappings"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/te.po b/addons/account/i18n/te.po
index 46ab871ce9e..1338acbd719 100644
--- a/addons/account/i18n/te.po
+++ b/addons/account/i18n/te.po
@@ -611,7 +611,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account
-msgid "Fiscal Position Accounts Mapping"
+msgid "Accounts Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1005,7 +1005,7 @@ msgstr "నికర మొత్తం:"
 #: field:account.invoice,fiscal_position:0
 #: model:ir.model,name:account.model_account_fiscal_position
 #: field:res.partner,property_account_position:0
-msgid "Fiscal Position"
+msgid "Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1027,7 +1027,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax
-msgid "Fiscal Position Taxes Mapping"
+msgid "Taxes Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1114,7 +1114,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
-msgid "Fiscal Position Templates"
+msgid "Fiscal Mapping Templates"
 msgstr ""
 
 #. module: account
@@ -1146,7 +1146,7 @@ msgstr ""
 #. module: account
 #: view:account.fiscal.position.template:0
 #: field:account.fiscal.position.template,name:0
-msgid "Fiscal Position Template"
+msgid "Fiscal Mapping Template"
 msgstr ""
 
 #. module: account
@@ -1212,7 +1212,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account_template
-msgid "Fiscal Position Template Account Mapping"
+msgid "Template Account Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1790,7 +1790,7 @@ msgstr "తర్వాత"
 #. module: account
 #: help:res.partner,property_account_position:0
 msgid ""
-"The fiscal position will determine taxes and the accounts used for the the "
+"The fiscal mapping will determine taxes and the accounts used for the  "
 "partner."
 msgstr ""
 
@@ -2061,7 +2061,7 @@ msgstr ""
 
 #. module: account
 #: rml:account.invoice:0
-msgid "Fiscal Position Remark :"
+msgid "Fiscal Mapping Remark :"
 msgstr ""
 
 #. module: account
@@ -3627,7 +3627,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_template
-msgid "Template for Fiscal Position"
+msgid "Template for Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -3732,7 +3732,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax_template
-msgid "Fiscal Position Template Tax Mapping"
+msgid "Template Tax Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -5867,7 +5867,7 @@ msgstr "చెల్లింపు కాలం"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
-msgid "Fiscal Positions"
+msgid "Fiscal Mappings"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/th.po b/addons/account/i18n/th.po
index 333187e87ab..3c193859a02 100644
--- a/addons/account/i18n/th.po
+++ b/addons/account/i18n/th.po
@@ -611,7 +611,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account
-msgid "Fiscal Position Accounts Mapping"
+msgid "Accounts Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1005,7 +1005,7 @@ msgstr ""
 #: field:account.invoice,fiscal_position:0
 #: model:ir.model,name:account.model_account_fiscal_position
 #: field:res.partner,property_account_position:0
-msgid "Fiscal Position"
+msgid "Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1027,7 +1027,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax
-msgid "Fiscal Position Taxes Mapping"
+msgid "Taxes Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1114,7 +1114,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
-msgid "Fiscal Position Templates"
+msgid "Fiscal Mapping Templates"
 msgstr ""
 
 #. module: account
@@ -1146,7 +1146,7 @@ msgstr ""
 #. module: account
 #: view:account.fiscal.position.template:0
 #: field:account.fiscal.position.template,name:0
-msgid "Fiscal Position Template"
+msgid "Fiscal Mapping Template"
 msgstr ""
 
 #. module: account
@@ -1212,7 +1212,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account_template
-msgid "Fiscal Position Template Account Mapping"
+msgid "Template Account Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1790,7 +1790,7 @@ msgstr ""
 #. module: account
 #: help:res.partner,property_account_position:0
 msgid ""
-"The fiscal position will determine taxes and the accounts used for the the "
+"The fiscal mapping will determine taxes and the accounts used for the  "
 "partner."
 msgstr ""
 
@@ -2061,7 +2061,7 @@ msgstr ""
 
 #. module: account
 #: rml:account.invoice:0
-msgid "Fiscal Position Remark :"
+msgid "Fiscal Mapping Remark :"
 msgstr ""
 
 #. module: account
@@ -3627,7 +3627,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_template
-msgid "Template for Fiscal Position"
+msgid "Template for Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -3732,7 +3732,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax_template
-msgid "Fiscal Position Template Tax Mapping"
+msgid "Template Tax Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -5867,7 +5867,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
-msgid "Fiscal Positions"
+msgid "Fiscal Mappings"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/tlh.po b/addons/account/i18n/tlh.po
index f15bb0b9d2b..e8aac209645 100644
--- a/addons/account/i18n/tlh.po
+++ b/addons/account/i18n/tlh.po
@@ -610,7 +610,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account
-msgid "Fiscal Position Accounts Mapping"
+msgid "Accounts Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1004,7 +1004,7 @@ msgstr ""
 #: field:account.invoice,fiscal_position:0
 #: model:ir.model,name:account.model_account_fiscal_position
 #: field:res.partner,property_account_position:0
-msgid "Fiscal Position"
+msgid "Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1026,7 +1026,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax
-msgid "Fiscal Position Taxes Mapping"
+msgid "Taxes Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1113,7 +1113,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
-msgid "Fiscal Position Templates"
+msgid "Fiscal Mapping Templates"
 msgstr ""
 
 #. module: account
@@ -1145,7 +1145,7 @@ msgstr ""
 #. module: account
 #: view:account.fiscal.position.template:0
 #: field:account.fiscal.position.template,name:0
-msgid "Fiscal Position Template"
+msgid "Fiscal Mapping Template"
 msgstr ""
 
 #. module: account
@@ -1211,7 +1211,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account_template
-msgid "Fiscal Position Template Account Mapping"
+msgid "Template Account Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1789,7 +1789,7 @@ msgstr ""
 #. module: account
 #: help:res.partner,property_account_position:0
 msgid ""
-"The fiscal position will determine taxes and the accounts used for the the "
+"The fiscal mapping will determine taxes and the accounts used for the  "
 "partner."
 msgstr ""
 
@@ -2060,7 +2060,7 @@ msgstr ""
 
 #. module: account
 #: rml:account.invoice:0
-msgid "Fiscal Position Remark :"
+msgid "Fiscal Mapping Remark :"
 msgstr ""
 
 #. module: account
@@ -3626,7 +3626,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_template
-msgid "Template for Fiscal Position"
+msgid "Template for Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -3731,7 +3731,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax_template
-msgid "Fiscal Position Template Tax Mapping"
+msgid "Template Tax Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -5866,7 +5866,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
-msgid "Fiscal Positions"
+msgid "Fiscal Mappings"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/tr.po b/addons/account/i18n/tr.po
index 033e57239de..58d1a9b909e 100644
--- a/addons/account/i18n/tr.po
+++ b/addons/account/i18n/tr.po
@@ -613,8 +613,8 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account
-msgid "Fiscal Position Accounts Mapping"
-msgstr "Mali Durum Eşleme Hes."
+msgid "Accounts Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: field:account.analytic.account,contact_id:0
@@ -1007,8 +1007,8 @@ msgstr "Net Toplam:"
 #: field:account.invoice,fiscal_position:0
 #: model:ir.model,name:account.model_account_fiscal_position
 #: field:res.partner,property_account_position:0
-msgid "Fiscal Position"
-msgstr "Mali Durum"
+msgid "Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: field:account.analytic.line,product_uom_id:0
@@ -1029,8 +1029,8 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax
-msgid "Fiscal Position Taxes Mapping"
-msgstr "Mali Durum Vergi Haritası"
+msgid "Taxes Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree2_new
@@ -1116,8 +1116,8 @@ msgstr "Yeni Analiz Hesabı"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
-msgid "Fiscal Position Templates"
-msgstr "Mali Durum Şablonu"
+msgid "Fiscal Mapping Templates"
+msgstr ""
 
 #. module: account
 #: rml:account.invoice:0
@@ -1148,8 +1148,8 @@ msgstr ""
 #. module: account
 #: view:account.fiscal.position.template:0
 #: field:account.fiscal.position.template,name:0
-msgid "Fiscal Position Template"
-msgstr "Mali Durum Şablonu"
+msgid "Fiscal Mapping Template"
+msgstr ""
 
 #. module: account
 #: field:account.payment.term,line_ids:0
@@ -1214,8 +1214,8 @@ msgstr "Firma Dövizi"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account_template
-msgid "Fiscal Position Template Account Mapping"
-msgstr "Mali Durum Şablonu Eşleme Hes."
+msgid "Template Account Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: field:account.analytic.account,parent_id:0
@@ -1792,7 +1792,7 @@ msgstr ""
 #. module: account
 #: help:res.partner,property_account_position:0
 msgid ""
-"The fiscal position will determine taxes and the accounts used for the the "
+"The fiscal mapping will determine taxes and the accounts used for the  "
 "partner."
 msgstr ""
 
@@ -2063,8 +2063,8 @@ msgstr "Müşteri Fatura İşlemleri"
 
 #. module: account
 #: rml:account.invoice:0
-msgid "Fiscal Position Remark :"
-msgstr "Mali Durum Beyanı :"
+msgid "Fiscal Mapping Remark :"
+msgstr ""
 
 #. module: account
 #: wizard_field:account.fiscalyear.close,init,period_id:0
@@ -3629,8 +3629,8 @@ msgstr "Sıra No"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_template
-msgid "Template for Fiscal Position"
-msgstr "Mali Durum için Şablon"
+msgid "Template for Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: view:account.bank.statement:0
@@ -3734,8 +3734,8 @@ msgstr "Taslak Faturalar"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax_template
-msgid "Fiscal Position Template Tax Mapping"
-msgstr "Mali Durum Şablonu Vergi Eşlemesi"
+msgid "Template Tax Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: rml:account.invoice:0
@@ -5869,8 +5869,8 @@ msgstr "Ödeme Vadesi"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
-msgid "Fiscal Positions"
-msgstr "Mali Durumlar"
+msgid "Fiscal Mappings"
+msgstr ""
 
 #. module: account
 #: model:process.process,name:account.process_process_statementprocess0
diff --git a/addons/account/i18n/ug.po b/addons/account/i18n/ug.po
index 02f82ee14c1..67fe6840276 100644
--- a/addons/account/i18n/ug.po
+++ b/addons/account/i18n/ug.po
@@ -611,7 +611,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account
-msgid "Fiscal Position Accounts Mapping"
+msgid "Accounts Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1005,7 +1005,7 @@ msgstr ""
 #: field:account.invoice,fiscal_position:0
 #: model:ir.model,name:account.model_account_fiscal_position
 #: field:res.partner,property_account_position:0
-msgid "Fiscal Position"
+msgid "Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1027,7 +1027,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax
-msgid "Fiscal Position Taxes Mapping"
+msgid "Taxes Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1114,7 +1114,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
-msgid "Fiscal Position Templates"
+msgid "Fiscal Mapping Templates"
 msgstr ""
 
 #. module: account
@@ -1146,7 +1146,7 @@ msgstr ""
 #. module: account
 #: view:account.fiscal.position.template:0
 #: field:account.fiscal.position.template,name:0
-msgid "Fiscal Position Template"
+msgid "Fiscal Mapping Template"
 msgstr ""
 
 #. module: account
@@ -1212,7 +1212,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account_template
-msgid "Fiscal Position Template Account Mapping"
+msgid "Template Account Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1790,7 +1790,7 @@ msgstr ""
 #. module: account
 #: help:res.partner,property_account_position:0
 msgid ""
-"The fiscal position will determine taxes and the accounts used for the the "
+"The fiscal mapping will determine taxes and the accounts used for the  "
 "partner."
 msgstr ""
 
@@ -2061,7 +2061,7 @@ msgstr ""
 
 #. module: account
 #: rml:account.invoice:0
-msgid "Fiscal Position Remark :"
+msgid "Fiscal Mapping Remark :"
 msgstr ""
 
 #. module: account
@@ -3627,7 +3627,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_template
-msgid "Template for Fiscal Position"
+msgid "Template for Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -3732,7 +3732,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax_template
-msgid "Fiscal Position Template Tax Mapping"
+msgid "Template Tax Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -5867,7 +5867,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
-msgid "Fiscal Positions"
+msgid "Fiscal Mappings"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/uk.po b/addons/account/i18n/uk.po
index 4e6370d091f..b6b796ec935 100644
--- a/addons/account/i18n/uk.po
+++ b/addons/account/i18n/uk.po
@@ -610,7 +610,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account
-msgid "Fiscal Position Accounts Mapping"
+msgid "Accounts Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1004,7 +1004,7 @@ msgstr ""
 #: field:account.invoice,fiscal_position:0
 #: model:ir.model,name:account.model_account_fiscal_position
 #: field:res.partner,property_account_position:0
-msgid "Fiscal Position"
+msgid "Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1026,7 +1026,7 @@ msgstr "Дочірній"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax
-msgid "Fiscal Position Taxes Mapping"
+msgid "Taxes Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1114,7 +1114,7 @@ msgstr "Новий Аналітичний Рахунок"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
-msgid "Fiscal Position Templates"
+msgid "Fiscal Mapping Templates"
 msgstr ""
 
 #. module: account
@@ -1146,7 +1146,7 @@ msgstr ""
 #. module: account
 #: view:account.fiscal.position.template:0
 #: field:account.fiscal.position.template,name:0
-msgid "Fiscal Position Template"
+msgid "Fiscal Mapping Template"
 msgstr ""
 
 #. module: account
@@ -1212,7 +1212,7 @@ msgstr "Валюта компанії"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account_template
-msgid "Fiscal Position Template Account Mapping"
+msgid "Template Account Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1792,7 +1792,7 @@ msgstr ""
 #. module: account
 #: help:res.partner,property_account_position:0
 msgid ""
-"The fiscal position will determine taxes and the accounts used for the the "
+"The fiscal mapping will determine taxes and the accounts used for the  "
 "partner."
 msgstr ""
 
@@ -2063,7 +2063,7 @@ msgstr ""
 
 #. module: account
 #: rml:account.invoice:0
-msgid "Fiscal Position Remark :"
+msgid "Fiscal Mapping Remark :"
 msgstr ""
 
 #. module: account
@@ -3639,7 +3639,7 @@ msgstr "Послідовність"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_template
-msgid "Template for Fiscal Position"
+msgid "Template for Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -3744,7 +3744,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax_template
-msgid "Fiscal Position Template Tax Mapping"
+msgid "Template Tax Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -5891,7 +5891,7 @@ msgstr "Терміни оплати"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
-msgid "Fiscal Positions"
+msgid "Fiscal Mappings"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/vi.po b/addons/account/i18n/vi.po
index 39cf005de03..daac0b40d9f 100644
--- a/addons/account/i18n/vi.po
+++ b/addons/account/i18n/vi.po
@@ -624,8 +624,8 @@ msgstr "giữ vị trí  trống cho lấn mở hiện tại"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account
-msgid "Fiscal Position Accounts Mapping"
-msgstr "sơ đồ tài chính liên kết các tài khoản"
+msgid "Accounts Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: field:account.analytic.account,contact_id:0
@@ -1018,7 +1018,7 @@ msgstr ""
 #: field:account.invoice,fiscal_position:0
 #: model:ir.model,name:account.model_account_fiscal_position
 #: field:res.partner,property_account_position:0
-msgid "Fiscal Position"
+msgid "Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1040,7 +1040,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax
-msgid "Fiscal Position Taxes Mapping"
+msgid "Taxes Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1127,7 +1127,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
-msgid "Fiscal Position Templates"
+msgid "Fiscal Mapping Templates"
 msgstr ""
 
 #. module: account
@@ -1159,7 +1159,7 @@ msgstr ""
 #. module: account
 #: view:account.fiscal.position.template:0
 #: field:account.fiscal.position.template,name:0
-msgid "Fiscal Position Template"
+msgid "Fiscal Mapping Template"
 msgstr ""
 
 #. module: account
@@ -1225,7 +1225,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account_template
-msgid "Fiscal Position Template Account Mapping"
+msgid "Template Account Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1803,7 +1803,7 @@ msgstr ""
 #. module: account
 #: help:res.partner,property_account_position:0
 msgid ""
-"The fiscal position will determine taxes and the accounts used for the the "
+"The fiscal mapping will determine taxes and the accounts used for the  "
 "partner."
 msgstr ""
 
@@ -2074,7 +2074,7 @@ msgstr ""
 
 #. module: account
 #: rml:account.invoice:0
-msgid "Fiscal Position Remark :"
+msgid "Fiscal Mapping Remark :"
 msgstr ""
 
 #. module: account
@@ -3640,7 +3640,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_template
-msgid "Template for Fiscal Position"
+msgid "Template for Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -3745,7 +3745,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax_template
-msgid "Fiscal Position Template Tax Mapping"
+msgid "Template Tax Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -5880,7 +5880,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
-msgid "Fiscal Positions"
+msgid "Fiscal Mappings"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/zh_CN.po b/addons/account/i18n/zh_CN.po
index 5a1e4b06cf2..ec28924edd2 100644
--- a/addons/account/i18n/zh_CN.po
+++ b/addons/account/i18n/zh_CN.po
@@ -612,8 +612,8 @@ msgstr "(当前状态留空为待处理)"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account
-msgid "Fiscal Position Accounts Mapping"
-msgstr "财务结构科目一览表"
+msgid "Accounts Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: field:account.analytic.account,contact_id:0
@@ -1006,8 +1006,8 @@ msgstr "不含税合计:"
 #: field:account.invoice,fiscal_position:0
 #: model:ir.model,name:account.model_account_fiscal_position
 #: field:res.partner,property_account_position:0
-msgid "Fiscal Position"
-msgstr "财务结构"
+msgid "Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: field:account.analytic.line,product_uom_id:0
@@ -1028,8 +1028,8 @@ msgstr "子科目"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax
-msgid "Fiscal Position Taxes Mapping"
-msgstr "财务结构税一览"
+msgid "Taxes Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree2_new
@@ -1115,8 +1115,8 @@ msgstr "新的辅助核算项目"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
-msgid "Fiscal Position Templates"
-msgstr "财务结构模板"
+msgid "Fiscal Mapping Templates"
+msgstr ""
 
 #. module: account
 #: rml:account.invoice:0
@@ -1147,8 +1147,8 @@ msgstr "这金额表示一个可选的其它货币"
 #. module: account
 #: view:account.fiscal.position.template:0
 #: field:account.fiscal.position.template,name:0
-msgid "Fiscal Position Template"
-msgstr "财务结构模板"
+msgid "Fiscal Mapping Template"
+msgstr ""
 
 #. module: account
 #: field:account.payment.term,line_ids:0
@@ -1214,8 +1214,8 @@ msgstr "公司本位币"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account_template
-msgid "Fiscal Position Template Account Mapping"
-msgstr "财务结构模板科目一览"
+msgid "Template Account Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: field:account.analytic.account,parent_id:0
@@ -1794,9 +1794,9 @@ msgstr "下一步"
 #. module: account
 #: help:res.partner,property_account_position:0
 msgid ""
-"The fiscal position will determine taxes and the accounts used for the the "
+"The fiscal mapping will determine taxes and the accounts used for the  "
 "partner."
-msgstr "财务结构将决定业务伙伴使用的税和科目"
+msgstr ""
 
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
@@ -2065,8 +2065,8 @@ msgstr "客户发票处理"
 
 #. module: account
 #: rml:account.invoice:0
-msgid "Fiscal Position Remark :"
-msgstr "财务状况备注:"
+msgid "Fiscal Mapping Remark :"
+msgstr ""
 
 #. module: account
 #: wizard_field:account.fiscalyear.close,init,period_id:0
@@ -3633,8 +3633,8 @@ msgstr "序列"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_template
-msgid "Template for Fiscal Position"
-msgstr "财务结构模板"
+msgid "Template for Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: view:account.bank.statement:0
@@ -3738,8 +3738,8 @@ msgstr "发票草稿"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax_template
-msgid "Fiscal Position Template Tax Mapping"
-msgstr "财务结构模板税一览"
+msgid "Template Tax Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: rml:account.invoice:0
@@ -5882,8 +5882,8 @@ msgstr "付款条款"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
-msgid "Fiscal Positions"
-msgstr "财务结构"
+msgid "Fiscal Mappings"
+msgstr ""
 
 #. module: account
 #: model:process.process,name:account.process_process_statementprocess0
diff --git a/addons/account/i18n/zh_HK.po b/addons/account/i18n/zh_HK.po
index c8fe32c505a..4073d0c980e 100644
--- a/addons/account/i18n/zh_HK.po
+++ b/addons/account/i18n/zh_HK.po
@@ -611,7 +611,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account
-msgid "Fiscal Position Accounts Mapping"
+msgid "Accounts Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1005,7 +1005,7 @@ msgstr ""
 #: field:account.invoice,fiscal_position:0
 #: model:ir.model,name:account.model_account_fiscal_position
 #: field:res.partner,property_account_position:0
-msgid "Fiscal Position"
+msgid "Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1027,7 +1027,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax
-msgid "Fiscal Position Taxes Mapping"
+msgid "Taxes Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1114,7 +1114,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
-msgid "Fiscal Position Templates"
+msgid "Fiscal Mapping Templates"
 msgstr ""
 
 #. module: account
@@ -1146,7 +1146,7 @@ msgstr ""
 #. module: account
 #: view:account.fiscal.position.template:0
 #: field:account.fiscal.position.template,name:0
-msgid "Fiscal Position Template"
+msgid "Fiscal Mapping Template"
 msgstr ""
 
 #. module: account
@@ -1212,7 +1212,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account_template
-msgid "Fiscal Position Template Account Mapping"
+msgid "Template Account Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1790,7 +1790,7 @@ msgstr ""
 #. module: account
 #: help:res.partner,property_account_position:0
 msgid ""
-"The fiscal position will determine taxes and the accounts used for the the "
+"The fiscal mapping will determine taxes and the accounts used for the  "
 "partner."
 msgstr ""
 
@@ -2061,7 +2061,7 @@ msgstr ""
 
 #. module: account
 #: rml:account.invoice:0
-msgid "Fiscal Position Remark :"
+msgid "Fiscal Mapping Remark :"
 msgstr ""
 
 #. module: account
@@ -3627,7 +3627,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_template
-msgid "Template for Fiscal Position"
+msgid "Template for Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -3732,7 +3732,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax_template
-msgid "Fiscal Position Template Tax Mapping"
+msgid "Template Tax Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -5867,7 +5867,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
-msgid "Fiscal Positions"
+msgid "Fiscal Mappings"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/zh_TW.po b/addons/account/i18n/zh_TW.po
index 89950fd9600..e3346372092 100644
--- a/addons/account/i18n/zh_TW.po
+++ b/addons/account/i18n/zh_TW.po
@@ -610,7 +610,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account
-msgid "Fiscal Position Accounts Mapping"
+msgid "Accounts Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1004,7 +1004,7 @@ msgstr ""
 #: field:account.invoice,fiscal_position:0
 #: model:ir.model,name:account.model_account_fiscal_position
 #: field:res.partner,property_account_position:0
-msgid "Fiscal Position"
+msgid "Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1026,7 +1026,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax
-msgid "Fiscal Position Taxes Mapping"
+msgid "Taxes Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1113,7 +1113,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
-msgid "Fiscal Position Templates"
+msgid "Fiscal Mapping Templates"
 msgstr ""
 
 #. module: account
@@ -1145,7 +1145,7 @@ msgstr ""
 #. module: account
 #: view:account.fiscal.position.template:0
 #: field:account.fiscal.position.template,name:0
-msgid "Fiscal Position Template"
+msgid "Fiscal Mapping Template"
 msgstr ""
 
 #. module: account
@@ -1211,7 +1211,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account_template
-msgid "Fiscal Position Template Account Mapping"
+msgid "Template Account Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -1789,7 +1789,7 @@ msgstr ""
 #. module: account
 #: help:res.partner,property_account_position:0
 msgid ""
-"The fiscal position will determine taxes and the accounts used for the the "
+"The fiscal mapping will determine taxes and the accounts used for the  "
 "partner."
 msgstr ""
 
@@ -2060,7 +2060,7 @@ msgstr ""
 
 #. module: account
 #: rml:account.invoice:0
-msgid "Fiscal Position Remark :"
+msgid "Fiscal Mapping Remark :"
 msgstr ""
 
 #. module: account
@@ -3626,7 +3626,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_template
-msgid "Template for Fiscal Position"
+msgid "Template for Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -3731,7 +3731,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax_template
-msgid "Fiscal Position Template Tax Mapping"
+msgid "Template Tax Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -5866,7 +5866,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
-msgid "Fiscal Positions"
+msgid "Fiscal Mappings"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/installer.py b/addons/account/installer.py
index ef3ac72a261..415879e6de8 100644
--- a/addons/account/installer.py
+++ b/addons/account/installer.py
@@ -266,7 +266,7 @@ class account_installer(osv.osv_memory):
                     vals_bnk = {'name': val.acc_name or '',
                         'currency_id': val.currency_id.id or False,
                         'code': str(110400 + code_cnt),
-                        'type': 'other',
+                        'type': 'liquidity',
                         'user_type': type,
                         'parent_id':new_account,
                         'company_id': company_id.id }
diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index d099557c2e2..44a57c2e11d 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -315,7 +315,7 @@ class account_invoice(osv.osv):
         'payment_ids': fields.function(_compute_lines, method=True, relation='account.move.line', type="many2many", string='Payments'),
         'move_name': fields.char('Journal Entry', size=64, readonly=True, states={'draft':[('readonly',False)]}),
         'user_id': fields.many2one('res.users', 'Salesman', readonly=True, states={'draft':[('readonly',False)]}),
-        'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Position', readonly=True, states={'draft':[('readonly',False)]})
+        'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Mapping', readonly=True, states={'draft':[('readonly',False)]})
     }
     _defaults = {
         'type': _get_type,
@@ -1314,7 +1314,7 @@ class account_invoice_line(osv.osv):
                 # Parse the value_reference field to get the ID of the account.account record
                 account_id = int (my_value[0]["value_reference"].split(",")[1])
                 # Use the ID of the account.account record in the browse for the account.account record
-                app_acc_in = account_obj.browse(cr, uid, [account_id])[0]                
+                app_acc_in = account_obj.browse(cr, uid, [account_id])[0]
             if not exp_pro_id:
                 ex_acc = res.product_tmpl_id.property_account_expense
                 ex_acc_cate = res.categ_id.property_account_expense_categ
@@ -1486,7 +1486,7 @@ account_invoice_line()
 class account_invoice_tax(osv.osv):
     _name = "account.invoice.tax"
     _description = "Invoice Tax"
-    
+
     def _count_factor(self, cr, uid, ids, name, args, context=None):
         res = {}
         for invoice_tax in self.browse(cr, uid, ids, context=context):
@@ -1497,13 +1497,13 @@ class account_invoice_tax(osv.osv):
             if invoice_tax.amount <> 0.0:
                 factor_tax = invoice_tax.tax_amount / invoice_tax.amount
                 res[invoice_tax.id]['factor_tax'] = factor_tax
-                
+
             if invoice_tax.base <> 0.0:
                 factor_base = invoice_tax.base_amount / invoice_tax.base
                 res[invoice_tax.id]['factor_base'] = factor_base
-                
+
         return res
-    
+
     _columns = {
         'invoice_id': fields.many2one('account.invoice', 'Invoice Line', ondelete='cascade', select=True),
         'name': fields.char('Tax Description', size=64, required=True),
diff --git a/addons/account/partner.py b/addons/account/partner.py
index 469b8f47652..536976d1e39 100644
--- a/addons/account/partner.py
+++ b/addons/account/partner.py
@@ -25,9 +25,9 @@ import ir
 
 class account_fiscal_position(osv.osv):
     _name = 'account.fiscal.position'
-    _description = 'Fiscal Position'
+    _description = 'Fiscal Mapping'
     _columns = {
-        'name': fields.char('Fiscal Position', size=64, translate=True, required=True),
+        'name': fields.char('Fiscal Mapping', size=64, translate=True, required=True),
         'company_id': fields.many2one('res.company', 'Company'),
         'account_ids': fields.one2many('account.fiscal.position.account', 'position_id', 'Account Mapping'),
         'tax_ids': fields.one2many('account.fiscal.position.tax', 'position_id', 'Tax Mapping'),
@@ -64,10 +64,10 @@ account_fiscal_position()
 
 class account_fiscal_position_tax(osv.osv):
     _name = 'account.fiscal.position.tax'
-    _description = 'Fiscal Position Taxes Mapping'
+    _description = 'Taxes Fiscal Mapping'
     _rec_name = 'position_id'
     _columns = {
-        'position_id': fields.many2one('account.fiscal.position', 'Fiscal Position', required=True, ondelete='cascade'),
+        'position_id': fields.many2one('account.fiscal.position', 'Fiscal Mapping', required=True, ondelete='cascade'),
         'tax_src_id': fields.many2one('account.tax', 'Tax Source', required=True),
         'tax_dest_id': fields.many2one('account.tax', 'Replacement Tax')
     }
@@ -76,10 +76,10 @@ account_fiscal_position_tax()
 
 class account_fiscal_position_account(osv.osv):
     _name = 'account.fiscal.position.account'
-    _description = 'Fiscal Position Accounts Mapping'
+    _description = 'Accounts Fiscal Mapping'
     _rec_name = 'position_id'
     _columns = {
-        'position_id': fields.many2one('account.fiscal.position', 'Fiscal Position', required=True, ondelete='cascade'),
+        'position_id': fields.many2one('account.fiscal.position', 'Fiscal Mapping', required=True, ondelete='cascade'),
         'account_src_id': fields.many2one('account.account', 'Account Source', domain=[('type','<>','view')], required=True),
         'account_dest_id': fields.many2one('account.account', 'Account Destination', domain=[('type','<>','view')], required=True)
     }
@@ -172,10 +172,10 @@ class res_partner(osv.osv):
             'account.fiscal.position',
             type='many2one',
             relation='account.fiscal.position',
-            string="Fiscal Position",
+            string="Fiscal Mapping",
             method=True,
             view_load=True,
-            help="The fiscal position will determine taxes and the accounts used for the partner.",
+            help="The fiscal Mapping will determine taxes and the accounts used for the partner.",
         ),
         'property_payment_term': fields.property(
             'account.payment.term',
diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml
index 0e5a07d7491..d53fb9fe80a 100644
--- a/addons/account/partner_view.xml
+++ b/addons/account/partner_view.xml
@@ -7,7 +7,7 @@
             <field name="model">account.fiscal.position</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Fiscal Position">
+                <form string="Fiscal Mapping">
                     <field name="name" select="1"/>
                     <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                     <separator string="Mapping" colspan="4"/>
@@ -42,7 +42,7 @@
             <field name="model">account.fiscal.position</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Fiscal Position">
+                <tree string="Fiscal Mapping">
                     <field name="name"/>
                     <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                 </tree>
@@ -50,7 +50,7 @@
         </record>
 
         <record id="action_account_fiscal_position_form" model="ir.actions.act_window">
-            <field name="name">Fiscal Positions</field>
+            <field name="name">Fiscal Mappings</field>
             <field name="res_model">account.fiscal.position</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
@@ -130,7 +130,7 @@
         <act_window
             id="action_analytic_open"
             name="Analytic Accounts"
-            res_model="account.analytic.account"             
+            res_model="account.analytic.account"
             context="{'search_default_partner_id':[active_id]}"
             src_model="res.partner"
             view_type="form"
diff --git a/addons/account/report/account_aged_partner_balance.py b/addons/account/report/account_aged_partner_balance.py
index cf35fcebe72..b9e01e48bbf 100644
--- a/addons/account/report/account_aged_partner_balance.py
+++ b/addons/account/report/account_aged_partner_balance.py
@@ -49,6 +49,7 @@ class aged_trial_report(rml_parse.rml_parse, common_report_header):
     def set_context(self, objects, data, ids, report_type=None):
         self.query = data['form'].get('query_line', '')
         self.direction_selection = data['form'].get('direction_selection', 'past')
+        self.target_move = data['form'].get('target_move', 'all')
         self.date_from = data['form'].get('date_from', time.strftime('%Y-%m-%d'))
         if (data['form']['result_selection'] == 'customer' ):
             self.ACCOUNT_TYPE = ['receivable']
@@ -64,7 +65,7 @@ class aged_trial_report(rml_parse.rml_parse, common_report_header):
         self.cr.execute('SELECT DISTINCT res_partner.id AS id,\
                     res_partner.name AS name \
                 FROM res_partner,account_move_line AS l, account_account\
-                WHERE (l.account_id=account_account.id)\
+                WHERE (l.account_id=account_account.id) \
                     AND ((reconcile_id IS NULL)\
                     OR (reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date > %s )))\
                     AND (l.partner_id=res_partner.id)\
@@ -77,19 +78,23 @@ class aged_trial_report(rml_parse.rml_parse, common_report_header):
         #
         # Build a string like (1,2,3) for easy use in SQL query
         partner_ids = [x['id'] for x in partners]
-
         # This dictionary will store the debit-credit for all partners, using partner_id as key.
+        move_state = ['draft','posted']
+        if self.target_move == 'posted':
+            move_state = ['posted']
+
         totals = {}
-        self.cr.execute('SELECT partner_id, SUM(debit-credit) \
-                    FROM account_move_line AS l, account_account\
-                    WHERE (l.account_id = account_account.id)\
+        self.cr.execute('SELECT l.partner_id, SUM(l.debit-l.credit) \
+                    FROM account_move_line AS l, account_account, account_move am \
+                    WHERE (l.account_id = account_account.id) AND (l.move_id=am.id) \
+                    AND (am.state IN %s)\
                     AND (account_account.type IN %s)\
-                    AND (partner_id IN %s)\
-                    AND ((reconcile_id IS NULL)\
-                    OR (reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date > %s )))\
+                    AND (l.partner_id IN %s)\
+                    AND ((l.reconcile_id IS NULL)\
+                    OR (l.reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date > %s )))\
                     AND ' + self.query + '\
                     AND account_account.active\
-                    GROUP BY partner_id ' , (tuple(self.ACCOUNT_TYPE), tuple(partner_ids), self.date_from,))
+                    GROUP BY partner_id ' , (tuple(move_state), tuple(self.ACCOUNT_TYPE), tuple(partner_ids), self.date_from))
         t = self.cr.fetchall()
         for i in t:
             totals[i[0]] = i[1]
@@ -97,32 +102,34 @@ class aged_trial_report(rml_parse.rml_parse, common_report_header):
         # This dictionary will store the future or past of all partners
         future_past = {}
         if self.direction_selection == 'future':
-            self.cr.execute('SELECT partner_id, SUM(debit-credit) \
-                        FROM account_move_line AS l, account_account\
-                        WHERE (l.account_id=account_account.id)\
+            self.cr.execute('SELECT l.partner_id, SUM(l.debit-l.credit) \
+                        FROM account_move_line AS l, account_account, account_move am \
+                        WHERE (l.account_id=account_account.id) AND (l.move_id=am.id) \
+                        AND (am.state IN %s)\
                         AND (account_account.type IN %s)\
-                        AND (COALESCE(date_maturity, date) < %s)\
-                        AND (partner_id IN %s)\
-                        AND ((reconcile_id IS NULL)\
-                        OR (reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date > %s )))\
+                        AND (COALESCE(l.date_maturity, l.date) < %s)\
+                        AND (l.partner_id IN %s)\
+                        AND ((l.reconcile_id IS NULL)\
+                        OR (l.reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date > %s )))\
                         AND '+ self.query + '\
                         AND account_account.active\
-                        GROUP BY partner_id', (tuple(self.ACCOUNT_TYPE), self.date_from, tuple(partner_ids),self.date_from,))
+                        GROUP BY l.partner_id', (tuple(move_state), tuple(self.ACCOUNT_TYPE), self.date_from, tuple(partner_ids),self.date_from))
             t = self.cr.fetchall()
             for i in t:
                 future_past[i[0]] = i[1]
         elif self.direction_selection == 'past': # Using elif so people could extend without this breaking
-            self.cr.execute('SELECT partner_id, SUM(debit-credit) \
-                    FROM account_move_line AS l, account_account\
-                    WHERE (l.account_id=account_account.id)\
+            self.cr.execute('SELECT l.partner_id, SUM(l.debit-l.credit) \
+                    FROM account_move_line AS l, account_account, account_move am \
+                    WHERE (l.account_id=account_account.id) AND (l.move_id=am.id)\
+                        AND (am.state IN %s)\
                         AND (account_account.type IN %s)\
-                        AND (COALESCE(date_maturity,date) > %s)\
-                        AND (partner_id IN %s)\
-                        AND ((reconcile_id IS NULL)\
-                        OR (reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date > %s )))\
+                        AND (COALESCE(l.date_maturity,l.date) > %s)\
+                        AND (l.partner_id IN %s)\
+                        AND ((l.reconcile_id IS NULL)\
+                        OR (l.reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date > %s )))\
                         AND '+ self.query + '\
                         AND account_account.active\
-                        GROUP BY partner_id' , (tuple(self.ACCOUNT_TYPE), self.date_from, tuple(partner_ids), self.date_from,))
+                        GROUP BY l.partner_id' , (tuple(move_state), tuple(self.ACCOUNT_TYPE), self.date_from, tuple(partner_ids), self.date_from))
             t = self.cr.fetchall()
             for i in t:
                 future_past[i[0]] = i[1]
@@ -131,8 +138,8 @@ class aged_trial_report(rml_parse.rml_parse, common_report_header):
         # Each history will contain : history[1] = {'<partner_id>': <partner_debit-credit>}
         history = []
         for i in range(5):
-            args_list = (tuple(self.ACCOUNT_TYPE), tuple(partner_ids) ,self.date_from,)
-            dates_query = "(COALESCE(date_maturity,date)"
+            args_list = (tuple(move_state), tuple(self.ACCOUNT_TYPE), tuple(partner_ids) ,self.date_from,)
+            dates_query = '(COALESCE(l.date_maturity,l.date)'
             if form[str(i)]['start'] and form[str(i)]['stop']:
                 dates_query += ' BETWEEN %s AND %s)'
                 args_list += (form[str(i)]['start'], form[str(i)]['stop'])
@@ -142,17 +149,19 @@ class aged_trial_report(rml_parse.rml_parse, common_report_header):
             else:
                 dates_query += ' < %s)'
                 args_list += (form[str(i)]['stop'],)
-            self.cr.execute('SELECT partner_id, SUM(debit-credit)\
-                    FROM account_move_line AS l, account_account\
-                    WHERE (l.account_id = account_account.id)\
+
+            self.cr.execute('SELECT l.partner_id, SUM(l.debit-l.credit)\
+                    FROM account_move_line AS l, account_account , account_move am \
+                    WHERE (l.account_id = account_account.id) AND (l.move_id=am.id)\
+                        AND (am.state IN %s)\
                         AND (account_account.type IN %s)\
-                        AND (partner_id IN %s)\
-                        AND ((reconcile_id IS NULL)\
-                        OR (reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date > %s )))\
+                        AND (l.partner_id IN %s)\
+                        AND ((l.reconcile_id IS NULL)\
+                        OR (l.reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date > %s )))\
                         AND '+ self.query + '\
                         AND account_account.active\
                         AND ' + dates_query + '\
-                    GROUP BY partner_id' , args_list)
+                    GROUP BY l.partner_id' , args_list)
             t = self.cr.fetchall()
             d = {}
             for i in t:
@@ -208,56 +217,63 @@ class aged_trial_report(rml_parse.rml_parse, common_report_header):
     def _get_lines_with_out_partner(self, form):
         res = []
         account_move_line_obj = pooler.get_pool(self.cr.dbname).get('account.move.line')
+        move_state = ['draft','posted']
+        if self.target_move == 'posted':
+            move_state = ['posted']
+
         ## mise a 0 du total
         for i in range(7):
             self.total_account.append(0)
         totals = {}
-        self.cr.execute('SELECT SUM(debit-credit) \
-                    FROM account_move_line AS l, account_account\
-                    WHERE (l.account_id = account_account.id)\
+        self.cr.execute('SELECT SUM(l.debit-l.credit) \
+                    FROM account_move_line AS l, account_account , account_move am \
+                    WHERE (l.account_id = account_account.id) AND (l.move_id=am.id)\
+                    AND (am.state IN %s)\
                     AND (l.partner_id IS NULL)\
                     AND (account_account.type IN %s)\
-                    AND ((reconcile_id IS NULL) \
-                    OR (reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date > %s )))\
+                    AND ((l.reconcile_id IS NULL) \
+                    OR (l.reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date > %s )))\
                     AND ' + self.query + '\
-                    AND account_account.active ' ,(tuple(self.ACCOUNT_TYPE), self.date_from, ))
+                    AND account_account.active ' ,(tuple(move_state), tuple(self.ACCOUNT_TYPE), self.date_from))
         t = self.cr.fetchall()
         for i in t:
-            totals['No Partner Defined'] = i[0]
+            totals['Unknown Partner'] = i[0]
         future_past = {}
         if self.direction_selection == 'future':
-            self.cr.execute('SELECT SUM(debit-credit) \
-                        FROM account_move_line AS l, account_account\
-                        WHERE (l.account_id=account_account.id)\
+            self.cr.execute('SELECT SUM(l.debit-l.credit) \
+                        FROM account_move_line AS l, account_account, account_move am\
+                        WHERE (l.account_id=account_account.id) AND (l.move_id=am.id)\
+                        AND (am.state IN %s)\
                         AND (l.partner_id IS NULL)\
                         AND (account_account.type IN %s)\
-                        AND (COALESCE(date_maturity, date) < %s)\
-                        AND ((reconcile_id IS NULL)\
-                        OR (reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date > %s )))\
+                        AND (COALESCE(l.date_maturity, l.date) < %s)\
+                        AND ((l.reconcile_id IS NULL)\
+                        OR (l.reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date > %s )))\
                         AND '+ self.query + '\
-                        AND account_account.active ', (tuple(self.ACCOUNT_TYPE), self.date_from, self.date_from, ))
+                        AND account_account.active ', (tuple(move_state), tuple(self.ACCOUNT_TYPE), self.date_from, self.date_from))
             t = self.cr.fetchall()
             for i in t:
-                future_past['No Partner Defined'] = i[0]
+                future_past['Unknown Partner'] = i[0]
         elif self.direction_selection == 'past': # Using elif so people could extend without this breaking
-            self.cr.execute('SELECT SUM(debit-credit) \
-                    FROM account_move_line AS l, account_account\
-                    WHERE (l.account_id=account_account.id)\
+            self.cr.execute('SELECT SUM(l.debit-l.credit) \
+                    FROM account_move_line AS l, account_account, account_move am \
+                    WHERE (l.account_id=account_account.id) AND (l.move_id=am.id)\
+                        AND (am.state IN %s)\
                         AND (l.partner_id IS NULL)\
                         AND (account_account.type IN %s)\
-                        AND (COALESCE(date_maturity,date) > %s)\
-                        AND ((reconcile_id IS NULL)\
-                        OR (reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date > %s )))\
+                        AND (COALESCE(l.date_maturity,l.date) > %s)\
+                        AND ((l.reconcile_id IS NULL)\
+                        OR (l.reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date > %s )))\
                         AND '+ self.query + '\
-                        AND account_account.active ' , (tuple(self.ACCOUNT_TYPE), self.date_from, self.date_from,))
+                        AND account_account.active ' , (tuple(move_state), tuple(self.ACCOUNT_TYPE), self.date_from, self.date_from))
             t = self.cr.fetchall()
             for i in t:
-                future_past['No Partner Defined'] = i[0]
+                future_past['Unknown Partner'] = i[0]
         history = []
 
         for i in range(5):
-            args_list = (tuple(self.ACCOUNT_TYPE), self.date_from)
-            dates_query = "(COALESCE(date_maturity,date)"
+            args_list = (tuple(move_state), tuple(self.ACCOUNT_TYPE), self.date_from,)
+            dates_query = '(COALESCE(l.date_maturity,l.date)'
             if form[str(i)]['start'] and form[str(i)]['stop']:
                 dates_query += ' BETWEEN %s AND %s)'
                 args_list += (form[str(i)]['start'], form[str(i)]['stop'])
@@ -267,51 +283,53 @@ class aged_trial_report(rml_parse.rml_parse, common_report_header):
             else:
                 dates_query += ' < %s)'
                 args_list += (form[str(i)]['stop'],)
-    
-            self.cr.execute('SELECT SUM(debit-credit)\
-                    FROM account_move_line AS l, account_account\
-                    WHERE (l.account_id = account_account.id)\
-                        AND (l.partner_id IS NULL)\
+
+            self.cr.execute('SELECT SUM(l.debit-l.credit)\
+                    FROM account_move_line AS l, account_account , account_move am \
+                    WHERE (l.account_id = account_account.id) AND (l.move_id=am.id)\
+                        AND (am.state IN %s)\
                         AND (account_account.type IN %s)\
-                        AND ((reconcile_id IS NULL)\
-                        OR (reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date > %s )))\
+                        AND (l.partner_id IS NULL)\
+                        AND ((l.reconcile_id IS NULL)\
+                        OR (l.reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date > %s )))\
                         AND '+ self.query + '\
-                        AND '+ dates_query + '\
-                        AND account_account.active ' , args_list)
+                        AND account_account.active\
+                        AND ' + dates_query + '\
+                    GROUP BY l.partner_id' , args_list)
             t = self.cr.fetchall()
             d = {}
             for i in t:
-                d['No Partner Defined'] = i[0]
+                d['Unknown Partner'] = i[0]
             history.append(d)
 
         values = {}
         if self.direction_selection == 'future':
             before = False
-            if future_past.has_key('No Partner Defined'):
-                before = [ future_past['No Partner Defined'] ]
+            if future_past.has_key('Unknown Partner'):
+                before = [ future_past['Unknown Partner'] ]
             self.total_account[6] = self.total_account[6] + (before and before[0] or 0.0)
             values['direction'] = before and before[0] or 0.0
         elif self.direction_selection == 'past':
             after = False
-            if future_past.has_key('No Partner Defined'):
-                after = [ future_past['No Partner Defined'] ]
+            if future_past.has_key('Unknown Partner'):
+                after = [ future_past['Unknown Partner'] ]
             self.total_account[6] = self.total_account[6] + (after and after[0] or 0.0)
-            values['direction'] = after and after[0] or ""
+            values['direction'] = after and after[0] or 0.0
 
         for i in range(5):
             during = False
-            if history[i].has_key('No Partner Defined'):
-                during = [ history[i]['No Partner Defined'] ]
+            if history[i].has_key('Unknown Partner'):
+                during = [ history[i]['Unknown Partner'] ]
             self.total_account[(i)] = self.total_account[(i)] + (during and during[0] or 0)
-            values[str(i)] = during and during[0] or ""
+            values[str(i)] = during and during[0] or 0.0
 
         total = False
-        if totals.has_key( 'No Partner Defined' ):
-            total = [ totals['No Partner Defined'] ]
+        if totals.has_key( 'Unknown Partner' ):
+            total = [ totals['Unknown Partner'] ]
         values['total'] = total and total[0] or 0.0
         ## Add for total
         self.total_account[(i+1)] = self.total_account[(i+1)] + (total and total[0] or 0.0)
-        values['name'] = 'No Partner Defined'
+        values['name'] = 'Unknown Partner'
 
         if values['total']:
             res.append(values)
diff --git a/addons/account/report/account_analytic_entries_report_view.xml b/addons/account/report/account_analytic_entries_report_view.xml
index f7e543cb22c..b837186f23c 100644
--- a/addons/account/report/account_analytic_entries_report_view.xml
+++ b/addons/account/report/account_analytic_entries_report_view.xml
@@ -50,7 +50,7 @@
                     <separator orientation="vertical"/>
                     <field name="product_id" />
                     <field name="user_id" widget="selection">
-                    <filter icon="terp-gtk-jump-to-ltr" domain="[('user_id','=',uid)]" help="My Entries"/>
+                    <filter icon="terp-personal" domain="[('user_id','=',uid)]" help="My Entries"/>
                     </field>
                 </group>
                 <newline/>
@@ -90,7 +90,7 @@
          <field name="type">graph</field>
          <field name="arch" type="xml">
              <graph string="Analytic Entries Analysis" type="bar">
-                 <field name="user_id"/>
+                <field name="user_id"/>
                 <field name="amount" operator="+"/>
                 <field name="unit_amount" operator="+"/>
                 <field name="amount_currency" operator="+"/>
diff --git a/addons/account/report/account_balance.py b/addons/account/report/account_balance.py
index f2177f80b3a..5ada9adc4d8 100644
--- a/addons/account/report/account_balance.py
+++ b/addons/account/report/account_balance.py
@@ -55,7 +55,6 @@ class account_balance(report_sxw.rml_parse, common_report_header):
         if (data['model'] == 'ir.ui.menu'):
             new_ids = 'chart_account_id' in data['form'] and [data['form']['chart_account_id']] or []
             objects = self.pool.get('account.account').browse(self.cr, self.uid, new_ids)
-        self.query_get_clause = data['form'].get('query_line', False) or ''
         return super(account_balance, self).set_context(objects, data, new_ids, report_type=report_type)
 
     #def _add_header(self, node, header=1):
diff --git a/addons/account/report/account_balance.rml b/addons/account/report/account_balance.rml
index eb221a6427b..5d71ef95c39 100644
--- a/addons/account/report/account_balance.rml
+++ b/addons/account/report/account_balance.rml
@@ -14,11 +14,11 @@
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
     </blockTableStyle>
- 	<blockTableStyle id="Table2">
+   <blockTableStyle id="Table2">
       <blockValign value="TOP"/>
       <blockAlignment value="RIGHT"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/>
-	<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,1" stop="-1,-1"/>
+  <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,1" stop="-1,-1"/>
     </blockTableStyle>
 
     <blockTableStyle id="Table8">
@@ -111,12 +111,12 @@
     <blockTableStyle id="Table5">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-	 	<lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
+     <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table6">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-		<lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/>
+    <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/>
     </blockTableStyle>
     <blockTableStyle id="Table_Account_Balance_Content">
       <blockAlignment value="LEFT"/>
@@ -199,7 +199,7 @@
     <blockTable colWidths="525.0" style="Table_Tilte_Table">
       <tr>
         <td>
-          <para style="P15">Account Balance </para>
+          <para style="P15">Trial Balance </para>
         </td>
       </tr>
     </blockTable>
@@ -212,7 +212,7 @@
     <blockTable colWidths="130.0,80.0,100.0,140.0,90.0" style="Table8">
       <tr>
         <td><para style="terp_tblheader_General_Centre">[[ data['model']=='account.account' and 'Company'or removeParentNode('para') ]]</para>
-      	<para style="terp_tblheader_General_Centre"> [[ data['model']=='ir.ui.menu' and 'Chart of Account' or removeParentNode('para') ]]</para></td>
+        <para style="terp_tblheader_General_Centre"> [[ data['model']=='ir.ui.menu' and 'Chart of Account' or removeParentNode('para') ]]</para></td>
         <td>
           <para style="terp_tblheader_General_Centre">Fiscal Year</para>
         </td>
@@ -292,11 +292,11 @@
         <td><para style="P10">Balance([[ company.currency_id.code]])</para></td>
       </tr>
       <tr>
-		<td><para style="P14">[[ repeatIn(lines(data['form']), 'a') ]]<font>[[ (a['level']&gt;2 and setTag('para','para',{'fontName':"Helvetica"})) or removeParentNode('font') ]]</font><i>[[ a['code'] or removeParentNode('tr')  ]]</i></para></td>
-        <td><para style="P14"><font>[[ (a['level']&gt;2 and setTag('para','para',{'fontName':"Helvetica"})) or removeParentNode('font') ]]</font><font color="white">[[ '..'*(a['level']-1) ]]</font><font>[[ a['name'] ]]</font> </para></td>
-        <td><para style="P3"><font>[[ (a['level']&gt;2 and setTag('para','para',{'fontName':"Helvetica"})) or removeParentNode('font') ]]</font><font>[[ a['type']=='view' and removeParentNode('font') ]][[ formatLang(a['debit']) ]] [[ company.currency_id.symbol ]]</font><font>[[ a['type']&lt;&gt;'view' and removeParentNode('font') ]] [[formatLang(a['debit']) ]] [[ company.currency_id.symbol ]]</font></para></td>
-        <td><para style="P3"><font>[[ (a['level']&gt;2 and setTag('para','para',{'fontName':"Helvetica"})) or removeParentNode('font')]]</font><font>[[ a['type']=='view' and removeParentNode('font') ]][[ formatLang(a['credit']) ]] [[ company.currency_id.symbol ]]</font><font>[[ a['type']&lt;&gt;'view' and removeParentNode('font') ]] [[ formatLang(a['credit']) ]] [[ company.currency_id.symbol ]]</font> </para></td>
-        <td><para style="P3"><font>[[ (a['level']&gt;2 and setTag('para','para',{'fontName':"Helvetica"})) or removeParentNode('font') ]]</font><font>[[ a['type']=='view' and removeParentNode('font') ]][[ formatLang(a['balance']) ]] [[ company.currency_id.symbol ]]</font><font>[[ a['type']&lt;&gt;'view' and removeParentNode('font') ]] [[ formatLang(a['balance']) ]] [[ company.currency_id.symbol ]]</font> </para></td>
+    <td><para style="P14">[[ repeatIn(lines(data['form']), 'a') ]]<font>[[ (a['type']&lt;&gt;'view' and setTag('para','para',{'fontName':"Helvetica"})) or removeParentNode('font') ]]</font><i>[[ a['code'] or removeParentNode('tr')  ]]</i></para></td>
+        <td><para style="P14"><font>[[ (a['type']&lt;&gt;'view' and setTag('para','para',{'fontName':"Helvetica"})) or removeParentNode('font') ]]</font><font color="white">[[ '..'*(a['level']-1) ]]</font><font>[[ a['name'] ]]</font> </para></td>
+        <td><para style="P3"><font>[[ (a['type']&lt;&gt;'view' and setTag('para','para',{'fontName':"Helvetica"})) or removeParentNode('font') ]]</font><font>[[ a['type']=='view' and removeParentNode('font') ]][[ formatLang(a['debit']) ]] [[ company.currency_id.symbol ]]</font><font>[[ a['type']&lt;&gt;'view' and removeParentNode('font') ]] [[formatLang(a['debit']) ]] [[ company.currency_id.symbol ]]</font></para></td>
+        <td><para style="P3"><font>[[ (a['type']&lt;&gt;'view' and setTag('para','para',{'fontName':"Helvetica"})) or removeParentNode('font')]]</font><font>[[ a['type']=='view' and removeParentNode('font') ]][[ formatLang(a['credit']) ]] [[ company.currency_id.symbol ]]</font><font>[[ a['type']&lt;&gt;'view' and removeParentNode('font') ]] [[ formatLang(a['credit']) ]] [[ company.currency_id.symbol ]]</font> </para></td>
+        <td><para style="P3"><font>[[ (a['type']&lt;&gt;'view' and setTag('para','para',{'fontName':"Helvetica"})) or removeParentNode('font') ]]</font><font>[[ a['type']=='view' and removeParentNode('font') ]][[ formatLang(a['balance']) ]] [[ company.currency_id.symbol ]]</font><font>[[ a['type']&lt;&gt;'view' and removeParentNode('font') ]] [[ formatLang(a['balance']) ]] [[ company.currency_id.symbol ]]</font> </para></td>
       </tr>
     </blockTable>
     <para style="P11">
diff --git a/addons/account/report/account_balance_sheet.py b/addons/account/report/account_balance_sheet.py
index e4d624af5d8..9b816b2ab5a 100644
--- a/addons/account/report/account_balance_sheet.py
+++ b/addons/account/report/account_balance_sheet.py
@@ -98,7 +98,7 @@ class report_balancesheet_horizontal(rml_parse.rml_parse, common_report_header):
         elif data['form']['filter'] == 'filter_date':
             ctx['date_from'] = data['form'].get('date_from', False)
             ctx['date_to'] =  data['form'].get('date_to', False)
-
+        ctx['state'] = data['form'].get('target_move', 'all')
         cal_list = {}
         pl_dict = {}
         account_dict = {}
diff --git a/addons/account/report/account_balance_sheet.rml b/addons/account/report/account_balance_sheet.rml
index 2170fb02c85..052ecce16cb 100644
--- a/addons/account/report/account_balance_sheet.rml
+++ b/addons/account/report/account_balance_sheet.rml
@@ -117,10 +117,10 @@
     <blockTableStyle id="Table3">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-    	<lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="-1,-1"/>
-    	<lineStyle kind="LINEAFTER" colorName="#cccccc" start="0,0" stop="-1,-1"/>
-    	<lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,0" stop="-1,-1"/>
-    	<lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="-1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="-1,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="0,0" stop="-1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,0" stop="-1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="-1,-1"/>
     </blockTableStyle>
     <initialize>
       <paraStyle name="all" alignment="justify"/>
@@ -177,42 +177,42 @@
     </para>
       <blockTable colWidths="120.0,100.0,140.0,90.0,90.0" style="Table2_header" >
       <tr>
-      	<td><para style="terp_tblheader_General_Centre">Chart of Account </para></td>
+        <td><para style="terp_tblheader_General_Centre">Chart of Account </para></td>
         <td><para style="terp_tblheader_General_Centre">Fiscal Year</para></td>
         <td><para style="terp_tblheader_General_Centre">Filter By <font>[[ get_filter(data)!='No Filter' and '' or removeParentNode('font') ]]</font></para></td>
-		<td><para style="terp_tblheader_General_Centre">Display Account</para></td>
+    <td><para style="terp_tblheader_General_Centre">Display Account</para></td>
         <td><para style="terp_tblheader_General_Centre">Printing Date</para></td>
       </tr>
-	<tr>
-	   <td><para style="terp_default_Centre_8">[[ get_account(data) or removeParentNode('para') ]]</para></td>
+  <tr>
+     <td><para style="terp_default_Centre_8">[[ get_account(data) or removeParentNode('para') ]]</para></td>
        <td><para style="terp_default_Centre_8">[[ get_fiscalyear(data)  or '' ]]</para></td>
         <td><para style="terp_default_Centre_8">[[ get_filter(data)=='No Filter' and get_filter(data) or removeParentNode('para') ]] </para>
-        	<blockTable colWidths="60.0,60.0" style="Table3">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]]
-				<tr>
-	               <td><para style="terp_tblheader_Details_Centre">Start Date</para></td>
-	        		<td><para style="terp_tblheader_Details_Centre">End Date</para></td>
-	        	</tr>
-	        	<tr>
-	        		<td><para style="terp_default_Centre_8">[[ formatLang(get_start_date(data),date=True) ]]</para></td>
-	        		<td><para style="terp_default_Centre_8">[[ formatLang(get_end_date(data),date=True) ]]</para></td>
-	        	</tr>
-        	</blockTable>
-        	<blockTable colWidths="65.0,60.0" style="Table3">[[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]]
-				<tr>
-			        <td><para style="terp_tblheader_Details_Centre">Start Period</para></td>
-			        <td><para style="terp_tblheader_Details_Centre">End Period</para></td>
-	        	</tr>
-	        	<tr>
-			        <td><para style="terp_default_Centre_8">[[ get_start_period(data) or removeParentNode('para') ]]</para></td>
-			        <td><para style="terp_default_Centre_8">[[ get_end_period(data) or removeParentNode('para') ]]</para></td>
-	        	</tr>
-        	 </blockTable>
-        	</td>
-		<td><para style="terp_default_Centre_8">[[ (data['form']['display_account']=='bal_all' and 'All') or  (data['form']['display_account']=='bal_movement' and 'With movements') or 'With balance is not equal to 0']]</para></td>
-		<td><para style="terp_default_Centre_8">[[ formatLang(time.strftime('%Y-%m-%d %H:%M:%S'), date_time = True) ]] </para></td>
-	</tr>
-	</blockTable>
-	    <para style="Standard">
+          <blockTable colWidths="60.0,60.0" style="Table3">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]]
+        <tr>
+                 <td><para style="terp_tblheader_Details_Centre">Start Date</para></td>
+              <td><para style="terp_tblheader_Details_Centre">End Date</para></td>
+            </tr>
+            <tr>
+              <td><para style="terp_default_Centre_8">[[ formatLang(get_start_date(data),date=True) ]]</para></td>
+              <td><para style="terp_default_Centre_8">[[ formatLang(get_end_date(data),date=True) ]]</para></td>
+            </tr>
+          </blockTable>
+          <blockTable colWidths="65.0,60.0" style="Table3">[[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]]
+        <tr>
+              <td><para style="terp_tblheader_Details_Centre">Start Period</para></td>
+              <td><para style="terp_tblheader_Details_Centre">End Period</para></td>
+            </tr>
+            <tr>
+              <td><para style="terp_default_Centre_8">[[ get_start_period(data) or removeParentNode('para') ]]</para></td>
+              <td><para style="terp_default_Centre_8">[[ get_end_period(data) or removeParentNode('para') ]]</para></td>
+            </tr>
+           </blockTable>
+          </td>
+    <td><para style="terp_default_Centre_8">[[ (data['form']['display_account']=='bal_all' and 'All') or  (data['form']['display_account']=='bal_movement' and 'With movements') or 'With balance is not equal to 0']]</para></td>
+    <td><para style="terp_default_Centre_8">[[ formatLang(time.strftime('%Y-%m-%d %H:%M:%S'), date_time = True) ]] </para></td>
+  </tr>
+  </blockTable>
+      <para style="Standard">
       <font color="white"> </font>
     </para>
         <para style="Standard">
@@ -221,44 +221,6 @@
     <para style="terp_default_9">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="100.0,326.0,113.0" style="Table_Account_Line_Title" repeatRows="1">
-      <tr>
-        <td>
-          <para style="terp_default_Bold_9">Code</para>
-        </td>
-        <td>
-          <para style="terp_default_Bold_9">Liabilities</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Total Amount([[ get_currency(data) ]])</para>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <para style="terp_default_9"><font face="Times-Roman">[[ repeatIn(get_lines_another('liability'), 'a') ]]</font>[[ a['code'] ]]<font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]] </font></para>
-        </td>
-        <td>
-          <para style="terp_default_9"><font color="white">[[  '. '*(a['level']-1) ]]</font><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font')  ]][[ a['name'] ]]</font></para>
-        </td>
-        <td>
-          <para style="terp_default_Right_9"><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font')  ]]</font><font>[[ formatLang(abs(a['balance'])) ]] [[ company.currency_id.symbol ]]</font></para>
-        </td>
-      </tr>
-    </blockTable>
-    <blockTable colWidths="426.0,113.0" style="Table_Net_Profit_Loss">
-      <tr>
-        <td>
-          <para style="terp_default_Bold_9">Balance:([[ get_currency(data) ]])</para>
-        </td>
-        <td>
-          <para style="terp_default_Right_9_Bold"><u>[[ formatLang(abs(sum_dr())) ]] [[ company.currency_id.symbol ]]</u></para>
-        </td>
-      </tr>
-    </blockTable>
-    <condPageBreak height="20cm"/>
-    <para style="terp_default_9">
-      <font color="white"> </font>
-    </para>
     <blockTable colWidths="100.0,326.0,113.0" style="Table1" repeatRows="1">
       <tr>
         <td>
@@ -293,6 +255,44 @@
         </td>
       </tr>
     </blockTable>
+    <condPageBreak height="20cm"/>
+    <para style="terp_default_9">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="100.0,326.0,113.0" style="Table_Account_Line_Title" repeatRows="1">
+      <tr>
+        <td>
+          <para style="terp_default_Bold_9">Code</para>
+        </td>
+        <td>
+          <para style="terp_default_Bold_9">Liabilities</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Total Amount([[ get_currency(data) ]])</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="terp_default_9"><font face="Times-Roman">[[ repeatIn(get_lines_another('liability'), 'a') ]]</font>[[ a['code'] ]]<font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]] </font></para>
+        </td>
+        <td>
+          <para style="terp_default_9"><font color="white">[[  '. '*(a['level']-1) ]]</font><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font')  ]][[ a['name'] ]]</font></para>
+        </td>
+        <td>
+          <para style="terp_default_Right_9"><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font')  ]]</font><font>[[ formatLang(abs(a['balance'])) ]] [[ company.currency_id.symbol ]]</font></para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="426.0,113.0" style="Table_Net_Profit_Loss">
+      <tr>
+        <td>
+          <para style="terp_default_Bold_9">Balance:([[ get_currency(data) ]])</para>
+        </td>
+        <td>
+          <para style="terp_default_Right_9_Bold"><u>[[ formatLang(abs(sum_dr())) ]] [[ company.currency_id.symbol ]]</u></para>
+        </td>
+      </tr>
+    </blockTable>
     <para style="Standard">
       <font color="white"> </font>
     </para>
diff --git a/addons/account/report/account_balance_sheet_horizontal.rml b/addons/account/report/account_balance_sheet_horizontal.rml
index 3b4545c4336..0d35f0ff262 100644
--- a/addons/account/report/account_balance_sheet_horizontal.rml
+++ b/addons/account/report/account_balance_sheet_horizontal.rml
@@ -128,7 +128,7 @@
         <blockTableStyle id="Table3">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-   	<lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
+     <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
     </blockTableStyle>
 
     <initialize>
@@ -197,62 +197,53 @@
     <para style="Standard">
       <font color="white"> </font>
     </para>
-	<para style="terp_default_8">[[ get_data(data) or removeParentNode('para') ]]</para>
+  <para style="terp_default_8">[[ get_data(data) or removeParentNode('para') ]]</para>
 
       <blockTable colWidths="210.0,210.0,200.0,200.0,200.0" style="Table2_header" >
       <tr>
-      	<td><para style="terp_tblheader_General_Centre">Chart of Account </para></td>
+        <td><para style="terp_tblheader_General_Centre">Chart of Account </para></td>
         <td><para style="terp_tblheader_General_Centre">Fiscal Year</para></td>
         <td><para style="terp_tblheader_General_Centre">Filter By  [[ get_filter(data)!='No Filter' and get_filter(data) ]]</para></td>
-		<td><para style="terp_tblheader_General_Centre">Display Account</para></td>
+    <td><para style="terp_tblheader_General_Centre">Display Account</para></td>
         <td><para style="terp_tblheader_General_Centre">Printing Date</para></td>
       </tr>
-	<tr>
-	   <td><para style="terp_default_Centre_8">[[ get_account(data) or removeParentNode('para') ]]</para></td>
+  <tr>
+     <td><para style="terp_default_Centre_8">[[ get_account(data) or removeParentNode('para') ]]</para></td>
        <td><para style="terp_default_Centre_8">[[ get_fiscalyear(data)  or '' ]]</para></td>
         <td><para style="terp_default_Centre_8">[[ get_filter(data)=='No Filter' and get_filter(data) or removeParentNode('para') ]] </para>
-        	<blockTable colWidths="85.0,85.0" style="Table3">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]]
-				<tr>
-	               <td><para style="terp_tblheader_Details_Centre">Start Date</para></td>
-	        		<td><para style="terp_tblheader_Details_Centre">End Date</para></td>
-	        	</tr>
-	        	<tr>
-	        		<td><para style="terp_default_Centre_8">[[ formatLang(get_start_date(data),date=True) ]]</para></td>
-	        		<td><para style="terp_default_Centre_8">[[ formatLang(get_end_date(data),date=True) ]]</para></td>
-	        	</tr>
-        	</blockTable>
-        	<blockTable colWidths="85.0,85.0" style="Table3">[[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]]
-				<tr>
-			        <td><para style="terp_tblheader_Details_Centre">Start Period</para></td>
-			        <td><para style="terp_tblheader_Details_Centre">End Period</para></td>
-	        	</tr>
-	        	<tr>
-			        <td><para style="terp_default_Centre_8">[[ get_start_period(data) or removeParentNode('para') ]]</para></td>
-			        <td><para style="terp_default_Centre_8">[[ get_end_period(data) or removeParentNode('para') ]]</para></td>
-	        	</tr>
-        	 </blockTable>
-        	</td>
-		<td><para style="terp_default_Centre_8">[[ (data['form']['display_account']=='bal_all' and 'All') or  (data['form']['display_account']=='bal_movement' and 'With movements') or 'With balance is not equal to 0']]</para></td>
-		<td><para style="terp_default_Centre_8">[[ formatLang(time.strftime('%Y-%m-%d %H:%M:%S'), date_time = True) ]] </para></td>
-	</tr>
-	</blockTable>
-	    <para style="Standard">
+          <blockTable colWidths="85.0,85.0" style="Table3">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]]
+        <tr>
+                 <td><para style="terp_tblheader_Details_Centre">Start Date</para></td>
+              <td><para style="terp_tblheader_Details_Centre">End Date</para></td>
+            </tr>
+            <tr>
+              <td><para style="terp_default_Centre_8">[[ formatLang(get_start_date(data),date=True) ]]</para></td>
+              <td><para style="terp_default_Centre_8">[[ formatLang(get_end_date(data),date=True) ]]</para></td>
+            </tr>
+          </blockTable>
+          <blockTable colWidths="85.0,85.0" style="Table3">[[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]]
+        <tr>
+              <td><para style="terp_tblheader_Details_Centre">Start Period</para></td>
+              <td><para style="terp_tblheader_Details_Centre">End Period</para></td>
+            </tr>
+            <tr>
+              <td><para style="terp_default_Centre_8">[[ get_start_period(data) or removeParentNode('para') ]]</para></td>
+              <td><para style="terp_default_Centre_8">[[ get_end_period(data) or removeParentNode('para') ]]</para></td>
+            </tr>
+           </blockTable>
+          </td>
+    <td><para style="terp_default_Centre_8">[[ (data['form']['display_account']=='bal_all' and 'All') or  (data['form']['display_account']=='bal_movement' and 'With movements') or 'With balance is not equal to 0']]</para></td>
+    <td><para style="terp_default_Centre_8">[[ formatLang(time.strftime('%Y-%m-%d %H:%M:%S'), date_time = True) ]] </para></td>
+  </tr>
+  </blockTable>
+      <para style="Standard">
       <font color="white"> </font>
     </para>
-        <para style="Standard">
+    <para style="Standard">
       <font color="white"> </font>
     </para>
     <blockTable colWidths="100.0,308.16,116.32,100.0,308.16,116.32" style="Table_Account_Line_Title" repeatRows="1">
       <tr>
-        <td>
-          <para style="terp_default_Bold_9">Code</para>
-        </td>
-        <td>
-          <para style="terp_default_Bold_9">Liabilities</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Total Amount([[ get_currency(data) ]])</para>
-        </td>
         <td>
           <para style="terp_default_Bold_9">Code</para>
         </td>
@@ -262,44 +253,52 @@
         <td>
           <para style="terp_tblheader_Details_Right">Total Amount([[ get_currency(data) ]]) </para>
         </td>
+        <td>
+          <para style="terp_default_Bold_9">Code</para>
+        </td>
+        <td>
+          <para style="terp_default_Bold_9">Liabilities</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Total Amount([[ get_currency(data) ]])</para>
+        </td>
       </tr>
-	  <tr>
-	      <td>
-
-	        <para style="terp_default_9"><font face="Times-Roman">[[ repeatIn(get_lines(), 'a') ]]</font> <font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font')  ]]</font><font>[[ a['code'] ]]</font></para>
-	      </td>
-	      <td>
-	        <para style="terp_default_9"><font color="white">[[  '. '*(a['level']-1) ]]</font><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font')  ]][[ a['name'] ]]</font></para>
-	      </td>
-	      <td>
-	        <para style="terp_default_Right_9"><font>[[ a['level1']&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font')  ]]</font><font>[[ formatLang(abs(a['balance'])) ]] [[ company.currency_id.symbol ]]</font></para>
-	      </td>
-	      <td>
-	        <para style="terp_default_9"><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font')  ]]</font><font>[[ a['code1'] ]]</font></para>
-	      </td>
-	      <td>
-	        <para style="terp_default_9"><font color="white">[[  '. '*(a['level1']-1) ]]</font><font>[[ a['level1']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font')  ]][[ a['name1'] ]]</font></para>
-	      </td>
-	      <td>
-	        <para style="terp_default_Right_9"><font>[[ a['level1']&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font')  ]]</font><font>[[ formatLang(abs(a['balance1'])) ]] [[ company.currency_id.symbol ]]</font></para>
-	      </td>
-	   </tr>
-      </blockTable>
-    <blockTable colWidths="408.16,116.32,408.16,116.32" style="Table_Net_Profit_Loss">
       <tr>
+        <td>
+          <para style="terp_default_9"><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font')  ]]</font><font>[[ a['code1'] ]]</font></para>
+        </td>
+        <td>
+          <para style="terp_default_9"><font color="white">[[  '. '*(a['level1']-1) ]]</font><font>[[ a['level1']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font')  ]][[ a['name1'] ]]</font></para>
+        </td>
+        <td>
+          <para style="terp_default_Right_9"><font>[[ a['level1']&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font')  ]]</font><font>[[ formatLang(abs(a['balance1'])) ]] [[ company.currency_id.symbol ]]</font></para>
+        </td>
+        <td>
+          <para style="terp_default_9"><font face="Times-Roman">[[ repeatIn(get_lines(), 'a') ]]</font> <font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font')  ]]</font><font>[[ a['code'] ]]</font></para>
+        </td>
+        <td>
+          <para style="terp_default_9"><font color="white">[[  '. '*(a['level']-1) ]]</font><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font')  ]][[ a['name'] ]]</font></para>
+        </td>
+        <td>
+          <para style="terp_default_Right_9"><font>[[ a['level1']&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font')  ]]</font><font>[[ formatLang(abs(a['balance'])) ]] [[ company.currency_id.symbol ]]</font></para>
+        </td>
+     </tr>
+     </blockTable>
+     <blockTable colWidths="408.16,116.32,408.16,116.32" style="Table_Net_Profit_Loss">
+      <tr>
+        <td>
+          <para style="terp_default_Bold_9">Balance:([[ get_currency(data) ]])</para>
+        </td>
+        <td>
+          <para style="terp_default_Right_9_Bold"><u>[[ formatLang(abs(sum_cr())) ]] [[ company.currency_id.symbol ]]</u></para>
+        </td>
         <td>
           <para style="terp_default_Bold_9">Balance:([[ get_currency(data) ]]) </para>
         </td>
         <td>
           <para style="terp_default_Right_9_Bold"><u>[[ formatLang(abs(sum_dr())) ]] [[ company.currency_id.symbol ]]</u></para>
         </td>
-        <td>
-          <para style="terp_default_Bold_9">Balance:([[ get_currency(data) ]])</para>
-        </td>
-		<td>
-          <para style="terp_default_Right_9_Bold"><u>[[ formatLang(abs(sum_cr())) ]] [[ company.currency_id.symbol ]]</u></para>
-        </td>
-         </tr>
+      </tr>
     </blockTable>
     <para style="terp_default_Right_9">
       <font color="white"> </font>
diff --git a/addons/account/report/account_general_ledger.py b/addons/account/report/account_general_ledger.py
index 340cb991941..e49c47034fb 100644
--- a/addons/account/report/account_general_ledger.py
+++ b/addons/account/report/account_general_ledger.py
@@ -77,7 +77,7 @@ class general_ledger(rml_parse.rml_parse, common_report_header):
         })
         self.context = context
 
-    def _sum_currency_amount_account(self, account, form):
+    def _sum_currency_amount_account(self, account):
         self.cr.execute("SELECT sum(l.amount_currency) AS tot_currency "\
                 "FROM account_move_line l "\
                 "WHERE l.account_id = %s AND %s" %(account.id, self.query))
@@ -89,7 +89,7 @@ class general_ledger(rml_parse.rml_parse, common_report_header):
             sum_currency += self.cr.fetchone()[0] or 0.0
         return str(sum_currency)
 
-    def get_children_accounts(self, account, form):
+    def get_children_accounts(self, account):
         res = []
         ids_acc = self.pool.get('account.account')._get_children_and_consol(self.cr, self.uid, account.id)
         for child_account in self.pool.get('account.account').browse(self.cr, self.uid, ids_acc):
@@ -100,7 +100,7 @@ class general_ledger(rml_parse.rml_parse, common_report_header):
             """ % (self.query)
             self.cr.execute(sql, (child_account.id,))
             num_entry = self.cr.fetchone()[0] or 0
-            sold_account = self._sum_balance_account(child_account,form)
+            sold_account = self._sum_balance_account(child_account)
             self.sold_accounts[child_account.id] = sold_account
             if self.display_account == 'bal_movement':
                 if child_account.type != 'view' and num_entry <> 0 :
@@ -115,7 +115,7 @@ class general_ledger(rml_parse.rml_parse, common_report_header):
             return [account]
         return res
 
-    def lines(self, account, form):
+    def lines(self, account):
         """ Return all the account_move_line of account with their account code counterparts """
         # First compute all counterpart strings for every move_id where this account appear.
         # Currently, the counterpart info is used only in landscape mode
@@ -139,7 +139,7 @@ class general_ledger(rml_parse.rml_parse, common_report_header):
         sql = """
             SELECT l.id AS lid, l.date AS ldate, j.code AS lcode, l.amount_currency,l.ref AS lref, l.name AS lname, COALESCE(l.debit,0) AS debit, COALESCE(l.credit,0) AS credit, l.period_id AS lperiod_id, l.partner_id AS lpartner_id,
             m.name AS move_name, m.id AS mmove_id,
-            c.code AS currency_code,
+            c.symbol AS currency_code,
             i.id AS invoice_id, i.type AS invoice_type, i.number AS invoice_number,
             p.name AS partner_name
             FROM account_move_line l
@@ -191,7 +191,7 @@ class general_ledger(rml_parse.rml_parse, common_report_header):
                 self.tot_currency = self.tot_currency + l['amount_currency']
         return res
 
-    def _sum_debit_account(self, account, form):
+    def _sum_debit_account(self, account):
         self.cr.execute("SELECT sum(debit) "\
                 "FROM account_move_line l "\
                 "WHERE l.account_id = %s AND %s "%(account.id, self.query))
@@ -204,7 +204,7 @@ class general_ledger(rml_parse.rml_parse, common_report_header):
             sum_debit += self.cr.fetchone()[0] or 0.0
         return sum_debit
 
-    def _sum_credit_account(self, account, form):
+    def _sum_credit_account(self, account):
         self.cr.execute("SELECT sum(credit) "\
                 "FROM account_move_line l "\
                 "WHERE l.account_id = %s AND %s "%(account.id, self.query))
@@ -217,7 +217,7 @@ class general_ledger(rml_parse.rml_parse, common_report_header):
             sum_credit += self.cr.fetchone()[0] or 0.0
         return sum_credit
 
-    def _sum_balance_account(self, account, form):
+    def _sum_balance_account(self, account):
         self.cr.execute("SELECT (sum(debit) - sum(credit)) as tot_balance "\
                 "FROM account_move_line l "\
                 "WHERE l.account_id = %s AND %s"%(account.id, self.query))
diff --git a/addons/account/report/account_general_ledger.rml b/addons/account/report/account_general_ledger.rml
index 14a3ff8833c..1884c302209 100644
--- a/addons/account/report/account_general_ledger.rml
+++ b/addons/account/report/account_general_ledger.rml
@@ -3,9 +3,9 @@
   <template pageSize="(595.0,842.0)" title="General Ledger" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
-			<pageGraphics>
+      <pageGraphics>
 
-			</pageGraphics>
+      </pageGraphics>
     </pageTemplate>
   </template>
    <stylesheet>
@@ -174,7 +174,7 @@
     <paraStyle name="Caption" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="Index" fontName="Helvetica"/>
-	<paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+  <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
   </stylesheet>
   <story>
     <blockTable colWidths="539.0" style="Table_Company_Name">
@@ -190,45 +190,45 @@
    <para>[[ repeatIn(objects, 'a') ]]</para>
     <blockTable colWidths="80.0,70.0,70.0,80.0,100.0,70.0,80.0" style="Table2">
       <tr>
-      	<td><para style="terp_tblheader_General_Centre">Chart of Account</para></td>
+        <td><para style="terp_tblheader_General_Centre">Chart of Account</para></td>
         <td><para style="terp_tblheader_General_Centre">Fiscal Year</para></td>
-		<td><para style="terp_tblheader_General_Centre">Journals</para></td>
-		<td><para style="terp_tblheader_General_Centre">Display Account </para></td>
+    <td><para style="terp_tblheader_General_Centre">Journals</para></td>
+    <td><para style="terp_tblheader_General_Centre">Display Account </para></td>
         <td><para style="terp_tblheader_General_Centre">Filter By  [[ get_filter(data)!='No Filter' and get_filter(data) ]]</para></td>
          <td><para style="terp_tblheader_General_Centre">Entries Sorted By</para></td>
         <td><para style="terp_tblheader_General_Centre">Printing Date</para></td>
       </tr>
-	<tr>
-	   <td><para style="terp_default_Centre_8">[[ get_account(data) or removeParentNode('para') ]]</para></td>
+  <tr>
+     <td><para style="terp_default_Centre_8">[[ get_account(data) or removeParentNode('para') ]]</para></td>
        <td><para style="terp_default_Centre_8">[[ get_fiscalyear(data)  or '' ]]</para></td>
-		<td> <para style="terp_default_Centre_8">[[', '.join([ lt or '' for lt in get_journal(data) ]) ]] </para></td>
-		<td><para style="terp_default_Centre_8">[[ (data['form']['display_account']=='bal_all' and 'All') or  (data['form']['display_account']=='bal_movement' and 'With movements') or 'With balance is not equal to 0']]</para></td>
+    <td> <para style="terp_default_Centre_8">[[', '.join([ lt or '' for lt in get_journal(data) ]) ]] </para></td>
+    <td><para style="terp_default_Centre_8">[[ (data['form']['display_account']=='bal_all' and 'All') or  (data['form']['display_account']=='bal_movement' and 'With movements') or 'With balance is not equal to 0']]</para></td>
         <td><para style="terp_default_Centre_8">[[ get_filter(data)=='No Filter' and get_filter(data) or removeParentNode('para') ]] </para>
-        	<blockTable colWidths="50.0,50.0" style="Table3">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]]
-				<tr>
-	               <td><para style="terp_tblheader_Details_Centre">Start Date</para></td>
-	        		<td><para style="terp_tblheader_Details_Centre">End Date</para></td>
-	        	</tr>
-	        	<tr>
-	       		<td><para style="terp_default_Centre_8">[[ formatLang(get_start_date(data),date=True) ]]</para></td>
-	        		<td><para style="terp_default_Centre_8">[[ formatLang(get_end_date(data),date=True) ]]</para></td>
-	        	</tr>
-        	</blockTable>
-        	<blockTable colWidths="50.0,50.0" style="Table3">[[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]]
-				<tr>
-			        <td><para style="terp_tblheader_Details_Centre">Start Period</para></td>
-			        <td><para style="terp_tblheader_Details_Centre">End Period</para></td>
-	        	</tr>
-	        	<tr>
-			        <td><para style="terp_default_Centre_8">[[ get_start_period(data) or removeParentNode('para') ]]</para></td>
-			        <td><para style="terp_default_Centre_8">[[ get_end_period(data) or removeParentNode('para') ]]</para></td>
-	        	</tr>
-        	 </blockTable>
-        	</td>
+          <blockTable colWidths="50.0,50.0" style="Table3">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]]
+        <tr>
+                 <td><para style="terp_tblheader_Details_Centre">Start Date</para></td>
+              <td><para style="terp_tblheader_Details_Centre">End Date</para></td>
+            </tr>
+            <tr>
+             <td><para style="terp_default_Centre_8">[[ formatLang(get_start_date(data),date=True) ]]</para></td>
+              <td><para style="terp_default_Centre_8">[[ formatLang(get_end_date(data),date=True) ]]</para></td>
+            </tr>
+          </blockTable>
+          <blockTable colWidths="50.0,50.0" style="Table3">[[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]]
+        <tr>
+              <td><para style="terp_tblheader_Details_Centre">Start Period</para></td>
+              <td><para style="terp_tblheader_Details_Centre">End Period</para></td>
+            </tr>
+            <tr>
+              <td><para style="terp_default_Centre_8">[[ get_start_period(data) or removeParentNode('para') ]]</para></td>
+              <td><para style="terp_default_Centre_8">[[ get_end_period(data) or removeParentNode('para') ]]</para></td>
+            </tr>
+           </blockTable>
+          </td>
         <td><para style="terp_default_Centre_8">[[ get_sortby(data) ]]</para></td>
-	<td><para style="terp_default_Centre_8">[[ formatLang(time.strftime('%Y-%m-%d %H:%M:%S'), date_time = True) ]] </para></td>
-	</tr>
-	</blockTable>
+  <td><para style="terp_default_Centre_8">[[ formatLang(time.strftime('%Y-%m-%d %H:%M:%S'), date_time = True) ]] </para></td>
+  </tr>
+  </blockTable>
 
     <para>
       <font color="white"> </font>
@@ -237,7 +237,7 @@
       <font color="white"> </font>
     </para>
 
-   <blockTable colWidths="66.0,124.0,70.0,40.0,80.0,59.0,52.0,54.0" style="tbl_header" repeatRows="1">[[data['form']['amount_currency'] == False or removeParentNode('blockTable')]]
+   <blockTable colWidths="66.0,44.0,80.0,60.0,92.5,66.5,64.5,71.5" style="tbl_header" repeatRows="1">[[data['form']['amount_currency'] == False or removeParentNode('blockTable')]]
         <tr>
           <td><para style="date">Date</para></td>
           <td><para style="P3b">Partner</para></td>
@@ -250,44 +250,44 @@
         </tr>
      </blockTable>
       <section>
-     <para>[[ repeatIn(get_children_accounts(a,data['form']), 'o') ]]</para>
-     <blockTable colWidths="66.0,124.0,70.0,40.0,80.0,59.0,52.0,54.0" style="tbl_content">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
+     <para>[[ repeatIn(get_children_accounts(a), 'o') ]]</para>
+     <blockTable colWidths="66.0,44.0,80.0,60.0,92.5,66.5,64.5,71.5" style="tbl_content">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
         <tr>
           <td>
-	        <blockTable colWidths="280.0,100.0,52.5,52.5,52.5" style="Table5">
-			<tr>
-			  <td><para style="Standard">[[ o.code or '']] [[ o.name or '']]</para></td>
-			  <td><para style="Standard"></para></td>
-			  <td alignment="right"><para style="P9b"><u>[[formatLang(sum_debit_account(o, data['form'])) ]] [[ company.currency_id.symbol ]]</u></para></td>
-			  <td alignment="right"><para style="P9b"><u>[[formatLang(sum_credit_account(o, data['form'])) ]] [[ company.currency_id.symbol ]]</u></para></td>
-			  <td><para style="P9b"><u>[[formatLang(sum_balance_account(o, data['form'])) ]] [[ company.currency_id.symbol ]]</u></para></td>
-			</tr>
-			</blockTable>
-			</td>
-			<td><para style="Standard"></para></td>
-	    	<td><para style="Standard"></para></td>
-	    	<td><para style="Standard"></para></td>
-	    	<td><para style="Standard"></para></td>
-	    	<td><para style="Standard"></para></td>
-	    	<td><para style="Standard"></para></td>
-	    	<td><para style="Standard"></para></td>
-	    </tr>
-		<tr>
-			  <td><para style="P3">[[ repeatIn(lines(o, data['form']), 'line') ]] <font>[[ formatLang(line['ldate'],date=True) ]]</font></para></td>
-			  <td><para style="P3">[[ line['partner'] or '']]</para></td>
-			  <td><para style="P3">[[ line['lref'] or '']]</para></td>
-			  <td><para style="P3">[[ line['move'] or '']]</para></td>
-			  <td><para style="P3">[[ line['lname'] or '' ]]</para></td>
-			  <td><para style="P4">[[ formatLang(line['debit']) ]] [[ company.currency_id.symbol ]]</para></td>
-			  <td><para style="P4">[[ formatLang(line['credit']) ]] [[ company.currency_id.symbol ]]</para></td>
-			  <td><para style="P4">[[ formatLang(line['progress']) ]] [[ company.currency_id.symbol ]]</para></td>
-	   </tr>
-	  </blockTable>
+          <blockTable colWidths="245.0,92.5,66.5,64.5,71.5" style="Table5">
+      <tr>
+        <td><para style="Standard">[[ o.code or '']] [[ o.name or '']]</para></td>
+        <td><para style="Standard"></para></td>
+        <td alignment="right"><para style="P9b"><u>[[formatLang(sum_debit_account(o)) ]] [[ company.currency_id.symbol ]]</u></para></td>
+        <td alignment="right"><para style="P9b"><u>[[formatLang(sum_credit_account(o)) ]] [[ company.currency_id.symbol ]]</u></para></td>
+        <td><para style="P9b"><u>[[ formatLang(sum_balance_account(o)) ]] [[ company.currency_id.symbol ]]</u></para></td>
+      </tr>
+      </blockTable>
+      </td>
+      <td><para style="Standard"></para></td>
+        <td><para style="Standard"></para></td>
+        <td><para style="Standard"></para></td>
+        <td><para style="Standard"></para></td>
+        <td><para style="Standard"></para></td>
+        <td><para style="Standard"></para></td>
+        <td><para style="Standard"></para></td>
+      </tr>
+    <tr>
+        <td><para style="P3">[[ repeatIn(lines(o), 'line') ]] <font>[[ formatLang(line['ldate'],date=True) ]]</font></para></td>
+        <td><para style="P3">[[ line['partner'] or '']]</para></td>
+        <td><para style="P3">[[ line['lref'] or '']]</para></td>
+        <td><para style="P3">[[ line['move'] or '']]</para></td>
+        <td><para style="P3">[[ line['lname'] or '' ]]</para></td>
+        <td><para style="P4">[[ formatLang(line['debit']) ]] [[ company.currency_id.symbol ]]</para></td>
+        <td><para style="P4">[[ formatLang(line['credit']) ]] [[ company.currency_id.symbol ]]</para></td>
+        <td><para style="P4">[[ formatLang(line['progress']) ]] [[ company.currency_id.symbol ]]</para></td>
+     </tr>
+    </blockTable>
      </section>
 
 
 
-     <blockTable colWidths="72.0,93.0,65.0,38.0,85.0,49.0,49.0,49.0,40.0" style="tbl_header" repeatRows="1">[[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]]
+     <blockTable colWidths="70.0,40.0,60.0,55.0,89.0,58.0,58.0,58.0,58.0" style="tbl_header" repeatRows="1">[[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]]
         <tr>
           <td><para style="date">Date</para></td>
           <td><para style="P3b">Partner</para></td>
@@ -301,42 +301,42 @@
         </tr>
      </blockTable>
      <section>
-     <para>[[ repeatIn(get_children_accounts(a,data['form']), 'o') ]]</para>
-     <blockTable colWidths="72.0,93.0,65.0,40.0,89.0,49.0,49.0,49.0,50.0" style="tbl_content">[[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]]
+     <para>[[ repeatIn(get_children_accounts(a), 'o') ]]</para>
+     <blockTable colWidths="70.0,40.0,60.0,55.0,89.0,58.0,58.0,58.0,58.0" style="tbl_content">[[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]]
        <tr>
           <td>
-	      	<blockTable colWidths="260.00,93.0,49.0,49.0,48.0,40.00" style="Table5">
-			<tr>
-			  <td><para style="Standard">[[ o.code or '' ]] [[ o.name or '' ]]</para></td>
-			  <td><para style="Standard"></para></td>
-			  <td alignment="right"><para style="P9b"><u>[[formatLang(sum_debit_account(o, data['form'])) ]] [[ company.currency_id.symbol ]]</u></para></td>
-			  <td alignment="right"><para style="P9b"><u>[[formatLang(sum_credit_account(o, data['form'])) ]] [[ company.currency_id.symbol ]]</u></para></td>
-			  <td><para style="P9b"><u>[[formatLang(sum_balance_account(o, data['form'])) ]] [[ company.currency_id.symbol ]]</u></para></td>
-			 <td><para style="P9b"><u>[[ o.currency_id and sum_currency_amount_account(o, data['form']) +o.currency_id.code or '' ]]</u></para></td>
-			</tr>
-			</blockTable>
-		  </td>
-		  <td><para style="Standard"></para></td>
-	      <td><para style="Standard"></para></td>
-	      <td><para style="Standard"></para></td>
-	      <td><para style="Standard"></para></td>
-	      <td><para style="Standard"></para></td>
-	      <td><para style="Standard"></para></td>
-	      <td><para style="Standard"></para></td>
-	      <td><para style="Standard"></para></td>
-	    </tr>
-		<tr>
-		   <td><para style="P3">[[ repeatIn(lines(o, data['form']), 'line') ]] <font>[[ formatLang(line['ldate'],date=True) ]]</font></para></td>
-		   <td><para style="P3">[[ line['partner'] or '' ]]</para></td>
-		   <td><para style="P3">[[ line['lref'] or '']]</para></td>
-		   <td><para style="P3">[[ line['move'] or '' ]]</para></td>
-		   <td><para style="P3">[[ line['lname'] or '' ]]</para></td>
-		   <td><para style="P4">[[ formatLang(line['debit']) ]] [[ company.currency_id.symbol ]]</para></td>
-		   <td><para style="P4">[[ formatLang(line['credit']) ]] [[ company.currency_id.symbol ]]</para></td>
-		   <td><para style="P4">[[ formatLang(line['progress']) ]] [[ company.currency_id.symbol ]]</para></td>
-		   <td><para style="P4">[[  formatLang(line['amount_currency'] or '') ]] [[ line['currency_code'] or '']]</para></td>
-		 </tr>
-	</blockTable>
-	</section>
+          <blockTable colWidths="230.00,74.0,55.5,60.5,60.5,65.5" style="Table5">
+              <tr>
+                <td><para style="Standard">[[ o.code or '' ]] [[ o.name or '' ]]</para></td>
+                <td><para style="Standard"></para></td>
+                <td alignment="right"><para style="P9b"><u>[[formatLang(sum_debit_account(o)) ]] [[ company.currency_id.symbol ]]</u></para></td>
+                <td alignment="right"><para style="P9b"><u>[[formatLang(sum_credit_account(o)) ]] [[ company.currency_id.symbol ]]</u></para></td>
+                <td><para style="P9b"><u>[[formatLang(sum_balance_account(o)) ]] [[ company.currency_id.symbol ]]</u></para></td>
+               <td><para style="P9b"><u>[[ o.currency_id and sum_currency_amount_account(o) +o.currency_id.symbol or '' ]]</u></para></td>
+              </tr>
+          </blockTable>
+      </td>
+      <td><para style="Standard"></para></td>
+        <td><para style="Standard"></para></td>
+        <td><para style="Standard"></para></td>
+        <td><para style="Standard"></para></td>
+        <td><para style="Standard"></para></td>
+        <td><para style="Standard"></para></td>
+        <td><para style="Standard"></para></td>
+        <td><para style="Standard"></para></td>
+      </tr>
+    <tr>
+       <td><para style="P3">[[ repeatIn(lines(o), 'line') ]] <font>[[ formatLang(line['ldate'],date=True) ]]</font></para></td>
+       <td><para style="P3">[[ line['partner'] or '' ]]</para></td>
+       <td><para style="P3">[[ line['lref'] or '']]</para></td>
+       <td><para style="P3">[[ line['move'] or '' ]]</para></td>
+       <td><para style="P3">[[ line['lname'] or '' ]]</para></td>
+       <td><para style="P4">[[ formatLang(line['debit']) ]] [[ company.currency_id.symbol ]]</para></td>
+       <td><para style="P4">[[ formatLang(line['credit']) ]] [[ company.currency_id.symbol ]]</para></td>
+       <td><para style="P4">[[ formatLang(line['progress']) ]] [[ company.currency_id.symbol ]]</para></td>
+       <td><para style="P4">[[  formatLang(line['amount_currency'] or '') ]] [[ line['currency_code'] or '']]</para></td>
+     </tr>
+  </blockTable>
+  </section>
   </story>
 </document>
diff --git a/addons/account/report/account_general_ledger_landscape.rml b/addons/account/report/account_general_ledger_landscape.rml
index 43aa96b1508..11065d3fc49 100644
--- a/addons/account/report/account_general_ledger_landscape.rml
+++ b/addons/account/report/account_general_ledger_landscape.rml
@@ -175,7 +175,7 @@
     <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="Index" fontName="Helvetica"/>
     <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="0.0"/>
-	<paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
+  <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
   </stylesheet>
   <story>
     <blockTable colWidths="539.0" style="Table_Company_Name">
@@ -193,46 +193,46 @@
       <blockTable colWidths="200.0,130.0,200.0,150.0,150.0,100.0,110.0" style="Table2">
       <tr>
       <td><para style="terp_tblheader_General_Centre">[[ data['model']=='account.account' and 'Company' or removeParentNode('para') ]]</para>
-      	<para style="terp_tblheader_General_Centre"> [[ data['model']=='ir.ui.menu' and 'Chart of Account' or removeParentNode('para') ]]</para></td>
+        <para style="terp_tblheader_General_Centre"> [[ data['model']=='ir.ui.menu' and 'Chart of Account' or removeParentNode('para') ]]</para></td>
         <td><para style="terp_tblheader_General_Centre">Fiscal Year</para></td>
-       	<td><para style="terp_tblheader_General_Centre">Journals</para></td>
-		<td><para style="terp_tblheader_General_Centre">Display Account</para></td>
+         <td><para style="terp_tblheader_General_Centre">Journals</para></td>
+    <td><para style="terp_tblheader_General_Centre">Display Account</para></td>
         <td><para style="terp_tblheader_General_Centre">Filter By  [[ get_filter(data)!='No Filter' and get_filter(data) ]]</para></td>
          <td><para style="terp_tblheader_General_Centre">Entries Sorted By</para></td>
         <td><para style="terp_tblheader_General_Centre">Printing Date</para></td>
       </tr>
-	<tr>
-	   <td><para style="terp_default_Centre_8">[[ get_account(data) or removeParentNode('para') ]]</para></td>
+  <tr>
+     <td><para style="terp_default_Centre_8">[[ get_account(data) or removeParentNode('para') ]]</para></td>
        <td><para style="terp_default_Centre_8">[[ get_fiscalyear(data)  or '' ]]</para></td>
        <td> <para style="terp_default_Centre_8">[[', '.join([ lt or '' for lt in get_journal(data) ]) ]] </para></td>
-		<td><para style="terp_default_Centre_8">[[ (data['form']['display_account']=='bal_all' and 'All') or  (data['form']['display_account']=='bal_movement' and 'With movements') or 'With balance is not equal to 0']]</para></td>
+    <td><para style="terp_default_Centre_8">[[ (data['form']['display_account']=='bal_all' and 'All') or  (data['form']['display_account']=='bal_movement' and 'With movements') or 'With balance is not equal to 0']]</para></td>
 
         <td><para style="terp_default_Centre_8">[[ get_filter(data)=='No Filter' and get_filter(data) or removeParentNode('para') ]] </para>
-        	<blockTable colWidths="60.0,60.0" style="Table3">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]]
-				<tr>
-	               <td><para style="terp_tblheader_General_Centre">Start Date</para></td>
-	        		<td><para style="terp_tblheader_General_Centre">End Date</para></td>
-	        	</tr>
-	        	<tr>
-	        		<td><para style="terp_default_Centre_8">[[ formatLang(get_start_date(data),date=True) ]]</para></td>
-	        		<td><para style="terp_default_Centre_8">[[ formatLang(get_end_date(data),date=True) ]]</para></td>
-	        	</tr>
-        	</blockTable>
-        	<blockTable colWidths="60.0,60.0" style="Table3">[[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]]
-				<tr>
-			        <td><para style="terp_tblheader_General_Centre">Start Period</para></td>
-			        <td><para style="terp_tblheader_General_Centre">End Period</para></td>
-	        	</tr>
-	        	<tr>
-			        <td><para style="terp_default_Centre_8">[[ get_start_period(data) or removeParentNode('para') ]]</para></td>
-			        <td><para style="terp_default_Centre_8">[[ get_end_period(data) or removeParentNode('para') ]]</para></td>
-	        	</tr>
-        	 </blockTable>
-        	</td>
+          <blockTable colWidths="60.0,60.0" style="Table3">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]]
+        <tr>
+                 <td><para style="terp_tblheader_General_Centre">Start Date</para></td>
+              <td><para style="terp_tblheader_General_Centre">End Date</para></td>
+            </tr>
+            <tr>
+              <td><para style="terp_default_Centre_8">[[ formatLang(get_start_date(data),date=True) ]]</para></td>
+              <td><para style="terp_default_Centre_8">[[ formatLang(get_end_date(data),date=True) ]]</para></td>
+            </tr>
+          </blockTable>
+          <blockTable colWidths="60.0,60.0" style="Table3">[[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]]
+        <tr>
+              <td><para style="terp_tblheader_General_Centre">Start Period</para></td>
+              <td><para style="terp_tblheader_General_Centre">End Period</para></td>
+            </tr>
+            <tr>
+              <td><para style="terp_default_Centre_8">[[ get_start_period(data) or removeParentNode('para') ]]</para></td>
+              <td><para style="terp_default_Centre_8">[[ get_end_period(data) or removeParentNode('para') ]]</para></td>
+            </tr>
+           </blockTable>
+          </td>
         <td><para style="terp_default_Centre_8">[[ get_sortby(data) ]]</para></td>
-	<td><para style="terp_default_Centre_8">[[ formatLang(time.strftime('%Y-%m-%d %H:%M:%S'), date_time = True) ]] </para></td>
-	</tr>
-	</blockTable>
+  <td><para style="terp_default_Centre_8">[[ formatLang(time.strftime('%Y-%m-%d %H:%M:%S'), date_time = True) ]] </para></td>
+  </tr>
+  </blockTable>
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
@@ -240,7 +240,7 @@
       <font color="white"> </font>
     </para>
 
-   	<blockTable colWidths="66.0,35.0,150.0, 90.0,60.0,300.0,80.0,69.0,72.0,64.0,58.0" style="tbl_header" repeatRows="1">[[data['form']['amount_currency'] == True or removeParentNode('blockTable')]]
+   	<blockTable colWidths="66.0,35.0,120.0,90.0,60.0,230.0,150.0,73.0,73.0,73.0,85.00" style="tbl_header" repeatRows="1">[[data['form']['amount_currency'] == True or removeParentNode('blockTable')]]
        <tr>
           <td><para style="date">Date</para></td>
           <td><para style="P2">JNRL</para></td>
@@ -257,19 +257,19 @@
     </blockTable>
      <section>
 
-      <para>[[ repeatIn(get_children_accounts(a,data['form']), 'o') ]]</para>
+      <para>[[ repeatIn(get_children_accounts(a), 'o') ]]</para>
 
-      <blockTable colWidths="66.0,35.0,150.0, 90.0,60.0,300.0,80.0,69.0,72.0,64.0,62.0" style="tbl_content">[[data['form']['amount_currency'] == True or removeParentNode('blockTable')]]
+      <blockTable colWidths="66.0,35.0,120.0,90.0,60.0,230.0,150.0,73.0,73.0,73.0,85.00" style="tbl_content">[[data['form']['amount_currency'] == True or removeParentNode('blockTable')]]
       	<tr>
         	<td>
-          		<blockTable colWidths="404.0,372.0,69.0,72.0,64.0,59.00" style="Table5">
+          		<blockTable colWidths="404.0,335.0,75.0,75.0,75.0,79.00" style="Table5">
 	        		<tr>
 		    			<td><para style="Standard">[[ o.code ]] [[ o.name ]]</para></td>
 		    			<td><para style="Standard"></para></td>
-					  	<td alignment="right"><para style="P9b"><u>[[formatLang(sum_debit_account(o, data['form'])) ]] [[ company.currency_id.symbol ]]</u></para></td>
-					  	<td alignment="right"><para style="P9b"><u>[[formatLang(sum_credit_account(o, data['form'])) ]] [[ company.currency_id.symbol ]]</u></para></td>
-			  			<td><para style="P9b"><u>[[formatLang(sum_balance_account(o, data['form'])) ]] [[ company.currency_id.symbol ]]</u></para></td>
-			  			<td><para style="P9b"><u>[[ o.currency_id and sum_currency_amount_account(o, data['form']) +o.currency_id.code or '' ]]</u></para></td>
+					  	<td alignment="right"><para style="P9b"><u>[[formatLang(sum_debit_account(o)) ]] [[ company.currency_id.symbol ]]</u></para></td>
+					  	<td alignment="right"><para style="P9b"><u>[[formatLang(sum_credit_account(o)) ]] [[ company.currency_id.symbol ]]</u></para></td>
+			  			<td><para style="P9b"><u>[[formatLang(sum_balance_account(o)) ]] [[ company.currency_id.symbol ]]</u></para></td>
+			  			<td><para style="P9b"><u>[[ o.currency_id and sum_currency_amount_account(o) +o.currency_id.code or '' ]]</u></para></td>
 		   			</tr>
 	    		</blockTable>
 	    	</td>
@@ -284,14 +284,14 @@
 	    	<td><para style="Standard"></para></td>
 	    	<td><para style="Standard"></para></td>
 	   	</tr>
-	   	<tr><para style="P2_content">[[ repeatIn(lines(o, data['form']), 'line') ]]</para>
+	   	<tr><para style="P2_content">[[ repeatIn(lines(o), 'line') ]]</para>
 			<td><para style="P2_content"> [[ formatLang(line['ldate'],date=True) ]]</para></td>
 			<td><para style="P2_content">[[ line['lcode'] ]]</para></td>
 			<td><para style="P2_content">[[ line['partner_name'] ]]</para></td>
 			<td><para style="P2_content">[[ line['lref'] ]]</para></td>
 			<td><para style="P2_content">[[ line['move'] ]]</para></td>
 			<td><para style="P3_content">[[ line['lname'] ]]</para></td>
-			<td><para style="P3_content_center">[[ strip_name(line['line_corresp'],15) ]]</para></td>
+			<td><para style="P3_content_center">[[ strip_name(line['line_corresp'].replace(', ',','),40) ]]</para></td>
 			<td><para style="P4_content">[[ formatLang(line['debit']) ]] [[ company.currency_id.symbol ]]</para></td>
 			<td><para style="P4_content">[[ formatLang(line['credit']) ]] [[ company.currency_id.symbol ]]</para></td>
 			<td><para style="P4_content">[[ formatLang(line['progress']) ]] [[ company.currency_id.symbol ]]</para></td>
@@ -318,7 +318,7 @@
 
 	<section>
 
-		<para>[[ repeatIn(get_children_accounts(a,data['form']), 'o') ]]</para>
+		<para>[[ repeatIn(get_children_accounts(a), 'o') ]]</para>
 
 		<blockTable colWidths="66.0,35.0,166.0,90.0,60.0,348.0,80.0,69.0,72.0,64.0" style="tbl_content">[[data['form']['amount_currency'] == False or removeParentNode('blockTable')]]
         	<tr>
@@ -327,9 +327,9 @@
 						<tr>
 			 	 			<td><para style="Standard">[[ o.code ]] [[ o.name ]]</para></td>
 			  				<td><para style="Standard"></para></td>
-						  	<td alignment="right"><para style="P9b"><u>[[formatLang(sum_debit_account(o, data['form'])) ]] [[ company.currency_id.symbol ]]</u></para></td>
-					  		<td alignment="right"><para style="P9b"><u>[[formatLang(sum_credit_account(o, data['form'])) ]] [[ company.currency_id.symbol ]]</u></para></td>
-			  				<td><para style="P9b"><u>[[formatLang(sum_balance_account(o, data['form'])) ]] [[ company.currency_id.symbol ]]</u></para></td>
+						  	<td alignment="right"><para style="P9b"><u>[[formatLang(sum_debit_account(o)) ]] [[ company.currency_id.symbol ]]</u></para></td>
+					  		<td alignment="right"><para style="P9b"><u>[[formatLang(sum_credit_account(o)) ]] [[ company.currency_id.symbol ]]</u></para></td>
+			  				<td><para style="P9b"><u>[[formatLang(sum_balance_account(o)) ]] [[ company.currency_id.symbol ]]</u></para></td>
 						</tr>
 					</blockTable>
 		 		</td>
@@ -344,7 +344,7 @@
 	    		<td><para style="Standard"></para></td>
 			</tr>
 			<tr>
-				<td><para style="P2_content">[[ repeatIn(lines(o, data['form']), 'line') ]]<font>[[ line['ldate'] and formatLang(line['ldate'],date=True) or removeParentNode('tr') ]]</font></para></td>
+				<td><para style="P2_content">[[ repeatIn(lines(o), 'line') ]]<font>[[ line['ldate'] and formatLang(line['ldate'],date=True) or removeParentNode('tr') ]]</font></para></td>
 				<para>[[ line or removeParentNode('tr')</para>
 				<td><para style="P2_content">[[ line['lcode'] ]]</para></td>
 				<td><para style="P2_content">[[ line['partner'] ]]</para></td>
diff --git a/addons/account/report/account_invoice_report.py b/addons/account/report/account_invoice_report.py
index c07ce03c2bf..d09be0fb331 100644
--- a/addons/account/report/account_invoice_report.py
+++ b/addons/account/report/account_invoice_report.py
@@ -39,7 +39,7 @@ class account_invoice_report(osv.osv):
         'uom_name': fields.char('Default UoM', size=128, readonly=True),
         'payment_term': fields.many2one('account.payment.term', 'Payment Term', readonly=True),
         'period_id': fields.many2one('account.period', 'Force Period', domain=[('state','<>','done')], readonly=True),
-        'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Position', readonly=True),
+        'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Mapping', readonly=True),
         'currency_id': fields.many2one('res.currency', 'Currency', readonly=True),
         'categ_id': fields.many2one('product.category','Category of Product', readonly=True),
         'journal_id': fields.many2one('account.journal', 'Journal', readonly=True),
diff --git a/addons/account/report/account_journal.py b/addons/account/report/account_journal.py
index 1ed15f60b6f..9f050756a5e 100644
--- a/addons/account/report/account_journal.py
+++ b/addons/account/report/account_journal.py
@@ -54,6 +54,7 @@ class journal_print(report_sxw.rml_parse, common_report_header):
     def set_context(self, objects, data, ids, report_type=None):
         new_ids = ids
         self.query_get_clause = ''
+        self.target_move = data['form'].get('target_move', 'all')
         if (data['model'] == 'ir.ui.menu'):
             new_ids = data['form'].get('active_ids', [])
             self.query_get_clause = 'AND '
@@ -66,6 +67,46 @@ class journal_print(report_sxw.rml_parse, common_report_header):
             self.period_ids, self.journal_ids = zip(*res)
         return super(journal_print, self).set_context(objects, data, ids, report_type=report_type)
 
+    def _sum_debit(self, period_id=False, journal_id=False):
+        if journal_id and isinstance(journal_id, int):
+            journal_id = [journal_id]
+        if period_id and isinstance(period_id, int):
+            period_id = [period_id]
+        if not journal_id:
+            journal_id = self.journal_ids
+        if not period_id:
+            period_id = self.period_ids
+        if not (period_id and journal_id):
+            return 0.0
+        move_state = ['draft','posted']
+        if self.target_move == 'posted':
+            move_state = ['posted']
+
+        self.cr.execute('SELECT SUM(debit) FROM account_move_line l , account_move am '
+                        'WHERE l.move_id=am.id AND am.state IN %s AND l.period_id IN %s AND l.journal_id IN %s ' + self.query_get_clause + ' ',
+                        (tuple(move_state), tuple(period_id), tuple(journal_id)))
+        return self.cr.fetchone()[0] or 0.0
+
+    def _sum_credit(self, period_id=False, journal_id=False):
+        if journal_id and isinstance(journal_id, int):
+            journal_id = [journal_id]
+        if period_id and isinstance(period_id, int):
+            period_id = [period_id]
+        if not journal_id:
+            journal_id = self.journal_ids
+        if not period_id:
+            period_id = self.period_ids
+        if not (period_id and journal_id):
+            return 0.0
+        move_state = ['draft','posted']
+        if self.target_move == 'posted':
+            move_state = ['posted']
+
+        self.cr.execute('SELECT SUM(l.credit) FROM account_move_line l, account_move am '
+                        'WHERE l.move_id=am.id AND am.state IN %s AND l.period_id IN %s AND l.journal_id IN %s '+ self.query_get_clause+'',
+                        (tuple(move_state), tuple(period_id), tuple(journal_id)))
+        return self.cr.fetchone()[0] or 0.0
+
     def lines(self, period_id, journal_id=False):
         if not journal_id:
             journal_id = self.journal_ids
@@ -74,7 +115,12 @@ class journal_print(report_sxw.rml_parse, common_report_header):
         obj_mline = self.pool.get('account.move.line')
         self.cr.execute('update account_journal_period set state=%s where journal_id IN %s and period_id=%s and state=%s', ('printed', self.journal_ids, period_id, 'draft'))
         self.cr.commit()
-        self.cr.execute('SELECT id FROM account_move_line l WHERE period_id=%s AND journal_id IN %s ' + self.query_get_clause + ' ORDER BY '+ self.sort_selection + '' ,(period_id, tuple(journal_id) ))
+        
+        move_state = ['draft','posted']
+        if self.target_move == 'posted':
+            move_state = ['posted']
+
+        self.cr.execute('SELECT l.id FROM account_move_line l, account_move am WHERE l.move_id=am.id AND am.state IN %s AND l.period_id=%s AND l.journal_id IN %s ' + self.query_get_clause + ' ORDER BY l.'+ self.sort_selection + '' ,(tuple(move_state), period_id, tuple(journal_id) ))
         ids = map(lambda x: x[0], self.cr.fetchall())
         return obj_mline.browse(self.cr, self.uid, ids)
 
diff --git a/addons/account/report/account_journal.rml b/addons/account/report/account_journal.rml
index a4c65d8b4a3..41261a12c1a 100644
--- a/addons/account/report/account_journal.rml
+++ b/addons/account/report/account_journal.rml
@@ -252,10 +252,10 @@
         <td><para style="P10">Entry No</para></td>
         <td><para style="P10">A/c No.</para></td>
         <td><para style="P10a">Partner</para></td>
-        <td><para style="P10a">Entry label</para></td>
-        <td><para style="P10b">Debit<font size="8.0">([[ company.currency_id.code]])</font></para></td>
-        <td><para style="P10b">Credit<font size="8.0">([[ company.currency_id.code]])</font></para></td>
-        <td><para style="P10b">Balance<font size="8.0">([[ company.currency_id.code]])</font></para></td>
+        <td><para style="P10a">Move - Entry label</para></td>
+        <td><para style="P10b">Debit([[ company.currency_id.code]])</para></td>
+        <td><para style="P10b">Credit([[ company.currency_id.code]])</para></td>
+        <td><para style="P10b">Balance([[ company.currency_id.code]])</para></td>
       </tr>
        <tr>
         <td><para style="P11">[[o.period_id.name ]]</para></td>
@@ -273,7 +273,7 @@
         <td><para style="terp_default_Centre_8">[[ line.ref ]]</para></td>
         <td><para style="terp_default_Centre_8">[[ line.account_id.code ]]</para></td>
         <td><para style="terp_default_8">[[ line.partner_id and line.partner_id.name ]]</para></td>
-        <td><para style="terp_default_8">[[ line.name ]]</para></td>
+        <td><para style="terp_default_8">[[ line.move_id.name ]] - [[ line.name ]]</para></td>
         <td><para style="P8">[[ formatLang(line.debit) ]] [[ company.currency_id.symbol ]]</para></td>
         <td><para style="P8">[[ formatLang(line.credit) ]] [[ company.currency_id.symbol ]]</para></td>
         <td><para style="P8">[[ formatLang(line.credit - line.debit) ]] [[ company.currency_id.symbol ]]</para></td>
@@ -287,7 +287,7 @@
         <td><para style="P10">Entry No</para></td>
         <td><para style="P10">A/c No.</para></td>
         <td><para style="P10a">Partner</para></td>
-        <td><para style="P10a">Entry label</para></td>
+        <td><para style="P10a">Move - Entry label</para></td>
         <td><para style="P10b">Debit<font size="8.0">([[ company.currency_id.code]])</font></para></td>
         <td><para style="P10b">Credit<font size="8.0">([[ company.currency_id.code]])</font></para></td>
    		<td><para style="P10b">Balance<font size="8.0">([[ company.currency_id.code]])</font></para></td>
@@ -309,11 +309,11 @@
         <td><para style="terp_default_Centre_8">[[ line.ref ]]</para></td>
         <td><para style="terp_default_Centre_8">[[ line.account_id.code ]]</para></td>
         <td><para style="terp_default_8">[[ line.partner_id and line.partner_id.name ]]</para></td>
-        <td><para style="terp_default_8">[[ line.name ]]</para></td>
+        <td><para style="terp_default_8">[[ line.move_id.name ]] - [[ line.name ]]</para></td>
         <td><para style="P8">[[ formatLang(line.debit) ]] [[ company.currency_id.symbol ]]</para></td>
         <td><para style="P8">[[ formatLang(line.credit) ]] [[ company.currency_id.symbol ]]</para></td>
         <td><para style="P8">[[ formatLang(line.credit - line.debit) ]] [[ company.currency_id.symbol ]]</para></td>
-		<td><para style="P8">[[ line.currency_id  and formatLang(line.amount_currency) or '' ]] [[ line.currency_id.code or '']]</para></td>
+		<td><para style="P8">[[ line.currency_id  and formatLang(line.amount_currency) or '' ]] [[ line.currency_id.symbol or '']]</para></td>
 
       </tr>
     </blockTable>
diff --git a/addons/account/report/account_partner_balance.py b/addons/account/report/account_partner_balance.py
index 83e9f03e0a4..4ce8eeb986c 100644
--- a/addons/account/report/account_partner_balance.py
+++ b/addons/account/report/account_partner_balance.py
@@ -104,6 +104,7 @@ class partner_balance(report_sxw.rml_parse, common_report_header):
         self.query = data['form'].get('query_line', '')
         self.init_query = data['form'].get('initial_bal_query', '')
         self.result_selection = data['form'].get('result_selection')
+        self.target_move = data['form'].get('target_move', 'all')
 
         if (self.result_selection == 'customer' ):
             self.ACCOUNT_TYPE = ('receivable',)
@@ -122,6 +123,10 @@ class partner_balance(report_sxw.rml_parse, common_report_header):
         return super(partner_balance, self).set_context(objects, data, ids, report_type=report_type)
 
     def lines(self):
+        move_state = ['draft','posted']
+        if self.target_move == 'posted':
+            move_state = ['posted']
+
         full_account = []
         result_tmp = 0.0
         self.cr.execute(
@@ -142,11 +147,13 @@ class partner_balance(report_sxw.rml_parse, common_report_header):
                     ") AS enlitige " \
             "FROM account_move_line l LEFT JOIN res_partner p ON (l.partner_id=p.id) " \
             "JOIN account_account ac ON (l.account_id = ac.id)" \
+            "JOIN account_move am ON (am.id = l.move_id)" \
             "WHERE ac.type IN %s " \
+            "AND am.state IN %s " \
             "AND " + self.query + "" \
             "GROUP BY p.id, p.ref, p.name,l.account_id,ac.name,ac.code " \
             "ORDER BY l.account_id,p.name",
-            (self.ACCOUNT_TYPE,))
+            (self.ACCOUNT_TYPE, tuple(move_state)))
         res = self.cr.dictfetchall()
 
         #For include intial balance..
@@ -212,6 +219,10 @@ class partner_balance(report_sxw.rml_parse, common_report_header):
         else:
             full_account = [r for r in res]
 
+        for rec in full_account:
+            if not rec.get('name', False):
+                rec.update({'name': 'Unknown Partner'})
+                
         ## We will now compute Total
         subtotal_row = self._add_subtotal(full_account)
 #        if not self.initial_balance:
@@ -344,15 +355,21 @@ class partner_balance(report_sxw.rml_parse, common_report_header):
         return completearray
 
     def _sum_debit(self):
+        move_state = ['draft','posted']
+        if self.target_move == 'posted':
+            move_state = ['posted']
+
         if not self.ids:
             return 0.0
         temp_res = 0.0
         self.cr.execute(
                 "SELECT sum(debit) " \
                 "FROM account_move_line AS l " \
+                "JOIN account_move am ON (am.id = l.move_id)" \
                 "WHERE l.account_id IN %s"  \
+                    "AND am.state IN %s" \
                     "AND " + self.query + "" ,
-                    (tuple(self.account_ids), ))
+                    (tuple(self.account_ids), tuple(move_state)))
         temp_res = float(self.cr.fetchone()[0] or 0.0)
 #        if self.initial_balance:
 #            self.cr.execute(
@@ -365,15 +382,21 @@ class partner_balance(report_sxw.rml_parse, common_report_header):
         return temp_res
 
     def _sum_credit(self):
+        move_state = ['draft','posted']
+        if self.target_move == 'posted':
+            move_state = ['posted']
+
         if not self.ids:
             return 0.0
         temp_res = 0.0
         self.cr.execute(
                 "SELECT sum(credit) " \
                 "FROM account_move_line AS l " \
+                "JOIN account_move am ON (am.id = l.move_id)" \
                 "WHERE l.account_id IN %s" \
+                    "AND am.state IN %s" \
                     "AND " + self.query + "" ,
-                    (tuple(self.account_ids),))
+                    (tuple(self.account_ids), tuple(move_state)))
         temp_res = float(self.cr.fetchone()[0] or 0.0)
 #        if self.initial_balance:
 #            self.cr.execute(
@@ -386,16 +409,22 @@ class partner_balance(report_sxw.rml_parse, common_report_header):
         return temp_res
 
     def _sum_litige(self):
+        move_state = ['draft','posted']
+        if self.target_move == 'posted':
+            move_state = ['posted']
+
         if not self.ids:
             return 0.0
         temp_res = 0.0
         self.cr.execute(
                 "SELECT sum(debit-credit) " \
                 "FROM account_move_line AS l " \
+                "JOIN account_move am ON (am.id = l.move_id)" \
                 "WHERE l.account_id IN %s" \
+                    "AND am.state IN %s" \
                     "AND " + self.query + " " \
                     "AND l.blocked=TRUE ",
-                    (tuple(self.account_ids), ))
+                    (tuple(self.account_ids), tuple(move_state), ))
         temp_res = float(self.cr.fetchone()[0] or 0.0)
 #        if self.initial_balance:
 #            self.cr.execute(
@@ -409,6 +438,10 @@ class partner_balance(report_sxw.rml_parse, common_report_header):
         return temp_res
 
     def _sum_sdebit(self):
+        move_state = ['draft','posted']
+        if self.target_move == 'posted':
+            move_state = ['posted']
+
         if not self.ids:
             return 0.0
         result_tmp = 0.0
@@ -419,10 +452,12 @@ class partner_balance(report_sxw.rml_parse, common_report_header):
                     "ELSE 0 " \
                 "END " \
             "FROM account_move_line AS l " \
+            "JOIN account_move am ON (am.id = l.move_id)" \
             "WHERE l.account_id IN %s" \
+                "AND am.state IN %s" \
                 "AND " + self.query + " " \
             "GROUP BY l.partner_id",
-            (tuple(self.account_ids),))
+            (tuple(self.account_ids), tuple(move_state),))
         a = self.cr.fetchone()[0]
 
         if self.cr.fetchone() != None:
@@ -432,6 +467,10 @@ class partner_balance(report_sxw.rml_parse, common_report_header):
         return result_tmp
 
     def _sum_scredit(self):
+        move_state = ['draft','posted']
+        if self.target_move == 'posted':
+            move_state = ['posted']
+
         if not self.ids:
             return 0.0
         result_tmp = 0.0
@@ -443,9 +482,11 @@ class partner_balance(report_sxw.rml_parse, common_report_header):
                 "END " \
             "FROM account_move_line AS l " \
             "WHERE l.account_id IN %s" \
+             "JOIN account_move am ON (am.id = l.move_id)" \
+             "AND am.state IN %s" \
             "AND " + self.query + " " \
             "GROUP BY l.partner_id",
-            (tuple(self.account_ids), ))
+            (tuple(self.account_ids), tuple(move_state), ))
         a = self.cr.fetchone()[0] or 0.0
         if self.cr.fetchone() != None:
             result_tmp = result_tmp + (a or 0.0)
diff --git a/addons/account/report/account_partner_balance.rml b/addons/account/report/account_partner_balance.rml
index 7632c88e65f..c5ea2946507 100644
--- a/addons/account/report/account_partner_balance.rml
+++ b/addons/account/report/account_partner_balance.rml
@@ -244,14 +244,6 @@
         <td><para style="P8"><u>[[ formatLang((solde_debit()-solde_credit())) ]] [[ company.currency_id.symbol ]]</u></para></td>
         <td><para style="P8"><u>[[ formatLang(sum_litige()) ]] [[ company.currency_id.symbol ]]</u></para></td>
       </tr>
-      <tr>
-        <td><para style="P7">Balance<font size="8.0">([[ company.currency_id.code]]) :</font></para></td>
-        <td><para style="P8"></para></td>
-        <td><para style="P8">[[ formatLang(solde_debit()) ]] [[ company.currency_id.symbol ]]</para></td>
-        <td><para style="P8">[[ formatLang(solde_credit()) ]] [[ company.currency_id.symbol ]]</para></td>
-        <td><para style="P8"></para></td>
-        <td><para style="P8"></para></td>
-      </tr>
       <tr>
         <td><para style="P3">[[ repeatIn(lines(), 'a') ]]<font>[[ (a['type']==3 and setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font><font>[[ a['ref'] ]] [[ a['type']==3 and a['code'] ]]</font></para></td>
         <td><para style="P3"><font>[[ (a['type']==3 and setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font>[[ a['name'] ]]</para></td>
diff --git a/addons/account/report/account_partner_ledger.py b/addons/account/report/account_partner_ledger.py
index 4211a516aa7..2a0c7446b6b 100644
--- a/addons/account/report/account_partner_ledger.py
+++ b/addons/account/report/account_partner_ledger.py
@@ -62,7 +62,12 @@ class third_party_ledger(rml_parse.rml_parse, common_report_header):
         self.initial_balance = data['form'].get('initial_balance', True)
         self.result_selection = data['form'].get('result_selection', 'customer')
         self.amount_currency = data['form'].get('amount_currency', False)
+        self.target_move = data['form'].get('target_move', 'all')
         PARTNER_REQUEST = ''
+        move_state = ['draft','posted']
+        if self.target_move == 'posted':
+            move_state = ['posted']
+
         if (data['model'] == 'res.partner'):
             ## Si on imprime depuis les partenaires
             if ids:
@@ -85,14 +90,17 @@ class third_party_ledger(rml_parse.rml_parse, common_report_header):
         partner_to_use = []
         self.cr.execute(
                 "SELECT DISTINCT l.partner_id " \
-                "FROM account_move_line AS l, account_account AS account " \
+                "FROM account_move_line AS l, account_account AS account, " \
+                " account_move AS am " \
                 "WHERE l.partner_id IS NOT NULL " \
                     "AND l.account_id = account.id " \
+                    "AND am.id = l.move_id " \
+                    "AND am.state IN %s"
                     "AND " + self.query +" " \
                     "AND l.account_id IN %s " \
                     " " + PARTNER_REQUEST + " " \
                     "AND account.active " ,
-                (tuple(self.account_ids),))
+                (tuple(move_state), tuple(self.account_ids),))
 
         res = self.cr.dictfetchall()
         for res_line in res:
@@ -117,23 +125,30 @@ class third_party_ledger(rml_parse.rml_parse, common_report_header):
             return self.comma_me(new)
 
     def lines(self, partner):
+        move_state = ['draft','posted']
+        if self.target_move == 'posted':
+            move_state = ['posted']
+
         full_account = []
         if self.reconcil:
             RECONCILE_TAG = " "
         else:
             RECONCILE_TAG = "AND l.reconcile_id IS NULL"
         self.cr.execute(
-            "SELECT l.id,l.date,j.code, l.ref, m.name as move_name, l.name, l.debit, l.credit,l.amount_currency,c.code AS currency_code " \
+            "SELECT l.id, l.date, j.code, acc.code as a_code, acc.name as a_name, l.ref, m.name as move_name, l.name, l.debit, l.credit, l.amount_currency, c.symbol AS currency_code " \
             "FROM account_move_line l " \
             "LEFT JOIN account_journal j " \
                 "ON (l.journal_id = j.id) " \
-            "LEFT JOIN res_currency c on (l.currency_id=c.id)" \
-            "LEFT JOIN account_move m on (m.id=l.move_id)" \
+            "LEFT JOIN account_account acc " \
+                "ON (l.account_id = acc.id) " \
+            "LEFT JOIN res_currency c ON (l.currency_id=c.id)" \
+            "LEFT JOIN account_move m ON (m.id=l.move_id)" \
             "WHERE l.partner_id = %s " \
                 "AND l.account_id IN %s AND " + self.query +" " \
+                "AND m.state IN %s " \
                 " " + RECONCILE_TAG + " "\
-                "ORDER BY l.id",
-                (partner.id, tuple(self.account_ids)))
+                "ORDER BY l.date",
+                (partner.id, tuple(self.account_ids), tuple(move_state)))
         res = self.cr.dictfetchall()
         sum = 0.0
         for r in res:
@@ -143,17 +158,28 @@ class third_party_ledger(rml_parse.rml_parse, common_report_header):
         return full_account
 
     def _get_intial_balance(self, partner):
+        move_state = ['draft','posted']
+        if self.target_move == 'posted':
+            move_state = ['posted']
+
         self.cr.execute(
             "SELECT COALESCE(SUM(l.debit),0.0), COALESCE(SUM(l.credit),0.0), COALESCE(sum(debit-credit), 0.0) " \
-            "FROM account_move_line AS l " \
+            "FROM account_move_line AS l,  " \
+            "account_move AS m "
             "WHERE partner_id = %s " \
+            "AND m.id = l.move_id " \
+            "AND m.state IN %s "
             "AND account_id IN %s" \
             "AND reconcile_id IS NULL  " \
             "AND " + self.init_query + "  ",
-            (partner.id, tuple(self.account_ids)))
+            (partner.id, tuple(move_state), tuple(self.account_ids)))
         return self.cr.fetchall()
 
     def _sum_debit_partner(self, partner):
+        move_state = ['draft','posted']
+        if self.target_move == 'posted':
+            move_state = ['posted']
+
         result_tmp = 0.0
         if self.reconcil :
             RECONCILE_TAG = " "
@@ -161,12 +187,15 @@ class third_party_ledger(rml_parse.rml_parse, common_report_header):
             RECONCILE_TAG = "AND reconcile_id IS NULL"
         self.cr.execute(
                 "SELECT sum(debit) " \
-                "FROM account_move_line AS l " \
+                "FROM account_move_line AS l, " \
+                "account_move AS m "
                 "WHERE partner_id = %s " \
+                    "AND m.id = l.move_id " \
+                    "AND m.state IN %s "
                     "AND account_id IN %s" \
                     " " + RECONCILE_TAG + " " \
                     "AND " + self.query + " " ,
-                (partner.id,tuple(self.account_ids),))
+                (partner.id, tuple(move_state), tuple(self.account_ids),))
 
         contemp = self.cr.fetchone()
         if contemp != None:
@@ -176,6 +205,10 @@ class third_party_ledger(rml_parse.rml_parse, common_report_header):
         return result_tmp
 
     def _sum_credit_partner(self, partner):
+        move_state = ['draft','posted']
+        if self.target_move == 'posted':
+            move_state = ['posted']
+
         result_tmp = 0.0
         if self.reconcil :
             RECONCILE_TAG = " "
@@ -183,12 +216,15 @@ class third_party_ledger(rml_parse.rml_parse, common_report_header):
             RECONCILE_TAG = "AND reconcile_id IS NULL"
         self.cr.execute(
                 "SELECT sum(credit) " \
-                "FROM account_move_line AS l " \
+                "FROM account_move_line AS l, " \
+                "account_move AS m "
                 "WHERE partner_id=%s " \
+                    "AND m.id = l.move_id " \
+                    "AND m.state IN %s "
                     "AND account_id IN %s" \
                     " " + RECONCILE_TAG + " " \
                     "AND " + self.query + " " ,
-                (partner.id, tuple(self.account_ids),))
+                (partner.id, tuple(move_state), tuple(self.account_ids),))
 
         contemp = self.cr.fetchone()
         if contemp != None:
@@ -198,6 +234,10 @@ class third_party_ledger(rml_parse.rml_parse, common_report_header):
         return result_tmp
 
     def _sum_debit(self):
+        move_state = ['draft','posted']
+        if self.target_move == 'posted':
+            move_state = ['posted']
+
         if not self.ids:
             return 0.0
         result_tmp = 0.0
@@ -209,12 +249,15 @@ class third_party_ledger(rml_parse.rml_parse, common_report_header):
         if self.initial_balance:
             self.cr.execute(
                     "SELECT sum(debit) " \
-                    "FROM account_move_line AS l " \
+                    "FROM account_move_line AS l, " \
+                    "account_move AS m "
                     "WHERE partner_id IN %s" \
+                        "AND m.id = l.move_id " \
+                        "AND m.state IN %s "
                         "AND account_id IN %s" \
                         "AND reconcile_id IS NULL " \
                         "AND " + self.init_query + " ",
-                    (tuple(self.partner_ids), tuple(self.account_ids)))
+                    (tuple(self.partner_ids), tuple(move_state), tuple(self.account_ids)))
             contemp = self.cr.fetchone()
             if contemp != None:
                 result_init = contemp[0] or 0.0
@@ -223,12 +266,15 @@ class third_party_ledger(rml_parse.rml_parse, common_report_header):
 
         self.cr.execute(
                 "SELECT sum(debit) " \
-                "FROM account_move_line AS l " \
+                "FROM account_move_line AS l, " \
+                "account_move AS m "
                 "WHERE partner_id IN %s" \
+                    "AND m.id = l.move_id " \
+                    "AND m.state IN %s "
                     "AND account_id IN %s" \
                     " " + RECONCILE_TAG + " " \
                     "AND " + self.query + " " ,
-                    (tuple(self.partner_ids), tuple(self.account_ids),))
+                    (tuple(self.partner_ids), tuple(move_state) ,tuple(self.account_ids),))
         contemp = self.cr.fetchone()
         if contemp != None:
             result_tmp = contemp[0] or 0.0
@@ -237,6 +283,10 @@ class third_party_ledger(rml_parse.rml_parse, common_report_header):
         return result_tmp  + result_init
 
     def _sum_credit(self):
+        move_state = ['draft','posted']
+        if self.target_move == 'posted':
+            move_state = ['posted']
+
         if not self.ids:
             return 0.0
         result_tmp = 0.0
@@ -248,12 +298,15 @@ class third_party_ledger(rml_parse.rml_parse, common_report_header):
         if self.initial_balance:
             self.cr.execute(
                     "SELECT sum(credit) " \
-                    "FROM account_move_line AS l " \
+                    "FROM account_move_line AS l, " \
+                    "account_move AS m  "
                     "WHERE partner_id IN %s" \
+                        "AND m.id = l.move_id " \
+                        "AND m.state IN %s "
                         "AND account_id IN %s" \
                         "AND reconcile_id IS NULL " \
                         "AND " + self.init_query + " ",
-                    (tuple(self.partner_ids), tuple(self.account_ids)))
+                    (tuple(self.partner_ids), tuple(move_state), tuple(self.account_ids)))
             contemp = self.cr.fetchone()
             if contemp != None:
                 result_init = contemp[0] or 0.0
@@ -262,12 +315,15 @@ class third_party_ledger(rml_parse.rml_parse, common_report_header):
 
         self.cr.execute(
                 "SELECT sum(credit) " \
-                "FROM account_move_line AS l " \
+                "FROM account_move_line AS l, " \
+                "account_move AS m "
                 "WHERE partner_id  IN %s" \
+                    "AND m.id = l.move_id " \
+                    "AND m.state IN %s "
                     "AND account_id IN %s" \
                     " " + RECONCILE_TAG + " " \
                     "AND " + self.query + " " ,
-                    (tuple(self.partner_ids), tuple(self.account_ids),))
+                    (tuple(self.partner_ids), tuple(move_state), tuple(self.account_ids),))
         contemp = self.cr.fetchone()
         if contemp != None:
             result_tmp = contemp[0] or 0.0
@@ -314,4 +370,4 @@ report_sxw.report_sxw('report.account.third_party_ledger_other', 'res.partner',
         'addons/account/report/account_partner_ledger_other.rml',parser=third_party_ledger,
         header='internal')
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/account/report/account_partner_ledger.rml b/addons/account/report/account_partner_ledger.rml
index d0b24655613..88b61dd43f6 100644
--- a/addons/account/report/account_partner_ledger.rml
+++ b/addons/account/report/account_partner_ledger.rml
@@ -24,6 +24,7 @@
       <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="6,-1" stop="6,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="7,-1" stop="7,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table1">
       <blockAlignment value="LEFT"/>
@@ -36,7 +37,7 @@
     <blockTableStyle id="Table2">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="0,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table2_header">
       <blockAlignment value="LEFT"/>
@@ -69,6 +70,9 @@
       <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="7,0" stop="7,-1"/>
       <lineStyle kind="LINEAFTER" colorName="#cccccc" start="7,0" stop="7,-1"/>
       <lineStyle kind="LINEABOVE" colorName="#cccccc" start="7,0" stop="7,0"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="8,0" stop="8,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="8,0" stop="8,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="8,0" stop="8,0"/>
     </blockTableStyle>
     <blockTableStyle id="Table3">
       <blockAlignment value="LEFT"/>
@@ -80,6 +84,7 @@
       <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#cccccc" start="6,-1" stop="6,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="7,-1" stop="7,-1"/>
     </blockTableStyle>
  	<blockTableStyle id="Table3_header">
       <blockAlignment value="LEFT"/>
@@ -96,12 +101,13 @@
       <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="6,-1" stop="6,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="7,-1" stop="7,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="8,-1" stop="8,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table6">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
 
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="0,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table5">
       <blockAlignment value="LEFT"/>
@@ -123,6 +129,7 @@
       <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#cccccc" start="6,-1" stop="6,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#cccccc" start="7,-1" stop="7,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="8,-1" stop="8,-1"/>
     </blockTableStyle>
     <initialize>
       <paraStyle name="all" alignment="justify"/>
@@ -270,7 +277,7 @@
       <para style="P4">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="65.0,28.0,45.0,175.0,77.0,75.0,74.0" style="Table_header_1">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
+    <blockTable colWidths="55.0,28.0,60.0,81.0,125.0,57.0,58.0,65.0" style="Table_header_1">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
       <tr>
         <td>
           <para style="terp_tblheader_Details">Date</para>
@@ -281,6 +288,9 @@
         <td>
           <para style="terp_tblheader_Details">Ref.</para>
         </td>
+        <td>
+          <para style="terp_tblheader_Details">A/c No.- Name</para>
+        </td>
         <td>
           <para style="terp_tblheader_Details">Entry Label</para>
         </td>
@@ -298,26 +308,10 @@
     <para style="P4">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="314.0,77.0,75.0,74.0" style="Table1">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
-      <tr>
-        <td>
-          <para style="terp_default_Bold_9">Balance Brought Forward</para>
-        </td>
-        <td>
-          <para style="P5"><u>[[ formatLang((sum_debit())) ]] [[ company.currency_id.symbol ]]</u></para>
-        </td>
-        <td>
-          <para style="P5"><u>[[ formatLang((sum_credit())) ]] [[ company.currency_id.symbol ]]</u></para>
-        </td>
-        <td>
-          <para style="P5"><u>[[ formatLang((sum_debit() - sum_credit())) ]] [[ company.currency_id.symbol ]]</u></para>
-        </td>
-      </tr>
-    </blockTable>
     <para style="terp_default_2">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="314.0,77.0,75.0,74.0" style="Table2">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
+    <blockTable colWidths="349.0,57.0,58.0,65.0" style="Table2">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
 
       <tr>
         <td>
@@ -335,7 +329,7 @@
       </tr>
        <tr>
     	<td>[[ data['form']['initial_balance'] or  removeParentNode('tr') ]]
-          <para style="terp_default_Centre_9" leftIndent="35.0">Initial Balance</para>
+          <para style="P2">Initial Balance</para>
         </td>
         <td>
           <para style="terp_default_Right_9">[[ formatLang(get_intial_balance(p)[0][0])]] [[ company.currency_id.symbol ]]</para>
@@ -353,7 +347,7 @@
     </para>
     <section>
       <para style="P1">[[ repeatIn(lines(p), 'line') ]]</para>
-      <blockTable colWidths="65.0,28.0,45.0,175.0,77.0,75.0,74.0" style="Table3">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
+      <blockTable colWidths="55.0,28.0,60.0,81.0,125.0,57.0,58.0,65.0" style="Table3">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
         <tr>
           <td>
             <para style="P3">[[ formatLang(line['date'],date=True) ]]</para>
@@ -365,7 +359,10 @@
             <para style="P3">[[ line['move_name'] ]]</para>
           </td>
           <td>
-            <para style="P3"><b>b</b>[[ (line['ref'] or '') + ' ' + line['name'] ]]</para>
+            <para style="P3">[[ line['a_code'] ]] - [[ line['a_name'] ]]</para>
+          </td>
+          <td>
+            <para style="P3">[[ line['ref'] ]] - [[ line['name'] ]]</para>
           </td>
           <td>
             <para style="terp_default_Right_9">[[ formatLang((line['debit'])) ]] [[ company.currency_id.symbol ]]</para>
@@ -382,10 +379,10 @@
         <font color="white"> </font>
       </para>
     </section>
-     <blockTable colWidths="57.0,25.0,40.0,154.0,66.0,68.0,68.0,60.0" style="Table4">[[ display_currency(data) == True or removeParentNode('blockTable') ]]
+     <blockTable colWidths="50.0,25.0,60.0,81.0,97.0,56.0,58.0,63.0,53.0" style="Table4">[[ display_currency(data) == True or removeParentNode('blockTable') ]]
       <tr>
         <td>
-          <para style="terp_tblheader_Details">Datefff</para>
+          <para style="terp_tblheader_Details">Date</para>
         </td>
         <td>
           <para style="terp_tblheader_Details">JNRL</para>
@@ -393,6 +390,9 @@
         <td>
           <para style="terp_tblheader_Details">Ref.</para>
         </td>
+        <td>
+          <para style="terp_tblheader_Details">A/c No.- Name</para>
+        </td>
         <td>
           <para style="terp_tblheader_Details">Entry Label</para>
         </td>
@@ -413,28 +413,10 @@
     <para style="P4">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="276.0,67.0,66.0,65.0,65.0" style="Table5">[[ display_currency(data) == True or removeParentNode('blockTable') ]]
-      <tr>
-        <td>
-          <para style="terp_default_Bold_9">Balance Brought Forward</para>
-        </td>
-        <td>
-          <para style="P5"><u>[[ formatLang((sum_debit())) ]] [[ company.currency_id.symbol ]]</u></para>
-        </td>
-        <td>
-          <para style="P5"><u>[[ formatLang((sum_credit())) ]] [[ company.currency_id.symbol ]]</u></para>
-        </td>
-        <td>
-          <para style="P5"><u>[[ formatLang((sum_debit() - sum_credit())) ]] [[ company.currency_id.symbol ]]</u></para>
-        </td>
-          <td>
-        </td>
-      </tr>
-    </blockTable>
     <para style="terp_default_2">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="276.0,67.0,66.0,65.0,65.0" style="Table6">[[ display_currency(data) == True or removeParentNode('blockTable') ]]
+    <blockTable colWidths="308.0,56.0,58.0,63.0,53.0" style="Table6">[[ display_currency(data) == True or removeParentNode('blockTable') ]]
 
       <tr>
         <td>
@@ -457,7 +439,7 @@
       </tr>
       <tr>
         <td>[[display_initial_balance(data) or  removeParentNode('tr') ]]
-          <para style="terp_default_Centre_9" leftIndent="35.0">Initial Balance</para>
+          <para style="P2">Initial Balance</para>
         </td>
          <td>
           <para style="terp_default_Right_9">[[ formatLang(get_intial_balance(p)[0][0]) ]] [[ company.currency_id.symbol ]]</para>
@@ -478,7 +460,7 @@
     </para>
     <section>
       <para style="P1">[[ repeatIn(lines(p), 'line') ]]</para>
-      <blockTable colWidths="57.0,25.0,40.0,154.0,67.0,66.0,65.0,65.0" style="Table7">[[ display_currency(data) == True or removeParentNode('blockTable') ]]
+      <blockTable colWidths="50.0,25.0,60.0,81.0,97.0,56.0,58.0,63.0,53.0" style="Table7">[[ display_currency(data) == True or removeParentNode('blockTable') ]]
         <tr>
           <td>
             <para style="P3">[[ formatLang(line['date'],date=True) ]]</para>
@@ -490,7 +472,10 @@
             <para style="P3">[[ line['move_name'] ]]</para>
           </td>
           <td>
-            <para style="P3"><b>a</b>[[ (line['ref'] or '') + ' ' + line['name'] ]]</para>
+            <para style="P3">[[ line['a_code'] ]] - [[ line['a_name'] ]]</para>
+          </td>
+          <td>
+            <para style="P3">[[ (line['ref'] or '') + ' ' + line['name'] ]]</para>
           </td>
           <td>
             <para style="terp_default_Right_9">[[ formatLang((line['debit'])) ]] [[ company.currency_id.symbol ]]</para>
diff --git a/addons/account/report/account_partner_ledger_other.rml b/addons/account/report/account_partner_ledger_other.rml
index b755479c12f..1e8429546db 100644
--- a/addons/account/report/account_partner_ledger_other.rml
+++ b/addons/account/report/account_partner_ledger_other.rml
@@ -181,7 +181,9 @@
       <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="7,0" stop="7,-1"/>
       <lineStyle kind="LINEAFTER" colorName="#cccccc" start="7,0" stop="7,-1"/>
       <lineStyle kind="LINEABOVE" colorName="#cccccc" start="7,0" stop="7,0"/>
-
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="8,0" stop="8,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="8,0" stop="8,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="8,0" stop="8,0"/>
     </blockTableStyle>
     <blockTableStyle id="Table9">
       <blockAlignment value="LEFT"/>
@@ -207,6 +209,7 @@
       <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="6,-1" stop="6,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="7,-1" stop="7,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table1">
       <blockAlignment value="LEFT"/>
@@ -219,7 +222,7 @@
     <blockTableStyle id="Table2">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="0,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table3">
       <blockAlignment value="LEFT"/>
@@ -231,6 +234,7 @@
       <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#cccccc" start="6,-1" stop="6,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="7,-1" stop="7,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table4">
       <blockAlignment value="LEFT"/>
@@ -243,6 +247,7 @@
       <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="6,-1" stop="6,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="7,-1" stop="7,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="8,-1" stop="8,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table5">
       <blockAlignment value="LEFT"/>
@@ -256,7 +261,7 @@
     <blockTableStyle id="Table6">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="0,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table7">
       <blockAlignment value="LEFT"/>
@@ -269,6 +274,7 @@
       <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#cccccc" start="6,-1" stop="6,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#cccccc" start="7,-1" stop="7,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="8,-1" stop="8,-1"/>
     </blockTableStyle>
     <initialize>
       <paraStyle name="all" alignment="justify"/>
@@ -425,7 +431,7 @@
                    <para style="P5">
             <font color="white"> </font>
           </para>
-    <blockTable colWidths="65.0,28.0,65.0,155.0,77.0,75.0,74.0" style="Table_header_1">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
+    <blockTable colWidths="50.0,28.0,65.0,61.0,145.0,60.0,60.0,60.0" style="Table_header_1">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
       <tr>
         <td>
           <para style="terp_tblheader_Details">Date</para>
@@ -436,6 +442,9 @@
         <td>
           <para style="terp_tblheader_Details">Ref.</para>
         </td>
+        <td>
+          <para style="terp_tblheader_Details">A/c No.- Name</para>
+        </td>
         <td>
           <para style="terp_tblheader_Details">Entry Label</para>
         </td>
@@ -450,26 +459,9 @@
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="314.0,77.0,75.0,74.0" style="Table1">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
-      <tr>
-        <td>
-          <para style="terp_default_Bold_9">Balance Brought Forward</para>
-        </td>
-        <td>
-          <para style="P5">[[ formatLang((sum_debit())) ]] [[ company.currency_id.symbol ]]</para>
-        </td>
-        <td>
-          <para style="P5">[[ formatLang((sum_credit())) ]] [[ company.currency_id.symbol ]]</para>
-        </td>
-        <td>
-          <para style="P5">[[ formatLang((sum_debit() - sum_credit())) ]] [[ company.currency_id.symbol ]]</para>
-        </td>
-      </tr>
-    </blockTable>
-
 	<section>
 	<para style="P3">[[ repeatIn(objects, 'p') ]] [[ setLang(p.lang) ]]</para>
-    <blockTable colWidths="314.0,77.0,75.0,74.0" style="Table2">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
+    <blockTable colWidths="349.0,60.0,60.0,60.0" style="Table2">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
 
       <tr>
         <td>
@@ -487,7 +479,7 @@
       </tr>
       <tr>
     <td>[[ display_initial_balance(data)  or  removeParentNode('tr') ]]
-          <para style="terp_default_Centre_9" leftIndent="35.0">Initial Balance</para>
+          <para style="P2">Initial Balance</para>
         </td>
         <td>
           <para style="terp_default_Right_9">[[ formatLang(get_intial_balance(p)[0][0])]] [[ company.currency_id.symbol ]]</para>
@@ -502,7 +494,7 @@
     </blockTable>
     <section>
       <para style="P1">[[ repeatIn(lines(p), 'line') ]]</para>
-      <blockTable colWidths="65.0,28.0,65.0,155.0,77.0,75.0,74.0" style="Table3">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
+      <blockTable colWidths="50.0,28.0,65.0,61.0,145.0,60.0,60.0,60.0" style="Table3">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
         <tr>
           <td>
             <para style="P3">[[ formatLang(line['date'],date=True) ]]</para>
@@ -514,7 +506,10 @@
             <para style="P3">[[ line['move_name'] ]]</para>
           </td>
           <td>
-            <para style="P3">[[ (line['ref'] or '')+ ' ' + line['name'] ]]</para>
+            <para style="P3">[[ line['a_code'] ]] - [[ line['a_name'] ]]</para>
+          </td>
+          <td>
+            <para style="P3">[[ (line['ref'] or '') + ' ' + line['name'] ]]</para>
           </td>
           <td>
             <para style="terp_default_Right_9">[[ formatLang((line['debit'])) ]] [[ company.currency_id.symbol ]]</para>
@@ -529,7 +524,7 @@
       </blockTable>
     </section>
     </section>
-    <blockTable colWidths="57.0,25.0,40.0,154.0,67.0,66.0,65.0,65.0" style="Table4">[[ display_currency(data) == True or removeParentNode('blockTable') ]]
+    <blockTable colWidths="50.0,28.0,65.0,65.0,112.0,53.0,53.0,60.0,53.0" style="Table4">[[ display_currency(data) == True or removeParentNode('blockTable') ]]
       <tr>
         <td>
           <para style="terp_tblheader_Details">Date</para>
@@ -540,6 +535,9 @@
         <td>
           <para style="terp_tblheader_Details">Ref.</para>
         </td>
+        <td>
+          <para style="terp_tblheader_Details">A/c No.- Name</para>
+        </td>
         <td>
           <para style="terp_tblheader_Details">Entry Label</para>
         </td>
@@ -558,30 +556,9 @@
       </tr>
     </blockTable>
     <para style="P4"/>
-    <blockTable colWidths="276.0,67.0,66.0,65.0,65.0" style="Table5">[[ display_currency(data) == True or removeParentNode('blockTable') ]]
-      <tr>
-        <td>
-          <para style="terp_default_Bold_9">Balance Brought Forward</para>
-        </td>
-        <td>
-          <para style="P5">[[ formatLang((sum_debit())) ]] [[ company.currency_id.symbol ]]</para>
-        </td>
-        <td>
-          <para style="P5">[[ formatLang((sum_credit())) ]] [[ company.currency_id.symbol ]]</para>
-        </td>
-        <td>
-          <para style="P5">[[ formatLang((sum_debit() - sum_credit())) ]] [[ company.currency_id.symbol ]]</para>
-        </td>
-        <td>
-          <para style="P5">
-            <font color="white"> </font>
-          </para>
-        </td>
-      </tr>
-    </blockTable>
     <section>
     <para style="P3">[[ repeatIn(objects, 'p') ]] [[ setLang(p.lang) ]]</para>
-    <blockTable colWidths="276.0,67.0,66.0,65.0,65.0" style="Table6">[[ display_currency(data) == True or removeParentNode('blockTable') ]]
+    <blockTable colWidths="320.0,53.0,53.0,60.0,53.0" style="Table6">[[ display_currency(data) == True or removeParentNode('blockTable') ]]
 
       <tr>
         <td>
@@ -604,7 +581,7 @@
       </tr>
         <tr>
         <td>[[ data['form']['initial_balance'] or  removeParentNode('tr') ]]
-         <para style="terp_default_Centre_9" leftIndent="35.0">Initial Balance</para>
+         <para style="P2">Initial Balance</para>
         </td>
          <td>
           <para style="terp_default_Right_9">[[ formatLang(get_intial_balance(p)[0][0]) ]] [[ company.currency_id.symbol ]]</para>
@@ -622,7 +599,7 @@
     </blockTable>
     <section>
       <para style="P1">[[ repeatIn(lines(p), 'line') ]]</para>
-      <blockTable colWidths="57.0,25.0,60.0,134.0,67.0,66.0,65.0,65.0" style="Table7">[[ display_currency(data) == True or removeParentNode('blockTable') ]]
+      <blockTable colWidths="50.0,28.0,65.0,65.0,112.0,53.0,53.0,60.0,53.0" style="Table7">[[ display_currency(data) == True or removeParentNode('blockTable') ]]
         <tr>
           <td>
             <para style="P3"> [[ formatLang(line['date'],date=True) ]]</para>
@@ -633,6 +610,9 @@
           <td>
             <para style="P3">[[ line['move_name'] ]]</para>
           </td>
+          <td>
+            <para style="P3">[[ line['a_code'] ]] - [[ line['a_name'] ]]</para>
+          </td>
           <td>
             <para style="P3">[[ (line['ref'] or '') + ' ' + line['name'] ]]</para>
           </td>
diff --git a/addons/account/report/invoice.rml b/addons/account/report/invoice.rml
index ea4eda3cb94..741e4544e7b 100644
--- a/addons/account/report/invoice.rml
+++ b/addons/account/report/invoice.rml
@@ -362,7 +362,7 @@
     <blockTable colWidths="120.0,410.0" style="Table1">
       <tr>
         <td>
-          <para style="terp_default_Bold_9">Fiscal Position Remark : </para>
+          <para style="terp_default_Bold_9">Fiscal Mapping Remark : </para>
         </td>
         <td>
           <para style="terp_default_9">[[ (o.fiscal_position.note and format(o.fiscal_position and o.fiscal_position.note)) or removeParentNode('blockTable') ]]</para>
diff --git a/addons/account/security/account_security.xml b/addons/account/security/account_security.xml
index 7344c40754e..adf3571f406 100644
--- a/addons/account/security/account_security.xml
+++ b/addons/account/security/account_security.xml
@@ -223,7 +223,7 @@
     </record>
 
     <record id="account_fiscal_position_comp_rule" model="ir.rule">
-        <field name="name">Account fiscal position company rule</field>
+        <field name="name">Account fiscal Mapping company rule</field>
         <field model="ir.model" name="model_id" ref="model_account_fiscal_position"/>
         <field eval="True" name="global"/>
         <field name="domain_force">[('company_id','=',user.company_id.id)]</field>
diff --git a/addons/account/test/account_report.yml b/addons/account/test/account_report.yml
index 619d8f7771e..6db4efeedd8 100644
--- a/addons/account/test/account_report.yml
+++ b/addons/account/test/account_report.yml
@@ -109,7 +109,7 @@
     
     (data, format) = netsvc.LocalService('report.account.central.journal').create(cr, uid, [], data_dict, {})
     if tools.config['test_report_directory']:
-       file(os.path.join(tools.config['test_report_directory'], 'account-central_journal.'+format), 'wb+').write(data)
+       file(os.path.join(tools.config['test_report_directory'], 'account-central_journal-menu.'+format), 'wb+').write(data)
 -
   Print the General Journal Report - From Journal
 -
@@ -137,14 +137,14 @@
     data_dict = {'model': 'account.account', 'form': {'initial_balance': 1,'initial_bal_query':' True ','chart_account_id':ref('account.chart0'),'display_account':'bal_all','filter': 'filter_no','sortby': 'sort_date','amount_currency': 0,'landscape':0,'period_manner': 'actual','fiscalyear_id': fy_id ,'query_line':'True ','target_move': 'all','periods': period_list,'journal_ids':journal_ids,'id':ref('account.bal') }}
     (data, format) = netsvc.LocalService('report.account.general.ledger').create(cr, uid, acc_ids, data_dict, {})
     if tools.config['test_report_directory']:
-       file(os.path.join(tools.config['test_report_directory'], 'account-general_journal.'+format), 'wb+').write(data)
+       file(os.path.join(tools.config['test_report_directory'], 'account-general_ledger.'+format), 'wb+').write(data)
 
     print "GL report from menu"
     data_dict.update({'model': 'ir.ui.menu'})
     data_dict['form'].update({'active_ids': acc_ids})
     (data, format) = netsvc.LocalService('report.account.general.ledger').create(cr, uid, [], data_dict, {})
     if tools.config['test_report_directory']:
-       file(os.path.join(tools.config['test_report_directory'], 'account-general_journal-menu.'+format), 'wb+').write(data)
+       file(os.path.join(tools.config['test_report_directory'], 'account-general_ledger-menu.'+format), 'wb+').write(data)
 -
   Print the General Ledger Report in Landscape Mode
 -
@@ -157,12 +157,45 @@
     data_dict = {'model': 'account.account', 'form': {'initial_balance': 1,'initial_bal_query':' True ','chart_account_id':ref('account.chart0'),'display_account':'bal_all','filter': 'filter_no','sortby': 'sort_date','amount_currency': 0,'landscape':1,'period_manner': 'actual','fiscalyear_id': fy_id ,'query_line':'True ','target_move': 'all','periods': period_list,'journal_ids':journal_ids,'id':ref('account.bal') }}
     (data, format) = netsvc.LocalService('report.account.general.ledger_landscape').create(cr, uid, acc_ids, data_dict, {})
     if tools.config['test_report_directory']:
-       file(os.path.join(tools.config['test_report_directory'], 'account-general_journal-landscape.'+format), 'wb+').write(data)
+       file(os.path.join(tools.config['test_report_directory'], 'account-general_ledger-landscape.'+format), 'wb+').write(data)
 
     print "GL report landscape mode from menu"
     data_dict.update({'model': 'ir.ui.menu'})
     data_dict['form'].update({'active_ids': acc_ids})
     (data, format) = netsvc.LocalService('report.account.general.ledger_landscape').create(cr, uid, [], data_dict, {})
     if tools.config['test_report_directory']:
-       file(os.path.join(tools.config['test_report_directory'], 'account-general_journal-landscape-menu.'+format), 'wb+').write(data)
+       file(os.path.join(tools.config['test_report_directory'], 'account-general_ledger-landscape-menu.'+format), 'wb+').write(data)
 
+-
+  Print Journal Report - From Model
+-
+  !python {model: account.journal.period}: |
+    import netsvc, tools, os, time
+    fy_id = ref('account.data_fiscalyear')
+    period_list = self.pool.get('account.period').search(cr, uid, [('fiscalyear_id', 'in', [fy_id])], context=context)
+    journal_ids = [ref('account.sales_journal'),ref('account.refund_sales_journal'),ref('account.expenses_journal'),ref('account.refund_expenses_journal'),ref('account.bank_journal'),ref('account.check_journal'),ref('account.cash_journal')]
+    journal_period_ids = self.pool.get('account.journal.period').search(cr, uid, [('journal_id', 'in', journal_ids), ('period_id', 'in', period_list)], context=context)
+
+    data_dict = {'model': 'account.journal.period', 'id':journal_period_ids[0], 'form': {'sort_selection': 'date','chart_account_id':ref('account.chart0'),'display_account':'bal_all','filter': 'filter_no','amount_currency': 0,'compare_pattern': 'none','account_choice': 'moves','landscape':0,'period_manner': 'actual','fiscalyear_id': fy_id ,'query_line':'True ','target_move': 'all','periods': period_list,'journal_ids':journal_ids,'id':ref('account.bal') }}
+    (data, format) = netsvc.LocalService('report.account.journal.period.print').create(cr, uid, journal_period_ids, data_dict, {})
+    if tools.config['test_report_directory']:
+       file(os.path.join(tools.config['test_report_directory'], 'account-print_journal.'+format), 'wb+').write(data)
+       
+    print "Journal Report - From Menu"
+    data_dict.update({'model': 'ir.ui.menu'})
+    data_dict['form'].update({'active_ids':journal_period_ids})
+    
+    (data, format) = netsvc.LocalService('report.account.journal.period.print').create(cr, uid, [], data_dict, {})
+    if tools.config['test_report_directory']:
+       file(os.path.join(tools.config['test_report_directory'], 'account-print_journal-menu.'+format), 'wb+').write(data)
+
+-
+  Print the Partner Balance Report
+-
+  !python {model: res.partner}: |
+    import netsvc, tools, os, time
+    journal_ids = [ref('account.sales_journal'),ref('account.refund_sales_journal'),ref('account.expenses_journal'),ref('account.refund_expenses_journal'),ref('account.bank_journal'),ref('account.check_journal'),ref('account.cash_journal')]
+    data_dict = {'model': 'ir.ui.menu', 'form': {'result_selection': 'customer','chart_account_id':ref('account.chart0'),'display_account':'bal_all','filter': 'filter_no','display_type': 0,'journal_ids':journal_ids,'display_partner': 'non-zero_balance','fiscalyear': ref('account.data_fiscalyear') ,'target_move': 'all','query_line':' True '}}
+    (data, format) = netsvc.LocalService('report.account.partner.balance').create(cr, uid, [], data_dict, {})
+    if tools.config['test_report_directory']:
+       file(os.path.join(tools.config['test_report_directory'], 'account-partner_balance.'+format), 'wb+').write(data)
diff --git a/addons/account/wizard/account_report_account_balance.py b/addons/account/wizard/account_report_account_balance.py
index 3869744bf96..ed37395acb5 100644
--- a/addons/account/wizard/account_report_account_balance.py
+++ b/addons/account/wizard/account_report_account_balance.py
@@ -26,7 +26,7 @@ from osv import osv, fields
 class account_balance_report(osv.osv_memory):
     _inherit = "account.common.account.report"
     _name = 'account.balance.report'
-    _description = 'Account Balance Report'
+    _description = 'Trial Balance Report'
 
     _columns = {
        'target_move': fields.selection([('all', 'All Entries'),
diff --git a/addons/account/wizard/account_report_account_balance_view.xml b/addons/account/wizard/account_report_account_balance_view.xml
index 8ffdf6ae02f..8c09e954dbf 100644
--- a/addons/account/wizard/account_report_account_balance_view.xml
+++ b/addons/account/wizard/account_report_account_balance_view.xml
@@ -4,21 +4,21 @@
     <data>
 
         <record id="account_report_balance_view" model="ir.ui.view">
-	        <field name="name">Account Balance</field>
-	        <field name="model">account.balance.report</field>
-	        <field name="type">form</field>
-	        <field name="inherit_id" ref="account_common_report_view" />
-	        <field name="arch" type="xml">
-	            <field name="fiscalyear_id" position="after">
-	                <field name="display_account"/>
-	                <field name="target_move"/>
-	                <newline/>
-	            </field>
-	        </field>
+          <field name="name">Trial Balance</field>
+          <field name="model">account.balance.report</field>
+          <field name="type">form</field>
+          <field name="inherit_id" ref="account_common_report_view" />
+          <field name="arch" type="xml">
+              <field name="fiscalyear_id" position="after">
+                  <field name="display_account"/>
+                  <field name="target_move"/>
+                  <newline/>
+              </field>
+          </field>
         </record>
 
         <record id="action_account_balance_menu" model="ir.actions.act_window">
-            <field name="name">Account Balance</field>
+            <field name="name">Trial Balance</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">account.balance.report</field>
             <field name="view_type">form</field>
@@ -29,7 +29,7 @@
 
         <menuitem
                 icon="STOCK_PRINT"
-                name="Account Balance"
+                name="Trial Balance"
                 parent="account.final_accounting_reports"
                 action="action_account_balance_menu"
                 id="menu_general_Balance_report"
@@ -38,7 +38,7 @@
         <record model="ir.values" id="action_account_balance_report_values1">
             <field name="model_id" ref="account.model_account_account" />
             <field name="object" eval="1" />
-            <field name="name">Account Balance</field>
+            <field name="name">Trial Balance</field>
             <field name="key2">client_print_multi</field>
             <field name="value" eval="'ir.actions.act_window,' +str(ref('action_account_balance_menu'))" />
             <field name="key">action</field>
diff --git a/addons/account/wizard/account_report_aged_partner_balance.py b/addons/account/wizard/account_report_aged_partner_balance.py
index b8b2a013d78..cef1860b45b 100644
--- a/addons/account/wizard/account_report_aged_partner_balance.py
+++ b/addons/account/wizard/account_report_aged_partner_balance.py
@@ -37,11 +37,14 @@ class account_aged_trial_balance(osv.osv_memory):
         'direction_selection': fields.selection([('past','Past'),
                                                  ('future','Future')],
                                                  'Analysis Direction', required=True),
+        'target_move': fields.selection([('all', 'All Entries'),
+                                        ('posted', 'All Posted Entries')], 'Target Moves', required=True),
     }
     _defaults = {
         'period_length': 30,
         'date_from' : time.strftime('%Y-%m-%d'),
         'direction_selection': 'past',
+        'target_move': 'all',
     }
 
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
@@ -61,7 +64,7 @@ class account_aged_trial_balance(osv.osv_memory):
             context = {}
 
         data = self.pre_print_report(cr, uid, ids, data, query_line, context=context)
-        data['form'].update(self.read(cr, uid, ids, ['period_length', 'direction_selection'])[0])
+        data['form'].update(self.read(cr, uid, ids, ['period_length', 'direction_selection', 'target_move'])[0])
 
         period_length = data['form']['period_length']
         if period_length<=0:
diff --git a/addons/account/wizard/account_report_aged_partner_balance_view.xml b/addons/account/wizard/account_report_aged_partner_balance_view.xml
index ad9c90b2e36..9f894f0f670 100644
--- a/addons/account/wizard/account_report_aged_partner_balance_view.xml
+++ b/addons/account/wizard/account_report_aged_partner_balance_view.xml
@@ -17,6 +17,7 @@
                     <newline/>
                     <field name="result_selection"/>
                     <field name="direction_selection"/>
+                    <field name="target_move"/>
                     <field name="journal_ids"/>
                     <newline/>
                     <separator colspan="4"/>
diff --git a/addons/account/wizard/account_report_balance_sheet.py b/addons/account/wizard/account_report_balance_sheet.py
index 9a53314c7a2..e3131e813c4 100644
--- a/addons/account/wizard/account_report_balance_sheet.py
+++ b/addons/account/wizard/account_report_balance_sheet.py
@@ -34,22 +34,26 @@ class account_bs_report(osv.osv_memory):
 
     _columns = {
         'display_type': fields.boolean("Landscape Mode"),
-        'reserve_account_id': fields.many2one('account.account', 'Reserve & Surplus Account',required = True,
+        'reserve_account_id': fields.many2one('account.account', 'Reserve & Profit/Loss Account',required = True,
                                       help='This Account is used for trasfering Profit/Loss(If It is Profit : Amount will be added, Loss : Amount will be duducted.), Which is calculated from Profilt & Loss Report', domain = [('type','=','payable')]),
+        'target_move': fields.selection([('all', 'All Entries'),
+                                        ('posted', 'All Posted Entries')], 'Target Moves', required=True),
     }
 
     _defaults={
         'display_type': True,
         'journal_ids': [],
+        'target_move': 'all',
     }
 
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
         mod_obj = self.pool.get('ir.model.data')
         res = super(account_bs_report, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=False)
         doc = etree.XML(res['arch'])
-        nodes = doc.xpath("//page[@name='journal_ids']")
+        nodes = doc.xpath("//field[@name='journal_ids']")
         for node in nodes:
-            node.set('invisible', '1')
+            node.set('readonly', '1')
+            node.set('required', '0')
         res['arch'] = etree.tostring(doc)
         return res
 
@@ -59,9 +63,9 @@ class account_bs_report(osv.osv_memory):
         data = self.pre_print_report(cr, uid, ids, data, query_line, context=context)
         account = self.pool.get('account.account').browse(cr, uid, data['form']['chart_account_id'])
         if not account.company_id.property_reserve_and_surplus_account:
-            raise osv.except_osv(_('Warning'),_('Please define the Reserve and Surplus account for current user company !'))
+            raise osv.except_osv(_('Warning'),_('Please define the Reserve and Profit/Loss account for current user company !'))
         data['form']['reserve_account_id'] = account.company_id.property_reserve_and_surplus_account.id
-        data['form'].update(self.read(cr, uid, ids, ['display_type'])[0])
+        data['form'].update(self.read(cr, uid, ids, ['display_type','target_move'])[0])
         if data['form']['display_type']:
             return {
                 'type': 'ir.actions.report.xml',
diff --git a/addons/account/wizard/account_report_balance_sheet_view.xml b/addons/account/wizard/account_report_balance_sheet_view.xml
index 113521604ae..e61ad6f46d5 100644
--- a/addons/account/wizard/account_report_balance_sheet_view.xml
+++ b/addons/account/wizard/account_report_balance_sheet_view.xml
@@ -10,6 +10,7 @@
             <field name="arch" type="xml">
                <field name="fiscalyear_id" position="after">
                     <field name="display_account"/>
+                    <field name="target_move"/>
                     <field name="display_type"/>
                     <field name="reserve_account_id"/>
                     <newline/>
diff --git a/addons/account/wizard/account_report_partner_balance.py b/addons/account/wizard/account_report_partner_balance.py
index d67954c3784..5e5ca64173b 100644
--- a/addons/account/wizard/account_report_partner_balance.py
+++ b/addons/account/wizard/account_report_partner_balance.py
@@ -32,18 +32,21 @@ class account_partner_balance(osv.osv_memory):
 #        'initial_balance': fields.boolean('Include Initial Balances'
 #                                    ,help='It adds initial balance row on report which display previous sum amount of debit/credit/balance'),
         'display_partner': fields.selection([('non-zero_balance', 'With balance is not equal to 0'), ('all', 'All Partners')]
-                                    ,'Display Partners')
+                                    ,'Display Partners'),
+        'target_move': fields.selection([('all', 'All Entries'),
+                                        ('posted', 'All Posted Entries')], 'Target Moves', required=True),
                 }
     _defaults = {
 #        'initial_balance': True,
-        'display_partner': 'non-zero_balance'
+        'display_partner': 'non-zero_balance',
+        'target_move': 'all'
                 }
 
     def _print_report(self, cr, uid, ids, data, query_line, context=None):
         if context is None:
             context = {}
         data = self.pre_print_report(cr, uid, ids, data, query_line, context=context)
-        data['form'].update(self.read(cr, uid, ids, ['display_partner'])[0])
+        data['form'].update(self.read(cr, uid, ids, ['display_partner', 'target_move'])[0])
         return {
             'type': 'ir.actions.report.xml',
             'report_name': 'account.partner.balance',
diff --git a/addons/account/wizard/account_report_partner_balance_view.xml b/addons/account/wizard/account_report_partner_balance_view.xml
index 81dfada99cc..2b970b45f93 100644
--- a/addons/account/wizard/account_report_partner_balance_view.xml
+++ b/addons/account/wizard/account_report_partner_balance_view.xml
@@ -12,6 +12,7 @@
                     <field name="result_selection"/>
                  <!--    <field name="initial_balance"/> -->
                     <field name="display_partner"/>
+                    <field name="target_move"/>
                     <newline/>
                </field>
             </field>
diff --git a/addons/account/wizard/account_report_partner_ledger.py b/addons/account/wizard/account_report_partner_ledger.py
index 9283d62ba21..53dbf12c348 100644
--- a/addons/account/wizard/account_report_partner_ledger.py
+++ b/addons/account/wizard/account_report_partner_ledger.py
@@ -35,18 +35,22 @@ class account_partner_ledger(osv.osv_memory):
         'reconcil': fields.boolean('Include Reconciled Entries', help='Consider reconciled entries'),
         'page_split': fields.boolean('One Partner Per Page', help='Display Ledger Report with One partner per page'),
         'amount_currency': fields.boolean("With Currency", help="It adds the currency column if the currency is different then the company currency"),
+        'target_move': fields.selection([('all', 'All Entries'),
+                                        ('posted', 'All Posted Entries')], 'Target Moves', required=True),
+
     }
     _defaults = {
        'reconcil': True,
        'initial_balance': True,
        'page_split': False,
+       'target_move': 'all'
     }
 
     def _print_report(self, cr, uid, ids, data, query_line, context=None):
         if context is None:
             context = {}
         data = self.pre_print_report(cr, uid, ids, data, query_line, context=context)
-        data['form'].update(self.read(cr, uid, ids, ['initial_balance', 'reconcil', 'page_split', 'amount_currency'])[0])
+        data['form'].update(self.read(cr, uid, ids, ['initial_balance', 'reconcil', 'page_split', 'amount_currency', 'target_move'])[0])
         if data['form']['page_split']:
             return {
                 'type': 'ir.actions.report.xml',
diff --git a/addons/account/wizard/account_report_partner_ledger_view.xml b/addons/account/wizard/account_report_partner_ledger_view.xml
index b4098d78083..f4cb72abe55 100644
--- a/addons/account/wizard/account_report_partner_ledger_view.xml
+++ b/addons/account/wizard/account_report_partner_ledger_view.xml
@@ -10,6 +10,7 @@
             <field name="arch" type="xml">
                <field name="fiscalyear_id" position="after">
                     <field name="result_selection"/>
+                    <field name="target_move"/>
                     <field name="initial_balance"/>
                     <field name="reconcil"/>
                     <field name="amount_currency"/>
diff --git a/addons/account/wizard/account_report_print_journal.py b/addons/account/wizard/account_report_print_journal.py
index e9c5b0fbf81..096678860ac 100644
--- a/addons/account/wizard/account_report_print_journal.py
+++ b/addons/account/wizard/account_report_print_journal.py
@@ -30,16 +30,19 @@ class account_print_journal(osv.osv_memory):
         'sort_selection': fields.selection([('date', 'Date'),
                                             ('ref', 'Reference Number'),],
                                             'Entries Sorted By', required=True),
+        'target_move': fields.selection([('all', 'All Entries'),
+                                        ('posted', 'All Posted Entries')], 'Target Moves', required=True)
     }
     _defaults = {
         'sort_selection': 'date',
+        'target_move': 'all'
     }
 
     def _print_report(self, cr, uid, ids, data, query_line, context=None):
         if context is None:
             context = {}
         data = self.pre_print_report(cr, uid, ids, data, query_line, context=context)
-        data['form'].update(self.read(cr, uid, ids, ['sort_selection'])[0])
+        data['form'].update(self.read(cr, uid, ids, ['sort_selection','target_move'])[0])
         return {'type': 'ir.actions.report.xml', 'report_name': 'account.journal.period.print', 'datas': data}
 
 account_print_journal()
diff --git a/addons/account/wizard/account_report_print_journal_view.xml b/addons/account/wizard/account_report_print_journal_view.xml
index 22cc1aca72a..2b4a597b87b 100644
--- a/addons/account/wizard/account_report_print_journal_view.xml
+++ b/addons/account/wizard/account_report_print_journal_view.xml
@@ -10,6 +10,7 @@
             <field name="arch" type="xml">
                <field name="fiscalyear_id" position="after">
                    <field name="sort_selection"/>
+                   <field name="target_move"/>
                    <field name="amount_currency"/>
                    <newline/>
                </field>
diff --git a/addons/account_voucher/__openerp__.py b/addons/account_voucher/__openerp__.py
index fd77dce3f91..824ca746f37 100644
--- a/addons/account_voucher/__openerp__.py
+++ b/addons/account_voucher/__openerp__.py
@@ -46,11 +46,12 @@
         "voucher_payment_receipt_view.xml",
         "voucher_sales_purchase_view.xml",
         "voucher_wizard.xml",
+        "security/account_voucher_security.xml"
     ],
     "test" : [
 #         "test/account_voucher.yml",
-          "test/sales_receipt.yml",
-          "test/sales_payment.yml",
+#          "test/sales_receipt.yml",
+#          "test/sales_payment.yml",
     ],
     'certificate': '0037580727101',
     "active": False,
diff --git a/addons/account_voucher/security/account_voucher_security.xml b/addons/account_voucher/security/account_voucher_security.xml
new file mode 100644
index 00000000000..df4e58484b5
--- /dev/null
+++ b/addons/account_voucher/security/account_voucher_security.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="voucher_comp_rule" model="ir.rule">
+            <field name="name">Voucher multi-company</field>
+            <field model="ir.model" name="model_id" ref="model_account_voucher"/>
+            <field eval="True" name="global"/>
+            <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+        </record>
+        <record id="voucher_line_comp_rule" model="ir.rule">
+            <field name="name">Voucher Line multi-company</field>
+            <field model="ir.model" name="model_id" ref="model_account_voucher_line"/>
+            <field eval="True" name="global"/>
+            <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+        </record>
+    </data>
+</openerp>
diff --git a/addons/account_voucher/voucher.py b/addons/account_voucher/voucher.py
index 3a9855e35f3..57b74d948d8 100644
--- a/addons/account_voucher/voucher.py
+++ b/addons/account_voucher/voucher.py
@@ -59,16 +59,23 @@ class account_voucher(osv.osv):
             return context.get('journal_id')
         if not context.get('journal_id', False) and context.get('search_default_journal_id', False):
             return context.get('search_default_journal_id')
-            
+        
         ttype = context.get('type', 'bank')
         res = journal_pool.search(cr, uid, [('type', '=', ttype)], limit=1)
         return res and res[0] or False
 
     def _get_tax(self, cr, uid, context={}):
+        journal_pool = self.pool.get('account.journal')
         journal_id = context.get('journal_id', False)
+        if not journal_id:
+            ttype = context.get('type', 'bank')
+            res = journal_pool.search(cr, uid, [('type', '=', ttype)], limit=1)
+            if not res:
+                return False
+            journal_id = res[0]
+        
         if not journal_id:
             return False
-        journal_pool = self.pool.get('account.journal')
         journal = journal_pool.browse(cr, uid, journal_id)
         account_id = journal.default_credit_account_id or journal.default_debit_account_id
         if account_id and account_id.tax_ids:
@@ -77,14 +84,24 @@ class account_voucher(osv.osv):
         return False
 
     def _get_currency(self, cr, uid, context):
-        user = self.pool.get('res.users').browse(cr, uid, uid)
-        if user.company_id:
-            return user.company_id.currency_id.id
+        journal_pool = self.pool.get('account.journal')
+        journal_id = context.get('journal_id', False)
+        if journal_id:
+            journal = journal_pool.browse(cr, uid, journal_id)
+            currency_id = journal.company_id.currency_id.id
+            if journal.currency:
+                currency_id = journal.currency.id
         return False
     
     def _get_partner(self, cr, uid, context={}):
         return context.get('partner_id', False)
     
+    def _get_reference(self, cr, uid, context={}):
+        return context.get('reference', False)
+    
+    def _get_narration(self, cr, uid, context={}):
+        return context.get('narration', False)
+        
     _name = 'account.voucher'
     _description = 'Accounting Voucher'
     _order = "date desc, id desc"
@@ -100,7 +117,6 @@ class account_voucher(osv.osv):
         'date':fields.date('Date', readonly=True, states={'draft':[('readonly',False)]}, help="Effective date for accounting entries"),
         'journal_id':fields.many2one('account.journal', 'Journal', required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'account_id':fields.many2one('account.account', 'Account', required=True, readonly=True, states={'draft':[('readonly',False)]}),
-
         'line_ids':fields.one2many('account.voucher.line','voucher_id','Voucher Lines', readonly=True, states={'draft':[('readonly',False)]}),
         'line_cr_ids':fields.one2many('account.voucher.line','voucher_id','Credits',
             domain=[('type','=','cr')], context={'default_type':'cr'}, readonly=True, states={'draft':[('readonly',False)]}),
@@ -108,8 +124,9 @@ class account_voucher(osv.osv):
             domain=[('type','=','dr')], context={'default_type':'dr'}, readonly=True, states={'draft':[('readonly',False)]}),
         'period_id': fields.many2one('account.period', 'Period', required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'narration':fields.text('Notes', readonly=True, states={'draft':[('readonly',False)]}),
-        'currency_id': fields.many2one('res.currency', 'Currency', required=True, readonly=True, states={'draft':[('readonly',False)]}),
-        'company_id': fields.many2one('res.company', 'Company', required=True),
+        'currency_id':fields.many2one('res.currency', 'Currency', readonly=True, states={'draft':[('readonly',False)]}),
+#        'currency_id': fields.related('journal_id','currency', type='many2one', relation='res.currency', string='Currency', store=True, readonly=True, states={'draft':[('readonly',False)]}),
+        'company_id': fields.many2one('res.company', 'Company', required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'state':fields.selection(
             [('draft','Draft'),
              ('proforma','Pro-forma'),
@@ -141,6 +158,8 @@ class account_voucher(osv.osv):
         'partner_id': _get_partner,
         'journal_id':_get_journal,
         'currency_id': _get_currency,
+        'reference': _get_reference,
+        'narration':_get_narration,
         'type':_get_type,
         'state': lambda *a: 'draft',
         'pay_now':lambda *a: 'pay_later',
@@ -254,7 +273,7 @@ class account_voucher(osv.osv):
             })
         return {'value':default}
     
-    def onchange_journal_voucher(self, cr, uid, ids, partner_id=False, journal_id=False, context={}):
+    def onchange_journal_voucher(self, cr, uid, ids, line_ids=False, tax_id=False, price=0.0, partner_id=False, journal_id=False, ttype=False, context={}):
         """price
         Returns a dict that contains new values and context
     
@@ -290,9 +309,13 @@ class account_voucher(osv.osv):
 
         default['value']['account_id'] = account_id
         default['value']['type'] = tr_type
+        
+        vals = self.onchange_journal(cr, uid, ids, journal_id, line_ids, tax_id, partner_id, context)
+        default['value'].update(vals.get('value'))
+        
         return default
     
-    def onchange_partner_id(self, cr, uid, ids, partner_id, journal_id=False, price=0.0, currency_id=False, ttype=False, context={}):
+    def onchange_partner_id(self, cr, uid, ids, partner_id, journal_id, price, currency_id, ttype, context={}):
         """price
         Returns a dict that contains new values and context
     
@@ -311,8 +334,12 @@ class account_voucher(osv.osv):
         move_line_pool = self.pool.get('account.move.line')
         partner_pool = self.pool.get('res.partner')
         journal_pool = self.pool.get('account.journal')
+        
+        vals = self.onchange_journal(cr, uid, ids, journal_id, [], False, partner_id, context)
+        vals = vals.get('value')
+        currency_id = vals.get('currency_id', currency_id)
         default = {
-            'value':{'line_ids':[], 'line_dr_ids':[], 'line_cr_ids':[], 'pre_line': False},
+            'value':{'line_ids':[], 'line_dr_ids':[], 'line_cr_ids':[], 'pre_line': False, 'currency_id':currency_id},
         }
 
         if not partner_id:
@@ -352,7 +379,7 @@ class account_voucher(osv.osv):
         ids.reverse()
         moves = move_line_pool.browse(cr, uid, ids)
         
-        company_currency = self.pool.get('res.users').browse(cr, uid, uid).company_id.currency_id.id
+        company_currency = journal.company_id.currency_id.id
         if company_currency != currency_id and ttype == 'payment':
             total_debit = currency_pool.compute(cr, uid, currency_id, company_currency, total_debit)
         elif company_currency != currency_id and ttype == 'receipt':
@@ -362,8 +389,7 @@ class account_voucher(osv.osv):
             if line.credit and line.reconcile_partial_id and ttype == 'receipt':
                 continue
             if line.debit and line.reconcile_partial_id and ttype == 'payment':
-                continue
-            
+                continue            
             total_credit += line.credit or 0.0
             total_debit += line.debit or 0.0
 
@@ -373,15 +399,16 @@ class account_voucher(osv.osv):
             if line.debit and line.reconcile_partial_id and ttype == 'payment':
                 continue
             
+            orignal_amount = line.credit or line.debit or 0.0
             rs = {
                 'name':line.move_id.name,
                 'type': line.credit and 'dr' or 'cr',
                 'move_line_id':line.id,
                 'account_id':line.account_id.id,
-                'amount_original':line.credit or line.debit or 0.0,
+                'amount_original':currency_pool.compute(cr, uid, company_currency, currency_id, orignal_amount),
                 'date_original':line.date,
                 'date_due':line.date_maturity,
-                'amount_unreconciled': line.amount_unreconciled
+                'amount_unreconciled':currency_pool.compute(cr, uid, company_currency, currency_id, line.amount_unreconciled)
             }
             if line.credit:
                 amount = min(line.amount_unreconciled, total_debit)
@@ -433,6 +460,10 @@ class account_voucher(osv.osv):
         
         vals = self.onchange_price(cr, uid, ids, line_ids, tax_id, partner_id, context)
         vals['value'].update({'tax_id':tax_id})
+        currency_id = journal.company_id.currency_id.id
+        if journal.currency:
+            currency_id = journal.currency.id
+        vals['value'].update({'currency_id':currency_id})
         return vals
 
     def proforma_voucher(self, cr, uid, ids):
@@ -516,9 +547,6 @@ class account_voucher(osv.osv):
             if inv.move_id:
                 continue
 
-            if not inv.line_ids:
-                raise osv.except_osv(_('Error !'), _('You can not validate a voucher without lines !'))
-
             if inv.journal_id.sequence_id:
                 name = self.pool.get('ir.sequence').get_id(cr, uid, inv.journal_id.sequence_id.id)
             else:
@@ -533,12 +561,13 @@ class account_voucher(osv.osv):
                 'period_id': inv.period_id and inv.period_id.id or False
             }
             move_id = move_pool.create(cr, uid, move)
-            company_currency = inv.account_id.company_id.currency_id.id
             
             #create the first line manually
+            company_currency = inv.journal_id.company_id.currency_id.id
             debit = 0.0
             credit = 0.0
-            # TODO: is there any other alternative then the voucher type ??
+            # TODO: is there any other alternative then the voucher type ?? 
+            # -for sale, purchase we have but for the payment and receipt we do not have as based on the bank/cash journal we can not know its payment or receipt
             if inv.type in ('purchase', 'payment'):
                 credit = currency_pool.compute(cr, uid, inv.currency_id.id, company_currency, inv.amount)
             elif inv.type in ('sale', 'receipt'):
@@ -560,6 +589,7 @@ class account_voucher(osv.osv):
                 'period_id':inv.period_id.id,
                 'partner_id':inv.partner_id.id,
                 'currency_id':inv.currency_id.id,
+                'amount_currency':inv.amount,
                 'date':inv.date,
                 'date_maturity':inv.date_due
             }
@@ -569,11 +599,10 @@ class account_voucher(osv.osv):
 
             rec_list_ids = []
             line_total = debit - credit
-            
             if inv.type == 'sale':
-                line_total = line_total - inv.tax_amount
+                line_total = line_total - currency_pool.compute(cr, uid, inv.currency_id.id, company_currency, inv.tax_amount)
             elif inv.type == 'purchase':
-                line_total = line_total + inv.tax_amount
+                line_total = line_total + currency_pool.compute(cr, uid, inv.currency_id.id, company_currency, inv.tax_amount)
 
             for line in inv.line_ids:
                 if not line.amount:
@@ -617,7 +646,7 @@ class account_voucher(osv.osv):
                 if line.move_line_id.id:
                     rec_ids = [master_line, line.move_line_id.id]
                     rec_list_ids.append(rec_ids)
-
+            
             if not self.pool.get('res.currency').is_zero(cr, uid, inv.currency_id, line_total):
                 diff = line_total
                 move_line = {
@@ -642,7 +671,7 @@ class account_voucher(osv.osv):
                 'move_id': move_id,
                 'state':'posted'
             })
-            #move_pool.post(cr, uid, [move_id], context={})
+            move_pool.post(cr, uid, [move_id], context={})
             for rec_ids in rec_list_ids:
                 if len(rec_ids) >= 2:
                     move_line_pool.reconcile_partial(cr, uid, rec_ids)
@@ -669,16 +698,27 @@ class account_voucher_line(osv.osv):
     _order = "move_line_id"
     
     def _compute_balance(self, cr, uid, ids, name, args, context=None):
-        res = {}
+        currency_pool = self.pool.get('res.currency')
+        rs_data = {}
         for line in self.browse(cr, uid, ids):
+            res = {}
+            company_currency = line.voucher_id.journal_id.company_id.currency_id.id
+            voucher_currency = line.voucher_id.currency_id.id
             move_line = line.move_line_id or False
+            
             if not move_line:
-                res[line.id] = 0.0
+                res['amount_original'] = 0.0
+                res['amount_unreconciled'] = 0.0
+                
             elif move_line and move_line.credit > 0:
-                res[line.id] = move_line.credit
+                res['amount_original'] = currency_pool.compute(cr, uid, company_currency, voucher_currency, move_line.credit)
             else:
-                res[line.id] = move_line.debit
-        return res
+                res['amount_original'] = currency_pool.compute(cr, uid, company_currency, voucher_currency, move_line.debit)
+            
+            if move_line:
+                res['amount_unreconciled'] = currency_pool.compute(cr, uid, company_currency, voucher_currency, move_line.amount_unreconciled)
+            rs_data[line.id] = res
+        return rs_data
 
     _columns = {
         'voucher_id':fields.many2one('account.voucher', 'Voucher', required=1, ondelete='cascade'),
@@ -686,14 +726,15 @@ class account_voucher_line(osv.osv):
         'account_id':fields.many2one('account.account','Account', required=True),
         'partner_id':fields.related('voucher_id', 'partner_id', type='many2one', relation='res.partner', string='Partner'),
         'untax_amount':fields.float('Untax Amount'),
-        'amount':fields.float('Amount'),
+        'amount':fields.float('Amount', digits=(14,2)),
         'type':fields.selection([('dr','Debit'),('cr','Credit')], 'Cr/Dr'),
         'account_analytic_id':  fields.many2one('account.analytic.account', 'Analytic Account'),
         'move_line_id': fields.many2one('account.move.line', 'Journal Item'),
         'date_original': fields.related('move_line_id','date', type='date', relation='account.move.line', string='Date', readonly=1),
         'date_due': fields.related('move_line_id','date_maturity', type='date', relation='account.move.line', string='Due Date', readonly=1),
-        'amount_original': fields.function(_compute_balance, method=True, type='float', string='Originial Amount', store=True),
-        'amount_unreconciled': fields.related('move_line_id','amount_unreconciled', type='float', relation='account.move.line', string='Open Balance', store=True, readonly="1"),
+        'amount_original': fields.function(_compute_balance, method=True, multi='dc', type='float', string='Originial Amount', store=True),
+        'amount_unreconciled': fields.function(_compute_balance, method=True, multi='dc', type='float', string='Open Balance', store=True),
+        'company_id': fields.related('voucher_id','company_id', relation='res.company', string='Company', store=True),
     }
     _defaults = {
         'name': lambda *a: ''
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index a708f42e257..fd79598a286 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -138,7 +138,7 @@
                             <group col="2" colspan="1">
                                 <separator string="Other Information" colspan="2"/>
                                 <field name="date" select="1" on_change="onchange_date(date)"/>
-                                <field name="currency_id" select="1" attrs="{'readonly':[('type','in',['sale', 'purchase'])]}"/>
+                                <field name="currency_id" invisible="True"/>
                                 <field name="number"/>
                             </group>
                         </page>
@@ -244,7 +244,7 @@
                             <group col="2" colspan="1">
                                 <separator string="Other Information" colspan="2"/>
                                 <field name="date" select="1" on_change="onchange_date(date)"/>
-                                <field name="currency_id" select="1"/>
+                                <field name="currency_id" invisible="True"/>
                                 <field name="number"/>
                             </group>
                         </page>
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index 9a55d5e4f83..7dd79c2d829 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -40,7 +40,6 @@
             </field>
         </record>
 
-
         <record id="view_voucher_filter_sale" model="ir.ui.view">
             <field name="name">account.voucher.sale.select</field>
             <field name="model">account.voucher</field>
@@ -80,7 +79,6 @@
             </field>
         </record>
 
-
         <record id="act_pay_voucher" model="ir.actions.act_window">
             <field name="name">Sales Payment</field>
             <field name="res_model">account.voucher</field>
@@ -98,7 +96,7 @@
             <field name="arch" type="xml">
                 <form string="Sales Receipt">
                     <group col="6" colspan="4">
-                        <field name="partner_id" required="1" on_change="onchange_partner_id(partner_id, journal_id)" string="Customer"/>
+                        <field name="partner_id" required="1" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type)" string="Customer"/>
                         <field name="journal_id" domain="[('type','in',['sale','sale_refund'])]" widget="selection" on_change="onchange_journal(journal_id, line_cr_ids, tax_id, partner_id)"/>
                         <field name="number"/>
                         <field name="name" colspan="4"/>
@@ -135,7 +133,7 @@
                                 <group col="4" colspan="1">
                                     <separator string="Total" colspan="4"/>
                                     <field name="tax_id" on_change="onchange_price(line_cr_ids, tax_id, partner_id)" widget="selection" domain="[('type_tax_use','in',('sale','all'))]"/><field name="tax_amount" nolabel="1"/><button type="object" icon="terp-stock_format-scientific" name="compute_tax" groups="base.group_extended" string="Compute Tax" attrs="{'invisible': [('state','!=','draft')]}"/>
-                                    <label colspan="1" string=""/><field name="amount" string="Total"/>
+                                    <label string="" colspan="1"/><field name="currency_id" invisible="True" nolabel="1"/><field name="amount" string="Total"/>
                                 </group>
                             </group>
                         </page>
@@ -154,7 +152,7 @@
                         <button name="cancel_voucher" string="Cancel" states="draft,proforma"  icon="gtk-cancel"/>
                         <button name="cancel_voucher" string="Cancel" type="object" states="posted" icon="terp-stock_effects-object-colorize" confirm="Are you sure to confirm this record ?"/>
                         <button name="proforma_voucher" string="Post" states="draft" icon="terp-camera_test"/>
-                        <button icon="terp-dolar_ok!" name="%(act_pay_voucher)d" context="{'title':'Sales Payment', 'type':'receipt', 'partner_id': partner_id}" type="action" string="Pay" attrs="{'invisible':[('pay_now','!=','pay_now'),('state','!=','posted')]}"/>
+                        <button icon="terp-dolar_ok!" name="%(act_pay_voucher)d" context="{'narration':narration, 'title':'Sales Payment', 'type':'receipt', 'partner_id': partner_id, 'reference':reference}" type="action" string="Pay" attrs="{'invisible':[('pay_now','!=','pay_now'), ('state','!=','posted')]}"/>
                         <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize"/>
                     </group>
                 </form>
@@ -206,7 +204,7 @@
             <field name="arch" type="xml">
                 <form string="Vendor Bills">
                     <group col="6" colspan="4">
-                        <field name="partner_id" required="1" string="Vendor" on_change="onchange_partner_id(partner_id, journal_id, amount)"/>
+                        <field name="partner_id" required="1" string="Vendor" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type)"/>
                         <field name="journal_id" domain="[('type','in',['purchase','purchase_refund'])]" widget="selection" select="1" on_change="onchange_journal(journal_id, line_dr_ids, tax_id, partner_id)"/>
                         <field name="number"/>
                         <field name="name" colspan="4"/>
@@ -216,7 +214,7 @@
                     </group>
                     <notebook colspan="4">
                         <page string="Bill Information">
-                            <field name="line_dr_ids" on_change="onchange_price(line_dr_ids, False, parent.partner_id)" default_get="{'journal_id':journal_id,'partner_id':partner_id}" colspan="4" nolabel="1" height="180">
+                            <field name="line_dr_ids" on_change="onchange_price(line_dr_ids, tax_id, partner_id)" default_get="{'journal_id':journal_id,'partner_id':partner_id}" colspan="4" nolabel="1" height="180">
                                 <tree string="Expense Lines" editable="bottom">
                                     <field name="account_id" widget="selection" domain="[('user_type.report_type','=','expense'), ('type','!=','view')]"/>
                                     <field name="name"/>
@@ -237,7 +235,7 @@
                                 <group col="4" colspan="1">
                                     <separator string="Total" colspan="4"/>
                                     <field name="tax_id" on_change="onchange_price(line_dr_ids, tax_id, partner_id)" widget="selection" domain="[('type_tax_use','in',('purchase','all'))]"/><field name="tax_amount" nolabel="1"/><button type="object" icon="terp-stock_format-scientific" name="compute_tax" string="Compute Tax" groups="base.group_extended" attrs="{'invisible': [('state','!=','draft')]}"/>
-                                    <label colspan="1" string=""/><field name="amount" string="Total"/>
+                                    <label string="" colspan="1"/><field name="currency_id" invisible="True" nolabel="1"/><field name="amount" string="Total"/>
                                 </group>
                             </group>
                         </page>
@@ -256,7 +254,7 @@
                         <button name="cancel_voucher" string="Cancel" states="draft,proforma"  icon="gtk-cancel"/>
                         <button name="cancel_voucher" string="Cancel" type="object" states="posted" icon="terp-stock_effects-object-colorize" confirm="Are you sure to confirm this record ?"/>
                         <button name="proforma_voucher" string="Post" states="draft" icon="terp-camera_test"/>
-                        <button icon="terp-dolar_ok!" name="%(act_pay_bills)d" context="{'title':'Bill Payment', 'type':'payment', 'partner_id': partner_id}" type="action" string="Pay Bill" attrs="{'invisible':[('state','!=','posted')]}"/>
+                        <button icon="terp-dolar_ok!" name="%(act_pay_bills)d" context="{'narration':narration, 'title':'Bill Payment', 'type':'payment', 'partner_id': partner_id, 'reference':reference}" type="action" string="Pay Bill" attrs="{'invisible':[('pay_now','!=','pay_now'), ('state','!=','posted')]}"/>
                         <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize"/>
                     </group>
                 </form>
diff --git a/addons/account_voucher/voucher_view.xml b/addons/account_voucher/voucher_view.xml
index 94f7f18c4a0..94b257775c1 100644
--- a/addons/account_voucher/voucher_view.xml
+++ b/addons/account_voucher/voucher_view.xml
@@ -28,8 +28,8 @@
             <field name="arch" type="xml">
                 <form string="Accounting Voucher">
                     <group col="6" colspan="4">
-                        <field name="partner_id" required="1" on_change="onchange_journal_voucher(partner_id, journal_id)"/>
-                        <field name="journal_id" widget="selection" select="1" on_change="onchange_journal_voucher(partner_id, journal_id)"/>
+                        <field name="partner_id" required="1" on_change="onchange_journal_voucher(line_ids, tax_id, amount, partner_id, journal_id, type)"/>
+                        <field name="journal_id" widget="selection" select="1" on_change="onchange_journal_voucher(line_ids, tax_id, amount, partner_id, journal_id, type)"/>
                         <field name="type" required="1"/>
                         <field name="name" colspan="4"/>
                         <field name="reference" select="1"/>
@@ -37,7 +37,7 @@
                     </group>
                     <notebook colspan="4">
                         <page string="Voucher Entry">
-                            <field name="line_ids" default_get="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}" colspan="4" nolabel="1" height="180">
+                            <field name="line_ids" on_change="onchange_price(line_ids, tax_id, partner_id)" default_get="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}" colspan="4" nolabel="1" height="180">
                                 <tree string="Voucher Items" editable="bottom">
                                     <field name="account_id"/>
                                     <field name="name"/>
@@ -55,11 +55,11 @@
                                     <separator string="Other Information" colspan="2"/>
                                     <field name="number"/>
                                     <field name="date" on_change="onchange_date(date)"/>
-                                    <field name="currency_id" attrs="{'readonly':[('type','in',['sale', 'purchase'])]}"/>
+                                    <field name="currency_id" invisible="True"/>
                                 </group>
                                 <group col="4" colspan="1" attrs="{'invisible':[('type','in',['payment', 'receipt', False])]}">
                                     <separator string="Total" colspan="4"/>
-                                    <field name="tax_id" on_change="onchange_price(line_cr_ids, tax_id, partner_id)" widget="selection" domain="[('type_tax_use','in',('sale','all'))]"/><field name="tax_amount" nolabel="1"/><button type="object" icon="terp-stock_format-scientific" name="compute_tax" groups="base.group_extended" string="Compute Tax" attrs="{'invisible': [('state','!=','draft')]}"/>
+                                    <field name="tax_id" on_change="onchange_price(line_ids, tax_id, partner_id)" widget="selection"/><field name="tax_amount" nolabel="1"/><button type="object" icon="terp-stock_format-scientific" name="compute_tax" groups="base.group_extended" string="Compute Tax" attrs="{'invisible': [('state','!=','draft')]}"/>
                                     <label colspan="1" string=""/><field name="amount" string="Total"/>
                                 </group>
                             </group>
diff --git a/addons/l10n_chart_uk_minimal/l10n_uk_chart.xml b/addons/l10n_chart_uk_minimal/l10n_uk_chart.xml
index 63b11c6c58d..f367d8b5739 100644
--- a/addons/l10n_chart_uk_minimal/l10n_uk_chart.xml
+++ b/addons/l10n_chart_uk_minimal/l10n_uk_chart.xml
@@ -56,7 +56,7 @@
 
         <record id="a_reserve_and_surplus" model="account.account.template">
             <field name="code">1113</field>
-            <field name="name">Reserve and Surplus Account</field>
+            <field name="name">Reserve and Profit/Loss Account</field>
             <field ref="cli" name="parent_id"/>
             <field name="type">other</field>
             <field name="user_type" ref="account_type_liability"/>
@@ -173,7 +173,7 @@
         </record>
 
         <record id="rev" model="account.account.template">
-            <field name="code">200</field>        
+            <field name="code">200</field>
             <field name="name">Revenue</field>
             <field ref="income_view" name="parent_id"/>
             <field name="type">view</field>
diff --git a/addons/l10n_in/l10n_in_chart.xml b/addons/l10n_in/l10n_in_chart.xml
index 3a043231d0f..9272fe4e18d 100644
--- a/addons/l10n_in/l10n_in_chart.xml
+++ b/addons/l10n_in/l10n_in_chart.xml
@@ -268,7 +268,7 @@
         </record>
 
         <record model="account.account.template" id="IA_AC0232">
-            <field name="name">Reserve and Surplus Account</field>
+            <field name="name">Reserve and Profit/Loss Account</field>
             <field name="code">IA_AC0232</field>
             <field name="type">other</field>
             <field name="user_type" ref="account_type_liability1"/>
@@ -366,7 +366,7 @@
             <field name="reconcile" eval="False"/>
             <field name="parent_id" ref="IA_AC11"/>
         </record>
-        
+
         <record model="account.account.template" id="IA_AC114">
             <field name="name">Opening Stock</field>
             <field name="code">IA_AC114</field>
@@ -494,6 +494,6 @@
             <field name="property_account_income_categ" ref="IA_AC122"/>
             <field name="property_reserve_and_surplus_account" ref="IA_AC0232"/>
         </record>
-        
+
     </data>
 </openerp>