diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php
index a2d33daacb3..805a62011c3 100644
--- a/htdocs/compta/resultat/clientfourn.php
+++ b/htdocs/compta/resultat/clientfourn.php
@@ -164,6 +164,7 @@ print adodb_gmstrftime('%Y-%d-%m %H:%M',$date_end).'
';
print $sql;
*/
+dol_syslog("get customer invoices sql=".$sql);
$result = $db->query($sql);
if ($result) {
$num = $db->num_rows($result);
@@ -206,6 +207,7 @@ if ($modecompta != 'CREANCES-DETTES')
$sql.= " GROUP BY nom";
$sql.= " ORDER BY nom";
+ dol_syslog("get old customer payments not linked to invoices sql=".$sql);
$result = $db->query($sql);
if ($result) {
$num = $db->num_rows($result);
@@ -276,8 +278,10 @@ $sql .= " GROUP BY nom, s.rowid";
$sql .= " ORDER BY nom, s.rowid";
print '
| '.$langs->trans("SuppliersInvoices").' |
';
+
$subtotal_ht = 0;
$subtotal_ttc = 0;
+dol_syslog("get suppliers invoices sql=".$sql);
$result = $db->query($sql);
if ($result) {
$num = $db->num_rows($result);
@@ -324,7 +328,7 @@ print '';
* Charges sociales non deductibles
*/
-print '| Prestations/Charges NON deductibles |
';
+print '| '.$langs->trans("SocialContributions").' |
';
if ($modecompta == 'CREANCES-DETTES') {
$sql = "SELECT c.libelle as nom, sum(s.amount) as amount";
@@ -347,6 +351,7 @@ else {
$sql.= " AND s.entity = ".$conf->entity;
$sql.= " GROUP BY c.libelle";
+dol_syslog("get social contributions deductible=0 sql=".$sql);
$result=$db->query($sql);
$subtotal_ht = 0;
$subtotal_ttc = 0;
@@ -391,7 +396,7 @@ print '';
* Charges sociales deductibles
*/
-print '| Prestations/Charges deductibles |
';
+print '| '.$langs->trans("SocialContributions").' |
';
if ($modecompta == 'CREANCES-DETTES') {
$sql = "SELECT c.libelle as nom, sum(s.amount) as amount";
@@ -416,6 +421,7 @@ else {
$sql.= " GROUP BY c.libelle";
}
+dol_syslog("get social contributions deductible=1 sql=".$sql);
$result=$db->query($sql);
$subtotal_ht = 0;
$subtotal_ttc = 0;
@@ -492,6 +498,7 @@ if ($modecompta == 'CREANCES-DETTES')
$sql.= " GROUP BY dm";
$sql.= " ORDER BY dm DESC";
+ dol_syslog("get vat to pay sql=".$sql);
$result=$db->query($sql);
if ($result) {
$num = $db->num_rows($result);
@@ -528,6 +535,7 @@ if ($modecompta == 'CREANCES-DETTES')
$sql.= " GROUP BY dm";
$sql.= " ORDER BY dm DESC";
+ dol_syslog("get vat received back sql=".$sql);
$result=$db->query($sql);
if ($result) {
$num = $db->num_rows($result);
@@ -567,6 +575,7 @@ else
$sql.= " GROUP BY dm";
$sql.= " ORDER BY dm DESC";
+ dol_syslog("get vat really paid sql=".$sql);
$result=$db->query($sql);
if ($result) {
$num = $db->num_rows($result);
@@ -605,6 +614,7 @@ else
$sql.= " GROUP BY dm";
$sql.= " ORDER BY dm DESC";
+ dol_syslog("get vat really received back sql=".$sql);
$result=$db->query($sql);
if ($result) {
$num = $db->num_rows($result);
diff --git a/htdocs/compta/resultat/index.php b/htdocs/compta/resultat/index.php
index 35a19a00f57..790fad2d04d 100644
--- a/htdocs/compta/resultat/index.php
+++ b/htdocs/compta/resultat/index.php
@@ -111,6 +111,7 @@ $sql.= " GROUP BY dm";
$sql.= " ORDER BY dm";
//print $sql;
+dol_syslog("get customers invoices sql=".$sql);
$result=$db->query($sql);
if ($result)
{
@@ -143,6 +144,7 @@ if ($modecompta != 'CREANCES-DETTES') {
$sql.= " GROUP BY dm";
$sql.= " ORDER BY dm";
+ dol_syslog("get old customers payments not linked to invoices sql=".$sql);
$result = $db->query($sql);
if ($result) {
$num = $db->num_rows($result);
@@ -174,7 +176,7 @@ if ($modecompta == 'CREANCES-DETTES') {
$sql.= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
$sql.= " WHERE f.fk_statut IN (1,2)";
} else {
- $sql = "SELECT sum(p.amount) as amount_ttc, date_format(p.datep,'%Y-%m') as dm";
+ $sql = "SELECT sum(pf.amount) as amount_ttc, date_format(p.datep,'%Y-%m') as dm";
$sql.= " FROM ".MAIN_DB_PREFIX."paiementfourn as p";
$sql.= ", ".MAIN_DB_PREFIX."facture_fourn as f";
$sql.= ", ".MAIN_DB_PREFIX."paiementfourn_facturefourn as pf";
@@ -185,6 +187,7 @@ $sql.= " AND f.entity = ".$conf->entity;
if ($socid) $sql.= " AND f.fk_soc = ".$socid;
$sql.= " GROUP BY dm";
+dol_syslog("get suppliers invoices sql=".$sql);
$result=$db->query($sql);
if ($result)
{
@@ -219,6 +222,7 @@ if ($modecompta == 'CREANCES-DETTES') {
$sql.= " AND f.entity = ".$conf->entity;
$sql.= " GROUP BY dm DESC";
+ dol_syslog("get vat to pay sql=".$sql);
$result=$db->query($sql);
if ($result) {
$num = $db->num_rows($result);
@@ -244,6 +248,7 @@ if ($modecompta == 'CREANCES-DETTES') {
$sql.= " AND f.entity = ".$conf->entity;
$sql.= " GROUP BY dm";
+ dol_syslog("get vat to receive back sql=".$sql);
$result=$db->query($sql);
if ($result) {
$num = $db->num_rows($result);
@@ -271,6 +276,7 @@ else {
$sql.= " AND t.entity = ".$conf->entity;
$sql.= " GROUP BY dm";
+ dol_syslog("get vat really paid sql=".$sql);
$result=$db->query($sql);
if ($result) {
$num = $db->num_rows($result);
@@ -296,6 +302,7 @@ else {
$sql.= " AND t.entity = ".$conf->entity;
$sql.= " GROUP BY dm";
+ dol_syslog("get vat really received back sql=".$sql);
$result=$db->query($sql);
if ($result) {
$num = $db->num_rows($result);
@@ -340,8 +347,8 @@ else {
$sql.= " AND s.entity = ".$conf->entity;
$sql.= " GROUP BY c.libelle, dm";
+dol_syslog("get social contributions deductible=0 sql=".$sql);
$result=$db->query($sql);
-
if ($result) {
$num = $db->num_rows($result);
$var=false;
@@ -387,6 +394,7 @@ else
$sql.= " AND s.entity = ".$conf->entity;
$sql.= " GROUP BY c.libelle, dm";
+dol_syslog("get social contributions paid deductible=1 sql=".$sql);
$result=$db->query($sql);
if ($result) {
$num = $db->num_rows($result);