openerp-openbig

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

  1. pack_barcode_check_rest
  2. Merge into addons
Proposed by gpa(OpenERP)
Status: Merged
Merged at revision: 83
Proposed branch: lp:~openbig/bigconsulting/pack_barcode_check_rest
Merge into: lp:bigconsulting
Diff against target: 81 lines (+14/-5)
3 files modified
packing_barcode_check/packing_barcode_check.py (+5/-2)
packing_barcode_check/packing_barcode_check_view.xml (+3/-3)
packing_barcode_check/packing_barcode_check_workflow.xml (+6/-0)
To merge this branch: bzr merge lp:~openbig/bigconsulting/pack_barcode_check_rest
Reviewer Review Type Date Requested Status
openbig Pending
Review via email: mp+34050@code.launchpad.net

Description of the change

sovled the problem of reset button

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.py'
2--- packing_barcode_check/packing_barcode_check.py 2010-08-27 04:58:57 +0000
3+++ packing_barcode_check/packing_barcode_check.py 2010-08-30 07:41:01 +0000
4@@ -23,6 +23,7 @@
5
6 from osv import osv, fields
7 from tools.sql import drop_view_if_exists
8+import netsvc
9
10 class stock_picking(osv.osv):
11 _name='stock.picking'
12@@ -61,10 +62,12 @@
13 'scanned_quantity' : lambda *a:0.0,
14 }
15
16- def button_reset(self, cr, uid, ids, context=None):
17+ def action_reset(self, cr, uid, ids, context=None):
18 move_obj = self.pool.get('stock.move')
19 move_ids = move_obj.search(cr, uid, [('picking_id','=',ids[0])])
20 move_obj.write(cr, uid, move_ids, {'scaned_qty':0.0}, context)
21+ wkf_service = netsvc.LocalService("workflow")
22+ wkf_service.trg_validate(uid, 'stock.picking', ids[0], 'button_reset', cr)
23 return True
24
25 def test_scanned(self, cr, uid, ids, context={}):
26@@ -72,7 +75,7 @@
27 if pick.tobe_scan_ids:
28 return False
29 return True
30-
31+
32 def action_scanned_wkf(self, cr, uid, ids, context={}):
33 for pick in self.browse(cr, uid, ids, context=context):
34 if not pick.tobe_scan_ids:
35
36=== modified file 'packing_barcode_check/packing_barcode_check_view.xml'
37--- packing_barcode_check/packing_barcode_check_view.xml 2010-08-27 04:58:57 +0000
38+++ packing_barcode_check/packing_barcode_check_view.xml 2010-08-30 07:41:01 +0000
39@@ -1,6 +1,6 @@
40 <?xml version="1.0" encoding="utf-8"?>
41 <openerp>
42- <data noupdate="1">
43+ <data>
44
45 <record id="view_picking_scanned_tree" model="ir.ui.view">
46 <field name="name">stock.picking.scanned.tree</field>
47@@ -38,7 +38,7 @@
48 <field name="backorder_id" select="2" readonly="1"/>
49 <field name="origin" select="2" readonly="1"/>
50 <label string=""/>
51- <button name="button_reset" states="assigned" string="Reset" type="object"/>
52+ <button name="action_reset" states="assigned,scanned" string="Reset" type="object"/>
53 </group>
54 <notebook colspan="4">
55 <page string="Scanning Info">
56@@ -66,7 +66,7 @@
57 <button name="draft_validate" states="draft" string="Process Now" type="object"/>
58 <button name="action_assign" states="confirmed" string="Check Availability" type="object"/>
59 <button name="force_assign" states="confirmed" string="Force Availability" type="object"/>
60- <button name="%(id_scan_product)d" states="assigned" string="Scan Packing" type="action"/>
61+ <button name="%(id_scan_product)d" states="assigned,scanned" string="Scan Packing" type="action"/>
62 <button name="%(stock.partial_picking)d" states="scanned" string="Packing Done" type="action"/>
63 <button name="button_cancel" states="assigned,confirmed,draft" string="Cancel"/>
64 </group>
65
66=== modified file 'packing_barcode_check/packing_barcode_check_workflow.xml'
67--- packing_barcode_check/packing_barcode_check_workflow.xml 2010-08-18 07:56:22 +0000
68+++ packing_barcode_check/packing_barcode_check_workflow.xml 2010-08-30 07:41:01 +0000
69@@ -16,6 +16,12 @@
70 <field name="signal">button_scanned</field>
71 </record>
72
73+ <record id="trans_scanned_assigned_back" model="workflow.transition">
74+ <field name="act_from" ref="act_scanned"/>
75+ <field name="act_to" ref="stock.act_assigned"/>
76+ <field name="signal">button_reset</field>
77+ </record>
78+
79 <record id="stock.trans_scanned_assigned_move" model="workflow.transition">
80 <field name="act_from" ref="act_scanned"/>
81 <field name="act_to" ref="stock.act_move"/>

Subscribers

People subscribed via source and target branches