bzr revid: fp@tinyerp.com-20090128151406-6x9zk5425gbp631f
This commit is contained in:
Fabien Pinckaers 2009-01-28 16:14:06 +01:00
parent 4fff87ad61
commit a7fa06f7cd
5 changed files with 44 additions and 44 deletions

View File

@ -188,10 +188,10 @@
<field name="state" select="2"/>
<field name="residual"/>
<group col="3" colspan="4">
<button name="invoice_open" states="draft,proforma2" string="Validate"/>
<button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel"/>
<button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object"/>
<button name='%(wizard_paid_open)d' type='action' string='Re-Open' states='paid'/>
<button name="invoice_open" states="draft,proforma2" string="Validate" icon="gtk-execute"/>
<button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel"/>
<button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
<button name='%(wizard_paid_open)d' type='action' string='Re-Open' states='paid' icon="gtk-convert"/>
</group>
</group>
</page>
@ -274,11 +274,11 @@
<field name="state" select="2"/>
<field name="residual"/>
<group col="3" colspan="4">
<button name="invoice_proforma2" states="draft" string="PRO-FORMA"/>
<button name="invoice_open" states="draft,proforma2" string="Create"/>
<button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel"/>
<button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object"/>
<button name='%(wizard_paid_open)d' type='action' string='Re-Open' states='paid'/>
<button name="invoice_proforma2" states="draft" string="PRO-FORMA" icon="gtk-print"/>
<button name="invoice_open" states="draft,proforma2" string="Create" icon="gtk-execute"/>
<button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel"/>
<button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
<button name='%(wizard_paid_open)d' type='action' string='Re-Open' states='paid' icon="gtk-convert"/>
</group>
</group>
</page>

View File

@ -985,8 +985,8 @@
<field name="state" select="2"/>
<field name="balance_end"/>
<button name="button_dummy" states="draft" string="Compute"/>
<button name="button_confirm" states="draft" string="Confirm" type="object"/>
<button name="button_cancel" states="confirm" string="Cancel" type="object"/>
<button name="button_confirm" states="draft" string="Confirm" type="object" icon="gtk-execute"/>
<button name="button_cancel" states="confirm" string="Cancel" type="object" icon="gtk-cancel"/>
</group>
</form>
</field>

View File

@ -34,16 +34,16 @@
<field colspan="4" name="members" nolabel="1"/>
<group col="9" colspan="8">
<field name="state"/>
<button name="set_template" string="Set as Template" type="object" states="open"/>
<button name="set_open" string="Reactivate Project" type="object" states="pending,cancelled,done"/>
<button name="set_pending" string="Pending" type="object" states="open"/>
<button name="set_cancel" string="Cancel" type="object" states="open,pending"/>
<button name="set_done" string="Done" type="object" states="open,pending"/>
<button name="reset_project" string="Reset as Project" type="object" states="template"/>
<button name="set_template" string="Set as Template" type="object" states="open" icon="gtk-convert"/>
<button name="set_open" string="Reactivate Project" type="object" states="pending,cancelled,done" icon="gtk-ok"/>
<button name="set_pending" string="Pending" type="object" states="open" icon="gtk-media-pause"/>
<button name="set_cancel" string="Cancel" type="object" states="open,pending" icon="gtk-cancel"/>
<button name="set_done" string="Done" type="object" states="open,pending" icon="gtk-ok"/>
<button name="reset_project" string="Reset as Project" type="object" states="template" icon="gtk-convert"/>
<button name="duplicate_template"
string="New Project Based on Template"
type="object"
states="template"/>
states="template" icon="gtk-execute"/>
</group>
</page>
<page groups="base.group_extended" string="Partner Info">
@ -270,13 +270,13 @@
<newline/>
<group col="11" colspan="4">
<field name="state" select="1"/>
<button name="do_draft" states="open" string="Draft" type="object"/>
<button name="do_open" states="pending,draft" string="Start Task" type="object"/>
<button name="do_reopen" states="done,cancelled" string="Reactivate" type="object"/>
<button name="do_pending" states="open" string="Pending" type="object"/>
<button groups="base.group_extended" name="%(wizard_delegate_task)d" states="pending,open" string="Delegate" type="action"/>
<button name="%(wizard_close_task)d" states="pending,open" string="Done" type="action"/>
<button name="do_cancel" states="draft,open,pending" string="Cancel" type="object"/>
<button name="do_draft" states="open" string="Draft" type="object" icon="gtk-indent"/>
<button name="do_open" states="pending,draft" string="Start Task" type="object" icon="gtk-execute"/>
<button name="do_reopen" states="done,cancelled" string="Reactivate" type="object" icon="gtk-convert"/>
<button name="do_pending" states="open" string="Pending" type="object" icon="gtk-media-pause"/>
<button groups="base.group_extended" name="%(wizard_delegate_task)d" states="pending,open" string="Delegate" type="action" icon="gtk-execute"/>
<button name="%(wizard_close_task)d" states="pending,open" string="Done" type="action" icon="gtk-jump-to"/>
<button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel"/>
</group>
</page>

View File

@ -60,15 +60,15 @@
</group>
<group col="11" colspan="4">
<field name="state" readonly="1"/>
<button name="purchase_confirm" states="draft" string="Confirm Purchase Order"/>
<button name="purchase_appbuyer" states="wait_auth" string="Approve Purchase"/>
<button name="purchase_approve" states="confirmed" string="Approved by Supplier"/>
<button name="purchase_cancel" states="draft,confirmed,wait_auth" string="Cancel Purchase Order"/>
<button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object"/>
<button name="action_cancel" states="approved,except_picking,except_invoice" string="Cancel Purchase Order" type="object"/>
<button name="purchase_confirm" states="draft" string="Confirm Purchase Order" icon="gtk-execute"/>
<button name="purchase_appbuyer" states="wait_auth" string="Approve Purchase" icon="gtk-ok"/>
<button name="purchase_approve" states="confirmed" string="Approved by Supplier" icon="gtk-ok"/>
<button name="purchase_cancel" states="draft,confirmed,wait_auth" string="Cancel Purchase Order" icon="gtk-cancel"/>
<button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
<button name="action_cancel" states="approved,except_picking,except_invoice" string="Cancel Purchase Order" type="object" icon="gtk-cancel"/>
<button name="picking_ok" states="except_picking" string="Manually Corrected"/>
<button name="invoice_ok" states="except_invoice" string="Manually Corrected"/>
<button name="picking_ok" states="except_picking" string="Manually Corrected" icon="gtk-convert"/>
<button name="invoice_ok" states="except_invoice" string="Manually Corrected" icon="gtk-convert"/>
</group>
</page>
<page string="Delivery &amp; Invoices">

View File

@ -185,17 +185,17 @@
</group>
<group col="13" colspan="4">
<field name="state" select="2"/>
<button name="order_confirm" states="draft" string="Confirm Order"/>
<button name="invoice_recreate" states="invoice_except" string="Recreate Invoice"/>
<button name="invoice_corrected" states="invoice_except" string="Invoice Corrected"/>
<button name="ship_recreate" states="shipping_except" string="Recreate Procurement"/>
<button name="ship_corrected" states="shipping_except" string="Procurement Corrected"/>
<button name="manual_invoice" states="manual" string="Create Invoice"/>
<button name="ship_cancel" states="shipping_except" string="Cancel Order"/>
<button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object"/>
<button name="action_cancel" states="manual,progress" string="Cancel Order" type="object"/>
<button name="cancel" states="draft" string="Cancel Order"/>
<button name="invoice_cancel" states="invoice_except" string="Cancel Order"/>
<button name="order_confirm" states="draft" string="Confirm Order" icon="gtk-execute"/>
<button name="invoice_recreate" states="invoice_except" string="Recreate Invoice" icon="gtk-execute"/>
<button name="invoice_corrected" states="invoice_except" string="Invoice Corrected" icon="gtk-go-forward"/>
<button name="ship_recreate" states="shipping_except" string="Recreate Procurement" icon="gtk-execute"/>
<button name="ship_corrected" states="shipping_except" string="Procurement Corrected" icon="gtk-go-forward"/>
<button name="manual_invoice" states="manual" string="Create Invoice" icon="gtk-execute"/>
<button name="ship_cancel" states="shipping_except" string="Cancel Order" icon="gtk-cancel"/>
<button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
<button name="action_cancel" states="manual,progress" string="Cancel Order" type="object" icon="gtk-cancel"/>
<button name="cancel" states="draft" string="Cancel Order" icon="gtk-cancel"/>
<button name="invoice_cancel" states="invoice_except" string="Cancel Order" icon="gtk-cancel"/>
</group>
</page>
<page string="Other data">