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

[IMP] account: Changed value of selection field 'only_detail' by 'detail_flat'. 

auction,hr_payroll_account,l10n_de: Changed demo data according to change in xml ids of account types.

bzr revid: uco@tinyerp.com-20111213114507-733esietgnh04z5l
This commit is contained in:
Ujjvala Collins (OpenERP) 2011-12-13 17:15:07 +05:30
parent cc867d6855
commit 1dedc1d259
8 changed files with 2384 additions and 2384 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/account/account.py
View File

@ -3006,7 +3006,7 @@ class account_financial_report(osv.osv):
'account_ids': fields.many2many('account.account', 'account_account_financial_report', 'report_line_id', 'account_id', 'Accounts'),
'display_detail': fields.selection([
('no_detail','No detail'),
('only_detail','Display children flat'),
('detail_flat','Display children flat'),
('detail_with_hierarchy','Display children with hierarchy')
], 'Display details'),
'account_report_id': fields.many2one('account.financial.report', 'Report Value'),
@ -3016,7 +3016,7 @@ class account_financial_report(osv.osv):
_defaults = {
'type': 'sum',
'display_detail': 'only_detail',
'display_detail': 'detail_flat',
'sign': 1,
}

2
addons/account/report/account_financial_report.py
View File

@ -70,7 +70,7 @@ class report_account_common(report_sxw.rml_parse, common_report_header):
account_ids = account_obj.search(self.cr, self.uid, [('user_type','in', [x.id for x in report.account_type_ids])])
if account_ids:
for account in account_obj.browse(self.cr, self.uid, account_ids, context=data['form']['used_context']):
if report.display_detail == 'only_detail' and account.type == 'view':
if report.display_detail == 'detail_flat' and account.type == 'view':
continue
flag = False
vals = {

8
addons/auction/auction_demo.xml
View File

@ -21,7 +21,7 @@
<field name="parent_id" eval="0">
<value search="[('type','=','view')]" model="account.account"/>
</field>
<field name="user_type" ref="account.account_type_root"/>
<field name="user_type" ref="account.data_account_type_view"/>
</record>
<record model="account.account" id="auction_expense_view">
@ -32,13 +32,13 @@
<field name="parent_id" eval="0">
<value search="[('type','=','view')]" model="account.account"/>
</field>
<field name="user_type" ref="account.account_type_expense"/>
<field name="user_type" ref="account.data_account_type_expense"/>
</record>
<record model="account.account" id="auction_income">
<field name="name">Auction Adjudications</field>
<field name="code">A7x*</field>
<field name="user_type" ref="account.account_type_income"/>
<field name="user_type" ref="account.data_account_type_income"/>
<field name="type">other</field>
<field name="currency_id" search="[('name','=','EUR')]"/>
<field name="parent_id" eval="auction_income_view"/>
@ -47,7 +47,7 @@
<record model="account.account" id="auction_expense">
<field name="name">Auction Adjudication Expenses</field>
<field name="code">A6x*</field>
<field name="user_type" ref="account.account_type_expense"/>
<field name="user_type" ref="account.data_account_type_expense"/>
<field name="type">other</field>
<field name="currency_id" search="[('name','=','EUR')]"/>
<field name="parent_id" eval="auction_expense_view"/>

6
addons/hr_payroll_account/hr_payroll_account_demo.xml
View File

@ -81,7 +81,7 @@
<field name="name">Bank Current Account</field>
<field ref="account.cas" name="parent_id"/>
<field name="type">liquidity</field>
<field name="user_type" ref="account.account_type_asset"/>
<field name="user_type" ref="account.data_account_type_asset"/>
</record>
<record id="a_salary_expense" model="account.account">
@ -89,7 +89,7 @@
<field name="name">Salary Expenses</field>
<field ref="account.ovr" name="parent_id"/>
<field name="type">other</field>
<field name="user_type" ref="account.account_type_expense"/>
<field name="user_type" ref="account.data_account_type_expense"/>
</record>
<record id="a_creditors" model="account.account">
@ -98,7 +98,7 @@
<field ref="account.cli" name="parent_id"/>
<field name="type">payable</field>
<field eval="True" name="reconcile"/>
<field name="user_type" ref="account.account_type_payable"/>
<field name="user_type" ref="account.data_account_type_payable"/>
</record>

2080
addons/l10n_de/account_chart_skr03.xml
View File

File diff suppressed because it is too large Load Diff

2660
addons/l10n_de/account_chart_skr04.xml
View File

File diff suppressed because it is too large Load Diff

4
addons/l10n_de/account_types_skr03.xml
View File

@ -15,14 +15,14 @@
<field name="close_method">none</field>
</record>
<record model="account.account.type" id="account.account_type_expense">
<record model="account.account.type" id="account.data_account_type_expense">
<field name="name">Erfolgskonten - Aufwendungen</field>
<field name="code">expense</field>
<field name="report_type">expense</field>
<field name="close_method">none</field>
</record>
<record model="account.account.type" id="account.account_type_asset">
<record model="account.account.type" id="account.data_account_type_asset">
<field name="name">Bilanzkonten - Aktiva - Vermögenskonten</field>
<field name="code">balance asset</field>
<field name="report_type">asset</field>

4
addons/l10n_de/account_types_skr04.xml
View File

@ -15,14 +15,14 @@
<field name="close_method">none</field>
</record>
<record model="account.account.type" id="account.account_type_expense">
<record model="account.account.type" id="account.data_account_type_expense">
<field name="name">Erfolgskonten - Aufwendungen</field>
<field name="code">expense</field>
<field name="report_type">expense</field>
<field name="close_method">none</field>
</record>
<record model="account.account.type" id="account.account_type_asset">
<record model="account.account.type" id="account.data_account_type_asset">
<field name="name">Bilanzkonten - Aktiva - Vermögenskonten</field>
<field name="code">balance asset</field>
<field name="report_type">asset</field>