Unifield Server

Merge lp:~jfb-tempo-consulting/unifield-server/US-5954 into lp:unifield-server

  1. US-5954
  2. Merge into trunk
Proposed by jftempo
Status: Needs review
Proposed branch: lp:~jfb-tempo-consulting/unifield-server/US-5954
Merge into: lp:unifield-server
Diff against target: 32 lines (+4/-3)
2 files modified
bin/addons/msf_doc_import/wizard/wizard_in_simulation_screen.py (+2/-1)
bin/addons/purchase/purchase_workflow.py (+2/-2)
To merge this branch: bzr merge lp:~jfb-tempo-consulting/unifield-server/US-5954
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+366889@code.launchpad.net
To post a comment you must log in.

Unmerged revisions

5316. By jftempo

VI IN auto import: update IN

5315. By jftempo

US-5954: IN Available updated: do not add new but use an Available IN or create a new 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/wizard/wizard_in_simulation_screen.py'
2--- bin/addons/msf_doc_import/wizard/wizard_in_simulation_screen.py 2019-02-11 09:38:43 +0000
3+++ bin/addons/msf_doc_import/wizard/wizard_in_simulation_screen.py 2019-05-03 09:51:54 +0000
4@@ -1117,9 +1117,10 @@
5
6 context['from_simu_screen'] = True
7
8- if simu_id.with_pack:
9+ if simu_id.with_pack or context.get('do_not_import_with_thread'):
10 cr.commit()
11 if context.get('do_not_import_with_thread'):
12+ # Auto VI IN import: do not process IN
13 self._import_with_thread(cr, uid, [partial_id], simu_id.id, context=context)
14 else:
15 new_thread = threading.Thread(target=self._import_with_thread, args=(cr, uid, [partial_id], simu_id.id, context))
16
17=== modified file 'bin/addons/purchase/purchase_workflow.py'
18--- bin/addons/purchase/purchase_workflow.py 2019-03-04 11:09:31 +0000
19+++ bin/addons/purchase/purchase_workflow.py 2019-05-03 09:51:54 +0000
20@@ -657,10 +657,10 @@
21 raise osv.except_osv(_('Error'), _('Line %s: Please choose a product before confirming the line') % pol.line_number)
22
23 if pol.order_type != 'direct' and not pol.from_synchro_return_goods:
24- # create incoming shipment (IN):
25+ # create incoming shipment (IN):
26 in_id = self.pool.get('stock.picking').search(cr, uid, [
27 ('purchase_id', '=', pol.order_id.id),
28- ('state', 'not in', ['done', 'cancel', 'shipped']),
29+ ('state', 'not in', ['done', 'cancel', 'shipped', 'updated', 'import']),
30 ('type', '=', 'in'),
31 ])
32 created = False

Subscribers

People subscribed via source and target branches