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

[REF] account: removed dead field 'property_reserve_and_surplus_account' that was not used anymore 

bzr revid: qdp-launchpad@openerp.com-20121015114847-j2po052ckxtgegqc
This commit is contained in:
Quentin (OpenERP) 2012-10-15 13:48:47 +02:00
parent 547c05e8d8
commit d56be2c622
16 changed files with 2 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/account/account.py
View File

@ -2768,7 +2768,6 @@ 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 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'),
'property_account_income_opening': fields.many2one('account.account.template', 'Opening Entries Income Account'),
'property_account_expense_opening': fields.many2one('account.account.template', 'Opening Entries Expense Account'),
}
@ -3216,7 +3215,6 @@ class wizard_multi_charts_accounts(osv.osv_memory):
('property_account_income_categ','product.category','account.account'),
('property_account_expense','product.template','account.account'),
('property_account_income','product.template','account.account'),
('property_reserve_and_surplus_account','res.company','account.account')
]
template = self.pool.get('account.chart.template').browse(cr, uid, chart_template_id, context=context)
for record in todo_list:

1
addons/account/account_view.xml
View File

@ -2171,7 +2171,6 @@
<field name="property_account_income" domain="[('id', 'child_of', [account_root_id])]"/>
<field name="property_account_income_opening" domain="[('id', 'child_of', [account_root_id])]"/>
<field name="property_account_expense_opening" domain="[('id', 'child_of', [account_root_id])]"/>
<field name="property_reserve_and_surplus_account" />
</group>
</form>
</field>

8
addons/account/company.py
View File

@ -32,14 +32,6 @@ class res_company(osv.osv):
help="If you select 'Round per Line' : for each tax, the tax amount will first be computed and rounded for each PO/SO/invoice line and then these rounded amounts will be summed, leading to the total amount for that tax. If you select 'Round Globally': for each tax, the tax amount will be computed for each PO/SO/invoice line, then these amounts will be summed and eventually this total tax amount will be rounded. If you sell with tax included, you should choose 'Round per line' because you certainly want the sum of your tax-included line subtotals to be equal to the total amount with taxes."),
'paypal_account': fields.char("Paypal Account", size=128, help="Paypal username (usually email) for receiving online payments."),
'overdue_msg': fields.text('Overdue Payments Message', translate=True),
'property_reserve_and_surplus_account': fields.property(
'account.account',
type='many2one',
relation='account.account',
string="Reserve and Profit/Loss Account",
view_load=True,
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.), as calculated in Profit & Loss Report"),
}
_defaults = {

1
addons/account/company_view.xml
View File

@ -21,7 +21,6 @@
<field name="model">res.company</field>
<field name="arch" type="xml">
<xpath expr="//group[@name='account_grp']" position="inside">
<field name="property_reserve_and_surplus_account"/>
<field name="tax_calculation_rounding_method"/>
<field name="paypal_account" placeholder="e.g. sales@openerp.com"/>
</xpath>

1
addons/account/data/configurable_account_chart.xml
View File

@ -381,7 +381,6 @@
<field name="property_account_income_categ" ref="conf_a_sale"/>
<field name="property_account_income_opening" ref="conf_o_income"/>
<field name="property_account_expense_opening" ref="conf_o_expense"/>
<field name="property_reserve_and_surplus_account" ref="conf_a_reserve_and_surplus"/>
<field name="complete_tax_set" eval="False"/>
</record>

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

@ -304,14 +304,6 @@
<field name="company_id" ref="base.main_company"/>
</record>
<record forcecreate="True" id="property_reserve_and_surplus_account" model="ir.property">
<field name="name">property_account_receivable</field>
<field name="fields_id" search="[('model','=','res.company'),('name','=','property_reserve_and_surplus_account')]"/>
<field eval="'account.account,'+str(rsa)" name="value"/>
<field name="company_id" ref="base.main_company"/>
</record>
<!--
Account Journal
-->

1
addons/l10n_ch/sterchi_chart/account.xml
View File

@ -11807,7 +11807,6 @@
<field name="property_account_income" ref="ch_3200"/>
<field name="property_account_income_opening" ref="ch_2990"/>
<field name="property_account_expense_opening" ref="ch_2990"/>
<field name="property_reserve_and_surplus_account" ref="ch_2991"/>
</record>
<!-- journal configuration of account -->

1
addons/l10n_cn/account_chart.xml
View File

@ -957,7 +957,6 @@
<field name="property_account_payable" ref="chart2202"/>
<field name="property_account_expense_categ" ref="chart1401"/>
<field name="property_account_income_categ" ref="chart6001"/>
<field name="property_reserve_and_surplus_account" ref="chart4103"/>
</record>
<!-- 增值税 -->
<record id="vats" model="account.tax.template">

1
addons/l10n_fr/fr_pcg_taxes.xml
View File

@ -441,7 +441,6 @@
<field name="property_account_payable" ref="fr_pcg_pay"/>
<field name="property_account_expense_categ" ref="pcg_6071"/>
<field name="property_account_income_categ" ref="pcg_7071"/>
<field name="property_reserve_and_surplus_account" ref="pcg_120"/>
</record>
</data>

1
addons/l10n_gt/l10n_gt_base.xml
View File

@ -35,7 +35,6 @@
<field name="bank_account_view_id" ref="cta1101"/>
<field name="property_account_receivable" ref="cta110201"/>
<field name="property_account_payable" ref="cta210101"/>
<field name="property_reserve_and_surplus_account" ref="cta310103"/>
<field name="property_account_income_categ" ref="cta410101"/>
<field name="property_account_expense_categ" ref="cta510101"/>
</record>

1
addons/l10n_hn/l10n_hn_base.xml
View File

@ -21,7 +21,6 @@
<field name="bank_account_view_id" ref="cta1101"/>
<field name="property_account_receivable" ref="cta110201"/>
<field name="property_account_payable" ref="cta210101"/>
<field name="property_reserve_and_surplus_account" ref="cta310103"/>
<field name="property_account_income_categ" ref="cta410101"/>
<field name="property_account_expense_categ" ref="cta510101"/>
</record>

1
addons/l10n_in/l10n_in_private_chart.xml
View File

@ -514,7 +514,6 @@
<field name="property_account_payable" ref="a215"/>
<field name="property_account_expense_categ" ref="a540"/>
<field name="property_account_income_categ" ref="a311"/>
<field name="property_reserve_and_surplus_account" ref="a260"/>
</record>

1
addons/l10n_in/l10n_in_public_chart.xml
View File

@ -668,7 +668,6 @@
<field name="property_account_payable" ref="p21000"/>
<field name="property_account_expense_categ" ref="p41010"/>
<field name="property_account_income_categ" ref="p31010"/>
<field name="property_reserve_and_surplus_account" ref="p24600"/>
</record>
</data>

1
addons/l10n_nl/account_chart_netherlands.xml
View File

@ -4102,7 +4102,6 @@
<field name="property_account_payable" ref="a_pay"/> <!-- crediteuren -->
<field name="property_account_expense_categ" ref="a_expense"/><!-- aankoop grondstoffen -->
<field name="property_account_income_categ" ref="a_sale"/> <!-- verkoop rekening -->
<field name="property_reserve_and_surplus_account" ref="a_9999"/>
</record>
<!-- BTW Template

4
addons/l10n_uk/data/account.chart.template.csv
View File

@ -1,2 +1,2 @@
"id","name","account_root_id:id","tax_code_root_id:id","bank_account_view_id:id","property_account_receivable:id","property_account_payable:id","property_account_expense_categ:id","property_account_income_categ:id","property_reserve_and_surplus_account:id"
"l10n_uk","UK Tax and Account Chart Template (by SmartMode)","UK0","0","1200","1100","2100","5000","4000","3200"
"id","name","account_root_id:id","tax_code_root_id:id","bank_account_view_id:id","property_account_receivable:id","property_account_payable:id","property_account_expense_categ:id","property_account_income_categ:id"
"l10n_uk","UK Tax and Account Chart Template (by SmartMode)","UK0","0","1200","1100","2100","5000","4000"

1 id name account_root_id:id tax_code_root_id:id bank_account_view_id:id property_account_receivable:id property_account_payable:id property_account_expense_categ:id property_account_income_categ:id property_reserve_and_surplus_account:id
2 l10n_uk UK Tax and Account Chart Template (by SmartMode) UK0 0 1200 1100 2100 5000 4000 3200

1
addons/l10n_uy/account_chart_template.xml
View File

@ -1895,7 +1895,6 @@
<field name="property_account_payable" ref="uy_code_21100"/>
<field name="property_account_income_categ" ref="uy_code_4100"/>
<field name="property_account_expense_categ" ref="uy_code_5100"/>
<field name="property_reserve_and_surplus_account" ref="uy_code_3313"/>
</record>