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

[IMP] sale.config.settings: improve xml id of two more groups 

bzr revid: rco@openerp.com-20120321143635-5k0qpdkdwrmgido1
This commit is contained in:
Raphael Collet 2012-03-21 15:36:35 +01:00
parent 1201b663be
commit aacdfb2d71
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/sale/res_config.py
View File

@ -85,9 +85,9 @@ class sale_configuration(osv.osv_memory):
'Taxes', required=True,
help="""Choose between either applying global taxes on a sale order, or applying different taxes on sale order lines, or applying no tax at all.""")
'group_sale_taxes_global_on_order': fields.boolean("Global on order",
implied_group='base.group_sale_taxes_global_on_order'),
implied_group='sale.group_taxes_global_on_order'),
'group_sale_taxes_on_order_line': fields.boolean("On order line",
implied_group='base.group_sale_taxes_on_order_line'),
implied_group='sale.group_taxes_on_order_line'),
'module_project_timesheet': fields.boolean("Project Timesheet"),
'module_project_mrp': fields.boolean("Project MRP"),
}

10
addons/sale/sale_view.xml
View File

@ -152,9 +152,9 @@
<field name="discount" groups="group_discount_per_so_line"/>
<separator colspan="5" string="Notes" groups="base.group_sale_notes_subtotal"/>
<field colspan="5" name="notes" nolabel="1" groups="base.group_sale_notes_subtotal"/>
<separator colspan="5" string="Taxes" groups="base.group_sale_taxes_on_order_line"/>
<separator colspan="5" string="Taxes" groups="group_taxes_on_order_line"/>
<field colspan="5" name="tax_id" nolabel="1" domain="[('parent_id','=',False),('type_tax_use','&lt;&gt;','purchase')]"
groups="base.group_sale_taxes_on_order_line" />
groups="group_taxes_on_order_line" />
<group colspan="5" col="5" groups="base.group_extended">
<separator colspan="5" string="States"/>
<field name="state" widget="statusbar" statusbar_visible="draft,confirmed,done" statusbar_colors='{"exception":"red","cancel":"red"}'/>
@ -194,9 +194,9 @@
</field>
<newline/>
<group col="13" colspan="10">
<field name="tax_id" groups="base.group_sale_taxes_global_on_order" on_change="onchange_taxes(tax_id)"/>
<field name="amount_untaxed" sum="Untaxed amount" groups="base.group_sale_taxes_on_order_line,base.group_sale_taxes_global_on_order"/>
<field name="amount_tax" groups="base.group_sale_taxes_on_order_line,base.group_sale_taxes_global_on_order"/>
<field name="tax_id" groups="group_taxes_global_on_order" on_change="onchange_taxes(tax_id)"/>
<field name="amount_untaxed" sum="Untaxed amount" groups="group_taxes_on_order_line,group_taxes_global_on_order"/>
<field name="amount_tax" groups="group_taxes_on_order_line,group_taxes_global_on_order"/>
<field name="amount_total"/>
<button name="button_dummy" states="draft" string="Compute" type="object" icon="gtk-execute"/>
<button name="%(action_view_sale_advance_payment_inv)d" string="Advance Invoice" type="action" icon="gtk-execute" states="draft,manual" groups="base.group_extended"/>

4
addons/sale/security/sale_security.xml
View File

@ -40,12 +40,12 @@
<field name="category_id" ref="base.module_category_hidden"/>
</record>
<record id="base.group_sale_taxes_global_on_order" model="res.groups">
<record id="group_taxes_global_on_order" model="res.groups">
<field name="name">Sales Taxes Global on Order</field>
<field name="category_id" ref="base.module_category_hidden"/>
</record>
<record id="base.group_sale_taxes_on_order_line" model="res.groups">
<record id="group_taxes_on_order_line" model="res.groups">
<field name="name">Sales Taxes on Order Lines</field>
<field name="category_id" ref="base.module_category_hidden"/>
</record>