Fix: Formulaire ajout charges n'tait plus visible
This commit is contained in:
Laurent Destailleur
parent
e33b47a3c6
commit
f5f1c44ab2
@ -53,8 +53,8 @@ $chid=isset($_GET["id"])?$_GET["id"]:$_POST["id"];
|
|||||||
/* *************************************************************************** */
|
/* *************************************************************************** */
|
||||||
if ($_GET["action"] == 'payed')
|
if ($_GET["action"] == 'payed')
|
||||||
{
|
{
|
||||||
$cha = new ChargeSociales($db);
|
$cha = new ChargeSociales($db);
|
||||||
$result = $cha->set_payed($chid);
|
$result = $cha->set_payed($chid);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -65,153 +65,154 @@ if ($_GET["action"] == 'payed')
|
|||||||
/* */
|
/* */
|
||||||
/* *************************************************************************** */
|
/* *************************************************************************** */
|
||||||
if ($chid > 0)
|
if ($chid > 0)
|
||||||
{
|
{
|
||||||
$html = new Form($db);
|
$html = new Form($db);
|
||||||
|
|
||||||
$cha = new ChargeSociales($db);
|
$cha = new ChargeSociales($db);
|
||||||
|
|
||||||
if ( $cha->fetch($chid) > 0)
|
if ($cha->fetch($chid) > 0)
|
||||||
{
|
{
|
||||||
/*
|
/*
|
||||||
* Charge
|
* Charge
|
||||||
*/
|
*/
|
||||||
|
|
||||||
//$head[0][0] = DOL_URL_ROOT.'/comm/propal.php?propalid='.$propal->id;
|
//$head[0][0] = DOL_URL_ROOT.'/comm/propal.php?propalid='.$propal->id;
|
||||||
$head[0][1] = $langs->trans("SocialContribution").": $cha->id";
|
$head[0][1] = $langs->trans("SocialContribution").": $cha->id";
|
||||||
$h = 1;
|
$h = 1;
|
||||||
$a = 0;
|
$a = 0;
|
||||||
|
|
||||||
dolibarr_fiche_head($head, $a);
|
dolibarr_fiche_head($head, $a);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Confirmation de la suppression de la charge
|
* Confirmation de la suppression de la charge
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
if ($_GET["action"] == 'delete')
|
if ($_GET["action"] == 'delete')
|
||||||
{
|
{
|
||||||
$html->form_confirm("index.php?id=$cha->id&action=del","Supprimer la charge sociale","Etes-vous sûr de vouloir supprimer cette charge sociale ?","confirm_delete");
|
$html->form_confirm("index.php?id=$cha->id&action=del","Supprimer la charge sociale","Etes-vous sûr de vouloir supprimer cette charge sociale ?","confirm_delete");
|
||||||
}
|
}
|
||||||
|
|
||||||
print "<form action=\"charges.php?id=$cha->id&action=update\" method=\"post\">";
|
print "<form action=\"charges.php?id=$cha->id&action=update\" method=\"post\">";
|
||||||
|
|
||||||
print '<table class="border" width="100%">';
|
print '<table class="border" width="100%">';
|
||||||
|
|
||||||
print "<tr><td>".$langs->trans("Type")."</td><td>$cha->type_libelle</td><td>".$langs->trans("Payments")."</td></tr>";
|
print "<tr><td>".$langs->trans("Type")."</td><td>$cha->type_libelle</td><td>".$langs->trans("Payments")."</td></tr>";
|
||||||
|
|
||||||
print "<tr><td>".$langs->trans("Period")."</td><td>".dolibarr_print_date($cha->periode,"%Y")."</td>";
|
print "<tr><td>".$langs->trans("Period")."</td><td>".dolibarr_print_date($cha->periode,"%Y")."</td>";
|
||||||
print '<td rowspan="5" valign="top">';
|
print '<td rowspan="5" valign="top">';
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Paiements
|
* Paiements
|
||||||
*/
|
*/
|
||||||
$sql = "SELECT ".$db->pdate("datep")." as dp, p.amount,";
|
$sql = "SELECT ".$db->pdate("datep")." as dp, p.amount,";
|
||||||
$sql .= "c.libelle as paiement_type, p.num_paiement, p.rowid";
|
$sql .= "c.libelle as paiement_type, p.num_paiement, p.rowid";
|
||||||
$sql .= " FROM ".MAIN_DB_PREFIX."paiementcharge as p, ".MAIN_DB_PREFIX."c_paiement as c ";
|
$sql .= " FROM ".MAIN_DB_PREFIX."paiementcharge as p, ".MAIN_DB_PREFIX."c_paiement as c ";
|
||||||
$sql .= " WHERE p.fk_charge = ".$chid." AND p.fk_typepaiement = c.id";
|
$sql .= " WHERE p.fk_charge = ".$chid." AND p.fk_typepaiement = c.id";
|
||||||
$sql .= " ORDER BY dp DESC";
|
$sql .= " ORDER BY dp DESC";
|
||||||
|
|
||||||
$result = $db->query($sql);
|
$result = $db->query($sql);
|
||||||
if ($result)
|
if ($result)
|
||||||
{
|
{
|
||||||
$num = $db->num_rows($result);
|
$num = $db->num_rows($result);
|
||||||
$i = 0; $total = 0;
|
$i = 0; $total = 0;
|
||||||
echo '<table class="noborder" width="100%">';
|
echo '<table class="noborder" width="100%">';
|
||||||
print '<tr class="liste_titre">';
|
print '<tr class="liste_titre">';
|
||||||
print '<td>'.$langs->trans("Date").'</td><td>'.$langs->trans("Type").'</td>';
|
print '<td>'.$langs->trans("Date").'</td><td>'.$langs->trans("Type").'</td>';
|
||||||
print '<td align="right">'.$langs->trans("Amount").'</td><td> </td></tr>';
|
print '<td align="right">'.$langs->trans("Amount").'</td><td> </td></tr>';
|
||||||
|
|
||||||
$var=True;
|
$var=True;
|
||||||
while ($i < $num)
|
while ($i < $num)
|
||||||
{
|
{
|
||||||
$objp = $db->fetch_object($result);
|
$objp = $db->fetch_object($result);
|
||||||
$var=!$var;
|
$var=!$var;
|
||||||
print "<tr $bc[$var]><td>";
|
print "<tr $bc[$var]><td>";
|
||||||
print img_object($langs->trans("Payment"),"payment").' ';
|
print img_object($langs->trans("Payment"),"payment").' ';
|
||||||
print dolibarr_print_date($objp->dp)."</td>\n";
|
print dolibarr_print_date($objp->dp)."</td>\n";
|
||||||
print "<td>$objp->paiement_type $objp->num_paiement</td>\n";
|
print "<td>$objp->paiement_type $objp->num_paiement</td>\n";
|
||||||
print '<td align="right">'.price($objp->amount)."</td><td>".$langs->trans("Currency".$conf->monnaie)."</td>\n";
|
print '<td align="right">'.price($objp->amount)."</td><td>".$langs->trans("Currency".$conf->monnaie)."</td>\n";
|
||||||
print "</tr>";
|
print "</tr>";
|
||||||
$totalpaye += $objp->amount;
|
$totalpaye += $objp->amount;
|
||||||
$i++;
|
$i++;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($fac->paye == 0)
|
if ($fac->paye == 0)
|
||||||
{
|
{
|
||||||
print "<tr><td colspan=\"2\" align=\"right\">Total payé:</td><td align=\"right\"><b>".price($totalpaye)."</b></td><td>".$langs->trans("Currency".$conf->monnaie)."</td></tr>\n";
|
print "<tr><td colspan=\"2\" align=\"right\">Total payé:</td><td align=\"right\"><b>".price($totalpaye)."</b></td><td>".$langs->trans("Currency".$conf->monnaie)."</td></tr>\n";
|
||||||
print "<tr><td colspan=\"2\" align=\"right\">Réclamé :</td><td align=\"right\" bgcolor=\"#d0d0d0\">".price($cha->amount)."</td><td bgcolor=\"#d0d0d0\">".$langs->trans("Currency".$conf->monnaie)."</td></tr>\n";
|
print "<tr><td colspan=\"2\" align=\"right\">Réclamé :</td><td align=\"right\" bgcolor=\"#d0d0d0\">".price($cha->amount)."</td><td bgcolor=\"#d0d0d0\">".$langs->trans("Currency".$conf->monnaie)."</td></tr>\n";
|
||||||
|
|
||||||
$resteapayer = $cha->amount - $totalpaye;
|
$resteapayer = $cha->amount - $totalpaye;
|
||||||
|
|
||||||
print "<tr><td colspan=\"2\" align=\"right\">".$langs->trans("RemainderToPay")." :</td>";
|
print "<tr><td colspan=\"2\" align=\"right\">".$langs->trans("RemainderToPay")." :</td>";
|
||||||
print "<td align=\"right\" bgcolor=\"#f0f0f0\"><b>".price($resteapayer)."</b></td><td bgcolor=\"#f0f0f0\">".$langs->trans("Currency".$conf->monnaie)."</td></tr>\n";
|
print "<td align=\"right\" bgcolor=\"#f0f0f0\"><b>".price($resteapayer)."</b></td><td bgcolor=\"#f0f0f0\">".$langs->trans("Currency".$conf->monnaie)."</td></tr>\n";
|
||||||
}
|
}
|
||||||
print "</table>";
|
print "</table>";
|
||||||
$db->free();
|
$db->free();
|
||||||
} else {
|
}
|
||||||
dolibarr_print_error($db);
|
else
|
||||||
}
|
{
|
||||||
print "</td>";
|
dolibarr_print_error($db);
|
||||||
|
}
|
||||||
|
print "</td>";
|
||||||
|
|
||||||
print "</tr>";
|
print "</tr>";
|
||||||
|
|
||||||
if ($cha->paye==0) {
|
if ($cha->paye==0) {
|
||||||
print '<tr><td>'.$langs->trans("Label").'</td><td><input type="text" name="desc" size="40" value="'.stripslashes($cha->lib).'"></td></tr>';
|
print '<tr><td>'.$langs->trans("Label").'</td><td><input type="text" name="desc" size="40" value="'.stripslashes($cha->lib).'"></td></tr>';
|
||||||
print '<tr><td>'.$langs->trans("DateDue")."</td><td><input type=\"text\" name=\"amount\" value=\"".strftime("%Y%m%d",$cha->date_ech)."\"></td></tr>";
|
print '<tr><td>'.$langs->trans("DateDue")."</td><td><input type=\"text\" name=\"amount\" value=\"".strftime("%Y%m%d",$cha->date_ech)."\"></td></tr>";
|
||||||
print '<tr><td>'.$langs->trans("AmountTTC")."</td><td><b><input type=\"text\" name=\"amount\" value=\"$cha->amount\"></b></td></tr>";
|
print '<tr><td>'.$langs->trans("AmountTTC")."</td><td><b><input type=\"text\" name=\"amount\" value=\"$cha->amount\"></b></td></tr>";
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
print '<tr><td>'.$langs->trans("Label").'</td><td>'.$cha->lib.'</td></tr>';
|
print '<tr><td>'.$langs->trans("Label").'</td><td>'.$cha->lib.'</td></tr>';
|
||||||
print "<tr><td>".$langs->trans("DateDue")."</td><td>".dolibarr_print_date($cha->date_ech)."</td></tr>";
|
print "<tr><td>".$langs->trans("DateDue")."</td><td>".dolibarr_print_date($cha->date_ech)."</td></tr>";
|
||||||
print '<tr><td>'.$langs->trans("AmountTTC").'</td><td><b>'.price($cha->amount).'</b></td></tr>';
|
print '<tr><td>'.$langs->trans("AmountTTC").'</td><td><b>'.price($cha->amount).'</b></td></tr>';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
print '<tr><td>'.$langs->trans("Status").'</td><td>'.$cha->getLibStatut().'</td></tr>';
|
print '<tr><td>'.$langs->trans("Status").'</td><td>'.$cha->getLibStatut().'</td></tr>';
|
||||||
print '</table>';
|
print '</table>';
|
||||||
|
|
||||||
|
|
||||||
print "</form>\n";
|
print "</form>\n";
|
||||||
|
|
||||||
print '</div>';
|
print '</div>';
|
||||||
|
|
||||||
if (! $_GET["action"]) {
|
if (! $_GET["action"])
|
||||||
|
{
|
||||||
|
/*
|
||||||
|
* Boutons actions
|
||||||
|
*/
|
||||||
|
|
||||||
/*
|
print "<div class=\"tabsAction\">\n";
|
||||||
* Boutons actions
|
|
||||||
*/
|
|
||||||
|
|
||||||
print "<div class=\"tabsAction\">\n";
|
// Supprimer
|
||||||
|
if ($cha->paye == 0 && $totalpaye <=0 && $user->rights->tax->charges->supprimer)
|
||||||
|
{
|
||||||
|
print "<a class=\"butDelete\" href=\"charges.php?id=$cha->id&action=delete\">".$langs->trans("Delete")."</a>";
|
||||||
|
}
|
||||||
|
|
||||||
// Supprimer
|
// Emettre paiement
|
||||||
if ($cha->paye == 0 && $totalpaye <=0 && $user->rights->compta->charges)
|
if ($cha->paye == 0 && round($resteapayer) > 0 && $user->rights->tax->charges->creer)
|
||||||
{
|
{
|
||||||
print "<a class=\"butDelete\" href=\"charges.php?id=$cha->id&action=delete\">".$langs->trans("Delete")."</a>";
|
print "<a class=\"tabAction\" href=\"../paiement_charge.php?id=$cha->id&action=create\">".$langs->trans("DoPaiement")."</a>";
|
||||||
}
|
}
|
||||||
|
|
||||||
// Emettre paiement
|
// Classer 'payé'
|
||||||
if ($cha->paye == 0 && round($resteapayer) > 0 && $user->rights->compta->charges)
|
if ($cha->paye == 0 && round($resteapayer) <=0 && $user->rights->tax->charges->creer)
|
||||||
{
|
{
|
||||||
print "<a class=\"tabAction\" href=\"../paiement_charge.php?id=$cha->id&action=create\">".$langs->trans("DoPaiement")."</a>";
|
print "<a class=\"tabAction\" href=\"charges.php?id=$cha->id&action=payed\">".$langs->trans("ClassifyPayed")."</a>";
|
||||||
}
|
}
|
||||||
|
|
||||||
// Classer 'payé'
|
print "</div>";
|
||||||
if ($cha->paye == 0 && round($resteapayer) <=0 && $user->rights->compta->charges)
|
}
|
||||||
{
|
}
|
||||||
print "<a class=\"tabAction\" href=\"charges.php?id=$cha->id&action=payed\">".$langs->trans("ClassifyPayed")."</a>";
|
else
|
||||||
}
|
{
|
||||||
|
/* Charge non trouvée */
|
||||||
print "</div>";
|
print "Charge inexistante ou accés refusé";
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
/* Charge non trouvée */
|
|
||||||
print "Charge inexistante ou accés refusé";
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$db->close();
|
$db->close();
|
||||||
|
|
||||||
llxFooter("<em>Dernière modification $Date$ révision $Revision$</em>");
|
llxFooter('$Date$ - $Revision$');
|
||||||
?>
|
?>
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user