.
This commit is contained in:
Rodolphe Quiedeville
parent
87141bbdd9
commit
379e50730d
176
htdocs/charge.class.php3
Normal file
176
htdocs/charge.class.php3
Normal file
@ -0,0 +1,176 @@
|
||||
<?PHP
|
||||
/* Copyright (C) 2002 Rodolphe Quiedeville <rodolphe@quiedeville.org>
|
||||
*
|
||||
* 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 2 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, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
*
|
||||
* $Id$
|
||||
* $Source$
|
||||
*
|
||||
*/
|
||||
|
||||
class Charge {
|
||||
var $db;
|
||||
|
||||
var $id;
|
||||
var $libelle;
|
||||
var $price;
|
||||
var $tms;
|
||||
var $debut;
|
||||
var $fin;
|
||||
|
||||
var $debut_epoch;
|
||||
var $fin_epoch;
|
||||
|
||||
Function Service($DB, $id=0) {
|
||||
$this->db = $DB;
|
||||
$this->id = $id;
|
||||
|
||||
return 1;
|
||||
}
|
||||
/*
|
||||
*
|
||||
*
|
||||
*
|
||||
*/
|
||||
Function create($user) {
|
||||
|
||||
$sql = "INSERT INTO llx_charges (datec, fk_user_author) VALUES (now(), ".$user->id.")";
|
||||
|
||||
if ($this->db->query($sql) ) {
|
||||
$id = $this->db->last_insert_id();
|
||||
|
||||
if ( $this->update($id, $user) ) {
|
||||
return $id;
|
||||
}
|
||||
} else {
|
||||
print $this->db->error() . ' in ' . $sql;
|
||||
}
|
||||
}
|
||||
/*
|
||||
*
|
||||
*
|
||||
*
|
||||
*/
|
||||
Function update($id, $user) {
|
||||
|
||||
$sql = "UPDATE llx_service ";
|
||||
$sql .= " SET label = '" . trim($this->libelle) ."'";
|
||||
$sql .= ",ref = '" . trim($this->ref) ."'";
|
||||
$sql .= ",price = " . $this->price ;
|
||||
$sql .= ",description = '" . trim($this->description) ."'";
|
||||
$sql .= ",fk_user_modif = " . $user->id ;
|
||||
|
||||
$sql .= " WHERE rowid = " . $id;
|
||||
|
||||
if ( $this->db->query($sql) ) {
|
||||
return 1;
|
||||
} else {
|
||||
print $this->db->error() . ' in ' . $sql;
|
||||
}
|
||||
}
|
||||
/*
|
||||
*
|
||||
*
|
||||
*
|
||||
*/
|
||||
Function start_comm($id, $user, $datedeb=0) {
|
||||
|
||||
$sql = "UPDATE llx_service ";
|
||||
if ($datedeb) {
|
||||
$sql .= " SET debut_comm = '$datedeb'";
|
||||
} else {
|
||||
$sql .= " SET debut_comm = now()";
|
||||
}
|
||||
$sql .= ",fk_user_modif = " . $user->id ;
|
||||
|
||||
$sql .= " WHERE rowid = " . $id;
|
||||
|
||||
if ( $this->db->query($sql) ) {
|
||||
return 1;
|
||||
} else {
|
||||
print $this->db->error() . ' in ' . $sql;
|
||||
}
|
||||
}
|
||||
/*
|
||||
*
|
||||
*
|
||||
*
|
||||
*/
|
||||
Function stop_comm($id, $user, $datefin=0) {
|
||||
|
||||
$sql = "UPDATE llx_service ";
|
||||
if ($datefin) {
|
||||
$sql .= " SET fin_comm = '$datefin'";
|
||||
} else {
|
||||
$sql .= " SET fin_comm = now()";
|
||||
}
|
||||
$sql .= ",fk_user_modif = " . $user->id ;
|
||||
|
||||
$sql .= " WHERE rowid = " . $id;
|
||||
|
||||
if ( $this->db->query($sql) ) {
|
||||
return 1;
|
||||
} else {
|
||||
print $this->db->error() . ' in ' . $sql;
|
||||
}
|
||||
}
|
||||
/*
|
||||
*
|
||||
*
|
||||
*
|
||||
*/
|
||||
Function fetch($id) {
|
||||
|
||||
$sql = "SELECT s.ref,s.label,s.price,s.tms,s.debut_comm,s.fin_comm,s.description,";
|
||||
$sql .= $this->db->pdate("s.debut_comm") . ' as debut_epoch,';
|
||||
$sql .= $this->db->pdate("s.fin_comm") . ' as fin_epoch';
|
||||
$sql .= " FROM llx_service as s";
|
||||
$sql .= " WHERE s.rowid = $id";
|
||||
|
||||
$result = $this->db->query($sql);
|
||||
|
||||
if ($result) {
|
||||
if ($this->db->num_rows()) {
|
||||
$obj = $this->db->fetch_object($result , 0);
|
||||
|
||||
$this->id = $obj->rowid;
|
||||
$this->ref = $obj->ref;
|
||||
$this->libelle = $obj->label;
|
||||
$this->price = $obj->price;
|
||||
$this->description = $obj->description;
|
||||
|
||||
$this->tms = $obj->tms;
|
||||
|
||||
$this->debut = $obj->debut_comm;
|
||||
$this->fin = $obj->fin_comm;
|
||||
|
||||
$this->debut_epoch = $obj->debut_epoch;
|
||||
$this->fin_epoch = $obj->fin_epoch;
|
||||
|
||||
}
|
||||
$this->db->free();
|
||||
|
||||
} else {
|
||||
print $this->db->error();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
/*
|
||||
* $Id$
|
||||
* $Source$
|
||||
*/
|
||||
?>
|
||||
218
htdocs/compta/charges/fiche.php3
Normal file
218
htdocs/compta/charges/fiche.php3
Normal file
@ -0,0 +1,218 @@
|
||||
<?PHP
|
||||
/* Copyright (C) 2001-2002 Rodolphe Quiedeville <rodolphe@quiedeville.org>
|
||||
*
|
||||
* 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 2 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, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
*
|
||||
* $Id$
|
||||
* $Source$
|
||||
*
|
||||
*/
|
||||
|
||||
require("./pre.inc.php3");
|
||||
require("../service.class.php3");
|
||||
|
||||
llxHeader();
|
||||
|
||||
$db = new Db();
|
||||
|
||||
if ($action == 'add') {
|
||||
$service = new Service($db);
|
||||
|
||||
$service->ref = $ref;
|
||||
$service->libelle = $label;
|
||||
$service->price = $price;
|
||||
$service->description = $desc;
|
||||
|
||||
$id = $service->create($user);
|
||||
|
||||
if ($comm_now && $id) {
|
||||
$service->start_comm($id, $user);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
if ($action == 'set_datedeb') {
|
||||
$service = new Service($db);
|
||||
$service->start_comm($id, $user->id, $datedeb);
|
||||
}
|
||||
if ($action == 'set_datefin') {
|
||||
$service = new Service($db);
|
||||
$service->stop_comm($id, $user->id, $datefin);
|
||||
}
|
||||
|
||||
if ($action == 'update') {
|
||||
$service = new Service($db);
|
||||
|
||||
$service->ref = $ref;
|
||||
$service->libelle = $label;
|
||||
$service->price = $price;
|
||||
$service->description = $desc;
|
||||
|
||||
$service->update($id, $user);
|
||||
}
|
||||
|
||||
|
||||
if ($action == 'create') {
|
||||
|
||||
print_titre("Nouveau service");
|
||||
print '<form action="'.$PHP_SELF.'" method="post">';
|
||||
print '<input type="hidden" name="action" value="add">';
|
||||
print '<table border="1" cellpadding="3" cellspacing="0">';
|
||||
|
||||
print '<tr><td valign="top">Référence</td>';
|
||||
print '<td><input size="12" type="text" name="ref"></td></tr>';
|
||||
|
||||
print '<tr><td valign="top">Libelle</td>';
|
||||
print '<td><input size="30" type="text" name="label"></td></tr>';
|
||||
|
||||
print '<tr><td valign="top">Prix</td>';
|
||||
print '<td><input size="8" type="text" name="price"></td></tr>';
|
||||
|
||||
print '<tr><td valign="top">Description</td><td>';
|
||||
print "<textarea name=\"desc\" rows=\"12\" cols=\"40\">";
|
||||
print "</textarea></td></tr>";
|
||||
|
||||
print '<tr><td valign="top">Commercialisé</td>';
|
||||
print '<td><select name="comm_now">';
|
||||
print '<option value="1">oui';
|
||||
print '<option value="0">non';
|
||||
print '</td></tr>';
|
||||
|
||||
print '<tr><td align="center" colspan="2"><input type="submit"></td></tr>';
|
||||
print '</form>';
|
||||
print '</table>';
|
||||
|
||||
} else {
|
||||
|
||||
if ($id) {
|
||||
|
||||
$service = new Service($db);
|
||||
$service->fetch($id);
|
||||
|
||||
print '<div class="titre">Fiche service</div><br>';
|
||||
|
||||
print '<table width="100%" border="1" cellpadding="3" cellspacing="0">';
|
||||
|
||||
print '<tr><td valign="top">Référence</td>';
|
||||
print '<td bgcolor="#e0e0e0">'.$service->ref.'</td>';
|
||||
print '<td valign="top">Créé le</td>';
|
||||
print '<td>'.$service->tms.'</td></tr>';
|
||||
|
||||
print '<tr><td valign="top">Libelle</td>';
|
||||
print '<td bgcolor="#e0e0e0">'.$service->libelle.'</td>';
|
||||
print '<td valign="top">Début comm</td>';
|
||||
print '<td>'.$service->debut.'</td></tr>';
|
||||
|
||||
print '<tr><td valign="top">Prix</td>';
|
||||
print '<td>'.price($service->price).'</td>';
|
||||
|
||||
print '<td valign="top">Fin comm</td>';
|
||||
|
||||
if ($service->fin_epoch < time()) {
|
||||
print '<td bgcolor="#99ffff"><b>'.$service->fin.' </b></td></tr>';
|
||||
} else {
|
||||
print '<td>'.$service->fin.' </td></tr>';
|
||||
}
|
||||
|
||||
print '<tr><td valign="top">Description</td><td colspan="3">';
|
||||
print nl2br($service->description);
|
||||
print '</table>';
|
||||
|
||||
|
||||
print '<br><table width="100%" border="1" cellspacing="0" cellpadding="3">';
|
||||
|
||||
print '<td width="20%" align="center">-</td>';
|
||||
|
||||
print '<td width="20%" align="center">[<a href="fiche.php3?action=edit&id='.$id.'">Editer</a>]</td>';
|
||||
|
||||
print '<td width="20%" align="center">[<a href="fiche.php3?action=datedeb&id='.$id.'">Date de debut</a>]</td>';
|
||||
print '<td width="20%" align="center">[<a href="fiche.php3?action=datefin&id='.$id.'">Date de fin</a>]</td>';
|
||||
print '<td width="20%" align="center">-</td>';
|
||||
|
||||
print '</table><br>';
|
||||
|
||||
|
||||
/*
|
||||
*
|
||||
*
|
||||
*
|
||||
*/
|
||||
if ($action == 'datedeb') {
|
||||
print '<p><b>Affectation de la date de début de commercialisation</b></p>';
|
||||
print '<form action="'.$PHP_SELF.'?id='.$id.'" method="post">';
|
||||
print '<input type="hidden" name="action" value="set_datedeb">';
|
||||
print '<table width="100%" border="1" cellpadding="3" cellspacing="0">';
|
||||
print '<tr><td>Date de debut de commercialisation</td>';
|
||||
print '<td><input size="10" type="text" name="datedeb" value="'.strftime("%Y-%m-%d", time()).'"></td>';
|
||||
print '<td><input type="submit"></td></tr>';
|
||||
print '</table></form><br>';
|
||||
}
|
||||
/*
|
||||
*
|
||||
*
|
||||
*
|
||||
*/
|
||||
if ($action == 'datefin') {
|
||||
print '<p><b>Affectation de la date de fin de commercialisation</b></p>';
|
||||
print '<form action="'.$PHP_SELF.'?id='.$id.'" method="post">';
|
||||
print '<input type="hidden" name="action" value="set_datefin">';
|
||||
print '<table width="100%" border="1" cellpadding="3" cellspacing="0">';
|
||||
print '<tr><td>Date de fin de commercialisation</td>';
|
||||
print '<td><input size="10" type="text" name="datefin" value="'.strftime("%Y-%m-%d", time()).'"></td>';
|
||||
print '<td><input type="submit"></td></tr>';
|
||||
print '</table></form><br>';
|
||||
}
|
||||
/*
|
||||
*
|
||||
* Mode edition
|
||||
*
|
||||
*/
|
||||
|
||||
if ($action == 'edit') {
|
||||
print '<hr><div class="titre">Editer la fiche service</div><br>';
|
||||
print '<form action="'.$PHP_SELF.'?id='.$id.'" method="post">';
|
||||
print '<input type="hidden" name="action" value="update">';
|
||||
print '<table border="1" cellpadding="3" cellspacing="0">';
|
||||
|
||||
print '<tr><td valign="top">Référence</td>';
|
||||
print '<td><input size="12" type="text" name="ref" value="'.$service->ref.'"></td></tr>';
|
||||
|
||||
print '<tr><td valign="top">Libelle</td>';
|
||||
print '<td><input size="30" type="text" name="label" value="'.$service->libelle.'"></td></tr>';
|
||||
|
||||
print '<tr><td valign="top">Prix</td>';
|
||||
print '<td><input size="8" type="text" name="price" value="'.$service->price.'"></td></tr>';
|
||||
|
||||
print '<tr><td valign="top">Description</td><td>';
|
||||
print "<textarea name=\"desc\" rows=\"12\" cols=\"40\">";
|
||||
print $service->description;
|
||||
print "</textarea></td></tr>";
|
||||
|
||||
print '<tr><td align="center" colspan="2"><input type="submit"></td></tr>';
|
||||
print '</form>';
|
||||
print '</table>';
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
$db->close();
|
||||
|
||||
llxFooter("<em>Dernière modification $Date$ révision $Revision$</em>");
|
||||
?>
|
||||
@ -65,7 +65,7 @@ if ($result) {
|
||||
$var=!$var;
|
||||
|
||||
print "<TR $bc[$var]><td> </td>";
|
||||
print "<td>Facture <a href=\"/compta/facture.php3?facid=$objp->facid\">$objp->facnumber</a> $objp->nom</TD>\n";
|
||||
print "<td>Factures <a href=\"/compta/facture.php3?facid=$objp->facid\">$objp->facnumber</a> $objp->nom</TD>\n";
|
||||
|
||||
print "<TD align=\"right\">".price($objp->amount)."</TD>\n";
|
||||
|
||||
@ -82,6 +82,8 @@ if ($result) {
|
||||
}
|
||||
print '<tr><td colspan="3" align="right">'.price($total).'</td></tr>';
|
||||
/*
|
||||
* Frais, factures fournisseurs.
|
||||
*
|
||||
*
|
||||
*/
|
||||
$sql = "SELECT s.nom,sum(f.amount) as amount";
|
||||
@ -92,11 +94,10 @@ if ($year > 0) {
|
||||
$sql .= " GROUP BY s.nom ASC";
|
||||
|
||||
print '<tr><td colspan="4">Frais</td></tr>';
|
||||
|
||||
$subtotal = 0;
|
||||
$result = $db->query($sql);
|
||||
if ($result) {
|
||||
$num = $db->num_rows();
|
||||
|
||||
$i = 0;
|
||||
|
||||
if ($num > 0) {
|
||||
@ -106,11 +107,12 @@ if ($result) {
|
||||
$var=!$var;
|
||||
|
||||
print "<TR $bc[$var]><td> </td>";
|
||||
print "<td>Facture <a href=\"/compta/facture.php3?facid=$objp->facid\">$objp->facnumber</a> $objp->nom</TD>\n";
|
||||
print "<td>Factures <a href=\"/compta/facture.php3?facid=$objp->facid\">$objp->facnumber</a> $objp->nom</TD>\n";
|
||||
|
||||
print "<TD align=\"right\">".price($objp->amount)."</TD>\n";
|
||||
|
||||
$total = $total - $objp->amount;
|
||||
$subtotal = $subtotal + $objp->amount;
|
||||
print "<TD align=\"right\">".price($total)."</TD>\n";
|
||||
|
||||
print "</TR>\n";
|
||||
@ -121,7 +123,7 @@ if ($result) {
|
||||
} else {
|
||||
print $db->error();
|
||||
}
|
||||
print '<tr><td colspan="3" align="right">'.price($total).'</td></tr>';
|
||||
print '<tr><td colspan="3" align="right">'.price($subtotal).'</td></tr>';
|
||||
|
||||
/*
|
||||
* Charges sociales
|
||||
|
||||
@ -101,7 +101,7 @@ $db = new Db();
|
||||
|
||||
$tva = new Tva($db);
|
||||
|
||||
print "Solde :" . price($tva->solde());
|
||||
print "Solde :" . price($tva->solde($year));
|
||||
|
||||
if ($year == 0 ) {
|
||||
$year_current = strftime("%Y",time());
|
||||
@ -127,7 +127,8 @@ for ($y = $year_current ; $y >= $year_start ; $y=$y-1 ) {
|
||||
print "<td> </td>\n";
|
||||
print "</TR>\n";
|
||||
$var=True;
|
||||
$total = 0;
|
||||
$total = 0; $subtotal = 0;
|
||||
$i=0;
|
||||
for ($m = 1 ; $m < 13 ; $m++ ) {
|
||||
$var=!$var;
|
||||
print "<TR $bc[$var]>";
|
||||
@ -141,11 +142,17 @@ for ($y = $year_current ; $y >= $year_start ; $y=$y-1 ) {
|
||||
|
||||
$diff = $x_coll - $x_paye;
|
||||
$total = $total + $diff;
|
||||
$subtotal = $subtotal + $diff;
|
||||
|
||||
print "<td align=\"right\">".price($diff)."</td>\n";
|
||||
print "</TR>\n";
|
||||
|
||||
$i++;
|
||||
if ($i > 2) {
|
||||
print '<tr><td align="right" colspan="3">Sous total :</td><td align="right">'.price($subtotal).'</td>';
|
||||
$i = 0;
|
||||
$subtotal = 0;
|
||||
}
|
||||
}
|
||||
print '<tr><td align="right" colspan="3">Total :</td><td align="right"><b>'.price($total).'</b></td>';
|
||||
print "</TABLE>";
|
||||
|
||||
@ -1,8 +1,5 @@
|
||||
<?PHP
|
||||
/* Copyright (C) 2001-2002 Rodolphe Quiedeville <rodolphe@quiedeville.org>
|
||||
*
|
||||
* $Id$
|
||||
* $Source$
|
||||
*
|
||||
* 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
|
||||
@ -18,18 +15,42 @@
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
*
|
||||
* $Id$
|
||||
* $Source$
|
||||
*
|
||||
*/
|
||||
require("./pre.inc.php3");
|
||||
|
||||
llxHeader();
|
||||
|
||||
print 'Utilisateur : ' . $user->prenom . ' ' . $user->nom .' ['.$user->code.']';
|
||||
|
||||
?>
|
||||
<p>
|
||||
On verra plus tard ce que l'on pourra mettre sur cette belle page ;-)
|
||||
<?PHP
|
||||
<h3>Dolibarr</h3>
|
||||
<?PHP print 'Utilisateur : <b>' . $user->prenom . ' ' . $user->nom .'</b> ['.$user->code.']';?>
|
||||
|
||||
<br><br>
|
||||
|
||||
<style type="text/css">
|
||||
td.dash { border: 1px dashed #c0C0C0; }
|
||||
</style>
|
||||
|
||||
<table width="100%" cellspacing="3">
|
||||
<tr>
|
||||
<td width="50%" class="dash">
|
||||
<a href="/comm/">Commercial</a>
|
||||
<ul>
|
||||
<li><a href="/comm/propal.php3">Propositions commerciales</a>
|
||||
</ul>
|
||||
</td>
|
||||
<td width="50%" class="dash">
|
||||
<a href="/compta">Compta</a>
|
||||
<ul>
|
||||
<li><a href="/compta/resultat/">Résultat</A>
|
||||
<li><a href="/compta/tva/">TVA</A>
|
||||
</ul>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
</table>
|
||||
<?PHP
|
||||
llxFooter("<em>Dernière modification $Date$ révision $Revision$</em>");
|
||||
?>
|
||||
|
||||
|
||||
@ -42,7 +42,7 @@ function llxHeader($head = "") {
|
||||
|
||||
$menu->add("/compta/", "Comptabilité");
|
||||
|
||||
$menu->add_submenu("/compta/", "Factures");
|
||||
$menu->add_submenu("/compta/facture.php3", "Factures");
|
||||
|
||||
if ($conf->fichinter->enabled ) {
|
||||
|
||||
|
||||
@ -23,17 +23,13 @@
|
||||
* La tva collectée n'est calculée que sur les factures payées.
|
||||
*
|
||||
*
|
||||
*
|
||||
*
|
||||
*
|
||||
*
|
||||
*
|
||||
*/
|
||||
class Tva {
|
||||
var $db;
|
||||
|
||||
var $note;
|
||||
|
||||
/*
|
||||
* Initialistation automatique de la classe
|
||||
*/
|
||||
Function Tva($DB) {
|
||||
global $config;
|
||||
|
||||
@ -41,7 +37,11 @@ class Tva {
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
/*
|
||||
* Hum la fonction s'appelle 'Solde' elle doit a mon avis
|
||||
* calcluer le solde de TVA, non ?
|
||||
*
|
||||
*/
|
||||
Function solde($year = 0) {
|
||||
|
||||
$payee = $this->tva_sum_payee($year);
|
||||
@ -50,11 +50,10 @@ class Tva {
|
||||
$solde = $payee - $collectee;
|
||||
|
||||
return $solde;
|
||||
|
||||
}
|
||||
/*
|
||||
* Tva collectée
|
||||
*
|
||||
* Total de la TVA des factures emises par la societe.
|
||||
*
|
||||
*/
|
||||
Function tva_sum_collectee($year = 0) {
|
||||
@ -63,7 +62,7 @@ class Tva {
|
||||
$sql .= " FROM llx_facture as f WHERE f.paye = 1";
|
||||
|
||||
if ($year) {
|
||||
$sql .= " AND f.datef >= '$y-01-01' AND f.datef <= '$y-12-31' ";
|
||||
$sql .= " AND f.datef >= '$year-01-01' AND f.datef <= '$year-12-31' ";
|
||||
}
|
||||
|
||||
$result = $this->db->query($sql);
|
||||
@ -85,7 +84,7 @@ class Tva {
|
||||
}
|
||||
/*
|
||||
* Tva payée
|
||||
*
|
||||
* Total de la TVA payee aupres de qui de droit
|
||||
*
|
||||
*/
|
||||
Function tva_sum_payee($year = 0) {
|
||||
@ -94,7 +93,7 @@ class Tva {
|
||||
$sql .= " FROM llx_tva as f";
|
||||
|
||||
if ($year) {
|
||||
$sql .= " WHERE f.datev >= '$y-01-01' AND f.datev <= '$y-12-31' ";
|
||||
$sql .= " WHERE f.datev >= '$year-01-01' AND f.datev <= '$year-12-31' ";
|
||||
}
|
||||
|
||||
$result = $this->db->query($sql);
|
||||
@ -115,8 +114,5 @@ class Tva {
|
||||
}
|
||||
}
|
||||
}
|
||||
/*
|
||||
* $Id$
|
||||
* $Source$
|
||||
*/
|
||||
|
||||
?>
|
||||
|
||||
@ -23,17 +23,31 @@
|
||||
-- de données, mieux on peut tester l'appli.
|
||||
-- ===========================================================================
|
||||
delete from llx_tva;
|
||||
insert into llx_tva (datep, datev, amount) values ('2001-11-11','2001-10-1',1960);
|
||||
insert into llx_tva (datep, datev, amount) values ('2001-11-11','2001-10-01', 1960.00);
|
||||
insert into llx_tva (datep, datev, amount) values ('2001-04-11','2001-01-01', 2000.00);
|
||||
|
||||
delete from llx_facture_fourn;
|
||||
|
||||
insert into llx_facture_fourn (facnumber, fk_soc, datec, datef, paye, amount, remise, tva, total, fk_statut, fk_user_author, fk_user_valid, note)
|
||||
values ('LOL-509',1,'2001-05-09','2001-05-09',1,1000,0,196,1196,1,NULL,NULL,'');
|
||||
insert into llx_facture_fourn (facnumber, fk_soc, datec, datef, paye, amount, remise, tva, total, fk_statut, fk_user_author, fk_user_valid, note)
|
||||
values ('LOL-510',1,'2001-09-09','2001-09-09',1,100,0,19.6,119.6,1,NULL,NULL,'');
|
||||
|
||||
insert into llx_facture_fourn (facnumber, fk_soc, datec, datef, paye, amount, remise, tva, total, fk_statut, fk_user_author, fk_user_valid, note)
|
||||
values ('02-1-YHGT',2,now(),'2002-01-01',1,100,0,19.6,119.6,1,NULL,NULL,'');
|
||||
|
||||
insert into llx_facture_fourn (facnumber, fk_soc, datec, datef, paye, amount, remise, tva, total, fk_statut, fk_user_author, fk_user_valid, note)
|
||||
values ('02-5-YHGT',2,now(),'2002-05-01',1,1000,0,196,1196,1,NULL,NULL,'');
|
||||
|
||||
insert into llx_facture_fourn (facnumber, fk_soc, datec, datef, paye, amount, remise, tva, total, fk_statut, fk_user_author, fk_user_valid, note)
|
||||
values ('02-10-YHGT',2,now(),'2002-10-01',1,1000,0,196,1196,1,NULL,NULL,'');
|
||||
insert into llx_facture_fourn (facnumber, fk_soc, datec, datef, paye, amount, remise, tva, total, fk_statut, fk_user_author, fk_user_valid, note)
|
||||
values ('02-11-YHGT',2,now(),'2002-11-01',1,1000,0,196,1196,1,NULL,NULL,'');
|
||||
insert into llx_facture_fourn (facnumber, fk_soc, datec, datef, paye, amount, remise, tva, total, fk_statut, fk_user_author, fk_user_valid, note)
|
||||
values ('02-12-YHGT',2,now(),'2002-12-01',1,1000,0,196,1196,1,NULL,NULL,'');
|
||||
|
||||
|
||||
|
||||
delete from llx_user;
|
||||
insert into llx_user (name,firstname,code,login,pass,module_comm,module_compta,admin,webcal_login)
|
||||
values ('Quiedeville','Rodolphe','RQ','rodo','rodo',1,1,1,'rodo');
|
||||
|
||||
@ -21,24 +21,45 @@ INSERT INTO llx_paiement (rowid, fk_facture, datec, datep, amount, author, fk_pa
|
||||
INSERT INTO llx_paiement (rowid, fk_facture, datec, datep, amount, author, fk_paiement, num_paiement, note) VALUES (10,8,'2002-05-09 15:00:35','2002-05-09 12:00:00',9483.56,'rodo',0,'','');
|
||||
INSERT INTO llx_paiement (rowid, fk_facture, datec, datep, amount, author, fk_paiement, num_paiement, note) VALUES (11,9,'2002-05-09 15:02:36','2002-05-09 12:00:00',43355,'rodo',0,'','');
|
||||
|
||||
-- MySQL dump 8.21
|
||||
--
|
||||
-- Host: localhost Database: dolibarr
|
||||
---------------------------------------------------------
|
||||
-- Server version 3.23.49-log
|
||||
|
||||
--
|
||||
-- Dumping data for table 'llx_facture'
|
||||
--
|
||||
|
||||
insert into llx_facture (rowid, facnumber, fk_soc, datec, datef, paye, amount, remise, tva, total, fk_statut, fk_user_author, fk_user_valid, note)
|
||||
values (1,'F-BO-010509',1,'2001-05-09 03:04:48','2001-05-09',1,10000,0,1960,11960,1,NULL,NULL,'');
|
||||
|
||||
INSERT INTO llx_facture (rowid, facnumber, fk_soc, datec, datef, paye, amount, remise, tva, total, fk_statut, author, fk_user, fk_user_author, fk_user_valid, note) VALUES (1,'F-BO-010509',1,'2001-05-09 03:04:48','2001-05-09',1,10000,0,1960,11960,1,'rodo',NULL,NULL,NULL,'');
|
||||
INSERT INTO llx_facture (rowid, facnumber, fk_soc, datec, datef, paye, amount, remise, tva, total, fk_statut, author, fk_user, fk_user_author, fk_user_valid, note) VALUES (2,'F-DO-020410',3,'2002-05-09 03:17:44','2002-04-10',1,910,100,178.36,1088.36,1,'rodo',NULL,NULL,NULL,'');
|
||||
INSERT INTO llx_facture (rowid, facnumber, fk_soc, datec, datef, paye, amount, remise, tva, total, fk_statut, author, fk_user, fk_user_author, fk_user_valid, note) VALUES (3,'F-BO-020314',1,'2002-05-09 03:21:25','2002-03-14',1,10,0,1.96,11.96,1,'rodo',NULL,NULL,NULL,'');
|
||||
INSERT INTO llx_facture (rowid, facnumber, fk_soc, datec, datef, paye, amount, remise, tva, total, fk_statut, author, fk_user, fk_user_author, fk_user_valid, note) VALUES (4,'F-CU-020215',2,'2002-05-09 03:23:31','2002-02-15',1,10000,0,1960,11960,1,'rodo',NULL,NULL,NULL,'');
|
||||
INSERT INTO llx_facture (rowid, facnumber, fk_soc, datec, datef, paye, amount, remise, tva, total, fk_statut, author, fk_user, fk_user_author, fk_user_valid, note) VALUES (5,'F-BO-020117',1,'2002-05-09 03:36:43','2002-01-17',1,20,0,3.92,23.92,1,'rodo',NULL,NULL,NULL,'');
|
||||
INSERT INTO llx_facture (rowid, facnumber, fk_soc, datec, datef, paye, amount, remise, tva, total, fk_statut, author, fk_user, fk_user_author, fk_user_valid, note) VALUES (6,'F-BO-020119',1,'2002-05-09 03:40:26','2002-05-09',1,30,0,5.88,35.88,1,'rodo',NULL,NULL,NULL,'');
|
||||
INSERT INTO llx_facture (rowid, facnumber, fk_soc, datec, datef, paye, amount, remise, tva, total, fk_statut, author, fk_user, fk_user_author, fk_user_valid, note) VALUES (7,'F-CU-020509',2,'2002-05-09 03:46:54','2002-05-09',1,20000,0,3920,23920,1,'rodo',NULL,NULL,NULL,'');
|
||||
INSERT INTO llx_facture (rowid, facnumber, fk_soc, datec, datef, paye, amount, remise, tva, total, fk_statut, author, fk_user, fk_user_author, fk_user_valid, note) VALUES (8,'F-FOO-020309',4,'2002-05-09 14:44:34','2002-03-09',1,12110,0,2373.56,14483.56,1,'rodo',NULL,NULL,NULL,'');
|
||||
INSERT INTO llx_facture (rowid, facnumber, fk_soc, datec, datef, paye, amount, remise, tva, total, fk_statut, author, fk_user, fk_user_author, fk_user_valid, note) VALUES (9,'F-CU-020509.1',2,'2002-05-09 15:02:08','2002-05-09',1,36250,0,7105,43355,1,'rodo',NULL,NULL,NULL,'');
|
||||
INSERT INTO llx_facture (rowid, facnumber, fk_soc, datec, datef, paye, amount, remise, tva, total, fk_statut, fk_user_author, fk_user_valid, note)
|
||||
VALUES (2,'F-DO-020410',3,'2002-05-09 03:17:44','2002-04-10',1,910,100,178.36,1088.36,1,NULL,NULL,'');
|
||||
|
||||
INSERT INTO llx_facture (rowid, facnumber, fk_soc, datec, datef, paye, amount, remise, tva, total, fk_statut, fk_user_author, fk_user_valid, note)
|
||||
VALUES (3,'F-BO-020314',1,'2002-05-09 03:21:25','2002-03-14',1,10,0,1.96,11.96,1,NULL,NULL,'');
|
||||
|
||||
INSERT INTO llx_facture (rowid, facnumber, fk_soc, datec, datef, paye, amount, remise, tva, total, fk_statut, fk_user_author, fk_user_valid, note)
|
||||
VALUES (4,'F-CU-020215',2,'2002-05-09 03:23:31','2002-02-15',1,10000,0,1960,11960,1,NULL,NULL,'');
|
||||
|
||||
INSERT INTO llx_facture (rowid, facnumber, fk_soc, datec, datef, paye, amount, remise, tva, total, fk_statut, fk_user_author, fk_user_valid, note)
|
||||
VALUES (5,'F-BO-020117',1,'2002-05-09 03:36:43','2002-01-17',1,20,0,3.92,23.92,1,NULL,NULL,'');
|
||||
|
||||
INSERT INTO llx_facture (rowid, facnumber, fk_soc, datec, datef, paye, amount, remise, tva, total, fk_statut, fk_user_author, fk_user_valid, note)
|
||||
VALUES (6,'F-BO-020119',1,'2002-05-09 03:40:26','2002-05-09',1,30,0,5.88,35.88,1,NULL,NULL,'');
|
||||
|
||||
INSERT INTO llx_facture (rowid, facnumber, fk_soc, datec, datef, paye, amount, remise, tva, total, fk_statut, fk_user_author, fk_user_valid, note)
|
||||
VALUES (7,'F-CU-020509',2,'2002-05-09 03:46:54','2002-05-09',1,20000,0,3920,23920,1,NULL,NULL,'');
|
||||
|
||||
INSERT INTO llx_facture (rowid, facnumber, fk_soc, datec, datef, paye, amount, remise, tva, total, fk_statut, fk_user_author, fk_user_valid, note)
|
||||
VALUES (8,'F-FOO-020309',4,'2002-05-09 14:44:34','2002-03-09',1,12110,0,2373.56,14483.56,1,NULL,NULL,'');
|
||||
|
||||
INSERT INTO llx_facture (rowid, facnumber, fk_soc, datec, datef, paye, amount, remise, tva, total, fk_statut, fk_user_author, fk_user_valid, note)
|
||||
VALUES (9,'F-CU-020509.1',2,'2002-05-09 15:02:08','2002-05-09',1,36250,0,7105,43355,1,NULL,NULL,'');
|
||||
|
||||
insert into llx_facture (rowid, facnumber, fk_soc, datec, datef, paye, amount, remise, tva, total, fk_statut, fk_user_author, fk_user_valid, note)
|
||||
values (10,'F-BO-010310',1,'2001-03-10 03:04:48','2001-03-10',1,20000,0,3920,13920,1,NULL,NULL,'');
|
||||
|
||||
insert into llx_facture (rowid, facnumber, fk_soc, datec, datef, paye, amount, remise, tva, total, fk_statut, fk_user_author, fk_user_valid, note)
|
||||
VALUES (11,'F-DO-010410',3,'2001-04-10 03:17:44','2001-04-10',1,910,100,178.36,1088.36,1,NULL,NULL,'');
|
||||
|
||||
INSERT INTO llx_facture (rowid, facnumber, fk_soc, datec, datef, paye, amount, remise, tva, total, fk_statut, fk_user_author, fk_user_valid, note)
|
||||
VALUES (12,'F-BO-010117',1,'2001-05-09 03:36:43','2001-01-17',1,20,0,3.92,23.92,1,NULL,NULL,'');
|
||||
|
||||
INSERT INTO llx_facture (rowid, facnumber, fk_soc, datec, datef, paye, amount, remise, tva, total, fk_statut, fk_user_author, fk_user_valid, note)
|
||||
VALUES (13,'F-CU-010509.1',2,'2001-05-09 15:02:08','2001-05-09',1,36250,0,7105,43355,1,NULL,NULL,'');
|
||||
|
||||
Loading…
Reference in New Issue
Block a user