Unifield Server

Merge lp:~mallorymarcot/unifield-server/us-4438 into lp:unifield-server

  1. us-4438
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 5133
Proposed branch: lp:~mallorymarcot/unifield-server/us-4438
Merge into: lp:unifield-server
Diff against target: 70 lines (+20/-5) (has conflicts)
2 files modified
bin/addons/msf_profile/i18n/fr_MF.po (+10/-0)
bin/addons/stock/wizard/physical_inventory_select_products.py (+10/-5)
Text conflict in bin/addons/msf_profile/i18n/fr_MF.po
To merge this branch: bzr merge lp:~mallorymarcot/unifield-server/us-4438
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+355783@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_profile/i18n/fr_MF.po'
2--- bin/addons/msf_profile/i18n/fr_MF.po 2018-10-17 09:42:30 +0000
3+++ bin/addons/msf_profile/i18n/fr_MF.po 2018-10-23 14:27:48 +0000
4@@ -101867,6 +101867,7 @@
5 #, python-format
6 msgid " goods products, please refer to the appropriate procedures"
7 msgstr " veuillez vous référer aux procédures adéquates."
8+<<<<<<< TREE
9
10 #. module: account_override
11 #: code:addons/account_override/account.py:517
12@@ -101975,3 +101976,12 @@
13 #: code:addons/account_mcdb/account_mcdb.py:1276
14 msgid "Related entries"
15 msgstr "Ecritures associées"
16+=======
17+
18+#. module: stock
19+#: code:addons/stock/wizard/physical_inventory_select_products.py:10
20+#: code:addons/stock/wizard/physical_inventory_select_products.py:11
21+#, python-format
22+msgid "%s months"
23+msgstr "%s mois"
24+>>>>>>> MERGE-SOURCE
25
26=== modified file 'bin/addons/stock/wizard/physical_inventory_select_products.py'
27--- bin/addons/stock/wizard/physical_inventory_select_products.py 2018-06-15 12:30:42 +0000
28+++ bin/addons/stock/wizard/physical_inventory_select_products.py 2018-10-23 14:27:48 +0000
29@@ -7,7 +7,8 @@
30 from dateutil.relativedelta import relativedelta
31
32 # This will be a tuple ((1,"1 months" ), (2, "2 months"), ...)
33-MOVED_IN_LAST_X_MONTHS = tuple([(i, "%s months" % str(i)) for i in range(1, 13)])
34+MOVED_IN_LAST_X_MONTHS_FULL_INV = tuple([("%s" % i, _("%s months") % str(i)) for i in range(0, 13)])
35+MOVED_IN_LAST_X_MONTHS = tuple([(i, _("%s months") % str(i)) for i in range(1, 13)])
36
37
38 class physical_inventory_select_products(osv.osv_memory):
39@@ -21,7 +22,7 @@
40
41 # If this is a full inventory, we'll add products in stock at that
42 # location + products with recent moves at that location
43- 'recent_moves_months_fullinvo': fields.selection(MOVED_IN_LAST_X_MONTHS, "Moved in the last", select=True),
44+ 'recent_moves_months_fullinvo': fields.selection(MOVED_IN_LAST_X_MONTHS_FULL_INV, "Moved in the last", select=True),
45
46 # For partial inventories :
47
48@@ -135,9 +136,11 @@
49
50 # Get products in stock at that location, or recently moved
51 products_in_stock = self.get_products_in_stock_at_location(cr, uid, location_id, context=context)
52- products_recently_moved = self.get_products_with_recent_moves_at_location(cr, uid, location_id,
53- w['recent_moves_months_fullinvo'],
54- context=context)
55+ products_recently_moved = set()
56+ if w['recent_moves_months_fullinvo'] != '0':
57+ products_recently_moved = self.get_products_with_recent_moves_at_location(cr, uid, location_id,
58+ w['recent_moves_months_fullinvo'],
59+ context=context)
60 products = products_in_stock.union(products_recently_moved)
61
62 # Show them in the preview
63@@ -261,6 +264,8 @@
64 def get_products_with_recent_moves_at_location(self, cr, uid, location_id, recent_moves_months, context=None):
65 context = context if context else {}
66
67+ if isinstance(recent_moves_months, (str,unicode)):
68+ recent_moves_months = int(recent_moves_months)
69 assert isinstance(location_id, int)
70 assert isinstance(recent_moves_months, int)
71

Subscribers

People subscribed via source and target branches