Unifield Server

Merge lp:~dorian-kemps/unifield-server/US-314 into lp:unifield-server

  1. US-314
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 5535
Proposed branch: lp:~dorian-kemps/unifield-server/US-314
Merge into: lp:unifield-server
Diff against target: 59 lines (+20/-0)
3 files modified
bin/addons/kit/kit.py (+1/-0)
bin/addons/kit/kit_creation.py (+13/-0)
bin/addons/msf_profile/i18n/fr_MF.po (+6/-0)
To merge this branch: bzr merge lp:~dorian-kemps/unifield-server/US-314
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+373401@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/kit/kit.py'
2--- bin/addons/kit/kit.py 2019-05-14 07:36:40 +0000
3+++ bin/addons/kit/kit.py 2019-10-22 15:33:23 +0000
4@@ -1397,6 +1397,7 @@
5 # do we want the child location
6 stock_context = dict(context, compute_child=consider_child_locations)
7 stock_context['uom'] = uom_id
8+ stock_context['location'] = ids
9 # we check for the available qty (in:done, out: assigned, done)
10 return {'total': self.pool.get('product.product').read(cr, uid, product_id, ['qty_allocable'], context=stock_context).get('qty_allocable', 0)}
11
12
13=== modified file 'bin/addons/kit/kit_creation.py'
14--- bin/addons/kit/kit_creation.py 2019-04-05 16:00:20 +0000
15+++ bin/addons/kit/kit_creation.py 2019-10-22 15:33:23 +0000
16@@ -621,6 +621,17 @@
17 res = wiz_obj.open_wizard(cr, uid, ids, name=name, model=model, step=step, context=dict(context))
18 return res
19
20+ def check_lines_availability(self, cr, uid, kit, context=None):
21+ if context is None:
22+ context = {}
23+
24+ for line in kit.to_consume_ids_kit_creation:
25+ if line.qty_available_to_consume < line.total_qty_to_consume:
26+ raise osv.except_osv(_('Warning !'),
27+ _('The Kitting Order cannot be processed unless all product lines are available.'))
28+
29+ return True
30+
31 def do_process_to_consume2(self, cr, uid, ids, context=None):
32 '''
33 - update components to consume
34@@ -647,6 +658,8 @@
35 # all lines are processed not consumed
36 to_consume_list = obj.to_consume_ids_kit_creation
37
38+ # Check if stock is available
39+ self.check_lines_availability(cr, uid, obj, context=context)
40 for to_consume in to_consume_list:
41 if not to_consume.consumed_to_consume:
42 # create a corresponding stock move
43
44=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
45--- bin/addons/msf_profile/i18n/fr_MF.po 2019-10-18 15:58:30 +0000
46+++ bin/addons/msf_profile/i18n/fr_MF.po 2019-10-22 15:33:23 +0000
47@@ -107389,6 +107389,12 @@
48 msgid "You should run the month-end revaluation before closing the period."
49 msgstr "Veuillez lancer la réévaluation de fin de mois avant de fermer la période."
50
51+#. module: kit
52+#: code:addons/kit/kit_creation.py:631
53+#, python-format
54+msgid "The Kitting Order cannot be processed unless all product lines are available."
55+msgstr "La Commande d'Assemblage ne pourra pas être traitée avant que tous les produits ne soient disponibles."
56+
57 #. module: sync_client
58 #: code:addons/sync_client/backup.py:127
59 #, python-format

Subscribers

People subscribed via source and target branches