Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
16e2890da8
dolibarr/htdocs/lib/tax.lib.php

440 lines
18 KiB
PHP
Raw Normal View History

Enhancement in ecm module
2008-10-26 02:26:18 +01:00
<?php
Prepare select of type of line
2009-03-09 00:09:45 +01:00
/* Copyright (C) 2004-2009 Laurent Destailleur <eldy@users.sourceforge.net>
Enhancement in ecm module
2008-10-26 02:26:18 +01:00
* Copyright (C) 2006-2007 Yannick Warnier <ywarnier@beeznest.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.
*/
/**
Prepare select of type of line
2009-03-09 00:09:45 +01:00
* \file htdocs/lib/tax.lib.php
* \ingroup tax
* \brief Library for tax module
* \version $Id$
*/
Enhancement in ecm module
2008-10-26 02:26:18 +01:00
/**
* \brief Look for collectable VAT clients in the chosen year
* \param db Database handle
* \param y Year
* \param modetax 0 or 1 (option vat on debit)
* \param direction 'sell' or 'buy'
* \return array List of customers third parties with vat, -1 if no accountancy module, -2 if not yet developped, -3 if error
*/
function vat_by_thirdparty($db, $y, $modetax, $direction)
{
global $conf;
$list=array();
//print "xx".$conf->global->MAIN_MODULE_COMPTABILITEEXPERT;
//print "xx".$conf->global->MAIN_MODULE_COMPTABILITE;
Minor enhancement on vat report
2009-03-05 21:14:13 +01:00
if ($direction == 'sell')
Enhancement in ecm module
2008-10-26 02:26:18 +01:00
{
$invoicetable='facture';
$invoicedettable='facturedet';
$fk_facture='fk_facture';
$total_tva='total_tva';
}
Minor enhancement on vat report
2009-03-05 21:14:13 +01:00
if ($direction == 'buy')
Enhancement in ecm module
2008-10-26 02:26:18 +01:00
{
$invoicetable='facture_fourn';
$invoicedettable='facture_fourn_det';
$fk_facture='fk_facture_fourn';
$total_tva='tva';
}
// Define sql request
$sql='';
if ($modetax == 1)
{
// If vat payed on due invoices (non draft)
if ($conf->global->MAIN_MODULE_COMPTABILITEEXPERT)
{
// \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.
// Seul le module compta expert peut r<>soudre ce probl<62>me.
// (Il faut quand un payment a lieu, stocker en plus du montant du paiement le
// detail part tva et part ht).
$sql = 'TODO';
}
if ($conf->global->MAIN_MODULE_COMPTABILITE)
{
$sql = "SELECT s.nom as nom, s.tva_intra as tva_intra,";
$sql.= " sum(fd.total_ht) as amount, sum(fd.".$total_tva.") as tva,";
$sql.= " s.tva_assuj as assuj, s.rowid as socid";
$sql.= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f, ".MAIN_DB_PREFIX.$invoicedettable." as fd, ".MAIN_DB_PREFIX."societe as s";
$sql.= " WHERE ";
$sql.= " f.fk_statut in (1,2)"; // Validated or payed (partially or completely)
$sql.= " AND f.datef >= '".$y."0101000000' AND f.datef <= '".$y."1231235959'";
$sql.= " AND s.rowid = f.fk_soc AND f.rowid = fd.".$fk_facture;
$sql.= " GROUP BY s.rowid";
}
}
else
{
if ($conf->global->MAIN_MODULE_COMPTABILITEEXPERT)
{
// If vat payed on 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.
// Seul le module compta expert peut r<>soudre ce probl<62>me.
// (Il faut quand un payment a lieu, stocker en plus du montant du paiement le
// detail part tva et part ht).
$sql = 'TODO';
}
if ($conf->global->MAIN_MODULE_COMPTABILITE)
{
// Tva sur factures pay<61>s (should be on payment)
/* $sql = "SELECT s.nom as nom, s.tva_intra as tva_intra,";
$sql.= " sum(fd.total_ht) as amount, sum(".$total_tva.") as tva,";
$sql.= " s.tva_assuj as assuj, s.rowid as socid";
$sql.= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f, ".MAIN_DB_PREFIX.$invoicetable." as fd, ".MAIN_DB_PREFIX."societe as s";
$sql.= " WHERE ";
$sql.= " f.fk_statut in (2)"; // Payed (partially or completely)
$sql.= " AND f.datef >= '".$y."0101000000' AND f.datef <= '".$y."1231235959'";
$sql.= " AND s.rowid = f.fk_soc AND f.rowid = fd.".$fk_facture;
$sql.= " GROUP BY s.rowid";
*/
$sql = 'TODO';
}
}
if (! $sql) return -1;
if ($sql && $sql=='TODO') return -2;
if ($sql && $sql!='TODO')
{
Qual: All call to dolibarr_ functions are made on dol_ functions.
2009-02-20 23:53:15 +01:00
dol_syslog("Client::vat_by_customer sql=".$sql);
Enhancement in ecm module
2008-10-26 02:26:18 +01:00
$resql = $db->query($sql);
if ($resql)
{
while($assoc = $db->fetch_array($resql))
{
$list[] = $assoc;
}
$db->free($resql);
return $list;
}
else
{
Qual: All call to dolibarr_ functions are made on dol_ functions.
2009-02-20 23:53:15 +01:00
dol_print_error($db);
Enhancement in ecm module
2008-10-26 02:26:18 +01:00
return -3;
}
}
}
/**
* \brief Gets VAT to collect for the given month of the given year
* The function gets the VAT in split results, as the VAT declaration asks
* to report the amounts for different VAT rates as different lines.
* This function also accounts recurrent invoices
* \param db Database handler object
* \param y Year
Prepare select of type of line
2009-03-09 00:09:45 +01:00
* \param q Period. If 1-4, it's year quarter.
Enhancement in ecm module
2008-10-26 02:26:18 +01:00
* \param modetax 0 or 1 (option vat on debit)
* \param direction 'sell' or 'buy'
* \return array List of quarters with vat
*/
function vat_by_quarter($db, $y, $q, $modetax, $direction)
{
global $conf;
$list=array();
Minor enhancement on vat report
2009-03-05 21:14:13 +01:00
if ($direction == 'sell')
Enhancement in ecm module
2008-10-26 02:26:18 +01:00
{
$invoicetable='facture';
$invoicedettable='facturedet';
$fk_facture='fk_facture';
$fk_facture2='fk_facture';
$fk_payment='fk_paiement';
$total_tva='total_tva';
$paymenttable='paiement';
$paymentfacturetable='paiement_facture';
}
Minor enhancement on vat report
2009-03-05 21:14:13 +01:00
if ($direction == 'buy')
Enhancement in ecm module
2008-10-26 02:26:18 +01:00
{
$invoicetable='facture_fourn';
$invoicedettable='facture_fourn_det';
$fk_facture='fk_facture_fourn';
$fk_facture2='fk_facturefourn';
$fk_payment='fk_paiementfourn';
$total_tva='tva';
$paymenttable='paiementfourn';
$paymentfacturetable='paiementfourn_facturefourn';
}
Minor enhancement on vat report
2009-03-05 21:14:13 +01:00
Enhancement in ecm module
2008-10-26 02:26:18 +01:00
// CAS DES BIENS
Minor enhancement on vat report
2009-03-05 21:14:13 +01:00
Enhancement in ecm module
2008-10-26 02:26:18 +01:00
// Define sql request
$sql='';
Minor enhancement on vat report
2009-03-05 21:14:13 +01:00
if ($modetax == 1) // Option vat on debit
Enhancement in ecm module
2008-10-26 02:26:18 +01:00
{
// If vat payed on due invoices (non draft)
if ($conf->global->MAIN_MODULE_COMPTABILITEEXPERT)
{
// \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.
// Seul le module compta expert peut r<>soudre ce probl<62>me.
// (Il faut quand un payment a lieu, stocker en plus du montant du paiement le
// detail part tva et part ht).
$sql='TODO';
}
if ($conf->global->MAIN_MODULE_COMPTABILITE)
{
$sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.tva_taux as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
Prepare select of type of line
2009-03-09 00:09:45 +01:00
$sql.= " d.date_start as date_start, d.date_end as date_end,";
$sql.= " f.facnumber as facnum, f.type, f.total_ttc as ftotal_ttc,";
Minor enhancement on vat report
2009-03-05 21:14:13 +01:00
$sql.= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
$sql.= " 0 as payment_id, 0 as payment_amount";
$sql.= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
Enhancement in ecm module
2008-10-26 02:26:18 +01:00
$sql.= " ".MAIN_DB_PREFIX.$invoicedettable." as d" ;
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
$sql.= " WHERE ";
$sql.= " f.fk_statut in (1,2)"; // Validated or payed (partially or completely)
$sql.= " AND f.rowid = d.".$fk_facture;
$sql.= " AND f.datef >= '".$y."0101000000' AND f.datef <= '".$y."1231235959'";
$sql.= " AND (date_format(f.datef,'%m') > ".(($q-1)*3)." AND date_format(f.datef,'%m') <= ".($q*3).")";
Prepare select of type of line
2009-03-09 00:09:45 +01:00
$sql.= " AND (d.product_type = 0"; // Limit to products
$sql.= " AND d.date_start is null AND d.date_end IS NULL)"; // enhance detection of service
Enhancement in ecm module
2008-10-26 02:26:18 +01:00
$sql.= " ORDER BY d.rowid, d.".$fk_facture;
}
}
Minor enhancement on vat report
2009-03-05 21:14:13 +01:00
else // Option vat on payments
Enhancement in ecm module
2008-10-26 02:26:18 +01:00
{
// If vat payed on payments
if ($conf->global->MAIN_MODULE_COMPTABILITEEXPERT)
{
// \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.
// Seul le module compta expert peut r<>soudre ce probl<62>me.
// (Il faut quand un payment a lieu, stocker en plus du montant du paiement le
// detail part tva et part ht).
$sql='TODO';
}
if ($conf->global->MAIN_MODULE_COMPTABILITE)
{
Minor enhancement on vat report
2009-03-05 21:14:13 +01:00
// Tva sur factures pay<61>s (should be on shipment, done on payment instead !)
Enhancement in ecm module
2008-10-26 02:26:18 +01:00
$sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.tva_taux as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
Prepare select of type of line
2009-03-09 00:09:45 +01:00
$sql.= " d.date_start as date_start, d.date_end as date_end,";
$sql.= " f.facnumber as facnum, f.type, f.total_ttc as ftotal_ttc,";
Minor enhancement on vat report
2009-03-05 21:14:13 +01:00
$sql.= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
$sql.= " 0 as payment_id, 0 as payment_amount";
// $sql.= " pf.".$fk_payment." as payment_id, pf.amount as payment_amount";
Enhancement in ecm module
2008-10-26 02:26:18 +01:00
$sql.= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
Minor enhancement on vat report
2009-03-05 21:14:13 +01:00
// $sql.= " ".MAIN_DB_PREFIX.$paymentfacturetable." as pf,";
// $sql.= " ".MAIN_DB_PREFIX.$paymenttable." as pa,";
Enhancement in ecm module
2008-10-26 02:26:18 +01:00
$sql.= " ".MAIN_DB_PREFIX.$invoicedettable." as d" ;
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
$sql.= " WHERE ";
$sql.= " f.fk_statut in (1,2)"; // Validated or payed (partially or completely)
$sql.= " AND f.rowid = d.".$fk_facture;
Minor enhancement on vat report
2009-03-05 21:14:13 +01:00
// $sql.= " AND pf.".$fk_facture2." = f.rowid";
// $sql.= " AND pa.rowid = pf.".$fk_payment;
// $sql.= " AND pa.datep >= '".$y."0101000000' AND pa.datep <= '".$y."1231235959'";
// $sql.= " AND (date_format(pa.datep,'%m') > ".(($q-1)*3)." AND date_format(pa.datep,'%m') <= ".($q*3).")";
Enhancement in ecm module
2008-10-26 02:26:18 +01:00
$sql.= " AND f.datef >= '".$y."0101000000' AND f.datef <= '".$y."1231235959'";
$sql.= " AND (date_format(f.datef,'%m') > ".(($q-1)*3)." AND date_format(f.datef,'%m') <= ".($q*3).")";
Prepare select of type of line
2009-03-09 00:09:45 +01:00
$sql.= " AND (d.product_type = 0"; // Limit to products
$sql.= " AND d.date_start is null AND d.date_end IS NULL)"; // enhance detection of service
Enhancement in ecm module
2008-10-26 02:26:18 +01:00
$sql.= " ORDER BY d.rowid, d.".$fk_facture;
}
}
if (! $sql) return -1;
if ($sql && $sql=='TODO') return -2;
if ($sql && $sql!='TODO')
{
Prepare select of type of line
2009-03-09 00:09:45 +01:00
dol_syslog("Tax.lib.php::vat_by_quarter sql=".$sql);
$resql = $db->query($sql);
Enhancement in ecm module
2008-10-26 02:26:18 +01:00
if ($resql)
{
$rate = -1;
$oldrowid='';
while($assoc = $db->fetch_array($resql))
{
if (! isset($list[$assoc['rate']]['totalht'])) $list[$assoc['rate']]['total_ht']=0;
if (! isset($list[$assoc['rate']]['vat'])) $list[$assoc['rate']]['total_vat']=0;
if ($assoc['rowid'] != $oldrowid) // Si rupture sur d.rowid
{
$oldrowid=$assoc['rowid'];
$list[$assoc['rate']]['totalht'] += $assoc['total_ht'];
$list[$assoc['rate']]['vat'] += $assoc['total_vat'];
}
$list[$assoc['rate']]['dtotal_ttc'][] = $assoc['total_ttc'];
$list[$assoc['rate']]['dtype'][] = $assoc['dtype'];
Prepare select of type of line
2009-03-09 00:09:45 +01:00
$list[$assoc['rate']]['ddate_start'][] = $db->jdate($assoc['date_start']);
$list[$assoc['rate']]['ddate_end'][] = $db->jdate($assoc['date_end']);
Enhancement in ecm module
2008-10-26 02:26:18 +01:00
$list[$assoc['rate']]['facid'][] = $assoc['facid'];
$list[$assoc['rate']]['facnum'][] = $assoc['facnum'];
Minor enhancement on vat report
2009-03-05 21:14:13 +01:00
$list[$assoc['rate']]['type'][] = $assoc['type'];
Enhancement in ecm module
2008-10-26 02:26:18 +01:00
$list[$assoc['rate']]['ftotal_ttc'][] = $assoc['ftotal_ttc'];
$list[$assoc['rate']]['descr'][] = $assoc['descr'];
$list[$assoc['rate']]['totalht_list'][] = $assoc['total_ht'];
$list[$assoc['rate']]['vat_list'][] = $assoc['total_vat'];
$list[$assoc['rate']]['pid'][] = $assoc['pid'];
$list[$assoc['rate']]['pref'][] = $assoc['pref'];
$list[$assoc['rate']]['ptype'][] = $assoc['ptype'];
$list[$assoc['rate']]['payment_id'][] = $assoc['payment_id'];
$list[$assoc['rate']]['payment_amount'][] = $assoc['payment_amount'];
Minor enhancement on vat report
2009-03-05 21:14:13 +01:00
Enhancement in ecm module
2008-10-26 02:26:18 +01:00
$rate = $assoc['rate'];
}
}
else
{
Qual: All call to dolibarr_ functions are made on dol_ functions.
2009-02-20 23:53:15 +01:00
dol_print_error($db);
Enhancement in ecm module
2008-10-26 02:26:18 +01:00
return -3;
}
}
// CAS DES SERVICES
Minor enhancement on vat report
2009-03-05 21:14:13 +01:00
Enhancement in ecm module
2008-10-26 02:26:18 +01:00
// Define sql request
$sql='';
if ($modetax == 1) // Option vat on debit
{
// If vat payed on due invoices (non draft)
if ($conf->global->MAIN_MODULE_COMPTABILITEEXPERT)
{
// \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.
// Seul le module compta expert peut r<>soudre ce probl<62>me.
// (Il faut quand un payment a lieu, stocker en plus du montant du paiement le
// detail part tva et part ht).
$sql='TODO';
}
if ($conf->global->MAIN_MODULE_COMPTABILITE)
{
$sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.tva_taux as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
Prepare select of type of line
2009-03-09 00:09:45 +01:00
$sql.= " d.date_start as date_start, d.date_end as date_end,";
$sql.= " f.facnumber as facnum, f.type, f.total_ttc as ftotal_ttc,";
Minor enhancement on vat report
2009-03-05 21:14:13 +01:00
$sql.= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
$sql.= " 0 as payment_id, 0 as payment_amount";
Enhancement in ecm module
2008-10-26 02:26:18 +01:00
$sql.= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
$sql.= " ".MAIN_DB_PREFIX.$invoicedettable." as d" ;
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
$sql.= " WHERE ";
$sql.= " f.fk_statut in (1,2)"; // Validated or payed (partially or completely)
$sql.= " AND f.rowid = d.".$fk_facture;
$sql.= " AND f.datef >= '".$y."0101000000' AND f.datef <= '".$y."1231235959'";
$sql.= " AND (date_format(f.datef,'%m') > ".(($q-1)*3)." AND date_format(f.datef,'%m') <= ".($q*3).")";
Prepare select of type of line
2009-03-09 00:09:45 +01:00
$sql.= " AND (d.product_type = 1"; // Limit to services
$sql.= " OR d.date_start is NOT null OR d.date_end IS NOT NULL)"; // enhance detection of service
Enhancement in ecm module
2008-10-26 02:26:18 +01:00
$sql.= " ORDER BY d.rowid, d.".$fk_facture;
}
}
Minor enhancement on vat report
2009-03-05 21:14:13 +01:00
else // Option vat on payments
Enhancement in ecm module
2008-10-26 02:26:18 +01:00
{
// If vat payed on payments
if ($conf->global->MAIN_MODULE_COMPTABILITEEXPERT)
{
// \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.
// Seul le module compta expert peut r<>soudre ce probl<62>me.
Minor enhancement on vat report
2009-03-05 21:14:13 +01:00
// (Il faut quand un paiement a lieu, stocker en plus du montant du paiement le
Enhancement in ecm module
2008-10-26 02:26:18 +01:00
// detail part tva et part ht).
$sql='TODO';
}
if ($conf->global->MAIN_MODULE_COMPTABILITE)
{
// Tva sur factures pay<61>s (should be on payment)
$sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.tva_taux as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
Prepare select of type of line
2009-03-09 00:09:45 +01:00
$sql.= " d.date_start as date_start, d.date_end as date_end,";
$sql.= " f.facnumber as facnum, f.type, f.total_ttc as ftotal_ttc,";
Enhancement in ecm module
2008-10-26 02:26:18 +01:00
$sql.= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
$sql.= " pf.".$fk_payment." as payment_id, pf.amount as payment_amount";
$sql.= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
$sql.= " ".MAIN_DB_PREFIX.$paymentfacturetable." as pf,";
$sql.= " ".MAIN_DB_PREFIX.$paymenttable." as pa,";
$sql.= " ".MAIN_DB_PREFIX.$invoicedettable." as d";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
$sql.= " WHERE ";
$sql.= " f.fk_statut in (1,2)"; // Payed (partially or completely)
$sql.= " AND f.rowid = d.".$fk_facture;;
$sql.= " AND pf.".$fk_facture2." = f.rowid";
$sql.= " AND pa.rowid = pf.".$fk_payment;
$sql.= " AND pa.datep >= '".$y."0101000000' AND pa.datep <= '".$y."1231235959'";
$sql.= " AND (date_format(pa.datep,'%m') > ".(($q-1)*3)." AND date_format(pa.datep,'%m') <= ".($q*3).")";
Prepare select of type of line
2009-03-09 00:09:45 +01:00
$sql.= " AND (d.product_type = 1"; // Limit to services
$sql.= " OR d.date_start is NOT null OR d.date_end IS NOT NULL)"; // enhance detection of service
Enhancement in ecm module
2008-10-26 02:26:18 +01:00
$sql.= " ORDER BY d.rowid, d.".$fk_facture.", pf.rowid";
}
}
if (! $sql) return -1;
if ($sql && $sql=='TODO') return -2;
if ($sql && $sql!='TODO')
{
Prepare select of type of line
2009-03-09 00:09:45 +01:00
dol_syslog("Tax.lib.php::vat_by_quarter sql=".$sql);
Enhancement in ecm module
2008-10-26 02:26:18 +01:00
$resql = $db->query($sql);
if ($resql)
{
$rate = -1;
$oldrowid='';
while($assoc = $db->fetch_array($resql))
{
if (! isset($list[$assoc['rate']]['totalht'])) $list[$assoc['rate']]['total_ht']=0;
if (! isset($list[$assoc['rate']]['vat'])) $list[$assoc['rate']]['total_vat']=0;
if ($assoc['rowid'] != $oldrowid) // Si rupture sur d.rowid
{
$oldrowid=$assoc['rowid'];
$list[$assoc['rate']]['totalht'] += $assoc['total_ht'];
$list[$assoc['rate']]['vat'] += $assoc['total_vat'];
}
$list[$assoc['rate']]['dtotal_ttc'][] = $assoc['total_ttc'];
$list[$assoc['rate']]['dtype'][] = $assoc['dtype'];
Prepare select of type of line
2009-03-09 00:09:45 +01:00
$list[$assoc['rate']]['ddate_start'][] = $db->jdate($assoc['date_start']);
$list[$assoc['rate']]['ddate_end'][] = $db->jdate($assoc['date_end']);
Minor enhancement on vat report
2009-03-05 21:14:13 +01:00
Enhancement in ecm module
2008-10-26 02:26:18 +01:00
$list[$assoc['rate']]['facid'][] = $assoc['facid'];
$list[$assoc['rate']]['facnum'][] = $assoc['facnum'];
Minor enhancement on vat report
2009-03-05 21:14:13 +01:00
$list[$assoc['rate']]['type'][] = $assoc['type'];
Enhancement in ecm module
2008-10-26 02:26:18 +01:00
$list[$assoc['rate']]['ftotal_ttc'][] = $assoc['ftotal_ttc'];
$list[$assoc['rate']]['descr'][] = $assoc['descr'];
$list[$assoc['rate']]['totalht_list'][] = $assoc['total_ht'];
$list[$assoc['rate']]['vat_list'][] = $assoc['total_vat'];
$list[$assoc['rate']]['pid'][] = $assoc['pid'];
$list[$assoc['rate']]['pref'][] = $assoc['pref'];
$list[$assoc['rate']]['ptype'][] = $assoc['ptype'];
$list[$assoc['rate']]['payment_id'][] = $assoc['payment_id'];
$list[$assoc['rate']]['payment_amount'][] = $assoc['payment_amount'];
$rate = $assoc['rate'];
}
}
else
{
Qual: All call to dolibarr_ functions are made on dol_ functions.
2009-02-20 23:53:15 +01:00
dol_print_error($db);
Enhancement in ecm module
2008-10-26 02:26:18 +01:00
return -3;
}
}
Minor enhancement on vat report
2009-03-05 21:14:13 +01:00
Enhancement in ecm module
2008-10-26 02:26:18 +01:00
return $list;
}
Suite rapport TVA
2008-02-18 05:23:08 +01:00
?>
Reference in New Issue Copy Permalink