Browse Source

Merge pull request #20964 from grandoc/new_branch_21_05_2022_02

fix : The property chid does not seem to exist on PaymentVAT
Laurent Destailleur 3 năm trước cách đây
mục cha
commit
19e8319327

+ 1 - 1
htdocs/compta/paiement_vat.php

@@ -290,7 +290,7 @@ if ($action == 'create') {
 		print "</tr>\n";
 		$total += $objp->total;
 		$total_ttc += $objp->total_ttc;
-		$totalrecu += $objp->am;
+		$totalrecu += $objp->amount;
 		$i++;
 	}
 	if ($i > 1) {

+ 15 - 0
htdocs/compta/tva/class/paymentvat.class.php

@@ -96,6 +96,21 @@ class PaymentVAT extends CommonObject
 	 */
 	public $fk_user_modif;
 
+	/**
+	 * @var int ID
+	 */
+	public $chid;
+
+	/**
+	 * @var integer|string datepaye
+	 */
+	public $datepaye;
+
+	/**
+	 * @var integer|string paiementtype
+	 */
+	public $paiementtype;
+
 	/**
 	 *	Constructor
 	 *

+ 11 - 0
htdocs/compta/tva/class/tva.class.php

@@ -49,6 +49,12 @@ class Tva extends CommonObject
 	 */
 	public $picto = 'payment';
 
+	/**
+	 * @deprecated
+	 * @see $amount
+	 */
+	public $total;
+
 	public $tms;
 	public $datep;
 	public $datev;
@@ -81,6 +87,11 @@ class Tva extends CommonObject
 	 */
 	public $fk_user_modif;
 
+	/**
+	 * @var integer|string paiementtype
+	 */
+	public $paiementtype;
+
 
 	const STATUS_UNPAID = 0;
 	const STATUS_PAID = 1;