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

Fix: Correction gestion de la 'periode' pour les charges sociales

Browse Source
This commit is contained in:
Laurent Destailleur 2004-06-11 13:33:23 +00:00
parent 591340a02e
commit b26e85a935
3 changed files with 37 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/compta/charges/index.php
View File

@ -51,7 +51,12 @@ $sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c, ".MAIN_DB_PREFIX."charge
$sql .= " WHERE s.fk_type = c.id"; $sql .= " WHERE s.fk_type = c.id";
if ($year > 0) if ($year > 0)
{ {
$sql .= " AND date_format(s.date_ech, '%Y') = $year"; $sql .= " AND (";
// Si period renseigné on l'utilise comme critere de date, sinon on prend date échéance,
// ceci afin d'etre compatible avec les cas ou la période n'etait pas obligatoire
$sql .= " (s.periode is not null and date_format(s.periode, '%Y') = $year) ";
$sql .= "or (s.periode is null and date_format(s.date_ech, '%Y') = $year)";
$sql .= ")";
} }
$sql .= " GROUP BY lower(c.libelle) ASC"; $sql .= " GROUP BY lower(c.libelle) ASC";

33
htdocs/compta/sociales/index.php
View File

@ -52,13 +52,22 @@ function valeur($sql)
if ($action == 'add') if ($action == 'add')
{ {
$sql = "INSERT INTO ".MAIN_DB_PREFIX."chargesociales (fk_type, libelle, date_ech, amount) "; if (! $_POST["date"] || ! $_POST["periode"] || ! $_POST["amount"]) {
$sql .= " VALUES (".$_POST["type"].",'".addslashes($_POST["libelle"])."','".$_POST["date"]."','".$_POST["amount"]."');"; $mesg="<div class=\"error\">Erreur: Tous les champs date et montant doivent etre renseignés avec une valeur non vide.</div>";
}
else {
$sql = "INSERT INTO ".MAIN_DB_PREFIX."chargesociales (fk_type, libelle, date_ech, periode, amount) ";
$sql .= " VALUES (".$_POST["type"].",'".addslashes($_POST["libelle"])."','".$_POST["date"]."','".$_POST["periode"]."','".$_POST["amount"]."');";
if (! $db->query($sql) ) if (! $db->query($sql) )
{ {
print $db->error(); print $db->error();
} }
else {
$mesg="<div class=\"ok\">La charge a été ajoutée.</div>";
}
}
} }
/* /*
@ -84,9 +93,12 @@ $filtre=$_GET["filtre"];
*/ */
print_titre("Charges sociales $year"); print_titre("Charges sociales $year");
print "<br>\n"; print "<br>\n";
if ($mesg) {
print "$mesg<br>";
}
//if ($filtre) { //if ($filtre) {
// print_titre("Filtre : ".$_GET["filtrelib"]); // print_titre("Filtre : ".$_GET["filtrelib"]);
// print "<br>\n"; // print "<br>\n";
@ -100,7 +112,7 @@ print '</td>';
print '<td>'; print '<td>';
print_liste_field_titre("Echéance",$PHP_SELF,"de"); print_liste_field_titre("Echéance",$PHP_SELF,"de");
print '</td><td>'; print '</td><td>';
print '&nbsp;'; print_liste_field_titre("Période",$PHP_SELF,"periode");
print '</td><td align="left">'; print '</td><td align="left">';
print_liste_field_titre("Type",$PHP_SELF,"type"); print_liste_field_titre("Type",$PHP_SELF,"type");
print '</td><td align="left">'; print '</td><td align="left">';
@ -118,7 +130,12 @@ $sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c, ".MAIN_DB_PREFIX."charge
$sql .= " WHERE s.fk_type = c.id"; $sql .= " WHERE s.fk_type = c.id";
if ($year > 0) if ($year > 0)
{ {
$sql .= " AND date_format(s.periode, '%Y') = $year"; $sql .= " AND (";
// Si period renseigné on l'utilise comme critere de date, sinon on prend date échéance,
// ceci afin d'etre compatible avec les cas ou la période n'etait pas obligatoire
$sql .= " (s.periode is not null and date_format(s.periode, '%Y') = $year) ";
$sql .= "or (s.periode is null and date_format(s.date_ech, '%Y') = $year)";
$sql .= ")";
} }
if ($filtre) { if ($filtre) {
$filtre=ereg_replace(":","=",$filtre); $filtre=ereg_replace(":","=",$filtre);
@ -184,11 +201,11 @@ else
* Forumalaire d'ajout d'une charge * Forumalaire d'ajout d'une charge
* *
*/ */
print '<tr class="form"><form method="post" action="index.php">'; print '<tr class="form" valign="top"><form method="post" action="index.php">';
print '<input type="hidden" name="action" value="add">'; print '<input type="hidden" name="action" value="add">';
print '<td>&nbsp;</td>'; print '<td>&nbsp;</td>';
print '<td><input type="text" size="8" name="date"> YYYYMMDD</td>'; print '<td><input type="text" size="8" name="date"><br>YYYYMMDD</td>';
print '<td>&nbsp;</td>'; print '<td><input type="text" size="8" name="periode"><br>YYYYMMDD</td>';
print '<td align="left"><select name="type">'; print '<td align="left"><select name="type">';

2
mysql/migration/1.1.0-1.2.0-RC1.sql
View File

@ -443,3 +443,5 @@ create table llx_cash
update llx_bank set datev=dateo where datev is null; update llx_bank set datev=dateo where datev is null;
update llx_chargesociales set periode=date_ech where periode is null or periode = '0000-00-00';