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

[IMP] stock: Add the short cut for cancel button in all view

Browse Source 
bzr revid: sbh@tinyerp.com-20100914112537-5xyhjg2fkkk3thyb
This commit is contained in:
sbh (Open ERP)
2010-09-14 16:55:37 +05:30
parent db4e43e07b
commit e7c5054bd0
10 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/stock/stock_view.xml
+12 -12
View File
@@ -581,7 +581,7 @@
<field name="picking_id" invisible="True"/>
<field domain="[('picking_id','&lt;&gt;',picking_id),('state','in',['confirmed','assigned']),('picking_id.address_id','=',address_id)]" name="move_ids" nolabel="1" height="100" width="500"/><newline/>
<group colspan="4">
<button special="cancel" string="Cancel" icon="gtk-cancel"/>
<button special="cancel" string="_Cancel" icon="gtk-cancel"/>
<button name="action_move" string="Add" type="object" icon="gtk-add"/>
</group>
</group>
@@ -750,7 +750,7 @@
<button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
<button name="%(action_partial_picking)d" states="assigned" string="Approve" type="action" icon="gtk-apply"/>
<button name="%(action_stock_invoice_onshipping)d" string="Create Invoice" type="action" icon="terp-document-new" attrs="{'invisible':[('invoice_state','!=','2binvoiced')]}"/>
<button name="button_cancel" states="assigned,confirmed,draft" string="Cancel" icon="gtk-cancel"/>
<button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel" icon="gtk-cancel"/>
</group>
</page>
<page string="Additional info" groups="base.group_extended,base.group_multi_company">
@@ -810,7 +810,7 @@
<field name="stock_journal_id" groups="base.group_extended" widget="selection"/>
<field name="state"/>
<button name="%(action_partial_picking)d" states="assigned" string="Approve" type="action" icon="gtk-go-forward" help="Approve Delivery"/>
<button name="button_cancel" states="assigned,confirmed,draft" string="Cancel" icon="gtk-cancel" help="Cancel" confirm="This operation will cancel the delivery. Do you want to continue?"/>
<button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel" icon="gtk-cancel" help="Cancel" confirm="This operation will cancel the delivery. Do you want to continue?"/>
</tree>
</field>
</record>
@@ -923,7 +923,7 @@
<button name="action_confirm" states="draft" string="Confirm" type="object" icon="gtk-apply"/>
<button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
<button name="cancel_assign" states="assigned" string="Cancel Availability" type="object" icon="gtk-find"/>
<button name="action_cancel" states="assigned" string="Cancel" type="object" icon="gtk-cancel"/>
<button name="action_cancel" states="assigned" string="_Cancel" type="object" icon="gtk-cancel"/>
</group>
</form>
</field>
@@ -935,7 +935,7 @@
<button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
<button name="%(action_partial_picking)d" states="assigned" string="Products Sent" type="action" icon="gtk-go-forward"/>
<button name="%(action_stock_invoice_onshipping)d" string="Create Invoice" type="action" icon="terp-document-new" attrs="{'invisible':[('invoice_state','!=','2binvoiced')]}"/>
<button name="button_cancel" states="assigned,confirmed,draft" string="Cancel" icon="gtk-cancel"/>
<button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel" icon="gtk-cancel"/>
</group>
</page>
<page string="Additional info" groups="base.group_extended,base.group_multi_company">
@@ -1139,7 +1139,7 @@
<button name="action_confirm" states="draft" string="Confirm" type="object" icon="gtk-apply"/>
<button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
<button name="cancel_assign" states="assigned" string="Cancel Availability" type="object" icon="gtk-find"/>
<button name="action_cancel" states="assigned" string="Cancel" type="object" icon="gtk-cancel"/>
<button name="action_cancel" states="assigned" string="_Cancel" type="object" icon="gtk-cancel"/>
</group>
</form>
</field>
@@ -1151,7 +1151,7 @@
<button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
<button name="%(action_partial_picking)d" states="assigned" string="Done" type="action" icon="gtk-execute"/>
<button name="%(action_stock_invoice_onshipping)d" string="Create Invoice" type="action" icon="terp-document-new" attrs="{'invisible':[('invoice_state','!=','2binvoiced')]}"/>
<button name="button_cancel" states="assigned,confirmed,draft" string="Cancel" icon="gtk-cancel"/>
<button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel" icon="gtk-cancel"/>
</group>
</page>
<page string="Additional info" groups="base.group_extended,base.group_multi_company">
@@ -1243,7 +1243,7 @@
<field name="stock_journal_id" groups="base.group_extended" widget="selection"/>
<field name="state"/>
<button name="%(action_partial_picking)d" states="assigned" string="Approve" type="action" icon="gtk-ok" help="Receive products"/>
<button name="button_cancel" states="assigned,confirmed,draft" string="Cancel" icon="gtk-cancel" help="Cancel" confirm="This operation will cancel the shipment. Do you want to continue?" />
<button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel" icon="gtk-cancel" help="Cancel" confirm="This operation will cancel the shipment. Do you want to continue?" />
</tree>
</field>
</record>
@@ -1350,7 +1350,7 @@
<button name="action_confirm" states="draft" string="Confirm" type="object" icon="gtk-apply"/>
<button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
<button name="cancel_assign" states="assigned" string="Cancel Availability" type="object" icon="gtk-find"/>
<button name="action_cancel" states="assigned" string="Cancel" type="object" icon="gtk-cancel"/>
<button name="action_cancel" states="assigned" string="_Cancel" type="object" icon="gtk-cancel"/>
</group>
</form>
</field>
@@ -1362,7 +1362,7 @@
<button name="force_assign" states="confirmed" string="Force Availability" type="object" groups="base.group_extended" icon="gtk-jump-to"/>
<button name="%(action_partial_picking)d" states="assigned" string="Products Received" type="action" icon="gtk-ok"/>
<button name="%(action_stock_invoice_onshipping)d" string="Create Invoice" type="action" icon="terp-document-new" attrs="{'invisible':[('invoice_state','!=','2binvoiced')]}"/>
<button name="button_cancel" states="assigned,confirmed,draft" string="Cancel" icon="gtk-cancel"/>
<button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel" icon="gtk-cancel"/>
</group>
</page>
<page string="Additional Info" groups="base.group_extended,base.group_multi_company">
@@ -1598,7 +1598,7 @@
<group col="4" colspan="2">
<button name="action_confirm" states="draft" string="Confirm" type="object" icon="gtk-apply"/>
<button name="action_assign" states="confirmed" string="Set Available" type="object" icon="gtk-yes"/>
<button name="action_cancel" states="assigned,confirmed" string="Cancel" type="object" icon="gtk-cancel"/>
<button name="action_cancel" states="assigned,confirmed" string="_Cancel" type="object" icon="gtk-cancel"/>
<button name="action_done" states="assigned" string="Done" type="object" icon="gtk-jump-to"/>
</group>
</form>
@@ -1767,7 +1767,7 @@
<group col="5" colspan="2">
<button name="action_confirm" states="draft" string="Confirm" type="object" icon="gtk-apply"/>
<button name="action_assign" states="confirmed" string="Set Available" type="object" icon="gtk-yes"/>
<button name="action_cancel" states="assigned,confirmed" string="Cancel" type="object" icon="gtk-cancel"/>
<button name="action_cancel" states="assigned,confirmed" string="_Cancel" type="object" icon="gtk-cancel"/>
<button name="%(action_partial_move)d" states="assigned,confirmed" string="Partial" type="action" icon="gtk-justify-fill"/>
<button name="action_done" states="assigned" string="Done" type="object" icon="gtk-jump-to"/>
</group>
addons/stock/wizard/stock_fill_inventory_view.xml
+1 -1
View File
@@ -14,7 +14,7 @@
<newline/>
<field name="set_stock_zero"/>
<separator string="" colspan="4" />
<button special="cancel" string="Cancel" icon='gtk-cancel'/>
<button special="cancel" string="_Cancel" icon='gtk-cancel'/>
<button name="fill_inventory" string="Fill Inventory" type="object" icon="gtk-ok"/>
</form>
</field>
addons/stock/wizard/stock_inventory_merge_view.xml
+1 -1
View File
@@ -12,7 +12,7 @@
<label string="Do you want to merge theses inventories ?"/>
<separator colspan="4"/>
<group colspan="4" col="6">
<button special="cancel" string="Cancel" icon='gtk-cancel'/>
<button special="cancel" string="_Cancel" icon='gtk-cancel'/>
<button name="do_merge" string="Yes" type="object" icon="gtk-apply"/>
</group>
</form>
addons/stock/wizard/stock_invoice_onshipping_view.xml
+1 -1
View File
@@ -16,7 +16,7 @@
<newline/>
<field name="invoice_date" />
<separator string="" colspan="4" />
<button special="cancel" string="Cancel" icon='gtk-cancel'/>
<button special="cancel" string="_Cancel" icon='gtk-cancel'/>
<button name="create_invoice" string="Create Invoices" type="object" icon="gtk-ok"/>
</form>
</field>
addons/stock/wizard/stock_location_product_view.xml
+1 -1
View File
@@ -16,7 +16,7 @@
<label string="(Keep empty to open the current situation. Adjust HH:MM:SS to 00:00:00 to filter all resources of the day for the 'From' date and 23:59:59 for the 'To' date)" align="0.0" colspan="3"/>
<separator string="" colspan="4" />
<label string=""/>
<button special="cancel" string="Cancel" icon="gtk-cancel" />
<button special="cancel" string="_Cancel" icon="gtk-cancel" />
<button name="action_open_window" string="Open Product" type="object" icon="gtk-ok"/>
</form>
</field>
addons/stock/wizard/stock_move_view.xml
+1 -1
View File
@@ -13,7 +13,7 @@
<newline/>
<separator string="" colspan="4" />
<button icon='gtk-cancel' special="cancel"
string="Cancel" />
string="_Cancel" />
<button name="track_lines" string="Ok"
type="object" icon="gtk-ok" />
</form>
addons/stock/wizard/stock_picking_make_view.xml
+1 -1
View File
@@ -12,7 +12,7 @@
width="600" height="300"/>
<separator string="" colspan="4" />
<button icon='gtk-cancel' special="cancel"
string="Cancel" />
string="_Cancel" />
<button name="make_packing" string="Ok"
type="object" icon="gtk-apply" />
</form>
addons/stock/wizard/stock_replacement_view.xml
+1 -1
View File
@@ -9,7 +9,7 @@
<form string="Replace a component">
<label string="Component" colspan="4"/>
<separator string="" colspan="4" />
<button icon='gtk-cancel' special="cancel" string="Cancel" />
<button icon='gtk-cancel' special="cancel" string="_Cancel" />
<button name="replace_composant" string="Replace" type="object" />
</form>
</field>
addons/stock/wizard/stock_splitinto_view.xml
+1 -1
View File
@@ -10,7 +10,7 @@
<separator string="Quantity to leave in the current pack" colspan="4"/>
<field name="quantity"/>
<button icon='gtk-cancel' special="cancel"
string="Cancel" />
string="_Cancel" />
<button name="split" string="Ok"
type="object" icon="gtk-ok" />
</form>
addons/stock/wizard/stock_ups_view.xml
+1 -1
View File
@@ -11,7 +11,7 @@
<separator string="UPS generator" colspan="4"/>
<field name="weight" />
<separator string="" colspan="4" />
<button icon='gtk-cancel' special="cancel" string="Cancel" />
<button icon='gtk-cancel' special="cancel" string="_Cancel" />
<button name="ups_save" string="Get xml file" type="object" />
<button name="ups_upload" string="Upload xml file" type="object" />
</form>