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

[IMP] purchase: change xml id of groups 

bzr revid: rco@openerp.com-20120322110834-k49v2g4w1wd9jqk2
This commit is contained in:
Raphael Collet 2012-03-22 12:08:34 +01:00
parent cf793363b6
commit fe31238077
3 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
addons/purchase/purchase_view.xml
View File

@ -189,8 +189,8 @@
<!-- default form view -->
</field>
<group col="7" colspan="4">
<field name="amount_untaxed" sum="Untaxed amount" groups="base.group_purchase_taxes_on_order_line,base.group_purchase_taxes_global_on_order"/>
<field name="amount_tax" groups="base.group_purchase_taxes_on_order_line,base.group_purchase_taxes_global_on_order"/>
<field name="amount_untaxed" sum="Untaxed amount" groups="purchase.group_taxes_on_order_line,purchase.group_taxes_global_on_order"/>
<field name="amount_tax" groups="purchase.group_taxes_on_order_line,purchase.group_taxes_global_on_order"/>
<field name="amount_total" sum="Total amount"/>
<button name="button_dummy" states="draft" string="Compute" type="object" icon="gtk-execute"/>
</group>
@ -367,7 +367,7 @@
<field name="price_unit"/>
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
<field name="account_analytic_id" colspan="4" groups="analytic.group_analytic_accounting" domain="[('parent_id','!=',False)]" />
<group colspan="4" col="4" groups="base.group_purchase_taxes_on_order_line">
<group colspan="4" col="4" groups="purchase.group_taxes_on_order_line">
<separator colspan="4" string="Taxes"/>
<field colspan="4" nolabel="1" name="taxes_id"
domain="[('parent_id','=',False),('type_tax_use','!=','sale')]"/>

4
addons/purchase/res_config.py
View File

@ -60,9 +60,9 @@ class purchase_config_settings(osv.osv_memory):
'Taxes', required=True,
help="""Choose between either applying global taxes on a purchase order, or applying different taxes on purchase order lines, or applying no tax at all."""),
'group_purchase_taxes_global_on_order':fields.boolean("Global on order",
implied_group='base.group_purchase_taxes_global_on_order'),
implied_group='purchase.group_taxes_global_on_order'),
'group_purchase_taxes_on_order_line':fields.boolean("On order line",
implied_group='base.group_purchase_taxes_on_order_line'),
implied_group='purchase.group_taxes_on_order_line'),
}
def default_get(self, cr, uid, fields, context=None):

11
addons/purchase/security/purchase_security.xml
View File

@ -6,28 +6,23 @@
<field name="name">User</field>
<field name="category_id" ref="base.module_category_purchase_management"/>
</record>
<record id="group_purchase_manager" model="res.groups">
<field name="name">Manager</field>
<field name="category_id" ref="base.module_category_purchase_management"/>
<field name="implied_ids" eval="[(4, ref('group_purchase_user'))]"/>
</record>
<record id="base.group_purchase_taxes_global_on_order" model="res.groups">
<record id="group_taxes_global_on_order" model="res.groups">
<field name="name">Purchase Taxes Global on Order</field>
<field name="category_id" ref="base.module_category_hidden"/>
</record>
<record id="base.group_purchase_taxes_on_order_line" model="res.groups">
<record id="group_taxes_on_order_line" model="res.groups">
<field name="name">Purchase Taxes on Order Lines</field>
<field name="category_id" ref="base.module_category_hidden"/>
</record>
<record id="base.group_user" model="res.groups">
<field name="implied_ids" eval="[(6,0,[
ref('base.group_purchase_taxes_global_on_order'),
])]"/>
</record>
<record model="ir.rule" id="purchase_order_comp_rule">
<field name="name">Purchase Order multi-company</field>
<field name="model_id" ref="model_purchase_order"/>