lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #20957 from grandoc/new_branch_21_05_2022

Browse Source 
fix : The property chid does not seem to exist on PaymentSocialContri…
This commit is contained in:
Laurent Destailleur 2022-05-21 19:11:42 +02:00 committed by GitHub
commit 39258bc7c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/compta/paiement_charge.php
View File

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

5
htdocs/compta/sociales/class/chargesociales.class.php
View File

@ -113,6 +113,11 @@ class ChargeSociales extends CommonObject
*/ */
public $fk_user; public $fk_user;
/**
* @var double total
*/
public $total;
const STATUS_UNPAID = 0; const STATUS_UNPAID = 0;
const STATUS_PAID = 1; const STATUS_PAID = 1;

16
htdocs/compta/sociales/class/paymentsocialcontribution.class.php
View File

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