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

2023-08-05 13:47:17 +02:00
parent bce7b869c2 310832a95b
commit ea364ff1a3
36 changed files with 47 additions and 39 deletions
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -134,6 +134,11 @@ class Commande extends CommonOrder
 	 */
 	public $cond_reglement_code;

+	/**
+	 * @var string Condition payment label
+	 */
+	public $cond_reglement_doc;
+
 	/**
 	 * @var double Deposit % for payment terms
 	 */