';
- $linkback = ''.$langs->trans("BackToList").' ';
+ $linkback = ''.$langs->trans("BackToList").' ';
- print "";
+ print " ";
print ''.$langs->trans("Ref").' ';
print $form->showrefnav($object, 'id', $linkback, 1, 'rowid', 'ref', '');
print ' ';
@@ -349,11 +350,13 @@ if ($id)
// Label
print ''.$langs->trans("Label").' '.$object->label.' ";
print ''.$langs->trans("DatePayment").' ';
print dol_print_date($object->datep,'day');
print ' ';
+ // Value date
print ''.$langs->trans("DateValue").' ';
print dol_print_date($object->datev,'day');
print ' ';
if (! empty($conf->accounting->enabled))
{
- $accountancyaccount = new AccountingAccount($db);
- $accountancyaccount->fetch('',$object->accountancy_code);
+ $accountingaccount = new AccountingAccount($db);
+ $accountingaccount->fetch('',$object->accountancy_code);
- print $accountancyaccount->getNomUrl(1);
- // print length_accountg($object->accountancy_code);
+ print $accountingaccount->getNomUrl(0,1,1,'',1);
} else {
print $object->accountancy_code;
}
@@ -411,7 +413,7 @@ if ($id)
print ''."\n";
if ($object->rappro == 0)
{
- if (! empty($user->rights->banque->delete))
+ if (! empty($user->rights->banque->modifier))
{
print '
'.$langs->trans("Delete").' ';
}
diff --git a/htdocs/compta/bank/various_payment/index.php b/htdocs/compta/bank/various_payment/index.php
index 5b2488cc5e8..539b9ac24f2 100644
--- a/htdocs/compta/bank/various_payment/index.php
+++ b/htdocs/compta/bank/various_payment/index.php
@@ -17,14 +17,16 @@
*/
/**
- * \file htdocs/compta/bank/various_payment/index.php
+ * \file htdocs/compta/bank/various_payment/index.php
* \ingroup bank
- * \brief List of various payments
+ * \brief List of various payments
*/
require '../../../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/paymentvarious.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/accountingaccount.class.php';
+if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingjournal.class.php';
$langs->load("compta");
$langs->load("banks");
@@ -90,8 +92,8 @@ $form = new Form($db);
$variousstatic = new PaymentVarious($db);
$accountstatic = new Account($db);
-$sql = "SELECT v.rowid, v.amount, v.label, v.datep as datep, v.datev as datev, v.fk_typepayment as type, v.num_payment, v.fk_bank,";
-$sql.= " ba.rowid as bid, ba.ref as bref, ba.number as bnumber, ba.account_number, ba.fk_accountancy_journal, ba.label as blabel,";
+$sql = "SELECT v.rowid, v.amount, v.label, v.datep as datep, v.datev as datev, v.fk_typepayment as type, v.num_payment, v.fk_bank, v.accountancy_code,";
+$sql.= " ba.rowid as bid, ba.ref as bref, ba.number as bnumber, ba.account_number as bank_account_number, ba.fk_accountancy_journal as accountancy_journal, ba.label as blabel,";
$sql.= " pst.code as payment_code";
$sql.= " FROM ".MAIN_DB_PREFIX."payment_various as v";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as pst ON v.fk_typepayment = pst.id";
@@ -113,7 +115,6 @@ if ($typeid) {
}
$sql.= $db->order($sortfield,$sortorder);
-//$sql.= " GROUP BY u.rowid, u.lastname, u.firstname, v.rowid, v.fk_user, v.amount, v.label, v.datev, v.fk_typepayment, v.num_payment, pst.code";
$totalnboflines=0;
$result=$db->query($sql);
if ($result)
@@ -156,24 +157,30 @@ if ($result)
print_liste_field_titre($langs->trans("DatePayment"),$_SERVER["PHP_SELF"],"v.datep","",$param,'align="center"',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("PaymentMode"),$_SERVER["PHP_SELF"],"type","",$param,'align="left"',$sortfield,$sortorder);
if (! empty($conf->banque->enabled)) print_liste_field_titre($langs->trans("BankAccount"),$_SERVER["PHP_SELF"],"ba.label","",$param,"",$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans("AccountAccounting"),$_SERVER["PHP_SELF"],"v.accountancy_code","",$param,'align="left"',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("Amount"),$_SERVER["PHP_SELF"],"v.amount","",$param,'align="right"',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("Sens"),$_SERVER["PHP_SELF"],"v.sens","",$param,'align="right"',$sortfield,$sortorder);
print_liste_field_titre('',$_SERVER["PHP_SELF"],"",'','','',$sortfield,$sortorder,'maxwidthsearch ');
print "\n";
print '
';
+
// Ref
print '';
print ' ';
+
// Label
print ' ';
+
// Type
print '';
$form->select_types_paiements($typeid,'typeid','',0,0,1,16);
print ' ';
+
// Account
if (! empty($conf->banque->enabled))
{
@@ -181,8 +188,13 @@ if ($result)
$form->select_comptes($search_account,'search_account',0,'',1);
print '';
}
+
+ // Accounting account
+ if (! empty($conf->accounting->enabled)) print ' ';
+
// Amount
print ' ';
@@ -201,34 +213,55 @@ if ($result)
$variousstatic->id=$obj->rowid;
$variousstatic->ref=$obj->rowid;
+
// Ref
print "".$variousstatic->getNomUrl(1)." \n";
+
// Label payment
print "".dol_trunc($obj->label,40)." \n";
+
// Date payment
print ''.dol_print_date($db->jdate($obj->datep),'day')." \n";
+
// Type
print ''.$langs->trans("PaymentTypeShort".$obj->payment_code).' '.$obj->num_payment.' ';
+
// Account
if (! empty($conf->banque->enabled))
{
print '';
if ($obj->fk_bank > 0)
{
- //$accountstatic->fetch($obj->fk_bank);
$accountstatic->id=$obj->bid;
$accountstatic->ref=$obj->bref;
$accountstatic->number=$obj->bnumber;
- $accountstatic->accountancy_number=$obj->account_number;
- $accountstatic->fk_accountancy_journal=$obj->fk_accountancy_journal;
+
+ if (! empty($conf->accounting->enabled)) {
+ $accountstatic->account_number=$obj->bank_account_number;
+
+ $accountingjournal = new AccountingJournal($db);
+ $accountingjournal->fetch($obj->accountancy_journal);
+ $accountstatic->accountancy_journal = $accountingjournal->getNomUrl(0,1,1,'',1);
+ }
+
$accountstatic->label=$obj->blabel;
print $accountstatic->getNomUrl(1);
}
else print ' ';
print ' ';
}
+
+ // Accounting account
+ if (! empty($conf->accounting->enabled)) {
+ $accountingaccount = new AccountingAccount($db);
+ $accountingaccount->fetch('',$obj->accountancy_code);
+
+ print ''.$accountingaccount->getNomUrl(0,1,1,'',1).' ';
+ }
+
// Amount
print "".price($obj->amount)." ";
+
// Sens
if ($obj->sens == '1') $sens = $langs->trans("Credit"); else $sens = $langs->trans("Debit");
print "".$sens." ";
@@ -240,7 +273,7 @@ if ($result)
$i++;
}
- $colspan=4;
+ $colspan=5;
if (! empty($conf->banque->enabled)) $colspan++;
print ' ';
print ''.$langs->trans("Total").' ';
diff --git a/htdocs/compta/paiement/list.php b/htdocs/compta/paiement/list.php
index 4a7a2e3c81a..ae54ae1e913 100644
--- a/htdocs/compta/paiement/list.php
+++ b/htdocs/compta/paiement/list.php
@@ -5,6 +5,7 @@
* Copyright (C) 2013 Cédric Salvador
* Copyright (C) 2015 Jean-François Ferry
* Copyright (C) 2015 Juanjo Menent
+ * Copyright (C) 2017 Alexandre Spangaro
*
* 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
@@ -31,6 +32,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingjournal.class.php';
$langs->load("bills");
$langs->load("compta");
@@ -129,7 +131,7 @@ else
$sql = "SELECT DISTINCT p.rowid, p.ref, p.datep as dp, p.amount,"; // DISTINCT is to avoid duplicate when there is a link to sales representatives
$sql.= " p.statut, p.num_paiement,";
$sql.= " c.code as paiement_code,";
- $sql.= " ba.rowid as bid, ba.ref as bref, ba.label as blabel, ba.number, ba.account_number as account_number, ba.accountancy_journal as accountancy_journal,";
+ $sql.= " ba.rowid as bid, ba.ref as bref, ba.label as blabel, ba.number, ba.account_number as account_number, ba.fk_accountancy_journal as accountancy_journal,";
$sql.= " s.rowid as socid, s.nom as name";
// Add fields for extrafields
foreach ($extrafields->attribute_list as $key => $val) $sql.=",ef.".$key.' as options_'.$key;
@@ -329,7 +331,11 @@ if ($resql)
$accountstatic->label=$objp->blabel;
$accountstatic->number=$objp->number;
$accountstatic->account_number=$objp->account_number;
- $accountstatic->accountancy_journal=$objp->accountancy_journal;
+
+ $accountingjournal = new AccountingJournal($db);
+ $accountingjournal->fetch($objp->accountancy_journal);
+ $accountstatic->accountancy_journal = $accountingjournal->getNomUrl(0,1,1,'',1);
+
print $accountstatic->getNomUrl(1);
}
else print ' ';
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 880f32cc580..cda39e3ca9d 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -6325,5 +6325,175 @@ class Form
}
return $out;
}
+
+ /**
+ * Return HTML to show the select categories of expense category
+ *
+ * @param string $selected preselected category
+ * @param string $htmlname name of HTML select list
+ * @param integer $useempty 1=Add empty line
+ * @param array $excludeid id to exclude
+ * @param string $target htmlname of target select to bind event
+ * @param int $default_selected default category to select if fk_c_type_fees change = EX_KME
+ * @param array $params param to give
+ * @return string
+ */
+ function selectExpenseCategories($selected='', $htmlname='fk_c_exp_tax_cat', $useempty=0, $excludeid=array(), $target='', $default_selected=0, $params=array())
+ {
+ global $db,$conf,$langs;
+
+ $sql = 'SELECT rowid, label FROM '.MAIN_DB_PREFIX.'c_exp_tax_cat WHERE active = 1';
+ $sql.= ' AND entity IN (0,'.getEntity('').')';
+ if (!empty($excludeid)) $sql.= ' AND rowid NOT IN ('.implode(',', $excludeid).')';
+ $sql.= ' ORDER BY label';
+
+ $resql = $db->query($sql);
+ if ($resql)
+ {
+ $out = '';
+ if ($useempty) $out.= 'rowid ? 'selected="selected"' : '').' value="'.$obj->rowid.'">'.$langs->trans($obj->label).' ';
+ }
+ $out.= ' ';
+
+ if (!empty($target))
+ {
+ $sql = "SELECT c.id FROM ".MAIN_DB_PREFIX."c_type_fees as c WHERE c.code = 'EX_KME' AND c.active = 1";
+ $resql = $db->query($sql);
+ if ($resql)
+ {
+ if ($db->num_rows($resql) > 0)
+ {
+ $obj = $db->fetch_object($resql);
+ $out.= '';
+ }
+ }
+ }
+ }
+ else
+ {
+ dol_print_error($db);
+ }
+
+ return $out;
+ }
+
+ /**
+ * Return HTML to show the select ranges of expense range
+ *
+ * @param string $selected preselected category
+ * @param string $htmlname name of HTML select list
+ * @param integer $useempty 1=Add empty line
+ * @return string
+ */
+ function selectExpenseRanges($selected='', $htmlname='fk_range', $useempty=0)
+ {
+ global $db,$conf,$langs;
+
+ $sql = 'SELECT rowid, range_ik FROM '.MAIN_DB_PREFIX.'c_exp_tax_range';
+ $sql.= ' WHERE entity = '.$conf->entity.' AND active = 1';
+
+ $resql = $db->query($sql);
+ if ($resql)
+ {
+ $out = '';
+ if ($useempty) $out.= 'rowid ? 'selected="selected"' : '').' value="'.$obj->rowid.'">'.price($obj->range_ik, 0, $langs, 1, 0).' ';
+ }
+ $out.= ' ';
+ }
+ else
+ {
+ dol_print_error($db);
+ }
+
+ return $out;
+ }
+
+ /**
+ * Return HTML to show a select of expense
+ *
+ * @param string $selected preselected category
+ * @param string $htmlname name of HTML select list
+ * @param integer $useempty 1=Add empty choice
+ * @param integer $allchoice 1=Add all choice
+ * @param integer $useid 0=use 'code' as key, 1=use 'id' as key
+ * @return string
+ */
+ function selectExpense($selected='', $htmlname='fk_c_type_fees', $useempty=0, $allchoice=1, $useid=0)
+ {
+ global $db,$langs;
+
+ $sql = 'SELECT id, code, label FROM '.MAIN_DB_PREFIX.'c_type_fees';
+ $sql.= ' WHERE active = 1';
+
+ $resql = $db->query($sql);
+ if ($resql)
+ {
+ $out = '';
+ if ($useempty) $out.= ''.$langs->trans('AllExpenseReport').' ';
+
+ $field = 'code';
+ if ($useid) $field = 'id';
+
+ while ($obj = $db->fetch_object($resql))
+ {
+ $key = $langs->trans($obj->code);
+ $out.= '{$field} ? 'selected="selected"' : '').' value="'.$obj->{$field}.'">'.($key != $obj->code ? $key : $obj->label).' ';
+ }
+ $out.= ' ';
+ }
+ else
+ {
+ dol_print_error($db);
+ }
+
+ return $out;
+ }
+
}
diff --git a/htdocs/core/lib/expensereport.lib.php b/htdocs/core/lib/expensereport.lib.php
index a5f19174a84..1efdc73f247 100644
--- a/htdocs/core/lib/expensereport.lib.php
+++ b/htdocs/core/lib/expensereport.lib.php
@@ -132,6 +132,22 @@ function expensereport_admin_prepare_head()
$head[$h][2] = 'expensereport';
$h++;
+ if (!empty($conf->global->MAIN_USE_EXPENSE_IK))
+ {
+ $head[$h][0] = DOL_URL_ROOT."/admin/expensereport_ik.php";
+ $head[$h][1] = $langs->trans("ExpenseReportsIk");
+ $head[$h][2] = 'expenseik';
+ $h++;
+ }
+
+ if (!empty($conf->global->MAIN_USE_EXPENSE_RULE))
+ {
+ $head[$h][0] = DOL_URL_ROOT."/admin/expensereport_rules.php";
+ $head[$h][1] = $langs->trans("ExpenseReportsRules");
+ $head[$h][2] = 'expenserules';
+ $h++;
+ }
+
// Show more tabs from modules
// Entries must be declared in modules descriptor with line
// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 950e421e729..c28ae952afa 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -6452,3 +6452,43 @@ function dol_mimetype($file,$default='application/octet-stream',$mode=0)
return $mime;
}
+/**
+ * Return value from dictionary
+ *
+ * @param string $tablename name of dictionary
+ * @param string $field the value to return
+ * @param int $id id of line
+ * @param bool $checkentity add filter on entity
+ * @param string $rowidfield name of the column rowid
+ */
+function getDictvalue($tablename, $field, $id, $checkentity=false, $rowidfield='rowid')
+{
+ global $dictvalues,$db,$langs;
+
+ if (!isset($dictvalues[$tablename]))
+ {
+ $dictvalues[$tablename] = array();
+ $sql = 'SELECT * FROM '.$tablename.' WHERE 1';
+ if ($checkentity) $sql.= ' entity IN (0,'.getEntity('').')';
+
+ $resql = $db->query($sql);
+ if ($resql)
+ {
+ while ($obj = $db->fetch_object($resql))
+ {
+ $dictvalues[$tablename][$obj->{$rowidfield}] = $obj;
+ }
+ }
+ else
+ {
+ dol_print_error($db);
+ }
+ }
+
+ if (!empty($dictvalues[$tablename][$id])) return $dictvalues[$tablename][$id]->{$field}; // Found
+ else // Not found
+ {
+ if ($id > 0) return $id;
+ return '';
+ }
+}
\ No newline at end of file
diff --git a/htdocs/core/menus/init_menu_auguria.sql b/htdocs/core/menus/init_menu_auguria.sql
index 5655ada681c..cf51976298b 100644
--- a/htdocs/core/menus/init_menu_auguria.sql
+++ b/htdocs/core/menus/init_menu_auguria.sql
@@ -12,7 +12,7 @@ insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, left
insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('societe|fournisseur', '( ! empty($conf->societe->enabled) && (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) || empty($conf->global->SOCIETE_DISABLE_CUSTOMERS))) || ! empty($conf->fournisseur->enabled)', 2__+MAX_llx_menu__, __HANDLER__, 'top', 'companies', '', 0, '/societe/index.php?mainmenu=companies&leftmenu=', 'ThirdParties', -1, 'companies', '$user->rights->societe->lire || $user->rights->societe->contact->lire', '', 2, 20, __ENTITY__);
insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('product|service', '$conf->product->enabled || $conf->service->enabled', 3__+MAX_llx_menu__, __HANDLER__, 'top', 'products', '', 0, '/product/index.php?mainmenu=products&leftmenu=', 'Products/Services', -1, 'products', '$user->rights->produit->lire||$user->rights->service->lire', '', 0, 30, __ENTITY__);
insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('propal|commande|fournisseur|contrat|ficheinter', '$conf->propal->enabled || $conf->commande->enabled || $conf->supplier_order->enabled || $conf->contrat->enabled || $conf->ficheinter->enabled', 5__+MAX_llx_menu__, __HANDLER__, 'top', 'commercial', '', 0, '/comm/index.php?mainmenu=commercial&leftmenu=', 'Commercial', -1, 'commercial', '$user->rights->societe->lire || $user->rights->societe->contact->lire', '', 2, 40, __ENTITY__);
-insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('comptabilite|accounting|facture|don|tax|salaries|loan', '$conf->comptabilite->enabled || $conf->accounting->enabled || $conf->facture->enabled || $conf->don->enabled || $conf->tax->enabled || $conf->salaries->enabled || $conf->supplier_invoice->enabled || $conf->loan->enabled', 6__+MAX_llx_menu__, __HANDLER__, 'top', 'accountancy', '', 0, '/compta/index.php?mainmenu=accountancy&leftmenu=', 'MenuFinancial', -1, 'compta', '$user->rights->compta->resultat->lire || $user->rights->accounting->plancompte->lire || $user->rights->facture->lire|| $user->rights->don->lire || $user->rights->tax->charges->lire || $user->rights->salaries->read || $user->rights->loan->read', '', 2, 50, __ENTITY__);
+insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('comptabilite|accounting|facture|don|tax|salaries|loan|banque', '$conf->comptabilite->enabled || $conf->accounting->enabled || $conf->facture->enabled || $conf->don->enabled || $conf->tax->enabled || $conf->salaries->enabled || $conf->supplier_invoice->enabled || $conf->loan->enabled || $conf->banque->enabled', 6__+MAX_llx_menu__, __HANDLER__, 'top', 'accountancy', '', 0, '/compta/index.php?mainmenu=accountancy&leftmenu=', 'MenuFinancial', -1, 'compta', '$user->rights->compta->resultat->lire || $user->rights->accounting->plancompte->lire || $user->rights->facture->lire|| $user->rights->don->lire || $user->rights->tax->charges->lire || $user->rights->salaries->read || $user->rights->loan->read || $user->rights->banque->lire', '', 2, 50, __ENTITY__);
insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('banque|prelevement', '$conf->banque->enabled || $conf->prelevement->enabled', 14__+MAX_llx_menu__, __HANDLER__, 'top', 'bank', '', 0, '/compta/bank/index.php?mainmenu=bank&leftmenu=bank', 'MenuBankCash', -1, 'banks', '$user->rights->banque->lire || $user->rights->prelevement->bons->lire', '', 0, 60, __ENTITY__);
insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('projet', '$conf->projet->enabled', 7__+MAX_llx_menu__, __HANDLER__, 'top', 'project', '', 0, '/projet/index.php?mainmenu=project&leftmenu=', 'Projects', -1, 'projects', '$user->rights->projet->lire', '', 2, 70, __ENTITY__);
insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('mailing|export|import|opensurvey|resource', '$conf->mailing->enabled || $conf->export->enabled || $conf->import->enabled || $conf->opensurvey->enabled || $conf->resource->enabled', 8__+MAX_llx_menu__, __HANDLER__, 'top', 'tools', '', 0, '/core/tools.php?mainmenu=tools&leftmenu=', 'Tools', -1, 'other', '$user->rights->mailing->lire || $user->rights->export->lire || $user->rights->import->run || $user->rights->opensurvey->read || $user->rights->resource->read', '', 2, 90, __ENTITY__);
@@ -192,7 +192,7 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->don->enabled && $leftmenu=="donations"', __HANDLER__, 'left', 2002__+MAX_llx_menu__, 'accountancy', '', 2000__+MAX_llx_menu__, '/don/list.php?leftmenu=donations&mainmenu=accountancy', 'List', 1, 'donations', '$user->rights->don->lire', '', 2, 1, __ENTITY__);
-- insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->don->enabled && $leftmenu=="donations"', __HANDLER__, 'left', 2003__+MAX_llx_menu__, 'accountancy', '', 2000__+MAX_llx_menu__, '/don/stats/index.php?leftmenu=donations&mainmenu=accountancy', 'Statistics', 1, 'donations', '$user->rights->don->lire', '', 2, 2, __ENTITY__);
-- Special expenses
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->tax->enabled || $conf->salaries->enabled', __HANDLER__, 'left', 2200__+MAX_llx_menu__, 'accountancy', 'tax', 6__+MAX_llx_menu__, '/compta/charges/index.php?leftmenu=tax&mainmenu=accountancy', 'MenuSpecialExpenses', 0, 'compta', '(! empty($conf->tax->enabled) && $user->rights->tax->charges->lire) || (! empty($conf->salaries->enabled) && $user->rights->salaries->read)', '', 0, 6, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->tax->enabled || $conf->salaries->enabled || $conf->loan->enabled || $conf->banque->enabled', __HANDLER__, 'left', 2200__+MAX_llx_menu__, 'accountancy', 'tax', 6__+MAX_llx_menu__, '/compta/charges/index.php?leftmenu=tax&mainmenu=accountancy', 'MenuSpecialExpenses', 0, 'compta', '(! empty($conf->tax->enabled) && $user->rights->tax->charges->lire) || (! empty($conf->salaries->enabled) && $user->rights->salaries->read) || (! empty($conf->loan->enabled) && $user->rights->loan->read) || (! empty($conf->banque->enabled) && $user->rights->banque->lire)', '', 0, 6, __ENTITY__);
insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->salaries->enabled', __HANDLER__, 'left', 2210__+MAX_llx_menu__, 'accountancy', 'tax_sal', 2200__+MAX_llx_menu__, '/compta/salaries/index.php?leftmenu=tax_salary&mainmenu=accountancy', 'Salaries', 1, 'salaries', '$user->rights->salaries->payment->read', '', 0, 1, __ENTITY__);
insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->salaries->enabled && $leftmenu=="tax_salary"', __HANDLER__, 'left', 2211__+MAX_llx_menu__, 'accountancy', '', 2210__+MAX_llx_menu__, '/compta/salaries/card.php?leftmenu=tax_salary&action=create', 'NewPayment', 2, 'companies', '$user->rights->salaries->payment->write', '', 0, 2, __ENTITY__);
insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->salaries->enabled && $leftmenu=="tax_salary"', __HANDLER__, 'left', 2212__+MAX_llx_menu__, 'accountancy', '', 2210__+MAX_llx_menu__, '/compta/salaries/index.php?leftmenu=tax_salary', 'Payments', 2, 'companies', '$user->rights->salaries->payment->read', '', 0, 3, __ENTITY__);
@@ -208,6 +208,9 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $leftmenu=="tax_vat"', __HANDLER__, 'left', 2302__+MAX_llx_menu__, 'accountancy', '', 2300__+MAX_llx_menu__, '/compta/tva/reglement.php?leftmenu=tax_vat', 'List', 2, 'companies', '$user->rights->tax->charges->lire', '', 0, 1, __ENTITY__);
insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $leftmenu=="tax_vat"', __HANDLER__, 'left', 2303__+MAX_llx_menu__, 'accountancy', '', 2300__+MAX_llx_menu__, '/compta/tva/clients.php?leftmenu=tax_vat', 'ReportByCustomers', 2, 'companies', '$user->rights->tax->charges->lire', '', 0, 2, __ENTITY__);
insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $leftmenu=="tax_vat"', __HANDLER__, 'left', 2304__+MAX_llx_menu__, 'accountancy', '', 2300__+MAX_llx_menu__, '/compta/tva/quadri_detail.php?leftmenu=tax_vat', 'ReportByQuarter', 2, 'companies', '$user->rights->tax->charges->lire', '', 0, 3, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->banque->enabled', __HANDLER__, 'left', 2350__+MAX_llx_menu__, 'accountancy', 'tax_various', 2200__+MAX_llx_menu__, '/bank/various_payment/index.php?leftmenu=tax_various&mainmenu=accountancy', 'MenuVariousPayment', 1, 'various_payment', '$user->rights->banque->lire', '', 0, 1, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->banque->enabled && $leftmenu=="tax_various"', __HANDLER__, 'left', 2351__+MAX_llx_menu__, 'accountancy', '', 2350__+MAX_llx_menu__, '/bank/various_payment/card.php?leftmenu=tax_various&action=create', 'MenuNewVariousPayment', 2, 'various_payment', '$user->rights->banque->modifier', '', 0, 2, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->banque->enabled && $leftmenu=="tax_various"', __HANDLER__, 'left', 2352__+MAX_llx_menu__, 'accountancy', '', 2350__+MAX_llx_menu__, '/bank/various_payment/index.php?leftmenu=tax_various', 'List', 2, 'various_payment', '$user->rights->banque->lire', '', 0, 3, __ENTITY__);
-- Accounting Expert
insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2400__+MAX_llx_menu__, 'accountancy', 'accounting', 6__+MAX_llx_menu__, '/accountancy/index.php?leftmenu=accountancy', 'MenuAccountancy', 0, 'accountancy', '! empty($conf->accounting->enabled) || $user->rights->accounting->bind->write || $user->rights->accounting->bind->write || $user->rights->compta->resultat->lire', '', 0, 7, __ENTITY__);
-- Setup
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 530be07da39..7715d09d2b5 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -148,10 +148,11 @@ function print_eldy_menu($db,$atarget,$type_user,&$tabMenu,&$menu,$noout=0,$mode
if (! empty($conf->salaries->enabled)) $menuqualified++;
if (! empty($conf->supplier_invoice->enabled)) $menuqualified++;
if (! empty($conf->loan->enabled)) $menuqualified++;
+ if (! empty($conf->banque->enabled)) $menuqualified++;
$tmpentry=array(
'enabled'=>$menuqualified,
- 'perms'=>(! empty($user->rights->compta->resultat->lire) || ! empty($user->rights->accounting->mouvements->lire) || ! empty($user->rights->facture->lire) || ! empty($user->rights->don->lire) || ! empty($user->rights->tax->charges->lire) || ! empty($user->rights->salaries->read) || ! empty($user->rights->fournisseur->facture->lire) || ! empty($user->rights->loan->read)),
- 'module'=>'comptabilite|accounting|facture|supplier_invoice|don|tax|salaries|loan');
+ 'perms'=>(! empty($user->rights->compta->resultat->lire) || ! empty($user->rights->accounting->mouvements->lire) || ! empty($user->rights->facture->lire) || ! empty($user->rights->don->lire) || ! empty($user->rights->tax->charges->lire) || ! empty($user->rights->salaries->read) || ! empty($user->rights->fournisseur->facture->lire) || ! empty($user->rights->loan->read) || ! empty($user->rights->banque->lire)),
+ 'module'=>'comptabilite|accounting|facture|supplier_invoice|don|tax|salaries|loan|banque');
$showmode=dol_eldy_showmenu($type_user, $tmpentry, $listofmodulesforexternal);
if ($showmode)
{
@@ -854,11 +855,11 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
}
// Taxes and social contributions
- if (! empty($conf->tax->enabled) || ! empty($conf->salaries->enabled) || ! empty($conf->loan->enabled))
+ if (! empty($conf->tax->enabled) || ! empty($conf->salaries->enabled) || ! empty($conf->loan->enabled) || ! empty($conf->banque->enabled))
{
global $mysoc;
- $permtoshowmenu=((! empty($conf->tax->enabled) && $user->rights->tax->charges->lire) || (! empty($conf->salaries->enabled) && $user->rights->salaries->read) || (! empty($conf->loan->enabled) && $user->rights->loan->read));
+ $permtoshowmenu=((! empty($conf->tax->enabled) && $user->rights->tax->charges->lire) || (! empty($conf->salaries->enabled) && $user->rights->salaries->read) || (! empty($conf->loan->enabled) && $user->rights->loan->read) || (! empty($conf->banque->enabled) && $user->rights->banque->lire));
$newmenu->add("/compta/charges/index.php?leftmenu=tax&mainmenu=accountancy",$langs->trans("MenuSpecialExpenses"), 0, $permtoshowmenu, '', $mainmenu, 'tax');
// Social contributions
@@ -918,6 +919,14 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
//if (empty($leftmenu) || preg_match('/^tax_loan/i',$leftmenu)) $newmenu->add("/loan/payment/list.php?leftmenu=tax_loan",$langs->trans("Payments"),2,$user->rights->loan->read);
if (($usemenuhider || empty($leftmenu) || preg_match('/^tax_loan/i',$leftmenu)) && ! empty($conf->global->LOAN_SHOW_CALCULATOR)) $newmenu->add("/loan/calc.php?leftmenu=tax_loan",$langs->trans("Calculator"),2,$user->rights->loan->calc);
}
+
+ // Various payment
+ if (! empty($conf->banque->enabled))
+ {
+ $newmenu->add("/compta/bank/various_payment/index.php?leftmenu=tax_various&mainmenu=accountancy",$langs->trans("MenuVariousPayment"),1,$user->rights->banque->lire, '', $mainmenu, 'tax_various');
+ if ($usemenuhider || empty($leftmenu) || preg_match('/^tax_various/i',$leftmenu)) $newmenu->add("/compta/bank/various_payment/card.php?leftmenu=tax_various&action=create",$langs->trans("MenuNewVariousPayment"), 2, $user->rights->banque->modifier);
+ if ($usemenuhider || empty($leftmenu) || preg_match('/^tax_various/i',$leftmenu)) $newmenu->add("/compta/bank/various_payment/index.php?leftmenu=tax_various",$langs->trans("List"),2,$user->rights->banque->lire);
+ }
}
// Accounting Expert
diff --git a/htdocs/expensereport/ajax/ajaxik.php b/htdocs/expensereport/ajax/ajaxik.php
new file mode 100644
index 00000000000..e1856f438b0
--- /dev/null
+++ b/htdocs/expensereport/ajax/ajaxik.php
@@ -0,0 +1,76 @@
+
+ * Copyright (C) 2017 Pierre-Henry Favre
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
';
$actiontouse='updateligne';
@@ -1971,235 +1937,244 @@ else
print '';
print '
';
- $resql = $db->query($sql);
- if ($resql)
+ if (!empty($object->lines))
{
- $num_lignes = $db->num_rows($resql);
$i = 0;$total = 0;
- if ($num_lignes)
+ print '';
+ print ''.$langs->trans('Piece').' ';
+ print ''.$langs->trans('Date').' ';
+ if (! empty($conf->projet->enabled)) print ''.$langs->trans('Project').' ';
+ if (!empty($conf->global->MAIN_USE_EXPENSE_IK)) print ''.$langs->trans('CarCategory').' ';
+ print ''.$langs->trans('Type').' ';
+ print ''.$langs->trans('Description').' ';
+ print ''.$langs->trans('VAT').' ';
+ print ''.$langs->trans('PriceUTTC').' ';
+ print ''.$langs->trans('Qty').' ';
+ if ($action != 'editline')
{
- print ' ';
- print ''.$langs->trans('Piece').' ';
- print ''.$langs->trans('Date').' ';
- if (! empty($conf->projet->enabled)) print ''.$langs->trans('Project').' ';
- print ''.$langs->trans('Type').' ';
- print ''.$langs->trans('Description').' ';
- print ''.$langs->trans('VAT').' ';
- print ''.$langs->trans('PriceUTTC').' ';
- print ''.$langs->trans('Qty').' ';
- if ($action != 'editline')
- {
- print ''.$langs->trans('AmountHT').' ';
- print ''.$langs->trans('AmountTTC').' ';
- }
- // Ajout des boutons de modification/suppression
- if (($object->fk_statut < 2 || $object->fk_statut == 99) && $user->rights->expensereport->creer)
- {
- print ' ';
+ print ''.$langs->trans('AmountHT').' ';
+ print ''.$langs->trans('AmountTTC').' ';
+ }
+ // Ajout des boutons de modification/suppression
+ if (($object->fk_statut < 2 || $object->fk_statut == 99) && $user->rights->expensereport->creer)
+ {
+ print '';
+
+ print '';
+ print img_picto($langs->trans("Document"), "object_generic");
+ print ' '.$piece_comptable.' ';
+ print ''.dol_print_date($db->jdate($line->date), 'day').' ';
+ if (! empty($conf->projet->enabled))
{
+ print '';
+ if ($line->fk_projet > 0)
+ {
+ $projecttmp->id=$line->fk_projet;
+ $projecttmp->ref=$line->projet_ref;
+ print $projecttmp->getNomUrl(1);
+ }
+ print ' ';
+ }
+ if (!empty($conf->global->MAIN_USE_EXPENSE_IK))
+ {
+ print '';
+ print dol_getIdFromCode($db, $line->fk_c_exp_tax_cat, 'c_exp_tax_cat', 'rowid', 'label');
+ print ' ';
+ }
+ // print ''.$langs->trans("TF_".strtoupper(empty($objp->type_fees_libelle)?'OTHER':$objp->type_fees_libelle)).' ';
+ print ''.($langs->trans(($line->type_fees_code)) == $line->type_fees_code ? $line->type_fees_libelle : $langs->trans(($line->type_fees_code))).' ';
+ print ''.$line->comments.' ';
+ print ''.vatrate($line->vatrate,true).' ';
+ print ''.price($line->value_unit).' ';
+ print ''.$line->qty.' ';
+
+ if ($action != 'editline')
+ {
+ print ''.price($line->total_ht).' ';
+ print ''.price($line->total_ttc).' ';
+ }
+
+ // Ajout des boutons de modification/suppression
+ if (($object->fk_statut < 2 || $object->fk_statut == 99) && $user->rights->expensereport->creer)
+ {
+ print '';
+
+ print 'rowid.'#'.$line->rowid.'">';
+ print img_edit();
+ print ' ';
+ print 'rowid.'">';
+ print img_delete();
+ print ' ';
+
+ print ' ';
+ }
+
+ print ' ';
+ }
+
+ if ($action == 'editline' && $line->rowid == GETPOST('rowid'))
+ {
print '';
- print '';
- print img_picto($langs->trans("Document"), "object_generic");
- print ' '.$piece_comptable.' ';
- print ''.dol_print_date($db->jdate($objp->date), 'day').' ';
+ print '';
+ $form->select_date($line->date,'date');
+ print ' ';
+
+ // Select project
if (! empty($conf->projet->enabled))
{
- print '';
- if ($objp->projet_id > 0)
- {
- $projecttmp->id=$objp->projet_id;
- $projecttmp->ref=$objp->projet_ref;
- print $projecttmp->getNomUrl(1);
- }
- print ' ';
+ print '';
+ $formproject->select_projects(-1, $line->fk_projet,'fk_projet', 0, 0, 1, 1);
+ print ' ';
}
- // print ''.$langs->trans("TF_".strtoupper(empty($objp->type_fees_libelle)?'OTHER':$objp->type_fees_libelle)).' ';
- print ''.($langs->trans(($objp->type_fees_code)) == $objp->type_fees_code ? $objp->type_fees_libelle : $langs->trans(($objp->type_fees_code))).' ';
- print ''.$objp->comments.' ';
- print ''.vatrate($objp->vatrate.($objp->vat_src_code?' ('.$objp->vat_src_code.')':''),true).' ';
- print ''.price($objp->value_unit).' ';
- print ''.$objp->qty.' ';
+
+ if (!empty($conf->global->MAIN_USE_EXPENSE_IK))
+ {
+ print '';
+ $params = array('fk_expense' => $object->id, 'fk_expense_det' => $line->rowid, 'date' => $line->dates);
+ print $form->selectExpenseCategories($line->fk_c_exp_tax_cat, 'fk_c_exp_tax_cat', 1, array(), 'fk_c_type_fees', $userauthor->default_c_exp_tax_cat, $params);
+ print ' ';
+ }
+
+ // Select type
+ print '';
+ select_type_fees_id($line->fk_c_type_fees,'fk_c_type_fees');
+ print ' ';
+
+ // Add comments
+ print '';
+ print '';
+ print ' ';
+
+ // VAT
+ print '';
+ print $form->load_tva('vatrate', (isset($_POST["vatrate"])?$_POST["vatrate"]:$line->vatrate), $mysoc, '');
+ print ' ';
+
+ // Unit price
+ print '';
+ print ' ';
+
+ // Quantity
+ print '';
+ print ' ';
if ($action != 'editline')
{
- print ''.price($objp->total_ht).' ';
- print ''.price($objp->total_ttc).' ';
+ print ''.$langs->trans('AmountHT').' ';
+ print ''.$langs->trans('AmountTTC').' ';
}
- // Ajout des boutons de modification/suppression
- if (($object->fk_statut < 2 || $object->fk_statut == 99) && $user->rights->expensereport->creer)
- {
- print '';
-
- print 'rowid.'#'.$objp->rowid.'">';
- print img_edit();
- print ' ';
- print 'rowid.'">';
- print img_delete();
- print ' ';
-
- print ' ';
- }
-
- print ' ';
- }
-
- if ($action == 'editline' && $objp->rowid == GETPOST('rowid'))
- {
- print '';
-
- print '';
- $form->select_date($objp->date,'date');
- print ' ';
-
- // Select project
- if (! empty($conf->projet->enabled))
- {
- print '';
- $formproject->select_projects(-1, $objp->fk_projet,'fk_projet', 0, 0, 1, 1);
- print ' ';
- }
-
- // Select type
- print '';
- select_type_fees_id($objp->type_fees_code,'fk_c_type_fees');
- print ' ';
-
- // Add comments
- print '';
- print '';
- print ' ';
-
- // VAT
- print '';
- $seller=$mysoc;
- $buyer=new Societe($db);
- $selectedvat=(GETPOST("vatrate",'alpha')?GETPOST("vatrate",'alpha'):$objp->vatrate.($objp->vat_src_code?' ('.$objp->vat_src_code.')':''));
- print $form->load_tva('vatrate', $selectedvat, $seller, $buyer, 0, 0, '', false, 1);
- print ' ';
-
- // Unit price
- print '';
- print ' ';
-
- // Quantity
- print '';
- print ' ';
-
- if ($action != 'editline')
- {
- print ''.$langs->trans('AmountHT').' ';
- print ''.$langs->trans('AmountTTC').' ';
- }
-
- print '';
- print ' ';
- }
-
- $i++;
+ print '';
+ print ' ';
}
- $db->free($resql);
+ $i++;
+ }
+ }
+
+ // Add a line
+ if (($object->fk_statut==0 || $object->fk_statut==99) && $action != 'editline' && $user->rights->expensereport->creer)
+ {
+ print ' ';
+ print ''.$langs->trans('Date').' ';
+ if (! empty($conf->projet->enabled)) print ''.$langs->trans('Project').' ';
+ if (!empty($conf->global->MAIN_USE_EXPENSE_IK)) print ''.$langs->trans('CarCategory').' ';
+ print ''.$langs->trans('Type').' ';
+ print ''.$langs->trans('Description').' ';
+ print ''.$langs->trans('VAT').' ';
+ print ''.$langs->trans('PriceUTTC').' ';
+ print ''.$langs->trans('Qty').' ';
+ print ' ';
+
+ print '';
+
+ print '';
+ $form->select_date($date?$date:-1,'date');
+ print ' ';
+
+ // Select project
+ if (! empty($conf->projet->enabled))
+ {
+ print '';
+ $formproject->select_projects(-1, $fk_projet, 'fk_projet', 0, 0, 1, 1);
+ print ' ';
+ }
+
+ if (!empty($conf->global->MAIN_USE_EXPENSE_IK))
+ {
+ print '';
+ $params = array('fk_expense' => $object->id);
+ print $form->selectExpenseCategories('', 'fk_c_exp_tax_cat', 1, array(), 'fk_c_type_fees', $userauthor->default_c_exp_tax_cat, $params);
+ print ' ';
}
- // Add a line
- if (($object->fk_statut==0 || $object->fk_statut==99) && $action != 'editline' && $user->rights->expensereport->creer)
+ // Select type
+ print '';
+ select_type_fees_id($fk_c_type_fees,'fk_c_type_fees',1);
+ print ' ';
+
+ // Add comments
+ print '';
+ print '';
+ print ' ';
+
+ // Select VAT
+ print '';
+ $defaultvat=-1;
+ if (! empty($conf->global->EXPENSEREPORT_NO_DEFAULT_VAT)) $conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS = 'none';
+ print $form->load_tva('vatrate', ($vatrate!=''?$vatrate:$defaultvat), $mysoc, '', 0, 0, '', false, 1);
+ print ' ';
+
+ // Unit price
+ print '';
+ print ' ';
+
+ // Quantity
+ print '';
+ print ' ';
+
+ if ($action != 'editline')
{
- print ' ';
- print ''.$langs->trans('Date').' ';
- if (! empty($conf->projet->enabled)) print ''.$langs->trans('Project').' ';
- print ''.$langs->trans('Type').' ';
- print ''.$langs->trans('Description').' ';
- print ''.$langs->trans('VAT').' ';
- print ''.$langs->trans('PriceUTTC').' ';
- print ''.$langs->trans('Qty').' ';
- print ' ';
+ print '';
+ print ' ';
+ } // Fin si c'est payé/validé
- // Select date
- print '';
- $form->select_date($date?$date:-1,'date');
- print ' ';
+ print '
';
+ print '
';
- $formproject->select_projects(-1, $fk_projet, 'fk_projet', 0, 0, 1, 1);
- print ' ';
- }
-
- // Select type
- print '';
- select_type_fees_id($fk_c_type_fees,'fk_c_type_fees',1);
- print ' ';
-
- // Add comments
- print '';
- print '';
- print ' ';
-
- // Select VAT
- print '';
- $defaultvat=-1;
- if (! empty($conf->global->EXPENSEREPORT_NO_DEFAULT_VAT)) $conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS = 'none';
- print $form->load_tva('vatrate', ($vatrate!=''?$vatrate:$defaultvat), $mysoc, '', 0, 0, '', false, 1);
- print ' ';
-
- // Unit price
- print '';
- print ' ';
-
- // Quantity
- print '';
- print ' ';
-
- if ($action != 'editline')
- {
- print ' ';
- } // Fin si c'est payé/validé
-
- print '
';
- print '';
-
- print '';
- }
- else
- {
- dol_print_error($db);
- }
+ print '';
dol_fiche_end();
@@ -2369,6 +2344,8 @@ if ($action != 'create' && $action != 'edit')
print '