Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Fix: Corrige quelques points sur tva

Browse Source
This commit is contained in:
Laurent Destailleur
2005-08-15 23:39:04 +00:00
parent ae4c9e0b92
commit 8889dbc5a1
4 changed files with 96 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
htdocs/compta/resultat/clientfourn.php
View File

@@ -256,7 +256,8 @@ print '<tr><td colspan="4">'.$langs->trans("VAT").'</td></tr>';
$subtotal_ht = 0;
$subtotal_ttc = 0;
if ($modecompta == 'CREANCES-DETTES') {
if ($modecompta == 'CREANCES-DETTES')
{
// TVA <20> payer
$amount=0;
$sql = "SELECT sum(f.tva) as amount, date_format(f.datef,'%Y-%m') as dm";
@@ -302,6 +303,7 @@ if ($modecompta == 'CREANCES-DETTES') {
}
$sql .= " GROUP BY dm";
$sql .= " ORDER BY dm DESC";
$result=$db->query($sql);
if ($result) {
$num = $db->num_rows($result);
@@ -329,8 +331,9 @@ if ($modecompta == 'CREANCES-DETTES') {
print "<td align=\"right\">".price($amount)."</td>\n";
print "</tr>\n";
}
else {
// TVA pay<61>e
else
{
// TVA r<>ellement d<>j<EFBFBD> pay<61>e
$amount=0;
$sql = "SELECT sum(t.amount) as amount, date_format(t.datev,'%Y-%m') as dm";
$sql .= " FROM ".MAIN_DB_PREFIX."tva as t";
@@ -362,7 +365,7 @@ else {
dolibarr_print_error($db);
}
print "<tr $bc[$var]><td>&nbsp</td>";
print "<td>".$langs->trans("VATToPay")."</td>\n";
print "<td>".$langs->trans("VATPayed")."</td>\n";
if ($modecompta == 'CREANCES-DETTES') print "<td align=\"right\">".price($amount)."</td>\n";
print "<td align=\"right\">".price($amount)."</td>\n";
print "</tr>\n";
@@ -398,7 +401,7 @@ else {
dolibarr_print_error($db);
}
print "<tr $bc[$var]><td>&nbsp</td>";
print "<td>".$langs->trans("VATToCollect")."</td>\n";
print "<td>".$langs->trans("VATCollected")."</td>\n";
if ($modecompta == 'CREANCES-DETTES') print "<td align=\"right\">".price($obj->amount)."</td>\n";
print "<td align=\"right\">".price($obj->amount)."</td>\n";
print "</tr>\n";

115
htdocs/compta/tva/index.php
View File

@@ -32,46 +32,103 @@
require("./pre.inc.php");
require("../../tva.class.php");
/*
* On r<>cup<75>re la tva collect<63>e
*/
function tva_coll($db, $y,$m) {
$sql = "SELECT sum(f.tva) as amount";
$sql .= " FROM ".MAIN_DB_PREFIX."facture as f WHERE ";
//Si on paye la tva sur la facturation
if(FACTURE_TVAOPTION == "facturation")
$sql .= "";
//Sinon, on paye la tva sur les encaissements
else
$sql .= "f.paye = 1 AND";
$sql .= " date_format(f.datef,'%Y') = $y";
$sql .= " AND date_format(f.datef,'%m') = $m";
$modecompta = $conf->compta->mode;
$result = $db->query($sql);
if ($result) {
$obj = $db->fetch_object($result);
return $obj->amount;
}
/*
* On r<>cup<75>re la tva <20> collecter
*/
function tva_coll($db, $y,$m)
{
if ($modecompta=="CREANCES-DETTES")
{
// Si on paye la tva sur les factures dues (non brouillon)
$sql = "SELECT sum(f.tva) as amount";
$sql.= " FROM ".MAIN_DB_PREFIX."facture as f";
$sql.= " WHERE ";
$sql.= " f.fk_statut = 1";
$sql.= " AND date_format(f.datef,'%Y') = $y";
$sql.= " AND date_format(f.datef,'%m') = $m";
}
else
{
// Si on paye la tva sur les payments
// \todo a ce jour on se sait pas la compter car le montant tva d'un payment
// n'est pas stock<63> dans la table des payments.
// Il faut quand un payment a lieu, stocker en plus du montant du paiement le
// detail part tva et part ht.
// En attendant, on renvoi tva sur factures pay<61>s
$sql = "SELECT sum(f.tva) as amount";
$sql.= " FROM ".MAIN_DB_PREFIX."facture as f";
$sql.= " WHERE ";
$sql.= " f.paye = 1";
$sql.= " AND date_format(f.datef,'%Y') = $y";
$sql.= " AND date_format(f.datef,'%m') = $m";
}
$resql = $db->query($sql);
if ($resql)
{
$obj = $db->fetch_object($resql);
return $obj->amount;
}
else
{
dolibarr_print_error($db);
}
}
/*
*
* On r<>cup<75>re la tva <20> payer
*/
function tva_paye($db, $y,$m)
{
$sql = "SELECT sum(f.total_tva) as amount";
$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f WHERE f.paye = 1";
$sql .= " AND date_format(f.datef,'%Y') = $y";
$sql .= " AND date_format(f.datef,'%m') = $m";
$result = $db->query($sql);
if ($result)
if ($modecompta=="CREANCES-DETTES")
{
$obj = $db->fetch_object($result);
return $obj->amount;
// Si on paye la tva sur les factures dues (non brouillon)
$sql = "SELECT sum(f.total_tva) as amount";
$sql.= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
$sql.= " WHERE ";
$sql.= " f.fk_statut = 1";
$sql.= " AND date_format(f.datef,'%Y') = $y";
$sql.= " AND date_format(f.datef,'%m') = $m";
}
else
{
// Si on paye la tva sur les payments
// \todo a ce jour on se sait pas la compter car le montant tva d'un payment
// n'est pas stock<63> dans la table des payments.
// Il faut quand un payment a lieu, stocker en plus du montant du paiement le
// detail part tva et part ht.
// En attendant, on renvoi tva sur factures pay<61>s
$sql = "SELECT sum(f.total_tva) as amount";
$sql.= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
// $sql.= " WHERE ";
$sql .= " WHERE f.fk_statut = 1";
// $sql.= " f.paye = 1";
$sql.= " AND date_format(f.datef,'%Y') = $y";
$sql.= " AND date_format(f.datef,'%m') = $m";
print "xx $sql";
}
$resql = $db->query($sql);
if ($resql)
{
$obj = $db->fetch_object($resql);
return $obj->amount;
}
else
{
dolibarr_print_error($db);
}
}
function pt ($db, $sql, $date) {
global $bc,$langs;

1
htdocs/langs/en_US/compta.lang
View File

@@ -22,6 +22,7 @@ VATToPay=VAT to pay
VATToCollect=VAT to collect
VATSummary=VAT Summary
VATPayed=VAT payed
VATCollected=VAT collected
SocialContribution=Social contribution
SocialContributions=Social contributions
ContributionsToPay=Contributions to pay

1
htdocs/langs/fr_FR/compta.lang
View File

@@ -22,6 +22,7 @@ VATToPay=TVA
VATToCollect=TVA <20> r<>cup<75>rer
VATSummary=R<>sum<75> TVA
VATPayed=TVA pay<61>e
VATCollected=TVA r<>cup<75>r<EFBFBD>e
SocialContribution=Charge sociale
SocialContributions=Charges sociales
ContributionsToPay=Charges <20> payer