diff --git a/htdocs/compta/bank/ligne.php b/htdocs/compta/bank/ligne.php
index f6709c4d1c5eb52334383e24d3ad48568fbbd38c..0d307115ed916f11793c89942f3882a1da191f6e 100644
--- a/htdocs/compta/bank/ligne.php
+++ b/htdocs/compta/bank/ligne.php
@@ -320,7 +320,7 @@ if ($result)
print '</a>';
}
else if ($links[$key]['type']=='sc') {
- print '<a href="'.DOL_URL_ROOT.'/compta/sociales/charges.php?id='.$links[$key]['url_id'].'">';
+ print '<a href="'.DOL_URL_ROOT.'/compta/sociales/card.php?id='.$links[$key]['url_id'].'">';
print img_object($langs->trans('ShowSocialContribution'),'bill').' ';
print $langs->trans("SocialContribution").($links[$key]['label']?' - '.$links[$key]['label']:'');
print '</a>';
diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php
index 7a7941da64ddbf412f4a61d2d5a5b2a2c6ff9a9b..cc23d9a9d044aafdbc66107c804feeaedfd0e885 100644
--- a/htdocs/compta/bank/releve.php
+++ b/htdocs/compta/bank/releve.php
@@ -469,7 +469,7 @@ else
$newline=0;
}
elseif ($links[$key]['type']=='sc') {
- print '<a href="'.DOL_URL_ROOT.'/compta/sociales/charges.php?id='.$links[$key]['url_id'].'">';
+ print '<a href="'.DOL_URL_ROOT.'/compta/sociales/card.php?id='.$links[$key]['url_id'].'">';
print img_object($langs->trans('ShowBill'),'bill').' ';
print $langs->trans("SocialContribution");
print '</a>';
diff --git a/htdocs/compta/paiement_charge.php b/htdocs/compta/paiement_charge.php
index 06a32c3865f51d4a56bb8dd614e98221c6cda380..c8e272cfd5aa8ddd1f5c9e155ecec56e2d66ebaf 100644
--- a/htdocs/compta/paiement_charge.php
+++ b/htdocs/compta/paiement_charge.php
@@ -51,7 +51,7 @@ if ($action == 'add_payment')
if ($_POST["cancel"])
{
- $loc = DOL_URL_ROOT.'/compta/sociales/charges.php?id='.$chid;
+ $loc = DOL_URL_ROOT.'/compta/sociales/card.php?id='.$chid;
header("Location: ".$loc);
exit;
}
@@ -130,7 +130,7 @@ if ($action == 'add_payment')
if (! $error)
{
$db->commit();
- $loc = DOL_URL_ROOT.'/compta/sociales/charges.php?id='.$chid;
+ $loc = DOL_URL_ROOT.'/compta/sociales/card.php?id='.$chid;
header('Location: '.$loc);
exit;
}
@@ -185,7 +185,7 @@ if ($_GET["action"] == 'create')
print "<tr class=\"liste_titre\"><td colspan=\"2\">".$langs->trans("SocialContribution")."</td></tr>";
- print '<tr><td>'.$langs->trans("Ref").'</td><td><a href="'.DOL_URL_ROOT.'/compta/sociales/charges.php?id='.$chid.'">'.$chid.'</a></td></tr>';
+ print '<tr><td>'.$langs->trans("Ref").'</td><td><a href="'.DOL_URL_ROOT.'/compta/sociales/card.php?id='.$chid.'">'.$chid.'</a></td></tr>';
print '<tr><td>'.$langs->trans("Type")."</td><td>".$charge->type_libelle."</td></tr>\n";
print '<tr><td>'.$langs->trans("Period")."</td><td>".dol_print_date($charge->periode,'day')."</td></tr>\n";
print '<tr><td>'.$langs->trans("Label").'</td><td>'.$charge->lib."</td></tr>\n";
diff --git a/htdocs/compta/payment_sc/card.php b/htdocs/compta/payment_sc/card.php
index ad59687b43c23294445dd1e2cd52499422fee282..9229397dbb626486dc0604d1abab7d65bee4681b 100644
--- a/htdocs/compta/payment_sc/card.php
+++ b/htdocs/compta/payment_sc/card.php
@@ -65,7 +65,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->tax->char
if ($result > 0)
{
$db->commit();
- header("Location: ".DOL_URL_ROOT."/compta/charges/index.php?mode=sconly");
+ header("Location: ".DOL_URL_ROOT."/compta/sociales/payments.php?mode=sconly");
exit;
}
else
diff --git a/htdocs/compta/sociales/charges.php b/htdocs/compta/sociales/card.php
similarity index 96%
rename from htdocs/compta/sociales/charges.php
rename to htdocs/compta/sociales/card.php
index f5a6cc2f6a9c86248801ef0dd1cb99e7884d2132..8c21bf32ceb7ff7d139363b0bdbfb552c3eef03d 100644
--- a/htdocs/compta/sociales/charges.php
+++ b/htdocs/compta/sociales/card.php
@@ -18,7 +18,7 @@
*/
/**
- * \file htdocs/compta/sociales/charges.php
+ * \file htdocs/compta/sociales/card.php
* \ingroup tax
* \brief Social contribution card page
*/
@@ -382,7 +382,7 @@ if ($id > 0)
if ($action == 'edit')
{
- print "<form name=\"charge\" action=\"charges.php?id=$object->id&action=update\" method=\"post\">";
+ print "<form name=\"charge\" action=\"".$_SERVER["PHP_SELF"]."?id=$object->id&action=update\" method=\"post\">";
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
}
@@ -585,13 +585,13 @@ if ($id > 0)
// Reopen
if ($object->paye && $user->rights->tax->charges->creer)
{
- print "<a class=\"butAction\" href=\"".dol_buildpath("/compta/sociales/charges.php",1). "?id=$object->id&action=reopen\">".$langs->trans("ReOpen")."</a>";
+ print "<a class=\"butAction\" href=\"".dol_buildpath("/compta/sociales/card.php",1). "?id=$object->id&action=reopen\">".$langs->trans("ReOpen")."</a>";
}
// Edit
if ($object->paye == 0 && $user->rights->tax->charges->creer)
{
- print "<a class=\"butAction\" href=\"".DOL_URL_ROOT."/compta/sociales/charges.php?id=$object->id&action=edit\">".$langs->trans("Modify")."</a>";
+ print "<a class=\"butAction\" href=\"".DOL_URL_ROOT."/compta/sociales/card.php?id=$object->id&action=edit\">".$langs->trans("Modify")."</a>";
}
// Emit payment
@@ -603,19 +603,19 @@ if ($id > 0)
// Classify 'paid'
if ($object->paye == 0 && round($resteapayer) <=0 && $user->rights->tax->charges->creer)
{
- print "<a class=\"butAction\" href=\"".DOL_URL_ROOT."/compta/sociales/charges.php?id=$object->id&action=paid\">".$langs->trans("ClassifyPaid")."</a>";
+ print "<a class=\"butAction\" href=\"".DOL_URL_ROOT."/compta/sociales/card.php?id=$object->id&action=paid\">".$langs->trans("ClassifyPaid")."</a>";
}
// Clone
if ($user->rights->tax->charges->creer)
{
- print "<a class=\"butAction\" href=\"".dol_buildpath("/compta/sociales/charges.php",1). "?id=$object->id&action=clone\">".$langs->trans("ToClone")."</a>";
+ print "<a class=\"butAction\" href=\"".dol_buildpath("/compta/sociales/card.php",1). "?id=$object->id&action=clone\">".$langs->trans("ToClone")."</a>";
}
// Delete
if ($user->rights->tax->charges->supprimer)
{
- print "<a class=\"butActionDelete\" href=\"".DOL_URL_ROOT."/compta/sociales/charges.php?id=$object->id&action=delete\">".$langs->trans("Delete")."</a>";
+ print "<a class=\"butActionDelete\" href=\"".DOL_URL_ROOT."/compta/sociales/card.php?id=$object->id&action=delete\">".$langs->trans("Delete")."</a>";
}
print "</div>";
diff --git a/htdocs/compta/sociales/class/chargesociales.class.php b/htdocs/compta/sociales/class/chargesociales.class.php
index af3acbf4c7f743d802e97e2c4bf8bf8021897bb5..ca9af96575868ca044692a92e25f8f9e7207e6c5 100644
--- a/htdocs/compta/sociales/class/chargesociales.class.php
+++ b/htdocs/compta/sociales/class/chargesociales.class.php
@@ -449,7 +449,7 @@ class ChargeSociales extends CommonObject
if (empty($this->ref)) $this->ref=$this->lib;
$label = $langs->trans("ShowSocialContribution").': '.$this->ref;
- $link = '<a href="'.DOL_URL_ROOT.'/compta/sociales/charges.php?id='.$this->id.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
+ $link = '<a href="'.DOL_URL_ROOT.'/compta/sociales/card.php?id='.$this->id.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
$linkend='</a>';
if ($withpicto) $result.=($link.img_object($label, 'bill', 'class="classfortooltip"').$linkend.' ');
diff --git a/htdocs/compta/sociales/index.php b/htdocs/compta/sociales/index.php
index 15ca799c1c2651c0bda23be776501dde456d07fd..fc106de2ad1bae6dee250a31286f999186d899d4 100644
--- a/htdocs/compta/sociales/index.php
+++ b/htdocs/compta/sociales/index.php
@@ -1,6 +1,6 @@
<?php
/* Copyright (C) 2001-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2014 Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2016 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2009 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2016 Frédéric France <frederic.france@free.fr>
*
@@ -233,7 +233,7 @@ if ($resql)
print '<td>'.dol_trunc($obj->libelle,42).'</td>';
// Type
- print '<td>'.dol_trunc($obj->type_lib,16).'</td>';
+ print '<td>'.$obj->type_lib.'</td>';
// Date end period
print '<td align="center">';
diff --git a/htdocs/compta/sociales/payments.php b/htdocs/compta/sociales/payments.php
new file mode 100644
index 0000000000000000000000000000000000000000..017bcb7686ee53ab424be41053219db268cbacd1
--- /dev/null
+++ b/htdocs/compta/sociales/payments.php
@@ -0,0 +1,490 @@
+<?php
+/* Copyright (C) 2001-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2014 Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2010 Regis Houssin <regis.houssin@capnetworks.com>
+ * Copyright (C) 2011-2016 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
+ * Copyright (C) 2011-2014 Juanjo Menent <jmenent@2byte.es>
+ * Copyright (C) 2015 Jean-François Ferry <jfefe@aternatik.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file htdocs/compta/sociales/payments.php
+ * \ingroup compta
+ * \brief Page to list payments of special expenses
+ */
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/paymentsocialcontribution.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/salaries/class/paymentsalary.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+
+$langs->load("compta");
+$langs->load("bills");
+
+// Security check
+if ($user->societe_id) $socid=$user->societe_id;
+$result = restrictedArea($user, 'tax|salaries', '', '', 'charges|');
+
+$mode=GETPOST("mode",'alpha');
+$year=GETPOST("year",'int');
+$filtre=GETPOST("filtre",'alpha');
+if (! $year && $mode != 'sconly') { $year=date("Y", time()); }
+
+$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
+$sortfield = GETPOST("sortfield",'alpha');
+$sortorder = GETPOST("sortorder",'alpha');
+$page = GETPOST("page",'int');
+if ($page == -1) { $page = 0; }
+$offset = $limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+if (! $sortfield) $sortfield="pc.datep";
+if (! $sortorder) $sortorder="DESC";
+
+
+/*
+ * View
+ */
+
+$tva_static = new Tva($db);
+$socialcontrib=new ChargeSociales($db);
+$payment_sc_static=new PaymentSocialContribution($db);
+$sal_static = new PaymentSalary($db);
+
+llxHeader('',$langs->trans("SpecialExpensesArea"));
+
+$title=$langs->trans("SpecialExpensesArea");
+if ($mode == 'sconly') $title=$langs->trans("SocialContributionsPayments");
+
+$param='';
+if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
+if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
+if ($mode == 'sconly') $param='&mode=sconly';
+if ($sortfield) $param.='&sortfield='.$sortfield;
+if ($sortorder) $param.='&sortorder='.$sortorder;
+
+
+print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
+print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+print '<input type="hidden" name="mode" value="'.$mode.'">';
+
+if ($mode != 'sconly')
+{
+ $center=($year?'<a href="index.php?year='.($year-1).$param.'">'.img_previous($langs->trans("Previous"), 'class="valignbottom"')."</a> ".$langs->trans("Year").' '.$year.' <a href="index.php?year='.($year+1).$param.'">'.img_next($langs->trans("Next"), 'class="valignbottom"')."</a>":"");
+ print_barre_liste($title,$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,$center,$num,$totalnboflines, 'title_accountancy', 0, '', '', $limit, 1);
+}
+else
+{
+ print_barre_liste($title,$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,$center,$num,$totalnboflines, 'title_accountancy', 0, '', '', $limit);
+}
+
+if ($year) $param.='&year='.$year;
+
+if ($mode != 'sconly')
+{
+ print $langs->trans("DescTaxAndDividendsArea").'<br>';
+ print "<br>";
+}
+
+if (! empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
+{
+ // Social contributions only
+ if ($mode != 'sconly')
+ {
+ print load_fiche_titre($langs->trans("SocialContributionsPayments").($year?' ('.$langs->trans("Year").' '.$year.')':''), '', '');
+ }
+
+ print '<table class="noborder" width="100%">';
+ print '<tr class="liste_titre">';
+ print_liste_field_titre($langs->trans("RefPayment"),$_SERVER["PHP_SELF"],"pc.rowid","",$param,'',$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans("DatePayment"),$_SERVER["PHP_SELF"],"pc.datep","",$param,'align="center"',$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans("Type"),$_SERVER["PHP_SELF"],"pct.code","",$param,'',$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans("LabelContrib"),$_SERVER["PHP_SELF"],"c.libelle","",$param,'',$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans("TypeContrib"),$_SERVER["PHP_SELF"],"cs.fk_type","",$param,'',$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans("PeriodEndDate"),$_SERVER["PHP_SELF"],"cs.date_ech","",$param,'width="140px"',$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans("ExpectedToPay"),$_SERVER["PHP_SELF"],"cs.amount","",$param,'align="right"',$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans("PayedByThisPayment"),$_SERVER["PHP_SELF"],"pc.amount","",$param,'align="right"',$sortfield,$sortorder);
+ print "</tr>\n";
+
+ $sql = "SELECT c.id, c.libelle as lib,";
+ $sql.= " cs.rowid, cs.libelle, cs.fk_type as type, cs.periode, cs.date_ech, cs.amount as total,";
+ $sql.= " pc.rowid as pid, pc.datep, pc.amount as totalpaye, pc.num_paiement as num_payment,";
+ $sql.= " pct.code as payment_code";
+ $sql.= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c,";
+ $sql.= " ".MAIN_DB_PREFIX."chargesociales as cs,";
+ $sql.= " ".MAIN_DB_PREFIX."paiementcharge as pc";
+ $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as pct ON pc.fk_typepaiement = pct.id";
+ $sql.= " WHERE cs.fk_type = c.id AND pc.fk_charge = cs.rowid";
+ $sql.= " AND cs.entity = ".$conf->entity;
+ if ($year > 0)
+ {
+ $sql .= " AND (";
+ // Si period renseignee on l'utilise comme critere de date, sinon on prend date echeance,
+ // ceci afin d'etre compatible avec les cas ou la periode n'etait pas obligatoire
+ $sql .= " (cs.periode IS NOT NULL AND cs.periode between '".$db->idate(dol_get_first_day($year))."' AND '".$db->idate(dol_get_last_day($year))."')";
+ $sql .= " OR (cs.periode IS NULL AND cs.date_ech between '".$db->idate(dol_get_first_day($year))."' AND '".$db->idate(dol_get_last_day($year))."')";
+ $sql .= ")";
+ }
+ if (preg_match('/^cs\./',$sortfield) || preg_match('/^c\./',$sortfield) || preg_match('/^pc\./',$sortfield) || preg_match('/^pct\./',$sortfield)) $sql.= $db->order($sortfield,$sortorder);
+ //$sql.= $db->plimit($limit+1,$offset);
+ //print $sql;
+
+ dol_syslog("compta/sociales/payments.php: select payment", LOG_DEBUG);
+ $resql=$db->query($sql);
+ if ($resql)
+ {
+ $num = $db->num_rows($resql);
+ $i = 0;
+ $total = 0;
+ $totalnb = 0;
+ $totalpaye = 0;
+ $var=true;
+
+ while ($i < min($num, $limit))
+ {
+ $obj = $db->fetch_object($resql);
+ $var = !$var;
+ print "<tr ".$bc[$var].">";
+ // Ref payment
+ $payment_sc_static->id=$obj->pid;
+ $payment_sc_static->ref=$obj->pid;
+ print '<td>'.$payment_sc_static->getNomUrl(1)."</td>\n";
+ // Date payment
+ print '<td align="center">'.dol_print_date($db->jdate($obj->datep),'day').'</td>';
+ // Type payment
+ print '<td>';
+ if ($obj->payment_code) print $langs->trans("PaymentTypeShort".$obj->payment_code).' ';
+ print $obj->num_payment.'</td>';
+ // Label
+ print '<td>';
+ $socialcontrib->id=$obj->rowid;
+ $socialcontrib->ref=$obj->libelle;
+ $socialcontrib->lib=$obj->libelle;
+ print $socialcontrib->getNomUrl(1,'20');
+ print '</td>';
+ // Type
+ print '<td><a href="../sociales/index.php?filtre=cs.fk_type:'.$obj->type.'">'.$obj->lib.'</a></td>';
+ // Date
+ $date=$obj->periode;
+ if (empty($date)) $date=$obj->date_ech;
+ print '<td>'.dol_print_date($date,'day').'</td>';
+ // Expected to pay
+ print '<td align="right">'.price($obj->total).'</td>';
+ // Paid
+ print '<td align="right">';
+ if ($obj->totalpaye) print price($obj->totalpaye);
+ print '</td>';
+ print '</tr>';
+
+ $total = $total + $obj->total;
+ $totalnb = $totalnb + $obj->nb;
+ $totalpaye = $totalpaye + $obj->totalpaye;
+ $i++;
+ }
+ print '<tr class="liste_total"><td colspan="3" class="liste_total">'.$langs->trans("Total").'</td>';
+ print '<td align="right" class="liste_total"></td>'; // A total here has no sense
+ print '<td align="center" class="liste_total"> </td>';
+ print '<td align="center" class="liste_total"> </td>';
+ print '<td align="center" class="liste_total"> </td>';
+ print '<td align="right" class="liste_total">'.price($totalpaye)."</td>";
+ print "</tr>";
+ }
+ else
+ {
+ dol_print_error($db);
+ }
+ print '</table>';
+}
+
+// VAT
+if (! empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
+{
+ if (! $mode || $mode != 'sconly')
+ {
+ print "<br>";
+
+ $tva = new Tva($db);
+
+ print load_fiche_titre($langs->trans("VATPayments").($year?' ('.$langs->trans("Year").' '.$year.')':''), '', '');
+
+ $sql = "SELECT pv.rowid, pv.amount, pv.label, pv.datev as dm";
+ $sql.= " FROM ".MAIN_DB_PREFIX."tva as pv";
+ $sql.= " WHERE pv.entity = ".$conf->entity;
+ if ($year > 0)
+ {
+ // Si period renseignee on l'utilise comme critere de date, sinon on prend date echeance,
+ // ceci afin d'etre compatible avec les cas ou la periode n'etait pas obligatoire
+ $sql.= " AND pv.datev between '".$db->idate(dol_get_first_day($year,1,false))."' AND '".$db->idate(dol_get_last_day($year,12,false))."'";
+ }
+ if (preg_match('/^pv\./',$sortfield)) $sql.= $db->order($sortfield,$sortorder);
+
+ $result = $db->query($sql);
+ if ($result)
+ {
+ $num = $db->num_rows($result);
+ $i = 0;
+ $total = 0 ;
+ print '<table class="noborder" width="100%">';
+ print '<tr class="liste_titre">';
+ print_liste_field_titre($langs->trans("PeriodEndDate"),$_SERVER["PHP_SELF"],"pv.datev","",$param,'width="140px"',$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans("Label"),$_SERVER["PHP_SELF"],"pv.label","",$param,'',$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans("ExpectedToPay"),$_SERVER["PHP_SELF"],"pv.amount","",$param,'align="right"',$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans("RefPayment"),$_SERVER["PHP_SELF"],"pv.rowid","",$param,'',$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans("DatePayment"),$_SERVER["PHP_SELF"],"pv.datev","",$param,'align="center"',$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans("PayedByThisPayment"),$_SERVER["PHP_SELF"],"pv.amount","",$param,'align="right"',$sortfield,$sortorder);
+ print "</tr>\n";
+ $var=1;
+ while ($i < $num)
+ {
+ $obj = $db->fetch_object($result);
+
+ $total = $total + $obj->amount;
+
+ $var=!$var;
+ print "<tr ".$bc[$var].">";
+ print '<td align="left">'.dol_print_date($db->jdate($obj->dm),'day').'</td>'."\n";
+
+ print "<td>".$obj->label."</td>\n";
+
+ print '<td align="right">'.price($obj->amount)."</td>";
+
+ // Ref payment
+ $tva_static->id=$obj->rowid;
+ $tva_static->ref=$obj->rowid;
+ print '<td align="left">'.$tva_static->getNomUrl(1)."</td>\n";
+
+ print '<td align="center">'.dol_print_date($db->jdate($obj->dm),'day')."</td>\n";
+ print '<td align="right">'.price($obj->amount)."</td>";
+ print "</tr>\n";
+
+ $i++;
+ }
+ print '<tr class="liste_total"><td colspan="2">'.$langs->trans("Total").'</td>';
+ print '<td align="right">'.price($total).'</td>';
+ print '<td align="center"> </td>';
+ print '<td align="center"> </td>';
+ print '<td align="right">'.price($total)."</td>";
+ print "</tr>";
+
+ print "</table>";
+ $db->free($result);
+ }
+ else
+ {
+ dol_print_error($db);
+ }
+ }
+}
+
+// Localtax
+if($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj=="1")
+{
+ $j=1;
+ $numlt=3;
+}
+elseif($mysoc->localtax1_assuj=="1")
+{
+ $j=1;
+ $numlt=2;
+}
+elseif($mysoc->localtax2_assuj=="1")
+{
+ $j=2;
+ $numlt=3;
+}
+else
+{
+ $j=0;
+ $numlt=0;
+}
+
+while($j<$numlt)
+{
+ if (! $mode || $mode != 'sconly')
+ {
+ print "<br>";
+
+ $tva = new Tva($db);
+
+ print load_fiche_titre($langs->transcountry(($j==1?"LT1Payments":"LT2Payments"),$mysoc->country_code).($year?' ('.$langs->trans("Year").' '.$year.')':''), '', '');
+
+
+ $sql = "SELECT pv.rowid, pv.amount, pv.label, pv.datev as dm, pv.datep as dp";
+ $sql.= " FROM ".MAIN_DB_PREFIX."localtax as pv";
+ $sql.= " WHERE pv.entity = ".$conf->entity." AND localtaxtype = ".$j ;
+ if ($year > 0)
+ {
+ // Si period renseignee on l'utilise comme critere de date, sinon on prend date echeance,
+ // ceci afin d'etre compatible avec les cas ou la periode n'etait pas obligatoire
+ $sql.= " AND pv.datev between '".$db->idate(dol_get_first_day($year,1,false))."' AND '".$db->idate(dol_get_last_day($year,12,false))."'";
+ }
+ if (preg_match('/^pv/',$sortfield)) $sql.= $db->order($sortfield,$sortorder);
+
+ $result = $db->query($sql);
+ if ($result)
+ {
+ $num = $db->num_rows($result);
+ $i = 0;
+ $total = 0 ;
+ print '<table class="noborder" width="100%">';
+ print '<tr class="liste_titre">';
+ print_liste_field_titre($langs->trans("PeriodEndDate"),$_SERVER["PHP_SELF"],"pv.datev","",$param,'width="120"',$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans("Label"),$_SERVER["PHP_SELF"],"pv.label","",$param,'',$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans("ExpectedToPay"),$_SERVER["PHP_SELF"],"pv.amount","",$param,'align="right"',$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans("RefPayment"),$_SERVER["PHP_SELF"],"pv.rowid","",$param,'',$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans("DatePayment"),$_SERVER["PHP_SELF"],"pv.datep","",$param,'align="center"',$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans("PayedByThisPayment"),$_SERVER["PHP_SELF"],"pv.amount","",$param,'align="right"',$sortfield,$sortorder);
+ print "</tr>\n";
+ $var=1;
+ while ($i < $num)
+ {
+ $obj = $db->fetch_object($result);
+
+ $total = $total + $obj->amount;
+
+ $var=!$var;
+ print "<tr ".$bc[$var].">";
+ print '<td align="left">'.dol_print_date($db->jdate($obj->dm),'day').'</td>'."\n";
+
+ print "<td>".$obj->label."</td>\n";
+
+ print '<td align="right">'.price($obj->amount)."</td>";
+
+ // Ref payment
+ $tva_static->id=$obj->rowid;
+ $tva_static->ref=$obj->rowid;
+ print '<td align="left">'.$tva_static->getNomUrl(1)."</td>\n";
+
+ print '<td align="center">'.dol_print_date($db->jdate($obj->dp),'day')."</td>\n";
+ print '<td align="right">'.price($obj->amount)."</td>";
+ print "</tr>\n";
+
+ $i++;
+ }
+ print '<tr class="liste_total"><td align="right" colspan="2">'.$langs->trans("Total").'</td>';
+ print '<td align="right">'.price($total)."</td>";
+ print '<td align="center"> </td>';
+ print '<td align="center"> </td>';
+ print '<td align="right">'.price($total)."</td>";
+ print "</tr>";
+
+ print "</table>";
+ $db->free($result);
+ }
+ else
+ {
+ dol_print_error($db);
+ }
+ }
+ $j++;
+}
+
+
+// Payment Salary
+if (! empty($conf->salaries->enabled) && $user->rights->salaries->read)
+{
+ if (! $mode || $mode != 'sconly')
+ {
+ $sal = new PaymentSalary($db);
+
+ print "<br>";
+
+ print_fiche_titre($langs->trans("SalariesPayments").($year?' ('.$langs->trans("Year").' '.$year.')':''), '', '');
+
+ $sql = "SELECT s.rowid, s.amount, s.label, s.datep as datep, s.datev as datev, s.datesp, s.dateep, s.salary, u.salary as current_salary";
+ $sql.= " FROM ".MAIN_DB_PREFIX."payment_salary as s, ".MAIN_DB_PREFIX."user as u";
+ $sql.= " WHERE s.entity IN (".getEntity('user',1).")";
+ $sql.= " AND u.rowid = s.fk_user";
+ if ($year > 0)
+ {
+ $sql.= " AND (s.datesp between '".$db->idate(dol_get_first_day($year,1,false))."' AND '".$db->idate(dol_get_last_day($year,12,false))."'";
+ $sql.= " OR s.dateep between '".$db->idate(dol_get_first_day($year,1,false))."' AND '".$db->idate(dol_get_last_day($year,12,false))."')";
+ }
+ if (preg_match('/^s\./',$sortfield)) $sql.= $db->order($sortfield,$sortorder);
+
+ $result = $db->query($sql);
+ if ($result)
+ {
+ $num = $db->num_rows($result);
+ $i = 0;
+ $total = 0 ;
+ print '<table class="noborder" width="100%">';
+ print '<tr class="liste_titre">';
+ print_liste_field_titre($langs->trans("PeriodEndDate"),$_SERVER["PHP_SELF"],"s.dateep","",$param,'width="140px"',$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans("Label"),$_SERVER["PHP_SELF"],"s.label","",$param,'',$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans("ExpectedToPay"),$_SERVER["PHP_SELF"],"s.amount","",$param,'align="right"',$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans("RefPayment"),$_SERVER["PHP_SELF"],"s.rowid","",$param,'',$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans("DatePayment"),$_SERVER["PHP_SELF"],"s.datep","",$param,'align="center"',$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans("PayedByThisPayment"),$_SERVER["PHP_SELF"],"s.amount","",$param,'align="right"',$sortfield,$sortorder);
+ print "</tr>\n";
+ $var=1;
+ while ($i < $num)
+ {
+ $obj = $db->fetch_object($result);
+
+ $total = $total + $obj->amount;
+
+ $var=!$var;
+ print "<tr ".$bc[$var].">";
+
+ print '<td align="left">'.dol_print_date($db->jdate($obj->dateep),'day').'</td>'."\n";
+
+ print "<td>".$obj->label."</td>\n";
+
+ print '<td align="right">'.($obj->salary?price($obj->salary):'')."</td>";
+
+ // Ref payment
+ $sal_static->id=$obj->rowid;
+ $sal_static->ref=$obj->rowid;
+ print '<td align="left">'.$sal_static->getNomUrl(1)."</td>\n";
+
+ print '<td align="center">'.dol_print_date($db->jdate($obj->datep),'day')."</td>\n";
+ print '<td align="right">'.price($obj->amount)."</td>";
+ print "</tr>\n";
+
+ $i++;
+ }
+ print '<tr class="liste_total"><td colspan="2">'.$langs->trans("Total").'</td>';
+ print '<td align="right"></td>'; // A total here has no sense
+ print '<td align="center"> </td>';
+ print '<td align="center"> </td>';
+ print '<td align="right">'.price($total)."</td>";
+ print "</tr>";
+
+ print "</table>";
+ $db->free($result);
+
+ print "<br>";
+ }
+ else
+ {
+ dol_print_error($db);
+ }
+ }
+}
+
+print '</form>';
+
+
+llxFooter();
+
+$db->close();
diff --git a/htdocs/core/lib/tax.lib.php b/htdocs/core/lib/tax.lib.php
index 203316ce111ba416e68bffbfa97c17d037bdb8be..740bb223cba73e9edab7ae6dbd7fc33b1315811b 100644
--- a/htdocs/core/lib/tax.lib.php
+++ b/htdocs/core/lib/tax.lib.php
@@ -41,7 +41,7 @@ function tax_prepare_head(ChargeSociales $object)
$h = 0;
$head = array();
- $head[$h][0] = DOL_URL_ROOT.'/compta/sociales/charges.php?id='.$object->id;
+ $head[$h][0] = DOL_URL_ROOT.'/compta/sociales/card.php?id='.$object->id;
$head[$h][1] = $langs->trans('Card');
$head[$h][2] = 'card';
$h++;
diff --git a/htdocs/core/menus/init_menu_auguria.sql b/htdocs/core/menus/init_menu_auguria.sql
index 1682f8d0887e470f4f1778d329925fba77e8d168..57270236c640a9757b42ad27597c6ee7735f6d84 100644
--- a/htdocs/core/menus/init_menu_auguria.sql
+++ b/htdocs/core/menus/init_menu_auguria.sql
@@ -202,8 +202,8 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
--insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->loan->enabled && $leftmenu=="tax_loan"', __HANDLER__, 'left', 2222__+MAX_llx_menu__, 'accountancy', '', 2220__+MAX_llx_menu__, '/loan/payment/list.php?leftmenu=tax_loan', 'Payments', 2, 'companies', '$user->rights->loan->read', '', 0, 3, __ENTITY__);
insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->loan->enabled && $leftmenu=="tax_loan" && ! empty($conf->global->LOAN_SHOW_CALCULATOR)', __HANDLER__, 'left', 2223__+MAX_llx_menu__, 'accountancy', '', 2220__+MAX_llx_menu__, '/loan/calc.php?leftmenu=tax_loan', 'Calculator', 2, 'companies', '$user->rights->loan->calc', '', 0, 4, __ENTITY__);
insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->tax->enabled', __HANDLER__, 'left', 2250__+MAX_llx_menu__, 'accountancy', 'tax_social', 2200__+MAX_llx_menu__, '/compta/sociales/index.php?leftmenu=tax_social', 'SocialContributions', 1, '', '$user->rights->tax->charges->lire', '', 0, 1, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->tax->enabled && $leftmenu=="tax_social"', __HANDLER__, 'left', 2251__+MAX_llx_menu__, 'accountancy', '', 2250__+MAX_llx_menu__, '/compta/sociales/charges.php?leftmenu=tax_social&action=create', 'MenuNewSocialContribution', 2, '', '$user->rights->tax->charges->creer', '', 0, 2, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->tax->enabled && $leftmenu=="tax_social"', __HANDLER__, 'left', 2252__+MAX_llx_menu__, 'accountancy', '', 2250__+MAX_llx_menu__, '/compta/charges/index.php?leftmenu=tax_social&mainmenu=accountancy&mode=sconly', 'Payments', 2, '', '$user->rights->tax->charges->lire', '', 0, 3, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->tax->enabled && $leftmenu=="tax_social"', __HANDLER__, 'left', 2251__+MAX_llx_menu__, 'accountancy', '', 2250__+MAX_llx_menu__, '/compta/sociales/card.php?leftmenu=tax_social&action=create', 'MenuNewSocialContribution', 2, '', '$user->rights->tax->charges->creer', '', 0, 2, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->tax->enabled && $leftmenu=="tax_social"', __HANDLER__, 'left', 2252__+MAX_llx_menu__, 'accountancy', '', 2250__+MAX_llx_menu__, '/compta/sociales/payments.php?leftmenu=tax_social&mainmenu=accountancy&mode=sconly', 'Payments', 2, '', '$user->rights->tax->charges->lire', '', 0, 3, __ENTITY__);
insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS)', __HANDLER__, 'left', 2300__+MAX_llx_menu__, 'accountancy', 'tax_vat', 2200__+MAX_llx_menu__, '/compta/tva/index.php?leftmenu=tax_vat&mainmenu=accountancy', 'VAT', 1, 'companies', '$user->rights->tax->charges->lire', '', 0, 7, __ENTITY__);
insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $leftmenu=="tax_vat"', __HANDLER__, 'left', 2301__+MAX_llx_menu__, 'accountancy', '', 2300__+MAX_llx_menu__, '/compta/tva/card.php?leftmenu=tax_vat&action=create', 'New', 2, 'companies', '$user->rights->tax->charges->creer', '', 0, 0, __ENTITY__);
insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $leftmenu=="tax_vat"', __HANDLER__, 'left', 2302__+MAX_llx_menu__, 'accountancy', '', 2300__+MAX_llx_menu__, '/compta/tva/reglement.php?leftmenu=tax_vat', 'List', 2, 'companies', '$user->rights->tax->charges->lire', '', 0, 1, __ENTITY__);
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 68917a8ba8905ec678b29a759a0e2d678564c7bc..7b2b131a59e35b9c192266c60558648d62f82b9c 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -876,9 +876,9 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
if (! empty($conf->tax->enabled))
{
$newmenu->add("/compta/sociales/index.php?leftmenu=tax_social",$langs->trans("MenuSocialContributions"),1,$user->rights->tax->charges->lire);
- if (empty($leftmenu) || preg_match('/^tax_social/i',$leftmenu)) $newmenu->add("/compta/sociales/charges.php?leftmenu=tax_social&action=create",$langs->trans("MenuNewSocialContribution"), 2, $user->rights->tax->charges->creer);
+ if (empty($leftmenu) || preg_match('/^tax_social/i',$leftmenu)) $newmenu->add("/compta/sociales/card.php?leftmenu=tax_social&action=create",$langs->trans("MenuNewSocialContribution"), 2, $user->rights->tax->charges->creer);
if (empty($leftmenu) || preg_match('/^tax_social/i',$leftmenu)) $newmenu->add("/compta/sociales/index.php?leftmenu=tax_social",$langs->trans("List"),2,$user->rights->tax->charges->lire);
- if (empty($leftmenu) || preg_match('/^tax_social/i',$leftmenu)) $newmenu->add("/compta/charges/index.php?leftmenu=tax_social&mainmenu=accountancy&mode=sconly",$langs->trans("Payments"), 2, $user->rights->tax->charges->lire);
+ if (empty($leftmenu) || preg_match('/^tax_social/i',$leftmenu)) $newmenu->add("/compta/sociales/payments.php?leftmenu=tax_social&mainmenu=accountancy&mode=sconly",$langs->trans("Payments"), 2, $user->rights->tax->charges->lire);
// VAT
if (empty($conf->global->TAX_DISABLE_VAT_MENUS))
{
diff --git a/htdocs/langs/en_US/compta.lang b/htdocs/langs/en_US/compta.lang
index 13433dcac3ff6096351c95039ca5647dcac5447e..3a7cd41386f47802e3dfc5834d5da1bbc8bed657 100644
--- a/htdocs/langs/en_US/compta.lang
+++ b/htdocs/langs/en_US/compta.lang
@@ -49,6 +49,8 @@ SocialContribution=Social or fiscal tax
SocialContributions=Social or fiscal taxes
SocialContributionsDeductibles=Deductible social or fiscal taxes
SocialContributionsNondeductibles=Nondeductible social or fiscal taxes
+LabelContrib=Label contribution
+TypeContrib=Type contribution
MenuSpecialExpenses=Special expenses
MenuTaxAndDividends=Taxes and dividends
MenuSocialContributions=Social/fiscal taxes
diff --git a/scripts/bank/export-bank-receipts.php b/scripts/bank/export-bank-receipts.php
index 98ec3dd84cd26ae3ef8e16084fcc0da9c254f0fb..4ec31ea37895f0b49c7adaad7162c8d7ee8c32c4 100755
--- a/scripts/bank/export-bank-receipts.php
+++ b/scripts/bank/export-bank-receipts.php
@@ -366,7 +366,7 @@ if ($resql)
/*elseif ($links[$key]['type']=='sc')
{
if ($accountelem) $accountelem.= ', ';
- //$accountelem.= '<a href="'.DOL_URL_ROOT.'/compta/sociales/charges.php?id='.$links[$key]['url_id'].'">';
+ //$accountelem.= '<a href="'.DOL_URL_ROOT.'/compta/sociales/card.php?id='.$links[$key]['url_id'].'">';
//$accountelem.= img_object($langs->transnoentitiesnoconv('ShowBill'),'bill').' ';
$accountelem.= $langs->transnoentitiesnoconv("SocialContribution");
//$accountelem.= '</a>';