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

[FIX] account: Balance Sheet: reserve_account_id is not truly required - it will yield a warning later anyway 

bzr revid: odo@openerp.com-20110926142813-4ve0g3pw3go1f2qg
This commit is contained in:
Olivier Dony 2011-09-26 16:28:13 +02:00
parent b0370edcb6
commit 48aaac81fa
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/account/company.py
View File

@ -32,7 +32,7 @@ class res_company(osv.osv):
string="Reserve and Profit/Loss Account", string="Reserve and Profit/Loss Account",
view_load=True, view_load=True,
domain="[('type', '=', 'other')]", domain="[('type', '=', 'other')]",
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 Profit & Loss Report"), help="This account is used for transferring Profit/Loss (If It is Profit: Amount will be added, Loss : Amount will be deducted.), as calculated in Profit & Loss Report"),
} }
_defaults = { _defaults = {

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

@ -40,10 +40,7 @@ class account_bs_report(osv.osv_memory):
_columns = { _columns = {
'display_type': fields.boolean("Landscape Mode"), 'display_type': fields.boolean("Landscape Mode"),
'reserve_account_id': fields.many2one('account.account', 'Reserve & Profit/Loss Account', 'reserve_account_id': fields.many2one('account.account', 'Reserve & Profit/Loss Account',
required=True, help='This account is used for transferring Profit/Loss (If It is Profit: Amount will be added, Loss : Amount will be deducted.), as calculated in Profit & Loss Report',
help='This Account is used for transfering Profit/Loss ' \
'(Profit: Amount will be added, Loss: Amount will be duducted), ' \
'which is calculated from Profilt & Loss Report',
domain = [('type','=','other')]), domain = [('type','=','other')]),
'journal_ids': fields.many2many('account.journal', 'account_bs_report_journal_rel', 'account_id', 'journal_id', 'Journals', required=True), 'journal_ids': fields.many2many('account.journal', 'account_bs_report_journal_rel', 'account_id', 'journal_id', 'Journals', required=True),
} }

2
addons/account/wizard/account_report_balance_sheet_view.xml
View File

@ -21,7 +21,7 @@
</xpath> </xpath>
<xpath expr="//field[@name='target_move']" position="after"> <xpath expr="//field[@name='target_move']" position="after">
<field name="display_account"/> <field name="display_account"/>
<field name="reserve_account_id" required="1"/> <field name="reserve_account_id"/>
<field name="display_type"/> <field name="display_type"/>
<newline/> <newline/>
</xpath> </xpath>