diff --git a/modules/axelor-open-suite/axelor-supplier-management/src/main/java/com/axelor/apps/suppliermanagement/service/PurchaseOrderSupplierLineService.java b/modules/axelor-open-suite/axelor-supplier-management/src/main/java/com/axelor/apps/suppliermanagement/service/PurchaseOrderSupplierLineService.java
index 999b4bb..76245ff 100644
--- a/modules/axelor-open-suite/axelor-supplier-management/src/main/java/com/axelor/apps/suppliermanagement/service/PurchaseOrderSupplierLineService.java
+++ b/modules/axelor-open-suite/axelor-supplier-management/src/main/java/com/axelor/apps/suppliermanagement/service/PurchaseOrderSupplierLineService.java
@@ -24,8 +24,10 @@ import com.axelor.apps.base.service.BlockingService;
import com.axelor.apps.purchase.db.PurchaseOrderLine;
import com.axelor.apps.purchase.exception.IExceptionMessage;
import com.axelor.apps.purchase.service.PurchaseOrderLineServiceImpl;
+import com.axelor.apps.purchase.service.app.AppPurchaseService;
import com.axelor.apps.suppliermanagement.db.PurchaseOrderSupplierLine;
import com.axelor.apps.suppliermanagement.db.repo.PurchaseOrderSupplierLineRepository;
+import com.axelor.auth.AuthUtils;
import com.axelor.exception.AxelorException;
import com.axelor.exception.db.repo.TraceBackRepository;
import com.axelor.i18n.I18n;
@@ -38,6 +40,8 @@ public class PurchaseOrderSupplierLineService {
@Inject PurchaseOrderSupplierLineRepository poSupplierLineRepo;
+ @Inject protected AppPurchaseService appPurchaseService;
+
@Transactional(rollbackOn = {Exception.class})
public void accept(PurchaseOrderSupplierLine purchaseOrderSupplierLine) throws AxelorException {
@@ -64,6 +68,9 @@ public class PurchaseOrderSupplierLineService {
purchaseOrderLine.getQty(), purchaseOrderLine.getPrice()));
purchaseOrderLine.setPriceDiscounted(purchaseOrderSupplierLine.getPrice()); // sophal
purchaseOrderSupplierLine.setStateSelect(PurchaseOrderSupplierLineRepository.STATE_ACCEPTED);
+ // sophal add acceptedOn and By TCO
+ purchaseOrderSupplierLine.setAcceptanceDate(appPurchaseService.getTodayDate());
+ purchaseOrderSupplierLine.setAcceptedByUser(AuthUtils.getUser());;
poSupplierLineRepo.save(purchaseOrderSupplierLine);
}
@@ -73,4 +80,9 @@ public class PurchaseOrderSupplierLineService {
return new PurchaseOrderSupplierLine(
price, PurchaseOrderSupplierLineRepository.STATE_REQUESTED, supplierPartner);
}
+
+ @Transactional(rollbackOn = {Exception.class})
+ public void savePurchaseSupplierLine(PurchaseOrderSupplierLine purchaseOrderSupplierLine){
+ poSupplierLineRepo.save(purchaseOrderSupplierLine);
+ }
}
diff --git a/modules/axelor-open-suite/axelor-supplier-management/src/main/resources/domains/PurchaseOrderSupplierLine.xml b/modules/axelor-open-suite/axelor-supplier-management/src/main/resources/domains/PurchaseOrderSupplierLine.xml
index 2f77bcc..c98125b 100644
--- a/modules/axelor-open-suite/axelor-supplier-management/src/main/resources/domains/PurchaseOrderSupplierLine.xml
+++ b/modules/axelor-open-suite/axelor-supplier-management/src/main/resources/domains/PurchaseOrderSupplierLine.xml
@@ -33,6 +33,10 @@
+
+
+
+