Merge branch 'dev' into wip

axelor · Feb 14, 2025 · 4e3974f · 4e3974f
2 parents 96cecc7 + 804bf70
commit 4e3974f
Show file tree

Hide file tree

Showing 10 changed files with 26 additions and 7 deletions.
diff --git a/axelor-account/src/main/resources/views/InvoicePayment.xml b/axelor-account/src/main/resources/views/InvoicePayment.xml
@@ -36,7 +36,7 @@
     <panel name="mainPanel" readonlyIf="statusSelect != 0">
       <field name="typeSelect" showIf="id" colSpan="12"/>
       <field name="amount" onChange="action-invoice-payment-group-change-amounts"
-        x-scale="$currencyScale"/>
+        x-scale="$currencyScale" validIf="amount &gt; 0"/>
       <field name="currency" canEdit="false" readonlyIf="$isMultiCurrency"
         form-view="currency-form" grid-view="currency-grid"
         onChange="action-invoice-payment-group-change-amounts"/>

diff --git a/...or-contract/src/main/java/com/axelor/apps/contract/db/repo/ContractVersionRepository.java b/...or-contract/src/main/java/com/axelor/apps/contract/db/repo/ContractVersionRepository.java
@@ -66,7 +66,7 @@ public ContractVersion copy(Contract contract) {
     newVersion.setDoNotRenew(currentVersion.getDoNotRenew());
 
     List<ContractLine> lines =
-        ModelHelper.copy(contractLineRepository, currentVersion.getContractLineList(), false);
+        ModelHelper.copy(contractLineRepository, currentVersion.getContractLineList(), true);
 
     for (ContractLine line : lines) {
       newVersion.addContractLineListItem(line);

diff --git a/axelor-marketing/src/main/resources/i18n/messages_fr.csv b/axelor-marketing/src/main/resources/i18n/messages_fr.csv
@@ -43,7 +43,7 @@
 "Error in sending emails. Please check the log file generated.","Erreur lors de l'envoi d'emails. Vérifiez s'il vous plaît le journal généré.",,
 "Event Type","Type d'évènement",,
 "Event end","Date de fin",,
-"Event start","Début de début",,
+"Event start","Date de début",,
 "Event type","Type d'évènement",,
 "Events","Évènements",,
 "Fiscal position","Position fiscale",,

diff --git a/...in/java/com/axelor/apps/production/service/SaleOrderLineProductProductionServiceImpl.java b/...in/java/com/axelor/apps/production/service/SaleOrderLineProductProductionServiceImpl.java
@@ -152,9 +152,13 @@ public Map<String, Object> setBillOfMaterial(SaleOrderLine saleOrderLine, SaleOr
         } else if (product.getParentProduct() != null) {
           saleOrderLine.setBillOfMaterial(product.getParentProduct().getDefaultBillOfMaterial());
         }
+        BillOfMaterial billOfMaterial = saleOrderLine.getBillOfMaterial();
         generateLines(saleOrderLine, saleOrder);
 
         saleOrderLineMap.put("billOfMaterial", saleOrderLine.getBillOfMaterial());
+        if (billOfMaterial != null) {
+          saleOrderLineMap.put("prodProcess", billOfMaterial.getProdProcess());
+        }
       }
       saleOrderLineMap.put("subSaleOrderLineList", saleOrderLine.getSubSaleOrderLineList());
       saleOrderLineMap.put("saleOrderLineDetailsList", saleOrderLine.getSaleOrderLineDetailsList());

diff --git a/...-production/src/main/java/com/axelor/apps/production/service/SolBomUpdateServiceImpl.java b/...-production/src/main/java/com/axelor/apps/production/service/SolBomUpdateServiceImpl.java
@@ -142,10 +142,11 @@ public boolean isUpdated(SaleOrderLine saleOrderLine) {
         && Optional.ofNullable(saleOrderLine.getSubSaleOrderLineList()).orElse(List.of()).stream()
             .filter(
                 subSaleOrderLine ->
-                    subSaleOrderLine
-                        .getProduct()
-                        .getProductSubTypeSelect()
-                        .equals(ProductRepository.PRODUCT_SUB_TYPE_SEMI_FINISHED_PRODUCT))
+                    subSaleOrderLine != null
+                        && subSaleOrderLine
+                            .getProduct()
+                            .getProductSubTypeSelect()
+                            .equals(ProductRepository.PRODUCT_SUB_TYPE_SEMI_FINISHED_PRODUCT))
             .allMatch(saleOrderLineBomLineMappingService::isSyncWithBomLine)
         && bomLineWithBom == subLineWithProduceSaleSupply;
   }

diff --git a/changelogs/unreleased/88871.yml b/changelogs/unreleased/88871.yml
@@ -0,0 +1,3 @@
+---
+title: "Sale order line: fixed default value for prodProcess."
+module: axelor-sale
diff --git a/changelogs/unreleased/89048.yml b/changelogs/unreleased/89048.yml
@@ -0,0 +1,3 @@
+---
+title: "Campaign: fixed FR translation for 'Event start'."
+module: axelor-marketing
diff --git a/changelogs/unreleased/89983.yml b/changelogs/unreleased/89983.yml
@@ -0,0 +1,3 @@
+---
+title: "Contract: fixed no analytic move lines on contract duplication."
+module: axelor-contract
diff --git a/changelogs/unreleased/90034.yml b/changelogs/unreleased/90034.yml
@@ -0,0 +1,2 @@
+title: "InvoicePayment : set a minimum on amount"
+module: axelor-base
diff --git a/changelogs/unreleased/90180.yml b/changelogs/unreleased/90180.yml
@@ -0,0 +1,3 @@
+---
+title: "Sale order: fixed an issue occurring when adding a title subline."
+module: axelor-production
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		title: "InvoicePayment : set a minimum on amount"
		module: axelor-base