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

[MERGE] lp:~openerp-commiter/openobject-addons/trunk-wiz-remove-btn-mrp-aja 

bzr revid: jam@tinyerp.com-20120619072326-y922uuxjnrh4qtkg
This commit is contained in:
Jigar Amin - OpenERP 2012-06-19 12:53:26 +05:30
parent d37fdd8fe0 6e9d4e10a5
commit ae1d70dcab
8 changed files with 32 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/mrp/res_config_view.xml
View File

@ -8,8 +8,8 @@
<field name="arch" type="xml">
<form string="Configure Manufacturing" version="7.0">
<header>
<button string="Apply" type="object" name="execute"/>
<button string="Cancel" special="cancel"/>
<button string="Apply" type="object" name="execute" class=
"oe_form_button_active_flow"/>
</header>
<sheet layout="auto">
<group col="4" string="Manufacturing Order">

14
addons/mrp/wizard/change_production_qty_view.xml
View File

@ -9,18 +9,14 @@
<field name="model">change.production.qty</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Change Product Qty">
<form string="Change Product Qty" version="7.0">
<header>
<button name="change_prod_qty" string="Approve"
colspan="1" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
</header>
<separator string="Change Quantity" colspan="4"/>
<newline/>
<field name="product_qty"/>
<newline/>
<separator colspan="4"/>
<group col="2" colspan="4">
<button icon='gtk-stop' special="cancel"
string="Cancel" />
<button name="change_prod_qty" string="Approve"
colspan="1" type="object" icon="gtk-ok" />
</group>
</form>
</field>
</record>

14
addons/mrp/wizard/mrp_price_view.xml
View File

@ -9,17 +9,13 @@
<field name="model">mrp.product_price</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Product Cost Structure">
<form string="Product Cost Structure" version="7.0">
<header>
<button name="print_report" string="Print"
colspan="1" type="object" icon="gtk-print" class="oe_form_button_active_flow" />
</header>
<separator colspan="4" string="Print Cost Structure of Product." />
<field name="number"/>
<newline/>
<separator string="" colspan="4"/>
<group col="2" colspan="4">
<button icon='gtk-stop' special="cancel"
string="Cancel" />
<button name="print_report" string="Print"
colspan="1" type="object" icon="gtk-print" />
</group>
</form>
</field>
</record>

15
addons/mrp/wizard/mrp_product_produce_view.xml
View File

@ -10,19 +10,14 @@
<field name="model">mrp.product.produce</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Produce">
<form string="Produce" version="7.0">
<header>
<button name="do_produce" string="Confirm"
colspan="1" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
</header>
<separator string="Produce" colspan="4"/>
<field name="mode" colspan="4"/>
<field name="product_qty" colspan="2"/>
<newline/>
<separator string="" colspan="4" />
<label string="" colspan="2" />
<group col="2" colspan="1">
<button icon='gtk-stop' special="cancel"
string="Cancel" />
<button name="do_produce" string="Confirm"
colspan="1" type="object" icon="gtk-ok" />
</group>
</form>
</field>
</record>

19
addons/mrp/wizard/mrp_workcenter_load_view.xml
View File

@ -9,17 +9,16 @@
<field name="model">mrp.workcenter.load</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Select time unit">
<field name="time_unit"/>
<newline/>
<field name="measure_unit"/>
<newline/>
<group col="2" colspan="4">
<button icon='gtk-stop' special="cancel"
string="Cancel" />
<form string="Select time unit" version="7.0">
<header>
<button name="print_report" string="Print"
colspan="1" type="object" icon="gtk-print" />
</group>
colspan="1" type="object" icon="gtk-print" class="oe_form_button_active_flow"/>
</header>
<sheet layout="auto">
<field name="time_unit"/>
<newline/>
<field name="measure_unit"/>
</sheet>
</form>
</field>
</record>

6
addons/mrp_repair/wizard/cancel_repair.py
View File

@ -70,11 +70,11 @@ class repair_cancel(osv.osv_memory):
repair_order = self.pool.get('mrp.repair').browse(cr, uid, record_id, context=context)
if not repair_order.invoiced:
res['arch'] = """ <form string="Cancel Repair" colspan="4">
<header>
<button name="cancel_repair" string="_Yes" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
</header>
<group col="2" colspan="2">
<label string="Do you want to continue?" colspan="4"/>
<separator colspan="4"/>
<button icon="gtk-stop" special="cancel" string="_No" readonly="0"/>
<button name="cancel_repair" string="_Yes" type="object" icon="gtk-ok"/>
</group>
</form>
"""

4
addons/mrp_repair/wizard/mrp_repair_cancel_view.xml
View File

@ -11,8 +11,7 @@
<field name="arch" type="xml">
<form string="Cancel Repair Order" version="7.0">
<header>
<button name="cancel_repair" string="Yes" type="object" icon="gtk-ok" />
<button icon="gtk-stop" special="cancel" string="No" />
<button name="cancel_repair" string="Yes" type="object" icon="gtk-ok" class="oe_form_button_active_flow" />
</header>
<label string="This operation will cancel the Repair process, but will not cancel it's Invoice. Do you want to continue?"/>
</form>
@ -27,7 +26,6 @@
<field name="view_mode">form</field>
<field name="target">new</field>
</record>
</data>
</openerp>

4
addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml
View File

@ -11,8 +11,8 @@
<field name="arch" type="xml">
<form string="Create invoices" version="7.0">
<header>
<button icon="gtk-stop" special="cancel" string="Cancel" />
<button name="make_invoices" string="Create Invoice" type="object" icon="terp-gtk-go-back-rtl" />
<button name="make_invoices" string="Create Invoice" type="object" icon="terp-gtk-go-back-rtl" class=
"oe_form_button_active_flow"/>
</header>
<group string="Do you really want to create the invoice(s)?">
<field name="group"/>