|
@@ -216,6 +216,7 @@ if ($result) {
|
|
|
// one line tabpay = line into bank
|
|
|
// one line for bank record = tabbq
|
|
|
// one line for thirdparty record = tabtp
|
|
|
+ // Note: tabcompany is used to store the subledger account
|
|
|
$i = 0;
|
|
|
while ($i < $num) {
|
|
|
$obj = $db->fetch_object($result);
|
|
@@ -263,7 +264,8 @@ if ($result) {
|
|
|
);
|
|
|
|
|
|
// Set accountancy code for user
|
|
|
- // $obj->accountancy_code is the accountancy_code of table u=user but it is defined only if a link with type 'user' exists)
|
|
|
+ // $obj->accountancy_code is the accountancy_code of table u=user (but it is defined only if
|
|
|
+ // a link with type 'user' exists and user as a subledger account)
|
|
|
$compta_user = (!empty($obj->accountancy_code) ? $obj->accountancy_code : '');
|
|
|
|
|
|
$tabuser[$obj->rowid] = array(
|
|
@@ -364,13 +366,25 @@ if ($result) {
|
|
|
$userstatic->lastname = $tabuser[$obj->rowid]['lastname'];
|
|
|
$userstatic->statut = $tabuser[$obj->rowid]['status'];
|
|
|
$userstatic->accountancy_code = $tabuser[$obj->rowid]['accountancy_code'];
|
|
|
+ // For a payment of social contribution, we have a link sc + user.
|
|
|
+ // but we already fill the $tabpay[$obj->rowid]["soclib"] in the line 'sc'.
|
|
|
+ // If we fill it here to, we must concat
|
|
|
if ($userstatic->id > 0) {
|
|
|
- $tabpay[$obj->rowid]["soclib"] = $userstatic->getNomUrl(1, 'accountancy', 0);
|
|
|
+ if ($is_sc) {
|
|
|
+ $tabpay[$obj->rowid]["soclib"] .= ' '.$userstatic->getNomUrl(1, 'accountancy', 0);
|
|
|
+ } else {
|
|
|
+ $tabpay[$obj->rowid]["soclib"] = $userstatic->getNomUrl(1, 'accountancy', 0);
|
|
|
+ }
|
|
|
} else {
|
|
|
$tabpay[$obj->rowid]["soclib"] = '???'; // Should not happen, but happens with old data when id of user was not saved on expense report payment.
|
|
|
}
|
|
|
+
|
|
|
if ($compta_user) {
|
|
|
- $tabtp[$obj->rowid][$compta_user] += $amounttouse;
|
|
|
+ if ($is_sc) {
|
|
|
+ //$tabcompany[$obj->rowid][$compta_user] += $amounttouse;
|
|
|
+ } else {
|
|
|
+ $tabtp[$obj->rowid][$compta_user] += $amounttouse;
|
|
|
+ }
|
|
|
}
|
|
|
} elseif ($links[$key]['type'] == 'sc') {
|
|
|
$chargestatic->id = $links[$key]['url_id'];
|