Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 20.0

Dolibarr · Sep 26, 2024 · 25c4f5b · 25c4f5b
2 parents f3c4686 + 184589d
commit 25c4f5b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/htdocs/accountancy/closure/index.php b/htdocs/accountancy/closure/index.php
@@ -127,11 +127,11 @@
 			if ($generate_bookkeeping_records) {
 				if (!getDolGlobalString('ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_BALANCE_SHEET_ACCOUNT')) {
 					$error++;
-					setEventMessages($langs->trans("ErrorSetupNotComplete"), null, 'errors');
+					setEventMessages($langs->trans("ErrorModuleSetupNotComplete"), null, 'errors');
 				}
 				if (!getDolGlobalString('ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_INCOME_STATEMENT')) {
 					$error++;
-					setEventMessages($langs->trans("ErrorSetupNotComplete"), null, 'errors');
+					setEventMessages($langs->trans("ErrorModuleSetupNotComplete"), null, 'errors');
 				}
 			}
 

diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
@@ -2175,7 +2175,7 @@ protected function _pagehead(&$pdf, $object, $showaddress, $outputlangs, $output
 				if (!empty($carac_client_shipping)) {
 					$posy += $hautcadre;
 
-					$hautcadre = $hautcadre - 10;	// Height for the shipping address does not need to be as high as main box
+					$hautcadre -= 10;	// Height for the shipping address does not need to be as high as main box
 
 					// Show shipping frame
 					$pdf->SetXY($posx + 2, $posy - 5);