odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] Account: Rename surplus to profit/loss 

bzr revid: mra@mra-laptop-20100915061046-d0v0p9mc8xe9vy2j
This commit is contained in:
Mustufa Rangwala 2010-09-15 11:40:46 +05:30
parent 2f4e994ea2
commit fc97015a62
8 changed files with 55 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/account/account.py
View File

@ -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()

2
addons/account/company.py
View File

@ -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')]",

2
addons/account/company_view.xml
View File

@ -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>

2
addons/account/configurable_account_chart.xml
View File

@ -218,7 +218,7 @@
<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"/>

2
addons/account/demo/account_minimal.xml
View File

@ -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"/>

4
addons/account/wizard/account_report_balance_sheet.py
View File

@ -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']:

2
addons/l10n_chart_uk_minimal/l10n_uk_chart.xml
View File

@ -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"/>

2
addons/l10n_in/l10n_in_chart.xml
View File

@ -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"/>