pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] lp:~openerp-commiter/openobject-addons/trunk-red-button-manufacturing-aja

Browse Source 
bzr revid: jam@tinyerp.com-20120614105425-wklhfzi3dxx7f483
This commit is contained in:
Jigar Amin - OpenERP
2012-06-14 16:24:25 +05:30
parent 37e3fc7853 414bf8db4b
commit 012d45bbe2
3 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/mrp/mrp_view.xml
+5 -4
View File
@@ -598,10 +598,11 @@
<field name="arch" type="xml">
<form string="Manufacturing Orders" version="7.0">
<header>
<button name="button_confirm" states="draft" string="Confirm Production"/>
<button name="button_produce" states="ready" string="Start Production"/>
<button name="%(act_mrp_product_produce)d" states="in_production" string="Produce" type="action"/>
<button name="force_production" states="confirmed,picking_except" string="Force Reservation" type="object"/>
<button name="button_confirm" states="draft" string="Confirm Production" class="oe_form_button_active_flow"/>
<button name="button_produce" states="ready" string="Start Production" class="oe_form_button_active_flow"/>
<button name="%(act_mrp_product_produce)d" states="in_production" string="Produce" type="action" class="oe_form_button_active_flow" />
<button name="force_production" states="confirmed" string="Force Reservation" type="object" class="oe_form_button_active_flow"/>
<button name="force_production" states="picking_except" string="Force Reservation" type="object"/>
<button name="button_recreate" states="picking_except" string="Recreate Picking"/>
<button name="button_cancel" states="draft,ready,in_production,picking_except" string="Cancel"/>
<button name="action_cancel" type="object" states="confirmed" string="Cancel"/>
addons/mrp_operations/mrp_operations_view.xml
+5 -5
View File
@@ -69,11 +69,11 @@
<field name="arch" type="xml">
<form version="7.0">
<header>
<button name="button_start_working" string="Start" states="draft"/>
<button name="button_resume" string="Resume" states="pause"/>
<button name="button_done" string="Finished" states="startworking"/>
<button name="button_pause" string="Pending" states="startworking"/>
<button name="button_draft" string="Set Draft" states="cancel"/>
<button name="button_start_working" string="Start" states="draft" class="oe_form_button_active_flow"/>
<button name="button_resume" string="Resume" states="pause" class="oe_form_button_active_flow"/>
<button name="button_done" string="Finished" states="startworking" class="oe_form_button_active_flow"/>
<button name="button_pause" string="Pending" states="startworking" class="oe_form_button_return_flow"/>
<button name="button_draft" string="Set Draft" states="cancel" class="oe_form_button_return_flow"/>
<button name="button_cancel" string="Cancel" states="draft,startworking"/>
<field name="state" widget="statusbar" statusbar_visible="draft,startworking"/>
</header>
addons/mrp_repair/mrp_repair_view.xml
+5 -6
View File
@@ -29,12 +29,11 @@
<field name="arch" type="xml">
<form version="7.0">
<header>
<button name="repair_confirm" states="draft" string="Confirm Repair"/>
<button name="repair_ready" states="confirmed" string="Start Repair"/>
<button name="action_repair_start" states="ready" string="Start Repair"/>
<button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object"/>
<button name="action_repair_end" states="under_repair" string="End Repair"/>
<button name="action_invoice_create" states="2binvoiced" string="Make Invoice"/>
<button name="repair_confirm" states="draft" string="Confirm Repair" class="oe_form_button_active_flow"/>
<button name="repair_ready" states="confirmed,ready" string="Start Repair" class="oe_form_button_active_flow"/>
<button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" class="oe_form_button_return_flow"/>
<button name="action_repair_end" states="under_repair" string="End Repair" class="oe_form_button_active_flow"/>
<button name="action_invoice_create" states="2binvoiced" string="Make Invoice" class="oe_form_button_active_flow"/>
<button name="invoice_recreate" states="invoice_except" string="Recreate Invoice"/>
<button name="invoice_corrected" states="invoice_except" string="Invoice Corrected"/>
<button name="%(action_cancel_repair)d" states="confirmed,2binvoiced,ready,under_repair" string="Cancel Repair" type="action"/>