Odoo Addons (MOVED TO GITHUB)

Merge lp:~openerp-dev/openobject-addons/6.1-opw-583775-dhs into lp:openobject-addons/6.1

  1. 6.1-opw-583775-dhs
  2. Merge into 6.1
Proposed by Dhruti Shastri(OpenERP)
Status: Needs review
Proposed branch: lp:~openerp-dev/openobject-addons/6.1-opw-583775-dhs
Merge into: lp:openobject-addons/6.1
Diff against target: 11 lines (+2/-0)
1 file modified
stock/wizard/stock_return_picking.py (+2/-0)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/6.1-opw-583775-dhs
Reviewer Review Type Date Requested Status
Naresh(OpenERP) Pending
Review via email: mp+143831@code.launchpad.net

Description of the change

This branch contains the fix described on Bug : https://bugs.launchpad.net/openobject-addons/+bug/1085377 back-ported from fix for 7.0

To post a comment you must log in.

Unmerged revisions

7133. By Dhruti Shastri(OpenERP)

[stock] : Delivery Not Applicable (Case:583775)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'stock/wizard/stock_return_picking.py'
--- stock/wizard/stock_return_picking.py 2012-06-12 16:15:51 +0000
+++ stock/wizard/stock_return_picking.py 2013-01-18 06:58:22 +0000
@@ -193,6 +193,8 @@
193 'location_id':new_location, 'location_dest_id':move.location_id.id,193 'location_id':new_location, 'location_dest_id':move.location_id.id,
194 'date':date_cur,})194 'date':date_cur,})
195 move_obj.write(cr, uid, [move.id], {'move_history_ids2':[(4,new_move)]})195 move_obj.write(cr, uid, [move.id], {'move_history_ids2':[(4,new_move)]})
196 if len(pick.move_lines) != len(val_id):
197 set_invoice_state_to_none = False
196 if not returned_lines:198 if not returned_lines:
197 raise osv.except_osv(_('Warning !'), _("Please specify at least one non-zero quantity!"))199 raise osv.except_osv(_('Warning !'), _("Please specify at least one non-zero quantity!"))
198200