Index: CHANGELOG.md
===================================================================
diff -u -N -rce5b304e27dd523196df32a7443e1b49a95fe0e6 -rf9a0ac030bfa003fcc724a518d2c2808632da4a9
--- CHANGELOG.md	(.../CHANGELOG.md)	(revision ce5b304e27dd523196df32a7443e1b49a95fe0e6)
+++ CHANGELOG.md	(.../CHANGELOG.md)	(revision f9a0ac030bfa003fcc724a518d2c2808632da4a9)
@@ -13,6 +13,7 @@
 * [OLMIS-7599](https://openlmis.atlassian.net/browse/OLMIS-7599): fixed refreshing the app - mobile app
 * [OLMIS-7593](https://openlmis.atlassian.net/browse/OLMIS-7593): fixed issue with saving the Unaccounted Quantity field in draft
 * [OLMIS-7608](https://openlmis.atlassian.net/browse/OLMIS-7608): Fixed wrong error displaying when making receives and updating physical inventory
+* [OLMIS-7594](https://openlmis.atlassian.net/browse/OLMIS-7594): Fixed issue with adding same lot codes for different products in one physical inventory draft
 
 Improvements:
 * [OLMIS-7588](https://openlmis.atlassian.net/browse/OLMIS-7588): Physical Inventory validation for unaccounted quantity - mobile app
Index: src/stock-physical-inventory-draft/physical-inventory-draft.controller.js
===================================================================
diff -u -N -r2534516140729f11e14fe35ba81549346af491f6 -rf9a0ac030bfa003fcc724a518d2c2808632da4a9
--- src/stock-physical-inventory-draft/physical-inventory-draft.controller.js	(.../physical-inventory-draft.controller.js)	(revision 2534516140729f11e14fe35ba81549346af491f6)
+++ src/stock-physical-inventory-draft/physical-inventory-draft.controller.js	(.../physical-inventory-draft.controller.js)	(revision f9a0ac030bfa003fcc724a518d2c2808632da4a9)
@@ -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;
                             }
                         });