Mentis

Merge lp:~matjaz-6/openerpsl/openerpsl_01_25 into lp:openerpsl/7.0

  1. openerpsl_01_25
  2. Merge into 7.0
Proposed by Matjaz Kalic
Status: Merged
Merged at revision: 306
Proposed branch: lp:~matjaz-6/openerpsl/openerpsl_01_25
Merge into: lp:openerpsl/7.0
Diff against target: 25 lines (+8/-5)
1 file modified
m_web_api/m_web.py (+8/-5)
To merge this branch: bzr merge lp:~matjaz-6/openerpsl/openerpsl_01_25
Reviewer Review Type Date Requested Status
Mentis Pending
Review via email: mp+203247@code.launchpad.net

Description of the change

[FIX] m_web_api/m_web.py (if sale_line_id == False)

To post a comment you must log in.
lp:~matjaz-6/openerpsl/openerpsl_01_25 updated
306. By Dušan Laznik (Mentis)

[FIX] m_web_api/m_web.py (if sale_line_id == False)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'm_web_api/m_web.py'
2--- m_web_api/m_web.py 2014-01-26 16:55:10 +0000
3+++ m_web_api/m_web.py 2014-01-26 18:08:54 +0000
4@@ -185,13 +185,16 @@
5 if 'sale_line_id' not in vals:
6 vals['basket_status'] = 2
7 else:
8- sale_line = self.pool.get('sale.order.line').browse(cr, user, [vals['sale_line_id']])[0]
9- if sale_line.order_id.shop_id.shop_production:
10- vals['basket_status'] = 3
11- vals['product_qty_returned'] = sale_line.product_qty_returned
12+ if vals['sale_line_id']:
13+ sale_line = self.pool.get('sale.order.line').browse(cr, user, [vals['sale_line_id']])[0]
14+ if sale_line.order_id.shop_id.shop_production:
15+ vals['basket_status'] = 3
16+ vals['product_qty_returned'] = sale_line.product_qty_returned
17+ else:
18+ vals['basket_status'] = 2
19+ vals['basket_deliverd'] = sale_line.product_uom_qty
20 else:
21 vals['basket_status'] = 2
22- vals['basket_deliverd'] = sale_line.product_uom_qty
23
24 res = super(stock_move_basket, self).create(cr, user, vals, context=context)
25 return res

Subscribers

People subscribed via source and target branches