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

[jftempo]

=== modified file 'bin/addons/consumption_calculation/expiry_calculation.py'
--- bin/addons/consumption_calculation/expiry_calculation.py	2021-05-06 10:22:29 +0000
+++ bin/addons/consumption_calculation/expiry_calculation.py	2021-10-04 08:49:54 +0000
@@ -524,22 +524,29 @@
                     product_lot_ids = lot_obj.search(new_cr, uid, domain, order='life_date', context=context)
 
                     tmp_last_expiry_date = False
-                    # Create an item line for each lot and each location
                     for product_lot in lot_obj.browse(new_cr, uid, product_lot_ids, context=context):
+                        # each BN that expires in the month ordered by life_date
                         if from_segment and segment_product_fmc:
                             life_date = DateFrom(product_lot.life_date)
                             consum = 0
+                            # consum is the sum of FMC for the period:
+                            #   period is: from today to expiry_date for the 1st BN
+                            #              or from previous_bn_expiry to expiry_date if previous BN found
+                            # note: the period may be covered by several FMC intervals
+
+                            # ignore FMC if BN is already expired
                             if life_date > last_expiry_date:
                                 tmp_last_expiry_date = last_expiry_date
                                 for fmc in segment_product_fmc.setdefault(lot.product_id.id, []):
                                     if life_date >= fmc['from'] and tmp_last_expiry_date <= fmc['to']:
+                                        # if the given period overlaps FMC interval
                                         end_fmc = min(life_date, fmc['to'])
                                         lot_days = Age(DateFrom(end_fmc), tmp_last_expiry_date)
                                         consum += fmc['fmc'] * (lot_days.years*364.8 + lot_days.months*30.44 + lot_days.days)/30.44
+                                        tmp_last_expiry_date = end_fmc
                                     if life_date <= fmc['to']:
+                                        # no need to check other FMCs
                                         break
-                                    else:
-                                        tmp_last_expiry_date = end_fmc
 
                         else:
                             lot_days = Age(DateFrom(product_lot.life_date), last_expiry_date)
@@ -568,6 +575,7 @@
                         lot_context = context.copy()
                         lot_context.update({'prodlot_id': product_lot.id})
                         lot_expired_qty = l_expired_qty
+                        # Create an item line for each lot and each location
                         for location in location_ids:
                             new_lot_context = lot_context.copy()
                             new_lot_context.update({'location': location, 'compute_child': False})
 
=== modified file 'bin/addons/procurement_cycle/replenishment.py'
--- bin/addons/procurement_cycle/replenishment.py	2021-08-26 07:25:26 +0000
+++ bin/addons/procurement_cycle/replenishment.py	2021-10-04 08:49:54 +0000
@@ -1220,7 +1220,7 @@
                                )
                     pipe_data = {}
                     for x in cr.fetchall():
-                        pipe_data[datetime.strptime('%s 23:59:59' % (x[0].split(' ')[0], ), '%Y-%m-%d %H:%M:%S')] = x[1]
+                        pipe_data[datetime.strptime('%s 00:00:00' % (x[0].split(' ')[0], ), '%Y-%m-%d %H:%M:%S')] = x[1]
 
                     pipe_date = sorted(pipe_data.keys())
 
@@ -1272,21 +1272,21 @@
                                     period_conso = month*num_fmc
                                     if period_conso <= pas_full:
                                         pas_full -= period_conso
-                                    else:
-                                        # missing stock to cover the full period
                                         for x in pipe_date[:]:
-                                            # add pipe before period
-                                            if x <= begin:
+                                            # add pipe before end of period
+                                            if x <= end:
                                                 pas_full += pipe_data[x]
                                                 pipe_date.pop(0)
                                             else:
                                                 break
+                                    else:
+                                        # missing stock to cover the full period
                                         if period_conso > pas_full:
                                             # still not enough stock
                                             for x in pipe_date[:]:
                                                 if x <= end:
                                                     # compute missing just before the next pipe
-                                                    ndays = (x - new_begin).days + 1
+                                                    ndays = (x - new_begin).days
                                                     qty = num_fmc/30.44*ndays
                                                     pas_full -= qty
                                                     if pas_full < 0: