openerp-openbig

Merge lp:~openbig/bigconsulting/added_button into lp:bigconsulting

  1. added_button
  2. Merge into addons
Proposed by gpa(OpenERP)
Status: Merged
Merged at revision: 87
Proposed branch: lp:~openbig/bigconsulting/added_button
Merge into: lp:bigconsulting
Diff against target: 37 lines (+4/-2)
1 file modified
packing_barcode_check/packing_barcode_check_view.xml (+4/-2)
To merge this branch: bzr merge lp:~openbig/bigconsulting/added_button
Reviewer Review Type Date Requested Status
openbig Pending
Review via email: mp+34735@code.launchpad.net

Description of the change

added reset button in General information tab

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'packing_barcode_check/packing_barcode_check_view.xml'
2--- packing_barcode_check/packing_barcode_check_view.xml 2010-09-03 12:48:19 +0000
3+++ packing_barcode_check/packing_barcode_check_view.xml 2010-09-07 10:33:41 +0000
4@@ -51,6 +51,7 @@
5 <button name="action_assign" states="confirmed" string="Check Availability" type="object" groups="base.group_extended"/>
6 <button name="force_assign" states="confirmed" string="Force Availability" type="object"/>
7 <button name="%(stock.partial_picking)d" states="scanned" string="Packing Done" type="action"/>
8+ <button name="action_reset" states="scanned" string="Reset" type="object"/>
9 <button name="button_cancel" states="scanned,assigned,confirmed,draft" string="Cancel"/>
10 </group>
11 </page>
12@@ -75,7 +76,7 @@
13 </group>
14 <group col="10" colspan="4">
15 <button name="%(id_scan_product)d" states="assigned,scanned" string="Scan Packing" type="action"/>
16- <button name="action_reset" states="assigned,scanned" string="Reset" type="object"/>
17+ <button name="button_cancel" states="assigned" string="Cancel"/>
18 </group>
19 </page>
20 </xpath>
21@@ -132,6 +133,7 @@
22 <button name="action_assign" states="confirmed" string="Check Availability" type="object"/>
23 <button name="force_assign" states="confirmed" string="Force Availability" type="object"/>
24 <button name="%(stock.partial_picking)d" states="scanned" string="Validate" type="action"/>
25+ <button name="action_reset" states="scanned" string="Reset" type="object"/>
26 <button name="button_cancel" states="scanned,assigned,confirmed,draft" string="Cancel"/>
27 </group>
28 </page>
29@@ -156,7 +158,7 @@
30 </group>
31 <group col="10" colspan="4">
32 <button name="%(id_scan_product)d" states="assigned,scanned" string="Scan Packing" type="action"/>
33- <button name="action_reset" states="assigned,scanned" string="Reset" type="object"/>
34+ <button name="button_cancel" states="assigned" string="Cancel"/>
35 </group>
36 </page>
37 </xpath>

Subscribers

People subscribed via source and target branches