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

Subscribers

People subscribed via source and target branches