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

[FIX] stock: misconfigured xml ids 

bzr revid: rco@openerp.com-20120322152755-i9ihcm3iac3eyne0
This commit is contained in:
Raphael Collet 2012-03-22 16:27:55 +01:00
parent 5fad916d37
commit 7205e2e096
6 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/product/product_view.xml
View File

@ -169,7 +169,7 @@
<separator string="Purchase Description"/>
<field colspan="4" name="description_purchase" nolabel="1"/>
</page>
<page groups="stock.group_packaging" string="Packaging">
<page groups="product.group_stock_packaging" string="Packaging">
<field colspan="4" name="packaging" nolabel="1">
<form string="Packaging">
<field name="ean"/>
@ -494,7 +494,7 @@
<field name="help">Create and manage your packaging dimensions and types you want to be maintained in your system.</field>
</record>
<menuitem
action="product_ul_form_action" groups="stock.group_packaging" id="menu_product_ul_form_action" parent="prod_config_main" sequence="3"/>
action="product_ul_form_action" groups="product.group_stock_packaging" id="menu_product_ul_form_action" parent="prod_config_main" sequence="3"/>
<record id="product_packaging_tree_view" model="ir.ui.view">
<field name="name">product.packaging.tree.view</field>

5
addons/product/security/product_security.xml
View File

@ -34,6 +34,11 @@
<field name="category_id" ref="base.module_category_hidden"/>
</record>
<record id="group_stock_packaging" model="res.groups">
<field name="name">Manage Product Packaging</field>
<field name="category_id" ref="base.module_category_hidden"/>
</record>
<record model="ir.rule" id="product_pricelist_comp_rule">
<field name="name">product pricelist company rule</field>
<field name="model_id" ref="model_product_pricelist"/>

2
addons/stock/res_config.py
View File

@ -52,7 +52,7 @@ class stock_config_settings(osv.osv_memory):
implied_group='product.group_uom',
help="""Allows you to select and maintain different unit of measures per product."""),
'group_stock_packaging': fields.boolean("Manage packaging by products",
implied_group='stock.group_packaging',
implied_group='product.group_stock_packaging',
help="""Allows you to create and manage your packaging dimensions and types you want to be maintained in your system."""),
'group_stock_production_lot': fields.boolean("Track production lots",
implied_group='stock.group_production_lot',

8
addons/stock/res_config_view.xml
View File

@ -2,7 +2,7 @@
<openerp>
<data>
<record id="view_stock.config.settings" model="ir.ui.view">
<record id="view_stock_config_settings" model="ir.ui.view">
<field name="name">Warehouse Application</field>
<field name="model">stock.config.settings</field>
<field name="type">form</field>
@ -45,7 +45,7 @@
</field>
</record>
<record id="action_stock.config.settings" model="ir.actions.act_window">
<record id="action_stock_config_settings" model="ir.actions.act_window">
<field name="name">Configure Warehouse</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">stock.config.settings</field>
@ -53,8 +53,8 @@
<field name="target">new</field>
</record>
<menuitem id="menu_stock.config.settings" name="Warehouse" parent="base.menu_config"
sequence="3" action="action_stock.config.settings"/>
<menuitem id="menu_stock_config_settings" name="Warehouse" parent="base.menu_config"
sequence="3" action="action_stock_config_settings"/>
</data>
</openerp>

5
addons/stock/security/stock_security.xml
View File

@ -12,11 +12,6 @@
<field name="implied_ids" eval="[(4, ref('group_stock_user'))]"/>
</record>
<record id="group_packaging" model="res.groups">
<field name="name">Manage Product Packaging</field>
<field name="category_id" ref="base.module_category_hidden"/>
</record>
<record id="group_production_lot" model="res.groups">
<field name="name">Manage Production Lots</field>
<field name="category_id" ref="base.module_category_hidden"/>

36
addons/stock/stock_view.xml
View File

@ -22,7 +22,7 @@
action="product.product_category_action_form" id="menu_product_category_config_stock"
parent="stock.menu_product_in_config_stock" sequence="0"/>
<menuitem
action="product.product_ul_form_action" groups="stock.group_packaging"
action="product.product_ul_form_action" groups="product.group_stock_packaging"
id="menu_product_packaging_stock_action" parent="stock.menu_product_in_config_stock" sequence="1"/>
<menuitem
id="menu_stock_unit_measure_stock" name="Units of Measure"
@ -206,7 +206,7 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Packs">
<group col="2" colspan="2" groups="stock.group_packaging">
<group col="2" colspan="2" groups="product.group_stock_packaging">
<separator string="Pack Identification" colspan="2"/>
<field name="name"/>
<field name="serial"/>
@ -428,7 +428,7 @@
<field name="product_uom" string="UOM" groups="product.group_uom"/>
<field name="prodlot_id" groups="stock.group_production_lot"/>
<field name="tracking_id" groups="stock.group_tracking_lot"/>
<field name="product_packaging" domain="[('product_id','=',product_id)]" groups="stock.group_packaging"/>
<field name="product_packaging" domain="[('product_id','=',product_id)]" groups="product.group_stock_packaging"/>
<field name="picking_id"/>
<field name="location_id" />
<field name="location_dest_id" />
@ -452,7 +452,7 @@
<field name="product_uom" string="UOM" groups="product.group_uom"/>
<field name="prodlot_id" groups="stock.group_production_lot"/>
<field name="tracking_id" groups="stock.group_tracking_lot"/>
<field name="product_packaging" domain="[('product_id','=',product_id)]" groups="stock.group_packaging"/>
<field name="product_packaging" domain="[('product_id','=',product_id)]" groups="product.group_stock_packaging"/>
<field name="picking_id"/>
<field name="location_id" />
<field name="location_dest_id" />
@ -734,7 +734,7 @@
groups="stock.group_tracking_lot"
states="draft,assigned,confirmed"/>
<button name="%(split_into)d" string="Put in a new pack" type="action"
groups="stock.group_packaging"
groups="product.group_stock_packaging"
icon="terp-stock_effects-object-colorize"
states="draft,assigned,confirmed"/>
<field name="location_dest_id"/>
@ -754,7 +754,7 @@
<field name="product_uom" string="Unit Of Measure" groups="product.group_uom" colspan="4"/>
<field name="product_uos_qty" groups="product.group_uos" on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)" colspan="4"/>
<field groups="product.group_uos" name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" colspan="4"/>
<field name="product_packaging" groups="stock.group_packaging" domain="[('product_id','=',product_id)]" colspan="4"/>
<field name="product_packaging" groups="product.group_stock_packaging" domain="[('product_id','=',product_id)]" colspan="4"/>
</group>
<group colspan="2" col="2">
@ -774,7 +774,7 @@
<separator string="Traceability" colspan="4" groups="stock.group_tracking_lot"/>
<field name="tracking_id" groups="stock.group_tracking_lot" colspan="3"/>
<button name="%(split_into)d" string="New pack" type="action"
groups="stock.group_packaging"
groups="product.group_stock_packaging"
icon="terp-stock_effects-object-colorize"
states="draft,assigned,confirmed" colspan="1"/>
<field name="prodlot_id" groups="stock.group_production_lot"
@ -925,7 +925,7 @@
states="draft,assigned,confirmed"/>
<button name="%(split_into)d" string="Put in a new pack" type="action"
icon="terp-stock_effects-object-colorize"
groups="stock.group_packaging"
groups="product.group_stock_packaging"
states="draft,assigned,confirmed"/>
<field name="location_id"/>
<field name="date"/>
@ -945,7 +945,7 @@
<field name="product_uom" string="Unit Of Measure" colspan="4" groups="product.group_uom"/>
<field name="product_uos_qty" groups="product.group_uos" on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)" colspan="4" />
<field groups="product.group_uos" name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" colspan="4" />
<field name="product_packaging" groups="stock.group_packaging" domain="[('product_id','=',product_id)]" colspan="4" />
<field name="product_packaging" groups="product.group_stock_packaging" domain="[('product_id','=',product_id)]" colspan="4" />
</group>
<group colspan="2" col="2">
@ -1146,7 +1146,7 @@
icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
states="draft,assigned,confirmed"/>
<button name="%(split_into)d" string="Put in a new pack" type="action"
groups="stock.group_packaging"
groups="product.group_stock_packaging"
icon="terp-stock_effects-object-colorize"
states="draft,assigned,confirmed"/>
<field name="location_dest_id"/>
@ -1165,7 +1165,7 @@
<field name="product_uom" string="Unit Of Measure" groups="product.group_uom" colspan="4"/>
<field name="product_uos_qty" groups="product.group_uos" on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)" colspan="4"/>
<field groups="product.group_uos" name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" colspan="4"/>
<field name="product_packaging" groups="stock.group_packaging" domain="[('product_id','=',product_id)]" colspan="4"/>
<field name="product_packaging" groups="product.group_stock_packaging" domain="[('product_id','=',product_id)]" colspan="4"/>
</group>
<group colspan="2" col="2">
@ -1185,7 +1185,7 @@
<separator string="Traceability" colspan="4" groups="stock.group_tracking_lot"/>
<field name="tracking_id" groups="stock.group_tracking_lot" colspan="3" />
<button name="%(split_into)d" string="New pack" type="action"
groups="stock.group_packaging"
groups="product.group_stock_packaging"
icon="terp-stock_effects-object-colorize"
states="draft,assigned,confirmed" colspan="1"/>
<field name="prodlot_id" groups="stock.group_production_lot"
@ -1384,11 +1384,11 @@
groups="stock.group_tracking_lot"/>
<field name="tracking_id" groups="stock.group_tracking_lot"/>
<button name="setlast_tracking" string="Put in current pack" type="object"
groups="stock.group_packaging"
groups="product.group_stock_packaging"
icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
states="draft,assigned,confirmed,done"/>
<button name="%(split_into)d" string="Put in a new pack" type="action"
groups="stock.group_packaging"
groups="product.group_stock_packaging"
icon="terp-stock_effects-object-colorize"
states="draft,assigned,confirmed,done"/>
<field name="location_id"/>
@ -1448,7 +1448,7 @@
<separator string="Traceability" colspan="4" groups="base.group_extended"/>
<field name="tracking_id" colspan="3" groups="stock.group_tracking_lot"/>
<button name="%(split_into)d" string="New pack" type="action"
groups="stock.group_packaging"
groups="product.group_stock_packaging"
icon="terp-stock_effects-object-colorize"
states="draft,assigned,confirmed" colspan="1"/>
<field name="prodlot_id" groups="stock.group_production_lot"
@ -1557,11 +1557,11 @@
<field name="tracking_id" groups="stock.group_tracking_lot"/>
<button name="setlast_tracking" string="Put in current pack" type="object"
attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
groups="stock.group_packaging"
groups="product.group_stock_packaging"
icon="terp-stock_effects-object-colorize"
states="draft,assigned,confirmed,done"/>
<button name="%(split_into)d" string="Put in a new pack" type="action"
groups="stock.group_packaging"
groups="product.group_stock_packaging"
icon="terp-stock_effects-object-colorize"
states="draft,assigned,confirmed,done"/>
<field name="date"/>
@ -1636,7 +1636,7 @@
<separator string="Traceability" colspan="4" groups="stock.group_tracking_lot"/>
<field name="tracking_id" colspan="3" groups="stock.group_tracking_lot"/>
<button name="%(split_into)d" string="New pack" type="action"
groups="stock.group_packaging"
groups="product.group_stock_packaging"
icon="terp-stock_effects-object-colorize"
states="draft,assigned,confirmed,done" colspan="1"/>
<field name="prodlot_id" groups="stock.group_production_lot"