diff options
| author | Amit Patel <apa@tinyerp.com> | 2012-10-25 12:31:33 +0530 |
|---|---|---|
| committer | Amit Patel <apa@tinyerp.com> | 2012-10-25 12:31:33 +0530 |
| commit | 3e4e8006de2c4eb4ab77bbc3692ba0b9d3d4e4c8 (patch) | |
| tree | f9ec948c2332fbbfc7458e903d534526a50297cc /addons/mrp | |
| parent | b59e7d17ed945dfadaf9f6140789bb2ecbca2617 (diff) | |
| parent | 013f14931bdc13c63fa6e169cf7fff364d5dda5a (diff) | |
[MERGE]:trunk
bzr revid: apa@tinyerp.com-20121025070133-x6g4can9le7p4d5z
Diffstat (limited to 'addons/mrp')
| -rw-r--r-- | addons/mrp/mrp.py | 12 | ||||
| -rw-r--r-- | addons/mrp/mrp_view.xml | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py index 92b47ff66e1..8a36d4b0a13 100644 --- a/addons/mrp/mrp.py +++ b/addons/mrp/mrp.py @@ -473,12 +473,12 @@ class mrp_production(osv.osv): [('draft', 'New'), ('cancel', 'Cancelled'), ('picking_except', 'Picking Exception'), ('confirmed', 'Waiting Goods'), ('ready', 'Ready to Produce'), ('in_production', 'Production Started'), ('done', 'Done')], string='Status', readonly=True, - help="When the production order is created the state is set to 'Draft'.\n\ - If the order is confirmed the state is set to 'Waiting Goods'.\n\ - If any exceptions are there, the state is set to 'Picking Exception'.\n\ - If the stock is available then the state is set to 'Ready to Produce'.\n\ - When the production gets started then the state is set to 'In Production'.\n\ - When the production is over, the state is set to 'Done'."), + help="When the production order is created the status is set to 'Draft'.\n\ + If the order is confirmed the status is set to 'Waiting Goods'.\n\ + If any exceptions are there, the status is set to 'Picking Exception'.\n\ + If the stock is available then the status is set to 'Ready to Produce'.\n\ + When the production gets started then the status is set to 'In Production'.\n\ + When the production is over, the status is set to 'Done'."), 'hour_total': fields.function(_production_calc, type='float', string='Total Hours', multi='workorder', store=True), 'cycle_total': fields.function(_production_calc, type='float', string='Total Cycles', multi='workorder', store=True), 'user_id':fields.many2one('res.users', 'Responsible'), diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml index 8d8e77bf75e..8b09d4ff0a0 100644 --- a/addons/mrp/mrp_view.xml +++ b/addons/mrp/mrp_view.xml @@ -668,7 +668,7 @@ <page string="Consumed Products"> <group> <group string="Products to Consume"> - <field name="move_lines" nolabel="1"> + <field name="move_lines" nolabel="1" options="{'reload_on_button': true}"> <tree colors="blue:state == 'draft';black:state in ('picking_except','confirmed','ready','in_production');gray:state in ('cancel','done') " string="Products to Consume"> <field name="product_id"/> <field name="product_qty" string="Quantity"/> @@ -692,7 +692,7 @@ </tree> </field> </group> - <group string="Consumed Product"> + <group string="Consumed Products"> <field name="move_lines2" nolabel="1"> <tree colors="red:scrapped==True;blue:state == 'draft';black:state in('picking_except','confirmed','ready','in_production');gray:state == 'cancel' " string="Consumed Products" editable="bottom"> <field name="product_id" readonly="1"/> |