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

Fix: Show VAT when module accounting is on

Browse Source
This commit is contained in:
aspangaro 2015-07-15 22:45:45 +02:00
parent 9aecfda78a
commit 892462e0d6
1 changed files with 117 additions and 167 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
htdocs/core/lib/tax.lib.php
View File

@ -264,17 +264,6 @@ function vat_by_date($db, $y, $q, $date_start, $date_end, $modetax, $direction,
// Define sql request // Define sql request
$sql=''; $sql='';
if ($modetax == 1) // Option vat on delivery for goods (payment) and debit invoice for services if ($modetax == 1) // Option vat on delivery for goods (payment) and debit invoice for services
{
if (! empty($conf->global->MAIN_MODULE_ACCOUNTING))
{
// TODO a ce jour on se sait pas la compter car le montant tva d'un payment
// n'est pas stocke dans la table des payments.
// Seul le module compta expert peut resoudre ce probleme.
// (Il faut quand un payment a lieu, stocker en plus du montant du paiement le
// detail part tva et part ht).
$sql='TODO';
}
if (! empty($conf->global->MAIN_MODULE_COMPTABILITE))
{ {
// Count on delivery date (use invoice date as delivery is unknown) // Count on delivery date (use invoice date as delivery is unknown)
$sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.tva_tx as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,"; $sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.tva_tx as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
@ -309,19 +298,7 @@ function vat_by_date($db, $y, $q, $date_start, $date_end, $modetax, $direction,
$sql.= " AND d.date_start is null AND d.date_end IS NULL)"; // enhance detection of service $sql.= " AND d.date_start is null AND d.date_end IS NULL)"; // enhance detection of service
$sql.= " ORDER BY d.rowid, d.".$fk_facture; $sql.= " ORDER BY d.rowid, d.".$fk_facture;
} }
}
else // Option vat on delivery for goods (payments) and payments for services else // Option vat on delivery for goods (payments) and payments for services
{
if (! empty($conf->global->MAIN_MODULE_ACCOUNTING))
{
// TODO a ce jour on se sait pas la compter car le montant tva d'un payment
// n'est pas stocke dans la table des payments.
// Seul le module compta expert peut resoudre ce probleme.
// (Il faut quand un payment a lieu, stocker en plus du montant du paiement le
// detail part tva et part ht).
$sql='TODO';
}
if (! empty($conf->global->MAIN_MODULE_COMPTABILITE))
{ {
// Count on delivery date (use invoice date as delivery is unknown) // Count on delivery date (use invoice date as delivery is unknown)
$sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.tva_tx as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,"; $sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.tva_tx as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
@ -357,7 +334,6 @@ function vat_by_date($db, $y, $q, $date_start, $date_end, $modetax, $direction,
$sql.= " ORDER BY d.rowid, d.".$fk_facture; $sql.= " ORDER BY d.rowid, d.".$fk_facture;
//print $sql; //print $sql;
} }
}
//print $sql.'<br>'; //print $sql.'<br>';
if (! $sql) return -1; if (! $sql) return -1;
@ -428,18 +404,6 @@ function vat_by_date($db, $y, $q, $date_start, $date_end, $modetax, $direction,
// Define sql request // Define sql request
$sql=''; $sql='';
if ($modetax == 1) // Option vat on delivery for goods (payment) and debit invoice for services if ($modetax == 1) // Option vat on delivery for goods (payment) and debit invoice for services
{
if (! empty($conf->global->MAIN_MODULE_ACCOUNTING))
{
// Count on invoice date
// TODO a ce jour on se sait pas la compter car le montant tva d'un payment
// n'est pas stocke dans la table des payments.
// Seul le module compta expert peut resoudre ce probleme.
// (Il faut quand un payment a lieu, stocker en plus du montant du paiement le
// detail part tva et part ht).
$sql='TODO';
}
if (! empty($conf->global->MAIN_MODULE_COMPTABILITE))
{ {
// Count on invoice date // Count on invoice date
$sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.tva_tx as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,"; $sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.tva_tx as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
@ -474,20 +438,7 @@ function vat_by_date($db, $y, $q, $date_start, $date_end, $modetax, $direction,
$sql.= " OR d.date_start is NOT null OR d.date_end IS NOT NULL)"; // enhance detection of service $sql.= " OR d.date_start is NOT null OR d.date_end IS NOT NULL)"; // enhance detection of service
$sql.= " ORDER BY d.rowid, d.".$fk_facture; $sql.= " ORDER BY d.rowid, d.".$fk_facture;
} }
}
else // Option vat on delivery for goods (payments) and payments for services else // Option vat on delivery for goods (payments) and payments for services
{
if (! empty($conf->global->MAIN_MODULE_ACCOUNTING))
{
// Count on payments date
// TODO a ce jour on se sait pas la compter car le montant tva d'un payment
// n'est pas stocke dans la table des payments.
// Seul le module compta expert peut resoudre ce probleme.
// (Il faut quand un paiement a lieu, stocker en plus du montant du paiement le
// detail part tva et part ht).
$sql='TODO';
}
if (! empty($conf->global->MAIN_MODULE_COMPTABILITE))
{ {
// Count on payments date // Count on payments date
$sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.tva_tx as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,"; $sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.tva_tx as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
@ -526,7 +477,6 @@ function vat_by_date($db, $y, $q, $date_start, $date_end, $modetax, $direction,
$sql.= " OR d.date_start is NOT null OR d.date_end IS NOT NULL)"; // enhance detection of service $sql.= " OR d.date_start is NOT null OR d.date_end IS NOT NULL)"; // enhance detection of service
$sql.= " ORDER BY d.rowid, d.".$fk_facture.", pf.rowid"; $sql.= " ORDER BY d.rowid, d.".$fk_facture.", pf.rowid";
} }
}
if (! $sql) if (! $sql)
{ {