Unifield Server

Merge lp:~unifield-team/unifield-server/us-71 into lp:unifield-server

  1. us-71
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 4009
Proposed branch: lp:~unifield-team/unifield-server/us-71
Merge into: lp:unifield-server
Diff against target: 42 lines (+3/-19)
1 file modified
bin/addons/msf_doc_import/initial_stock_inventory.py (+3/-19)
To merge this branch: bzr merge lp:~unifield-team/unifield-server/us-71
Reviewer Review Type Date Requested Status
UniField Dev Team Pending
Review via email: mp+308751@code.launchpad.net
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 'bin/addons/msf_doc_import/initial_stock_inventory.py'
2--- bin/addons/msf_doc_import/initial_stock_inventory.py 2016-08-18 08:32:03 +0000
3+++ bin/addons/msf_doc_import/initial_stock_inventory.py 2016-10-18 16:01:51 +0000
4@@ -186,18 +186,12 @@
5 batch = str(batch)
6 try:
7 batch = batch.strip()
8- if ',' in batch:
9- bad_batch_name = True
10- batch_name = False
11+ batch_ids = batch_obj.search(cr, uid, [('product_id', '=', product_id), ('name', '=', batch)], context=context)
12+ if not batch_ids:
13+ batch_name = batch
14 batch = False
15 to_correct_ok = True
16 else:
17- batch_ids = batch_obj.search(cr, uid, [('product_id', '=', product_id), ('name', '=', batch)], context=context)
18- if not batch_ids:
19- batch_name = batch
20- batch = False
21- to_correct_ok = True
22- else:
23 batch = batch_ids[0]
24 except Exception:
25 batch = False
26@@ -707,16 +701,6 @@
27
28 # Batch
29 batch = row.cells[4].data
30- if batch:
31- try:
32- batch = batch.strip()
33- batch_name = batch
34- if ',' in batch_name:
35- batch_name = False
36- batch = False
37- bad_batch_name = True
38- except Exception:
39- pass
40
41 # Expiry date
42 if row.cells[5].data:

Subscribers

People subscribed via source and target branches

to all changes: