Merge branch 'Dolibarr:18.0' into 18.0

Dolibarr · Dec 9, 2024 · e1bd5b7 · e1bd5b7
2 parents d7addd8 + cfd4919
commit e1bd5b7
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 11 deletions.
diff --git a/.github/workflows/pr-18.yaml b/.github/workflows/pr-18.yaml
@@ -39,6 +39,7 @@ jobs:
         echo "pr_number=$pr_number"
         echo Authenticate login gh
         gh auth login --with-token <<< "${{ secrets.GITHUB_TOKEN }}"
-        echo Set the reviewere
+        gh auth setup-git
+        echo Set the reviewer
         gh pr edit $pr_number --add-reviewer "$REVIEWER"
       continue-on-error: true
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -20,6 +20,10 @@ jobs:
     steps:
       - name: Log
         run: |
+          echo "Run action by ${{ github.actor }}"        
+          echo "github.token=${{ github.token }}"
+          echo "secrets.GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }}"
+          echo "GITHUB_EVENT_PATH=$GITHUB_EVENT_PATH"
           echo "repo-token: ${{secrets.GITHUB_TOKEN}}"
           echo "variable org: ${{vars.AAA}}"
           echo "env prg: ${{env.AAA}}"
@@ -28,7 +32,7 @@ jobs:
           echo "variable repository of orga: ${{vars.CCC}}"
           echo "ENVGHT: ${{env.ENVGHT}}"
           echo "ENVGHU: ${{env.ENVGHU}}"
-          echo "VARAAA: ${{env.VARAAA}}"
+          echo "VARAAA: ${{vars.AAA}}"
           echo "ENVAAA: ${{env.VARAAA}}"
           echo "VARREPORGCCC: ${{env.VARREPORGCCC}}"
-          echo "ENVFIX: ${{env.abc}}"
+          echo "ENVFIX: ${{env.ENVFIX}}"
diff --git a/htdocs/compta/facture/card-rec.php b/htdocs/compta/facture/card-rec.php
@@ -91,7 +91,10 @@
 $object = new FactureRec($db);
 if (($id > 0 || $ref) && $action != 'create' && $action != 'add') {
 	$ret = $object->fetch($id, $ref);
-	if (!$ret) {
+	if ($ret < 0) {
+		dol_print_error($db, $object->error, $object->errors);
+		exit;
+	} elseif (! $ret) {
 		setEventMessages($langs->trans("ErrorRecordNotFound"), null, 'errors');
 	}
 }
@@ -1304,14 +1307,10 @@
 		}
 		print '</tr></table>';
 		print '</td><td>';
-		if ($object->type != Facture::TYPE_CREDIT_NOTE) {
-			if ($action == 'editconditions') {
-				$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?facid='.$object->id, $object->cond_reglement_id, 'cond_reglement_id');
-			} else {
-				$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?facid='.$object->id, $object->cond_reglement_id, 'none');
-			}
+		if ($action == 'editconditions') {
+			$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?facid='.$object->id, $object->cond_reglement_id, 'cond_reglement_id');
 		} else {
-			print '&nbsp;';
+			$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?facid='.$object->id, $object->cond_reglement_id, 'none');
 		}
 		print '</td></tr>';
 
@@ -1735,6 +1734,7 @@
 		// List of actions on element
 		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
 		$formactions = new FormActions($db);
+		$morehtmlcenter = '';
 		$somethingshown = $formactions->showactions($object, $object->element, (is_object($object->thirdparty) ? $object->thirdparty->id : 0), 1, '', $MAXEVENT, '', $morehtmlcenter);
 
 		print '</div>';

diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php
@@ -1397,6 +1397,7 @@ public function createRecurringInvoices($restrictioninvoiceid = 0, $forcevalidat
 					$nb_create++;
 					$this->output .= $langs->trans("InvoiceGeneratedFromTemplate", $facture->ref, $facturerec->ref)."\n";
 				} else {
+					$this->output .= $langs->trans("InvoiceGeneratedFromTemplateError", $facture->ref, $facturerec->ref, $this->error)."\n";
 					$this->db->rollback("createRecurringInvoices Process invoice template id=".$facturerec->id.", ref=".$facturerec->ref);
 				}
 

diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang
@@ -410,6 +410,7 @@ InvoiceAutoValidate=Validate invoices automatically
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
 DateIsNotEnough=Date not reached yet
 InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
+InvoiceGeneratedFromTemplateError=Error Invoice %s generated from recurring template invoice %s : %s
 GeneratedFromTemplate=Generated from template invoice %s
 WarningInvoiceDateInFuture=Warning, the invoice date is higher than current date
 WarningInvoiceDateTooFarInFuture=Warning, the invoice date is too far from current date