SOPHAL/CRM
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #20 from root/dev

Browse Source 
set refusal and acceptance On date and by TCO
This commit is contained in:
root
2022-07-06 10:41:59 +02:00
parent af35779677 7ec929b178
commit 700be71003
2 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
modules/axelor-open-suite/axelor-supplier-management/src/main/java/com/axelor/apps/suppliermanagement/service/PurchaseOrderSupplierLineService.java
View File

@@ -24,8 +24,10 @@ import com.axelor.apps.base.service.BlockingService;
import com.axelor.apps.purchase.db.PurchaseOrderLine; import com.axelor.apps.purchase.db.PurchaseOrderLine;
import com.axelor.apps.purchase.exception.IExceptionMessage; import com.axelor.apps.purchase.exception.IExceptionMessage;
import com.axelor.apps.purchase.service.PurchaseOrderLineServiceImpl; 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.PurchaseOrderSupplierLine;
import com.axelor.apps.suppliermanagement.db.repo.PurchaseOrderSupplierLineRepository; import com.axelor.apps.suppliermanagement.db.repo.PurchaseOrderSupplierLineRepository;
import com.axelor.auth.AuthUtils;
import com.axelor.exception.AxelorException; import com.axelor.exception.AxelorException;
import com.axelor.exception.db.repo.TraceBackRepository; import com.axelor.exception.db.repo.TraceBackRepository;
import com.axelor.i18n.I18n; import com.axelor.i18n.I18n;
@@ -38,6 +40,8 @@ public class PurchaseOrderSupplierLineService {
@Inject PurchaseOrderSupplierLineRepository poSupplierLineRepo; @Inject PurchaseOrderSupplierLineRepository poSupplierLineRepo;
@Inject protected AppPurchaseService appPurchaseService;
@Transactional(rollbackOn = {Exception.class}) @Transactional(rollbackOn = {Exception.class})
public void accept(PurchaseOrderSupplierLine purchaseOrderSupplierLine) throws AxelorException { public void accept(PurchaseOrderSupplierLine purchaseOrderSupplierLine) throws AxelorException {
@@ -64,6 +68,9 @@ public class PurchaseOrderSupplierLineService {
purchaseOrderLine.getQty(), purchaseOrderLine.getPrice())); purchaseOrderLine.getQty(), purchaseOrderLine.getPrice()));
purchaseOrderLine.setPriceDiscounted(purchaseOrderSupplierLine.getPrice()); // sophal purchaseOrderLine.setPriceDiscounted(purchaseOrderSupplierLine.getPrice()); // sophal
purchaseOrderSupplierLine.setStateSelect(PurchaseOrderSupplierLineRepository.STATE_ACCEPTED); purchaseOrderSupplierLine.setStateSelect(PurchaseOrderSupplierLineRepository.STATE_ACCEPTED);
// sophal add acceptedOn and By TCO
purchaseOrderSupplierLine.setAcceptanceDate(appPurchaseService.getTodayDate());
purchaseOrderSupplierLine.setAcceptedByUser(AuthUtils.getUser());;
poSupplierLineRepo.save(purchaseOrderSupplierLine); poSupplierLineRepo.save(purchaseOrderSupplierLine);
} }
@@ -73,4 +80,9 @@ public class PurchaseOrderSupplierLineService {
return new PurchaseOrderSupplierLine( return new PurchaseOrderSupplierLine(
price, PurchaseOrderSupplierLineRepository.STATE_REQUESTED, supplierPartner); price, PurchaseOrderSupplierLineRepository.STATE_REQUESTED, supplierPartner);
} }
@Transactional(rollbackOn = {Exception.class})
public void savePurchaseSupplierLine(PurchaseOrderSupplierLine purchaseOrderSupplierLine){
poSupplierLineRepo.save(purchaseOrderSupplierLine);
}
} }

4
modules/axelor-open-suite/axelor-supplier-management/src/main/resources/domains/PurchaseOrderSupplierLine.xml
View File

@@ -33,6 +33,10 @@
<many-to-one name="acceptedByUser" ref="com.axelor.auth.db.User" readonly="true" title="Accepted by"/> <many-to-one name="acceptedByUser" ref="com.axelor.auth.db.User" readonly="true" title="Accepted by"/>
<date name="acceptanceDate" title="Acceptance date" readonly="true"/> <date name="acceptanceDate" title="Acceptance date" readonly="true"/>
<many-to-one name="refusedByUser" ref="com.axelor.auth.db.User" readonly="true" title="Refused by"/>
<date name="refusalDate" title="refusal date" readonly="true"/>
<!-- sophal --> <!-- sophal -->
<extra-code><![CDATA[ <extra-code><![CDATA[