[MERGE] lp:~openerp-dev/openobject-addons/trunk-wiz-remove-btn-sale-tpa

bzr revid: jam@tinyerp.com-20120619090229-t0aetgxs8wti2yfa
This commit is contained in:
Jigar Amin - OpenERP
2012-06-19 14:32:29 +05:30
4 changed files with 5 additions and 9 deletions
+1 -2
View File
@@ -8,8 +8,7 @@
<field name="arch" type="xml">
<form string="Create invoices" version="7.0">
<header>
<button name="make_invoices" string="Create Invoices" type="object" icon="terp-gtk-go-back-rtl"/>
<button special="cancel" string="Cancel" icon="gtk-cancel"/>
<button name="make_invoices" string="Create Invoices" type="object" icon="terp-gtk-go-back-rtl" class="oe_form_button_active_flow"/>
</header>
<separator string="Do you really want to create the invoice(s)?" />
</form>
+1 -2
View File
@@ -8,8 +8,7 @@
<field name="arch" type="xml">
<form string="Create invoices" version="7.0">
<header>
<button name="make_invoices" string="Create Invoices" type="object" icon="terp-gtk-go-back-rtl"/>
<button special="cancel" string="Cancel" icon="gtk-cancel"/>
<button name="make_invoices" string="Create Invoices" type="object" icon="terp-gtk-go-back-rtl" class="oe_form_button_active_flow"/>
</header>
<separator colspan="4" string="Do you really want to create the invoice(s)?" />
<group>
@@ -8,9 +8,8 @@
<field name="arch" type="xml">
<form string="Advance Invoice" version="7.0">
<header>
<button name="create_invoices" string="Create Invoice" type="object" icon="gtk-go-forward" context="{'open_invoices': False}"/>
<button name="create_invoices" string="Create and view Invoice" type="object" icon="terp-camera_test" context="{'open_invoices': True}" />
<button special="cancel" string="Cancel" icon="gtk-cancel"/>
<button name="create_invoices" string="Create Invoice" type="object" icon="gtk-go-forward" context="{'open_invoices': False}" class="oe_form_button_active_flow"/>
<button name="create_invoices" string="Create and view Invoice" type="object" icon="terp-camera_test" context="{'open_invoices': True}" class="oe_form_button_active_flow"/>
</header>
<group col="4">
<field name="advance_payment_method" on_change="onchange_advance_payment_method(advance_payment_method,product_id)"/>
@@ -10,8 +10,7 @@
<field name="arch" type="xml">
<form string="Convert to Quotation" version="7.0">
<header>
<button name="makeOrder" string="_Create" type="object" icon='gtk-go-forward'/>
<button special="cancel" string="Cancel" icon="gtk-cancel"/>
<button name="makeOrder" string="_Create" type="object" icon='gtk-go-forward' class="oe_form_button_active_flow"/>
</header>
<group col="4">
<field name="partner_id" required="1"/>