From fc97015a62575a4839e32f921af109561d71502f Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Wed, 15 Sep 2010 11:40:46 +0530
Subject: [PATCH] [IMP] Account: Rename surplus to profit/loss

bzr revid: mra@mra-laptop-20100915061046-d0v0p9mc8xe9vy2j
---
 addons/account/account.py                     |  2 +-
 addons/account/company.py                     |  2 +-
 addons/account/company_view.xml               |  4 +-
 addons/account/configurable_account_chart.xml | 86 +++++++++----------
 addons/account/demo/account_minimal.xml       |  2 +-
 .../wizard/account_report_balance_sheet.py    |  4 +-
 .../l10n_chart_uk_minimal/l10n_uk_chart.xml   |  4 +-
 addons/l10n_in/l10n_in_chart.xml              |  6 +-
 8 files changed, 55 insertions(+), 55 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index b1c19476548..f461be1b2ed 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()
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 ecffb6cef12..58399db3111 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,7 +182,7 @@
 			            <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>
@@ -190,7 +190,7 @@
 			            <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     -->
 	    <!-- = = = = = = = = = = = = = = = -->
-        
-        
+
+
         <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/wizard/account_report_balance_sheet.py b/addons/account/wizard/account_report_balance_sheet.py
index ebe3b4c8ba8..30ee28d17ff 100644
--- a/addons/account/wizard/account_report_balance_sheet.py
+++ b/addons/account/wizard/account_report_balance_sheet.py
@@ -34,7 +34,7 @@ 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')]),
     }
 
@@ -60,7 +60,7 @@ 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])
         if data['form']['display_type']:
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>