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

[ADD][FIX][IMP] account: added property field for reserve & surplus account reference to company object, fixed type head problem in uk minimum chart, configuration chart, account minimum chart. 

bzr revid: vra@tinyerp.com-20100813141406-4a5m4jty2g873r7o
This commit is contained in:
vra 2010-08-13 19:44:06 +05:30
parent 73c60da63f
commit 237c2a7240
13 changed files with 865 additions and 740 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
addons/account/account.py
View File

@ -2342,6 +2342,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 trasfering Profit/Loss(If It is Profit : Amount will be added, Loss : Amount will be duducted.), Which is calculated from Profilt & Loss Report'),
}
account_chart_template()
@ -2725,7 +2726,8 @@ class wizard_multi_charts_accounts(osv.osv_memory):
('property_account_expense_categ','product.category','account.account'),
('property_account_income_categ','product.category','account.account'),
('property_account_expense','product.template','account.account'),
('property_account_income','product.template','account.account')
('property_account_income','product.template','account.account'),
('property_reserve_and_surplus_account','res.company','account.account')
]
for record in todo_list:
r = []
@ -2738,6 +2740,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
'fields_id': field[0],
'value': account and 'account.account,'+str(acc_template_ref[account.id]) or False,
}
if r:
#the property exist: modify it
property_obj.write(cr, uid, r, vals)

1
addons/account/account_view.xml
View File

@ -2080,6 +2080,7 @@
<field name="property_account_income_categ"/>
<field name="property_account_expense"/>
<field name="property_account_income"/>
<field name="property_reserve_and_surplus_account"/>
</group>
</form>
</field>

9
addons/account/company.py
View File

@ -25,6 +25,15 @@ class res_company(osv.osv):
_inherit = "res.company"
_columns = {
'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 Surplus Account",
method=True,
view_load=True,
domain="[('type', '=', 'payable')]",
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"),
}
_defaults = {

16
addons/account/company_view.xml
View File

@ -15,5 +15,21 @@
</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"/>
<field name="model">res.company</field>
<field name="type">form</field>
<field name="arch" type="xml">
<page string="Configuration" position="inside">
<group col="2" colspan="2">
<separator string="Reserve And Surplus Account" colspan="2"/>
<field name="property_reserve_and_surplus_account" colspan="2"/>
</group>
</page>
</field>
</record>
</data>
</openerp>

93
addons/account/configurable_account_chart.xml
View File

@ -6,12 +6,14 @@
<record model="account.account.type" id="conf_account_type_receivable" >
<field name="name">Receivable</field>
<field name="code">receivable</field>
<field name="report_type">income</field>
<field name="close_method">unreconciled</field>
</record>
<record model="account.account.type" id="conf_account_type_payable" >
<field name="name">Payable</field>
<field name="code">payable</field>
<field name="report_type">expense</field>
<field name="close_method">unreconciled</field>
</record>
@ -21,50 +23,86 @@
<field name="close_method">none</field>
</record>
<record model="account.account.type" id="account_type_income_view1">
<field name="name">Income View</field>
<field name="code">view</field>
<field name="report_type">income</field>
</record>
<record model="account.account.type" id="account_type_expense_view1">
<field name="name">Expense View</field>
<field name="code">expense</field>
<field name="report_type">expense</field>
</record>
<record model="account.account.type" id="account_type_asset_view1">
<field name="name">Asset View</field>
<field name="code">asset</field>
<field name="report_type">asset</field>
</record>
<record model="account.account.type" id="account_type_liability_view1">
<field name="name">Liability View</field>
<field name="code">liability</field>
<field name="report_type">liability</field>
</record>
<record model="account.account.type" id="conf_account_type_income" >
<field name="name">Income</field>
<field name="code">income</field>
<field name="report_type">income</field>
<field name="close_method">none</field>
</record>
<record model="account.account.type" id="conf_account_type_expense">
<field name="name">Expense</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="conf_account_type_tax">
<field name="name">Tax</field>
<field name="code">tax</field>
<field name="report_type">expense</field>
<field name="close_method">unreconciled</field>
</record>
<record model="account.account.type" id="conf_account_type_cash">
<field name="name">Cash</field>
<field name="code">cash</field>
<field name="report_type">asset</field>
<field name="close_method">balance</field>
</record>
<record model="account.account.type" id="conf_account_type_liability">
<field name="name">Liability</field>
<field name="code">liability</field>
<field name="report_type">liability</field>
<field name="close_method">balance</field>
</record>
<record model="account.account.type" id="conf_account_type_asset">
<field name="name">Asset</field>
<field name="code">asset</field>
<field name="report_type">asset</field>
<field name="close_method">balance</field>
</record>
<record model="account.account.type" id="conf_account_type_equity">
<field name="name">Equity</field>
<field name="code">equity</field>
<field name="report_type">asset</field>
<field name="close_method">balance</field>
</record>
<record model="account.account.type" id="conf_account_type_bnk">
<field name="name">Bank</field>
<field name="code">bank</field>
<field name="report_type">asset</field>
<field name="close_method">balance</field>
</record>
<record model="account.account.type" id="conf_account_type_chk">
<field name="name">Check</field>
<field name="code">check</field>
<field name="report_type">asset</field>
<field name="close_method">balance</field>
</record>
@ -94,7 +132,7 @@
<field name="name">Fixed Assets</field>
<field ref="conf_bal" name="parent_id"/>
<field name="type">view</field>
<field name="user_type" ref="conf_account_type_view"/>
<field name="user_type" ref="account_type_asset_view1"/>
</record>
<record id="conf_xfa" model="account.account.template">
@ -102,7 +140,7 @@
<field name="name">Fixed Asset Account</field>
<field ref="conf_fas" name="parent_id"/>
<field name="type">other</field>
<field name="user_type" ref="conf_account_type_asset"/>
<field name="user_type" ref="account_type_asset_view1"/>
</record>
<record id="conf_nca" model="account.account.template">
@ -110,7 +148,7 @@
<field name="name">Net Current Assets</field>
<field ref="conf_bal" name="parent_id"/>
<field name="type">view</field>
<field name="user_type" ref="conf_account_type_view"/>
<field name="user_type" ref="account_type_asset_view1"/>
</record>
<record id="conf_cas" model="account.account.template">
@ -118,7 +156,7 @@
<field name="name">Current Assets</field>
<field ref="conf_nca" name="parent_id"/>
<field name="type">view</field>
<field name="user_type" ref="conf_account_type_view"/>
<field name="user_type" ref="account_type_asset_view1"/>
</record>
<record id="conf_stk" model="account.account.template">
@ -135,7 +173,7 @@
<field ref="conf_cas" name="parent_id"/>
<field name="type">receivable</field>
<field eval="True" name="reconcile"/>
<field name="user_type" ref="conf_account_type_receivable"/>
<field name="user_type" ref="conf_account_type_asset"/>
</record>
<!-- <record id="account.property_account_receivable" model="ir.property">
@ -147,7 +185,7 @@
<field name="name">Output VAT</field>
<field ref="conf_cas" name="parent_id"/>
<field name="type">other</field>
<field name="user_type" ref="conf_account_type_tax"/>
<field name="user_type" ref="conf_account_type_asset"/>
</record>
<record id="conf_bnk" model="account.account.template">
@ -155,23 +193,23 @@
<field name="name">Bank Current Account</field>
<field ref="conf_cas" name="parent_id"/>
<field name="type">view</field>
<field name="user_type" ref="conf_account_type_cash"/>
<field name="user_type" ref="conf_account_type_bnk"/>
</record>
<record id="conf_cash" model="account.account.template">
<field name="code">1105</field>
<field name="name">Cash</field>
<field ref="conf_cas" name="parent_id"/>
<field name="type">view</field>
<field name="user_type" ref="conf_account_type_cash"/>
</record>
<!-- <record id="conf_cash" model="account.account.template">-->
<!-- <field name="code">1105</field>-->
<!-- <field name="name">Cash</field>-->
<!-- <field ref="conf_cas" name="parent_id"/>-->
<!-- <field name="type">view</field>-->
<!-- <field name="user_type" ref="conf_account_type_cash"/>-->
<!-- </record>-->
<record id="conf_cli" model="account.account.template">
<field name="code">111</field>
<field name="name">Current Liabilities</field>
<field ref="conf_nca" name="parent_id"/>
<field name="type">view</field>
<field name="user_type" ref="conf_account_type_view"/>
<field name="user_type" ref="account_type_liability_view1"/>
</record>
<record id="conf_a_pay" model="account.account.template">
@ -180,7 +218,7 @@
<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_payable"/>
<field name="user_type" ref="conf_account_type_liability"/>
</record>
<!-- <record id="account.property_account_payable" model="ir.property">
@ -192,9 +230,19 @@
<field name="name">Input VAT</field>
<field ref="conf_cli" name="parent_id"/>
<field name="type">other</field>
<field name="user_type" ref="conf_account_type_tax"/>
<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 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">
@ -210,7 +258,7 @@
<field name="name">Revenue</field>
<field ref="conf_gpf" name="parent_id"/>
<field name="type">view</field>
<field name="user_type" ref="conf_account_type_view"/>
<field name="user_type" ref="account_type_income_view1"/>
</record>
<record id="conf_a_sale" model="account.account.template">
@ -230,7 +278,7 @@
<field name="name">Cost of Sales</field>
<field ref="conf_gpf" name="parent_id"/>
<field name="type">view</field>
<field name="user_type" ref="conf_account_type_view"/>
<field name="user_type" ref="account_type_income_view1"/>
</record>
<record id="conf_cog" model="account.account.template">
@ -246,7 +294,7 @@
<field name="name">Overheads</field>
<field ref="conf_gpf" name="parent_id"/>
<field name="type">view</field>
<field name="user_type" ref="conf_account_type_view"/>
<field name="user_type" ref="account_type_expense_view1"/>
</record>
<record id="conf_a_expense" model="account.account.template">
@ -266,8 +314,6 @@
<!-- Invoiced VAT -->
<!-- Input VAT -->
<record id="vat_code_chart_root" model="account.tax.code.template">
<field name="name">Plan Fees </field>
</record>
@ -277,6 +323,7 @@
<field name="parent_id" ref="vat_code_chart_root"/>
</record>
<!-- Input VAT -->
<record id="vat_code_input" model="account.tax.code.template">
<field name="name">Input VAT</field>
<field name="parent_id" ref="vat_code_balance_net"/>
@ -310,6 +357,7 @@
<field name="parent_id" ref="vat_code_output"/>
</record>
<!-- Invoiced Base of VAT -->
<!-- Purchases -->
@ -390,6 +438,7 @@
<field name="property_account_payable" ref="conf_a_pay"/>
<field name="property_account_expense_categ" ref="conf_a_expense"/>
<field name="property_account_income_categ" ref="conf_a_sale"/>
<field name="property_reserve_and_surplus_account" ref="conf_a_reserve_and_surplus"/>
</record>
<!-- VAT Codes -->

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

@ -4,6 +4,7 @@
<!--
Account Type
-->
<record id="account_type_root" model="account.account.type">
<field name="name">View</field>
<field name="code">view</field>
@ -89,15 +90,6 @@
<field name="parent_id" ref="bal"/>
</record>
<record model="account.account" id="liabilities_view">
<field name="name">Liabilities - (test)</field>
<field name="code">X11</field>
<field name="type">view</field>
<field name="user_type" ref="account_type_liability"/>
<field name="reconcile" eval="False"/>
<field name="parent_id" ref="bal"/>
</record>
<record id="fas" model="account.account">
<field name="code">X100</field>
<field name="name">Fixed Assets - (test)</field>
@ -144,7 +136,7 @@
<field ref="cas" name="parent_id"/>
<field name="type">receivable</field>
<field eval="True" name="reconcile"/>
<field name="user_type" ref="account_type_receivable"/>
<field name="user_type" ref="account_type_asset"/>
</record>
<record id="ova" model="account.account">
@ -152,7 +144,7 @@
<field name="name">Output VAT - (test)</field>
<field ref="cas" name="parent_id"/>
<field name="type">other</field>
<field name="user_type" ref="account_type_receivable"/>
<field name="user_type" ref="account_type_asset"/>
</record>
<record id="bnk" model="account.account">
@ -171,6 +163,15 @@
<field name="user_type" ref="account_type_asset"/>
</record>
<record model="account.account" id="liabilities_view">
<field name="name">Liabilities - (test)</field>
<field name="code">X11</field>
<field name="type">view</field>
<field name="user_type" ref="account_type_liability"/>
<field name="reconcile" eval="False"/>
<field name="parent_id" ref="bal"/>
</record>
<record id="cli" model="account.account">
<field name="code">X110</field>
<field name="name">Current Liabilities - (test)</field>
@ -185,7 +186,7 @@
<field ref="cli" name="parent_id"/>
<field name="type">payable</field>
<field eval="True" name="reconcile"/>
<field name="user_type" ref="account_type_payable"/>
<field name="user_type" ref="account_type_liability"/>
</record>
<record id="iva" model="account.account">
@ -193,7 +194,15 @@
<field name="name">Input VAT - (test)</field>
<field ref="cli" name="parent_id"/>
<field name="type">other</field>
<field name="user_type" ref="account_type_payable"/>
<field name="user_type" ref="account_type_liability"/>
</record>
<record id="rsa" model="account.account">
<field name="code">X1113</field>
<field name="name">Reserve and Surplus - (test)</field>
<field ref="cli" name="parent_id"/>
<field name="type">payable</field>
<field name="user_type" ref="account_type_liability"/>
</record>
<!-- Profit and Loss -->
@ -224,15 +233,6 @@
<field name="parent_id" ref="income_view"/>
</record>
<record model="account.account" id="expense_view">
<field name="name">Expense - (test)</field>
<field name="code">X21</field>
<field name="type">view</field>
<field name="user_type" ref="account_type_expense"/>
<field name="reconcile" eval="False"/>
<field name="parent_id" ref="gpf"/>
</record>
<record id="rev" model="account.account">
<field name="code">X200</field>
<field name="name">Revenue - (test)</field>
@ -249,6 +249,16 @@
<field name="user_type" ref="account_type_income"/>
</record>
<record model="account.account" id="expense_view">
<field name="name">Expense - (test)</field>
<field name="code">X21</field>
<field name="type">view</field>
<field name="user_type" ref="account_type_expense"/>
<field name="reconcile" eval="False"/>
<field name="parent_id" ref="gpf"/>
</record>
<record id="cos" model="account.account">
<field name="code">X210</field>
<field name="name">Cost of Sales - (test)</field>
@ -310,6 +320,13 @@
<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

5
addons/account/installer.py
View File

@ -340,8 +340,10 @@ class account_installer(osv.osv_memory):
('property_account_expense_categ','product.category','account.account'),
('property_account_income_categ','product.category','account.account'),
('property_account_expense','product.template','account.account'),
('property_account_income','product.template','account.account')
('property_account_income','product.template','account.account'),
('property_reserve_and_surplus_account','res.company','account.account'),
]
for record in todo_list:
r = []
r = property_obj.search(cr, uid, [('name','=', record[0] ),('company_id','=',company_id.id)])
@ -353,6 +355,7 @@ class account_installer(osv.osv_memory):
'fields_id': field[0],
'value': account and 'account.account,'+str(acc_template_ref[account.id]) or False,
}
if r:
#the property exist: modify it
property_obj.write(cr, uid, r, vals)

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

@ -22,6 +22,7 @@
from lxml import etree
from osv import osv, fields
from tools.translate import _
class account_bs_report(osv.osv_memory):
"""
@ -57,7 +58,11 @@ class account_bs_report(osv.osv_memory):
if context is None:
context = {}
data = self.pre_print_report(cr, uid, ids, data, query_line, context=context)
data['form'].update(self.read(cr, uid, ids, ['display_type', 'reserve_account_id'])[0])
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 !'))
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']:
return {
'type': 'ir.actions.report.xml',

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

@ -9,8 +9,8 @@
<field name="inherit_id" ref="account.account_common_report_view" />
<field name="arch" type="xml">
<field name="fiscalyear_id" position="after">
<field name="reserve_account_id"/>
<newline/>
<!-- <field name="reserve_account_id"/>-->
<!-- <newline/>-->
<field name="display_account"/>
<field name="display_type"/>
<newline/>

132
addons/l10n_chart_uk_minimal/account_chart.xml
View File

@ -21,15 +21,6 @@
<field name="user_type" ref="account_type_view"/>
</record>
<record model="account.account.template" id="assets_view">
<field name="name">Assets</field>
<field name="code">10</field>
<field name="type">view</field>
<field name="user_type" ref="acct_type_asset_view"/>
<field name="reconcile" eval="False"/>
<field name="parent_id" ref="bal"/>
</record>
<record model="account.account.template" id="liabilities_view">
<field name="name">Liabilities</field>
<field name="code">11</field>
@ -39,12 +30,58 @@
<field name="parent_id" ref="bal"/>
</record>
<record id="cli" model="account.account.template">
<field name="code">110</field>
<field name="name">Current Liabilities</field>
<field ref="liabilities_view" name="parent_id"/>
<field name="type">view</field>
<field name="user_type" ref="acct_type_liability_view"/>
</record>
<record id="a_pay" model="account.account.template">
<field name="code">1111</field>
<field name="name">Creditors</field>
<field ref="cli" name="parent_id"/>
<field name="type">payable</field>
<field eval="True" name="reconcile"/>
<field name="user_type" ref="account_type_liability"/>
</record>
<record id="iva" model="account.account.template">
<field name="code">1112</field>
<field name="name">Input VAT</field>
<field ref="cli" name="parent_id"/>
<field name="type">other</field>
<field name="user_type" ref="account_type_liability"/>
</record>
<record id="a_reserve_and_surplus" model="account.account.template">
<field name="code">1113</field>
<field name="name">Reserve and Surplus Account</field>
<field ref="cli" name="parent_id"/>
<field name="type">payable</field>
<field name="user_type" ref="account_type_liability"/>
</record>
<!-- <record id="account.property_account_payable" model="ir.property">
<field eval="'account.account,'+str(a_pay)" name="value"/>
</record>-->
<record model="account.account.template" id="assets_view">
<field name="name">Assets</field>
<field name="code">10</field>
<field name="type">view</field>
<field name="user_type" ref="acct_type_asset_view"/>
<field name="reconcile" eval="False"/>
<field name="parent_id" ref="bal"/>
</record>
<record id="fas" model="account.account.template">
<field name="code">100</field>
<field name="name">Fixed Assets</field>
<field ref="assets_view" name="parent_id"/>
<field name="type">view</field>
<field name="user_type" ref="account_type_view"/>
<field name="user_type" ref="acct_type_asset_view"/>
</record>
<record id="xfa" model="account.account.template">
@ -60,7 +97,7 @@
<field name="name">Net Current Assets</field>
<field ref="assets_view" name="parent_id"/>
<field name="type">view</field>
<field name="user_type" ref="account_type_view"/>
<field name="user_type" ref="acct_type_asset_view"/>
</record>
<record id="cas" model="account.account.template">
@ -68,7 +105,7 @@
<field name="name">Current Assets</field>
<field ref="nca" name="parent_id"/>
<field name="type">view</field>
<field name="user_type" ref="account_type_view"/>
<field name="user_type" ref="acct_type_asset_view"/>
</record>
<record id="stk" model="account.account.template">
@ -85,7 +122,7 @@
<field ref="cas" name="parent_id"/>
<field name="type">receivable</field>
<field eval="True" name="reconcile"/>
<field name="user_type" ref="account_type_receivable"/>
<field name="user_type" ref="account_type_asset"/>
</record>
<!-- <record id="account.property_account_receivable" model="ir.property">
@ -97,7 +134,7 @@
<field name="name">Output VAT</field>
<field ref="cas" name="parent_id"/>
<field name="type">other</field>
<field name="user_type" ref="account_type_tax"/>
<field name="user_type" ref="account_type_asset"/>
</record>
<record id="bnk" model="account.account.template">
@ -116,34 +153,6 @@
<field name="user_type" ref="account_type_cash"/>
</record>
<record id="cli" model="account.account.template">
<field name="code">110</field>
<field name="name">Current Liabilities</field>
<field ref="liabilities_view" name="parent_id"/>
<field name="type">view</field>
<field name="user_type" ref="account_type_view"/>
</record>
<record id="a_pay" model="account.account.template">
<field name="code">1111</field>
<field name="name">Creditors</field>
<field ref="cli" name="parent_id"/>
<field name="type">payable</field>
<field eval="True" name="reconcile"/>
<field name="user_type" ref="account_type_payable"/>
</record>
<!-- <record id="account.property_account_payable" model="ir.property">
<field eval="'account.account,'+str(a_pay)" name="value"/>
</record>-->
<record id="iva" model="account.account.template">
<field name="code">1112</field>
<field name="name">Input VAT</field>
<field ref="cli" name="parent_id"/>
<field name="type">other</field>
<field name="user_type" ref="account_type_tax"/>
</record>
<!-- Profit and Loss -->
@ -168,11 +177,27 @@
<field name="name">Foreign Exchange Gain</field>
<field name="code">X201</field>
<field name="type">other</field>
<field name="user_type" ref="acct_type_income_view"/>
<field name="user_type" ref="account_type_income"/>
<field name="reconcile" eval="False"/>
<field name="parent_id" ref="income_view"/>
</record>
<record id="rev" model="account.account.template">
<field name="code">200</field>
<field name="name">Revenue</field>
<field ref="income_view" name="parent_id"/>
<field name="type">view</field>
<field name="user_type" ref="acct_type_income_view"/>
</record>
<record id="a_sale" model="account.account.template">
<field name="code">2001</field>
<field name="name">Product Sales</field>
<field ref="rev" name="parent_id"/>
<field name="type">other</field>
<field name="user_type" ref="account_type_income"/>
</record>
<record model="account.account.template" id="expense_view">
<field name="name">Expense</field>
<field name="code">21</field>
@ -182,22 +207,6 @@
<field name="parent_id" ref="gpf"/>
</record>
<record id="rev" model="account.account.template">
<field name="code">200</field>
<field name="name">Revenue</field>
<field ref="income_view" name="parent_id"/>
<field name="type">view</field>
<field name="user_type" ref="account_type_view"/>
</record>
<record id="a_sale" model="account.account.template">
<field name="code">2001</field>
<field name="name">Product Sales</field>
<field ref="rev" name="parent_id"/>
<field name="type">other</field>
<field name="user_type" ref="account_type_income"/>
</record>
<!-- <record id="account.property_account_income_categ" model="ir.property">
<field eval="'account.account,'+str(a_sale)" name="value"/>
</record> -->
@ -207,7 +216,7 @@
<field name="name">Cost of Sales</field>
<field ref="expense_view" name="parent_id"/>
<field name="type">view</field>
<field name="user_type" ref="account_type_view"/>
<field name="user_type" ref="acct_type_expense_view"/>
</record>
<record id="cog" model="account.account.template">
@ -223,7 +232,7 @@
<field name="name">Overheads</field>
<field ref="expense_view" name="parent_id"/>
<field name="type">view</field>
<field name="user_type" ref="account_type_view"/>
<field name="user_type" ref="acct_type_expense_view"/>
</record>
<record id="a_expense" model="account.account.template">
@ -246,6 +255,5 @@
<!-- <record id="account.property_account_expense_categ" model="ir.property">
<field eval="'account.account,'+str(a_expense)" name="value"/>
</record> -->
</data>
</openerp>

1
addons/l10n_chart_uk_minimal/account_tax.xml
View File

@ -132,6 +132,7 @@
<field name="property_account_payable" ref="l10n_chart_uk_minimal.a_pay"/>
<field name="property_account_expense_categ" ref="l10n_chart_uk_minimal.a_expense"/>
<field name="property_account_income_categ" ref="l10n_chart_uk_minimal.a_sale"/>
<field name="property_reserve_and_surplus_account" ref="l10n_chart_uk_minimal.a_reserve_and_surplus"/>
</record>
<!-- VAT Codes -->

16
addons/l10n_chart_uk_minimal/account_types.xml
View File

@ -5,14 +5,14 @@
<record model="account.account.type" id="account_type_receivable" >
<field name="name">Receivable</field>
<field name="code">receivable</field>
<field name="report_type">asset</field>
<field name="report_type">income</field>
<field name="close_method">unreconciled</field>
</record>
<record model="account.account.type" id="account_type_payable" >
<field name="name">Payable</field>
<field name="code">payable</field>
<field name="report_type">liability</field>
<field name="report_type">expense</field>
<field name="close_method">unreconciled</field>
</record>
@ -27,21 +27,25 @@
<field name="code">view</field>
<field name="report_type">income</field>
</record>
<record model="account.account.type" id="acct_type_expense_view">
<field name="name">Expense View</field>
<field name="code">expense</field>
<field name="report_type">expense</field>
</record>
<record model="account.account.type" id="acct_type_asset_view">
<field name="name">Asset View</field>
<field name="code">asset</field>
<field name="report_type">asset</field>
</record>
<record model="account.account.type" id="acct_type_liability_view">
<field name="name">Liability View</field>
<field name="code">liability</field>
<field name="report_type">liability</field>
</record>
<record model="account.account.type" id="account_type_income" >
<field name="name">Income</field>
<field name="code">income</field>
@ -59,6 +63,7 @@
<record model="account.account.type" id="account_type_tax">
<field name="name">Tax</field>
<field name="code">tax</field>
<field name="report_type">liability</field>
<field name="close_method">unreconciled</field>
</record>
@ -69,6 +74,13 @@
<field name="close_method">balance</field>
</record>
<record model="account.account.type" id="account_type_liability">
<field name="name">Liability</field>
<field name="code">liability</field>
<field name="close_method">balance</field>
<field name="report_type">liability</field>
</record>
<record model="account.account.type" id="account_type_asset">
<field name="name">Asset</field>
<field name="code">asset</field>

1
addons/l10n_in/account_chart.xml
View File

@ -580,6 +580,7 @@
<field name="property_account_payable" ref="IA_AC02131"/>
<field name="property_account_expense_categ" ref="IA_AC112"/>
<field name="property_account_income_categ" ref="IA_AC122"/>
<field name="property_reserve_and_surplus_account" ref="IA_AC0232"/>
</record>