';
print '';
print $form->editfieldkey("SupplierAccountancyCode", 'supplieraccountancycode', $object->code_compta_fournisseur, $object, $user->rights->societe->creer);
diff --git a/htdocs/accountancy/class/accountancycategory.class.php b/htdocs/accountancy/class/accountancycategory.class.php
index 0a538f0a6ae..27254ef31d1 100644
--- a/htdocs/accountancy/class/accountancycategory.class.php
+++ b/htdocs/accountancy/class/accountancycategory.class.php
@@ -360,9 +360,11 @@ class AccountancyCategory // extends CommonObject
* @return int <0 if KO, 0 if not found, >0 if OK
*/
public function display($id) {
+ global $conf;
$sql = "SELECT t.rowid, t.account_number, t.label";
$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_account as t";
$sql .= " WHERE t.fk_accounting_category = " . $id;
+ $sql .= " AND t.entity = " . $conf->entity;
$this->lines_display = array();
@@ -400,13 +402,14 @@ class AccountancyCategory // extends CommonObject
$sql .= " WHERE t.numero_compte NOT IN (";
$sql .= " SELECT t.account_number";
$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_account as t";
- $sql .= " WHERE t.fk_accounting_category = " . $id . ")";
+ $sql .= " WHERE t.fk_accounting_category = " . $id . " AND t.entity = " . $conf->entity.")";
$sql .= " AND t.numero_compte IN (";
$sql .= " SELECT DISTINCT aa.account_number";
$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_account as aa";
$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "accounting_system as asy ON aa.fk_pcg_version = asy.pcg_version";
$sql .= " AND asy.rowid = " . $conf->global->CHARTOFACCOUNTS;
- $sql .= " AND aa.active = 1)";
+ $sql .= " AND aa.active = 1";
+ $sql .= " AND aa.entity = = " . $conf->entity . ")";
$sql .= " GROUP BY t.numero_compte, t.label_operation, t.doc_ref";
$sql .= " ORDER BY t.numero_compte";
@@ -448,6 +451,7 @@ class AccountancyCategory // extends CommonObject
$sql .= " WHERE (aa.fk_accounting_category != ".$id." OR aa.fk_accounting_category IS NULL)";
$sql .= " AND asy.rowid = " . $conf->global->CHARTOFACCOUNTS;
$sql .= " AND aa.active = 1";
+ $sql .= " AND aa.entity = " . $conf->entity;
$sql .= " GROUP BY aa.account_number, aa.label";
$sql .= " ORDER BY aa.account_number, aa.label";
@@ -492,6 +496,7 @@ class AccountancyCategory // extends CommonObject
$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "accounting_system as asy ON aa.fk_pcg_version = asy.pcg_version";
$sql .= " AND asy.rowid = " . $conf->global->CHARTOFACCOUNTS;
$sql .= " AND aa.active = 1";
+ $sql .= " AND aa.entity = " . $conf->entity;
$this->db->begin();
@@ -581,7 +586,7 @@ class AccountancyCategory // extends CommonObject
*/
public function getCatsCpts()
{
- global $mysoc;
+ global $mysoc,$conf;
$sql = "";
@@ -595,8 +600,10 @@ class AccountancyCategory // extends CommonObject
$sql .= " WHERE t.fk_accounting_category IN ( SELECT c.rowid ";
$sql .= " FROM " . MAIN_DB_PREFIX . "c_accounting_category as c";
$sql .= " WHERE c.active = 1";
+ $sql .= " AND c.entity = " . $conf->entity;
$sql .= " AND (c.fk_country = ".$mysoc->country_id." OR c.fk_country = 0)";
$sql .= " AND cat.rowid = t.fk_accounting_category";
+ $sql .= " AND t.entity = " . $conf->entity;
$sql .= " ORDER BY cat.position ASC";
$resql = $this->db->query($sql);
@@ -685,7 +692,7 @@ class AccountancyCategory // extends CommonObject
*/
public function getCats($categorytype=-1)
{
- global $db, $langs, $user, $mysoc;
+ global $db, $langs, $user, $mysoc, $conf;
if (empty($mysoc->country_id)) {
dol_print_error('', 'Call to select_accounting_account with mysoc country not yet defined');
@@ -695,6 +702,7 @@ class AccountancyCategory // extends CommonObject
$sql = "SELECT c.rowid, c.code, c.label, c.formula, c.position, c.category_type";
$sql .= " FROM " . MAIN_DB_PREFIX . "c_accounting_category as c";
$sql .= " WHERE c.active = 1 ";
+ $sql .= " AND c.entity = " . $conf->entity;
if ($categorytype >= 0) $sql.=" AND c.category_type = 1";
$sql .= " AND (c.fk_country = ".$mysoc->country_id." OR c.fk_country = 0)";
$sql .= " ORDER BY c.position ASC";
diff --git a/htdocs/accountancy/class/accountancyexport.class.php b/htdocs/accountancy/class/accountancyexport.class.php
index 3a12d606fdd..52b5f1c411f 100644
--- a/htdocs/accountancy/class/accountancyexport.class.php
+++ b/htdocs/accountancy/class/accountancyexport.class.php
@@ -1,14 +1,14 @@
- * Copyright (C) 2014 Juanjo Menent
- * Copyright (C) 2015 Florian Henry
- * Copyright (C) 2015 Raphaël Doursenaud
- * Copyright (C) 2016 Pierre-Henry Favre
- * Copyright (C) 2016-2017 Alexandre Spangaro
- * Copyright (C) 2013-2017 Olivier Geffroy
- * Copyright (C) 2017 Elarifr. Ari Elbaz
- * Copyright (C) 2017 Frédéric France
+ * Copyright (C) 2007-2012 Laurent Destailleur
+ * Copyright (C) 2014 Juanjo Menent
+ * Copyright (C) 2015 Florian Henry
+ * Copyright (C) 2015 Raphaël Doursenaud
+ * Copyright (C) 2016 Pierre-Henry Favre
+ * Copyright (C) 2016-2018 Alexandre Spangaro
+ * Copyright (C) 2013-2017 Olivier Geffroy
+ * Copyright (C) 2017 Elarifr. Ari Elbaz
+ * Copyright (C) 2017 Frédéric France
*
* This program is free software; you can redistribute it and/or modify
@@ -177,7 +177,7 @@ class AccountancyExport
*/
public static function downloadFile() {
global $conf;
- $journal = 'bookkepping';
+ $filename = 'general_ledger';
include DOL_DOCUMENT_ROOT . '/accountancy/tpl/export_journal.tpl.php';
}
diff --git a/htdocs/accountancy/class/accountingaccount.class.php b/htdocs/accountancy/class/accountingaccount.class.php
index 6b7e925832b..d1870fabc38 100644
--- a/htdocs/accountancy/class/accountingaccount.class.php
+++ b/htdocs/accountancy/class/accountingaccount.class.php
@@ -384,14 +384,15 @@ class AccountingAccount extends CommonObject
/**
* Return clicable name (with picto eventually)
*
- * @param int $withpicto 0=No picto, 1=Include picto into link, 2=Only picto
- * @param int $withlabel 0=No label, 1=Include label of account
- * @param int $nourl 1=Disable url
- * @param string $moretitle Add more text to title tooltip
- * @param int $notooltip 1=Disable tooltip
+ * @param int $withpicto 0=No picto, 1=Include picto into link, 2=Only picto
+ * @param int $withlabel 0=No label, 1=Include label of account
+ * @param int $nourl 1=Disable url
+ * @param string $moretitle Add more text to title tooltip
+ * @param int $notooltip 1=Disable tooltip
+ * @param int $save_lastsearch_value -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
* @return string String with URL
*/
- function getNomUrl($withpicto = 0, $withlabel = 0, $nourl = 0, $moretitle='',$notooltip=0)
+ function getNomUrl($withpicto = 0, $withlabel = 0, $nourl = 0, $moretitle='',$notooltip=0, $save_lastsearch_value=-1)
{
global $langs, $conf, $user;
require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
@@ -402,6 +403,11 @@ class AccountingAccount extends CommonObject
$url = DOL_URL_ROOT . '/accountancy/admin/card.php?id=' . $this->id;
+ // Add param to save lastsearch_values or not
+ $add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
+ if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
+ if ($add_save_lastsearch_values) $url.='&save_lastsearch_values=1';
+
$picto = 'billr';
$label='';
@@ -560,7 +566,7 @@ class AccountingAccount extends CommonObject
function LibStatut($statut,$mode=0)
{
global $langs;
- $langs->load('users');
+ $langs->loadLangs(array("users"));
if ($mode == 0)
{
diff --git a/htdocs/accountancy/class/accountingjournal.class.php b/htdocs/accountancy/class/accountingjournal.class.php
index 2e48fc8a54a..454de6d7b84 100644
--- a/htdocs/accountancy/class/accountingjournal.class.php
+++ b/htdocs/accountancy/class/accountingjournal.class.php
@@ -256,7 +256,7 @@ class AccountingJournal extends CommonObject
{
global $langs;
- $langs->load("accountancy");
+ $langs->loadLangs(array("accountancy"));
if ($mode == 0)
{
diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php
index 13b25599280..f7fed2e2b5b 100644
--- a/htdocs/accountancy/class/bookkeeping.class.php
+++ b/htdocs/accountancy/class/bookkeeping.class.php
@@ -170,7 +170,7 @@ class BookKeeping extends CommonObject
// Check parameters
if (empty($this->numero_compte) || $this->numero_compte == '-1' || $this->numero_compte == 'NotDefined')
{
- $langs->load("errors");
+ $langs->loadLangs(array("errors"));
if (in_array($this->doc_type, array('bank', 'expense_report')))
{
$this->errors[]=$langs->trans('ErrorFieldAccountNotDefinedForBankLine', $this->fk_docdet, $this->doc_type);
@@ -246,9 +246,6 @@ class BookKeeping extends CommonObject
}
$now = dol_now();
- if (empty($this->date_create)) {
- $this->date_create = $now;
- }
$sql = "INSERT INTO " . MAIN_DB_PREFIX . $this->table_element . " (";
$sql .= "doc_date";
@@ -291,7 +288,7 @@ class BookKeeping extends CommonObject
$sql .= "," . $this->montant;
$sql .= ",'" . $this->db->escape($this->sens) . "'";
$sql .= ",'" . $this->db->escape($this->fk_user_author) . "'";
- $sql .= ",'" . $this->db->idate($this->date_create). "'";
+ $sql .= ",'" . $this->db->idate($now). "'";
$sql .= ",'" . $this->db->escape($this->code_journal) . "'";
$sql .= ",'" . $this->db->escape($this->journal_label) . "'";
$sql .= "," . $this->db->escape($this->piece_num);
@@ -354,6 +351,67 @@ class BookKeeping extends CommonObject
}
}
+ /**
+ * Return a link to the object card (with optionaly the picto)
+ *
+ * @param int $withpicto Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
+ * @param string $option On what the link point to ('nolink', ...)
+ * @param int $notooltip 1=Disable tooltip
+ * @param string $morecss Add more css on link
+ * @param int $save_lastsearch_value -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+ * @return string String with URL
+ */
+ function getNomUrl($withpicto=0, $option='', $notooltip=0, $morecss='', $save_lastsearch_value=-1)
+ {
+ global $db, $conf, $langs;
+ global $dolibarr_main_authentication, $dolibarr_main_demo;
+ global $menumanager;
+
+ if (! empty($conf->dol_no_mouse_hover)) $notooltip=1; // Force disable tooltips
+
+ $result = '';
+ $companylink = '';
+
+ $label = '' . $langs->trans("Transaction") . ' ';
+ $label.= '' . $langs->trans('Ref') . ': ' . $this->piece_num;
+
+ $url = DOL_URL_ROOT.'/accountancy/bookkeeping/card.php?piece_num='.$this->piece_num;
+
+ if ($option != 'nolink')
+ {
+ // Add param to save lastsearch_values or not
+ $add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
+ if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
+ if ($add_save_lastsearch_values) $url.='&save_lastsearch_values=1';
+ }
+
+ $linkclose='';
+ if (empty($notooltip))
+ {
+ if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+ {
+ $label=$langs->trans("ShowTransaction");
+ $linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
+ }
+ $linkclose.=' title="'.dol_escape_htmltag($label, 1).'"';
+ $linkclose.=' class="classfortooltip'.($morecss?' '.$morecss:'').'"';
+ }
+ else $linkclose = ($morecss?' class="'.$morecss.'"':'');
+
+ $linkstart = '';
+ $linkend=' ';
+
+ $result .= $linkstart;
+ if ($withpicto) $result.=img_object(($notooltip?'':$label), ($this->picto?$this->picto:'generic'), ($notooltip?(($withpicto != 2) ? 'class="paddingright"' : ''):'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip?0:1);
+ if ($withpicto != 2) $result.= $this->piece_num;
+ $result .= $linkend;
+ //if ($withpicto != 2) $result.=(($addlabel && $this->label) ? $sep . dol_trunc($this->label, ($addlabel > 1 ? $addlabel : 0)) : '');
+
+ return $result;
+ }
+
/**
* Create object into database
*
@@ -435,9 +493,6 @@ class BookKeeping extends CommonObject
$this->credit = price2num($this->credit, 'MT');
$now = dol_now();
- if (empty($this->date_create)) {
- $this->date_create = $now;
- }
// Check parameters
// Put here code to add control on parameters values
@@ -484,7 +539,7 @@ class BookKeeping extends CommonObject
$sql .= ' ' . (! isset($this->montant) ? 'NULL' : $this->montant ). ',';
$sql .= ' ' . (! isset($this->sens) ? 'NULL' : "'" . $this->db->escape($this->sens) . "'") . ',';
$sql .= ' ' . $user->id . ',';
- $sql .= ' ' . "'" . $this->db->idate($this->date_create) . "',";
+ $sql .= ' ' . "'" . $this->db->idate($now) . "',";
$sql .= ' ' . (empty($this->code_journal) ? 'NULL' : "'" . $this->db->escape($this->code_journal) . "'") . ',';
$sql .= ' ' . (empty($this->journal_label) ? 'NULL' : "'" . $this->db->escape($this->journal_label) . "'") . ',';
$sql .= ' ' . (empty($this->piece_num) ? 'NULL' : $this->db->escape($this->piece_num)).',';
@@ -676,12 +731,12 @@ class BookKeeping extends CommonObject
$sqlwhere[] = $key . '=' . $value;
} elseif ($key == 't.subledger_account' || $key == 't.numero_compte') {
$sqlwhere[] = $key . ' LIKE \'' . $this->db->escape($value) . '%\'';
- } elseif ($key == 't.label_operation') {
- $sqlwhere[] = $key . ' LIKE \'' . $this->db->escape($value) . '%\'';
} elseif ($key == 't.date_creation>=' || $key == 't.date_creation<=') {
$sqlwhere[] = $key . '\'' . $this->db->idate($value) . '\'';
+ } elseif ($key == 't.credit' || $key == 't.debit') {
+ $sqlwhere[] = natural_search($key, $value, 1, 1);
} else {
- $sqlwhere[] = $key . ' LIKE \'%' . $this->db->escape($value) . '%\'';
+ $sqlwhere[] = natural_search($key, $value, 0, 1);
}
}
}
@@ -804,13 +859,14 @@ class BookKeeping extends CommonObject
$sqlwhere[] = $key . '\'' . $this->db->idate($value) . '\'';
} elseif ($key == 't.tms>=' || $key == 't.tms<=') {
$sqlwhere[] = $key . '\'' . $this->db->idate($value) . '\'';
+ } elseif ($key == 't.credit' || $key == 't.debit') {
+ $sqlwhere[] = natural_search($key, $value, 1, 1);
} else {
- $sqlwhere[] = $key . ' LIKE \'%' . $this->db->escape($value) . '%\'';
+ $sqlwhere[] = natural_search($key, $value, 0, 1);
}
}
}
- $sql.= ' WHERE 1 = 1';
- $sql .= " AND entity IN (" . getEntity('accountancy') . ")";
+ $sql.= ' WHERE entity IN (' . getEntity('accountancy') . ')';
if (count($sqlwhere) > 0) {
$sql .= ' AND ' . implode(' ' . $filtermode . ' ', $sqlwhere);
}
diff --git a/htdocs/accountancy/customer/card.php b/htdocs/accountancy/customer/card.php
index 92d8f7b1c37..d0e5adc97fd 100644
--- a/htdocs/accountancy/customer/card.php
+++ b/htdocs/accountancy/customer/card.php
@@ -24,13 +24,10 @@
*/
require '../../main.inc.php';
-// Class
require_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
-// Langs
-$langs->load("bills");
-$langs->load("accountancy");
+$langs->loadLangs(array("bills","accountancy"));
$action = GETPOST('action', 'alpha');
$cancel = GETPOST('cancel', 'alpha');
diff --git a/htdocs/accountancy/customer/index.php b/htdocs/accountancy/customer/index.php
index aedaeda0e5b..8b88d8f396b 100644
--- a/htdocs/accountancy/customer/index.php
+++ b/htdocs/accountancy/customer/index.php
@@ -32,11 +32,7 @@ require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
require_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
// Langs
-$langs->load("compta");
-$langs->load("bills");
-$langs->load("other");
-$langs->load("main");
-$langs->load("accountancy");
+$langs->loadLangs(array("compta","bills","other","main","accountancy"));
// Security check
if (empty($conf->accounting->enabled)) {
@@ -129,6 +125,7 @@ llxHeader('', $langs->trans("CustomersVentilation"));
$textprevyear = '' . img_previous() . ' ';
$textnextyear = ' ' . img_next() . ' ';
+
print load_fiche_titre($langs->trans("CustomersVentilation") . " " . $textprevyear . " " . $langs->trans("Year") . " " . $year_start . " " . $textnextyear, '', 'title_accountancy');
// Clean database
@@ -160,8 +157,8 @@ $y = $year_current;
$buttonbind = '' . $langs->trans("ValidateHistory") . ' ';
-
-print_fiche_titre($langs->trans("OverviewOfAmountOfLinesNotBound"), $buttonbind, '');
+print_barre_liste($langs->trans("OverviewOfAmountOfLinesNotBound"), '', '', '', '', '', '', -1, '', '', 0, $buttonbind, '', 0, 1, 1);
+//print_fiche_titre($langs->trans("OverviewOfAmountOfLinesNotBound"), $buttonbind, '');
print '';
print '
';
@@ -236,7 +233,8 @@ print '';
print '';
print '
';
@@ -315,7 +313,8 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) // This part of code looks strange.
print '';
print '
';
diff --git a/htdocs/accountancy/customer/lines.php b/htdocs/accountancy/customer/lines.php
index e696b4774d1..7bc929a7e6b 100644
--- a/htdocs/accountancy/customer/lines.php
+++ b/htdocs/accountancy/customer/lines.php
@@ -27,7 +27,6 @@
*/
require '../../main.inc.php';
-// Class
require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
require_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
@@ -35,12 +34,7 @@ require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
require_once DOL_DOCUMENT_ROOT . '/core/class/html.formother.class.php';
require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
-// Langs
-$langs->load("bills");
-$langs->load("compta");
-$langs->load("main");
-$langs->load("accountancy");
-$langs->load("productbatch");
+$langs->loadLangs(array("bills","compta","accountancy","productbatch"));
$account_parent = GETPOST('account_parent');
$changeaccount = GETPOST('changeaccount');
@@ -116,10 +110,10 @@ if (is_array($changeaccount) && count($changeaccount) > 0) {
setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Account")), null, 'errors');
}
- $db->begin();
-
if (! $error)
{
+ $db->begin();
+
$sql1 = "UPDATE " . MAIN_DB_PREFIX . "facturedet as l";
$sql1 .= " SET l.fk_code_ventilation=" . (GETPOST('account_parent','int') > 0 ? GETPOST('account_parent','int') : '0');
$sql1 .= ' WHERE l.rowid IN (' . implode(',', $changeaccount) . ')';
@@ -173,20 +167,24 @@ print '';
@@ -210,12 +218,12 @@ $account_to='';
$label='';
$amount='';
-if($error)
+if ($error)
{
$account_from = GETPOST('account_from','int');
$account_to = GETPOST('account_to','int');
$label = GETPOST('label','alpha');
- $amount = GETPOST('amount','int');
+ $amount = GETPOST('amount','alpha');
}
print load_fiche_titre($langs->trans("MenuBankInternalTransfer"), '', 'title_bank.png');
@@ -246,9 +254,9 @@ print "\n";
print "";
$form->select_date((! empty($dateo)?$dateo:''),'','','','','add');
print " \n";
-print '
";
diff --git a/htdocs/compta/bank/various_payment/card.php b/htdocs/compta/bank/various_payment/card.php
index b6649250e64..2828963d889 100644
--- a/htdocs/compta/bank/various_payment/card.php
+++ b/htdocs/compta/bank/various_payment/card.php
@@ -349,7 +349,7 @@ if ($action == 'create')
print '
';
print '
';
print '';
diff --git a/htdocs/compta/bank/various_payment/index.php b/htdocs/compta/bank/various_payment/index.php
index aa47d714bd9..f92090a0259 100644
--- a/htdocs/compta/bank/various_payment/index.php
+++ b/htdocs/compta/bank/various_payment/index.php
@@ -38,7 +38,7 @@ $result = restrictedArea($user, 'banque', '', '', '');
$optioncss = GETPOST('optioncss','alpha');
-$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
$search_ref = GETPOST('search_ref','int');
$search_user = GETPOST('search_user','alpha');
$search_label = GETPOST('search_label','alpha');
@@ -153,7 +153,13 @@ if ($result)
if ($optioncss != '') $param.='&optioncss='.urlencode($optioncss);
- $newcardbutton='
'.$langs->trans('MenuNewVariousPayment').' ';
+ $newcardbutton='';
+ if ($user->rights->banque->modifier)
+ {
+ $newcardbutton='
'.$langs->trans('MenuNewVariousPayment');
+ $newcardbutton.= ' ';
+ }
print '
';
print '
';
// Show graphs
-print '
';
+print '';
if ($mesg) { print $mesg; }
else {
print $px1->show();
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 041e7099221..eda10c1773b 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -1048,15 +1048,13 @@ if (empty($reshook))
// Add link between credit note and origin
if(! empty($object->fk_facture_source)) {
$facture_source->fetch($object->fk_facture_source);
- }
- $facture_source->fetchObjectLinked();
+ $facture_source->fetchObjectLinked();
- if(! empty($facture_source->linkedObjectsIds)) {
- $linkedObjectIds = $facture_source->linkedObjectsIds;
- $sourcetype = key($linkedObjectIds);
- $fk_origin = current($facture_source->linkedObjectsIds[$sourcetype]);
-
- $object->add_object_linked($sourcetype, $fk_origin);
+ if(! empty($facture_source->linkedObjectsIds)) {
+ foreach($facture_source->linkedObjectsIds as $sourcetype => $TIds) {
+ $object->add_object_linked($sourcetype, current($TIds));
+ }
+ }
}
}
}
@@ -2386,7 +2384,7 @@ if (empty($reshook))
}
}
}
-
+
// Actions when printing a doc from card
include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
@@ -2412,22 +2410,15 @@ if (empty($reshook))
$ret = $extrafields->setOptionalsFromPost($extralabels, $object, GETPOST('attribute','none'));
if ($ret < 0) $error++;
- if (! $error) {
- // Actions on extra fields (by external module or standard code)
- // TODO le hook fait double emploi avec le trigger !!
- $hookmanager->initHooks(array('invoicedao'));
- $parameters = array('id' => $object->id);
- $reshook = $hookmanager->executeHooks('insertExtraFields', $parameters, $object, $action); // Note that $action and $object may have been modified by
- // some hooks
- if (empty($reshook)) {
- $result = $object->insertExtraFields('BILL_MODIFY');
- if ($result < 0)
- {
- setEventMessages($object->error, $object->errors, 'errors');
- $error++;
- }
- } else if ($reshook < 0)
- $error ++;
+ if (! $error)
+ {
+ // Actions on extra fields
+ $result = $object->insertExtraFields('BILL_MODIFY');
+ if ($result < 0)
+ {
+ setEventMessages($object->error, $object->errors, 'errors');
+ $error++;
+ }
}
if ($error)
@@ -3067,7 +3058,7 @@ if ($action == 'create')
$parameters = array('objectsrc' => $objectsrc,'colspan' => ' colspan="2"', 'cols'=>2);
$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
- if (empty($reshook) && ! empty($extrafields->attribute_label)) {
+ if (empty($reshook)) {
print $object->showOptionals($extrafields, 'edit');
}
@@ -4815,8 +4806,7 @@ else if ($id > 0 || ! empty($ref))
print '';
}
}
-
-
+
// For situation invoice with excess received
if ($object->statut == Facture::STATUS_VALIDATED
&& ($object->total_ttc - $totalpaye - $totalcreditnotes - $totaldeposits) > 0
@@ -4854,7 +4844,7 @@ else if ($id > 0 || ! empty($ref))
print '';
}
}
-
+
// Create next situation invoice
if ($user->rights->facture->creer && ($object->type == 5) && ($object->statut == 1 || $object->statut == 2)) {
if ($object->is_last_in_cycle() && $object->situation_final != 1) {
@@ -4923,6 +4913,7 @@ else if ($id > 0 || ! empty($ref))
// Show links to link elements
$linktoelem = $form->showLinkToObjectBlock($object, null, array('invoice'));
+
$compatibleImportElementsList = false;
if($user->rights->facture->creer
&& $object->statut == Facture::STATUS_DRAFT
@@ -4931,7 +4922,7 @@ else if ($id > 0 || ! empty($ref))
$compatibleImportElementsList = array('commande'); // import from linked elements
}
$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem,$compatibleImportElementsList);
-
+
// Show online payment link
$useonlinepayment = (! empty($conf->paypal->enabled) || ! empty($conf->stripe->enabled) || ! empty($conf->paybox->enabled));
diff --git a/htdocs/compta/facture/class/api_invoices.class.php b/htdocs/compta/facture/class/api_invoices.class.php
index a114829d43c..2c744b8bda3 100644
--- a/htdocs/compta/facture/class/api_invoices.class.php
+++ b/htdocs/compta/facture/class/api_invoices.class.php
@@ -196,7 +196,7 @@ class Invoices extends DolibarrApi
* @param array $request_data Request datas
* @return int ID of invoice
*/
- function post($request_data = NULL)
+ function post($request_data = null)
{
if(! DolibarrApiAccess::$user->rights->facture->creer) {
throw new RestException(401, "Insuffisant rights");
@@ -313,7 +313,7 @@ class Invoices extends DolibarrApi
* @throws 401
* @throws 404
*/
- function putLine($id, $lineid, $request_data = NULL) {
+ function putLine($id, $lineid, $request_data = null) {
if(! DolibarrApiAccess::$user->rights->facture->creer) {
throw new RestException(401);
}
@@ -414,7 +414,7 @@ class Invoices extends DolibarrApi
* @param array $request_data Datas
* @return int
*/
- function put($id, $request_data = NULL)
+ function put($id, $request_data = null)
{
if(! DolibarrApiAccess::$user->rights->facture->creer) {
throw new RestException(401);
@@ -499,7 +499,7 @@ class Invoices extends DolibarrApi
* @throws 404
* @throws 400
*/
- function postLine($id, $request_data = NULL) {
+ function postLine($id, $request_data = null) {
if(! DolibarrApiAccess::$user->rights->facture->creer) {
throw new RestException(401);
}
@@ -562,6 +562,59 @@ class Invoices extends DolibarrApi
return $updateRes;
}
+ /**
+ * Adds a contact to an invoice
+ *
+ * @param int $id Order ID
+ * @param int $fk_socpeople Id of thirdparty contact (if source = 'external') or id of user (if souce = 'internal') to link
+ * @param string $type_contact Type of contact (code). Must a code found into table llx_c_type_contact. For example: BILLING
+ * @param string $source external=Contact extern (llx_socpeople), internal=Contact intern (llx_user)
+ * @param int $notrigger Disable all triggers
+ *
+ * @url POST {id}/contacts
+ *
+ * @return array
+ *
+ * @throws 200
+ * @throws 304
+ * @throws 401
+ * @throws 404
+ * @throws 500
+ *
+ */
+ function addContact($id, $fk_socpeople, $type_contact, $source, $notrigger=0)
+ {
+ if(! DolibarrApiAccess::$user->rights->facture->creer) {
+ throw new RestException(401);
+ }
+ $result = $this->invoice->fetch($id);
+ if( ! $result ) {
+ throw new RestException(404, 'Invoice not found');
+ }
+
+ if( ! DolibarrApi::_checkAccessToResource('facture',$this->invoice->id)) {
+ throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+ }
+
+ $result = $this->invoice->add_contact($fk_socpeople,$type_contact,$source,$notrigger);
+ if ($result < 0) {
+ throw new RestException(500, 'Error : '.$this->invoice->error);
+ }
+
+ $result = $this->invoice->fetch($id);
+ if( ! $result ) {
+ throw new RestException(404, 'Invoice not found');
+ }
+
+ if( ! DolibarrApi::_checkAccessToResource('facture',$this->invoice->id)) {
+ throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+ }
+
+ return $this->_cleanObjectDatas($this->invoice);
+ }
+
+
+
/**
* Sets an invoice as draft
*
@@ -899,14 +952,13 @@ class Invoices extends DolibarrApi
return $result;
}
- /**
- * Add payment line to a specific invoice
- *
- * The model schema is defined by the PaymentData class.
+
+ /**
+ * Add payment line to a specific invoice with the remain to pay as amount.
*
* @param int $id Id of invoice
- * @param string $datepaye {@from body} Payment date {@type timestamp}
- * @param int $paiementid {@from body} Payment mode Id {@min 1}
+ * @param string $datepaye {@from body} Payment date {@type timestamp}
+ * @param int $paiementid {@from body} Payment mode Id {@min 1}
* @param string $closepaidinvoices {@from body} Close paid invoices {@choice yes,no}
* @param int $accountid {@from body} Account Id {@min 1}
* @param string $num_paiement {@from body} Payment number (optional)
@@ -922,63 +974,194 @@ class Invoices extends DolibarrApi
* @throws 404
*/
function addPayment($id, $datepaye, $paiementid, $closepaidinvoices, $accountid, $num_paiement='', $comment='', $chqemetteur='', $chqbank='') {
+ global $conf;
+
+ require_once DOL_DOCUMENT_ROOT . '/compta/paiement/class/paiement.class.php';
+
+ if(! DolibarrApiAccess::$user->rights->facture->creer) {
+ throw new RestException(403);
+ }
+ if(empty($id)) {
+ throw new RestException(400, 'Invoice ID is mandatory');
+ }
+
+ if( ! DolibarrApi::_checkAccessToResource('facture',$id)) {
+ throw new RestException(403, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+ }
+
+ if (! empty($conf->banque->enabled)) {
+ if(empty($accountid)) {
+ throw new RestException(400, 'Account ID is mandatory');
+ }
+ }
+
+ if(empty($paiementid)) {
+ throw new RestException(400, 'Paiement ID or Paiement Code is mandatory');
+ }
+
+
+ $result = $this->invoice->fetch($id);
+ if( ! $result ) {
+ throw new RestException(404, 'Invoice not found');
+ }
+
+ // Calculate amount to pay
+ $totalpaye = $this->invoice->getSommePaiement();
+ $totalcreditnotes = $this->invoice->getSumCreditNotesUsed();
+ $totaldeposits = $this->invoice->getSumDepositsUsed();
+ $resteapayer = price2num($this->invoice->total_ttc - $totalpaye - $totalcreditnotes - $totaldeposits, 'MT');
+
+ $this->db->begin();
+
+ $amounts = array();
+ $multicurrency_amounts = array();
+
+ // Clean parameters amount if payment is for a credit note
+ if ($this->invoice->type == Facture::TYPE_CREDIT_NOTE) {
+ $resteapayer = price2num($resteapayer,'MT');
+ $amounts[$id] = -$resteapayer;
+ // Multicurrency
+ $newvalue = price2num($this->invoice->multicurrency_total_ttc,'MT');
+ $multicurrency_amounts[$id] = -$newvalue;
+ } else {
+ $resteapayer = price2num($resteapayer,'MT');
+ $amounts[$id] = $resteapayer;
+ // Multicurrency
+ $newvalue = price2num($this->invoice->multicurrency_total_ttc,'MT');
+ $multicurrency_amounts[$id] = $newvalue;
+ }
+
+
+ // Creation of payment line
+ $paiement = new Paiement($this->db);
+ $paiement->datepaye = $datepaye;
+ $paiement->amounts = $amounts; // Array with all payments dispatching with invoice id
+ $paiement->multicurrency_amounts = $multicurrency_amounts; // Array with all payments dispatching
+ $paiement->paiementid = $paiementid;
+ $paiement->paiementcode = dol_getIdFromCode($this->db,$paiementid,'c_paiement','id','code',1);
+ $paiement->num_paiement = $num_paiement;
+ $paiement->note = $comment;
+
+ $paiement_id = $paiement->create(DolibarrApiAccess::$user, ($closepaidinvoices=='yes'?1:0)); // This include closing invoices
+ if ($paiement_id < 0)
+ {
+ $this->db->rollback();
+ throw new RestException(400, 'Payment error : '.$paiement->error);
+ }
+
+ if (! empty($conf->banque->enabled)) {
+ $label='(CustomerInvoicePayment)';
+
+ if($paiement->paiementcode == 'CHQ' && empty($chqemetteur)) {
+ throw new RestException(400, 'Emetteur is mandatory when payment code is '.$paiement->paiementcode);
+ }
+ if ($this->invoice->type == Facture::TYPE_CREDIT_NOTE) $label='(CustomerInvoicePaymentBack)'; // Refund of a credit note
+ $result=$paiement->addPaymentToBank(DolibarrApiAccess::$user,'payment',$label,$accountid,$chqemetteur,$chqbank);
+ if ($result < 0)
+ {
+ $this->db->rollback();
+ throw new RestException(400, 'Add payment to bank error : '.$paiement->error);
+ }
+ }
+
+ $this->db->commit();
+
+ return $paiement_id;
+ }
+
+ /**
+ * Add a payment to pay partially or completely one or several invoices.
+ * Warning: Take care that all invoices are owned by the same customer.
+ * Example of value for parameter arrayofamounts: {"1": "99.99", "2": "10"}
+ *
+ * @param array $arrayofamounts {@from body} Array with id of invoices with amount to pay for each invoice
+ * @param string $datepaye {@from body} Payment date {@type timestamp}
+ * @param int $paiementid {@from body} Payment mode Id {@min 1}
+ * @param string $closepaidinvoices {@from body} Close paid invoices {@choice yes,no}
+ * @param int $accountid {@from body} Account Id {@min 1}
+ * @param string $num_paiement {@from body} Payment number (optional)
+ * @param string $comment {@from body} Note (optional)
+ * @param string $chqemetteur {@from body} Payment issuer (mandatory if paiementcode = 'CHQ')
+ * @param string $chqbank {@from body} Issuer bank name (optional)
+ *
+ * @url POST /paymentsdistributed
+ *
+ * @return int Payment ID
+ * @throws 400
+ * @throws 401
+ * @throws 403
+ * @throws 404
+ */
+ function addPaymentDistributed($arrayofamounts, $datepaye, $paiementid, $closepaidinvoices, $accountid, $num_paiement='', $comment='', $chqemetteur='', $chqbank='')
+ {
global $conf;
require_once DOL_DOCUMENT_ROOT . '/compta/paiement/class/paiement.class.php';
if(! DolibarrApiAccess::$user->rights->facture->creer) {
- throw new RestException(401);
+ throw new RestException(403);
}
- if(empty($id)) {
- throw new RestException(400, 'Invoice ID is mandatory');
- }
-
- if( ! DolibarrApi::_checkAccessToResource('facture',$id)) {
- throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+ foreach($arrayofamounts as $id => $amount) {
+ if(empty($id)) {
+ throw new RestException(400, 'Invoice ID is mandatory. Fill the invoice id and amount into arrayofamounts parameter. For example: {"1": "99.99", "2": "10"}');
+ }
+ if( ! DolibarrApi::_checkAccessToResource('facture',$id)) {
+ throw new RestException(403, 'Access not allowed on invoice ID '.$id.' for login '.DolibarrApiAccess::$user->login);
+ }
}
if (! empty($conf->banque->enabled)) {
- if(empty($accountid)) {
- throw new RestException(400, 'Account ID is mandatory');
- }
+ if(empty($accountid)) {
+ throw new RestException(400, 'Account ID is mandatory');
+ }
}
-
if(empty($paiementid)) {
- throw new RestException(400, 'Paiement ID or Paiement Code is mandatory');
+ throw new RestException(400, 'Paiement ID or Paiement Code is mandatory');
}
-
- $result = $this->invoice->fetch($id);
- if( ! $result ) {
- throw new RestException(404, 'Invoice not found');
- }
-
- // Calculate amount to pay
- $totalpaye = $this->invoice->getSommePaiement();
- $totalcreditnotes = $this->invoice->getSumCreditNotesUsed();
- $totaldeposits = $this->invoice->getSumDepositsUsed();
- $resteapayer = price2num($this->invoice->total_ttc - $totalpaye - $totalcreditnotes - $totaldeposits, 'MT');
-
$this->db->begin();
$amounts = array();
$multicurrency_amounts = array();
- // Clean parameters amount if payment is for a credit note
- if ($this->invoice->type == Facture::TYPE_CREDIT_NOTE) {
- $resteapayer = price2num($resteapayer,'MT');
- $amounts[$id] = -$resteapayer;
- // Multicurrency
- $newvalue = price2num($this->invoice->multicurrency_total_ttc,'MT');
- $multicurrency_amounts[$id] = -$newvalue;
- } else {
- $resteapayer = price2num($resteapayer,'MT');
- $amounts[$id] = $resteapayer;
- // Multicurrency
- $newvalue = price2num($this->invoice->multicurrency_total_ttc,'MT');
- $multicurrency_amounts[$id] = $newvalue;
- }
+ // Loop on each invoice to pay
+ foreach($arrayofamounts as $id => $amount)
+ {
+ $result = $this->invoice->fetch($id);
+ if( ! $result ) {
+ $this->db->rollback();
+ throw new RestException(404, 'Invoice ID '.$id.' not found');
+ }
+ // Calculate amount to pay
+ $totalpaye = $this->invoice->getSommePaiement();
+ $totalcreditnotes = $this->invoice->getSumCreditNotesUsed();
+ $totaldeposits = $this->invoice->getSumDepositsUsed();
+ $resteapayer = price2num($this->invoice->total_ttc - $totalpaye - $totalcreditnotes - $totaldeposits, 'MT');
+ if ($amount != 'remain')
+ {
+ if ($amount > $resteapayer)
+ {
+ $this->db->rollback();
+ throw new RestException(400, 'Payment amount on invoice ID '.$id.' ('.$amount.') is higher than remain to pay ('.$resteapayer.')');
+ }
+ $resteapayer = $amount;
+ }
+ // Clean parameters amount if payment is for a credit note
+ if ($this->invoice->type == Facture::TYPE_CREDIT_NOTE) {
+ $resteapayer = price2num($resteapayer,'MT');
+ $amounts[$id] = -$resteapayer;
+ // Multicurrency
+ $newvalue = price2num($this->invoice->multicurrency_total_ttc,'MT');
+ $multicurrency_amounts[$id] = -$newvalue;
+ } else {
+ $resteapayer = price2num($resteapayer,'MT');
+ $amounts[$id] = $resteapayer;
+ // Multicurrency
+ $newvalue = price2num($this->invoice->multicurrency_total_ttc,'MT');
+ $multicurrency_amounts[$id] = $newvalue;
+ }
+ }
// Creation of payment line
$paiement = new Paiement($this->db);
@@ -989,17 +1172,14 @@ class Invoices extends DolibarrApi
$paiement->paiementcode = dol_getIdFromCode($this->db,$paiementid,'c_paiement','id','code',1);
$paiement->num_paiement = $num_paiement;
$paiement->note = $comment;
-
$paiement_id = $paiement->create(DolibarrApiAccess::$user, ($closepaidinvoices=='yes'?1:0)); // This include closing invoices
if ($paiement_id < 0)
{
$this->db->rollback();
throw new RestException(400, 'Payment error : '.$paiement->error);
}
-
if (! empty($conf->banque->enabled)) {
$label='(CustomerInvoicePayment)';
-
if($paiement->paiementcode == 'CHQ' && empty($chqemetteur)) {
throw new RestException(400, 'Emetteur is mandatory when payment code is '.$paiement->paiementcode);
}
@@ -1011,7 +1191,9 @@ class Invoices extends DolibarrApi
throw new RestException(400, 'Add payment to bank error : '.$paiement->error);
}
}
+
$this->db->commit();
+
return $paiement_id;
}
diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php
index 8759f2eebf3..40205ff0a97 100644
--- a/htdocs/compta/facture/class/facture-rec.class.php
+++ b/htdocs/compta/facture/class/facture-rec.class.php
@@ -108,7 +108,7 @@ class FactureRec extends CommonInvoice
if (empty($this->frequency))
{
$this->frequency=0;
- $this->date_when=NULL;
+ $this->date_when=null;
}
@@ -475,7 +475,6 @@ class FactureRec extends CommonInvoice
$line->id = $objp->rowid;
$line->rowid = $objp->rowid;
- $line->label = $objp->custom_label; // Label line
$line->desc = $objp->description; // Description line
$line->description = $objp->description; // Description line
$line->product_type = $objp->product_type; // Type of line
@@ -488,6 +487,8 @@ class FactureRec extends CommonInvoice
$line->qty = $objp->qty;
$line->subprice = $objp->subprice;
+ $line->label = $objp->custom_label; // @deprecated
+
$line->vat_src_code = $objp->vat_src_code;
$line->tva_tx = $objp->tva_tx;
$line->localtax1_tx = $objp->localtax1_tx;
@@ -978,6 +979,8 @@ class FactureRec extends CommonInvoice
{
global $conf, $langs, $db, $user;
+ $error=0;
+
$langs->load("bills");
$nb_create=0;
@@ -992,6 +995,7 @@ class FactureRec extends CommonInvoice
$sql.= " AND (date_when IS NULL OR date_when <= '".$db->idate($today)."')";
$sql.= ' AND (nb_gen_done < nb_gen_max OR nb_gen_max = 0)';
$sql.= ' AND suspended = 0';
+ $sql.= ' AND entity = '.$conf->entity; // MUST STAY = $conf->entity here
$sql.= $db->order('entity', 'ASC');
//print $sql;exit;
@@ -1006,58 +1010,68 @@ class FactureRec extends CommonInvoice
$saventity = $conf->entity;
- while ($i < $num) // Loop on each template invoice
+ while ($i < $num) // Loop on each template invoice. If $num = 0, test is false at first pass.
{
- $line = $db->fetch_object($resql);
+ $line = $db->fetch_object($resql);
$db->begin();
- $facturerec = new FactureRec($db);
+ $invoiceidgenerated = 0;
+
+ $facturerec = new FactureRec($db);
$facturerec->fetch($line->rowid);
- // Set entity context
- $conf->entity = $facturerec->entity;
+ if ($facturerec->id > 0)
+ {
+ // Set entity context
+ $conf->entity = $facturerec->entity;
- dol_syslog("createRecurringInvoices Process invoice template id=".$facturerec->id.", ref=".$facturerec->ref.", entity=".$facturerec->entity);
+ dol_syslog("createRecurringInvoices Process invoice template id=".$facturerec->id.", ref=".$facturerec->ref.", entity=".$facturerec->entity);
- $error=0;
+ $facture = new Facture($db);
+ $facture->fac_rec = $facturerec->id; // We will create $facture from this recurring invoice
+ $facture->fk_fac_rec_source = $facturerec->id; // We will create $facture from this recurring invoice
- $facture = new Facture($db);
- $facture->fac_rec = $facturerec->id; // We will create $facture from this recurring invoice
- $facture->fk_fac_rec_source = $facturerec->id; // We will create $facture from this recurring invoice
+ $facture->type = self::TYPE_STANDARD;
+ $facture->brouillon = 1;
+ $facture->date = (empty($facturerec->date_when)?$now:$facturerec->date_when); // We could also use dol_now here but we prefer date_when so invoice has real date when we would like even if we generate later.
+ $facture->socid = $facturerec->socid;
- $facture->type = self::TYPE_STANDARD;
- $facture->brouillon = 1;
- $facture->date = (empty($facturerec->date_when)?$now:$facturerec->date_when); // We could also use dol_now here but we prefer date_when so invoice has real date when we would like even if we generate later.
- $facture->socid = $facturerec->socid;
-
- $invoiceidgenerated = $facture->create($user);
- if ($invoiceidgenerated <= 0)
- {
- $this->errors = $facture->errors;
- $this->error = $facture->error;
- $error++;
- }
- if (! $error && $facturerec->auto_validate)
- {
- $result = $facture->validate($user);
- if ($result <= 0)
- {
- $this->errors = $facture->errors;
- $this->error = $facture->error;
- $error++;
- }
- }
- if (! $error && $facturerec->generate_pdf)
- {
- $result = $facture->generateDocument($facturerec->modelpdf, $langs);
- if ($result <= 0)
- {
- $this->errors = $facture->errors;
- $this->error = $facture->error;
- $error++;
- }
- }
+ $invoiceidgenerated = $facture->create($user);
+ if ($invoiceidgenerated <= 0)
+ {
+ $this->errors = $facture->errors;
+ $this->error = $facture->error;
+ $error++;
+ }
+ if (! $error && $facturerec->auto_validate)
+ {
+ $result = $facture->validate($user);
+ if ($result <= 0)
+ {
+ $this->errors = $facture->errors;
+ $this->error = $facture->error;
+ $error++;
+ }
+ }
+ if (! $error && $facturerec->generate_pdf)
+ {
+ $result = $facture->generateDocument($facturerec->modelpdf, $langs);
+ if ($result <= 0)
+ {
+ $this->errors = $facture->errors;
+ $this->error = $facture->error;
+ $error++;
+ }
+ }
+ }
+ else
+ {
+ $error++;
+ $this->error="Failed to load invoice template with id=".$line->rowid.", entity=".$conf->entity."\n";
+ $this->errors[]="Failed to load invoice template with id=".$line->rowid.", entity=".$conf->entity;
+ dol_syslog("createRecurringInvoices Failed to load invoice template with id=".$line->rowid.", entity=".$conf->entity);
+ }
if (! $error && $invoiceidgenerated >= 0)
{
@@ -1503,7 +1517,7 @@ class FactureRec extends CommonInvoice
}
/**
- * Update the auto validate invoice
+ * Update the auto validate flag of invoice
*
* @param int $validate 0 to create in draft, 1 to create and validate invoice
* @return int <0 if KO, >0 if OK
@@ -1791,7 +1805,7 @@ class FactureLigneRec extends CommonInvoiceLine
}
}
- if (! $notrigger)
+ if (! $error && ! $notrigger)
{
// Call trigger
$result=$this->call_trigger('LINEBILL_REC_UPDATE',$user);
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index d30c20f164a..7403804b179 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -613,7 +613,7 @@ class Facture extends CommonInvoice
$line = $this->lines[$i];
// Test and convert into object this->lines[$i]. When coming from REST API, we may still have an array
- //if (! is_object($line)) $line=json_decode(json_encode($line), FALSE); // convert recursively array into object.
+ //if (! is_object($line)) $line=json_decode(json_encode($line), false); // convert recursively array into object.
if (! is_object($line)) $line = (object) $line;
if ($result >= 0)
@@ -750,35 +750,20 @@ class Facture extends CommonInvoice
{
$action='create';
- // Actions on extra fields (by external module or standard code)
- // TODO le hook fait double emploi avec le trigger !!
- /*
- $hookmanager->initHooks(array('invoicedao'));
- $parameters=array('invoiceid'=>$this->id);
- $reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$this,$action); // Note that $action and $object may have been modified by some hooks
- if (empty($reshook))
- {
- if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
- {*/
+ // Actions on extra fields
if (! $error)
{
$result=$this->insertExtraFields();
if ($result < 0) $error++;
}
- /*}
- }
- else if ($reshook < 0) $error++;*/
- if (! $error)
- {
- if (! $notrigger)
- {
- // Call trigger
- $result=$this->call_trigger('BILL_CREATE',$user);
- if ($result < 0) $error++;
- // End call triggers
- }
- }
+ if (! $error && ! $notrigger)
+ {
+ // Call trigger
+ $result=$this->call_trigger('BILL_CREATE',$user);
+ if ($result < 0) $error++;
+ // End call triggers
+ }
if (! $error)
{
@@ -2007,6 +1992,7 @@ class Facture extends CommonInvoice
$this->db->begin();
dol_syslog(get_class($this)."::set_paid rowid=".$this->id, LOG_DEBUG);
+
$sql = 'UPDATE '.MAIN_DB_PREFIX.'facture SET';
$sql.= ' fk_statut='.self::STATUS_CLOSED;
if (! $close_code) $sql.= ', paye=1';
@@ -2014,7 +2000,6 @@ class Facture extends CommonInvoice
if ($close_note) $sql.= ", close_note='".$this->db->escape($close_note)."'";
$sql.= ' WHERE rowid = '.$this->id;
- dol_syslog(get_class($this)."::set_paid", LOG_DEBUG);
$resql = $this->db->query($sql);
if ($resql)
{
@@ -2386,7 +2371,7 @@ class Facture extends CommonInvoice
if (!empty($conf->global->INVOICE_USE_SITUATION))
{
- $final = True;
+ $final = true;
$nboflines = count($this->lines);
while (($i < $nboflines) && $final) {
$final = ($this->lines[$i]->situation_percent == 100);
@@ -2588,6 +2573,7 @@ class Facture extends CommonInvoice
// Deprecation warning
if ($label) {
dol_syslog(__METHOD__ . ": using line label is deprecated", LOG_WARNING);
+ //var_dump(debug_backtrace(false));exit;
}
global $mysoc, $conf, $langs;
@@ -2753,14 +2739,15 @@ class Facture extends CommonInvoice
// Mise a jour informations denormalisees au niveau de la facture meme
$result=$this->update_price(1,'auto',0,$mysoc); // The addline method is designed to add line from user input so total calculation with update_price must be done using 'auto' mode.
+
if ($result > 0)
{
$this->db->commit();
- return $this->line->rowid;
+ return $this->line->id;
}
else
{
- $this->error=$this->db->error();
+ $this->error=$this->db->lasterror();
$this->db->rollback();
return -1;
}
@@ -4517,11 +4504,11 @@ class FactureLigne extends CommonInvoiceLine
$resql=$this->db->query($sql);
if ($resql)
{
- $this->rowid=$this->db->last_insert_id(MAIN_DB_PREFIX.'facturedet');
+ $this->id=$this->db->last_insert_id(MAIN_DB_PREFIX.'facturedet');
+ $this->rowid=$this->id; // For backward compatibility
if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
{
- $this->id=$this->rowid;
$result=$this->insertExtraFields();
if ($result < 0)
{
@@ -4593,12 +4580,12 @@ class FactureLigne extends CommonInvoiceLine
}
$this->db->commit();
- return $this->rowid;
+ return $this->id;
}
else
{
- $this->error=$this->db->error();
+ $this->error=$this->db->lasterror();
$this->db->rollback();
return -2;
}
@@ -4717,7 +4704,7 @@ class FactureLigne extends CommonInvoiceLine
}
}
- if (! $notrigger)
+ if (! $error && ! $notrigger)
{
// Call trigger
$result=$this->call_trigger('LINEBILL_UPDATE',$user);
diff --git a/htdocs/compta/facture/document.php b/htdocs/compta/facture/document.php
index a9396e445c9..70dcfebaacb 100644
--- a/htdocs/compta/facture/document.php
+++ b/htdocs/compta/facture/document.php
@@ -171,7 +171,7 @@ if ($id > 0 || ! empty($ref))
print '';
print ''.$langs->trans("NbOfAttachedFiles").' '.count($filearray).' '.$langs->trans("TotalSizeOfAttachedFiles").' '.$totalsize.' '.$langs->trans("bytes").' '.$langs->trans("TotalSizeOfAttachedFiles").' '.dol_print_size($totalsize,1,1).'
\n";
print "\n";
diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php
index 6f96e74d345..1fc7fa1fb96 100644
--- a/htdocs/compta/facture/fiche-rec.php
+++ b/htdocs/compta/facture/fiche-rec.php
@@ -69,7 +69,7 @@ $projectid = GETPOST('projectid','int');
$year_date_when=GETPOST('year_date_when');
$month_date_when=GETPOST('month_date_when');
-$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
$sortfield = GETPOST("sortfield",'alpha');
$sortorder = GETPOST("sortorder",'alpha');
$page = GETPOST("page",'int');
@@ -417,7 +417,8 @@ if (empty($reshook))
$ret = $extrafields->setOptionalsFromPost($extralabels, $object, GETPOST('attribute','none'));
if ($ret < 0) $error++;
- if (! $error) {
+ if (! $error)
+ {
$result = $object->insertExtraFields('BILLREC_MODIFY');
if ($result < 0)
{
@@ -1496,7 +1497,7 @@ else
}
print ' ';
if ($action == 'date_when' || $object->frequency > 0)
{
@@ -1512,7 +1513,14 @@ else
print $form->editfieldval($langs->trans("NextDateToExecution"), 'date_when', $object->date_when, $object, $user->rights->facture->creer, 'day', $object->date_when, null, '', '', 0, 'strikeIfMaxNbGenReached');
}
//var_dump(dol_print_date($object->date_when+60, 'dayhour').' - '.dol_print_date($now, 'dayhour'));
- if ($action != 'editdate_when' && $object->frequency > 0 && $object->date_when && $object->date_when < $now) print img_warning($langs->trans("Late"));
+ if (! $object->isMaxNbGenReached())
+ {
+ if ($action != 'editdate_when' && $object->frequency > 0 && $object->date_when && $object->date_when < $now) print img_warning($langs->trans("Late"));
+ }
+ else
+ {
+ print img_info($langs->trans("MaxNumberOfGenerationReached"));
+ }
print ' ';
print '';
- print '';
- print ($objp->frequency ? ($invoicerectmp->isMaxNbGenReached()?'':'').dol_print_date($db->jdate($objp->date_when),'day').($invoicerectmp->isMaxNbGenReached()?' ':'') : ''.$langs->trans('NA').' ');
- if ($objp->frequency > 0 && $db->jdate($objp->date_when) && $db->jdate($objp->date_when) < $now) print img_warning($langs->trans("Late"));
- print '
';
- print ' ';
- if (! $i) $totalarray['nbfield']++;
+ print '';
+ print '';
+ print ($objp->frequency ? ($invoicerectmp->isMaxNbGenReached()?'':'').dol_print_date($db->jdate($objp->date_when),'day').($invoicerectmp->isMaxNbGenReached()?' ':'') : ''.$langs->trans('NA').' ');
+ if (! $invoicerectmp->isMaxNbGenReached())
+ {
+ if ($objp->frequency > 0 && $db->jdate($objp->date_when) && $db->jdate($objp->date_when) < $now) print img_warning($langs->trans("Late"));
+ }
+ else
+ {
+ print img_info($langs->trans("MaxNumberOfGenerationReached"));
+ }
+ print '
';
+ print ' ';
+ if (! $i) $totalarray['nbfield']++;
}
if (! empty($arrayfields['f.datec']['checked']))
{
@@ -631,7 +644,11 @@ if ($resql)
print '';
if ($user->rights->facture->creer && empty($invoicerectmp->suspended))
{
- if (empty($objp->frequency) || $db->jdate($objp->date_when) <= $today)
+ if ($invoicerectmp->isMaxNbGenReached())
+ {
+ print $langs->trans("MaxNumberOfGenerationReached");
+ }
+ elseif (empty($objp->frequency) || $db->jdate($objp->date_when) <= $today)
{
print '';
print $langs->trans("CreateBill").' ';
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 32dfd03a8bf..b6bde6605ad 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -90,12 +90,13 @@ $search_country=GETPOST("search_country",'int');
$search_type_thirdparty=GETPOST("search_type_thirdparty",'int');
$search_user = GETPOST('search_user','int');
$search_sale = GETPOST('search_sale','int');
-$day = GETPOST('day','int');
-$month = GETPOST('month','int');
-$year = GETPOST('year','int');
-$day_lim = GETPOST('day_lim','int');
-$month_lim = GETPOST('month_lim','int');
-$year_lim = GETPOST('year_lim','int');
+$search_day = GETPOST('search_day','int');
+$search_month = GETPOST('search_month','int');
+$search_year = GETPOST('search_year','int');
+$search_day_lim = GETPOST('search_day_lim','int');
+$search_month_lim = GETPOST('search_month_lim','int');
+$search_year_lim = GETPOST('search_year_lim','int');
+$search_categ_cus=trim(GETPOST("search_categ_cus",'int'));
$option = GETPOST('search_option');
if ($option == 'late') {
@@ -103,7 +104,7 @@ if ($option == 'late') {
}
$filtre = GETPOST('filtre','alpha');
-$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
$sortfield = GETPOST("sortfield",'alpha');
$sortorder = GETPOST("sortorder",'alpha');
$page = GETPOST("page",'int');
@@ -218,16 +219,18 @@ if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter','a
$search_type='';
$search_country='';
$search_type_thirdparty='';
- $day='';
- $year='';
- $month='';
+ $search_day='';
+ $search_year='';
+ $search_month='';
$option='';
$filter='';
- $day_lim='';
- $year_lim='';
- $month_lim='';
+ $search_day_lim='';
+ $search_year_lim='';
+ $search_month_lim='';
$toselect='';
$search_array_options=array();
+ $search_categ_cus=0;
+
}
if (empty($reshook))
@@ -369,6 +372,8 @@ $sql.= " p.rowid as project_id, p.ref as project_ref, p.title as project_label";
// We need dynamount_payed to be able to sort on status (value is surely wrong because we can count several lines several times due to other left join or link with contacts. But what we need is just 0 or > 0)
// TODO Better solution to be able to sort on already payed or remain to pay is to store amount_payed in a denormalized field.
if (! $sall) $sql.= ', SUM(pf.amount) as dynamount_payed';
+if ($search_categ_cus) $sql .= ", cc.fk_categorie, cc.fk_soc";
+
// Add fields from extrafields
foreach ($extrafields->attribute_label as $key => $val) $sql.=($extrafields->attribute_type[$key] != 'separate' ? ",ef.".$key.' as options_'.$key : '');
// Add fields from hooks
@@ -379,6 +384,8 @@ $sql.= ' FROM '.MAIN_DB_PREFIX.'societe as s';
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as country on (country.rowid = s.fk_pays)";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_typent as typent on (typent.id = s.fk_typent)";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as state on (state.rowid = s.fk_departement)";
+if (! empty($search_categ_cus)) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_societe as cc ON s.rowid = cc.fk_soc"; // We'll need this table joined to the select in order to filter by categ
+
$sql.= ', '.MAIN_DB_PREFIX.'facture as f';
if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."facture_extrafields as ef on (f.rowid = ef.fk_object)";
if (! $sall) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'paiement_facture as pf ON pf.fk_facture = f.rowid';
@@ -435,6 +442,8 @@ if ($search_montant_vat != '') $sql.= natural_search('f.tva', $search_montant_va
if ($search_montant_localtax1 != '') $sql.= natural_search('f.localtax1', $search_montant_localtax1, 1);
if ($search_montant_localtax2 != '') $sql.= natural_search('f.localtax2', $search_montant_localtax2, 1);
if ($search_montant_ttc != '') $sql.= natural_search('f.total_ttc', $search_montant_ttc, 1);
+if ($search_categ_cus > 0) $sql.= " AND cc.fk_categorie = ".$db->escape($search_categ_cus);
+if ($search_categ_cus == -2) $sql.= " AND cc.fk_categorie IS NULL";
if ($search_status != '' && $search_status >= 0)
{
if ($search_status == '0') $sql.=" AND f.fk_statut = 0"; // draft
@@ -443,31 +452,31 @@ if ($search_status != '' && $search_status >= 0)
if ($search_status == '3') $sql.=" AND f.fk_statut = 3"; // abandonned
}
if ($search_paymentmode > 0) $sql .= " AND f.fk_mode_reglement = ".$db->escape($search_paymentmode);
-if ($month > 0)
+if ($search_month > 0)
{
- if ($year > 0 && empty($day))
- $sql.= " AND f.datef BETWEEN '".$db->idate(dol_get_first_day($year,$month,false))."' AND '".$db->idate(dol_get_last_day($year,$month,false))."'";
- else if ($year > 0 && ! empty($day))
- $sql.= " AND f.datef BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month, $day, $year))."' AND '".$db->idate(dol_mktime(23, 59, 59, $month, $day, $year))."'";
+ if ($search_year > 0 && empty($search_day))
+ $sql.= " AND f.datef BETWEEN '".$db->idate(dol_get_first_day($search_year,$search_month,false))."' AND '".$db->idate(dol_get_last_day($search_year,$search_month,false))."'";
+ else if ($search_year > 0 && ! empty($search_day))
+ $sql.= " AND f.datef BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $search_month, $search_day, $search_year))."' AND '".$db->idate(dol_mktime(23, 59, 59, $search_month, $search_day, $serch_year))."'";
else
$sql.= " AND date_format(f.datef, '%m') = '".$month."'";
}
-else if ($year > 0)
+else if ($search_year > 0)
{
- $sql.= " AND f.datef BETWEEN '".$db->idate(dol_get_first_day($year,1,false))."' AND '".$db->idate(dol_get_last_day($year,12,false))."'";
+ $sql.= " AND f.datef BETWEEN '".$db->idate(dol_get_first_day($search_year,1,false))."' AND '".$db->idate(dol_get_last_day($search_year,12,false))."'";
}
if ($month_lim > 0)
{
- if ($year_lim > 0 && empty($day_lim))
- $sql.= " AND f.date_lim_reglement BETWEEN '".$db->idate(dol_get_first_day($year_lim,$month_lim,false))."' AND '".$db->idate(dol_get_last_day($year_lim,$month_lim,false))."'";
- else if ($year_lim > 0 && ! empty($day_lim))
- $sql.= " AND f.date_lim_reglement BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month_lim, $day_lim, $year_lim))."' AND '".$db->idate(dol_mktime(23, 59, 59, $month_lim, $day_lim, $year_lim))."'";
+ if ($search_year_lim > 0 && empty($search_day_lim))
+ $sql.= " AND f.date_lim_reglement BETWEEN '".$db->idate(dol_get_first_day($search_year_lim,$search_month_lim,false))."' AND '".$db->idate(dol_get_last_day($search_year_lim,$search_month_lim,false))."'";
+ else if ($search_year_lim > 0 && ! empty($search_day_lim))
+ $sql.= " AND f.date_lim_reglement BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $search_month_lim, $search_day_lim, $search_year_lim))."' AND '".$db->idate(dol_mktime(23, 59, 59, $search_month_lim, $search_day_lim, $search_year_lim))."'";
else
- $sql.= " AND date_format(f.date_lim_reglement, '%m') = '".$db->escape($month_lim)."'";
+ $sql.= " AND date_format(f.date_lim_reglement, '%m') = '".$db->escape($search_month_lim)."'";
}
-else if ($year_lim > 0)
+else if ($search_year_lim > 0)
{
- $sql.= " AND f.date_lim_reglement BETWEEN '".$db->idate(dol_get_first_day($year_lim,1,false))."' AND '".$db->idate(dol_get_last_day($year_lim,12,false))."'";
+ $sql.= " AND f.date_lim_reglement BETWEEN '".$db->idate(dol_get_first_day($search_year_lim,1,false))."' AND '".$db->idate(dol_get_last_day($search_year_lim,12,false))."'";
}
if ($option == 'late') $sql.=" AND f.date_lim_reglement < '".$db->idate(dol_now() - $conf->facture->client->warning_delay)."'";
if ($search_sale > 0) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$search_sale;
@@ -515,6 +524,11 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
{
$result = $db->query($sql);
$nbtotalofrecords = $db->num_rows($result);
+ if (($page * $limit) > $nbtotalofrecords) // if total resultset is smaller then paging size (filtering), goto and load page 0
+ {
+ $page = 0;
+ $offset = 0;
+ }
}
$sql.= $db->plimit($limit+1,$offset);
@@ -535,15 +549,15 @@ if ($resql)
}
$param='&socid='.$socid;
- if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
- if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
+ if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.urlencode($contextpage);
+ if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.urlencode($limit);
if ($sall) $param.='&sall='.urlencode($sall);
- if ($day) $param.='&day='.urlencode($day);
- if ($month) $param.='&month='.urlencode($month);
- if ($year) $param.='&year=' .urlencode($year);
- if ($day_lim) $param.='&day_lim='.urlencode($day_lim);
- if ($month_lim) $param.='&month_lim='.urlencode($month_lim);
- if ($year_lim) $param.='&year_lim=' .urlencode($year_lim);
+ if ($search_day) $param.='&search_day='.urlencode($search_day);
+ if ($search_month) $param.='&search_month='.urlencode($search_month);
+ if ($search_year) $param.='&search_year=' .urlencode($search_year);
+ if ($search_day_lim) $param.='&search_day_lim='.urlencode($search_day_lim);
+ if ($search_month_lim) $param.='&search_month_lim='.urlencode($search_month_lim);
+ if ($search_year_lim) $param.='&search_year_lim=' .urlencode($search_year_lim);
if ($search_ref) $param.='&search_ref=' .urlencode($search_ref);
if ($search_refcustomer) $param.='&search_refcustomer=' .urlencode($search_refcustomer);
if ($search_type != '') $param.='&search_type='.urlencode($search_type);
@@ -558,9 +572,11 @@ if ($resql)
if ($search_montant_ttc != '') $param.='&search_montant_ttc='.urlencode($search_montant_ttc);
if ($search_status != '') $param.='&search_status='.urlencode($search_status);
if ($search_paymentmode > 0) $param.='search_paymentmode='.urlencode($search_paymentmode);
- if ($show_files) $param.='&show_files=' .$show_files;
- if ($option) $param.="&search_option=".$option;
- if ($optioncss != '') $param.='&optioncss='.$optioncss;
+ if ($show_files) $param.='&show_files='.urlencode($show_files);
+ if ($option) $param.="&search_option=".urlencode($option);
+ if ($optioncss != '') $param.='&optioncss='.urlencode($optioncss);
+ if ($search_categ_cus > 0) $param.='&search_categ_cus='.urlencode($search_categ_cus);
+
// Add $param from extra fields
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
@@ -569,30 +585,27 @@ if ($resql)
'presend'=>$langs->trans("SendByMail"),
'builddoc'=>$langs->trans("PDFMerge"),
);
- if ($conf->prelevement->enabled)
- {
- $langs->load("withdrawals");
- $arrayofmassactions['withdrawrequest']=$langs->trans("MakeWithdrawRequest");
+ if ($conf->prelevement->enabled) {
+ $langs->load("withdrawals");
+ $arrayofmassactions['withdrawrequest'] = $langs->trans("MakeWithdrawRequest");
}
- if ($user->rights->facture->supprimer)
- {
- //if (! empty($conf->global->STOCK_CALCULATE_ON_BILL) || empty($conf->global->INVOICE_CAN_ALWAYS_BE_REMOVED))
- if (empty($conf->global->INVOICE_CAN_ALWAYS_BE_REMOVED))
- {
- // mass deletion never possible on invoices on such situation
+ if ($user->rights->facture->supprimer) {
+ if (!empty($conf->global->INVOICE_CAN_REMOVE_DRAFT_ONLY)) {
+ $arrayofmassactions['predeletedraft'] = $langs->trans("Deletedraft");
}
- else
- {
- $arrayofmassactions['predelete']=$langs->trans("Delete");
- }
- }
- if (in_array($massaction, array('presend','predelete'))) $arrayofmassactions=array();
+ elseif (!empty($conf->global->INVOICE_CAN_ALWAYS_BE_REMOVED)) { // mass deletion never possible on invoices on such situation
+ $arrayofmassactions['predelete'] = $langs->trans("Delete");
+ }
+ }
+ if (in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
$massactionbutton=$form->selectMassAction('', $arrayofmassactions);
$newcardbutton='';
if($user->rights->facture->creer)
{
- $newcardbutton=''.$langs->trans('NewBill').' ';
+ $newcardbutton=''.$langs->trans('NewBill');
+ $newcardbutton.= ' ';
}
$i = 0;
@@ -650,6 +663,14 @@ if ($resql)
$moreforfilter.=$form->selectarray('search_product_category', $cate_arbo, $search_product_category, 1, 0, 0, '', 0, 0, 0, 0, 'maxwidth300', 1);
$moreforfilter.='';
}
+ if (! empty($conf->categorie->enabled))
+ {
+ require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
+ $moreforfilter.='';
+ $moreforfilter.=$langs->trans('CustomersProspectsCategoriesShort').': ';
+ $moreforfilter.=$formother->select_categories('customer',$search_categ_cus,'search_categ_cus',1);
+ $moreforfilter.='
';
+ }
$parameters=array();
$reshook=$hookmanager->executeHooks('printFieldPreListTitle',$parameters); // Note that $action and $object may have been modified by hook
if (empty($reshook)) $moreforfilter .= $hookmanager->resPrint;
@@ -707,18 +728,18 @@ if ($resql)
if (! empty($arrayfields['f.date']['checked']))
{
print ' ';
- if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print ' ';
}
// Date due
if (! empty($arrayfields['f.date_lim_reglement']['checked']))
{
print '';
- if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print ' ';
}
diff --git a/htdocs/compta/facture/stats/index.php b/htdocs/compta/facture/stats/index.php
index d85255fbf4e..2f2692055e9 100644
--- a/htdocs/compta/facture/stats/index.php
+++ b/htdocs/compta/facture/stats/index.php
@@ -331,7 +331,7 @@ print '';
// Show graphs
-print '
';
+print '';
if ($mesg) { print $mesg; }
else {
print $px1->show();
diff --git a/htdocs/compta/localtax/card.php b/htdocs/compta/localtax/card.php
index ad409145478..438427fa491 100644
--- a/htdocs/compta/localtax/card.php
+++ b/htdocs/compta/localtax/card.php
@@ -25,6 +25,7 @@
require '../../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/compta/localtax/class/localtax.class.php';
require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/vat.lib.php';
$langs->load("compta");
$langs->load("banks");
@@ -38,11 +39,11 @@ if (empty($refund)) $refund=0;
$lttype=GETPOST('localTaxType', 'int');
// Security check
-$socid = isset($_GET["socid"])?$_GET["socid"]:'';
+$socid = GETPOST('socid','int');
if ($user->societe_id) $socid=$user->societe_id;
$result = restrictedArea($user, 'tax', '', '', 'charges');
-$localtax = new Localtax($db);
+$object = new Localtax($db);
// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
$hookmanager->initHooks(array('localtaxvatcard','globalcard'));
@@ -52,8 +53,8 @@ $hookmanager->initHooks(array('localtaxvatcard','globalcard'));
* Actions
*/
-//add payment of localtax
-if($_POST["cancel"] == $langs->trans("Cancel")){
+if ($_POST["cancel"] == $langs->trans("Cancel") && ! $id)
+{
header("Location: list.php?localTaxType=".$lttype);
exit;
}
@@ -66,15 +67,15 @@ if ($action == 'add' && $_POST["cancel"] <> $langs->trans("Cancel"))
$datev=dol_mktime(12,0,0, $_POST["datevmonth"], $_POST["datevday"], $_POST["datevyear"]);
$datep=dol_mktime(12,0,0, $_POST["datepmonth"], $_POST["datepday"], $_POST["datepyear"]);
- $localtax->accountid=GETPOST("accountid");
- $localtax->paymenttype=GETPOST("paiementtype");
- $localtax->datev=$datev;
- $localtax->datep=$datep;
- $localtax->amount=price2num(GETPOST("amount"));
- $localtax->label=GETPOST("label");
- $localtax->ltt=$lttype;
+ $object->accountid=GETPOST("accountid");
+ $object->paymenttype=GETPOST("paiementtype");
+ $object->datev=$datev;
+ $object->datep=$datep;
+ $object->amount=price2num(GETPOST("amount"));
+ $object->label=GETPOST("label");
+ $object->ltt=$lttype;
- $ret=$localtax->addPayment($user);
+ $ret=$object->addPayment($user);
if ($ret > 0)
{
$db->commit();
@@ -84,7 +85,7 @@ if ($action == 'add' && $_POST["cancel"] <> $langs->trans("Cancel"))
else
{
$db->rollback();
- setEventMessages($localtax->error, $localtax->errors, 'errors');
+ setEventMessages($object->error, $object->errors, 'errors');
$_GET["action"]="create";
}
}
@@ -92,39 +93,39 @@ if ($action == 'add' && $_POST["cancel"] <> $langs->trans("Cancel"))
//delete payment of localtax
if ($action == 'delete')
{
- $result=$localtax->fetch($id);
+ $result=$object->fetch($id);
- if ($localtax->rappro == 0)
+ if ($object->rappro == 0)
{
$db->begin();
- $ret=$localtax->delete($user);
+ $ret=$object->delete($user);
if ($ret > 0)
{
- if ($localtax->fk_bank)
+ if ($object->fk_bank)
{
$accountline=new AccountLine($db);
- $result=$accountline->fetch($localtax->fk_bank);
+ $result=$accountline->fetch($object->fk_bank);
if ($result > 0) $result=$accountline->delete($user); // $result may be 0 if not found (when bank entry was deleted manually and fk_bank point to nothing)
}
if ($result >= 0)
{
$db->commit();
- header("Location: ".DOL_URL_ROOT.'/compta/localtax/list.php?localTaxType='.$localtax->ltt);
+ header("Location: ".DOL_URL_ROOT.'/compta/localtax/list.php?localTaxType='.$object->ltt);
exit;
}
else
{
- $localtax->error=$accountline->error;
+ $object->error=$accountline->error;
$db->rollback();
- setEventMessages($localtax->error, $localtax->errors, 'errors');
+ setEventMessages($object->error, $object->errors, 'errors');
}
}
else
{
$db->rollback();
- setEventMessages($localtax->error, $localtax->errors, 'errors');
+ setEventMessages($object->error, $object->errors, 'errors');
}
}
else
@@ -136,17 +137,12 @@ if ($action == 'delete')
/*
-* View
-*/
-
-llxHeader();
-
-$form = new Form($db);
+ * View
+ */
if ($id)
{
- $vatpayment = new Localtax($db);
- $result = $vatpayment->fetch($id);
+ $result = $object->fetch($id);
if ($result <= 0)
{
dol_print_error($db);
@@ -154,6 +150,13 @@ if ($id)
}
}
+$form = new Form($db);
+
+$title=$langs->trans("LT".$object->ltt) . " - " . $langs->trans("Card");
+$help_url='';
+llxHeader("",$title,$helpurl);
+
+
if ($action == 'create')
{
@@ -173,7 +176,7 @@ if ($action == 'create')
print $form->select_date($datep,"datep",'','','','add',1,1);
print ' '.$langs->trans("DateValue").' ';
+ print ' '.$form->textwithpicto($langs->trans("PeriodEndDate"), $langs->trans("LastDayTaxIsRelatedTo")).' ';
print $form->select_date($datev,"datev",'','','','add',1,1);
print ' '.$langs->trans("BackToList").' ';
+
+ dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref, '', 0, '', '');
+
+ print '';
+ print '
';
print '
';
print "";
- print ''.$langs->trans("Ref").' ';
- print $vatpayment->ref;
+ print ' '.$langs->trans("Ref").' ';
+ print $object->ref;
print ' ';
print "";
print ''.$langs->trans("DatePayment").' ';
- print dol_print_date($vatpayment->datep,'day');
+ print dol_print_date($object->datep,'day');
print ' ';
- print ''.$langs->trans("DateValue").' ';
- print dol_print_date($vatpayment->datev,'day');
+ print ' '.$form->textwithpicto($langs->trans("PeriodEndDate"), $langs->trans("LastDayTaxIsRelatedTo")).' ';
+ print dol_print_date($object->datev,'day');
print ' '.$langs->trans("Amount").' '.price($vatpayment->amount).' '.$langs->trans("Amount").' '.price($object->amount).' ';
print ''.$langs->trans('BankTransactionLine').' ';
@@ -271,22 +275,28 @@ if ($id)
// Other attributes
$parameters=array();
- $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$vatpayment,$action); // Note that $action and $object may have been modified by hook
+ $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
print '
';
- dol_fiche_end();
+ print '
".$vatcust." ";
print "\n";
- $coll_list = vat_by_thirdparty($db,0,$date_start,$date_end,$modetax,'sell');
+ $coll_list = tax_by_thirdparty('localtax'.$local, $db, 0, $date_start, $date_end, $modetax, 'sell');
$action = "tvaclient";
$object = &$coll_list;
@@ -244,7 +248,7 @@ if($calc ==0 || $calc == 1){
$company_static=new Societe($db);
- $coll_list = vat_by_thirdparty($db,0,$date_start,$date_end,$modetax,'buy');
+ $coll_list = tax_by_thirdparty('localtax'.$local, $db, 0, $date_start, $date_end,$modetax, 'buy');
$parameters["direction"] = 'buy';
$parameters["type"] = 'localtax'.$local;
diff --git a/htdocs/compta/localtax/index.php b/htdocs/compta/localtax/index.php
index cfcb117b0a8..4e825469b14 100644
--- a/htdocs/compta/localtax/index.php
+++ b/htdocs/compta/localtax/index.php
@@ -25,40 +25,66 @@
require '../../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/report.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/tax.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/localtax/class/localtax.class.php';
-$langs->loadLangs(array("other","compta","banks","bills","companies"));
+$langs->loadLangs(array("other","compta","banks","bills","companies","product","trips","admin"));
$localTaxType=GETPOST('localTaxType', 'int');
+// Date range
$year=GETPOST("year","int");
-if ($year == 0)
+if (empty($year))
{
- $year_current = strftime("%Y",time());
- $year_start = $year_current;
+ $year_current = strftime("%Y",dol_now());
+ $year_start = $year_current;
} else {
- $year_current = $year;
- $year_start = $year;
+ $year_current = $year;
+ $year_start = $year;
+}
+$date_start=dol_mktime(0,0,0,GETPOST("date_startmonth"),GETPOST("date_startday"),GETPOST("date_startyear"));
+$date_end=dol_mktime(23,59,59,GETPOST("date_endmonth"),GETPOST("date_endday"),GETPOST("date_endyear"));
+if (empty($date_start) || empty($date_end)) // We define date_start and date_end
+{
+ $q=GETPOST("q","int");
+ if (empty($q))
+ {
+ if (GETPOST("month","int")) { $date_start=dol_get_first_day($year_start,GETPOST("month","int"),false); $date_end=dol_get_last_day($year_start,GETPOST("month","int"),false); }
+ else
+ {
+ $date_start=dol_get_first_day($year_start, $conf->global->SOCIETE_FISCAL_MONTH_START,false);
+ $date_end=dol_time_plus_duree($date_start, 1, 'y') - 1;
+ }
+ }
+ else
+ {
+ if ($q==1) { $date_start=dol_get_first_day($year_start,1,false); $date_end=dol_get_last_day($year_start,3,false); }
+ if ($q==2) { $date_start=dol_get_first_day($year_start,4,false); $date_end=dol_get_last_day($year_start,6,false); }
+ if ($q==3) { $date_start=dol_get_first_day($year_start,7,false); $date_end=dol_get_last_day($year_start,9,false); }
+ if ($q==4) { $date_start=dol_get_first_day($year_start,10,false); $date_end=dol_get_last_day($year_start,12,false); }
+ }
}
+// Define modetax (0 or 1)
+// 0=normal, 1=option vat for services is on debit, 2=option on payments for products
+$modetax = $conf->global->TAX_MODE;
+if (GETPOSTISSET("modetax")) $modetax=GETPOST("modetax",'int');
+if (empty($modetax)) $modetax=0;
+
// Security check
-$socid = isset($_GET["socid"])?$_GET["socid"]:'';
+$socid = GETPOST('socid','int');
if ($user->societe_id) $socid=$user->societe_id;
$result = restrictedArea($user, 'tax', '', '', 'charges');
-// Define modetax (0 or 1)
-// 0=normal, 1=option vat for services is on debit
-$modetax = $conf->global->TAX_MODE;
-if (isset($_GET["modetax"])) $modetax=GETPOST("modetax",'alpha');
/**
* print function
*
- * @param DoliDB $db Database handler
- * @param string $sql SQL Request
- * @param string $date Date
- * @return void
+ * @param DoliDB $db Database handler
+ * @param string $sql SQL Request
+ * @param string $date Date
+ * @return void
*/
function pt ($db, $sql, $date)
{
@@ -70,25 +96,78 @@ function pt ($db, $sql, $date)
$i = 0;
$total = 0;
print '';
+
print '';
- print ''.$date.' ';
- print ''.$langs->trans("Amount").' ';
- print ' '."\n";
+ print ''.$date.' ';
+ print ''.$langs->trans("ClaimedForThisPeriod").' ';
+ print ''.$langs->trans("PaidDuringThisPeriod").' ';
print " \n";
+ $amountclaimed = 0;
+ $amountpaid = 0;
+ $previousmode = '';
while ($i < $num) {
$obj = $db->fetch_object($result);
- print '';
- print ''.$obj->dm." \n";
- $total = $total + $obj->mm;
+ if ($obj->mode == 'claimed' && ! empty($previousmode))
+ {
+ print ' ';
+ print ''.$obj->dm." \n";
+ print ''.price($amountclaimed)." \n";
+ print ''.price($amountpaid)." \n";
+ print " \n";
- print ''.price($obj->mm)." \n";
- print "\n";
+ $amountclaimed = 0;
+ $amountpaid = 0;
+ }
+
+ if ($obj->mode == 'claimed')
+ {
+ $amountclaimed = $obj->mm;
+ $totalclaimed = $totalclaimed + $amountclaimed;
+ }
+ if ($obj->mode == 'paid')
+ {
+ $amountpaid = $obj->mm;
+ $totalpaid = $totalpaid + $amountpaied;
+ }
+
+ if ($obj->mode == 'paid')
+ {
+ print '';
+ print ''.$obj->dm." \n";
+ print ''.price($amountclaimed)." \n";
+ print ''.price($amountpaid)." \n";
+ print " \n";
+ $amountclaimed = 0;
+ $amountpaid = 0;
+ $previousmode = '';
+ }
+ else
+ {
+ $previousmode = $obj->mode;
+ }
$i++;
}
- print ''.$langs->trans("Total")." : ".price($total)." ';
+ print ''.$obj->dm." \n";
+ print ''.price($amountclaimed)." \n";
+ print ''.price($amountpaid)." \n";
+ print " \n";
+
+ $amountclaimed = 0;
+ $amountpaid = 0;
+ }
+
+ print '';
+ print ''.$langs->trans("Total").' ';
+ print ''.price($totalclaimed).' ';
+ print ''.price($totalpaid).' ';
+ print " ";
print "
";
$db->free($result);
@@ -103,6 +182,8 @@ function pt ($db, $sql, $date)
* View
*/
+$form=new Form($db);
+$company_static=new Societe($db);
$tva = new Tva($db);
if($localTaxType==1) {
@@ -121,34 +202,37 @@ if($localTaxType==1) {
$CalcLT= $conf->global->MAIN_INFO_LOCALTAX_CALC2;
}
+$fsearch.=' ".img_previous()." ";
-$textnextyear=" ".img_next()." ";
-
+//$textprevyear="".img_previous()." ";
+//$textnextyear=" ".img_next()." ";
//print load_fiche_titre($langs->transcountry($LT,$mysoc->country_code),"$textprevyear ".$langs->trans("Year")." $year_start $textnextyear", 'title_accountancy.png');
-report_header($name,'',$textprevyear.$langs->trans("Year")." ".$year_start.$textnextyear,'',$description,$builddate,$exportlink,array(),$calcmode);
+report_header($name,'',$period,$periodlink,$description,$builddate,$exportlink,array(),$calcmode);
+//report_header($name,'',$textprevyear.$langs->trans("Year")." ".$year_start.$textnextyear,'',$description,$builddate,$exportlink,array(),$calcmode);
+
print '';
-print '
';
-print '';
print load_fiche_titre($langs->transcountry($LTSummary,$mysoc->country_code), '', '');
-print ' ';
-print load_fiche_titre($langs->transcountry($LTPaid,$mysoc->country_code), '', '');
-print ' ';
print '';
print '';
@@ -163,21 +247,156 @@ if($CalcLT==1) {
if($CalcLT==2) {
print "".$langs->transcountry($LTCustomer,$mysoc->country_code)." ".$langs->trans("TotalToPay")." ";
print " \n";
print " \n";
-$y = $year_current ;
+$tmp=dol_getdate($date_start);
+$y = $tmp['year'];
+$m = $tmp['mon'];
+$tmp=dol_getdate($date_end);
+$yend = $tmp['year'];
+$mend = $tmp['mon'];
$total=0; $subtotalcoll=0; $subtotalpaye=0; $subtotal=0;
-$i=0;
-for ($m = 1 ; $m < 13 ; $m++ ) {
- $coll_listsell = tax_by_date('vat', $db, $y, 0, 0, 0, $modetax, 'sell', $m);
- $coll_listbuy = tax_by_date('vat', $db, $y, 0, 0, 0, $modetax, 'buy', $m);
+$i=0; $mcursor=0;
+while ((($y < $yend) || ($y == $yend && $m < $mend)) && $mcursor < 1000) // $mcursor is to avoid too large loop
+{
+ //$m = $conf->global->SOCIETE_FISCAL_MONTH_START + ($mcursor % 12);
+ if ($m == 13) $y++;
+ if ($m > 12) $m -= 12;
+ $mcursor++;
+
+ // Get array with details of each line
+ $x_coll = tax_by_rate(($localTaxType==1?'localtax1':'localtax2'), $db, $y, 0, 0, 0, $modetax, 'sell', $m);
+ $x_paye = tax_by_rate(($localTaxType==1?'localtax1':'localtax2'), $db, $y, 0, 0, 0, $modetax, 'buy', $m);
+
+ $x_both = array();
+ //now, from these two arrays, get another array with one rate per line
+ foreach(array_keys($x_coll) as $my_coll_rate)
+ {
+ $x_both[$my_coll_rate]['coll']['totalht'] = $x_coll[$my_coll_rate]['totalht'];
+ $x_both[$my_coll_rate]['coll']['vat'] = $x_coll[$my_coll_rate]['vat'];
+ $x_both[$my_coll_rate]['coll']['localtax1'] = $x_coll[$my_coll_rate]['localtax1'];
+ $x_both[$my_coll_rate]['coll']['localtax2'] = $x_coll[$my_coll_rate]['localtax2'];
+ $x_both[$my_coll_rate]['paye']['totalht'] = 0;
+ $x_both[$my_coll_rate]['paye']['vat'] = 0;
+ $x_both[$my_coll_rate]['paye']['localtax1'] = 0;
+ $x_both[$my_coll_rate]['paye']['localtax2'] = 0;
+ $x_both[$my_coll_rate]['coll']['links'] = '';
+ $x_both[$my_coll_rate]['coll']['detail'] = array();
+ foreach($x_coll[$my_coll_rate]['facid'] as $id=>$dummy) {
+ //$invoice_customer->id=$x_coll[$my_coll_rate]['facid'][$id];
+ //$invoice_customer->ref=$x_coll[$my_coll_rate]['facnum'][$id];
+ //$invoice_customer->type=$x_coll[$my_coll_rate]['type'][$id];
+ //$company_static->fetch($x_coll[$my_coll_rate]['company_id'][$id]);
+ $x_both[$my_coll_rate]['coll']['detail'][] = array(
+ 'id' =>$x_coll[$my_coll_rate]['facid'][$id],
+ 'descr' =>$x_coll[$my_coll_rate]['descr'][$id],
+ 'pid' =>$x_coll[$my_coll_rate]['pid'][$id],
+ 'pref' =>$x_coll[$my_coll_rate]['pref'][$id],
+ 'ptype' =>$x_coll[$my_coll_rate]['ptype'][$id],
+ 'payment_id'=>$x_coll[$my_coll_rate]['payment_id'][$id],
+ 'payment_amount'=>$x_coll[$my_coll_rate]['payment_amount'][$id],
+ 'ftotal_ttc'=>$x_coll[$my_coll_rate]['ftotal_ttc'][$id],
+ 'dtotal_ttc'=>$x_coll[$my_coll_rate]['dtotal_ttc'][$id],
+ 'dtype' =>$x_coll[$my_coll_rate]['dtype'][$id],
+ 'datef' =>$x_coll[$my_coll_rate]['datef'][$id],
+ 'datep' =>$x_coll[$my_coll_rate]['datep'][$id],
+ //'company_link'=>$company_static->getNomUrl(1,'',20),
+ 'ddate_start'=>$x_coll[$my_coll_rate]['ddate_start'][$id],
+ 'ddate_end' =>$x_coll[$my_coll_rate]['ddate_end'][$id],
+
+ 'totalht' =>$x_coll[$my_coll_rate]['totalht_list'][$id],
+ 'vat' =>$x_coll[$my_coll_rate]['vat_list'][$id],
+ 'localtax1' =>$x_coll[$my_coll_rate]['localtax1_list'][$id],
+ 'localtax2' =>$x_coll[$my_coll_rate]['localtax2_list'][$id],
+ //'link' =>$invoice_customer->getNomUrl(1,'',12)
+ );
+ }
+ }
+
+ // tva paid
+ foreach (array_keys($x_paye) as $my_paye_rate) {
+ $x_both[$my_paye_rate]['paye']['totalht'] = $x_paye[$my_paye_rate]['totalht'];
+ $x_both[$my_paye_rate]['paye']['vat'] = $x_paye[$my_paye_rate]['vat'];
+ $x_both[$my_paye_rate]['paye']['localtax1'] = $x_paye[$my_paye_rate]['localtax1'];
+ $x_both[$my_paye_rate]['paye']['localtax2'] = $x_paye[$my_paye_rate]['localtax2'];
+ if (!isset($x_both[$my_paye_rate]['coll']['totalht'])) {
+ $x_both[$my_paye_rate]['coll']['totalht'] = 0;
+ $x_both[$my_paye_rate]['coll']['vat'] = 0;
+ $x_both[$my_paye_rate]['coll']['localtax1'] = 0;
+ $x_both[$my_paye_rate]['coll']['localtax2'] = 0;
+ }
+ $x_both[$my_paye_rate]['paye']['links'] = '';
+ $x_both[$my_paye_rate]['paye']['detail'] = array();
+
+ foreach ($x_paye[$my_paye_rate]['facid'] as $id=>$dummy)
+ {
+ // ExpenseReport
+ if ($x_paye[$my_paye_rate]['ptype'][$id] == 'ExpenseReportPayment')
+ {
+ //$expensereport->id=$x_paye[$my_paye_rate]['facid'][$id];
+ //$expensereport->ref=$x_paye[$my_paye_rate]['facnum'][$id];
+ //$expensereport->type=$x_paye[$my_paye_rate]['type'][$id];
+
+ $x_both[$my_paye_rate]['paye']['detail'][] = array(
+ 'id' =>$x_paye[$my_paye_rate]['facid'][$id],
+ 'descr' =>$x_paye[$my_paye_rate]['descr'][$id],
+ 'pid' =>$x_paye[$my_paye_rate]['pid'][$id],
+ 'pref' =>$x_paye[$my_paye_rate]['pref'][$id],
+ 'ptype' =>$x_paye[$my_paye_rate]['ptype'][$id],
+ 'payment_id' =>$x_paye[$my_paye_rate]['payment_id'][$id],
+ 'payment_amount' =>$x_paye[$my_paye_rate]['payment_amount'][$id],
+ 'ftotal_ttc' =>price2num($x_paye[$my_paye_rate]['ftotal_ttc'][$id]),
+ 'dtotal_ttc' =>price2num($x_paye[$my_paye_rate]['dtotal_ttc'][$id]),
+ 'dtype' =>$x_paye[$my_paye_rate]['dtype'][$id],
+ 'ddate_start' =>$x_paye[$my_paye_rate]['ddate_start'][$id],
+ 'ddate_end' =>$x_paye[$my_paye_rate]['ddate_end'][$id],
+
+ 'totalht' =>price2num($x_paye[$my_paye_rate]['totalht_list'][$id]),
+ 'vat' =>$x_paye[$my_paye_rate]['vat_list'][$id],
+ 'localtax1' =>$x_paye[$my_paye_rate]['localtax1_list'][$id],
+ 'localtax2' =>$x_paye[$my_paye_rate]['localtax2_list'][$id],
+ //'link' =>$expensereport->getNomUrl(1)
+ );
+ }
+ else
+ {
+ //$invoice_supplier->id=$x_paye[$my_paye_rate]['facid'][$id];
+ //$invoice_supplier->ref=$x_paye[$my_paye_rate]['facnum'][$id];
+ //$invoice_supplier->type=$x_paye[$my_paye_rate]['type'][$id];
+ //$company_static->fetch($x_paye[$my_paye_rate]['company_id'][$id]);
+ $x_both[$my_paye_rate]['paye']['detail'][] = array(
+ 'id' =>$x_paye[$my_paye_rate]['facid'][$id],
+ 'descr' =>$x_paye[$my_paye_rate]['descr'][$id],
+ 'pid' =>$x_paye[$my_paye_rate]['pid'][$id],
+ 'pref' =>$x_paye[$my_paye_rate]['pref'][$id],
+ 'ptype' =>$x_paye[$my_paye_rate]['ptype'][$id],
+ 'payment_id'=>$x_paye[$my_paye_rate]['payment_id'][$id],
+ 'payment_amount'=>$x_paye[$my_paye_rate]['payment_amount'][$id],
+ 'ftotal_ttc'=>price2num($x_paye[$my_paye_rate]['ftotal_ttc'][$id]),
+ 'dtotal_ttc'=>price2num($x_paye[$my_paye_rate]['dtotal_ttc'][$id]),
+ 'dtype' =>$x_paye[$my_paye_rate]['dtype'][$id],
+ 'datef' =>$x_paye[$my_paye_rate]['datef'][$id],
+ 'datep' =>$x_paye[$my_paye_rate]['datep'][$id],
+ //'company_link'=>$company_static->getNomUrl(1,'',20),
+ 'ddate_start'=>$x_paye[$my_paye_rate]['ddate_start'][$id],
+ 'ddate_end' =>$x_paye[$my_paye_rate]['ddate_end'][$id],
+
+ 'totalht' =>price2num($x_paye[$my_paye_rate]['totalht_list'][$id]),
+ 'vat' =>$x_paye[$my_paye_rate]['vat_list'][$id],
+ 'localtax1' =>$x_paye[$my_paye_rate]['localtax1_list'][$id],
+ 'localtax2' =>$x_paye[$my_paye_rate]['localtax2_list'][$id],
+ //'link' =>$invoice_supplier->getNomUrl(1,'',12)
+ );
+ }
+ }
+ }
+ //now we have an array (x_both) indexed by rates for coll and paye
$action = "tva";
- $object = array(&$coll_listsell, &$coll_listbuy);
+ $object = array(&$x_coll, &$x_paye, &$x_both);
$parameters["mode"] = $modetax;
$parameters["year"] = $y;
$parameters["month"] = $m;
@@ -187,112 +406,176 @@ for ($m = 1 ; $m < 13 ; $m++ ) {
$hookmanager->initHooks(array('externalbalance'));
$reshook=$hookmanager->executeHooks('addVatLine',$parameters,$object,$action); // Note that $action and $object may have been modified by some hooks
- if (! is_array($coll_listbuy) && $coll_listbuy == -1) {
+ if (! is_array($x_coll) && $coll_listbuy == -1)
+ {
$langs->load("errors");
print ''.$langs->trans("ErrorNoAccountancyModuleLoaded").' '.$langs->trans("FeatureNotYetAvailable").' ';
- print ''.dol_print_date(dol_mktime(0,0,0,$m,1,$y),"%b %Y").' ';
- if($CalcLT==0) {
- $x_coll = 0;
- foreach($coll_listsell as $vatrate=>$val) {
- $x_coll+=$val[$localTaxType==1?'localtax1':'localtax2'];
- }
- $subtotalcoll = $subtotalcoll + $x_coll;
- print "".price($x_coll)." ";
+ print ''.dol_print_date(dol_mktime(0,0,0,$m,1,$y),"%b %Y").' ".price($x_paye)." ";
- } elseif($CalcLT==1) {
- $x_paye = 0;
- foreach($coll_listbuy as $vatrate=>$val) {
- $x_paye+=$val[$localTaxType==1?'localtax1':'localtax2'];
+ $x_coll_sum = 0;
+ foreach (array_keys($x_coll) as $rate)
+ {
+ $subtot_coll_total_ht = 0;
+ $subtot_coll_vat = 0;
+
+ foreach ($x_both[$rate]['coll']['detail'] as $index => $fields)
+ {
+ // Payment
+ $ratiopaymentinvoice=1;
+ if ($modetax != 1)
+ {
+ // Define type
+ // We MUST use dtype (type in line). We can use something else, only if dtype is really unknown.
+ $type=(isset($fields['dtype'])?$fields['dtype']:$fields['ptype']);
+ // Try to enhance type detection using date_start and date_end for free lines where type
+ // was not saved.
+ if (!empty($fields['ddate_start'])) {
+ $type=1;
+ }
+ if (!empty($fields['ddate_end'])) {
+ $type=1;
+ }
+
+ if (($type == 0 && $conf->global->TAX_MODE_SELL_PRODUCT == 'invoice')
+ || ($type == 1 && $conf->global->TAX_MODE_SELL_SERVICE == 'invoice'))
+ {
+ //print $langs->trans("NA");
+ } else {
+ if (isset($fields['payment_amount']) && price2num($fields['ftotal_ttc'])) {
+ $ratiopaymentinvoice=($fields['payment_amount']/$fields['ftotal_ttc']);
+ }
+ }
+ }
+ //var_dump('type='.$type.' '.$fields['totalht'].' '.$ratiopaymentinvoice);
+ $temp_ht=$fields['totalht']*$ratiopaymentinvoice;
+ $temp_vat=$fields['localtax'.$localTaxType]*$ratiopaymentinvoice;
+ $subtot_coll_total_ht += $temp_ht;
+ $subtot_coll_vat += $temp_vat;
+ $x_coll_sum += $temp_vat;
}
- $subtotalpaye = $subtotalpaye + $x_paye;
- print "".price($x_paye)." ".price(price2num($x_coll_sum,'MT'))." ";
+
+ $x_paye_sum = 0;
+ foreach (array_keys($x_paye) as $rate)
+ {
+ $subtot_paye_total_ht = 0;
+ $subtot_paye_vat = 0;
+
+ foreach ($x_both[$rate]['paye']['detail'] as $index => $fields)
+ {
+ // Payment
+ $ratiopaymentinvoice=1;
+ if ($modetax != 1)
+ {
+ // Define type
+ // We MUST use dtype (type in line). We can use something else, only if dtype is really unknown.
+ $type=(isset($fields['dtype'])?$fields['dtype']:$fields['ptype']);
+ // Try to enhance type detection using date_start and date_end for free lines where type
+ // was not saved.
+ if (!empty($fields['ddate_start'])) {
+ $type=1;
+ }
+ if (!empty($fields['ddate_end'])) {
+ $type=1;
+ }
+
+ if (($type == 0 && $conf->global->TAX_MODE_SELL_PRODUCT == 'invoice')
+ || ($type == 1 && $conf->global->TAX_MODE_SELL_SERVICE == 'invoice'))
+ {
+ //print $langs->trans("NA");
+ } else {
+ if (isset($fields['payment_amount']) && price2num($fields['ftotal_ttc'])) {
+ $ratiopaymentinvoice=($fields['payment_amount']/$fields['ftotal_ttc']);
+ }
+ }
+ }
+ //var_dump('type='.$type.' '.$fields['totalht'].' '.$ratiopaymentinvoice);
+ $temp_ht=$fields['totalht']*$ratiopaymentinvoice;
+ $temp_vat=$fields['localtax'.$localTaxType]*$ratiopaymentinvoice;
+ $subtot_paye_total_ht += $temp_ht;
+ $subtot_paye_vat += $temp_vat;
+ $x_paye_sum += $temp_vat;
}
- $subtotalcoll = $subtotalcoll + $x_coll;
- print "".price($x_coll)." ".price(price2num($x_paye_sum,'MT'))." ";
- if($CalcLT==0) {
- $diff= $x_coll - $x_paye;
- } elseif($CalcLT==1) {
- $diff= $x_paye;
- } elseif($CalcLT==2) {
- $diff= $x_coll;
- }
+ $subtotalcoll = $subtotalcoll + $x_coll_sum;
+ $subtotalpaye = $subtotalpaye + $x_paye_sum;
+ $diff = $x_coll_sum - $x_paye_sum;
$total = $total + $diff;
- $subtotal = $subtotal + $diff;
+ $subtotal = price2num($subtotal + $diff, 'MT');
- print "".price($diff)." \n";
+ print "".price(price2num($diff,'MT'))." \n";
print " \n";
print " \n";
- $i++;
- if ($i > 2) {
- print '';
- print ''.$langs->trans("SubTotal").': ';
- if($CalcLT==0) {
- print ''.price($subtotalcoll).' ';
- print ''.price($subtotalpaye).' ';
- print ''.price($subtotal).' ';
- } elseif($CalcLT==1) {
- print ''.price($subtotalpaye).' '.price($subtotal).' ';
- } elseif($CalcLT==2) {
- print ''.price($subtotalcoll).' '.price($subtotal).' ';
- }
- print ' ';
- $i = 0;
- $subtotalcoll=0; $subtotalpaye=0; $subtotal=0;
+ $i++; $m++;
+ if ($i > 2)
+ {
+ print '';
+ print ''.$langs->trans("SubTotal").' :'.price(price2num($subtotalcoll,'MT')).' ';
+ print ''.price(price2num($subtotalpaye,'MT')).' ';
+ print ''.price(price2num($subtotal,'MT')).' ';
+ print ' ';
+ $i = 0;
+ $subtotalcoll=0; $subtotalpaye=0; $subtotal=0;
}
}
-print ''.$langs->trans("TotalToPay").': '.price($total).' ';
+print ''.$langs->trans("TotalToPay").': '.price(price2num($total, 'MT')).' ';
print " \n";
print '
';
-print ' ';
+
+print '';
+
+
/*
* Payed
*/
-$sql = "SELECT SUM(amount) as mm, date_format(f.datev,'%Y-%m') as dm";
+print load_fiche_titre($langs->transcountry($LTPaid,$mysoc->country_code), '', '');
+
+$sql='';
+
+$sql.= "SELECT SUM(amount) as mm, date_format(f.datev,'%Y-%m') as dm, 'claimed' as mode";
$sql.= " FROM ".MAIN_DB_PREFIX."localtax as f";
$sql.= " WHERE f.entity = ".$conf->entity;
-$sql.= " AND f.datev >= '".$db->idate(dol_get_first_day($y,1,false))."'";
-$sql.= " AND f.datev <= '".$db->idate(dol_get_last_day($y,12,false))."'";
+$sql.= " AND (f.datev >= '".$db->idate($date_start)."' AND f.datev <= '".$db->idate($date_end)."')";
$sql.= " AND localtaxtype=".$localTaxType;
$sql.= " GROUP BY dm";
-$sql.= " ORDER BY dm ASC";
-pt($db, $sql,$langs->trans("Year")." $y");
+$sql.= " UNION ";
-print '
';
+$sql.= "SELECT SUM(amount) as mm, date_format(f.datep,'%Y-%m') as dm, 'paid' as mode";
+$sql.= " FROM ".MAIN_DB_PREFIX."localtax as f";
+$sql.= " WHERE f.entity = ".$conf->entity;
+$sql.= " AND (f.datep >= '".$db->idate($date_start)."' AND f.datep <= '".$db->idate($date_end)."')";
+$sql.= " AND localtaxtype=".$localTaxType;
+$sql.= " GROUP BY dm";
-print '';
-print '
';
+$sql.= " ORDER BY dm ASC, mode ASC";
+//print $sql;
+
+pt($db, $sql, $langs->trans("Month"));
+
+
+print '';
llxFooter();
$db->close();
diff --git a/htdocs/compta/localtax/list.php b/htdocs/compta/localtax/list.php
index 54183ef72b9..6668e3d61db 100644
--- a/htdocs/compta/localtax/list.php
+++ b/htdocs/compta/localtax/list.php
@@ -16,7 +16,7 @@
*/
/**
- * \file htdocs/compta/localtax/reglement.php
+ * \file htdocs/compta/localtax/list.php
* \ingroup tax
* \brief List of IRPF payments
*/
@@ -24,15 +24,15 @@
require '../../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/compta/localtax/class/localtax.class.php';
-$langs->load("compta");
$langs->load("compta");
// Security check
-$socid = isset($_GET["socid"])?$_GET["socid"]:'';
+$socid = GETPOST('socid','int');
if ($user->societe_id) $socid=$user->societe_id;
$result = restrictedArea($user, 'tax', '', '', 'charges');
$ltt=GETPOST("localTaxType");
+
/*
* View
*/
@@ -41,12 +41,20 @@ llxHeader();
$localtax_static = new Localtax($db);
-print load_fiche_titre($langs->transcountry($ltt==2?"LT2Payments":"LT1Payments",$mysoc->country_code));
+$newcardbutton='';
+if ($user->rights->tax->charges->creer)
+{
+ $newcardbutton=''.$langs->trans('NewVATPayment');
+ $newcardbutton.= ' ';
+}
-$sql = "SELECT rowid, amount, label, f.datev as dm";
+print load_fiche_titre($langs->transcountry($ltt==2?"LT2Payments":"LT1Payments",$mysoc->country_code), $newcardbutton);
+
+$sql = "SELECT rowid, amount, label, f.datev, f.datep";
$sql.= " FROM ".MAIN_DB_PREFIX."localtax as f ";
$sql.= " WHERE f.entity = ".$conf->entity." AND localtaxtype=".$db->escape($ltt);
-$sql.= " ORDER BY dm DESC";
+$sql.= " ORDER BY datev DESC";
$result = $db->query($sql);
if ($result)
@@ -59,6 +67,7 @@ if ($result)
print ' ';
print ''.$langs->trans("Ref").' ';
print "".$langs->trans("Label")." ";
+ print "".$langs->trans("PeriodEndDate")." ";
print ''.$langs->trans("DatePayment").' ';
print "".$langs->trans("PayedByThisPayment")." ";
print " \n";
@@ -66,14 +75,15 @@ if ($result)
while ($i < $num)
{
$obj = $db->fetch_object($result);
-
+
print '';
$localtax_static->id=$obj->rowid;
$localtax_static->ref=$obj->rowid;
print "".$localtax_static->getNomUrl(1)." \n";
print "".dol_trunc($obj->label,40)." \n";
- print ''.dol_print_date($db->jdate($obj->dm),'day')." \n";
+ print ''.dol_print_date($db->jdate($obj->datev),'day')." \n";
+ print ''.dol_print_date($db->jdate($obj->datep),'day')." \n";
$total = $total + $obj->amount;
print "".price($obj->amount)." ";
@@ -81,8 +91,8 @@ if ($result)
$i++;
}
- print ' '.$langs->trans("Total").' ';
- print "".price($total)." '.$langs->trans("Total").' ';
+ print ''.price($total).'
";
$db->free($result);
diff --git a/htdocs/compta/localtax/quadri_detail.php b/htdocs/compta/localtax/quadri_detail.php
index 5e18c786c18..8d7843b5cea 100644
--- a/htdocs/compta/localtax/quadri_detail.php
+++ b/htdocs/compta/localtax/quadri_detail.php
@@ -22,8 +22,7 @@
/**
* \file htdocs/compta/tva/quadri_detail.php
* \ingroup tax
- * \brief Trimestrial page - detailed version
- * TODO Deal with recurrent invoices as well
+ * \brief Local tax by rate
*/
global $mysoc;
@@ -31,21 +30,21 @@ require '../../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/report.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/tax.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php';
require_once DOL_DOCUMENT_ROOT.'/compta/localtax/class/localtax.class.php';
require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
require_once DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php';
+require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
+require_once DOL_DOCUMENT_ROOT.'/expensereport/class/paymentexpensereport.class.php';
-$langs->load("bills");
-$langs->load("compta");
-$langs->load("companies");
-$langs->load("products");
+$langs->loadLangs(array("other","compta","banks","bills","companies","product","trips","admin"));
$local=GETPOST('localTaxType', 'int');
// Date range
-$year=GETPOST("year");
+$year=GETPOST("year","int");
if (empty($year))
{
$year_current = strftime("%Y",dol_now());
@@ -54,38 +53,41 @@ if (empty($year))
$year_current = $year;
$year_start = $year;
}
-
-$date_start = dol_mktime( 0, 0, 0, GETPOST( "date_startmonth" ), GETPOST( "date_startday" ), GETPOST( "date_startyear" ) );
-$date_end = dol_mktime( 23, 59, 59, GETPOST( "date_endmonth" ), GETPOST( "date_endday" ), GETPOST( "date_endyear" ) );
+$date_start=dol_mktime(0,0,0,GETPOST("date_startmonth"),GETPOST("date_startday"),GETPOST("date_startyear"));
+$date_end=dol_mktime(23,59,59,GETPOST("date_endmonth"),GETPOST("date_endday"),GETPOST("date_endyear"));
// Quarter
if (empty($date_start) || empty($date_end)) // We define date_start and date_end
{
- $q=GETPOST("q");
+ $q=GETPOST("q","int");
if (empty($q))
{
- if (isset($_REQUEST["month"])) { $date_start=dol_get_first_day($year_start,$_REQUEST["month"],false); $date_end=dol_get_last_day($year_start,$_REQUEST["month"],false); }
+ if (GETPOST("month","int")) { $date_start=dol_get_first_day($year_start,GETPOST("month","int"),false); $date_end=dol_get_last_day($year_start,GETPOST("month","int"),false); }
else
{
- $month_current = strftime("%m",dol_now());
- if ($month_current >= 10) $q=4;
- elseif ($month_current >= 7) $q=3;
- elseif ($month_current >= 4) $q=2;
- else $q=1;
+ $date_start=dol_get_first_day($year_start,empty($conf->global->SOCIETE_FISCAL_MONTH_START)?1:$conf->global->SOCIETE_FISCAL_MONTH_START,false);
+ if (empty($conf->global->MAIN_INFO_VAT_RETURN) || $conf->global->MAIN_INFO_VAT_RETURN == 2) $date_end=dol_time_plus_duree($date_start, 3, 'm') - 1;
+ else if ($conf->global->MAIN_INFO_VAT_RETURN == 3) $date_end=dol_time_plus_duree($date_start, 1, 'y') - 1;
+ else if ($conf->global->MAIN_INFO_VAT_RETURN == 1) $date_end=dol_time_plus_duree($date_start, 1, 'm') - 1;
}
}
- if ($q==1) { $date_start=dol_get_first_day($year_start,1,false); $date_end=dol_get_last_day($year_start,3,false); }
- if ($q==2) { $date_start=dol_get_first_day($year_start,4,false); $date_end=dol_get_last_day($year_start,6,false); }
- if ($q==3) { $date_start=dol_get_first_day($year_start,7,false); $date_end=dol_get_last_day($year_start,9,false); }
- if ($q==4) { $date_start=dol_get_first_day($year_start,10,false); $date_end=dol_get_last_day($year_start,12,false); }
+ else
+ {
+ if ($q==1) { $date_start=dol_get_first_day($year_start,1,false); $date_end=dol_get_last_day($year_start,3,false); }
+ if ($q==2) { $date_start=dol_get_first_day($year_start,4,false); $date_end=dol_get_last_day($year_start,6,false); }
+ if ($q==3) { $date_start=dol_get_first_day($year_start,7,false); $date_end=dol_get_last_day($year_start,9,false); }
+ if ($q==4) { $date_start=dol_get_first_day($year_start,10,false); $date_end=dol_get_last_day($year_start,12,false); }
+ }
}
-$min = GETPOST("min");
+$min = price2num(GETPOST("min","alpha"));
if (empty($min)) $min = 0;
// Define modetax (0 or 1)
-// 0=normal, 1=option vat for services is on debit
-$modetax = $conf->global->TAX_MODE;
-if (isset($_REQUEST["modetax"])) $modetax=$_REQUEST["modetax"];
+// 0=normal, 1=option vat for services is on debit, 2=option on payments for products
+//$modetax = $conf->global->TAX_MODE;
+$calc=$conf->global->MAIN_INFO_LOCALTAX_CALC.$local;
+$modetax=$conf->global->$calc;
+if (GETPOSTISSET("modetax")) $modetax=GETPOST("modetax",'int');
if (empty($modetax)) $modetax=0;
// Security check
@@ -93,122 +95,123 @@ $socid = GETPOST('socid','int');
if ($user->societe_id) $socid=$user->societe_id;
$result = restrictedArea($user, 'tax', '', '', 'charges');
-/**
+
+
+/*
* View
*/
+
+$form=new Form($db);
+$company_static=new Societe($db);
+$invoice_customer=new Facture($db);
+$invoice_supplier=new FactureFournisseur($db);
+$expensereport=new ExpenseReport($db);
+$product_static=new Product($db);
+$payment_static=new Paiement($db);
+$paymentfourn_static=new PaiementFourn($db);
+$paymentexpensereport_static=new PaymentExpenseReport($db);
+
$morequerystring='';
$listofparams=array('date_startmonth','date_startyear','date_startday','date_endmonth','date_endyear','date_endday');
-foreach($listofparams as $param)
+foreach ($listofparams as $param)
{
if (GETPOST($param)!='') $morequerystring.=($morequerystring?'&':'').$param.'='.GETPOST($param);
}
-llxHeader('','','','',0,0,'','',$morequerystring);
-
-$form=new Form($db);
-
-$company_static=new Societe($db);
-$invoice_customer=new Facture($db);
-$invoice_supplier=new FactureFournisseur($db);
-$product_static=new Product($db);
-$payment_static=new Paiement($db);
-$paymentfourn_static=new PaiementFourn($db);
+llxHeader('',$langs->trans("LocalTaxReport"),'','',0,0,'','',$morequerystring);
$fsearch.='
';
$fsearch.='
';
$fsearch.='
';
-$calc=$conf->global->MAIN_INFO_LOCALTAX_CALC.$local;
-
-if ($conf->global->$calc==0 || $conf->global->$calc==1) // Calculate on invoice for goods and services
-{
- $nom=$langs->trans($local==1?"LT1ReportByQuartersInDueDebtMode":"LT2ReportByQuartersInDueDebtMode");
- $calcmode=$calc==0?$langs->trans("CalcModeLT".$local):$langs->trans("CalcModeLT".$local."Rec");
- $calcmode.='
('.$langs->trans("TaxModuleSetupToModifyRulesLT",DOL_URL_ROOT.'/admin/company.php').')';
- $period=$form->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$form->select_date($date_end,'date_end',0,0,0,'',1,0,1);
- $prevyear=$year_start; $prevquarter=$q;
- if ($prevquarter > 1) $prevquarter--;
- else { $prevquarter=4; $prevyear--; }
- $nextyear=$year_start; $nextquarter=$q;
- if ($nextquarter < 4) $nextquarter++;
- else { $nextquarter=1; $nextyear++; }
-
- if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $description.='
'.$langs->trans("DepositsAreNotIncluded");
- else $description.='
'.$langs->trans("DepositsAreIncluded");
- $description.=$fsearch;
- $builddate=dol_now();
-
- $elementcust=$langs->trans("CustomersInvoices");
- $productcust=$langs->trans("ProductOrService");
- $amountcust=$langs->trans("AmountHT");
- $vatcust=$langs->trans("VATReceived");
- if ($mysoc->tva_assuj) $vatcust.=' ('.$langs->trans("ToPay").')';
- $elementsup=$langs->trans("SuppliersInvoices");
- $productsup=$langs->trans("ProductOrService");
- $amountsup=$langs->trans("AmountHT");
- $vatsup=$langs->trans("VATPaid");
- if ($mysoc->tva_assuj) $vatsup.=' ('.$langs->trans("ToGetBack").')';
+$name=$langs->transcountry($local==1?"LT1ReportByQuarters":"LT2ReportByQuarters", $mysoc->country_code);
+$calcmode='';
+if ($modetax == 0) $calcmode=$langs->trans('OptionVATDefault');
+if ($modetax == 1) $calcmode=$langs->trans('OptionVATDebitOption');
+if ($modetax == 2) $calcmode=$langs->trans('OptionPaymentForProductAndServices');
+$calcmode.='
('.$langs->trans("TaxModuleSetupToModifyRules",DOL_URL_ROOT.'/admin/taxes.php').')';
+// Set period
+$period=$form->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$form->select_date($date_end,'date_end',0,0,0,'',1,0,1);
+$prevyear=$year_start; $prevquarter=$q;
+if ($prevquarter > 1) {
+ $prevquarter--;
+} else {
+ $prevquarter=4; $prevyear--;
}
-if ($conf->global->$calc==2) // Invoice for goods, payment for services
-{
- $nom=$langs->trans($local==1?"LT1ReportByQuartersInInputOutputMode":"LT2ReportByQuartersInInputOutputMode");
- $calcmode=$calc==0?$langs->trans("CalcModeLT".$local):$langs->trans("CalcModeLT".$local."Rec");
- $calcmode.='
('.$langs->trans("TaxModuleSetupToModifyRulesLT",DOL_URL_ROOT.'/admin/company.php').')';
- $period=$form->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$form->select_date($date_end,'date_end',0,0,0,'',1,0,1);
- $prevyear=$year_start; $prevquarter=$q;
- if ($prevquarter > 1) $prevquarter--;
- else { $prevquarter=4; $prevyear--; }
- $nextyear=$year_start; $nextquarter=$q;
- if ($nextquarter < 4) $nextquarter++;
- else { $nextquarter=1; $nextyear++; }
- if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $description.=' '.$langs->trans("DepositsAreNotIncluded");
- else $description.=' '.$langs->trans("DepositsAreIncluded");
- $description.=$fsearch;
- $builddate=dol_now();
-
- $elementcust=$langs->trans("CustomersInvoices");
- $productcust=$langs->trans("ProductOrService");
- $amountcust=$langs->trans("AmountHT");
- $vatcust=$langs->trans("VATReceived");
- if ($mysoc->tva_assuj) $vatcust.=' ('.$langs->trans("ToPay").')';
- $elementsup=$langs->trans("SuppliersInvoices");
- $productsup=$langs->trans("ProductOrService");
- $amountsup=$langs->trans("AmountHT");
- $vatsup=$langs->trans("VATPaid");
- if ($mysoc->tva_assuj) $vatsup.=' ('.$langs->trans("ToGetBack").')';
+$nextyear=$year_start; $nextquarter=$q;
+if ($nextquarter < 4) {
+ $nextquarter++;
+} else {
+ $nextquarter=1; $nextyear++;
}
+$description.=$fsearch;
+$builddate=dol_now();
+
+/*if ($conf->global->TAX_MODE_SELL_PRODUCT == 'invoice') $description.=$langs->trans("RulesVATDueProducts");
+if ($conf->global->TAX_MODE_SELL_PRODUCT == 'payment') $description.=$langs->trans("RulesVATInProducts");
+if ($conf->global->TAX_MODE_SELL_SERVICE == 'invoice') $description.='
'.$langs->trans("RulesVATDueServices");
+if ($conf->global->TAX_MODE_SELL_SERVICE == 'payment') $description.='
'.$langs->trans("RulesVATInServices");
+if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
+ $description.='
'.$langs->trans("DepositsAreNotIncluded");
+}
+*/
+if (! empty($conf->global->MAIN_MODULE_ACCOUNTING)) $description.='
'.$langs->trans("ThisIsAnEstimatedValue");
+
+// Customers invoices
+$elementcust=$langs->trans("CustomersInvoices");
+$productcust=$langs->trans("ProductOrService");
+$amountcust=$langs->trans("AmountHT");
+$vatcust=$langs->trans("VATReceived");
+$namecust=$langs->trans("Name");
+if ($mysoc->tva_assuj) {
+ $vatcust.=' ('.$langs->trans("ToPay").')';
+}
+
+// Suppliers invoices
+$elementsup=$langs->trans("SuppliersInvoices");
+$productsup=$productcust;
+$amountsup=$amountcust;
+$vatsup=$langs->trans("VATPaid");
+$namesup=$namecust;
+if ($mysoc->tva_assuj) {
+ $vatsup.=' ('.$langs->trans("ToGetBack").')';
+}
+
+
report_header($name,'',$period,$periodlink,$description,$builddate,$exportlink,array(),$calcmode);
if($local==1){
$vatcust=$langs->transcountry("LocalTax1", $mysoc->country_code);
$vatsup=$langs->transcountry("LocalTax1", $mysoc->country_code);
+ $vatexpensereport=$langs->transcountry("LocalTax1", $mysoc->country_code);
}else{
$vatcust=$langs->transcountry("LocalTax2", $mysoc->country_code);
$vatsup=$langs->transcountry("LocalTax2", $mysoc->country_code);
+ $vatexpensereport=$langs->transcountry("LocalTax2", $mysoc->country_code);
}
// VAT Received and paid
+echo '
';
$y = $year_current;
$total = 0;
$i=0;
+$columns = 5;
// Load arrays of datas
-$x_coll = tax_by_date('localtax' . $local, $db, 0, 0, $date_start, $date_end, $modetax, 'sell');
-$x_paye = tax_by_date('localtax' . $local, $db, 0, 0, $date_start, $date_end, $modetax, 'buy');
-
-echo '';
+$x_coll = tax_by_rate('localtax' . $local, $db, 0, 0, $date_start, $date_end, $modetax, 'sell');
+$x_paye = tax_by_rate('localtax' . $local, $db, 0, 0, $date_start, $date_end, $modetax, 'buy');
if (! is_array($x_coll) || ! is_array($x_paye))
{
$langs->load("errors");
if ($x_coll == -1)
- print ''.$langs->trans("ErrorNoAccountancyModuleLoaded").' '.$langs->trans("ErrorNoAccountancyModuleLoaded").' '.$langs->trans("FeatureNotYetAvailable").' '.$langs->trans("FeatureNotYetAvailable").' '.$langs->trans("Error").' '.$langs->trans("Error").' ';
print ''.$elementcust.' ';
print ''.$productcust.' ';
- if ($modetax == 0)
- {
- print ''.$amountcust.' ';
- print ''.$langs->trans("Payment").' ('.$langs->trans("PercentOfInvoice").') ';
- }
+ if ($modetax != 2) print ''.$amountcust.' ';
+ if ($modetax != 1) print ''.$langs->trans("Payment").' ('.$langs->trans("PercentOfInvoice").') ';
print ''.$langs->trans("BI").' ';
print ''.$vatcust.' ';
print ' ';
@@ -319,8 +331,6 @@ else
if (is_array($x_both[$rate]['coll']['detail']))
{
// VAT Rate
- $var=true;
-
if($rate!=0){
print "";
print ''.$langs->trans("Rate").': '.vatrate($rate).'% ';
-
- // Ref
- print ''.$fields['link'].' ';
-
- // Description
- print '';
- if ($fields['pid'])
+ if(($local==1 && $fields['localtax1']!=0) || ($local==2 && $fields['localtax2']!=0))
{
- $product_static->id=$fields['pid'];
- $product_static->ref=$fields['pref'];
- $product_static->type=$fields['ptype'];
- print $product_static->getNomUrl(1);
- if (dol_string_nohtmltag($fields['descr'])) print ' - '.dol_trunc(dol_string_nohtmltag($fields['descr']),16);
- }
- else
- {
- if ($type) $text = img_object($langs->trans('Service'),'service');
- else $text = img_object($langs->trans('Product'),'product');
- if (preg_match('/^\((.*)\)$/',$fields['descr'],$reg))
- {
- if ($reg[1]=='DEPOSIT') $fields['descr']=$langs->transnoentitiesnoconv('Deposit');
- elseif ($reg[1]=='CREDIT_NOTE') $fields['descr']=$langs->transnoentitiesnoconv('CreditNote');
- else $fields['descr']=$langs->transnoentitiesnoconv($reg[1]);
- }
- print $text.' '.dol_trunc(dol_string_nohtmltag($fields['descr']),16);
+ // Define type
+ $type=($fields['dtype']?$fields['dtype']:$fields['ptype']);
+ // Try to enhance type detection using date_start and date_end for free lines where type
+ // was not saved.
+ if (! empty($fields['ddate_start'])) $type=1;
+ if (! empty($fields['ddate_end'])) $type=1;
- // Show range
- print_date_range($fields['ddate_start'],$fields['ddate_end']);
- }
- print ' ';
- // Total HT
- if ($modetax == 0)
- {
- print '';
- print price($fields['totalht']);
- if (price2num($fields['ftotal_ttc']))
+ print ' ';
+
+ // Ref
+ print ''.$fields['link'].' ';
+
+ // Description
+ print '';
+ if ($fields['pid'])
{
- $ratiolineinvoice=($fields['dtotal_ttc']/$fields['ftotal_ttc']);
+ $product_static->id=$fields['pid'];
+ $product_static->ref=$fields['pref'];
+ $product_static->type=$fields['ptype'];
+ print $product_static->getNomUrl(1);
+ if (dol_string_nohtmltag($fields['descr'])) print ' - '.dol_trunc(dol_string_nohtmltag($fields['descr']),16);
+ }
+ else
+ {
+ if ($type) $text = img_object($langs->trans('Service'),'service');
+ else $text = img_object($langs->trans('Product'),'product');
+ if (preg_match('/^\((.*)\)$/',$fields['descr'],$reg))
+ {
+ if ($reg[1]=='DEPOSIT') $fields['descr']=$langs->transnoentitiesnoconv('Deposit');
+ elseif ($reg[1]=='CREDIT_NOTE') $fields['descr']=$langs->transnoentitiesnoconv('CreditNote');
+ else $fields['descr']=$langs->transnoentitiesnoconv($reg[1]);
+ }
+ print $text.' '.dol_trunc(dol_string_nohtmltag($fields['descr']),16);
+
+ // Show range
+ print_date_range($fields['ddate_start'],$fields['ddate_end']);
}
print ' ';
- }
- // Payment
- $ratiopaymentinvoice=1;
- if ($modetax == 0)
- {
- if (isset($fields['payment_amount']) && $fields['ftotal_ttc']) $ratiopaymentinvoice=($fields['payment_amount']/$fields['ftotal_ttc']);
+ // Total HT
+ if ($modetax != 2)
+ {
+ print '';
+ print price($fields['totalht']);
+ if (price2num($fields['ftotal_ttc']))
+ {
+ $ratiolineinvoice=($fields['dtotal_ttc']/$fields['ftotal_ttc']);
+ }
+ print ' ';
+ }
+
+ // Payment
+ $ratiopaymentinvoice=1;
+ if ($modetax != 1)
+ {
+ if (isset($fields['payment_amount']) && $fields['ftotal_ttc']) $ratiopaymentinvoice=($fields['payment_amount']/$fields['ftotal_ttc']);
+ print '';
+ if ($fields['payment_amount'] && $fields['ftotal_ttc'])
+ {
+ $payment_static->id=$fields['payment_id'];
+ print $payment_static->getNomUrl(2);
+ }
+ if ($type == 0)
+ {
+ print $langs->trans("NotUsedForGoods");
+ }
+ else {
+ print price($fields['payment_amount']);
+ if (isset($fields['payment_amount'])) print ' ('.round($ratiopaymentinvoice*100,2).'%)';
+ }
+ print ' ';
+ }
+
+ // Total collected
print '';
- if ($fields['payment_amount'] && $fields['ftotal_ttc'])
- {
- $payment_static->id=$fields['payment_id'];
- print $payment_static->getNomUrl(2);
- }
- if ($type == 0)
- {
- print $langs->trans("NotUsedForGoods");
- }
- else {
- print price($fields['payment_amount']);
- if (isset($fields['payment_amount'])) print ' ('.round($ratiopaymentinvoice*100,2).'%)';
- }
+ $temp_ht=$fields['totalht'];
+ if ($type == 1) $temp_ht=$fields['totalht']*$ratiopaymentinvoice;
+ print price(price2num($temp_ht,'MT'));
print ' ';
+
+ // Localtax
+ print '';
+ $temp_vat= $local==1?$fields['localtax1']:$fields['localtax2'];
+ print price(price2num($temp_vat,'MT'));
+ //print price($fields['vat']);
+ print ' ';
+ print ' ';
+
+ $subtot_coll_total_ht += $temp_ht;
+ $subtot_coll_vat += $temp_vat;
+ $x_coll_sum += $temp_vat;
}
-
- // Total collected
- print '';
- $temp_ht=$fields['totalht'];
- if ($type == 1) $temp_ht=$fields['totalht']*$ratiopaymentinvoice;
- print price(price2num($temp_ht,'MT'));
- print ' ';
-
- // Localtax
- print '';
- $temp_vat= $local==1?$fields['localtax1']:$fields['localtax2'];
- print price(price2num($temp_vat,'MT'));
- //print price($fields['vat']);
- print ' ';
- print '';
-
- $subtot_coll_total_ht += $temp_ht;
- $subtot_coll_vat += $temp_vat;
- $x_coll_sum += $temp_vat;
}
}
- }
- if($rate!=0){
- // Total customers for this vat rate
- print '';
- print ''.$langs->trans("Total").': ';
- if ($modetax == 0)
- {
- print ' ';
- print ' ';
- }
- print ''.price(price2num($subtot_coll_total_ht,'MT')).' ';
- print ''.price(price2num($subtot_coll_vat,'MT')).' ';
- print ' ';
- }
+
+ // Total customers for this vat rate
+ print '';
+ print ''.$langs->trans("Total").': ';
+ if ($modetax != 1)
+ {
+ print ' ';
+ print ' ';
+ }
+ print ''.price(price2num($subtot_coll_total_ht,'MT')).' ';
+ print ''.price(price2num($subtot_coll_vat,'MT')).' ';
+ print ' ';
}
if (count($x_coll) == 0) // Show a total ine if nothing shown
@@ -459,15 +469,15 @@ else
print '
';
$diff=$x_coll_sum;
- }
+ //}
- if($conf->global->$calc ==0 || $conf->global->$calc == 1){
+ //if($conf->global->$calc ==0 || $conf->global->$calc == 1){
echo '';
//print table headers for this quadri - expenses now
print '';
print ''.$elementsup.' ';
print ''.$productsup.' ';
- if ($modetax == 0)
+ if ($modetax != 1)
{
print ''.$amountsup.' ';
print ''.$langs->trans("Payment").' ('.$langs->trans("PercentOfInvoice").') ';
@@ -481,9 +491,8 @@ else
$subtot_paye_total_ht = 0;
$subtot_paye_vat = 0;
- if(is_array($x_both[$rate]['paye']['detail']))
+ if (is_array($x_both[$rate]['paye']['detail']))
{
- $var=true;
if($rate!=0){
print " ";
print ''.$langs->trans("Rate").': '.vatrate($rate).'% ';
-
- // Ref
- print ''.$fields['link'].' ';
-
- // Description
- print '';
- if ($fields['pid'])
+ if(($local==1 && $fields['localtax1']!=0) || ($local==2 && $fields['localtax2']!=0))
{
- $product_static->id=$fields['pid'];
- $product_static->ref=$fields['pref'];
- $product_static->type=$fields['ptype'];
- print $product_static->getNomUrl(1);
- if (dol_string_nohtmltag($fields['descr'])) print ' - '.dol_trunc(dol_string_nohtmltag($fields['descr']),16);
- }
- else
- {
- if ($type) $text = img_object($langs->trans('Service'),'service');
- else $text = img_object($langs->trans('Product'),'product');
- print $text.' '.dol_trunc(dol_string_nohtmltag($fields['descr']),16);
+ // Define type
+ $type=($fields['dtype']?$fields['dtype']:$fields['ptype']);
+ // Try to enhance type detection using date_start and date_end for free lines where type
+ // was not saved.
+ if (! empty($fields['ddate_start'])) $type=1;
+ if (! empty($fields['ddate_end'])) $type=1;
- // Show range
- print_date_range($fields['ddate_start'],$fields['ddate_end']);
- }
- print ' ';
- // Total HT
- if ($modetax == 0)
- {
- print '';
- print price($fields['totalht']);
- if (price2num($fields['ftotal_ttc']))
+ print ' ';
+
+ // Ref
+ print ''.$fields['link'].' ';
+
+ // Description
+ print '';
+ if ($fields['pid'])
{
- //print $fields['dtotal_ttc']."/".$fields['ftotal_ttc']." - ";
- $ratiolineinvoice=($fields['dtotal_ttc']/$fields['ftotal_ttc']);
- //print ' ('.round($ratiolineinvoice*100,2).'%)';
- }
- print ' ';
- }
-
- // Payment
- $ratiopaymentinvoice=1;
- if ($modetax == 0)
- {
- if (isset($fields['payment_amount']) && $fields['ftotal_ttc']) $ratiopaymentinvoice=($fields['payment_amount']/$fields['ftotal_ttc']);
- print '';
- if ($fields['payment_amount'] && $fields['ftotal_ttc'])
- {
- $paymentfourn_static->id=$fields['payment_id'];
- print $paymentfourn_static->getNomUrl(2);
- }
- if ($type == 0)
- {
- print $langs->trans("NotUsedForGoods");
+ $product_static->id=$fields['pid'];
+ $product_static->ref=$fields['pref'];
+ $product_static->type=$fields['ptype'];
+ print $product_static->getNomUrl(1);
+ if (dol_string_nohtmltag($fields['descr'])) print ' - '.dol_trunc(dol_string_nohtmltag($fields['descr']),16);
}
else
{
- print price($fields['payment_amount']);
- if (isset($fields['payment_amount'])) print ' ('.round($ratiopaymentinvoice*100,2).'%)';
+ if ($type) $text = img_object($langs->trans('Service'),'service');
+ else $text = img_object($langs->trans('Product'),'product');
+ print $text.' '.dol_trunc(dol_string_nohtmltag($fields['descr']),16);
+
+ // Show range
+ print_date_range($fields['ddate_start'],$fields['ddate_end']);
}
print ' ';
+
+ // Total HT
+ if ($modetax != 2)
+ {
+ print '';
+ print price($fields['totalht']);
+ if (price2num($fields['ftotal_ttc']))
+ {
+ //print $fields['dtotal_ttc']."/".$fields['ftotal_ttc']." - ";
+ $ratiolineinvoice=($fields['dtotal_ttc']/$fields['ftotal_ttc']);
+ //print ' ('.round($ratiolineinvoice*100,2).'%)';
+ }
+ print ' ';
+ }
+
+ // Payment
+ $ratiopaymentinvoice=1;
+ if ($modetax != 1)
+ {
+ print '';
+ if (isset($fields['payment_amount']) && $fields['ftotal_ttc']) $ratiopaymentinvoice=($fields['payment_amount']/$fields['ftotal_ttc']);
+ if ($fields['payment_amount'] && $fields['ftotal_ttc'])
+ {
+ $paymentfourn_static->id=$fields['payment_id'];
+ print $paymentfourn_static->getNomUrl(2);
+ }
+ if ($type == 0)
+ {
+ print $langs->trans("NA");
+ }
+ else
+ {
+ print price(price2num($fields['payment_amount'],'MT'));
+ if (isset($fields['payment_amount'])) {
+ print ' ('.round($ratiopaymentinvoice*100,2).'%)';
+ }
+ }
+ print ' ';
+ }
+
+ // VAT paid
+ print '';
+ $temp_ht=$fields['totalht']*$ratiopaymentinvoice;
+ print price(price2num($temp_ht,'MT'),1);
+ print ' ';
+
+ // Localtax
+ print '';
+ $temp_vat=($local==1?$fields['localtax1']:$fields['localtax2'])*$ratiopaymentinvoice;;
+ print price(price2num($temp_vat,'MT'),1);
+ //print price($fields['vat']);
+ print ' ';
+ print ' ';
+
+ $subtot_paye_total_ht += $temp_ht;
+ $subtot_paye_vat += $temp_vat;
+ $x_paye_sum += $temp_vat;
}
-
- // VAT paid
- print '';
- $temp_ht=$fields['totalht'];
- if ($type == 1) $temp_ht=$fields['totalht']*$ratiopaymentinvoice;
- print price(price2num($temp_ht,'MT'));
- print ' ';
-
- // Localtax
- print '';
- $temp_vat= $local==1?$fields['localtax1']:$fields['localtax2'];
- print price(price2num($temp_vat,'MT'));
- //print price($fields['vat']);
- print ' ';
- print '';
-
- $subtot_paye_total_ht += $temp_ht;
- $subtot_paye_vat += $temp_vat;
- $x_paye_sum += $temp_vat;
}
}
- }
- if($rate!=0){
- // Total suppliers for this vat rate
- print '';
- print ' ';
- print ''.$langs->trans("Total").': ';
- if ($modetax == 0)
- {
- print ' ';
- print ' ';
- }
- print ''.price(price2num($subtot_paye_total_ht,'MT')).' ';
- print ''.price(price2num($subtot_paye_vat,'MT')).' ';
- print ' ';
- }
+
+ // Total suppliers for this vat rate
+ print '';
+ print ' ';
+ print ''.$langs->trans("Total").': ';
+ if ($modetax != 1)
+ {
+ print ' ';
+ print ' ';
+ }
+ print ''.price(price2num($subtot_paye_total_ht,'MT')).' ';
+ print ''.price(price2num($subtot_paye_vat,'MT')).' ';
+ print ' ';
}
- if (count($x_paye) == 0) // Show a total ine if nothing shown
- {
- print '';
- print ' ';
- print ''.$langs->trans("Total").': ';
- if ($modetax == 0)
- {
- print ' ';
- print ' ';
- }
- print ''.price(price2num(0,'MT')).' ';
- print ''.price(price2num(0,'MT')).' ';
- print ' ';
+ if (count($x_paye) == 0) { // Show a total line if nothing shown
+ print '';
+ print ' ';
+ print ''.$langs->trans("Total").': ';
+ if ($modetax != 1) {
+ print ' ';
+ print ' ';
+ }
+ print ''.price(price2num(0,'MT')).' ';
+ print ''.price(price2num(0,'MT')).' ';
+ print ' ';
}
print '
';
- $diff=$x_paye_sum;
- }
+ //}
- if($conf->global->$calc ==0){$diff=$x_coll_sum - $x_paye_sum;}
- echo '';
- // Total to pay
- print '';
- //$diff = $local==1?$x_coll_sum:$x_paye_sum;
- print '';
- print ''.$langs->trans("TotalToPay").($q?', '.$langs->trans("Quadri").' '.$q:'').' ';
- print ''.price(price2num($diff,'MT'))." \n";
-
- echo '
';
+ // Total to pay
+ print '';
+ $diff = $x_coll_sum - $x_paye_sum;
+ print '';
+ print ''.$langs->trans("TotalToPay").($q?', '.$langs->trans("Quadri").' '.$q:'').' ';
+ print ''.price(price2num($diff,'MT'))." \n";
$i++;
}
+print '
';
llxFooter();
$db->close();
diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php
index 77d9cd0a93d..8b6956a3942 100644
--- a/htdocs/compta/paiement.php
+++ b/htdocs/compta/paiement.php
@@ -819,7 +819,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
if (! GETPOST('action','aZ09'))
{
if ($page == -1) $page = 0 ;
- $limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
+ $limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
$offset = $limit * $page ;
if (! $sortorder) $sortorder='DESC';
diff --git a/htdocs/compta/paiement/cheque/card.php b/htdocs/compta/paiement/cheque/card.php
index 8a165ebe811..8489e82ae33 100644
--- a/htdocs/compta/paiement/cheque/card.php
+++ b/htdocs/compta/paiement/cheque/card.php
@@ -54,7 +54,7 @@ $page=GETPOST('page', 'int');
if (! $sortorder) $sortorder="ASC";
if (! $sortfield) $sortfield="b.dateo,b.rowid";
if (empty($page) || $page == -1) { $page = 0; }
-$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
$offset = $limit * $page ;
$dir=$conf->bank->dir_output.'/checkdeposits/';
diff --git a/htdocs/compta/paiement/cheque/index.php b/htdocs/compta/paiement/cheque/index.php
index 9ddbd0b5cf6..74fe9ea9455 100644
--- a/htdocs/compta/paiement/cheque/index.php
+++ b/htdocs/compta/paiement/cheque/index.php
@@ -94,7 +94,7 @@ $max=10;
$sql = "SELECT bc.rowid, bc.date_bordereau as db, bc.amount, bc.ref as ref,";
$sql.= " bc.statut, bc.nbcheque,";
-$sql.= " ba.ref, ba.label, ba.rowid as bid, ba.number, ba.currency_code, ba.account_number, ba.accountancy_journal,";
+$sql.= " ba.ref, ba.label, ba.rowid as bid, ba.number, ba.currency_code, ba.account_number, ba.fk_accountancy_journal,";
$sql.= " aj.code";
$sql.= " FROM ".MAIN_DB_PREFIX."bordereau_cheque as bc, ".MAIN_DB_PREFIX."bank_account as ba";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_journal as aj ON aj.rowid = ba.fk_accountancy_journal";
@@ -130,6 +130,7 @@ if ($resql)
$accountstatic->currency_code=$objp->currency_code;
$accountstatic->account_number=$objp->account_number;
$accountstatic->accountancy_journal=$objp->code;
+ $accountstatic->fk_accountancy_journal=$objp->fk_accountancy_journal;
print ''."\n";
diff --git a/htdocs/compta/paiement/cheque/list.php b/htdocs/compta/paiement/cheque/list.php
index 532d2e4c9b8..b9e8cac609a 100644
--- a/htdocs/compta/paiement/cheque/list.php
+++ b/htdocs/compta/paiement/cheque/list.php
@@ -43,7 +43,7 @@ $search_ref = GETPOST('search_ref','alpha');
$search_account = GETPOST('search_account','int');
$search_amount = GETPOST('search_amount','alpha');
-$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
$sortfield = GETPOST("sortfield",'alpha');
$sortorder = GETPOST("sortorder",'alpha');
$page = GETPOST("page",'int');
@@ -117,6 +117,11 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
{
$result = $db->query($sql);
$nbtotalofrecords = $db->num_rows($result);
+ if (($page * $limit) > $nbtotalofrecords) // if total resultset is smaller then paging size (filtering), goto and load page 0
+ {
+ $page = 0;
+ $offset = 0;
+ }
}
$sql.= $db->plimit($limit+1, $offset);
@@ -134,7 +139,9 @@ if ($resql)
$newcardbutton='';
if ($user->rights->banque->cheque)
{
- $newcardbutton = ''.$langs->trans('NewCheckDeposit').' ';
+ $newcardbutton = ''.$langs->trans('NewCheckDeposit');
+ $newcardbutton.= ' ';
}
print ' ';
- $var = True;
-
$users = array();
while ($i < min($num,$limit))
diff --git a/htdocs/compta/prelevement/factures.php b/htdocs/compta/prelevement/factures.php
index 64811c7604a..d446e64fe9b 100644
--- a/htdocs/compta/prelevement/factures.php
+++ b/htdocs/compta/prelevement/factures.php
@@ -170,6 +170,11 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
{
$result = $db->query($sql);
$nbtotalofrecords = $db->num_rows($result);
+ if (($page * $limit) > $nbtotalofrecords) // if total resultset is smaller then paging size (filtering), goto and load page 0
+ {
+ $page = 0;
+ $offset = 0;
+ }
}
$sql.= $db->plimit($limit + 1,$offset);
diff --git a/htdocs/compta/prelevement/fiche-rejet.php b/htdocs/compta/prelevement/fiche-rejet.php
index 82431e3bdd2..2fbaaf7fbcb 100644
--- a/htdocs/compta/prelevement/fiche-rejet.php
+++ b/htdocs/compta/prelevement/fiche-rejet.php
@@ -169,6 +169,11 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
{
$result = $db->query($sql);
$nbtotalofrecords = $db->num_rows($result);
+ if (($page * $limit) > $nbtotalofrecords) // if total resultset is smaller then paging size (filtering), goto and load page 0
+ {
+ $page = 0;
+ $offset = 0;
+ }
}
$sql.= $db->plimit($limit+1, $offset);
diff --git a/htdocs/compta/prelevement/index.php b/htdocs/compta/prelevement/index.php
index 271ce4da7fe..64e1991064d 100644
--- a/htdocs/compta/prelevement/index.php
+++ b/htdocs/compta/prelevement/index.php
@@ -71,7 +71,6 @@ print '';
$thirdpartystatic=new Societe($db);
$invoicestatic=new Facture($db);
$bprev = new BonPrelevement($db);
-$var=true;
print '
';
print ''.$langs->trans("Statistics").' '.$langs->trans("InvoiceWaitingWithdraw").' ('.$num.') ';
if ($num)
{
- $var = True;
while ($i < $num && $i < 20)
{
$obj = $db->fetch_object($resql);
@@ -184,7 +182,6 @@ if ($result)
{
$num = $db->num_rows($result);
$i = 0;
- $var=True;
print"\n\n";
print '';
diff --git a/htdocs/compta/prelevement/list.php b/htdocs/compta/prelevement/list.php
index ff6fe4e109c..10634670f5f 100644
--- a/htdocs/compta/prelevement/list.php
+++ b/htdocs/compta/prelevement/list.php
@@ -40,7 +40,7 @@ if ($user->societe_id) $socid=$user->societe_id;
$result = restrictedArea($user, 'prelevement','','','bons');
-$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
$sortfield = GETPOST('sortfield','alpha');
$sortorder = GETPOST('sortorder','alpha');
$page = GETPOST('page','int');
@@ -111,6 +111,11 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
{
$result = $db->query($sql);
$nbtotalofrecords = $db->num_rows($result);
+ if (($page * $limit) > $nbtotalofrecords) // if total resultset is smaller then paging size (filtering), goto and load page 0
+ {
+ $page = 0;
+ $offset = 0;
+ }
}
$sql.= $db->plimit($limit + 1,$offset);
diff --git a/htdocs/compta/resultat/index.php b/htdocs/compta/resultat/index.php
index e8b00fc869b..c4131dc365b 100644
--- a/htdocs/compta/resultat/index.php
+++ b/htdocs/compta/resultat/index.php
@@ -90,7 +90,7 @@ $tmps=dol_getdate($date_start);
$year_start = $tmps['year'];
$tmpe=dol_getdate($date_end);
$year_end = $tmpe['year'];
-$nbofyear = ($year_end - $start_year) + 1;
+$nbofyear = ($year_end - $year_start) + 1;
//var_dump("year_start=".$year_start." year_end=".$year_end." nbofyear=".$nbofyear." date_start=".dol_print_date($date_start, 'dayhour')." date_end=".dol_print_date($date_end, 'dayhour'));
diff --git a/htdocs/compta/salaries/class/paymentsalary.class.php b/htdocs/compta/salaries/class/paymentsalary.class.php
index 71cfe997fe0..3a3f34b85b4 100644
--- a/htdocs/compta/salaries/class/paymentsalary.class.php
+++ b/htdocs/compta/salaries/class/paymentsalary.class.php
@@ -388,7 +388,11 @@ class PaymentSalary extends CommonObject
-abs($this->amount),
$this->num_payment,
'',
- $user
+ $user,
+ '',
+ '',
+ '',
+ $this->datev
);
// Update fk_bank into llx_paiement.
diff --git a/htdocs/compta/salaries/document.php b/htdocs/compta/salaries/document.php
index 03cef9c07e8..00bc6185ffd 100644
--- a/htdocs/compta/salaries/document.php
+++ b/htdocs/compta/salaries/document.php
@@ -118,7 +118,7 @@ if ($object->id)
print '';
print ''.$langs->trans("NbOfAttachedFiles").' '.count($filearray).' '.$langs->trans("TotalSizeOfAttachedFiles").' '.$totalsize.' '.$langs->trans("bytes").' '.$langs->trans("TotalSizeOfAttachedFiles").' '.dol_print_size($totalsize,1,1).'
';
print '';
diff --git a/htdocs/compta/salaries/index.php b/htdocs/compta/salaries/index.php
index f9b9adf616c..a88ec8683a9 100644
--- a/htdocs/compta/salaries/index.php
+++ b/htdocs/compta/salaries/index.php
@@ -28,17 +28,14 @@ require_once DOL_DOCUMENT_ROOT.'/compta/salaries/class/paymentsalary.class.php';
require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingjournal.class.php';
-$langs->load("compta");
-$langs->load("salaries");
-$langs->load("bills");
-$langs->load("hrm");
+$langs->loadLangs(array("compta","salaries","bills","hrm"));
// Security check
$socid = GETPOST("socid","int");
if ($user->societe_id) $socid=$user->societe_id;
$result = restrictedArea($user, 'salaries', '', '', '');
-$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
$search_ref = GETPOST('search_ref','int');
$search_user = GETPOST('search_user','alpha');
$search_label = GETPOST('search_label','alpha');
@@ -52,8 +49,8 @@ if (empty($page) || $page == -1) { $page = 0; } // If $page is not defined,
$offset = $conf->liste_limit * $page;
$pageprev = $page - 1;
$pagenext = $page + 1;
-if (! $sortfield) $sortfield="s.datep";
-if (! $sortorder) $sortorder="DESC";
+if (! $sortfield) $sortfield="s.datep,s.rowid";
+if (! $sortorder) $sortorder="DESC,DESC";
$optioncss = GETPOST('optioncss','alpha');
$filtre=$_GET["filtre"];
@@ -150,9 +147,15 @@ if ($result)
if ($typeid) $param.='&typeid='.$typeid;
if ($optioncss != '') $param.='&optioncss='.$optioncss;
- $newcardbutton=''.$langs->trans('NewSalaryPayment').' ';
+ $newcardbutton='';
+ if ($user->rights->salaries->payment->write)
+ {
+ $newcardbutton=''.$langs->trans('NewSalaryPayment');
+ $newcardbutton.= ' ';
+ }
- print '';
print '';
-print '';
+print ' ';
print ''.$langs->trans("Year").' ';
-print ''.$langs->trans("Number").' ';
-print ''.$langs->trans("AmountTotal").' ';
-print ''.$langs->trans("AmountAverage").' ';
+print ''.$langs->trans("Number").' ';
+print ''.$langs->trans("AmountTotal").' ';
+print ''.$langs->trans("AmountAverage").' ';
print ' ';
$oldyear=0;
@@ -269,7 +270,7 @@ print '';
// Show graphs
-print '
';
+print '';
if ($mesg) { print $mesg; }
else {
print $px1->show();
diff --git a/htdocs/compta/sociales/card.php b/htdocs/compta/sociales/card.php
index cdcabc5617b..d7bdd9c77e6 100644
--- a/htdocs/compta/sociales/card.php
+++ b/htdocs/compta/sociales/card.php
@@ -327,13 +327,23 @@ if ($action == 'create')
// Date end period
print ' ';
print '';
- print $langs->trans("PeriodEndDate");
+ print $form->textwithpicto($langs->trans("PeriodEndDate"), $langs->trans("LastDayTaxIsRelatedTo"));
print ' ';
print '';
print $form->select_date(! empty($dateperiod)?$dateperiod:'-1', 'period', 0, 0, 0, 'charge', 1);
print ' ';
print ' ';
+ // Date due
+ print '';
+ print '';
+ print $langs->trans("DateDue");
+ print ' ';
+ print '';
+ print $form->select_date(! empty($dateech)?$dateech:'-1', 'ech', 0, 0, 0, 'charge', 1);
+ print ' ';
+ print " \n";
+
// Amount
print '';
print '';
@@ -370,16 +380,6 @@ if ($action == 'create')
print ' ';
}
- // Date due
- print '';
- print '';
- print $langs->trans("DateDue");
- print ' ';
- print '';
- print $form->select_date(! empty($dateech)?$dateech:'-1', 'ech', 0, 0, 0, 'charge', 1);
- print ' ';
- print " \n";
-
print '
';
dol_fiche_end();
@@ -496,7 +496,7 @@ if ($id > 0)
print " ".$langs->trans("PeriodEndDate")." ";
+ print "".$form->textwithpicto($langs->trans("PeriodEndDate"), $langs->trans("LastDayTaxIsRelatedTo"))." ";
print "";
if ($action == 'edit')
{
diff --git a/htdocs/compta/sociales/class/chargesociales.class.php b/htdocs/compta/sociales/class/chargesociales.class.php
index fa4127c3af6..f16d18c8143 100644
--- a/htdocs/compta/sociales/class/chargesociales.class.php
+++ b/htdocs/compta/sociales/class/chargesociales.class.php
@@ -192,7 +192,7 @@ class ChargeSociales extends CommonObject
$this->id=$this->db->last_insert_id(MAIN_DB_PREFIX."chargesociales");
//dol_syslog("ChargesSociales::create this->id=".$this->id);
- $result=$this->call_trigger('PAYMENTSOCIALCONTRIBUTION_CREATE',$user);
+ $result=$this->call_trigger('SOCIALCONTRIBUTION_CREATE',$user);
if ($result < 0) $error++;
if(empty($error)) {
diff --git a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
index 4cd0dfd2b59..ba9c671f755 100644
--- a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
+++ b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
@@ -164,6 +164,9 @@ class PaymentSocialContribution extends CommonObject
}
+ $result = $this->call_trigger('PAYMENTSOCIALCONTRIBUTION_CREATE',$user);
+ if($result < 0) $error++;
+
if ($totalamount != 0 && ! $error)
{
$this->amount=$totalamount;
diff --git a/htdocs/compta/sociales/document.php b/htdocs/compta/sociales/document.php
index 0bf1e7f6f13..0e2bcc5c986 100644
--- a/htdocs/compta/sociales/document.php
+++ b/htdocs/compta/sociales/document.php
@@ -150,7 +150,7 @@ if ($object->id)
print '';
print ''.$langs->trans("NbOfAttachedFiles").' '.count($filearray).' '.$langs->trans("TotalSizeOfAttachedFiles").' '.$totalsize.' '.$langs->trans("bytes").' '.$langs->trans("TotalSizeOfAttachedFiles").' '.dol_print_size($totalsize,1,1).'
';
print '';
diff --git a/htdocs/compta/sociales/index.php b/htdocs/compta/sociales/index.php
index 3850ddfe5c5..d38ae348c90 100644
--- a/htdocs/compta/sociales/index.php
+++ b/htdocs/compta/sociales/index.php
@@ -42,7 +42,7 @@ $search_label = GETPOST('search_label','alpha');
$search_amount = GETPOST('search_amount','alpha');
$search_status = GETPOST('search_status','int');
-$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
$sortfield = GETPOST("sortfield",'alpha');
$sortorder = GETPOST("sortorder",'alpha');
$page = GETPOST("page",'int');
@@ -149,7 +149,9 @@ if ($resql)
$newcardbutton='';
if($user->rights->tax->charges->creer)
{
- $newcardbutton=''.$langs->trans('MenuNewSocialContribution').' ';
+ $newcardbutton=''.$langs->trans('MenuNewSocialContribution');
+ $newcardbutton.= ' ';
}
print ' ';
// Product
+ print "";
$fullname=$name[$key];
- if ($key >= 0) {
+ if ($key > 0) {
$linkname=''.img_object($langs->trans("ShowProduct"),$type[$key]==0?'product':'service').' '.$fullname.' ';
} else {
$linkname=$langs->trans("PaymentsNotLinkedToProduct");
}
-
- print " ".$linkname." \n";
+ print $linkname;
+ print "\n";
// Quantity
print '';
@@ -417,11 +422,11 @@ if ($modecompta == 'CREANCES-DETTES')
// Total
print ' ';
print ''.$langs->trans("Total").' ';
- print ''.price($qtytotal).' ';
- print ' ';
+ print ''.$qtytotal.' ';
+ print '100% ';
print ''.price($catotal_ht).' ';
print ''.price($catotal).' ';
- print ' ';
+ print '100% ';
print ' ';
$db->free($result);
diff --git a/htdocs/compta/stats/cabyuser.php b/htdocs/compta/stats/cabyuser.php
index 1fa48738e66..1d386df6c6f 100644
--- a/htdocs/compta/stats/cabyuser.php
+++ b/htdocs/compta/stats/cabyuser.php
@@ -99,6 +99,12 @@ else
{
// TODO We define q
}
+// $date_start and $date_end are defined. We force $year_start and $nbofyear
+$tmps=dol_getdate($date_start);
+$year_start = $tmps['year'];
+$tmpe=dol_getdate($date_end);
+$year_end = $tmpe['year'];
+$nbofyear = ($year_end - $year_start) + 1;
$commonparams=array();
$commonparams['modecompta']=$modecompta;
@@ -139,9 +145,7 @@ $form=new Form($db);
if ($modecompta=="CREANCES-DETTES") {
$name=$langs->trans("SalesTurnover").', '.$langs->trans("ByUserAuthorOfInvoice");
$calcmode=$langs->trans("CalcModeDebt");
- $calcmode.='',' ').')';
- $period=$form->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$form->select_date($date_end,'date_end',0,0,0,'',1,0,1);
- //$periodlink="".img_previous()." ".img_next()." ";
+ $calcmode.='',' ').')';
$description=$langs->trans("RulesCADue");
if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $description.= $langs->trans("DepositsAreNotIncluded");
else $description.= $langs->trans("DepositsAreIncluded");
@@ -150,14 +154,16 @@ if ($modecompta=="CREANCES-DETTES") {
} else {
$name=$langs->trans("SalesTurnover").', '.$langs->trans("ByUserAuthorOfInvoice");
$calcmode=$langs->trans("CalcModeEngagement");
- $calcmode.='',' ').')';
- $period=$form->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$form->select_date($date_end,'date_end',0,0,0,'',1,0,1);
- //$periodlink="".img_previous()." ".img_next()." ";
+ $calcmode.='',' ').')';
$description=$langs->trans("RulesCAIn");
$description.= $langs->trans("DepositsAreIncluded");
$builddate=dol_now();
//$exportlink=$langs->trans("NotYetAvailable");
}
+$period=$form->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$form->select_date($date_end,'date_end',0,0,0,'',1,0,1);
+if ($date_end == dol_time_plus_duree($date_start, 1, 'y') - 1) $periodlink=''.img_previous().' '.img_next().' ';
+else $periodlink = '';
+
$moreparam=array();
if (! empty($modecompta)) $moreparam['modecompta']=$modecompta;
diff --git a/htdocs/compta/stats/casoc.php b/htdocs/compta/stats/casoc.php
index b7b37d0837c..5c1e8cc4db7 100644
--- a/htdocs/compta/stats/casoc.php
+++ b/htdocs/compta/stats/casoc.php
@@ -90,8 +90,8 @@ $date_end=dol_mktime(23,59,59,GETPOST("date_endmonth"),GETPOST("date_endday"),GE
// Quarter
if (empty($date_start) || empty($date_end)) // We define date_start and date_end
{
- $q=GETPOST("q")?GETPOST("q"):0;
- if ($q==0)
+ $q=GETPOST("q","int")?GETPOST("q","int"):0;
+ if (empty($q))
{
// We define date_start and date_end
$month_start=GETPOST("month")?GETPOST("month"):($conf->global->SOCIETE_FISCAL_MONTH_START?($conf->global->SOCIETE_FISCAL_MONTH_START):1);
@@ -120,6 +120,13 @@ else
// TODO We define q
}
+// $date_start and $date_end are defined. We force $year_start and $nbofyear
+$tmps=dol_getdate($date_start);
+$year_start = $tmps['year'];
+$tmpe=dol_getdate($date_end);
+$year_end = $tmpe['year'];
+$nbofyear = ($year_end - $year_start) + 1;
+
$commonparams=array();
$commonparams['modecompta']=$modecompta;
$commonparams['sortorder'] = $sortorder;
@@ -167,9 +174,7 @@ if ($modecompta=="CREANCES-DETTES")
{
$name=$langs->trans("SalesTurnover").', '.$langs->trans("ByThirdParties");
$calcmode=$langs->trans("CalcModeDebt");
- $calcmode.='',' ').')';
- $period=$form->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$form->select_date($date_end,'date_end',0,0,0,'',1,0,1);
- //$periodlink=''.img_previous().' '.img_next().' ';
+ $calcmode.='',' ').')';
$description=$langs->trans("RulesCADue");
if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $description.= $langs->trans("DepositsAreNotIncluded");
else $description.= $langs->trans("DepositsAreIncluded");
@@ -178,14 +183,15 @@ if ($modecompta=="CREANCES-DETTES")
} else {
$name=$langs->trans("SalesTurnover").', '.$langs->trans("ByThirdParties");
$calcmode=$langs->trans("CalcModeEngagement");
- $calcmode.='',' ').')';
- $period=$form->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$form->select_date($date_end,'date_end',0,0,0,'',1,0,1);
- //$periodlink=''.img_previous().' '.img_next().' ';
+ $calcmode.='',' ').')';
$description=$langs->trans("RulesCAIn");
$description.= $langs->trans("DepositsAreIncluded");
$builddate=dol_now();
//$exportlink=$langs->trans("NotYetAvailable");
}
+$period=$form->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$form->select_date($date_end,'date_end',0,0,0,'',1,0,1);
+if ($date_end == dol_time_plus_duree($date_start, 1, 'y') - 1) $periodlink=''.img_previous().' '.img_next().' ';
+else $periodlink = '';
report_header($name,$namelink,$period,$periodlink,$description,$builddate,$exportlink,$tableparams,$calcmode);
diff --git a/htdocs/compta/stats/index.php b/htdocs/compta/stats/index.php
index 598de2ba490..bb5cb25e30d 100644
--- a/htdocs/compta/stats/index.php
+++ b/htdocs/compta/stats/index.php
@@ -71,7 +71,6 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end
}
$month_end=$month_start-1;
if ($month_end < 1) $month_end=12;
- else $year_end++;
}
else $month_end=$month_start;
$date_start=dol_get_first_day($year_start,$month_start,false); $date_end=dol_get_last_day($year_end,$month_end,false);
@@ -85,6 +84,12 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end
$userid=GETPOST('userid','int');
$socid = GETPOST('socid','int');
+$tmps=dol_getdate($date_start);
+$year_start = $tmps['year'];
+$tmpe=dol_getdate($date_end);
+$year_end = $tmpe['year'];
+$nbofyear = ($year_end - $year_start) + 1;
+
// Define modecompta ('CREANCES-DETTES' or 'RECETTES-DEPENSES' or 'BOOKKEEPING')
$modecompta = $conf->global->ACCOUNTING_MODE;
if (! empty($conf->accounting->enabled)) $modecompta='BOOKKEEPING';
@@ -114,7 +119,7 @@ if ($modecompta=="CREANCES-DETTES")
$calcmode.='',' ').')';
$calcmode.='',' ').')';
$period=$form->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$form->select_date($date_end,'date_end',0,0,0,'',1,0,1);
- $periodlink=($year_start?"".img_previous()." ".img_next()." ":"");
+ $periodlink=($year_start?"".img_previous()." ".img_next()." ":"");
$description=$langs->trans("RulesCADue");
if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $description.= $langs->trans("DepositsAreNotIncluded");
else $description.= $langs->trans("DepositsAreIncluded");
@@ -128,7 +133,7 @@ else if ($modecompta=="RECETTES-DEPENSES")
$calcmode.='',' ').')';
$calcmode.='',' ').')';
$period=$form->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$form->select_date($date_end,'date_end',0,0,0,'',1,0,1);
- $periodlink=($year_start?"".img_previous()." ".img_next()." ":"");
+ $periodlink=($year_start?"".img_previous()." ".img_next()." ":"");
$description=$langs->trans("RulesCAIn");
$description.= $langs->trans("DepositsAreIncluded");
$builddate=dol_now();
@@ -141,7 +146,7 @@ else if ($modecompta=="BOOKKEEPING")
$calcmode.='',' ').')';
$calcmode.='',' ').')';
$period=$form->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$form->select_date($date_end,'date_end',0,0,0,'',1,0,1);
- $periodlink=($year_start?"".img_previous()." ".img_next()." ":"");
+ $periodlink=($year_start?"".img_previous()." ".img_next()." ":"");
$description=$langs->trans("RulesCATotalSaleJournal");
$builddate=dol_now();
//$exportlink=$langs->trans("NotYetAvailable");
@@ -493,7 +498,7 @@ for ($annee = $year_start ; $annee <= $year_end ; $annee++)
}
if (! $total[$annee-1] && $total[$annee])
{
- print '+zzzz'.$total[$annee-1].$langs->trans('Inf').'% ';
+ print '+'.$langs->trans('Inf').'% ';
}
if (! $total[$annee-1] && ! $total[$annee])
{
@@ -551,7 +556,6 @@ print '';
if ($num)
{
- $var = True;
$total_ttc_Rac = $totalam_Rac = $total_Rac = 0;
while ($i < $num)
{
@@ -561,7 +565,7 @@ print '';
$i++;
}
- print "Facture a encaisser : ".price($total_ttc_Rac)." <-- bug ici car n'exclut pas le deja r?gl? des factures partiellement r?gl?es Facture a encaisser : ".price($total_ttc_Rac)." <-- bug ici car n'exclut pas le deja r?gl? des factures partiellement r?gl?es Signe et non facture: ".price($total_pr)." <-- bug ici, ca devrait exclure le deja facture Signe et non facture: ".price($total_pr)." <-- bug ici, ca devrait exclure le deja facture Total CA previsionnel : ".price($total_CA)." <-- bug ici car bug sur les 2 precedents Total CA previsionnel : ".price($total_CA)." <-- bug ici car bug sur les 2 precedents
";
diff --git a/htdocs/compta/tva/card.php b/htdocs/compta/tva/card.php
index 2411858a924..240a4624d44 100644
--- a/htdocs/compta/tva/card.php
+++ b/htdocs/compta/tva/card.php
@@ -59,10 +59,18 @@ if ($_POST["cancel"] == $langs->trans("Cancel") && ! $id)
exit;
}
+if ($action == 'setlib' && $user->rights->tax->charges->creer)
+{
+ $object->fetch($id);
+ $result = $object->setValueFrom('label', GETPOST('lib','alpha'), '', '', 'text', '', $user, 'TAX_MODIFY');
+ if ($result < 0)
+ setEventMessages($object->error, $object->errors, 'errors');
+}
+
if ($action == 'setdatev' && $user->rights->tax->charges->creer)
{
$object->fetch($id);
- $object->datev=dol_mktime(12,0,0,$_POST['datevmonth'],$_POST['datevday'],$_POST['datevyear']);
+ $object->datev=dol_mktime(12,0,0,GETPOST('datevmonth','int'),GETPOST('datevday','int'),GETPOST('datevyear','int'));
$result=$object->update($user);
if ($result < 0) dol_print_error($db,$object->error);
@@ -172,7 +180,8 @@ if ($action == 'delete')
}
else
{
- setEventMessages('Error try do delete a line linked to a conciliated bank transaction', null, 'errors');
+ $mesg='Error try do delete a line linked to a conciliated bank transaction';
+ setEventMessages($mesg, null, 'errors');
}
}
@@ -180,11 +189,13 @@ if ($action == 'delete')
/*
* View
*/
+
+$form = new Form($db);
+
$title=$langs->trans("VAT") . " - " . $langs->trans("Card");
$help_url='';
llxHeader("",$title,$helpurl);
-$form = new Form($db);
if ($id)
{
@@ -248,7 +259,7 @@ if ($action == 'create')
print $form->select_date($datep,"datep",'','','','add',1,1);
print '';
- print '
'.$langs->trans("DateValue").' ';
+ print ' '.$form->textwithpicto($langs->trans("PeriodEndDate"), $langs->trans("LastDayTaxIsRelatedTo")).' ';
print $form->select_date($datev,"datev",'','','','add',1,1);
print ' ';
@@ -261,7 +272,7 @@ if ($action == 'create')
print '
'.$langs->trans("Label").' ';
// Amount
- print '
'.$langs->trans("Amount").' ';
+ print '
'.$langs->trans("Amount").' ';
if (! empty($conf->banque->enabled))
{
@@ -306,6 +317,13 @@ if ($id)
dol_fiche_head($head, 'card', $langs->trans("VATPayment"), -1, 'payment');
+ $morehtmlref='
';
+ // Label of social contribution
+ $morehtmlref.=$form->editfieldkey("Label", 'lib', $object->label, $object, $user->rights->tax->charges->creer, 'string', '', 0, 1);
+ $morehtmlref.=$form->editfieldval("Label", 'lib', $object->label, $object, $user->rights->tax->charges->creer, 'string', '', null, null, '', 1);
+ // Project
+ $morehtmlref.='
';
+
$linkback = '
'.$langs->trans("BackToList").' ';
dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref, '', 0, '', '');
@@ -316,18 +334,17 @@ if ($id)
print '
';
// Label
- print ''.$langs->trans("Label").' '.$object->label.' '.$langs->trans("Label").' '.$object->label.' ";
- print ''.$langs->trans("DatePayment").' ';
+ print ' '.$langs->trans("DatePayment").' ';
print dol_print_date($object->datep,'day');
print ' ';
-
print '';
- print $form->editfieldkey("DateValue", 'datev', $object->datev, $object, $user->rights->tax->charges->creer, 'day');
+ print $form->editfieldkey($form->textwithpicto($langs->trans("PeriodEndDate"), $langs->trans("LastDayTaxIsRelatedTo")), 'datev', $object->datev, $object, $user->rights->tax->charges->creer, 'day');
print ' ';
- print $form->editfieldval("DateValue", 'datev', $object->datev, $object, $user->rights->tax->charges->creer, 'day');
+ print $form->editfieldval("PeriodEndDate", 'datev', $object->datev, $object, $user->rights->tax->charges->creer, 'day');
//print dol_print_date($object->datev,'day');
print '
- * Copyright (C) 2004-2013 Laurent Destailleur
+ * Copyright (C) 2004-2018 Laurent Destailleur
* Copyright (C) 2006 Yannick Warnier
* Copyright (C) 2014 Ferran Marcet
*
@@ -20,9 +20,9 @@
*/
/**
- * \file htdocs/compta/tva/clients.php
- * \ingroup tax
- * \brief Page des societes
+ * \file htdocs/compta/tva/clients.php
+ * \ingroup tax
+ * \brief Page of sales taxes
*/
require '../../main.inc.php';
@@ -30,79 +30,67 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/report.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/tax.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/ccountry.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/localtax/class/localtax.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
+require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
+require_once DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php';
+require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
+require_once DOL_DOCUMENT_ROOT.'/expensereport/class/paymentexpensereport.class.php';
-$langs->load("bills");
-$langs->load("compta");
-$langs->load("companies");
-$langs->load("products");
-$langs->load("other");
-$langs->load("admin");
+$langs->loadLangs(array("other","compta","banks","bills","companies","product","trips","admin"));
// Date range
-$year=GETPOST("year");
-if (empty($year)) {
+$year=GETPOST("year","int");
+if (empty($year))
+{
$year_current = strftime("%Y",dol_now());
$year_start = $year_current;
} else {
$year_current = $year;
$year_start = $year;
}
-$date_start=dol_mktime(0,0,0,$_REQUEST["date_startmonth"],$_REQUEST["date_startday"],$_REQUEST["date_startyear"]);
-$date_end=dol_mktime(23,59,59,$_REQUEST["date_endmonth"],$_REQUEST["date_endday"],$_REQUEST["date_endyear"]);
+$date_start=dol_mktime(0,0,0,GETPOST("date_startmonth"),GETPOST("date_startday"),GETPOST("date_startyear"));
+$date_end=dol_mktime(23,59,59,GETPOST("date_endmonth"),GETPOST("date_endday"),GETPOST("date_endyear"));
// Quarter
-if (empty($date_start) || empty($date_end)) {// We define date_start and date_end
+if (empty($date_start) || empty($date_end)) // We define date_start and date_end
+{
$q=GETPOST("q");
- if (empty($q)) {
- if (isset($_REQUEST["month"])) {
- $date_start=dol_get_first_day($year_start,$_REQUEST["month"],false);
- $date_end=dol_get_last_day($year_start,$_REQUEST["month"],false);
- } else {
- $month_current = strftime("%m",dol_now());
- if ($month_current >= 10) $q=4;
- elseif ($month_current >= 7) $q=3;
- elseif ($month_current >= 4) $q=2;
- else $q=1;
+ if (empty($q))
+ {
+ if (GETPOST("month")) { $date_start=dol_get_first_day($year_start,GETPOST("month"),false); $date_end=dol_get_last_day($year_start,GETPOST("month"),false); }
+ else
+ {
+ $date_start=dol_get_first_day($year_start,empty($conf->global->SOCIETE_FISCAL_MONTH_START)?1:$conf->global->SOCIETE_FISCAL_MONTH_START,false);
+ if (empty($conf->global->MAIN_INFO_VAT_RETURN) || $conf->global->MAIN_INFO_VAT_RETURN == 2) $date_end=dol_time_plus_duree($date_start, 3, 'm') - 1;
+ else if ($conf->global->MAIN_INFO_VAT_RETURN == 3) $date_end=dol_time_plus_duree($date_start, 1, 'y') - 1;
+ else if ($conf->global->MAIN_INFO_VAT_RETURN == 1) $date_end=dol_time_plus_duree($date_start, 1, 'm') - 1;
}
}
- if ($q==1) {
- $date_start=dol_get_first_day($year_start,1,false);
- $date_end=dol_get_last_day($year_start,3,false);
- }
- if ($q==2) {
- $date_start=dol_get_first_day($year_start,4,false);
- $date_end=dol_get_last_day($year_start,6,false);
- }
- if ($q==3) {
- $date_start=dol_get_first_day($year_start,7,false);
- $date_end=dol_get_last_day($year_start,9,false);
- }
- if ($q==4) {
- $date_start=dol_get_first_day($year_start,10,false);
- $date_end=dol_get_last_day($year_start,12,false);
+ else
+ {
+ if ($q==1) { $date_start=dol_get_first_day($year_start,1,false); $date_end=dol_get_last_day($year_start,3,false); }
+ if ($q==2) { $date_start=dol_get_first_day($year_start,4,false); $date_end=dol_get_last_day($year_start,6,false); }
+ if ($q==3) { $date_start=dol_get_first_day($year_start,7,false); $date_end=dol_get_last_day($year_start,9,false); }
+ if ($q==4) { $date_start=dol_get_first_day($year_start,10,false); $date_end=dol_get_last_day($year_start,12,false); }
}
}
-$min = price2num(GETPOST("min"));
+$min = price2num(GETPOST("min","alpha"));
if (empty($min)) $min = 0;
// 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, 2=option on payments for products
$modetax = $conf->global->TAX_MODE;
-if (isset($_REQUEST["modetax"])) $modetax=$_REQUEST["modetax"];
+if (GETPOSTISSET("modetax")) $modetax=GETPOST("modetax",'int');
if (empty($modetax)) $modetax=0;
// Security check
$socid = GETPOST('socid','int');
-if ($user->societe_id) {
- $socid=$user->societe_id;
-}
+if ($user->societe_id) $socid=$user->societe_id;
$result = restrictedArea($user, 'tax', '', '', 'charges');
-// Define modecompta ('CREANCES-DETTES' or 'RECETTES-DEPENSES')
-$modecompta = $conf->global->ACCOUNTING_MODE;
-if (GETPOST("modecompta")) $modecompta=GETPOST("modecompta");
-
/*
@@ -111,13 +99,19 @@ if (GETPOST("modecompta")) $modecompta=GETPOST("modecompta");
$form=new Form($db);
$company_static=new Societe($db);
+$invoice_customer=new Facture($db);
+$invoice_supplier=new FactureFournisseur($db);
+$expensereport=new ExpenseReport($db);
+$product_static=new Product($db);
+$payment_static=new Paiement($db);
+$paymentfourn_static=new PaiementFourn($db);
+$paymentexpensereport_static=new PaymentExpenseReport($db);
$morequerystring='';
$listofparams=array('date_startmonth','date_startyear','date_startday','date_endmonth','date_endyear','date_endday');
-foreach($listofparams as $param) {
- if (GETPOST($param)!='') {
- $morequerystring.=($morequerystring?'&':'').$param.'='.GETPOST($param);
- }
+foreach ($listofparams as $param)
+{
+ if (GETPOST($param)!='') $morequerystring.=($morequerystring?'&':'').$param.'='.GETPOST($param);
}
$special_report = false;
@@ -133,13 +127,28 @@ $fsearch.=' ".img_previous()." ".img_next()." ":"");
- $description.=$fsearch;
+//$periodlink=($year_start?"".img_previous()." ".img_next()." ":"");
+$description.=$fsearch;
+if (! empty($conf->global->TAX_REPORT_EXTRA_REPORT))
+{
$description.='".img_previous()." ".img_next()." ":"");
- //if ($conf->global->MAIN_MODULE_COMPTABILITE || $conf->global->MAIN_MODULE_ACCOUNTING) $description.='";
-print "";
-print ''.$langs->trans("Num")." ";
-print ''.$langs->trans("Customer")." ";
-print "".$langs->trans("VATIntra")." ";
-print "".$langs->trans("AmountHTVATRealReceived")." ";
-print "".$vatcust." ";
-print " \n";
-$coll_list = vat_by_thirdparty($db,0,$date_start,$date_end,$modetax,'sell');
+$y = $year_current;
+$total = 0;
+$i=0;
+$columns = 5;
-$action = "tvaclient";
-$object = &$coll_list;
-$parameters["mode"] = $modetax;
-$parameters["start"] = $date_start;
-$parameters["end"] = $date_end;
-$parameters["direction"] = 'sell';
-$parameters["type"] = 'vat';
+// Load arrays of datas
+$x_coll = tax_by_thirdparty('vat', $db, 0, $date_start, $date_end, $modetax, 'sell');
+$x_paye = tax_by_thirdparty('vat', $db, 0, $date_start, $date_end, $modetax, 'buy');
-// Initialize technical object to manage hooks of expenses. Note that conf->hooks_modules contains array array
-$hookmanager->initHooks(array('externalbalance'));
-$reshook=$hookmanager->executeHooks('addVatLine',$parameters,$object,$action); // Note that $action and $object may have been modified by some hooks
-
-if (is_array($coll_list)) {
- $var=true;
- $total = 0; $totalamount = 0;
- $i = 1;
- foreach ($coll_list as $coll) {
- if ($min == 0 or ($min > 0 && $coll->amount > $min)) {
-
- $intra = str_replace($find,$replace,$coll->tva_intra);
- if(empty($intra)) {
- if($coll->assuj == '1') {
- $intra = $langs->trans('Unknown');
- } else {
- //$intra = $langs->trans('NotRegistered');
- $intra = '';
- }
- }
- print '';
- print ''.$i." ";
- $company_static->id=$coll->socid;
- $company_static->name=$coll->name;
- $company_static->client=1;
- print ''.$company_static->getNomUrl(1,'customer').' ';
- $find = array(' ','.');
- $replace = array('','');
- print ''.$intra." ";
- print "".price($coll->amount)." ";
- print "".price($coll->tva)." ";
- $totalamount = $totalamount + $coll->amount;
- $total = $total + $coll->tva;
- print " \n";
- $i++;
- }
- }
- $x_coll_sum = $total;
-
- print ''.$langs->trans("Total").': ';
- print ''.price($totalamount).' ';
- print ''.price($total).' ';
- print '' . $langs->trans("ErrorNoAccountancyModuleLoaded") . ' ' . $langs->trans("FeatureNotYetAvailable") . ' ' . $langs->trans("FeatureNotYetAvailable") . ' ' . $langs->trans("ErrorNoAccountancyModuleLoaded") . ' ' . $langs->trans("FeatureNotYetAvailable") . ' ' . $langs->trans("Error") . ' ' . $langs->trans("Error") . '
';
-
-
-// VAT Paid
-
-//print "";
-print "";
-print ''.$langs->trans("Num")." ";
-print ''.$langs->trans("Supplier")." ";
-print "".$langs->trans("VATIntra")." ";
-print "".$langs->trans("AmountHTVATRealPaid")." ";
-print "".$vatsup." ";
-print " \n";
-
-$company_static=new Societe($db);
-
-$coll_list = vat_by_thirdparty($db,0,$date_start,$date_end,$modetax,'buy');
-
-$parameters["direction"] = 'buy';
-$reshook=$hookmanager->executeHooks('addVatLine',$parameters,$object,$action); // Note that $action and $object may have been modified by some hooks
-if (is_array($coll_list)) {
- $var=true;
- $total = 0; $totalamount = 0;
- $i = 1;
- foreach ($coll_list as $coll) {
- if ($min == 0 or ($min > 0 && $coll->amount > $min)) {
-
- $intra = str_replace($find,$replace,$coll->tva_intra);
- if (empty($intra)) {
- if ($coll->assuj == '1') {
- $intra = $langs->trans('Unknown');
- } else {
- //$intra = $langs->trans('NotRegistered');
- $intra = '';
- }
- }
- print '';
- print ''.$i." ";
- $company_static->id=$coll->socid;
- $company_static->name=$coll->name;
- $company_static->fournisseur=1;
- print ''.$company_static->getNomUrl(1,'supplier').' ';
- $find = array(' ','.');
- $replace = array('','');
- print ''.$intra." ";
- print "".price($coll->amount)." ";
- print "".price($coll->tva)." ";
- $totalamount = $totalamount + $coll->amount;
- $total = $total + $coll->tva;
- print " \n";
- $i++;
+} else {
+ $x_both = array();
+ //now, from these two arrays, get another array with one rate per line
+ foreach(array_keys($x_coll) as $my_coll_thirdpartyid)
+ {
+ $x_both[$my_coll_thirdpartyid]['coll']['totalht'] = $x_coll[$my_coll_thirdpartyid]['totalht'];
+ $x_both[$my_coll_thirdpartyid]['coll']['vat'] = $x_coll[$my_coll_thirdpartyid]['vat'];
+ $x_both[$my_coll_thirdpartyid]['paye']['totalht'] = 0;
+ $x_both[$my_coll_thirdpartyid]['paye']['vat'] = 0;
+ $x_both[$my_coll_thirdpartyid]['coll']['links'] = '';
+ $x_both[$my_coll_thirdpartyid]['coll']['detail'] = array();
+ foreach($x_coll[$my_coll_thirdpartyid]['facid'] as $id=>$dummy) {
+ $invoice_customer->id=$x_coll[$my_coll_thirdpartyid]['facid'][$id];
+ $invoice_customer->ref=$x_coll[$my_coll_thirdpartyid]['facnum'][$id];
+ $invoice_customer->type=$x_coll[$my_coll_thirdpartyid]['type'][$id];
+ $company_static->fetch($x_coll[$my_coll_thirdpartyid]['company_id'][$id]);
+ $x_both[$my_coll_thirdpartyid]['coll']['detail'][] = array(
+ 'id' =>$x_coll[$my_coll_thirdpartyid]['facid'][$id],
+ 'descr' =>$x_coll[$my_coll_thirdpartyid]['descr'][$id],
+ 'pid' =>$x_coll[$my_coll_thirdpartyid]['pid'][$id],
+ 'pref' =>$x_coll[$my_coll_thirdpartyid]['pref'][$id],
+ 'ptype' =>$x_coll[$my_coll_thirdpartyid]['ptype'][$id],
+ 'payment_id'=>$x_coll[$my_coll_thirdpartyid]['payment_id'][$id],
+ 'payment_amount'=>$x_coll[$my_coll_thirdpartyid]['payment_amount'][$id],
+ 'ftotal_ttc'=>$x_coll[$my_coll_thirdpartyid]['ftotal_ttc'][$id],
+ 'dtotal_ttc'=>$x_coll[$my_coll_thirdpartyid]['dtotal_ttc'][$id],
+ 'dtype' =>$x_coll[$my_coll_thirdpartyid]['dtype'][$id],
+ 'drate' =>$x_coll[$my_coll_thirdpartyid]['drate'][$id],
+ 'datef' =>$x_coll[$my_coll_thirdpartyid]['datef'][$id],
+ 'datep' =>$x_coll[$my_coll_thirdpartyid]['datep'][$id],
+ 'company_link'=>$company_static->getNomUrl(1,'',20),
+ 'ddate_start'=>$x_coll[$my_coll_thirdpartyid]['ddate_start'][$id],
+ 'ddate_end' =>$x_coll[$my_coll_thirdpartyid]['ddate_end'][$id],
+ 'totalht' =>$x_coll[$my_coll_thirdpartyid]['totalht_list'][$id],
+ 'vat' =>$x_coll[$my_coll_thirdpartyid]['vat_list'][$id],
+ 'link' =>$invoice_customer->getNomUrl(1,'',12)
+ );
}
}
- $x_paye_sum = $total;
+ // tva paid
+ foreach (array_keys($x_paye) as $my_paye_thirdpartyid) {
+ $x_both[$my_paye_thirdpartyid]['paye']['totalht'] = $x_paye[$my_paye_thirdpartyid]['totalht'];
+ $x_both[$my_paye_thirdpartyid]['paye']['vat'] = $x_paye[$my_paye_thirdpartyid]['vat'];
+ if (!isset($x_both[$my_paye_thirdpartyid]['coll']['totalht'])) {
+ $x_both[$my_paye_thirdpartyid]['coll']['totalht'] = 0;
+ $x_both[$my_paye_thirdpartyid]['coll']['vat'] = 0;
+ }
+ $x_both[$my_paye_thirdpartyid]['paye']['links'] = '';
+ $x_both[$my_paye_thirdpartyid]['paye']['detail'] = array();
- print ''.$langs->trans("Total").': ';
- print ''.price($totalamount).' ';
- print ''.price($total).' ';
+ foreach ($x_paye[$my_paye_thirdpartyid]['facid'] as $id=>$dummy)
+ {
+ // ExpenseReport
+ if ($x_paye[$my_paye_thirdpartyid]['ptype'][$id] == 'ExpenseReportPayment')
+ {
+ $expensereport->id=$x_paye[$my_paye_thirdpartyid]['facid'][$id];
+ $expensereport->ref=$x_paye[$my_paye_thirdpartyid]['facnum'][$id];
+ $expensereport->type=$x_paye[$my_paye_thirdpartyid]['type'][$id];
+
+ $x_both[$my_paye_thirdpartyid]['paye']['detail'][] = array(
+ 'id' =>$x_paye[$my_paye_thirdpartyid]['facid'][$id],
+ 'descr' =>$x_paye[$my_paye_thirdpartyid]['descr'][$id],
+ 'pid' =>$x_paye[$my_paye_thirdpartyid]['pid'][$id],
+ 'pref' =>$x_paye[$my_paye_thirdpartyid]['pref'][$id],
+ 'ptype' =>$x_paye[$my_paye_thirdpartyid]['ptype'][$id],
+ 'payment_id' =>$x_paye[$my_paye_thirdpartyid]['payment_id'][$id],
+ 'payment_amount' =>$x_paye[$my_paye_thirdpartyid]['payment_amount'][$id],
+ 'ftotal_ttc' =>price2num($x_paye[$my_paye_thirdpartyid]['ftotal_ttc'][$id]),
+ 'dtotal_ttc' =>price2num($x_paye[$my_paye_thirdpartyid]['dtotal_ttc'][$id]),
+ 'dtype' =>$x_paye[$my_paye_thirdpartyid]['dtype'][$id],
+ 'drate' =>$x_paye[$my_coll_thirdpartyid]['drate'][$id],
+ 'ddate_start' =>$x_paye[$my_paye_thirdpartyid]['ddate_start'][$id],
+ 'ddate_end' =>$x_paye[$my_paye_thirdpartyid]['ddate_end'][$id],
+ 'totalht' =>price2num($x_paye[$my_paye_thirdpartyid]['totalht_list'][$id]),
+ 'vat' =>$x_paye[$my_paye_thirdpartyid]['vat_list'][$id],
+ 'link' =>$expensereport->getNomUrl(1)
+ );
+ }
+ else
+ {
+ $invoice_supplier->id=$x_paye[$my_paye_thirdpartyid]['facid'][$id];
+ $invoice_supplier->ref=$x_paye[$my_paye_thirdpartyid]['facnum'][$id];
+ $invoice_supplier->type=$x_paye[$my_paye_thirdpartyid]['type'][$id];
+ $company_static->fetch($x_paye[$my_paye_thirdpartyid]['company_id'][$id]);
+ $x_both[$my_paye_thirdpartyid]['paye']['detail'][] = array(
+ 'id' =>$x_paye[$my_paye_thirdpartyid]['facid'][$id],
+ 'descr' =>$x_paye[$my_paye_thirdpartyid]['descr'][$id],
+ 'pid' =>$x_paye[$my_paye_thirdpartyid]['pid'][$id],
+ 'pref' =>$x_paye[$my_paye_thirdpartyid]['pref'][$id],
+ 'ptype' =>$x_paye[$my_paye_thirdpartyid]['ptype'][$id],
+ 'payment_id'=>$x_paye[$my_paye_thirdpartyid]['payment_id'][$id],
+ 'payment_amount'=>$x_paye[$my_paye_thirdpartyid]['payment_amount'][$id],
+ 'ftotal_ttc'=>price2num($x_paye[$my_paye_thirdpartyid]['ftotal_ttc'][$id]),
+ 'dtotal_ttc'=>price2num($x_paye[$my_paye_thirdpartyid]['dtotal_ttc'][$id]),
+ 'dtype' =>$x_paye[$my_paye_thirdpartyid]['dtype'][$id],
+ 'drate' =>$x_paye[$my_coll_thirdpartyid]['drate'][$id],
+ 'datef' =>$x_paye[$my_paye_thirdpartyid]['datef'][$id],
+ 'datep' =>$x_paye[$my_paye_thirdpartyid]['datep'][$id],
+ 'company_link'=>$company_static->getNomUrl(1,'',20),
+ 'ddate_start'=>$x_paye[$my_paye_thirdpartyid]['ddate_start'][$id],
+ 'ddate_end' =>$x_paye[$my_paye_thirdpartyid]['ddate_end'][$id],
+ 'totalht' =>price2num($x_paye[$my_paye_thirdpartyid]['totalht_list'][$id]),
+ 'vat' =>$x_paye[$my_paye_thirdpartyid]['vat_list'][$id],
+ 'link' =>$invoice_supplier->getNomUrl(1,'',12)
+ );
+ }
+ }
+ }
+ //now we have an array (x_both) indexed by rates for coll and paye
+
+
+ //print table headers for this quadri - incomes first
+
+ $x_coll_sum = 0;
+ $x_coll_ht = 0;
+ $x_paye_sum = 0;
+ $x_paye_ht = 0;
+
+ $span=$columns;
+ if ($modetax != 1) $span+=2;
+
+ //print ''..') ';
+ print ''.$elementcust.' ';
+ print ''.$langs->trans("DateInvoice").' ';
+ if ($conf->global->TAX_MODE_SELL_PRODUCT == 'payment' || $conf->global->TAX_MODE_SELL_SERVICE == 'payment') print ''.$langs->trans("DatePayment").' ';
+ else print ''.$namerate.' ';
+ print ''.$productcust.' ';
+ if ($modetax != 1)
+ {
+ print ''.$amountcust.' ';
+ print ''.$langs->trans("Payment").' ('.$langs->trans("PercentOfInvoice").') ';
+ }
+ print ''.$langs->trans("AmountHTVATRealReceived").' ';
+ print ''.$vatcust.' ';
print ' ';
+ $action = "tvadetail";
+ $parameters["mode"] = $modetax;
+ $parameters["start"] = $date_start;
+ $parameters["end"] = $date_end;
+ $parameters["type"] = 'vat';
+
+ $object = array(&$x_coll, &$x_paye, &$x_both);
+ // Initialize technical object to manage hooks of expenses. Note that conf->hooks_modules contains array array
+ $hookmanager->initHooks(array('externalbalance'));
+ $reshook=$hookmanager->executeHooks('addVatLine',$parameters,$object,$action); // Note that $action and $object may have been modified by some hooks
+
+ foreach (array_keys($x_coll) as $thirdparty_id) {
+ $subtot_coll_total_ht = 0;
+ $subtot_coll_vat = 0;
+
+ if (is_array($x_both[$thirdparty_id]['coll']['detail']))
+ {
+
+ // VAT Rate
+ print "";
+ print '';
+ if (is_numeric($thirdparty_id))
+ {
+ $company_static->fetch($thirdparty_id);
+ print $langs->trans("ThirdParty").': '.$company_static->getNomUrl(1);
+ }
+ else
+ {
+ $tmpid = preg_replace('/userid_/','',$thirdparty_id);
+ $user_static->fetch($tmpid);
+ print $langs->trans("User").': '.$user_static->getNomUrl(1);
+ }
+ print ' '."\n";
+
+ foreach ($x_both[$thirdparty_id]['coll']['detail'] as $index => $fields) {
+ // Define type
+ // We MUST use dtype (type in line). We can use something else, only if dtype is really unknown.
+ $type=(isset($fields['dtype'])?$fields['dtype']:$fields['ptype']);
+ // Try to enhance type detection using date_start and date_end for free lines where type
+ // was not saved.
+ if (!empty($fields['ddate_start'])) {
+ $type=1;
+ }
+ if (!empty($fields['ddate_end'])) {
+ $type=1;
+ }
+
+
+ print '';
+
+ // Ref
+ print ''.$fields['link'].' ';
+
+ // Invoice date
+ print '' . dol_print_date($fields['datef'], 'day') . ' ';
+
+ // Payment date
+ if ($conf->global->TAX_MODE_SELL_PRODUCT == 'payment' || $conf->global->TAX_MODE_SELL_SERVICE == 'payment') print '' . dol_print_date($fields['datep'], 'day') . ' ';
+ else print '' . $fields['drate'] . ' ';
+
+ // Description
+ print '';
+ if ($fields['pid'])
+ {
+ $product_static->id=$fields['pid'];
+ $product_static->ref=$fields['pref'];
+ $product_static->type=$fields['dtype']; // We force with the type of line to have type how line is registered
+ print $product_static->getNomUrl(1);
+ if (dol_string_nohtmltag($fields['descr'])) {
+ print ' - '.dol_trunc(dol_string_nohtmltag($fields['descr']),24);
+ }
+ }
+ else
+ {
+ if ($type) {
+ $text = img_object($langs->trans('Service'),'service');
+ } else {
+ $text = img_object($langs->trans('Product'),'product');
+ }
+ if (preg_match('/^\((.*)\)$/',$fields['descr'],$reg)) {
+ if ($reg[1]=='DEPOSIT') {
+ $fields['descr']=$langs->transnoentitiesnoconv('Deposit');
+ } elseif ($reg[1]=='CREDIT_NOTE') {
+ $fields['descr']=$langs->transnoentitiesnoconv('CreditNote');
+ } else {
+ $fields['descr']=$langs->transnoentitiesnoconv($reg[1]);
+ }
+ }
+ print $text.' '.dol_trunc(dol_string_nohtmltag($fields['descr']),24);
+
+ // Show range
+ print_date_range($fields['ddate_start'],$fields['ddate_end']);
+ }
+ print ' ';
+
+ // Total HT
+ if ($modetax != 1)
+ {
+ print '';
+ print price($fields['totalht']);
+ if (price2num($fields['ftotal_ttc']))
+ {
+ //print $fields['dtotal_ttc']."/".$fields['ftotal_ttc']." - ";
+ $ratiolineinvoice=($fields['dtotal_ttc']/$fields['ftotal_ttc']);
+ //print ' ('.round($ratiolineinvoice*100,2).'%)';
+ }
+ print ' ';
+ }
+
+ // Payment
+ $ratiopaymentinvoice=1;
+ if ($modetax != 1)
+ {
+ print '';
+ //print $fields['totalht']."-".$fields['payment_amount']."-".$fields['ftotal_ttc'];
+ if ($fields['payment_amount'] && $fields['ftotal_ttc'])
+ {
+ $payment_static->id=$fields['payment_id'];
+ print $payment_static->getNomUrl(2);
+ }
+ if (($type == 0 && $conf->global->TAX_MODE_SELL_PRODUCT == 'invoice')
+ || ($type == 1 && $conf->global->TAX_MODE_SELL_SERVICE == 'invoice'))
+ {
+ print $langs->trans("NA");
+ } else {
+ if (isset($fields['payment_amount']) && price2num($fields['ftotal_ttc'])) {
+ $ratiopaymentinvoice=($fields['payment_amount']/$fields['ftotal_ttc']);
+ }
+ print price(price2num($fields['payment_amount'],'MT'));
+ if (isset($fields['payment_amount'])) {
+ print ' ('.round($ratiopaymentinvoice*100,2).'%)';
+ }
+ }
+ print ' ';
+ }
+
+ // Total collected
+ print '';
+ $temp_ht=$fields['totalht']*$ratiopaymentinvoice;
+ print price(price2num($temp_ht,'MT'),1);
+ print ' ';
+
+ // VAT
+ print '';
+ $temp_vat=$fields['vat']*$ratiopaymentinvoice;
+ print price(price2num($temp_vat,'MT'),1);
+ //print price($fields['vat']);
+ print ' ';
+ print ' ';
+
+ $subtot_coll_total_ht += $temp_ht;
+ $subtot_coll_vat += $temp_vat;
+ $x_coll_sum += $temp_vat;
+ }
+ }
+ // Total customers for this vat rate
+ print '';
+ print ''.$langs->trans("Total").': ';
+ if ($modetax != 1) {
+ print ' ';
+ print ' ';
+ }
+ print ''.price(price2num($subtot_coll_total_ht,'MT')).' ';
+ print ''.price(price2num($subtot_coll_vat,'MT')).' ';
+ print ' ';
+ }
+
+ if (count($x_coll) == 0) // Show a total ine if nothing shown
+ {
+ print '';
+ print ''.$langs->trans("Total").': ';
+ if ($modetax != 1) {
+ print ' ';
+ print ' ';
+ }
+ print ''.price(price2num(0,'MT')).' ';
+ print ''.price(price2num(0,'MT')).' ';
+ print ' ';
+ }
+
+ // Blank line
+ print ' ';
+ print ''.$elementsup.' ';
+ print ''.$langs->trans("DateInvoice").' ';
+ if ($conf->global->TAX_MODE_BUY_PRODUCT == 'payment' || $conf->global->TAX_MODE_BUY_SERVICE == 'payment') print ''.$langs->trans("DatePayment").' ';
+ else print ''.$namesup.' ';
+ print ''.$productsup.' ';
+ if ($modetax != 1) {
+ print ''.$amountsup.' ';
+ print ''.$langs->trans("Payment").' ('.$langs->trans("PercentOfInvoice").') ';
+ }
+ print ''.$langs->trans("AmountHTVATRealPaid").' ';
+ print ''.$vatsup.' ';
+ print ' '."\n";
+
+ foreach (array_keys($x_paye) as $thirdparty_id)
+ {
+ $subtot_paye_total_ht = 0;
+ $subtot_paye_vat = 0;
+
+ if (is_array($x_both[$thirdparty_id]['paye']['detail']))
+ {
+ print "";
+ print '';
+ if (is_numeric($thirdparty_id))
+ {
+ $company_static->fetch($thirdparty_id);
+ print $langs->trans("ThirdParty").': '.$company_static->getNomUrl(1);
+ }
+ else
+ {
+ $tmpid = preg_replace('/userid_/','',$thirdparty_id);
+ $user_static->fetch($tmpid);
+ print $langs->trans("User").': '.$user_static->getNomUrl(1);
+ }
+ print ' '."\n";
+
+ foreach ($x_both[$thirdparty_id]['paye']['detail'] as $index=>$fields) {
+ // Define type
+ // We MUST use dtype (type in line). We can use something else, only if dtype is really unknown.
+ $type=(isset($fields['dtype'])?$fields['dtype']:$fields['ptype']);
+ // Try to enhance type detection using date_start and date_end for free lines where type
+ // was not saved.
+ if (!empty($fields['ddate_start'])) {
+ $type=1;
+ }
+ if (!empty($fields['ddate_end'])) {
+ $type=1;
+ }
+
+
+ print '';
+
+ // Ref
+ print ''.$fields['link'].' ';
+
+ // Invoice date
+ print '' . dol_print_date($fields['datef'], 'day') . ' ';
+
+ // Payment date
+ if ($conf->global->TAX_MODE_BUY_PRODUCT == 'payment' || $conf->global->TAX_MODE_BUY_SERVICE == 'payment') print '' . dol_print_date($fields['datep'], 'day') . ' ';
+ else print '' . $fields['company_link'] . ' ';
+
+ // Description
+ print '';
+ if ($fields['pid'])
+ {
+ $product_static->id=$fields['pid'];
+ $product_static->ref=$fields['pref'];
+ $product_static->type=$fields['dtype']; // We force with the type of line to have type how line is registered
+ print $product_static->getNomUrl(1);
+ if (dol_string_nohtmltag($fields['descr'])) {
+ print ' - '.dol_trunc(dol_string_nohtmltag($fields['descr']),24);
+ }
+ }
+ else
+ {
+ if ($type) {
+ $text = img_object($langs->trans('Service'),'service');
+ } else {
+ $text = img_object($langs->trans('Product'),'product');
+ }
+ if (preg_match('/^\((.*)\)$/',$fields['descr'],$reg)) {
+ if ($reg[1]=='DEPOSIT') {
+ $fields['descr']=$langs->transnoentitiesnoconv('Deposit');
+ } elseif ($reg[1]=='CREDIT_NOTE') {
+ $fields['descr']=$langs->transnoentitiesnoconv('CreditNote');
+ } else {
+ $fields['descr']=$langs->transnoentitiesnoconv($reg[1]);
+ }
+ }
+ print $text.' '.dol_trunc(dol_string_nohtmltag($fields['descr']),24);
+
+ // Show range
+ print_date_range($fields['ddate_start'],$fields['ddate_end']);
+ }
+ print ' ';
+
+ // Total HT
+ if ($modetax != 1)
+ {
+ print '';
+ print price($fields['totalht']);
+ if (price2num($fields['ftotal_ttc']))
+ {
+ //print $fields['dtotal_ttc']."/".$fields['ftotal_ttc']." - ";
+ $ratiolineinvoice=($fields['dtotal_ttc']/$fields['ftotal_ttc']);
+ //print ' ('.round($ratiolineinvoice*100,2).'%)';
+ }
+ print ' ';
+ }
+
+ // Payment
+ $ratiopaymentinvoice=1;
+ if ($modetax != 1)
+ {
+ print '';
+ if ($fields['payment_amount'] && $fields['ftotal_ttc'])
+ {
+ $paymentfourn_static->id=$fields['payment_id'];
+ print $paymentfourn_static->getNomUrl(2);
+ }
+
+ if (($type == 0 && $conf->global->TAX_MODE_BUY_PRODUCT == 'invoice')
+ || ($type == 1 && $conf->global->TAX_MODE_BUY_SERVICE == 'invoice'))
+ {
+ print $langs->trans("NA");
+ }
+ else
+ {
+ if (isset($fields['payment_amount']) && $fields['ftotal_ttc']) {
+ $ratiopaymentinvoice=($fields['payment_amount']/$fields['ftotal_ttc']);
+ }
+ print price(price2num($fields['payment_amount'],'MT'));
+ if (isset($fields['payment_amount'])) {
+ print ' ('.round($ratiopaymentinvoice*100,2).'%)';
+ }
+ }
+ print ' ';
+ }
+
+ // VAT paid
+ print '';
+ $temp_ht=$fields['totalht']*$ratiopaymentinvoice;
+ print price(price2num($temp_ht,'MT'),1);
+ print ' ';
+
+ // VAT
+ print '';
+ $temp_vat=$fields['vat']*$ratiopaymentinvoice;
+ print price(price2num($temp_vat,'MT'),1);
+ //print price($fields['vat']);
+ print ' ';
+ print ' ';
+
+ $subtot_paye_total_ht += $temp_ht;
+ $subtot_paye_vat += $temp_vat;
+ $x_paye_sum += $temp_vat;
+ }
+ }
+ // Total suppliers for this vat rate
+ print '';
+ print ''.$langs->trans("Total").': ';
+ if ($modetax != 1) {
+ print ' ';
+ print ' ';
+ }
+ print ''.price(price2num($subtot_paye_total_ht,'MT')).' ';
+ print ''.price(price2num($subtot_paye_vat,'MT')).' ';
+ print ' ';
+ }
+
+ if (count($x_paye) == 0) { // Show a total line if nothing shown
+ print '';
+ print ''.$langs->trans("Total").': ';
+ if ($modetax != 1) {
+ print ' ';
+ print ' ';
+ }
+ print ''.price(price2num(0,'MT')).' ';
+ print ''.price(price2num(0,'MT')).' ';
+ print ' ';
+ }
+
print '
';
// Total to pay
@@ -374,198 +743,15 @@ if (is_array($coll_list)) {
print '';
$diff = $x_coll_sum - $x_paye_sum;
print '';
- print ''.$langs->trans("TotalToPay").($q?', '.$langs->trans("Quadri").' '.$q:'').' ';
+ print ''.$langs->trans("TotalToPay").($q?', '.$langs->trans("Quadri").' '.$q:'').' ';
print ''.price(price2num($diff,'MT'))." \n";
-} else {
- $langs->load("errors");
- if ($coll_list == -1) {
- if ($modecompta == 'CREANCES-DETTES')
- {
- print '' . $langs->trans("ErrorNoAccountancyModuleLoaded") . ' ' . $langs->trans("FeatureNotYetAvailable") . ' ' . $langs->trans("FeatureNotYetAvailable") . ' ' . $langs->trans("Error") . '
';
-if ($special_report) {
- // Get country 2-letters code
- global $mysoc;
- $country_id = $mysoc->country_id;
- $country = new Ccountry($db);
- $country->fetch($country_id);
-
- // Print listing of other-country customers as additional report
- // This matches tax requirements to list all same-country customers (only)
- print ''.$langs->trans('OtherCountriesCustomersReport').' ';
- print $langs->trans('BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry');
- $coll_list = vat_by_thirdparty($db, 0, $date_start, $date_end, $modetax, 'sell');
-
- print "";
- print "";
- print '' . $langs->trans("Num") . " ";
- print '' . $langs->trans("Customer") . " ";
- print "" . $langs->trans("VATIntra") . " ";
- print "" . $langs->trans("AmountHTVATRealReceived") . " ";
- print "" . $vatcust . " ";
- print " \n";
-
- if (is_array($coll_list)) {
- $var = true;
- $total = 0;
- $totalamount = 0;
- $i = 1;
- foreach ($coll_list as $coll) {
- if (substr($coll->tva_intra, 0, 2) == $country->code) {
- // Only use different-country VAT codes
- continue;
- }
- if ($min == 0 or ($min > 0 && $coll->amount > $min)) {
- $var = !$var;
- $intra = str_replace($find, $replace, $coll->tva_intra);
- if (empty($intra)) {
- if ($coll->assuj == '1') {
- $intra = $langs->trans('Unknown');
- } else {
- //$intra = $langs->trans('NotRegistered');
- $intra = '';
- }
- }
- print "";
- print '' . $i . " ";
- $company_static->id = $coll->socid;
- $company_static->name = $coll->name;
- $company_static->client = 1;
- print '' . $company_static->getNomUrl(1,
- 'customer') . ' ';
- $find = array(' ', '.');
- $replace = array('', '');
- print '' . $intra . " ";
- print "" . price($coll->amount) . " ";
- print "" . price($coll->tva) . " ";
- $totalamount = $totalamount + $coll->amount;
- $total = $total + $coll->tva;
- print " \n";
- $i++;
- }
- }
- $x_coll_sum = $total;
-
- print '' . $langs->trans("Total") . ': ';
- print '' . price($totalamount) . ' ';
- print '' . price($total) . ' ';
- print '' . $langs->trans("ErrorNoAccountancyModuleLoaded") . ' ' . $langs->trans("FeatureNotYetAvailable") . ' ' . $langs->trans("FeatureNotYetAvailable") . ' ' . $langs->trans("Error") . '
';
-
- // Print listing of same-country customers as additional report
- // This matches tax requirements to list all same-country customers (only)
- print ''.$langs->trans('SameCountryCustomersWithVAT').' ';
- print $langs->trans('BasedOnTwoFirstLettersOfVATNumberBeingTheSameAsYourCompanyCountry');
- $coll_list = vat_by_thirdparty($db, 0, $date_start, $date_end, $modetax, 'sell');
-
- print "";
- print "";
- print '' . $langs->trans("Num") . " ";
- print '' . $langs->trans("Customer") . " ";
- print "" . $langs->trans("VATIntra") . " ";
- print "" . $langs->trans("AmountHTVATRealReceived") . " ";
- print "" . $vatcust . " ";
- print " \n";
-
- if (is_array($coll_list)) {
- $var = true;
- $total = 0;
- $totalamount = 0;
- $i = 1;
- foreach ($coll_list as $coll) {
- if (substr($coll->tva_intra, 0, 2) != $country->code) {
- // Only use same-country VAT codes
- continue;
- }
- if ($min == 0 or ($min > 0 && $coll->amount > $min)) {
- $var = !$var;
- $intra = str_replace($find, $replace, $coll->tva_intra);
- if (empty($intra)) {
- if ($coll->assuj == '1') {
- $intra = $langs->trans('Unknown');
- } else {
- //$intra = $langs->trans('NotRegistered');
- $intra = '';
- }
- }
- print "";
- print '' . $i . " ";
- $company_static->id = $coll->socid;
- $company_static->name = $coll->name;
- $company_static->client = 1;
- print '' . $company_static->getNomUrl(1, 'customer') . ' ';
- $find = array(' ', '.');
- $replace = array('', '');
- print '' . $intra . " ";
- print "" . price($coll->amount) . " ";
- print "" . price($coll->tva) . " ";
- $totalamount = $totalamount + $coll->amount;
- $total = $total + $coll->tva;
- print " \n";
- $i++;
- }
- }
- $x_coll_sum = $total;
-
- print '' . $langs->trans("Total") . ': ';
- print '' . price($totalamount) . ' ';
- print '' . price($total) . ' ';
- print '' . $langs->trans("ErrorNoAccountancyModuleLoaded") . ' ' . $langs->trans("FeatureNotYetAvailable") . ' ' . $langs->trans("FeatureNotYetAvailable") . ' ' . $langs->trans("Error") . '
';
-}
llxFooter();
diff --git a/htdocs/compta/tva/document.php b/htdocs/compta/tva/document.php
index 2fb7ba272c8..04d65dfadf5 100644
--- a/htdocs/compta/tva/document.php
+++ b/htdocs/compta/tva/document.php
@@ -84,7 +84,7 @@ include_once DOL_DOCUMENT_ROOT . '/core/actions_linkedfiles.inc.php';
if ($action == 'setlib' && $user->rights->tax->charges->creer)
{
$object->fetch($id);
- $result = $object->setValueFrom('libelle', GETPOST('lib'), '', '', 'text', '', $user, 'TAX_MODIFY');
+ $result = $object->setValueFrom('label', GETPOST('lib','alpha'), '', '', 'text', '', $user, 'TAX_MODIFY');
if ($result < 0)
setEventMessages($object->error, $object->errors, 'errors');
}
@@ -111,23 +111,8 @@ if ($object->id)
$morehtmlref='';
// Label of social contribution
- $morehtmlref.=$form->editfieldkey("Label", 'lib', $object->lib, $object, $user->rights->tax->charges->creer, 'string', '', 0, 1);
- $morehtmlref.=$form->editfieldval("Label", 'lib', $object->lib, $object, $user->rights->tax->charges->creer, 'string', '', null, null, '', 1);
- // Project
- if (! empty($conf->projet->enabled))
- {
- $langs->load("projects");
- $morehtmlref.='
'.$langs->trans('Project') . ' : ';
- if (! empty($object->fk_project)) {
- $proj = new Project($db);
- $proj->fetch($object->fk_project);
- $morehtmlref.='
';
- $morehtmlref.=$proj->ref;
- $morehtmlref.=' ';
- } else {
- $morehtmlref.='';
- }
- }
+ $morehtmlref.=$form->editfieldkey("Label", 'lib', $object->label, $object, $user->rights->tax->charges->creer, 'string', '', 0, 1);
+ $morehtmlref.=$form->editfieldval("Label", 'lib', $object->label, $object, $user->rights->tax->charges->creer, 'string', '', null, null, '', 1);
$morehtmlref.='
' . $langs->trans("BackToList") . ' ';
@@ -151,7 +136,7 @@ if ($object->id)
print '';
print ''.$langs->trans("NbOfAttachedFiles").' '.count($filearray).' '.$langs->trans("TotalSizeOfAttachedFiles").' '.$totalsize.' '.$langs->trans("bytes").' '.$langs->trans("TotalSizeOfAttachedFiles").' '.dol_print_size($totalsize,1,1).'
';
print '';
diff --git a/htdocs/compta/tva/index.php b/htdocs/compta/tva/index.php
index 0ccd7013ba4..0eb40cd4d56 100644
--- a/htdocs/compta/tva/index.php
+++ b/htdocs/compta/tva/index.php
@@ -27,39 +27,64 @@
require '../../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/report.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/tax.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/localtax/class/localtax.class.php';
-$langs->loadLangs(array("other","compta","banks","bills","companies","admin"));
+$langs->loadLangs(array("other","compta","banks","bills","companies","product","trips","admin"));
+// Date range
$year=GETPOST("year","int");
-if ($year == 0)
+if (empty($year))
{
- $year_current = strftime("%Y",time());
- $year_start = $year_current;
+ $year_current = strftime("%Y",dol_now());
+ $year_start = $year_current;
} else {
- $year_current = $year;
- $year_start = $year;
+ $year_current = $year;
+ $year_start = $year;
+}
+$date_start=dol_mktime(0,0,0,GETPOST("date_startmonth"),GETPOST("date_startday"),GETPOST("date_startyear"));
+$date_end=dol_mktime(23,59,59,GETPOST("date_endmonth"),GETPOST("date_endday"),GETPOST("date_endyear"));
+if (empty($date_start) || empty($date_end)) // We define date_start and date_end
+{
+ $q=GETPOST("q","int");
+ if (empty($q))
+ {
+ if (GETPOST("month","int")) { $date_start=dol_get_first_day($year_start,GETPOST("month","int"),false); $date_end=dol_get_last_day($year_start,GETPOST("month","int"),false); }
+ else
+ {
+ $date_start=dol_get_first_day($year_start, $conf->global->SOCIETE_FISCAL_MONTH_START,false);
+ $date_end=dol_time_plus_duree($date_start, 1, 'y') - 1;
+ }
+ }
+ else
+ {
+ if ($q==1) { $date_start=dol_get_first_day($year_start,1,false); $date_end=dol_get_last_day($year_start,3,false); }
+ if ($q==2) { $date_start=dol_get_first_day($year_start,4,false); $date_end=dol_get_last_day($year_start,6,false); }
+ if ($q==3) { $date_start=dol_get_first_day($year_start,7,false); $date_end=dol_get_last_day($year_start,9,false); }
+ if ($q==4) { $date_start=dol_get_first_day($year_start,10,false); $date_end=dol_get_last_day($year_start,12,false); }
+ }
}
+// Define modetax (0 or 1)
+// 0=normal, 1=option vat for services is on debit, 2=option on payments for products
+$modetax = $conf->global->TAX_MODE;
+if (GETPOSTISSET("modetax")) $modetax=GETPOST("modetax",'int');
+if (empty($modetax)) $modetax=0;
+
// Security check
-$socid = isset($_GET["socid"])?$_GET["socid"]:'';
+$socid = GETPOST('socid','int');
if ($user->societe_id) $socid=$user->societe_id;
$result = restrictedArea($user, 'tax', '', '', 'charges');
-// Define modetax (0 or 1)
-// 0=normal, 1=option vat for services is on debit
-$modetax = $conf->global->TAX_MODE;
-if (isset($_GET["modetax"])) $modetax=GETPOST("modetax",'alpha');
-
/**
* print function
*
- * @param DoliDB $db Database handler
- * @param string $sql SQL Request
- * @param string $date Date
- * @return void
+ * @param DoliDB $db Database handler
+ * @param string $sql SQL Request
+ * @param string $date Date
+ * @return void
*/
function pt ($db, $sql, $date)
{
@@ -71,27 +96,88 @@ function pt ($db, $sql, $date)
$i = 0;
$total = 0;
print '';
+
print '';
- print ''.$date.' ';
- print ''.$langs->trans("Amount").' ';
- print ' '."\n";
+ print ''.$date.' ';
+ print ''.$langs->trans("ClaimedForThisPeriod").' ';
+ print ''.$langs->trans("PaidDuringThisPeriod").' ';
print " \n";
+ $amountclaimed = 0;
+ $amountpaid = 0;
+ $previousmonth = '';
+ $previousmode = '';
+ $mode = '';
+
while ($i < $num) {
$obj = $db->fetch_object($result);
+ $mode = $obj->mode;
- print '';
- print ''.$obj->dm." \n";
- $total = $total + $obj->mm;
+ //print $obj->dm.' '.$obj->mode.' '.$previousmonth.' '.$previousmode;
+ if ($obj->mode == 'claimed' && ! empty($previousmode))
+ {
+ print ' ';
+ print ''.$previousmonth." \n";
+ print ''.price($amountclaimed)." \n";
+ print ''.price($amountpaid)." \n";
+ print " \n";
- print ''.price($obj->mm)." \n";
- print "\n";
+ $amountclaimed = 0;
+ $amountpaid = 0;
+ }
+
+ if ($obj->mode == 'claimed')
+ {
+ $amountclaimed = $obj->mm;
+ $totalclaimed = $totalclaimed + $amountclaimed;
+ }
+ if ($obj->mode == 'paid')
+ {
+ $amountpaid = $obj->mm;
+ $totalpaid = $totalpaid + $amountpaid;
+ }
+
+ if ($obj->mode == 'paid')
+ {
+ print '';
+ print ''.$obj->dm." \n";
+ print ''.price($amountclaimed)." \n";
+ print ''.price($amountpaid)." \n";
+ print " \n";
+ $amountclaimed = 0;
+ $amountpaid = 0;
+ $previousmode = '';
+ $previousmonth = '';
+ }
+ else
+ {
+ $previousmode = $obj->mode;
+ $previousmonth = $obj->dm;
+ }
$i++;
}
- print ''.$langs->trans("Total")." : ".price($total)." ';
+ print ''.$previousmonth." \n";
+ print ''.price($amountclaimed)." \n";
+ print ''.price($amountpaid)." \n";
+ print " \n";
+
+ $amountclaimed = 0;
+ $amountpaid = 0;
+ }
+
+ print '';
+ print ''.$langs->trans("Total").' ';
+ print ''.price($totalclaimed).' ';
+ print ''.price($totalpaid).' ';
+ print " ";
print "
";
+
$db->free($result);
}
else {
@@ -104,10 +190,14 @@ function pt ($db, $sql, $date)
* View
*/
+$form=new Form($db);
+$company_static=new Societe($db);
$tva = new Tva($db);
-$name = $langs->trans("ReportByMonth");
+$description = '';
+// Show report header
+$name = $langs->trans("ReportByMonth");
$calcmode='';
if ($modetax == 0) $calcmode=$langs->trans('OptionVATDefault');
if ($modetax == 1) $calcmode=$langs->trans('OptionVATDebitOption');
@@ -124,17 +214,19 @@ if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
}
if (! empty($conf->global->MAIN_MODULE_ACCOUNTING)) $description.='".img_previous($langs->trans("Previous"), 'class="valignbottom"')." ";
-$textnextyear=" ".img_next($langs->trans("Next"), 'class="valignbottom"')." ";
-
+//$textprevyear="".img_previous($langs->trans("Previous"), 'class="valignbottom"')." ";
+//$textnextyear=" ".img_next($langs->trans("Next"), 'class="valignbottom"')." ";
//print load_fiche_titre($langs->transcountry("VAT", $mysoc->country_code), $textprevyear." ".$langs->trans("Year")." ".$year_start." ".$textnextyear, 'title_accountancy.png');
-report_header($name,'',$textprevyear.$langs->trans("Year")." ".$year_start.$textnextyear,'',$description,$builddate,$exportlink,array(),$calcmode);
+report_header($name,'',$period,$periodlink,$description,$builddate,$exportlink,array(),$calcmode);
+//report_header($name,'',$textprevyear.$langs->trans("Year")." ".$year_start.$textnextyear,'',$description,$builddate,$exportlink,array(),$calcmode);
print '';
print ''.$langs->trans("Year")." ".$y.' ';
print ''.$langs->trans("VATToPay").' ';
print ''.$langs->trans("VATToCollect").' ';
-print ''.$langs->trans("TotalToPay").' ';
+print ''.$langs->trans("Balance").' ';
print ' '."\n";
print ' '."\n";
-
-$y = $year_current ;
-
-
+$tmp=dol_getdate($date_start);
+$y = $tmp['year'];
+$m = $tmp['mon'];
+$tmp=dol_getdate($date_end);
+$yend = $tmp['year'];
+$mend = $tmp['mon'];
+//var_dump($m);
$total=0; $subtotalcoll=0; $subtotalpaye=0; $subtotal=0;
-$i=0;
-for ($m = 1 ; $m < 13 ; $m++ )
+$i=0; $mcursor=0;
+while ((($y < $yend) || ($y == $yend && $m < $mend)) && $mcursor < 1000) // $mcursor is to avoid too large loop
{
- $coll_listsell = tax_by_date('vat', $db, $y, 0, 0, 0, $modetax, 'sell', $m);
- $coll_listbuy = tax_by_date('vat', $db, $y, 0, 0, 0, $modetax, 'buy', $m);
+ //$m = $conf->global->SOCIETE_FISCAL_MONTH_START + ($mcursor % 12);
+ if ($m == 13) $y++;
+ if ($m > 12) $m -= 12;
+ $mcursor++;
+
+ $x_coll = tax_by_rate('vat', $db, $y, 0, 0, 0, $modetax, 'sell', $m);
+ $x_paye = tax_by_rate('vat', $db, $y, 0, 0, 0, $modetax, 'buy', $m);
+
+ $x_both = array();
+ //now, from these two arrays, get another array with one rate per line
+ foreach(array_keys($x_coll) as $my_coll_rate)
+ {
+ $x_both[$my_coll_rate]['coll']['totalht'] = $x_coll[$my_coll_rate]['totalht'];
+ $x_both[$my_coll_rate]['coll']['vat'] = $x_coll[$my_coll_rate]['vat'];
+ $x_both[$my_coll_rate]['paye']['totalht'] = 0;
+ $x_both[$my_coll_rate]['paye']['vat'] = 0;
+ $x_both[$my_coll_rate]['coll']['links'] = '';
+ $x_both[$my_coll_rate]['coll']['detail'] = array();
+ foreach($x_coll[$my_coll_rate]['facid'] as $id=>$dummy) {
+ //$invoice_customer->id=$x_coll[$my_coll_rate]['facid'][$id];
+ //$invoice_customer->ref=$x_coll[$my_coll_rate]['facnum'][$id];
+ //$invoice_customer->type=$x_coll[$my_coll_rate]['type'][$id];
+ //$company_static->fetch($x_coll[$my_coll_rate]['company_id'][$id]);
+ $x_both[$my_coll_rate]['coll']['detail'][] = array(
+ 'id' =>$x_coll[$my_coll_rate]['facid'][$id],
+ 'descr' =>$x_coll[$my_coll_rate]['descr'][$id],
+ 'pid' =>$x_coll[$my_coll_rate]['pid'][$id],
+ 'pref' =>$x_coll[$my_coll_rate]['pref'][$id],
+ 'ptype' =>$x_coll[$my_coll_rate]['ptype'][$id],
+ 'payment_id'=>$x_coll[$my_coll_rate]['payment_id'][$id],
+ 'payment_amount'=>$x_coll[$my_coll_rate]['payment_amount'][$id],
+ 'ftotal_ttc'=>$x_coll[$my_coll_rate]['ftotal_ttc'][$id],
+ 'dtotal_ttc'=>$x_coll[$my_coll_rate]['dtotal_ttc'][$id],
+ 'dtype' =>$x_coll[$my_coll_rate]['dtype'][$id],
+ 'datef' =>$x_coll[$my_coll_rate]['datef'][$id],
+ 'datep' =>$x_coll[$my_coll_rate]['datep'][$id],
+ //'company_link'=>$company_static->getNomUrl(1,'',20),
+ 'ddate_start'=>$x_coll[$my_coll_rate]['ddate_start'][$id],
+ 'ddate_end' =>$x_coll[$my_coll_rate]['ddate_end'][$id],
+ 'totalht' =>$x_coll[$my_coll_rate]['totalht_list'][$id],
+ 'vat' =>$x_coll[$my_coll_rate]['vat_list'][$id],
+ //'link' =>$invoice_customer->getNomUrl(1,'',12)
+ );
+ }
+ }
+
+ // tva paid
+ foreach (array_keys($x_paye) as $my_paye_rate) {
+ $x_both[$my_paye_rate]['paye']['totalht'] = $x_paye[$my_paye_rate]['totalht'];
+ $x_both[$my_paye_rate]['paye']['vat'] = $x_paye[$my_paye_rate]['vat'];
+ if (!isset($x_both[$my_paye_rate]['coll']['totalht'])) {
+ $x_both[$my_paye_rate]['coll']['totalht'] = 0;
+ $x_both[$my_paye_rate]['coll']['vat'] = 0;
+ }
+ $x_both[$my_paye_rate]['paye']['links'] = '';
+ $x_both[$my_paye_rate]['paye']['detail'] = array();
+
+ foreach ($x_paye[$my_paye_rate]['facid'] as $id=>$dummy)
+ {
+ // ExpenseReport
+ if ($x_paye[$my_paye_rate]['ptype'][$id] == 'ExpenseReportPayment')
+ {
+ //$expensereport->id=$x_paye[$my_paye_rate]['facid'][$id];
+ //$expensereport->ref=$x_paye[$my_paye_rate]['facnum'][$id];
+ //$expensereport->type=$x_paye[$my_paye_rate]['type'][$id];
+
+ $x_both[$my_paye_rate]['paye']['detail'][] = array(
+ 'id' =>$x_paye[$my_paye_rate]['facid'][$id],
+ 'descr' =>$x_paye[$my_paye_rate]['descr'][$id],
+ 'pid' =>$x_paye[$my_paye_rate]['pid'][$id],
+ 'pref' =>$x_paye[$my_paye_rate]['pref'][$id],
+ 'ptype' =>$x_paye[$my_paye_rate]['ptype'][$id],
+ 'payment_id' =>$x_paye[$my_paye_rate]['payment_id'][$id],
+ 'payment_amount' =>$x_paye[$my_paye_rate]['payment_amount'][$id],
+ 'ftotal_ttc' =>price2num($x_paye[$my_paye_rate]['ftotal_ttc'][$id]),
+ 'dtotal_ttc' =>price2num($x_paye[$my_paye_rate]['dtotal_ttc'][$id]),
+ 'dtype' =>$x_paye[$my_paye_rate]['dtype'][$id],
+ 'ddate_start' =>$x_paye[$my_paye_rate]['ddate_start'][$id],
+ 'ddate_end' =>$x_paye[$my_paye_rate]['ddate_end'][$id],
+ 'totalht' =>price2num($x_paye[$my_paye_rate]['totalht_list'][$id]),
+ 'vat' =>$x_paye[$my_paye_rate]['vat_list'][$id],
+ //'link' =>$expensereport->getNomUrl(1)
+ );
+ }
+ else
+ {
+ //$invoice_supplier->id=$x_paye[$my_paye_rate]['facid'][$id];
+ //$invoice_supplier->ref=$x_paye[$my_paye_rate]['facnum'][$id];
+ //$invoice_supplier->type=$x_paye[$my_paye_rate]['type'][$id];
+ //$company_static->fetch($x_paye[$my_paye_rate]['company_id'][$id]);
+ $x_both[$my_paye_rate]['paye']['detail'][] = array(
+ 'id' =>$x_paye[$my_paye_rate]['facid'][$id],
+ 'descr' =>$x_paye[$my_paye_rate]['descr'][$id],
+ 'pid' =>$x_paye[$my_paye_rate]['pid'][$id],
+ 'pref' =>$x_paye[$my_paye_rate]['pref'][$id],
+ 'ptype' =>$x_paye[$my_paye_rate]['ptype'][$id],
+ 'payment_id'=>$x_paye[$my_paye_rate]['payment_id'][$id],
+ 'payment_amount'=>$x_paye[$my_paye_rate]['payment_amount'][$id],
+ 'ftotal_ttc'=>price2num($x_paye[$my_paye_rate]['ftotal_ttc'][$id]),
+ 'dtotal_ttc'=>price2num($x_paye[$my_paye_rate]['dtotal_ttc'][$id]),
+ 'dtype' =>$x_paye[$my_paye_rate]['dtype'][$id],
+ 'datef' =>$x_paye[$my_paye_rate]['datef'][$id],
+ 'datep' =>$x_paye[$my_paye_rate]['datep'][$id],
+ //'company_link'=>$company_static->getNomUrl(1,'',20),
+ 'ddate_start'=>$x_paye[$my_paye_rate]['ddate_start'][$id],
+ 'ddate_end' =>$x_paye[$my_paye_rate]['ddate_end'][$id],
+ 'totalht' =>price2num($x_paye[$my_paye_rate]['totalht_list'][$id]),
+ 'vat' =>$x_paye[$my_paye_rate]['vat_list'][$id],
+ //'link' =>$invoice_supplier->getNomUrl(1,'',12)
+ );
+ }
+ }
+ }
+ //now we have an array (x_both) indexed by rates for coll and paye
$action = "tva";
- $object = array(&$coll_listsell, &$coll_listbuy);
+ $object = array(&$x_coll, &$x_paye, &$x_both);
$parameters["mode"] = $modetax;
$parameters["year"] = $y;
$parameters["month"] = $m;
@@ -174,13 +381,13 @@ for ($m = 1 ; $m < 13 ; $m++ )
$hookmanager->initHooks(array('externalbalance'));
$reshook=$hookmanager->executeHooks('addVatLine',$parameters,$object,$action); // Note that $action and $object may have been modified by some hooks
- if (! is_array($coll_listbuy) && $coll_listbuy == -1)
+ if (! is_array($x_coll) && $coll_listbuy == -1)
{
$langs->load("errors");
print ''.$langs->trans("ErrorNoAccountancyModuleLoaded").' '.$langs->trans("FeatureNotYetAvailable").' ';
- print ''.dol_print_date(dol_mktime(0,0,0,$m,1,$y),"%b %Y").' '.dol_print_date(dol_mktime(0,0,0,$m,1,$y),"%b %Y").' ".price($x_coll)." ";
+ $subtot_coll_total_ht = 0;
+ $subtot_coll_vat = 0;
- $x_paye = 0;
- foreach($coll_listbuy as $vatrate=>$val)
+ foreach ($x_both[$rate]['coll']['detail'] as $index => $fields)
+ {
+ // Payment
+ $ratiopaymentinvoice=1;
+ if ($modetax != 1)
+ {
+ // Define type
+ // We MUST use dtype (type in line). We can use something else, only if dtype is really unknown.
+ $type=(isset($fields['dtype'])?$fields['dtype']:$fields['ptype']);
+ // Try to enhance type detection using date_start and date_end for free lines where type
+ // was not saved.
+ if (!empty($fields['ddate_start'])) {
+ $type=1;
+ }
+ if (!empty($fields['ddate_end'])) {
+ $type=1;
+ }
+
+ if (($type == 0 && $conf->global->TAX_MODE_SELL_PRODUCT == 'invoice')
+ || ($type == 1 && $conf->global->TAX_MODE_SELL_SERVICE == 'invoice'))
+ {
+ //print $langs->trans("NA");
+ } else {
+ if (isset($fields['payment_amount']) && price2num($fields['ftotal_ttc'])) {
+ $ratiopaymentinvoice=($fields['payment_amount']/$fields['ftotal_ttc']);
+ }
+ }
+ }
+ //var_dump('type='.$type.' '.$fields['totalht'].' '.$ratiopaymentinvoice);
+ $temp_ht=$fields['totalht']*$ratiopaymentinvoice;
+ $temp_vat=$fields['vat']*$ratiopaymentinvoice;
+ $subtot_coll_total_ht += $temp_ht;
+ $subtot_coll_vat += $temp_vat;
+ $x_coll_sum += $temp_vat;
+ }
+ }
+ print "".price(price2num($x_coll_sum,'MT'))." ";
+
+ $x_paye_sum = 0;
+ foreach (array_keys($x_paye) as $rate)
{
- $x_paye+=$val['vat'];
- }
- $subtotalpaye = $subtotalpaye + $x_paye;
- print "".price($x_paye)." ";
+ $subtot_paye_total_ht = 0;
+ $subtot_paye_vat = 0;
- $diff = $x_coll - $x_paye;
+ foreach ($x_both[$rate]['paye']['detail'] as $index => $fields)
+ {
+ // Payment
+ $ratiopaymentinvoice=1;
+ if ($modetax != 1)
+ {
+ // Define type
+ // We MUST use dtype (type in line). We can use something else, only if dtype is really unknown.
+ $type=(isset($fields['dtype'])?$fields['dtype']:$fields['ptype']);
+ // Try to enhance type detection using date_start and date_end for free lines where type
+ // was not saved.
+ if (!empty($fields['ddate_start'])) {
+ $type=1;
+ }
+ if (!empty($fields['ddate_end'])) {
+ $type=1;
+ }
+
+ if (($type == 0 && $conf->global->TAX_MODE_SELL_PRODUCT == 'invoice')
+ || ($type == 1 && $conf->global->TAX_MODE_SELL_SERVICE == 'invoice'))
+ {
+ //print $langs->trans("NA");
+ } else {
+ if (isset($fields['payment_amount']) && price2num($fields['ftotal_ttc'])) {
+ $ratiopaymentinvoice=($fields['payment_amount']/$fields['ftotal_ttc']);
+ }
+ }
+ }
+ //var_dump('type='.$type.' '.$fields['totalht'].' '.$ratiopaymentinvoice);
+ $temp_ht=$fields['totalht']*$ratiopaymentinvoice;
+ $temp_vat=$fields['vat']*$ratiopaymentinvoice;
+ $subtot_paye_total_ht += $temp_ht;
+ $subtot_paye_vat += $temp_vat;
+ $x_paye_sum += $temp_vat;
+ }
+ }
+ print "".price(price2num($x_paye_sum,'MT'))." ";
+
+ $subtotalcoll = $subtotalcoll + $x_coll_sum;
+ $subtotalpaye = $subtotalpaye + $x_paye_sum;
+
+ $diff = $x_coll_sum - $x_paye_sum;
$total = $total + $diff;
- $subtotal = $subtotal + $diff;
+ $subtotal = price2num($subtotal + $diff, 'MT');
- print "".price($diff)." \n";
+ print "".price(price2num($diff,'MT'))." \n";
print " \n";
print " \n";
- $i++;
- if ($i > 2) {
+ $i++; $m++;
+ if ($i > 2)
+ {
print '';
print ''.$langs->trans("SubTotal").' :'.price($subtotalcoll).' ';
- print ''.price($subtotalpaye).' ';
- print ''.price($subtotal).' ';
+ print ''.price(price2num($subtotalcoll,'MT')).' ';
+ print ''.price(price2num($subtotalpaye,'MT')).' ';
+ print ''.price(price2num($subtotal,'MT')).' ';
print ' ';
$i = 0;
$subtotalcoll=0; $subtotalpaye=0; $subtotal=0;
}
}
-print ''.$langs->trans("TotalToPay").': '.price($total).' ';
+print ''.$langs->trans("TotalToPay").': '.price(price2num($total, 'MT')).' ';
print " \n";
print '
';
print '
';
-print load_fiche_titre($langs->trans("VATPaid"), '', '');
/*
* Payed
*/
-$sql = "SELECT SUM(amount) as mm, date_format(f.datep,'%Y-%m') as dm";
+print load_fiche_titre($langs->trans("VATPaid"), '', '');
+
+$sql='';
+
+$sql.= "SELECT SUM(amount) as mm, date_format(f.datev,'%Y-%m') as dm, 'claimed' as mode";
$sql.= " FROM ".MAIN_DB_PREFIX."tva as f";
$sql.= " WHERE f.entity = ".$conf->entity;
-$sql.= " AND f.datep >= '".$db->idate(dol_get_first_day($y,1,false))."'";
-$sql.= " AND f.datep <= '".$db->idate(dol_get_last_day($y,12,false))."'";
-$sql.= " GROUP BY dm ORDER BY dm ASC";
+$sql.= " AND (f.datev >= '".$db->idate($date_start)."' AND f.datev <= '".$db->idate($date_end)."')";
+$sql.= " GROUP BY dm";
-pt($db, $sql,$langs->trans("Year")." $y");
+$sql.= " UNION ";
+$sql.= "SELECT SUM(amount) as mm, date_format(f.datep,'%Y-%m') as dm, 'paid' as mode";
+$sql.= " FROM ".MAIN_DB_PREFIX."tva as f";
+$sql.= " WHERE f.entity = ".$conf->entity;
+$sql.= " AND (f.datep >= '".$db->idate($date_start)."' AND f.datep <= '".$db->idate($date_end)."')";
+$sql.= " GROUP BY dm";
-print '
';
+$sql.= " ORDER BY dm ASC, mode ASC";
+//print $sql;
+pt($db, $sql, $langs->trans("Month"));
if (! empty($conf->global->MAIN_FEATURES_LEVEL))
{
- /*
+ print '
';
+
+ /*
* Recap
*/
- print load_fiche_titre($langs->trans("VATRecap"), '', ''); // need to add translation
+ print load_fiche_titre($langs->trans("VATBalance"), '', ''); // need to add translation
$sql1 = "SELECT SUM(amount) as mm, date_format(f.datev,'%Y') as dm";
$sql1 .= " FROM " . MAIN_DB_PREFIX . "tva as f";
$sql1 .= " WHERE f.entity = " . $conf->entity;
- $sql1 .= " AND f.datev >= '" . $db->idate(dol_get_first_day($y, 1, false)) . "'";
- $sql1 .= " AND f.datev <= '" . $db->idate(dol_get_last_day($y, 12, false)) . "'";
+ $sql1 .= " AND f.datev >= '" . $db->idate($date_start) . "'";
+ $sql1 .= " AND f.datev <= '" . $db->idate($date_end) . "'";
$sql1 .= " GROUP BY dm ORDER BY dm ASC";
$result = $db->query($sql1);
@@ -277,7 +571,7 @@ if (! empty($conf->global->MAIN_FEATURES_LEVEL))
print '
';
print "";
- print '' . $langs->trans("VATDue") . ' '; // need to add translation
+ print '' . $langs->trans("VATDue") . ' ';
print '' . price(price2num($total, 'MT')) . ' ';
print " \n";
@@ -288,7 +582,7 @@ if (! empty($conf->global->MAIN_FEATURES_LEVEL))
$restopay = $total - $obj->mm;
print "";
- print '' . $langs->trans("VATRestopay") . ' '; // need to add translation
+ print '' . $langs->trans("RemainToPay") . ' ';
print '' . price(price2num($restopay, 'MT')) . ' ';
print " \n";
diff --git a/htdocs/compta/tva/info.php b/htdocs/compta/tva/info.php
index 6a3955403e7..24208aedf2a 100644
--- a/htdocs/compta/tva/info.php
+++ b/htdocs/compta/tva/info.php
@@ -37,10 +37,27 @@ $socid = GETPOST('socid','int');
if ($user->societe_id) $socid=$user->societe_id;
$result = restrictedArea($user, 'tax', '', '', 'charges');
+$object = new Tva($db);
+
+
+
+/*
+ * Actions
+ */
+
+if ($action == 'setlib' && $user->rights->tax->charges->creer)
+{
+ $object->fetch($id);
+ $result = $object->setValueFrom('label', GETPOST('lib','alpha'), '', '', 'text', '', $user, 'TAX_MODIFY');
+ if ($result < 0)
+ setEventMessages($object->error, $object->errors, 'errors');
+}
+
/*
* View
*/
+
$title=$langs->trans("VAT") . " - " . $langs->trans("Info");
$help_url='';
llxHeader("",$title,$helpurl);
@@ -53,6 +70,12 @@ $head = vat_prepare_head($object);
dol_fiche_head($head, 'info', $langs->trans("VATPayment"), -1, 'payment');
+$morehtmlref='';
+// Label of social contribution
+$morehtmlref.=$form->editfieldkey("Label", 'lib', $object->label, $object, $user->rights->tax->charges->creer, 'string', '', 0, 1);
+$morehtmlref.=$form->editfieldval("Label", 'lib', $object->label, $object, $user->rights->tax->charges->creer, 'string', '', null, null, '', 1);
+$morehtmlref.='
';
+
$linkback = ''.$langs->trans("BackToList").' ';
dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref, '', 0, '', '');
diff --git a/htdocs/compta/tva/list.php b/htdocs/compta/tva/list.php
index 056e16b4d5b..efe436a3704 100644
--- a/htdocs/compta/tva/list.php
+++ b/htdocs/compta/tva/list.php
@@ -35,7 +35,7 @@ $langs->load("compta");
$langs->load("bills");
// Security check
-$socid = isset($_GET["socid"])?$_GET["socid"]:'';
+$socid = GETPOST('socid','int');
if ($user->societe_id) $socid=$user->societe_id;
$result = restrictedArea($user, 'tax', '', '', 'charges');
@@ -46,7 +46,7 @@ $search_account = GETPOST('search_account','int');
$month = GETPOST("month","int");
$year = GETPOST("year","int");
-$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
$sortfield = GETPOST("sortfield",'alpha');
$sortorder = GETPOST("sortorder",'alpha');
$page = GETPOST("page",'int');
@@ -151,7 +151,9 @@ if ($result)
$newcardbutton='';
if ($user->rights->tax->charges->creer)
{
- $newcardbutton=''.$langs->trans('NewVATPayment').' ';
+ $newcardbutton=''.$langs->trans('NewVATPayment');
+ $newcardbutton.= ' ';
}
print '
';
-
+
if(!empty($compatibleImportElementsList))
{
$res=@include dol_buildpath('core/tpl/ajax/objectlinked_lineimport.tpl.php');
}
-
-
+
+
print '
';
return $nbofdifferenttypes;
diff --git a/htdocs/core/class/html.formaccounting.class.php b/htdocs/core/class/html.formaccounting.class.php
index a79f01352e8..17e437f5223 100644
--- a/htdocs/core/class/html.formaccounting.class.php
+++ b/htdocs/core/class/html.formaccounting.class.php
@@ -64,7 +64,7 @@ class FormAccounting extends Form
*/
function select_journal($selectid, $htmlname = 'journal', $nature=0, $showempty = 0, $select_in = 0, $select_out = 0, $morecss='maxwidth300 maxwidthonsmartphone', $usecache='', $disabledajaxcombo=0)
{
- global $conf;
+ global $conf,$langs;
$out = '';
@@ -93,9 +93,10 @@ class FormAccounting extends Form
}
$selected = 0;
+ $langs->load('accountancy');
while ($obj = $this->db->fetch_object($resql))
{
- $label = $obj->code . ' - ' . $obj->label;
+ $label = $obj->code . ' - ' . $langs->trans($obj->label);
$select_value_in = $obj->rowid;
$select_value_out = $obj->rowid;
@@ -274,6 +275,7 @@ class FormAccounting extends Form
$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "accounting_system as asy ON aa.fk_pcg_version = asy.pcg_version";
$sql .= " AND asy.rowid = " . $conf->global->CHARTOFACCOUNTS;
$sql .= " AND aa.active = 1";
+ $sql .= " AND aa.entity=".$conf->entity;
$sql .= " ORDER BY aa.account_number";
dol_syslog(get_class($this) . "::select_account", LOG_DEBUG);
diff --git a/htdocs/core/class/html.formactions.class.php b/htdocs/core/class/html.formactions.class.php
index f254fe44b9d..f4b4e010faf 100644
--- a/htdocs/core/class/html.formactions.class.php
+++ b/htdocs/core/class/html.formactions.class.php
@@ -194,16 +194,16 @@ class FormActions
$projectid = $object->fk_project;
if ($typeelement == 'project') $projectid = $object->id;
- $buttontoaddnewevent='';
+ $newcardbutton='';
if (! empty($conf->agenda->enabled))
{
- $buttontoaddnewevent = '
';
- $buttontoaddnewevent.= $langs->trans("AddEvent");
- $buttontoaddnewevent.= ' ';
+ $newcardbutton = '
'.$langs->trans("AddEvent");
+ $newcardbutton.= ' ';
}
print ''."\n";
- print load_fiche_titre($title, $buttontoaddnewevent, '', 0, 0, '', $morehtmlright);
+ print load_fiche_titre($title, $newcardbutton, '', 0, 0, '', $morehtmlright);
$page=0; $param='';
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index df6f389180f..ae2d88d2b6f 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -469,6 +469,15 @@ class FormFile
$modellist=ModelePDFProduct::liste_modeles($this->db);
}
}
+ elseif ($modulepart == 'product_batch')
+ {
+ if (is_array($genallowed)) $modellist=$genallowed;
+ else
+ {
+ include_once DOL_DOCUMENT_ROOT.'/core/modules/product_batch/modules_product_batch.class.php';
+ $modellist=ModelePDFProductBatch::liste_modeles($this->db);
+ }
+ }
elseif ($modulepart == 'export')
{
if (is_array($genallowed)) $modellist=$genallowed;
@@ -586,7 +595,7 @@ class FormFile
$file=dol_buildpath('/'.$modulepart.'/core/modules/'.$modulepart.'/modules_'.$modulepart.'.php',0);
$res=include_once $file;
}
- $class='Modele'.ucfirst($modulepart);
+ $class='ModelePDF'.ucfirst($modulepart);
if (class_exists($class))
{
$modellist=call_user_func($class.'::liste_modeles',$this->db);
@@ -740,7 +749,7 @@ class FormFile
// Show file size
$size=(! empty($file['size'])?$file['size']:dol_filesize($filedir."/".$file["name"]));
- $out.= '
'.dol_print_size($size).' ';
+ $out.= '
'.dol_print_size($size,1,1).' ';
// Show file date
$date=(! empty($file['date'])?$file['date']:dol_filemtime($filedir."/".$file["name"]));
@@ -858,13 +867,21 @@ class FormFile
}
else
{
- preg_match('/\/([0-9]+)\/[^\/]+\/'.preg_quote($modulesubdir).'$/', $filedir, $regs);
+ preg_match('/\/([0-9]+)\/[^\/]+\/'.preg_quote($modulesubdir,'/').'$/', $filedir, $regs);
$entity = ((! empty($regs[1]) && $regs[1] > 1) ? $regs[1] : $conf->entity);
}
- $filterforfilesearch = preg_quote(basename($modulesubdir),'/').'[^\-]+';
-
- $file_list=dol_dir_list($filedir, 'files', 0, $filterforfilesearch, '\.meta$|\.png$'); // Get list of files starting with name of ref (but not followed by "-" to discard uploaded files)
+ // Get list of files starting with name of ref (but not followed by "-" to discard uploaded files and get only generated files)
+ // @TODO Why not showing by default all files by just removing the '[^\-]+' at end of regex ?
+ if (! empty($conf->global->MAIN_SHOW_ALL_FILES_ON_DOCUMENT_TOOLTIP))
+ {
+ $filterforfilesearch = preg_quote(basename($modulesubdir),'/');
+ }
+ else
+ {
+ $filterforfilesearch = preg_quote(basename($modulesubdir),'/').'[^\-]+';
+ }
+ $file_list=dol_dir_list($filedir, 'files', 0, $filterforfilesearch, '\.meta$|\.png$'); // We also discard .meta and .png preview
//var_dump($file_list);
// For ajax treatment
@@ -973,6 +990,10 @@ class FormFile
global $user, $conf, $langs, $hookmanager;
global $sortfield, $sortorder, $maxheightmini;
global $dolibarr_main_url_root;
+ global $form;
+
+ $disablecrop=1;
+ if (in_array($modulepart, array('societe','product','produit','service','expensereport','holiday','member','project','ticketsup','user'))) $disablecrop=0;
// Define relative path used to store the file
if (empty($relativepath))
@@ -1017,6 +1038,12 @@ class FormFile
}
else
{
+ if (! is_object($form))
+ {
+ include_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php'; // The compoent may be included into ajax page that does not include the Form class
+ $form=new Form($this->db);
+ }
+
if (! preg_match('/&id=/', $param) && isset($object->id)) $param.='&id='.$object->id;
$relativepathwihtoutslashend=preg_replace('/\/$/', '', $relativepath);
if ($relativepathwihtoutslashend) $param.= '&file='.urlencode($relativepathwihtoutslashend);
@@ -1144,7 +1171,15 @@ class FormFile
print "\n";
// Size
- print '
'.dol_print_size($file['size'],1,1).' ';
+ $sizetoshow = dol_print_size($file['size'],1,1);
+ $sizetoshowbytes = dol_print_size($file['size'],0,1);
+
+ print '
';
+ if ($sizetoshow == $sizetoshowbytes) print $sizetoshow;
+ else {
+ print $form->textwithpicto($sizetoshow, $sizetoshowbytes, -1);
+ }
+ print ' ';
// Date
print '
'.dol_print_date($file['date'],"dayhour","tzuser").' ';
@@ -1225,9 +1260,6 @@ class FormFile
$newmodulepart=$modulepart;
if (in_array($modulepart, array('product','produit','service'))) $newmodulepart='produit|service';
- $disablecrop=1;
- if (in_array($modulepart, array('societe','product','produit','service','expensereport','holiday','member','project','ticketsup','user'))) $disablecrop=0;
-
if (! $disablecrop && image_format_supported($file['name']) > 0)
{
if ($permtoeditline)
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index b9043626c51..555ad503693 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -3,6 +3,7 @@
* Copyright (C) 2005-2012 Regis Houssin
* Copyright (C) 2010-2011 Juanjo Menent
* Copyright (C) 2015-2017 Marcos García
+ * Copyright (C) 2015-2017 Nicolas ZABOURI
*
* 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
@@ -81,6 +82,9 @@ class FormMail extends Form
var $substit_lines=array();
var $param=array();
+ public $withtouser=array();
+ public $withtoccuser=array();
+
var $error;
public $lines_model;
@@ -624,6 +628,28 @@ class FormMail extends Form
$out.= "\n";
}
+ // To User
+ if (! empty($this->withtouser) && is_array($this->withtouser) && !empty($conf->global->MAIN_MAIL_ENABLED_USER_DEST_SELECT))
+ {
+ $out.= '';
+ $out.= $langs->trans("MailToSalaries");
+ $out.= ' ';
+
+ // multiselect array convert html entities into options tags, even if we dont want this, so we encode them a second time
+ $tmparray = $this->withtouser;
+ foreach($tmparray as $key => $val)
+ {
+ $tmparray[$key]=dol_htmlentities($tmparray[$key], null, 'UTF-8', true);
+ }
+ $withtoselected=GETPOST("receiveruser",'none'); // Array of selected value
+ if (empty($withtoselected) && count($tmparray) == 1 && GETPOST('action','aZ09') == 'presend')
+ {
+ $withtoselected = array_keys($tmparray);
+ }
+ $out.= $form->multiselectarray("receiveruser", $tmparray, $withtoselected, null, null, 'inline-block minwidth500', null, "");
+ $out.= " ';
+ $out.= $langs->trans("MailToCCSalaries");
+ $out.= ' ';
+
+ // multiselect array convert html entities into options tags, even if we dont want this, so we encode them a second time
+ $tmparray = $this->withtoccuser;
+ foreach($tmparray as $key => $val)
+ {
+ $tmparray[$key]=dol_htmlentities($tmparray[$key], null, 'UTF-8', true);
+ }
+ $withtoselected=GETPOST("receiverccuser",'none'); // Array of selected value
+ if (empty($withtoselected) && count($tmparray) == 1 && GETPOST('action','aZ09') == 'presend')
+ {
+ $withtoselected = array_keys($tmparray);
+ }
+ $out.= $form->multiselectarray("receiverccuser", $tmparray, $withtoselected, null, null, 'inline-block minwidth500', null, "");
+ $out.= "
