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

[FIX] purchase: fix xml_id of some groups 

bzr revid: rco@openerp.com-20120322125008-9p824sjgf36mgqae
This commit is contained in:
Raphael Collet 2012-03-22 13:50:08 +01:00
parent c59d3bea1f
commit 867f6d87d6
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/purchase/partner_view.xml
View File

@ -9,7 +9,7 @@
<field name="priority">36</field> <field name="priority">36</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<page string="Sales &amp; Purchases" position="inside"> <page string="Sales &amp; Purchases" position="inside">
<group colspan="2" col="2" groups="base.group_purchase_pricelist_per_supplier"> <group colspan="2" col="2" groups="product.group_purchase_pricelist">
<separator string="Purchase Properties" colspan="2"/> <separator string="Purchase Properties" colspan="2"/>
<field name="property_product_pricelist_purchase" /> <field name="property_product_pricelist_purchase" />
</group> </group>

14
addons/purchase/purchase_view.xml
View File

@ -14,7 +14,7 @@
<menuitem <menuitem
id="menu_purchase_config_pricelist" name="Pricelists" id="menu_purchase_config_pricelist" name="Pricelists"
parent="menu_purchase_config_purchase" sequence="50" groups="base.group_purchase_pricelist_per_supplier"/> parent="menu_purchase_config_purchase" sequence="50" groups="product.group_purchase_pricelist"/>
<menuitem <menuitem
action="product.product_pricelist_action" id="menu_product_pricelist_action_purhase" action="product.product_pricelist_action" id="menu_product_pricelist_action_purhase"
@ -39,7 +39,7 @@
<menuitem <menuitem
id="menu_purchase_unit_measure_purchase" name="Units of Measure" id="menu_purchase_unit_measure_purchase" name="Units of Measure"
parent="purchase.menu_product_in_config_purchase" sequence="20" groups="base.group_sale_uom_per_product"/> parent="purchase.menu_product_in_config_purchase" sequence="20" groups="product.group_uom"/>
<menuitem <menuitem
action="product.product_uom_categ_form_action" id="menu_purchase_uom_categ_form_action" action="product.product_uom_categ_form_action" id="menu_purchase_uom_categ_form_action"
@ -174,7 +174,7 @@
<page string="Purchase Order"> <page string="Purchase Order">
<field name="partner_id" on_change="onchange_partner_id(partner_id)" context="{'search_default_supplier':1,'default_supplier':1,'default_customer':0}" options='{"quick_create": false}'/> <field name="partner_id" on_change="onchange_partner_id(partner_id)" context="{'search_default_supplier':1,'default_supplier':1,'default_customer':0}" options='{"quick_create": false}'/>
<field name="partner_address_id" options='{"quick_create": false}'/> <field name="partner_address_id" options='{"quick_create": false}'/>
<field domain="[('type','=','purchase')]" name="pricelist_id" groups="base.group_purchase_pricelist_per_supplier"/> <field domain="[('type','=','purchase')]" name="pricelist_id" groups="product.group_purchase_pricelist"/>
<field name="origin" groups="base.group_extended"/> <field name="origin" groups="base.group_extended"/>
<newline/> <newline/>
<field colspan="4" name="order_line" nolabel="1" mode="tree,form"> <field colspan="4" name="order_line" nolabel="1" mode="tree,form">
@ -182,7 +182,7 @@
<field name="date_planned"/> <field name="date_planned"/>
<field name="name"/> <field name="name"/>
<field name="product_qty"/> <field name="product_qty"/>
<field name="product_uom" groups="base.group_sale_uom_per_product"/> <field name="product_uom" groups="product.group_uom"/>
<field name="price_unit"/> <field name="price_unit"/>
<field name="price_subtotal"/> <field name="price_subtotal"/>
</tree> </tree>
@ -361,7 +361,7 @@
<page string="Order Line"> <page string="Order Line">
<field name="product_id" colspan="4" on_change="onchange_product_id(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id, parent.date_order,parent.fiscal_position,date_planned,name,price_unit,notes,context)" required="1"/> <field name="product_id" colspan="4" on_change="onchange_product_id(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id, parent.date_order,parent.fiscal_position,date_planned,name,price_unit,notes,context)" required="1"/>
<field name="product_qty" on_change="onchange_product_id(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id,parent.date_order,parent.fiscal_position,date_planned,name,price_unit,notes,context)"/> <field name="product_qty" on_change="onchange_product_id(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id,parent.date_order,parent.fiscal_position,date_planned,name,price_unit,notes,context)"/>
<field name="product_uom" groups="base.group_sale_uom_per_product" on_change="onchange_product_uom(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id, parent.date_order,parent.fiscal_position,date_planned,name,price_unit,notes,context)"/> <field name="product_uom" groups="product.group_uom" on_change="onchange_product_uom(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id, parent.date_order,parent.fiscal_position,date_planned,name,price_unit,notes,context)"/>
<field colspan="4" name="name"/> <field colspan="4" name="name"/>
<field name="date_planned" widget="date"/> <field name="date_planned" widget="date"/>
<field name="price_unit"/> <field name="price_unit"/>
@ -403,7 +403,7 @@
<field name="product_id"/> <field name="product_id"/>
<field name="price_unit"/> <field name="price_unit"/>
<field name="product_qty"/> <field name="product_qty"/>
<field name="product_uom" groups="base.group_sale_uom_per_product"/> <field name="product_uom" groups="product.group_uom"/>
<field name="price_subtotal"/> <field name="price_subtotal"/>
<field name="date_planned" widget="date" width="135"/> <field name="date_planned" widget="date" width="135"/>
<field name="state" invisible="1"/> <field name="state" invisible="1"/>
@ -424,7 +424,7 @@
<field name="order_id"/> <field name="order_id"/>
<field name="product_id" readonly="1" /> <field name="product_id" readonly="1" />
<field name="product_qty" readonly="1" /> <field name="product_qty" readonly="1" />
<field name="product_uom" readonly="1" groups="base.group_sale_uom_per_product"/> <field name="product_uom" readonly="1" groups="product.group_uom"/>
<field colspan="4" name="name"/> <field colspan="4" name="name"/>
<field name="date_planned" widget="date" readonly="1"/> <field name="date_planned" widget="date" readonly="1"/>
<field name="price_unit"/> <field name="price_unit"/>

4
addons/purchase_double_validation/purchase_double_validation_installer.py
View File

@ -28,6 +28,10 @@ class purchase_config_settings(osv.osv_memory):
help="Maximum amount after which validation of purchase is required."), help="Maximum amount after which validation of purchase is required."),
} }
_defaults = {
'limit_amount': 5000,
}
def get_default_limit_amount(self, cr, uid, fields, context=None): def get_default_limit_amount(self, cr, uid, fields, context=None):
ir_model_data = self.pool.get('ir.model.data') ir_model_data = self.pool.get('ir.model.data')
transition = ir_model_data.get_object(cr, uid, 'purchase_double_validation', 'trans_waiting_confirmed') transition = ir_model_data.get_object(cr, uid, 'purchase_double_validation', 'trans_waiting_confirmed')