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

Fix: Date paiement non saisi par defaut pour eviter erreur saisie

Browse Source
This commit is contained in:
Laurent Destailleur 2008-07-12 10:16:48 +00:00
parent d77b926d53
commit 987ede7c10
2 changed files with 34 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
htdocs/chargesociales.class.php
View File

@ -363,10 +363,13 @@ class PaiementCharge
if ($total > 0)
{
$sql = "INSERT INTO ".MAIN_DB_PREFIX."paiementcharge (fk_charge, datec, datep, amount, fk_typepaiement, num_paiement, note, fk_user_creat)";
$sql = "INSERT INTO ".MAIN_DB_PREFIX."paiementcharge (fk_charge, datec, datep, amount,";
$sql.= " fk_typepaiement, num_paiement, note, fk_user_creat, fk_bank)";
$sql.= " VALUES ($this->chid, now(), ";
$sql.= $this->db->idate($this->datepaye).", ";
$sql.= price2num($total).", $this->paiementtype, '$this->num_paiement', '".addslashes($this->note)."', $user->id)";
$sql.= price2num($total);
$sql.= ", ".$this->paiementtype.", '".$this->num_paiement."', '".addslashes($this->note)."', ".$user->id.",";
$sql.= "0)";
dolibarr_syslog("PaiementCharge::create sql=".$sql);
$resql=$this->db->query($sql);
@ -389,7 +392,7 @@ class PaiementCharge
else
{
$this->error=$this->db->error();
dolibarr_syslog("PaiementCharges::create ".$this->error);
dolibarr_syslog("PaiementCharges::create ".$this->error, LOG_ERR);
$this->db->rollback();
return -1;
}
@ -403,6 +406,8 @@ class PaiementCharge
function update_fk_bank($id_bank)
{
$sql = "UPDATE llx_paiementcharge set fk_bank = ".$id_bank." where rowid = ".$this->id;
dolibarr_syslog("PaiementCharge::update_fk_bank sql=".$sql);
$result = $this->db->query($sql);
if ($result)
{
@ -410,8 +415,9 @@ class PaiementCharge
}
else
{
$this->error=$this->db->error()." sql=".$sql;
return 0;
$this->error=$this->db->error();
dolibarr_syslog("PaiementCharges::update_fk_bank ".$this->error, LOG_ERR);
return 0;
}
}
}

36
htdocs/compta/paiement_charge.php
View File

@ -1,5 +1,5 @@
<?php
/* Copyright (C) 2004-2007 Laurent Destailleur <eldy@users.sourceforge.net>
/* Copyright (C) 2004-2008 Laurent Destailleur <eldy@users.sourceforge.net>
*
* 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
@ -50,12 +50,25 @@ if ($_POST["action"] == 'add_paiement')
Header("Location: $loc");
exit;
}
if ($_POST["paiementtype"] > 0)
{
$datepaye = dolibarr_mktime(12, 0 , 0, $_POST["remonth"], $_POST["reday"], $_POST["reyear"]);
$datepaye = dolibarr_mktime(12, 0 , 0, $_POST["remonth"], $_POST["reday"], $_POST["reyear"]);
if (! $_POST["paiementtype"] > 0)
{
$mesg = $langs->trans("ErrorFieldRequired",$langs->transnoentities("PaymentMode"));
$error++;
}
if ($datepaye == '')
{
$mesg = $langs->trans("ErrorFieldRequired",$langs->transnoentities("Date"));
$error++;
}
if (! $error)
{
$paiement_id = 0;
// Read possible payments
$amounts = array();
foreach ($_POST as $key => $value)
{
@ -125,10 +138,7 @@ if ($_POST["action"] == 'add_paiement')
$mesg = "Echec de la création du paiement: paiement_id=$paiement_id ".$db->error();
}
}
else
{
$mesg = $langs->trans("ErrorFieldRequired",$langs->transnoentities("PaymentMode"));
}
$_GET["action"]='create';
}
@ -171,10 +181,10 @@ if ($_GET["action"] == 'create')
print '<tr><td>'.$langs->trans("Ref").'</td><td colspan="2">';
print '<a href="'.DOL_URL_ROOT.'/compta/sociales/charges.php?id='.$chid.'">'.$chid.'</a></td></tr>';
print '<tr><td>'.$langs->trans("Type")."</td><td colspan=\"2\">$charge->type_libelle</td></tr>\n";
print '<tr><td>'.$langs->trans("Period")."</td><td colspan=\"2\">$charge->periode</td></tr>\n";
print '<tr><td>'.$langs->trans("Type")."</td><td colspan=\"2\">".$charge->type_libelle."</td></tr>\n";
print '<tr><td>'.$langs->trans("Period")."</td><td colspan=\"2\">".dolibarr_print_date($charge->periode,'day')."</td></tr>\n";
print '<tr><td>'.$langs->trans("Label").'</td><td colspan="2">'.$charge->lib."</td></tr>\n";
print '<tr><td>'.$langs->trans("DateDue")."</td><td colspan=\"2\">".dolibarr_print_date($charge->date_ech)."</td></tr>\n";
print '<tr><td>'.$langs->trans("DateDue")."</td><td colspan=\"2\">".dolibarr_print_date($charge->date_ech,'day')."</td></tr>\n";
print '<tr><td>'.$langs->trans("AmountTTC")."</td><td colspan=\"2\"><b>".price($charge->amount).'</b> '.$langs->trans("Currency".$conf->monnaie).'</td></tr>';
@ -196,7 +206,7 @@ if ($_GET["action"] == 'create')
print "<input type=\"hidden\" name=\"chid\" value=\"$chid\">";
print '<tr><td>'.$langs->trans("Date").'</td><td>';
$html->select_date('','','','','',"add_paiement");
$html->select_date(-1,'','','','',"add_paiement");
print "</td>";
print '<td>'.$langs->trans("Comments").'</td></tr>';