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

Add new selection field(tax use in:sale/purchase) on tax object now using this filters all taxes where it used , modify charts also l10n_be,l10n_uk_chart_minimal 

bzr revid: mra@tinyerp.com-20090121135303-dsbnkas7b16ihk0i
This commit is contained in:
mra (Open ERP) 2009-01-21 19:23:03 +05:30
parent e1510dcd55
commit 4322da3382
10 changed files with 138 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
addons/account/account.py
View File

@ -1266,8 +1266,18 @@ class account_tax(osv.osv):
'include_base_amount': fields.boolean('Include in base amount', help="Indicate if the amount of tax must be included in the base amount for the computation of the next taxes"),
'company_id': fields.many2one('res.company', 'Company', required=True),
'description': fields.char('Tax Code',size=32),
'price_include': fields.boolean('Tax Included in Price', help="Check this is the price you use on the product and invoices is including this tax.")
'price_include': fields.boolean('Tax Included in Price', help="Check this is the price you use on the product and invoices is including this tax."),
'type_tax_use': fields.selection([('sale','Sale'),('purchase','Purchase')], 'Tax Use in')
}
def search(self, cr, uid, args, offset=0, limit=None, order=None,
context=None, count=False):
if context and context.has_key('type'):
if context['type'] in ('out_invoice','out_refund'):
args.append(('type_tax_use','=','sale'))
elif context['type'] in ('in_invoice','in_refund'):
args.append(('type_tax_use','=','purchase'))
return super(account_tax, self).search(cr, uid, args, offset, limit, order, context, count)
def name_get(self, cr, uid, ids, context={}):
if not len(ids):
@ -1898,6 +1908,7 @@ class account_tax_template(osv.osv):
'ref_tax_sign': fields.float('Tax Code Sign', help="Usually 1 or -1."),
'include_base_amount': fields.boolean('Include in base amount', help="Indicate if the amount of tax must be included in the base amount for the computation of the next taxes."),
'description': fields.char('Internal Name', size=32),
'type_tax_use': fields.selection([('sale','Sale'),('purchase','Purchase')], 'Tax Use in')
}
def name_get(self, cr, uid, ids, context={}):
@ -2073,6 +2084,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
'include_base_amount': tax.include_base_amount,
'description':tax.description,
'company_id': company_id,
'type_tax_use': tax.type_tax_use
}
new_tax = obj_acc_tax.create(cr,uid,vals_tax)
#as the accounts have not been created yet, we have to wait before filling these fields

4
addons/account/account_invoice_view.xml
View File

@ -63,7 +63,7 @@
<field domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id)]" name="account_analytic_id"/>
<newline/>
<field name="price_subtotal"/>
<field colspan="4" name="invoice_line_tax_id" domain="[('parent_id','=',False)]"/>
<field colspan="4" name="invoice_line_tax_id" context="{'type':parent.type}" domain="[('parent_id','=',False)]"/>
</page>
<page string="Notes">
<field colspan="4" name="note" nolabel="1"/>
@ -156,7 +156,7 @@
<tree string="Invoice lines" editable="top">
<field name="product_id" on_change="product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.address_invoice_id)"/>
<field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id" on_change="onchange_account_id(parent.fiscal_position,account_id)"/>
<field name="invoice_line_tax_id" view_mode="2" domain="[('parent_id','=',False)]"/>
<field name="invoice_line_tax_id" view_mode="2" context="{'type':parent.type}" domain="[('parent_id','=',False)]"/>
<field domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id)]" name="account_analytic_id"/>
<field name="quantity"/>
<field name="price_unit"/>

2
addons/account/account_view.xml
View File

@ -608,6 +608,7 @@
<field groups="base.group_extended" name="child_depend"/>
<field groups="base.group_extended" name="sequence"/>
<field groups="base.group_extended" name="price_include"/>
<field name="type_tax_use"/>
<newline/>
<field colspan="4" groups="base.group_extended" name="child_ids"/>
</page>
@ -1550,6 +1551,7 @@
<field name="chart_template_id" select="1"/>
<field name="tax_group" select="1"/>
<field name="type" select="2"/>
<field name="type_tax_use" select="2"/>
</group>
<notebook colspan="4">
<page string="Tax Definition">

4
addons/account/product.py
View File

@ -54,10 +54,10 @@ class product_template(osv.osv):
_columns = {
'taxes_id': fields.many2many('account.tax', 'product_taxes_rel',
'prod_id', 'tax_id', 'Customer Taxes',
domain=[('parent_id','=',False)]),
domain=[('parent_id','=',False),('type_tax_use','=','sale')]),
'supplier_taxes_id': fields.many2many('account.tax',
'product_supplier_taxes_rel', 'prod_id', 'tax_id',
'Supplier Taxes', domain=[('parent_id', '=', False)]),
'Supplier Taxes', domain=[('parent_id', '=', False),('type_tax_use','=','purchase')]),
'property_account_income': fields.property(
'account.account',
type='many2one',

14
addons/auction/auction_view.xml
View File

@ -103,8 +103,8 @@ Auction Management/Auction Dates/New Auction Dates
<field name="auction1" select="1"/>
<field name="auction2" select="1"/>
<separator string="Commissions" colspan="4"/>
<field name="seller_costs" domain="[('parent_id','=',False),('domain','=','auction')]"/>
<field name="buyer_costs" domain="[('parent_id','=',False),('domain','=','auction')]"/>
<field name="seller_costs" domain="[('parent_id','=',False),('domain','=','auction'),('type_tax_use','=','sale')]"/>
<field name="buyer_costs" domain="[('parent_id','=',False),('domain','=','auction'),('type_tax_use','=','purchase')]"/>
<separator string="Accounting" colspan="4"/>
<field name="acc_expense"/>
<field name="acc_income"/>
@ -208,7 +208,7 @@ Auction Management/Auction Dates/Reporting
<field name="vnd_lim"/>
<field name="vnd_lim_net"/>
<field name="lot_est1"/>
<field name="author_right" domain="[('domain','=','sabam'),('parent_id','=',False)]"/>
<field name="author_right" domain="[('domain','=','sabam'),('parent_id','=',False),('type_tax_use','=','purchase')]"/>
<field name="lot_est2"/>
<field name="product_id"/>
<field name="state" readonly="1"/>
@ -319,7 +319,7 @@ Auction Management/Auction Dates/Reporting
<field name="obj_comm" select="2"/>
<field name="obj_ret"/>
<field name="ach_emp"/>
<field name="author_right" domain="[('domain','=','sabam'),('parent_id','=',False)]"/>
<field name="author_right" domain="[('domain','=','sabam'),('parent_id','=',False),('type_tax_use','=','purchase')]"/>
<field name="buyer_price"/>
<field name="seller_price"/>
<field name="gross_revenue"/>
@ -430,7 +430,7 @@ Auction Management/Auction Dates/Reporting
<field name="name" readonly="1" select="1"/>
<field name="name2" readonly="2" select="1"/>
<field name="artist_id" readonly="1"/>
<field name="author_right" domain="[('domain','=','sabam'),('parent_id','=',False)]"/>
<field name="author_right" domain="[('domain','=','sabam'),('parent_id','=',False),('type_tax_use','=','purchase')]"/>
<newline/>
<field name="buyer_price"/>
<field name="is_ok" select="1"/>
@ -510,7 +510,7 @@ Auction Management/Auction Dates/Reporting
<field name="partner_id" select="1" on_change="partner_id_change(partner_id)"/>
<field name="method"/>
<newline/>
<field name="tax_id" domain="[('domain','=','auction'),('parent_id','=',False)]"/>
<field name="tax_id" domain="[('domain','=','auction'),('parent_id','=',False),('type_tax_use','=','sale')]"/>
<field name="transfer"/>
<newline/>
<field name="lot_id" colspan="4" mode="tree,graph" nolabel="1">
@ -545,7 +545,7 @@ Auction Management/Auction Dates/Reporting
<field name="lot_est1"/>
<field name="lot_est2"/>
<field name="author_right" domain="[('domain','=','sabam'),('parent_id','=',False)]"/>
<field name="author_right" domain="[('domain','=','sabam'),('parent_id','=',False),('type_tax_use','=','purchase')]"/>
<field name="product_id" domain="[('sale_ok','=',True)]"/>
<field name="state" readonly="1"/>
</page><page string="Photos">

20
addons/l10n_be/account_pcmn_belgium.xml
View File

@ -6637,6 +6637,7 @@
<field name="tax_code_id" ref="vat_code_a49"/>
<field name="ref_base_code_id" ref="vat_code_a54"/>
<field name="ref_tax_code_id" ref="vat_code_a63"/>
<field name="type_tax_use">sale</field>
</record>
<record id="vat_6_buy" model="account.tax.template">
<field name="chart_template_id" ref="l10nbe_chart_template"/>
@ -6645,6 +6646,7 @@
<field name="type">percent</field>
<field name="account_collected_id" ref="vat_refund06"/>
<field name="account_paid_id" ref="vat_payable06"/>
<field name="type_tax_use">purchase</field>
</record>
<record id="vat_12" model="account.tax.template">
<field name="chart_template_id" ref="l10nbe_chart_template"/>
@ -6653,6 +6655,7 @@
<field name="type">percent</field>
<field name="account_collected_id" ref="vat_payable12"/>
<field name="account_paid_id" ref="vat_refund12"/>
<field name="type_tax_use">sale</field>
</record>
<record id="vat_12_buy" model="account.tax.template">
<field name="chart_template_id" ref="l10nbe_chart_template"/>
@ -6661,6 +6664,7 @@
<field name="type">percent</field>
<field name="account_collected_id" ref="vat_refund12"/>
<field name="account_paid_id" ref="vat_payable12"/>
<field name="type_tax_use">purchase</field>
</record>
<record id="vat_21" model="account.tax.template">
<field name="chart_template_id" ref="l10nbe_chart_template"/>
@ -6673,6 +6677,7 @@
<field name="tax_code_id" ref="vat_code_a54"/>
<field name="ref_base_code_id" ref="vat_code_a49"/>
<field name="ref_tax_code_id" ref="vat_code_a64"/>
<field name="type_tax_use">sale</field>
</record>
<record id="vat_21_buy" model="account.tax.template">
<field name="chart_template_id" ref="l10nbe_chart_template"/>
@ -6680,6 +6685,7 @@
<field eval="1.0" name="amount"/>
<field name="type">percent</field>
<field eval="1" name="child_depend"/>
<field name="type_tax_use">purchase</field>
</record>
<record id="vat_21_buy_1" model="account.tax.template">
<field name="chart_template_id" ref="l10nbe_chart_template"/>
@ -6693,6 +6699,8 @@
<field name="tax_code_id" ref="vat_code_a59"/>
<field name="ref_base_code_id" ref="vat_code_a85"/>
<field name="ref_tax_code_id" ref="vat_code_a63"/>
<field name="type_tax_use">purchase</field>
</record>
<record id="vat_21_buy_2" model="account.tax.template">
<field name="chart_template_id" ref="l10nbe_chart_template"/>
@ -6702,6 +6710,7 @@
<field name="type">percent</field>
<field name="ref_base_code_id" ref="vat_code_a82"/>
<field eval="-1" name="ref_base_sign"/>
<field name="type_tax_use">purchase</field>
</record>
<record id="vat_0" model="account.tax.template">
<field name="chart_template_id" ref="l10nbe_chart_template"/>
@ -6710,6 +6719,7 @@
<field name="type">percent</field>
<field name="account_collected_id" ref="vat_payable0"/>
<field name="account_paid_id" ref="vat_refund0"/>
<field name="type_tax_use">sale</field>
</record>
<record id="vat_CO" model="account.tax.template">
<field name="chart_template_id" ref="l10nbe_chart_template"/>
@ -6721,6 +6731,7 @@
<field eval="vat_code_a82" name="base_code_id"/>
<field eval="vat_code_a82" name="ref_base_code_id"/>
<field eval="True" name="child_depend"/>
<field name="type_tax_use">purchase</field>
</record>
<record id="vat_CO_0" model="account.tax.template">
<field name="chart_template_id" ref="l10nbe_chart_template"/>
@ -6732,6 +6743,7 @@
<field name="account_paid_id" ref="vat_refund0"/>
<field eval="vat_code_a59" name="tax_code_id"/>
<field eval="vat_code_a59" name="ref_tax_code_id"/>
<field name="type_tax_use">purchase</field>
</record>
<record id="vat_CO_1" model="account.tax.template">
<field name="chart_template_id" ref="l10nbe_chart_template"/>
@ -6743,6 +6755,7 @@
<field name="account_paid_id" ref="vat_refund0"/>
<field eval="vat_code_a56" name="tax_code_id"/>
<field eval="vat_code_a56" name="ref_tax_code_id"/>
<field name="type_tax_use">purchase</field>
</record>
<record id="vat_Ex" model="account.tax.template">
<field name="chart_template_id" ref="l10nbe_chart_template"/>
@ -6751,6 +6764,7 @@
<field name="type">percent</field>
<field name="account_collected_id" ref="vat_payable0"/>
<field name="account_paid_id" ref="vat_refund0"/>
<field name="type_tax_use">sale</field>
</record>
<record id="vat_I0" model="account.tax.template">
<field name="chart_template_id" ref="l10nbe_chart_template"/>
@ -6760,6 +6774,7 @@
<field eval="True" name="child_depend"/>
<field eval="vat_code_a81" name="base_code_id"/>
<field eval="vat_code_a81" name="ref_base_code_id"/>
<field name="type_tax_use">sale</field>
</record>
<record id="vat_I0_1" model="account.tax.template">
<field name="chart_template_id" ref="l10nbe_chart_template"/>
@ -6771,6 +6786,7 @@
<field name="account_paid_id" ref="vat_refund0"/>
<field eval="vat_code_a59" name="tax_code_id"/>
<field eval="vat_code_a59" name="ref_tax_code_id"/>
<field name="type_tax_use">sale</field>
</record>
<record id="vat_I0_2" model="account.tax.template">
<field name="chart_template_id" ref="l10nbe_chart_template"/>
@ -6782,6 +6798,7 @@
<field name="account_paid_id" ref="vat_payable0"/>
<field eval="vat_code_a55" name="tax_code_id"/>
<field eval="vat_code_a55" name="ref_tax_code_id"/>
<field name="type_tax_use">sale</field>
</record>
<record id="vat_XO" model="account.tax.template">
<field name="chart_template_id" ref="l10nbe_chart_template"/>
@ -6791,6 +6808,7 @@
<field name="account_collected_id" ref="vat_payable0"/>
<field name="account_paid_id" ref="vat_refund0"/>
<field eval="True" name="child_depend"/>
<field name="type_tax_use">sale</field>
</record>
<record id="vat_XO_1" model="account.tax.template">
<field name="chart_template_id" ref="l10nbe_chart_template"/>
@ -6802,6 +6820,7 @@
<field name="account_paid_id" ref="vat_refund0"/>
<field eval="vat_code_a59" name="tax_code_id"/>
<field eval="vat_code_a59" name="ref_tax_code_id"/>
<field name="type_tax_use">sale</field>
</record>
<record id="vat_XO_2" model="account.tax.template">
<field name="chart_template_id" ref="l10nbe_chart_template"/>
@ -6813,6 +6832,7 @@
<field name="account_paid_id" ref="vat_payable0"/>
<field eval="vat_code_a57" name="tax_code_id"/>
<field eval="vat_code_a57" name="ref_tax_code_id"/>
<field name="type_tax_use">sale</field>
</record>
</data>

10
addons/l10n_chart_uk_minimal/account_tax.xml
View File

@ -148,6 +148,7 @@
<field name="tax_code_id" ref="vat_code_input_S"/>
<field name="ref_base_code_id" ref="vat_code_purch_S"/>
<field name="ref_tax_code_id" ref="vat_code_input_S"/>
<field name="type_tax_use">purchase</field>
</record>
<record id="ivatr" model="account.tax.template">
@ -161,6 +162,7 @@
<field name="tax_code_id" ref="vat_code_input_R"/>
<field name="ref_base_code_id" ref="vat_code_purch_R"/>
<field name="ref_tax_code_id" ref="vat_code_input_R"/>
<field name="type_tax_use">purchase</field>
</record>
<record id="ivatz" model="account.tax.template">
@ -170,6 +172,7 @@
<field name="type">percent</field>
<field name="base_code_id" ref="vat_code_purch_Z"/>
<field name="ref_base_code_id" ref="vat_code_purch_Z"/>
<field name="type_tax_use">purchase</field>
</record>
<record id="ivatx" model="account.tax.template">
@ -179,6 +182,7 @@
<field name="type">percent</field>
<field name="base_code_id" ref="vat_code_purch_X"/>
<field name="ref_base_code_id" ref="vat_code_purch_X"/>
<field name="type_tax_use">purchase</field>
</record>
<record id="ivato" model="account.tax.template">
@ -188,6 +192,7 @@
<field name="type">percent</field>
<field name="base_code_id" ref="vat_code_purch_O"/>
<field name="ref_base_code_id" ref="vat_code_purch_O"/>
<field name="type_tax_use">purchase</field>
</record>
<!-- Sales + Output VAT -->
@ -203,6 +208,7 @@
<field name="tax_code_id" ref="vat_code_output_S"/>
<field name="ref_base_code_id" ref="vat_code_sales_S"/>
<field name="ref_tax_code_id" ref="vat_code_output_S"/>
<field name="type_tax_use">sale</field>
</record>
<record id="ovatr" model="account.tax.template">
@ -216,6 +222,7 @@
<field name="tax_code_id" ref="vat_code_output_R"/>
<field name="ref_base_code_id" ref="vat_code_sales_R"/>
<field name="ref_tax_code_id" ref="vat_code_output_R"/>
<field name="type_tax_use">sale</field>
</record>
<record id="ovatz" model="account.tax.template">
@ -225,6 +232,7 @@
<field name="type">percent</field>
<field name="base_code_id" ref="vat_code_sales_Z"/>
<field name="ref_base_code_id" ref="vat_code_sales_Z"/>
<field name="type_tax_use">sale</field>
</record>
<record id="ovatx" model="account.tax.template">
@ -234,6 +242,7 @@
<field name="type">percent</field>
<field name="base_code_id" ref="vat_code_sales_X"/>
<field name="ref_base_code_id" ref="vat_code_sales_X"/>
<field name="type_tax_use">sale</field>
</record>
<record id="ovato" model="account.tax.template">
@ -243,6 +252,7 @@
<field name="type">percent</field>
<field name="base_code_id" ref="vat_code_sales_O"/>
<field name="ref_base_code_id" ref="vat_code_sales_O"/>
<field name="type_tax_use">sale</field>
</record>
</data>

4
addons/mrp_repair/mrp_repair_view.xml
View File

@ -44,7 +44,7 @@
<field name="invoiced"/>
</group>
<newline/>
<field colspan="4" name="tax_id" domain="[('parent_id','=',False)]"/>
<field colspan="4" name="tax_id" domain="[('parent_id','=',False),('type_tax_use','=','sale')]"/>
<separator colspan="4" string="States"/>
<field name="state"/>
</page>
@ -113,7 +113,7 @@
<field name="invoiced"/>
</group>
<newline/>
<field colspan="4" name="tax_id" domain="[('parent_id','=',False)]"/>
<field colspan="4" name="tax_id" domain="[('parent_id','=',False),('type_tax_use','=','sale')]"/>
</page>
<page string="History" groups="base.group_extended">
<field colspan="4" name="invoice_line_id" />

2
addons/purchase/purchase_view.xml
View File

@ -180,7 +180,7 @@
<field name="price_unit"/>
<field name="account_analytic_id"/>
<field name="price_subtotal" readonly="1"/>
<field colspan="4" name="taxes_id" domain="[('parent_id','=',False)]"/>
<field colspan="4" name="taxes_id" domain="[('parent_id','=',False),('type_tax_use','=','purchase')]"/>
</page>
<page string="Notes">
<field colspan="4" name="notes" nolabel="1"/>

4
addons/sale/sale_view.xml
View File

@ -140,7 +140,7 @@
<field name="type"/>
<field name="delay" select="2"/>
<newline/>
<field colspan="4" name="tax_id" domain="[('parent_id','=',False)]"/>
<field colspan="4" name="tax_id" domain="[('parent_id','=',False),('type_tax_use','=','sale')]"/>
<separator colspan="4" string="States"/>
<field name="state" select="2"/>
<group col="3" colspan="2">
@ -398,7 +398,7 @@
<field name="type"/>
<field name="delay" select="2"/>
<field name="price_subtotal"/>
<field colspan="4" name="tax_id" domain="[('parent_id','=',False)]"/>
<field colspan="4" name="tax_id" domain="[('parent_id','=',False),('type_tax_use','=','sale')]"/>
<separator colspan="4" string="States"/>
<field name="state" select="2"/>
<group col="2" colspan="2">