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

Developpement de la fonction Classer Pay pour les charges

Browse Source
This commit is contained in:
Laurent Destailleur 2004-06-08 15:09:49 +00:00
parent 34c02b468a
commit fee960d8ad
2 changed files with 211 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

274
htdocs/chargesociales.class.php
View File

@ -20,102 +20,208 @@
* $Source$ * $Source$
*/ */
class PaiementCharge {
var $db;
var $id;
var $chid;
var $paiementtype;
var $datepaye;
var $amounts;
var $num_paiement;
var $note;
Function PaiementCharge($DB) {
$this->db = $DB;
return 1;
}
Function create($user) {
$sql_err = 0;
/*
* Insertion dans la base
*/
if ($this->db->begin())
{
$total = 0;
foreach ($this->amounts as $key => $value)
{
$facid = $key;
$value = trim($value);
$amount = round(ereg_replace(",",".",$value), 2);
if (is_numeric($amount))
{
$total += $amount;
}
}
if ($total > 0)
{
$sql = "INSERT INTO ".MAIN_DB_PREFIX."paiementcharge (fk_charge, datec, datep, amount, fk_typepaiement, num_paiement, note, fk_user_creat)";
$sql .= " VALUES ($this->chid, now(), $this->datepaye, $total, $this->paiementtype, '$this->num_paiement', '$this->note', $user->id)";
if ( $this->db->query($sql) )
{
$this->id = $this->db->last_insert_id();
}
else
{
$sql_err++;
print "Error: $sql : ".$this->db->error();
}
}
if ( $total > 0 && $sql_err == 0 )
{
$this->db->commit();
return $this->id;
}
else
{
$this->db->rollback();
return -1;
}
}
}
/*
* Mise a jour du lien entre le paiement de charge et la ligne dans llx_bank générée
*
*/
Function update_fk_bank($id_bank) {
$sql = "UPDATE llx_paiementcharge set fk_bank = ".$id_bank." where rowid = ".$this->id;
$result = $this->db->query($sql);
if ($result)
{
return 1;
}
else
{
print $this->db->error() ."<br>".$sql;
return 0;
}
}
}
/* /*
* La tva collectée n'est calculée que sur les factures payées. * La tva collectée n'est calculée que sur les factures payées.
* *
*/ */
class ChargeSociales { class ChargeSociales {
var $id; var $db;
var $db;
var $date_ech;
var $date_pai;
var $lib;
var $type;
var $lib_typ;
var $amount;
var $paye;
var $periode;
Function ChargeSociales($DB) var $id;
{ var $date_ech;
$this->db = $DB; var $date_pai;
var $lib;
var $type;
var $type_libelle;
var $amount;
var $paye;
var $periode;
return 1; Function ChargeSociales($DB) {
} $this->db = $DB;
/* return 1;
* }
/*
* Retrouve et charge une charge sociale
* Retour: 1 si trouve, 0 sinon
*/
Function fetch($id) {
$sql = "SELECT cs.rowid,".$this->db->pdate("cs.date_ech")." as date_ech,".$this->db->pdate("cs.date_pai")." as date_pai";
$sql .=", cs.libelle as lib, cs.fk_type, cs.amount, cs.paye, cs.periode, c.libelle";
$sql .= " FROM ".MAIN_DB_PREFIX."chargesociales as cs, ".MAIN_DB_PREFIX."c_chargesociales as c";
$sql .= " WHERE cs.fk_type = c.id";
$sql .=" AND cs.rowid = ".$id;
if ($this->db->query($sql))
{
if ($this->db->num_rows())
{
$obj = $this->db->fetch_object(0);
$this->id = $obj->rowid;
$this->date_ech = $obj->date_ech;
$this->date_pai = $obj->date_pai;
$this->lib = $obj->lib;
$this->type = $obj->fk_type;
$this->type_libelle = $obj->libelle;
$this->amount = $obj->amount;
$this->paye = $obj->paye;
$this->periode = $obj->periode;
return 1;
}
else
{
return 0;
}
$this->db->free();
}
else
{
print $this->db->error();
return 0;
}
}
Function solde($year = 0) {
$sql = "SELECT sum(f.amount) as amount";
$sql .= " FROM ".MAIN_DB_PREFIX."chargesociales as f WHERE paye = 0";
if ($year) {
$sql .= " AND f.datev >= '$y-01-01' AND f.datev <= '$y-12-31' ";
}
$result = $this->db->query($sql);
if ($result) {
if ($this->db->num_rows()) {
$obj = $this->db->fetch_object(0);
return $obj->amount;
} else {
return 0;
}
$this->db->free();
} else {
print $this->db->error();
return -1;
}
}
/**
* Tag la charge comme payée complètement
* *
*/ */
Function fetch($id) Function set_payed($rowid)
{ {
$sql = "SELECT cs.rowid,".$this->db->pdate("cs.date_ech")." as date_ech,".$this->db->pdate("cs.date_pai")." as date_pai"; $sql = "UPDATE ".MAIN_DB_PREFIX."chargesociales set paye=1 WHERE rowid = $rowid ;";
$sql .=", cs.libelle as lib, cs.fk_type, cs.amount, cs.paye, cs.periode, c.libelle"; $return = $this->db->query( $sql);
$sql .= " FROM ".MAIN_DB_PREFIX."chargesociales as cs, ".MAIN_DB_PREFIX."c_chargesociales as c";
$sql .= " WHERE cs.fk_type = c.id";
$sql .=" AND cs.rowid = ".$id;
if ($this->db->query($sql))
{
if ($this->db->num_rows())
{
$obj = $this->db->fetch_object(0);
$this->id = $obj->rowid;
$this->date_ech = $obj->date_ech;
$this->date_pai = $obj->date_pai;
$this->lib = $obj->lib;
$this->type = $obj->fk_type;
$this->type_libelle = $obj->libelle;
$this->amount = $obj->amount;
$this->paye = $obj->paye;
$this->periode = $obj->periode;
return 1;
}
else
{
return 0;
}
$this->db->free();
}
else
{
print $this->db->error();
return 0;
}
} }
Function solde($year = 0) {
$sql = "SELECT sum(f.amount) as amount"; /**
$sql .= " FROM ".MAIN_DB_PREFIX."chargesociales as f WHERE paye = 0"; * Renvoi le staut sous forme de libellé d'une charge
*
if ($year) { */
$sql .= " AND f.datev >= '$y-01-01' AND f.datev <= '$y-12-31' "; Function getLibStatut() {
if ($this->paye == 0) { return "Non Payé"; }
else { return "Payé"; }
} }
$result = $this->db->query($sql);
if ($result) {
if ($this->db->num_rows()) {
$obj = $this->db->fetch_object(0);
return $obj->amount;
} else {
return 0;
}
$this->db->free();
} else {
print $this->db->error();
return -1;
}
}
} }
/* /*
* $Id$ * $Id$
* $Source$ * $Source$
*/ */
?> ?>

28
htdocs/compta/sociales/charges.php
View File

@ -21,14 +21,12 @@
*/ */
require("./pre.inc.php"); require("./pre.inc.php");
$user->getrights('facture');
$user->getrights('compta'); $user->getrights('compta');
if (!$user->admin && !$user->rights->compta->charges) if (!$user->admin && !$user->rights->compta->charges)
accessforbidden(); accessforbidden();
require("../../chargesociales.class.php"); require("../../chargesociales.class.php");
//require("../../paiement_charge.class.php");
require("../bank/account.class.php"); require("../bank/account.class.php");
llxHeader(); llxHeader();
@ -36,6 +34,20 @@ llxHeader();
$chid=isset($_GET["id"])?$_GET["id"]:$_POST["id"]; $chid=isset($_GET["id"])?$_GET["id"]:$_POST["id"];
/* *************************************************************************** */
/* */
/* Action Classer Payé */
/* */
/* *************************************************************************** */
if ($_GET["action"] == 'payed')
{
$cha = new ChargeSociales($db);
$result = $cha->set_payed($chid);
}
/* *************************************************************************** */ /* *************************************************************************** */
/* */ /* */
/* Mode fiche */ /* Mode fiche */
@ -160,19 +172,19 @@ if ($chid > 0)
print "<div class=\"tabsAction\">\n"; print "<div class=\"tabsAction\">\n";
// Supprimer // Supprimer
if ($cha->paye == 0 && $user->rights->facture->supprimer) if ($cha->paye == 0 && $totalpaye <=0 && $user->rights->compta->charges)
{ {
print "<a class=\"tabAction\" href=\"$PHP_SELF?id=$cha->id&amp;action=delete\">Supprimer</a>"; print "<a class=\"tabAction\" href=\"$PHP_SELF?id=$cha->id&amp;action=delete\">Supprimer</a>";
} }
// Emettre paiement // Emettre paiement
if ($cha->paye == 0 && $user->rights->facture->paiement) if ($cha->paye == 0 && round($resteapayer) > 0 && $user->rights->compta->charges)
{ {
print "<a class=\"tabAction\" href=\"../paiement_charge.php?id=$cha->id&amp;action=create\">Emettre paiement</a>"; print "<a class=\"tabAction\" href=\"../paiement_charge.php?id=$cha->id&amp;action=create\">Emettre paiement</a>";
} }
// Classer 'payé' // Classer 'payé'
if ($cha->paye == 0 && $user->rights->facture->paiement) if ($cha->paye == 0 && round($resteapayer) <=0 && $user->rights->compta->charges)
{ {
print "<a class=\"tabAction\" href=\"$PHP_SELF?id=$cha->id&amp;action=payed\">Classer 'Payée'</a>"; print "<a class=\"tabAction\" href=\"$PHP_SELF?id=$cha->id&amp;action=payed\">Classer 'Payée'</a>";
} }
@ -180,12 +192,6 @@ if ($chid > 0)
print "</div>"; print "</div>";
} }
if ($_GET["action"] == 'payed')
{
print "Cette fonction n'a pas encore été implémentée";
}
} }
else else
{ {