Index: CHANGELOG.md
===================================================================
diff -u -N -r434adde4d6e44e27ced98b6ae6985bf3f15193d1 -r0f32b7711f01babea13a5d00e3c1a611c08cf0f3
--- CHANGELOG.md	(.../CHANGELOG.md)	(revision 434adde4d6e44e27ced98b6ae6985bf3f15193d1)
+++ CHANGELOG.md	(.../CHANGELOG.md)	(revision 0f32b7711f01babea13a5d00e3c1a611c08cf0f3)
@@ -3,6 +3,7 @@
 
 New functionality that are backwards-compatible:
 * [OLMIS-7373](https://openlmis.atlassian.net/browse/OLMIS-7373): Add filtering by product code, name and lot code on Stock on Hand page
+* [OLMIS-7594](https://openlmis.atlassian.net/browse/OLMIS-7594): Add possibility to use the same Lot Code in two or more different products
 
 Bug fixes:
 * [OLMIS-7579](https://openlmis.atlassian.net/browse/OLMIS-7579): Fixed issue with moving into next screen when current stock = 0 - mobile app
Index: src/stock-physical-inventory-draft/physical-inventory-draft.controller.js
===================================================================
diff -u -N -r434adde4d6e44e27ced98b6ae6985bf3f15193d1 -r0f32b7711f01babea13a5d00e3c1a611c08cf0f3
--- src/stock-physical-inventory-draft/physical-inventory-draft.controller.js	(.../physical-inventory-draft.controller.js)	(revision 434adde4d6e44e27ced98b6ae6985bf3f15193d1)
+++ src/stock-physical-inventory-draft/physical-inventory-draft.controller.js	(.../physical-inventory-draft.controller.js)	(revision 0f32b7711f01babea13a5d00e3c1a611c08cf0f3)
@@ -541,7 +541,8 @@
                     }
                     responses.forEach(function(lot) {
                         draft.lineItems.forEach(function(lineItem) {
-                            if (lineItem.lot && lineItem.lot.lotCode === lot.lotCode) {
+                            if (lineItem.lot && lineItem.lot.lotCode === lot.lotCode
+                                && lineItem.orderable.identifiers['tradeItem'] === lot.tradeItemId) {
                                 lineItem.lot = lot;
                             }
                         });