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

Fix: Show vat_by_thirdparty when module accounting is on

Browse Source
This commit is contained in:
aspangaro 2015-07-15 23:24:28 +02:00
parent 892462e0d6
commit efbaeaab5c
2 changed files with 52 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/compta/tva/clients.php
View File

@ -90,9 +90,8 @@ if (empty($min)) {
// Define modetax (0 or 1) // Define modetax (0 or 1)
// 0=normal, 1=option vat for services is on debit // 0=normal, 1=option vat for services is on debit
$modetax = $conf->global->TAX_MODE; $modetax = $conf->global->TAX_MODE;
if (isset($_REQUEST["modetax"])) { if (isset($_REQUEST["modetax"])) $modetax=$_REQUEST["modetax"];
$modetax=$_REQUEST["modetax"]; if (empty($modetax)) $modetax=0;
}
// Security check // Security check
$socid = GETPOST('socid','int'); $socid = GETPOST('socid','int');

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

@ -108,17 +108,6 @@ function vat_by_thirdparty($db, $y, $date_start, $date_end, $modetax, $direction
if ($modetax == 1) if ($modetax == 1)
{ {
// If vat paid on due invoices (non draft) // If vat paid on due invoices (non draft)
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))
{
$sql = "SELECT s.rowid as socid, s.nom as name, s.siren as tva_intra, s.tva_assuj as assuj,"; $sql = "SELECT s.rowid as socid, s.nom as name, s.siren as tva_intra, s.tva_assuj as assuj,";
$sql.= " sum(f.$total_ht) as amount, sum(f.".$total_tva.") as tva,"; $sql.= " sum(f.$total_ht) as amount, sum(f.".$total_tva.") as tva,";
$sql.= " sum(f.localtax1) as localtax1,"; $sql.= " sum(f.localtax1) as localtax1,";
@ -143,20 +132,7 @@ function vat_by_thirdparty($db, $y, $date_start, $date_end, $modetax, $direction
$sql.= " AND s.rowid = f.fk_soc"; $sql.= " AND s.rowid = f.fk_soc";
$sql.= " GROUP BY s.rowid, s.nom, s.tva_intra, s.tva_assuj"; $sql.= " GROUP BY s.rowid, s.nom, s.tva_intra, s.tva_assuj";
} }
}
else else
{
if (! empty($conf->global->MAIN_MODULE_ACCOUNTING))
{
// If vat paid on payments
// 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))
{ {
// Tva sur factures payes (should be on payment) // Tva sur factures payes (should be on payment)
/* $sql = "SELECT s.rowid as socid, s.nom as nom, s.tva_intra as tva_intra, s.tva_assuj as assuj,"; /* $sql = "SELECT s.rowid as socid, s.nom as nom, s.tva_intra as tva_intra, s.tva_assuj as assuj,";
@ -180,14 +156,10 @@ function vat_by_thirdparty($db, $y, $date_start, $date_end, $modetax, $direction
$sql.= " AND s.rowid = f.fk_soc AND f.rowid = fd.".$fk_facture; $sql.= " AND s.rowid = f.fk_soc AND f.rowid = fd.".$fk_facture;
$sql.= " GROUP BY s.rowid as socid, s.nom as nom, s.tva_intra as tva_intra, s.tva_assuj as assuj"; $sql.= " GROUP BY s.rowid as socid, s.nom as nom, s.tva_intra as tva_intra, s.tva_assuj as assuj";
*/ */
$sql = 'TODO';
}
} }
if (! $sql) return -1; if (! $sql) return -1;
if ($sql == 'TODO') return -2;
if ($sql != 'TODO')
{
dol_syslog("Tax.lib:thirdparty", LOG_DEBUG); dol_syslog("Tax.lib:thirdparty", LOG_DEBUG);
$resql = $db->query($sql); $resql = $db->query($sql);
if ($resql) if ($resql)
@ -205,7 +177,6 @@ function vat_by_thirdparty($db, $y, $date_start, $date_end, $modetax, $direction
return -3; return -3;
} }
} }
}
/** /**