'."\n";
print '';
- print ' ';
print ' ';
print ' ';
- if (!empty($conf->global->ACCOUNTANCY_USE_EXPENSE_REPORT_VALIDATION_DATE)) {
+ if (! empty($conf->global->ACCOUNTANCY_USE_EXPENSE_REPORT_VALIDATION_DATE)) {
print ' ';
}
print '';
@@ -277,17 +265,17 @@
print ' ';
print ' ';
print ' ';
- print '';
- $searchpicto = $form->showFilterButtons();
- print $searchpicto;
- print ' ';
+ print ' ';
+ print '';
+ $searchpicto = $form->showFilterButtons();
+ print $searchpicto;
+ print ' ';
print " \n";
print '';
- print_liste_field_titre("Employees", $_SERVER['PHP_SELF'], "u.login", $param, "", "", $sortfield, $sortorder);
print_liste_field_titre("LineId", $_SERVER["PHP_SELF"], "erd.rowid", "", $param, '', $sortfield, $sortorder);
print_liste_field_titre("ExpenseReport", $_SERVER["PHP_SELF"], "er.ref", "", $param, '', $sortfield, $sortorder);
- if (!empty($conf->global->ACCOUNTANCY_USE_EXPENSE_REPORT_VALIDATION_DATE)) {
+ if (! empty($conf->global->ACCOUNTANCY_USE_EXPENSE_REPORT_VALIDATION_DATE)) {
print_liste_field_titre("DateValidation", $_SERVER["PHP_SELF"], "er.date_valid", "", $param, '', $sortfield, $sortorder, 'center ');
}
print_liste_field_titre("DateOfLine", $_SERVER["PHP_SELF"], "erd.date, erd.rowid", "", $param, '', $sortfield, $sortorder, 'center ');
@@ -295,80 +283,53 @@
print_liste_field_titre("Description", $_SERVER["PHP_SELF"], "erd.comments", "", $param, '', $sortfield, $sortorder);
print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "erd.total_ht", "", $param, '', $sortfield, $sortorder, 'right ');
print_liste_field_titre("VATRate", $_SERVER["PHP_SELF"], "erd.tva_tx", "", $param, '', $sortfield, $sortorder, 'center ');
- print_liste_field_titre("AccountAccounting", $_SERVER["PHP_SELF"], "aa.account_number", "", $param, '', $sortfield, $sortorder);
- $checkpicto = $form->showCheckAddButtons();
+ print_liste_field_titre("Account", $_SERVER["PHP_SELF"], "aa.account_number", "", $param, '', $sortfield, $sortorder);
+ print_liste_field_titre('');
+ $checkpicto = $form->showCheckAddButtons();
print_liste_field_titre($checkpicto, '', '', '', '', '', '', '', 'center ');
print " \n";
- $expensereportstatic = new ExpenseReport($db);
- $accountingaccountstatic = new AccountingAccount($db);
- $userstatic = new User($db);
-
- $i = 0;
+ $expensereport_static = new ExpenseReport($db);
+
while ($i < min($num_lines, $limit)) {
$objp = $db->fetch_object($result);
-
- $expensereportstatic->ref = $objp->ref;
- $expensereportstatic->id = $objp->erid;
-
- $userstatic->id = $objp->userid;
- $userstatic->ref = $objp->label;
- $userstatic->login = $objp->login;
- $userstatic->statut = $objp->statut;
- $userstatic->email = $objp->email;
- $userstatic->gender = $objp->gender;
- $userstatic->firstname = $objp->firstname;
- $userstatic->lastname = $objp->lastname;
- $userstatic->employee = $objp->employee;
- $userstatic->photo = $objp->photo;
-
- $accountingaccountstatic->rowid = $objp->fk_compte;
- $accountingaccountstatic->label = $objp->label;
- $accountingaccountstatic->labelshort = $objp->labelshort;
- $accountingaccountstatic->account_number = $objp->account_number;
+ $codeCompta = length_accountg($objp->account_number).' - '.$objp->label.' ';
+
+ $expensereport_static->ref = $objp->ref;
+ $expensereport_static->id = $objp->erid;
print '';
- // Login
- print '';
- print $userstatic->getNomUrl(-1, '', 0, 0, 24, 1, 'login', '', 1);
- print ' ';
-
- // Line id
print ''.$objp->rowid.' ';
- // Ref Expense report
- print ''.$expensereportstatic->getNomUrl(1).' ';
+ // Ref Invoice
+ print ''.$expensereport_static->getNomUrl(1).' ';
// Date validation
- if (!empty($conf->global->ACCOUNTANCY_USE_EXPENSE_REPORT_VALIDATION_DATE)) {
+ if (! empty($conf->global->ACCOUNTANCY_USE_EXPENSE_REPORT_VALIDATION_DATE)) {
print ''.dol_print_date($db->jdate($objp->date_valid), 'day').' ';
}
print ''.dol_print_date($db->jdate($objp->date), 'day').' ';
- // Fees label
print ''.($langs->trans($objp->type_fees_code) == $objp->type_fees_code ? $objp->type_fees_label : $langs->trans(($objp->type_fees_code))).' ';
- // Fees description -- Can be null
print '';
$text = dolGetFirstLineOfText(dol_string_nohtmltag($objp->comments));
$trunclength = empty($conf->global->ACCOUNTING_LENGTH_DESCRIPTION) ? 32 : $conf->global->ACCOUNTING_LENGTH_DESCRIPTION;
print $form->textwithtooltip(dol_trunc($text, $trunclength), $objp->comments);
print ' ';
- // Amount without taxes
print ''.price($objp->total_ht).' ';
- // Vat rate
print ''.vatrate($objp->tva_tx.($objp->vat_src_code ? ' ('.$objp->vat_src_code.')' : '')).' ';
- // Accounting account affected
- print '';
- print $accountingaccountstatic->getNomUrl(0, 1, 1, '', 1);
- print ' ';
+ print ' '.$codeCompta.' ';
+
+ print '';
print img_edit();
print ' ';
+
print ' ';
print " ";
@@ -379,7 +340,7 @@
print "";
if ($nbtotalofrecords > $limit) {
- print_barre_liste('', $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num_lines, $nbtotalofrecords, '', 0, '', '', $limit, 1);
+ print_barre_liste('', $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num_lines, $nbtotalofrecords, '', 0, '', '', $limit, 1);
}
print '';
--- /tmp/dsg/dolibarr/htdocs/accountancy/expensereport/github_list.php
+++ /tmp/dsg/dolibarr/htdocs/accountancy/expensereport/client_list.php
@@ -28,7 +28,6 @@
require '../../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
-require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
@@ -36,14 +35,14 @@
require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
// Load translation files required by the page
-$langs->loadLangs(array("bills", "companies", "compta", "accountancy", "other", "trips", "productbatch", "hrm"));
-
-$action = GETPOST('action', 'aZ09');
+$langs->loadLangs(array("bills", "companies", "compta", "accountancy", "other", "trips", "productbatch"));
+
+$action = GETPOST('action', 'alpha');
$massaction = GETPOST('massaction', 'alpha');
$show_files = GETPOST('show_files', 'int');
$confirm = GETPOST('confirm', 'alpha');
$toselect = GETPOST('toselect', 'array');
-$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'expensereportlist'; // To manage different context of search
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'myobjectlist'; // To manage different context of search
$optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
@@ -51,7 +50,6 @@
$mesCasesCochees = GETPOST('toselect', 'array');
// Search Getpost
-$search_login = GETPOST('search_login', 'alpha');
$search_lineid = GETPOST('search_lineid', 'alpha');
$search_expensereport = GETPOST('search_expensereport', 'alpha');
$search_label = GETPOST('search_label', 'alpha');
@@ -65,8 +63,8 @@
// Load variable for pagination
$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : (empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION) ? $conf->liste_limit : $conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
-$sortfield = GETPOST('sortfield', 'aZ09comma');
-$sortorder = GETPOST('sortorder', 'aZ09comma');
+$sortfield = GETPOST('sortfield', 'alpha');
+$sortorder = GETPOST('sortorder', 'alpha');
$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
if (empty($page) || $page < 0) { $page = 0; }
$offset = $limit * $page;
@@ -102,16 +100,15 @@
// Purge search criteria
if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All test are required to be compatible with all browsers
{
- $search_login = '';
- $search_expensereport = '';
- $search_label = '';
- $search_desc = '';
- $search_amount = '';
- $search_account = '';
- $search_vat = '';
- $search_day = '';
- $search_month = '';
- $search_year = '';
+ $search_expensereport = '';
+ $search_label = '';
+ $search_desc = '';
+ $search_amount = '';
+ $search_account = '';
+ $search_vat = '';
+ $search_day = '';
+ $search_month = '';
+ $search_year = '';
}
// Mass actions
@@ -124,46 +121,48 @@
if ($massaction == 'ventil') {
$msg = '';
- //print '' . $langs->trans("Processing") . '...
';
- if (!empty($mesCasesCochees)) {
- $msg = ''.$langs->trans("SelectedLines").': '.count($mesCasesCochees).'
';
- $msg .= '';
- $cpt = 0;
- $ok = 0;
- $ko = 0;
-
- foreach ($mesCasesCochees as $maLigneCochee) {
- $maLigneCourante = explode("_", $maLigneCochee);
- $monId = $maLigneCourante[0];
- $monCompte = GETPOST('codeventil'.$monId);
-
- if ($monCompte <= 0)
- {
- $msg .= '
'.$langs->trans("Lineofinvoice").' '.$monId.' - '.$langs->trans("NoAccountSelected").'
';
- $ko++;
- } else {
- $sql = " UPDATE ".MAIN_DB_PREFIX."expensereport_det";
- $sql .= " SET fk_code_ventilation = ".$monCompte;
- $sql .= " WHERE rowid = ".$monId;
-
- $accountventilated = new AccountingAccount($db);
- $accountventilated->fetch($monCompte, '', 1);
-
- dol_syslog('accountancy/expensereport/list.php:: sql='.$sql, LOG_DEBUG);
- if ($db->query($sql)) {
- $msg .= '
'.$langs->trans("LineOfExpenseReport").' '.$monId.' - '.$langs->trans("VentilatedinAccount").' : '.length_accountg($accountventilated->account_number).'
';
- $ok++;
- } else {
- $msg .= '
'.$langs->trans("ErrorDB").' : '.$langs->trans("Lineofinvoice").' '.$monId.' - '.$langs->trans("NotVentilatedinAccount").' : '.length_accountg($accountventilated->account_number).' '.$sql.' ';
- $ko++;
- }
- }
-
- $cpt++;
- }
- $msg .= '
';
- $msg .= ''.$langs->trans("EndProcessing").'
';
- }
+ //print '' . $langs->trans("Processing") . '...
';
+ if (!empty($mesCasesCochees)) {
+ $msg = ''.$langs->trans("SelectedLines").': '.count($mesCasesCochees).'
';
+ $msg .= '';
+ $cpt = 0;
+ $ok = 0;
+ $ko = 0;
+
+ foreach ($mesCasesCochees as $maLigneCochee) {
+ $maLigneCourante = explode("_", $maLigneCochee);
+ $monId = $maLigneCourante[0];
+ $monCompte = GETPOST('codeventil'.$monId);
+
+ if ($monCompte <= 0)
+ {
+ $msg .= '
'.$langs->trans("Lineofinvoice").' '.$monId.' - '.$langs->trans("NoAccountSelected").'
';
+ $ko++;
+ }
+ else
+ {
+ $sql = " UPDATE ".MAIN_DB_PREFIX."expensereport_det";
+ $sql .= " SET fk_code_ventilation = ".$monCompte;
+ $sql .= " WHERE rowid = ".$monId;
+
+ $accountventilated = new AccountingAccount($db);
+ $accountventilated->fetch($monCompte, '');
+
+ dol_syslog('accountancy/expensereport/list.php:: sql='.$sql, LOG_DEBUG);
+ if ($db->query($sql)) {
+ $msg .= '
'.$langs->trans("LineOfExpenseReport").' '.$monId.' - '.$langs->trans("VentilatedinAccount").' : '.length_accountg($accountventilated->account_number).'
';
+ $ok++;
+ } else {
+ $msg .= '
'.$langs->trans("ErrorDB").' : '.$langs->trans("Lineofinvoice").' '.$monId.' - '.$langs->trans("NotVentilatedinAccount").' : '.length_accountg($accountventilated->account_number).' '.$sql.' ';
+ $ko++;
+ }
+ }
+
+ $cpt++;
+ }
+ $msg .= '
';
+ $msg .= ''.$langs->trans("EndProcessing").'
';
+ }
}
@@ -181,8 +180,8 @@
{
print $langs->trans("ErrorChartOfAccountSystemNotSelected");
// End of page
- llxFooter();
- $db->close();
+ llxFooter();
+ $db->close();
exit;
}
@@ -190,39 +189,30 @@
$sql = "SELECT er.ref, er.rowid as erid, er.date_debut, er.date_valid,";
$sql .= " erd.rowid, erd.fk_c_type_fees, erd.comments, erd.total_ht as price, erd.fk_code_ventilation, erd.tva_tx as tva_tx_line, erd.vat_src_code, erd.date,";
$sql .= " f.id as type_fees_id, f.code as type_fees_code, f.label as type_fees_label, f.accountancy_code as code_buy,";
-$sql .= " u.rowid as userid, u.login, u.lastname, u.firstname, u.email, u.gender, u.employee, u.photo, u.statut,";
$sql .= " aa.rowid as aarowid";
$sql .= " FROM ".MAIN_DB_PREFIX."expensereport as er";
$sql .= " INNER JOIN ".MAIN_DB_PREFIX."expensereport_det as erd ON er.rowid = erd.fk_expensereport";
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_type_fees as f ON f.id = erd.fk_c_type_fees";
-$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as u ON u.rowid = er.fk_user_author";
-$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa ON f.accountancy_code = aa.account_number AND aa.fk_pcg_version = '".$db->escape($chartaccountcode)."' AND aa.entity = ".$conf->entity;
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa ON f.accountancy_code = aa.account_number AND aa.fk_pcg_version = '".$chartaccountcode."' AND aa.entity = ".$conf->entity;
$sql .= " WHERE er.fk_statut IN (".ExpenseReport::STATUS_APPROVED.", ".ExpenseReport::STATUS_CLOSED.") AND erd.fk_code_ventilation <= 0";
-// Define begin binding date
-if (!empty($conf->global->ACCOUNTING_DATE_START_BINDING)) {
- $sql .= " AND er.date_debut >= '".$db->idate($conf->global->ACCOUNTING_DATE_START_BINDING)."'";
-}
// Add search filter like
-if (strlen(trim($search_login))) {
- $sql .= natural_search("u.login", $search_login);
-}
if (strlen(trim($search_expensereport))) {
- $sql .= natural_search("er.ref", $search_expensereport);
+ $sql .= natural_search("er.ref", $search_expensereport);
}
if (strlen(trim($search_label))) {
- $sql .= natural_search("f.label", $search_label);
+ $sql .= natural_search("f.label", $search_label);
}
if (strlen(trim($search_desc))) {
- $sql .= natural_search("erd.comments", $search_desc);
+ $sql .= natural_search("erd.comments", $search_desc);
}
if (strlen(trim($search_amount))) {
- $sql .= natural_search("erd.total_ht", $search_amount, 1);
+ $sql .= natural_search("erd.total_ht", $search_amount, 1);
}
if (strlen(trim($search_account))) {
- $sql .= natural_search("aa.account_number", $search_account);
+ $sql .= natural_search("aa.account_number", $search_account);
}
if (strlen(trim($search_vat))) {
- $sql .= natural_search("erd.tva_tx", $search_vat, 1);
+ $sql .= natural_search("erd.tva_tx", $search_vat, 1);
}
$sql .= dolSqlDateFilter('erd.date', $search_day, $search_month, $search_year);
$sql .= " AND er.entity IN (".getEntity('expensereport', 0).")"; // We don't share object for accountancy
@@ -233,13 +223,13 @@
$nbtotalofrecords = '';
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;
- }
+ $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);
@@ -255,7 +245,6 @@
$param = '';
if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
- if ($search_login) $param .= '&search_login='.urlencode($search_login);
if ($search_lineid) $param .= '&search_lineid='.urlencode($search_lineid);
if ($search_day) $param .= '&search_day='.urlencode($search_day);
if ($search_month) $param .= '&search_month='.urlencode($search_month);
@@ -267,7 +256,7 @@
if ($search_vat) $param .= '&search_vat='.urlencode($search_vat);
$arrayofmassactions = array(
- 'ventil' => $langs->trans("Ventilate")
+ 'ventil' => $langs->trans("Ventilate")
);
$massactionbutton = $form->selectMassAction('ventil', $arrayofmassactions, 1);
@@ -285,19 +274,24 @@
print ''.$langs->trans("DescVentilTodoExpenseReport").' ';
+ /*$topicmail="Information";
+ $modelmail="project";
+ $objecttmp=new Project($db);
+ $trackid='prj'.$object->id;
+ include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';*/
+
if ($msg) print $msg.' ';
$moreforfilter = '';
- print '';
+ print '
';
print '
'."\n";
// We add search filter
print '';
- print ' ';
print ' ';
print ' ';
- if (!empty($conf->global->ACCOUNTANCY_USE_EXPENSE_REPORT_VALIDATION_DATE)) {
+ if (! empty($conf->global->ACCOUNTANCY_USE_EXPENSE_REPORT_VALIDATION_DATE)) {
print ' ';
}
print '';
@@ -318,10 +312,9 @@
print ' ';
print '';
- print_liste_field_titre("Employee", $_SERVER['PHP_SELF'], "u.login", $param, "", "", $sortfield, $sortorder);
print_liste_field_titre("LineId", $_SERVER["PHP_SELF"], "erd.rowid", "", $param, '', $sortfield, $sortorder);
print_liste_field_titre("ExpenseReport", $_SERVER["PHP_SELF"], "er.ref", "", $param, '', $sortfield, $sortorder);
- if (!empty($conf->global->ACCOUNTANCY_USE_EXPENSE_REPORT_VALIDATION_DATE)) {
+ if (! empty($conf->global->ACCOUNTANCY_USE_EXPENSE_REPORT_VALIDATION_DATE)) {
print_liste_field_titre("DateValidation", $_SERVER["PHP_SELF"], "er.date_valid", "", $param, '', $sortfield, $sortorder, 'center ');
}
print_liste_field_titre("DateOfLine", $_SERVER["PHP_SELF"], "erd.date, erd.rowid", "", $param, '', $sortfield, $sortorder, 'center ');
@@ -338,7 +331,6 @@
$expensereport_static = new ExpenseReport($db);
- $userstatic = new User($db);
$form = new Form($db);
while ($i < min($num_lines, $limit)) {
@@ -350,23 +342,7 @@
$expensereport_static->ref = $objp->ref;
$expensereport_static->id = $objp->erid;
- $userstatic->id = $objp->userid;
- $userstatic->ref = $objp->label;
- $userstatic->login = $objp->login;
- $userstatic->statut = $objp->statut;
- $userstatic->email = $objp->email;
- $userstatic->gender = $objp->gender;
- $userstatic->firstname = $objp->firstname;
- $userstatic->lastname = $objp->lastname;
- $userstatic->employee = $objp->employee;
- $userstatic->photo = $objp->photo;
-
print ' ';
-
- // Login
- print '';
- print $userstatic->getNomUrl(-1, '', 0, 0, 24, 1, 'login', '', 1);
- print ' ';
// Line id
print ''.$objp->rowid.' ';
@@ -375,7 +351,7 @@
print ''.$expensereport_static->getNomUrl(1).' ';
// Date validation
- if (!empty($conf->global->ACCOUNTANCY_USE_EXPENSE_REPORT_VALIDATION_DATE)) {
+ if (! empty($conf->global->ACCOUNTANCY_USE_EXPENSE_REPORT_VALIDATION_DATE)) {
print ''.dol_print_date($db->jdate($objp->date_valid), 'day').' ';
}
@@ -394,7 +370,6 @@
print $form->textwithtooltip(dol_trunc($text, $trunclength), $objp->comments);
print '';
- // Amount without taxes
print '';
print price($objp->price);
print ' ';