RM#89282: Global discount on invoice #13891

fix issue + translation
axelor · Feb 14, 2025 · 323b28c · 323b28c
1 parent 2404f35
commit 323b28c
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 5 deletions.
diff --git a/axelor-account/src/main/resources/i18n/messages.csv b/axelor-account/src/main/resources/i18n/messages.csv
@@ -3241,6 +3241,7 @@
 "Template move is not balanced",,,
 "Temporarily reconcile selected lines",,,
 "Temporary Closure Authorized Role",,,
+"Temporary line holder",,,
 "Term(s)",,,
 "Term(s) to pay/be paid by partner",,,
 "Terms",,,
@@ -3501,6 +3502,7 @@
 "Turnover type",,,
 "Type",,,
 "Type select",,,
+"Type select normal",,,
 "UMR List",,,
 "UMR N°",,,
 "Unblocking",,,

diff --git a/axelor-account/src/main/resources/i18n/messages_en.csv b/axelor-account/src/main/resources/i18n/messages_en.csv
@@ -3241,6 +3241,7 @@
 "Template move is not balanced",,,
 "Temporarily reconcile selected lines",,,
 "Temporary Closure Authorized Role",,,
+"Temporary line holder",,,
 "Term(s)",,,
 "Term(s) to pay/be paid by partner",,,
 "Terms",,,
@@ -3501,6 +3502,7 @@
 "Turnover type",,,
 "Type",,,
 "Type select",,,
+"Type select normal",,,
 "UMR List",,,
 "UMR N°",,,
 "Unblocking",,,

diff --git a/axelor-account/src/main/resources/i18n/messages_fr.csv b/axelor-account/src/main/resources/i18n/messages_fr.csv
@@ -3242,6 +3242,7 @@ e a été payée ou qu'elle est reliée à une session de paiement.</Badge></>",
 "Template move is not balanced","Le modèle d'écriture n'est pas équilibré",,
 "Temporarily reconcile selected lines","Lettrer temporairement les lignes sélectionnées",,
 "Temporary Closure Authorized Role","Rôles autorisés à la clôture provisoire",,
+"Temporary line holder","Porteur de ligne temporaire",,
 "Term(s)","Echéance(s)",,
 "Term(s) to pay/be paid by partner","Echéance(s) à régler/réglée(s) par tiers",,
 "Terms","Échéances",,
@@ -3502,6 +3503,7 @@ e a été payée ou qu'elle est reliée à une session de paiement.</Badge></>",
 "Turnover type","Type de CA",,
 "Type","Type",,
 "Type select","Sélectionner le type",,
+"Type select normal","Type normal",,
 "UMR List","RUM Liste",,
 "UMR N°","RUM n°",,
 "Unblocking","Déblocage",,

diff --git a/...r-base/src/main/java/com/axelor/apps/base/service/discount/GlobalDiscountServiceImpl.java b/...r-base/src/main/java/com/axelor/apps/base/service/discount/GlobalDiscountServiceImpl.java
@@ -57,9 +57,8 @@ protected void applyPercentageGlobalDiscountOnLines(GlobalDiscounter globalDisco
             globalDiscounterLine -> {
               globalDiscounterLine.setDiscountTypeSelect(
                   PriceListLineRepository.AMOUNT_TYPE_PERCENT);
-              globalDiscounterLine.setDiscountAmount(globalDiscounterLine.getDiscountAmount());
+              globalDiscounterLine.setDiscountAmount(globalDiscounter.getDiscountAmount());
             });
-    adjustPercentageDiscountOnLastLine(globalDiscounter);
   }
 
   protected void applyFixedGlobalDiscountOnLines(GlobalDiscounter globalDiscounter) {
@@ -71,7 +70,7 @@ protected void applyFixedGlobalDiscountOnLines(GlobalDiscounter globalDiscounter
                     .equals(globalDiscounterLine.getTypeSelectNormal()))
         .forEach(
             globalDiscounterLine -> {
-              globalDiscounterLine.setDiscountTypeSelect(globalDiscounter.getDiscountTypeSelect());
+              globalDiscounterLine.setDiscountTypeSelect(PriceListLineRepository.AMOUNT_TYPE_FIXED);
               globalDiscounterLine.setDiscountAmount(
                   globalDiscounterLine
                       .getPrice()

diff --git a/axelor-base/src/main/resources/i18n/messages.csv b/axelor-base/src/main/resources/i18n/messages.csv
@@ -1272,6 +1272,7 @@
 "Length",,,
 "Length unit",,,
 "Level of grouping",,,
+"Lines",,,
 "Link type",,,
 "Linked Adjusting Moves",,,
 "Linked pricing",,,

diff --git a/axelor-base/src/main/resources/i18n/messages_en.csv b/axelor-base/src/main/resources/i18n/messages_en.csv
@@ -1272,6 +1272,7 @@
 "Length",,,
 "Length unit",,,
 "Level of grouping",,,
+"Lines",,,
 "Link type",,,
 "Linked Adjusting Moves",,,
 "Linked pricing",,,

diff --git a/axelor-base/src/main/resources/i18n/messages_fr.csv b/axelor-base/src/main/resources/i18n/messages_fr.csv
@@ -1272,6 +1272,7 @@
 "Length","Longueur",,
 "Length unit","Unité de longueur",,
 "Level of grouping","Niveau de regroupement",,
+"Lines","Lignes",,
 "Link type","Type de relation",,
 "Linked Adjusting Moves","Écritures rectificatives liées",,
 "Linked pricing",,,

diff --git a/axelor-sale/src/main/resources/i18n/messages.csv b/axelor-sale/src/main/resources/i18n/messages.csv
@@ -436,8 +436,6 @@
 "Products",,,
 "Products & services",,,
 "Proforma invoice",,,
-"Project and task generation",,,
-"Project generation method",,,
 "Project/Task",,,
 "Prospects",,,
 "Prototype",,,
@@ -629,6 +627,7 @@
 "Template",,,
 "Template created by",,,
 "Templates",,,
+"Temporary line holder",,,
 "Test this creator",,,
 "The client Partner is required and must be the same for all sale orders",,,
 "The client provided is not a customer of the given company: %s.",,,
@@ -684,6 +683,7 @@
 "Turnover per customer type",,,
 "Turnover per month per salesman",,,
 "Type",,,
+"Type select normal",,,
 "Unit",,,
 "Unit cost price in company currency",,,
 "Unit price A.T.I.",,,

diff --git a/axelor-sale/src/main/resources/i18n/messages_en.csv b/axelor-sale/src/main/resources/i18n/messages_en.csv
@@ -629,6 +629,7 @@
 "Template",,,
 "Template created by",,,
 "Templates",,,
+"Temporary line holder",,,
 "Test this creator",,,
 "The client Partner is required and must be the same for all sale orders",,,
 "The client provided is not a customer of the given company: %s.",,,
@@ -684,6 +685,7 @@
 "Turnover per customer type",,,
 "Turnover per month per salesman",,,
 "Type",,,
+"Type select normal",,,
 "Unit",,,
 "Unit cost price in company currency",,,
 "Unit price A.T.I.",,,

diff --git a/axelor-sale/src/main/resources/i18n/messages_fr.csv b/axelor-sale/src/main/resources/i18n/messages_fr.csv
@@ -629,6 +629,7 @@
 "Template","Modèle",,
 "Template created by","Modèle créé par",,
 "Templates","Modèles",,
+"Temporary line holder","Porteur de ligne temporaire",,
 "Test this creator","Tester le modèle",,
 "The client Partner is required and must be the same for all sale orders","Le client est requis et doit être le même pour toutes les cmdes clients",,
 "The client provided is not a customer of the given company: %s.","Le client fourni n'est pas un client de l'entreprise donnée: %s ",,
@@ -684,6 +685,7 @@
 "Turnover per customer type","CA HT par type client",,
 "Turnover per month per salesman","CA HT par mois par commercial",,
 "Type",,,
+"Type select normal","Type normal",,
 "Unit","Unité",,
 "Unit cost price in company currency","Coût unitaire dans devise société",,
 "Unit price A.T.I.","Prix unitaire T.T.C.",,