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

[jftempo]

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2018-10-17 09:42:30 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2018-10-23 14:27:48 +0000
@@ -101867,6 +101867,7 @@
 #, python-format
 msgid " goods products, please refer to the appropriate procedures"
 msgstr " veuillez vous référer aux procédures adéquates."
+<<<<<<< TREE
 
 #. module: account_override
 #: code:addons/account_override/account.py:517
@@ -101975,3 +101976,12 @@
 #: code:addons/account_mcdb/account_mcdb.py:1276
 msgid "Related entries"
 msgstr "Ecritures associées"
+=======
+
+#. module: stock
+#: code:addons/stock/wizard/physical_inventory_select_products.py:10
+#: code:addons/stock/wizard/physical_inventory_select_products.py:11
+#, python-format
+msgid "%s months"
+msgstr "%s mois"
+>>>>>>> MERGE-SOURCE
 
=== modified file 'bin/addons/stock/wizard/physical_inventory_select_products.py'
--- bin/addons/stock/wizard/physical_inventory_select_products.py	2018-06-15 12:30:42 +0000
+++ bin/addons/stock/wizard/physical_inventory_select_products.py	2018-10-23 14:27:48 +0000
@@ -7,7 +7,8 @@
 from dateutil.relativedelta import relativedelta
 
 # This will be a tuple ((1,"1 months" ), (2, "2 months"), ...)
-MOVED_IN_LAST_X_MONTHS = tuple([(i, "%s months" % str(i)) for i in range(1, 13)])
+MOVED_IN_LAST_X_MONTHS_FULL_INV = tuple([("%s" % i, _("%s months") % str(i)) for i in range(0, 13)])
+MOVED_IN_LAST_X_MONTHS = tuple([(i, _("%s months") % str(i)) for i in range(1, 13)])
 
 
 class physical_inventory_select_products(osv.osv_memory):
@@ -21,7 +22,7 @@
 
         # If this is a full inventory, we'll add products in stock at that
         # location + products with recent moves at that location
-        'recent_moves_months_fullinvo': fields.selection(MOVED_IN_LAST_X_MONTHS, "Moved in the last", select=True),
+        'recent_moves_months_fullinvo': fields.selection(MOVED_IN_LAST_X_MONTHS_FULL_INV, "Moved in the last", select=True),
 
         # For partial inventories :
 
@@ -135,9 +136,11 @@
 
             # Get products in stock at that location, or recently moved
             products_in_stock = self.get_products_in_stock_at_location(cr, uid, location_id, context=context)
-            products_recently_moved = self.get_products_with_recent_moves_at_location(cr, uid, location_id,
-                                                                                      w['recent_moves_months_fullinvo'],
-                                                                                      context=context)
+            products_recently_moved = set()
+            if w['recent_moves_months_fullinvo'] != '0':
+                products_recently_moved = self.get_products_with_recent_moves_at_location(cr, uid, location_id,
+                                                                                          w['recent_moves_months_fullinvo'],
+                                                                                          context=context)
             products = products_in_stock.union(products_recently_moved)
 
             # Show them in the preview
@@ -261,6 +264,8 @@
     def get_products_with_recent_moves_at_location(self, cr, uid, location_id, recent_moves_months, context=None):
         context = context if context else {}
 
+        if isinstance(recent_moves_months, (str,unicode)):
+            recent_moves_months = int(recent_moves_months)
         assert isinstance(location_id, int)
         assert isinstance(recent_moves_months, int)