diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index 2b5dd23b7d8..2114f6107c0 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -79,7 +79,7 @@ $catid = GETPOST("catid", 'int');
$socid = GETPOST('socid', 'int');
$search_filter = GETPOST("search_filter", 'alpha');
-$search_status = GETPOST("search_status", 'intcomma'); // statut
+$search_status = GETPOST("search_status", 'intcomma'); // status
$search_datec_start = dol_mktime(0, 0, 0, GETPOST('search_datec_start_month', 'int'), GETPOST('search_datec_start_day', 'int'), GETPOST('search_datec_start_year', 'int'));
$search_datec_end = dol_mktime(23, 59, 59, GETPOST('search_datec_end_month', 'int'), GETPOST('search_datec_end_day', 'int'), GETPOST('search_datec_end_year', 'int'));
$search_datem_start = dol_mktime(0, 0, 0, GETPOST('search_datem_start_month', 'int'), GETPOST('search_datem_start_day', 'int'), GETPOST('search_datem_start_year', 'int'));
@@ -374,7 +374,7 @@ if ((!empty($search_categ) && $search_categ > 0) || !empty($catid)) {
$sql .= " d.rowid, d.ref, d.login, d.lastname, d.firstname, d.gender, d.societe as company, d.fk_soc,";
$sql .= " d.civility, d.datefin, d.address, d.zip, d.town, d.state_id, d.country,";
$sql .= " d.email, d.phone, d.phone_perso, d.phone_mobile, d.birth, d.public, d.photo,";
-$sql .= " d.fk_adherent_type as type_id, d.morphy, d.statut, d.datec as date_creation, d.tms as date_update,";
+$sql .= " d.fk_adherent_type as type_id, d.morphy, d.statut as status, d.datec as date_creation, d.tms as date_update,";
$sql .= " d.note_private, d.note_public, d.import_key,";
$sql .= " s.nom,";
$sql .= " ".$db->ifsql("d.societe IS NULL", "s.nom", "d.societe")." as companyname,";
@@ -967,9 +967,16 @@ if (!empty($arrayfields['d.tms']['checked'])) {
print '';
}
+// Import Key
+if (!empty($arrayfields['d.import_key']['checked'])) {
+ print '| ';
+ print '';
+ print ' | ';
+}
+
// Status
if (!empty($arrayfields['d.statut']['checked'])) {
- print '';
+ print ' | ';
$liststatus = array(
Adherent::STATUS_DRAFT => $langs->trans("Draft"),
Adherent::STATUS_VALIDATED => $langs->trans("Validated"),
@@ -980,13 +987,6 @@ if (!empty($arrayfields['d.statut']['checked'])) {
print ' | ';
}
-// Import Key
-if (!empty($arrayfields['d.import_key']['checked'])) {
- print '';
- print '';
- print ' | ';
-}
-
// Action column
if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
print '';
@@ -1008,7 +1008,7 @@ if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
$totalarray['nbfield']++;
}
if (getDolGlobalString('MAIN_SHOW_TECHNICAL_ID')) {
- print_liste_field_titre("ID", $_SERVER["PHP_SELF"], '', '', $param, 'align="center"', $sortfield, $sortorder);
+ print_liste_field_titre("ID", $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'center ');
$totalarray['nbfield']++;
}
if (!empty($arrayfields['d.ref']['checked'])) {
@@ -1096,27 +1096,27 @@ $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // No
print $hookmanager->resPrint;
if (!empty($arrayfields['d.datec']['checked'])) {
- print_liste_field_titre($arrayfields['d.datec']['label'], $_SERVER["PHP_SELF"], "d.datec", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
+ print_liste_field_titre($arrayfields['d.datec']['label'], $_SERVER["PHP_SELF"], "d.datec", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
$totalarray['nbfield']++;
}
if (!empty($arrayfields['d.birth']['checked'])) {
- print_liste_field_titre($arrayfields['d.birth']['label'], $_SERVER["PHP_SELF"], "d.birth", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
+ print_liste_field_titre($arrayfields['d.birth']['label'], $_SERVER["PHP_SELF"], "d.birth", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
$totalarray['nbfield']++;
}
if (!empty($arrayfields['d.tms']['checked'])) {
- print_liste_field_titre($arrayfields['d.tms']['label'], $_SERVER["PHP_SELF"], "d.tms", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
- $totalarray['nbfield']++;
-}
-if (!empty($arrayfields['d.statut']['checked'])) {
- print_liste_field_titre($arrayfields['d.statut']['label'], $_SERVER["PHP_SELF"], "d.statut,t.subscription,d.datefin", "", $param, 'class="right"', $sortfield, $sortorder);
+ print_liste_field_titre($arrayfields['d.tms']['label'], $_SERVER["PHP_SELF"], "d.tms", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
$totalarray['nbfield']++;
}
if (!empty($arrayfields['d.import_key']['checked'])) {
print_liste_field_titre($arrayfields['d.import_key']['label'], $_SERVER["PHP_SELF"], "d.import_key", "", $param, '', $sortfield, $sortorder, 'center ');
$totalarray['nbfield']++;
}
+if (!empty($arrayfields['d.statut']['checked'])) {
+ print_liste_field_titre($arrayfields['d.statut']['label'], $_SERVER["PHP_SELF"], "d.statut,t.subscription,d.datefin", "", $param, '', $sortfield, $sortorder, 'center ');
+ $totalarray['nbfield']++;
+}
if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
- print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
+ print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'maxwidthsearch center ');
$totalarray['nbfield']++;
}
print "\n";
@@ -1143,7 +1143,8 @@ while ($i < $imaxinloop) {
$memberstatic->lastname = $obj->lastname;
$memberstatic->firstname = $obj->firstname;
$memberstatic->gender = $obj->gender;
- $memberstatic->statut = $obj->statut;
+ $memberstatic->statut = $obj->status;
+ $memberstatic->status = $obj->status;
$memberstatic->datefin = $datefin;
$memberstatic->socid = $obj->fk_soc;
$memberstatic->photo = $obj->photo;
@@ -1374,7 +1375,7 @@ while ($i < $imaxinloop) {
// End of subscription date
$datefin = $db->jdate($obj->datefin);
if (!empty($arrayfields['d.datefin']['checked'])) {
- print ' | ';
+ print ' | ';
if ($datefin) {
print dol_print_date($datefin, 'day');
if ($memberstatic->hasDelay()) {
@@ -1384,7 +1385,7 @@ while ($i < $imaxinloop) {
} else {
if (!empty($obj->subscription)) {
print ''.$langs->trans("SubscriptionNotReceived").'';
- if ($obj->statut > 0) {
+ if ($obj->status > 0) {
print " ".img_warning();
}
} else {
@@ -1429,15 +1430,7 @@ while ($i < $imaxinloop) {
$totalarray['nbfield']++;
}
}
- // Status
- if (!empty($arrayfields['d.statut']['checked'])) {
- print ' | ';
- print $memberstatic->LibStatut($obj->statut, $obj->subscription, $datefin, 5);
- print ' | ';
- if (!$i) {
- $totalarray['nbfield']++;
- }
- }
+ // Import key
if (!empty($arrayfields['d.import_key']['checked'])) {
print '';
print dol_escape_htmltag($obj->import_key);
@@ -1446,6 +1439,15 @@ while ($i < $imaxinloop) {
$totalarray['nbfield']++;
}
}
+ // Status
+ if (!empty($arrayfields['d.statut']['checked'])) {
+ print ' | ';
+ print $memberstatic->LibStatut($obj->status, $obj->subscription, $datefin, 5);
+ print ' | ';
+ if (!$i) {
+ $totalarray['nbfield']++;
+ }
+ }
// Action column
if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
print '';
diff --git a/htdocs/adherents/subscription/list.php b/htdocs/adherents/subscription/list.php
index b2867203410..2e6974dff77 100644
--- a/htdocs/adherents/subscription/list.php
+++ b/htdocs/adherents/subscription/list.php
@@ -30,7 +30,7 @@ require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
require_once DOL_DOCUMENT_ROOT.'/adherents/class/subscription.class.php';
require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
-$langs->loadLangs(array("members", "companies"));
+$langs->loadLangs(array("members", "companies", "banks"));
$action = GETPOST('action', 'aZ09') ? GETPOST('action', 'aZ09') : 'view'; // The action 'create'/'add', 'edit'/'update', 'view', ...
$massaction = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists)
@@ -172,7 +172,7 @@ $accountstatic = new Account($db);
$now = dol_now();
// List of subscriptions
-$sql = "SELECT d.rowid, d.login, d.firstname, d.lastname, d.societe, d.photo, d.statut,";
+$sql = "SELECT d.rowid, d.login, d.firstname, d.lastname, d.societe, d.photo, d.statut as status,";
$sql .= " d.gender, d.email, d.morphy,";
$sql .= " c.rowid as crowid, c.fk_type, c.subscription,";
$sql .= " c.dateadh, c.datef, c.datec as date_creation, c.tms as date_update,";
@@ -611,7 +611,8 @@ while ($i < $imaxinloop) {
$adherent->firstname = $obj->firstname;
$adherent->ref = $obj->rowid;
$adherent->id = $obj->rowid;
- $adherent->statut = $obj->statut;
+ $adherent->statut = $obj->status;
+ $adherent->status = $obj->status;
$adherent->login = $obj->login;
$adherent->photo = $obj->photo;
$adherent->gender = $obj->gender;
@@ -672,14 +673,14 @@ while ($i < $imaxinloop) {
}
// Ref
if (!empty($arrayfields['d.ref']['checked'])) {
- print ' | '.$subscription->getNomUrl(1).' | ';
+ print ''.$subscription->getNomUrl(1).' | ';
if (!$i) {
$totalarray['nbfield']++;
}
}
// Type
if (!empty($arrayfields['d.fk_type']['checked'])) {
- print '';
+ print ' | ';
if ($typeid > 0) {
print $adht->getNomUrl(1);
}
@@ -739,14 +740,14 @@ while ($i < $imaxinloop) {
// Date start
if (!empty($arrayfields['c.dateadh']['checked'])) {
- print ' | '.dol_print_date($db->jdate($obj->dateadh), 'day')." | \n";
+ print ''.dol_print_date($db->jdate($obj->dateadh), 'day')." | \n";
if (!$i) {
$totalarray['nbfield']++;
}
}
// Date end
if (!empty($arrayfields['c.datef']['checked'])) {
- print ''.dol_print_date($db->jdate($obj->datef), 'day')." | \n";
+ print ''.dol_print_date($db->jdate($obj->datef), 'day')." | \n";
if (!$i) {
$totalarray['nbfield']++;
}
diff --git a/htdocs/admin/expensereport_ik.php b/htdocs/admin/expensereport_ik.php
index 36b3cf73586..f4cfce82217 100644
--- a/htdocs/admin/expensereport_ik.php
+++ b/htdocs/admin/expensereport_ik.php
@@ -21,7 +21,7 @@
/**
* \file htdocs/admin/expensereport_ik.php
* \ingroup expensereport
- * \brief Page to display expense tax ik
+ * \brief Page to display expense tax ik. Used when MAIN_USE_EXPENSE_IK is set.
*/
// Load Dolibarr environment
@@ -38,7 +38,7 @@ $error = 0;
$action = GETPOST('action', 'aZ09');
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
$ikoffset = (float) price2num(GETPOST('ikoffset', 'alpha'));
$coef = (float) price2num(GETPOST('coef', 'alpha'));
$fk_c_exp_tax_cat = GETPOSTINT('fk_c_exp_tax_cat');
@@ -167,6 +167,7 @@ foreach ($rangesbycateg as $fk_c_exp_tax_cat => $Tab) {
echo $range->ik->ikoffset;
}
echo '';
+
// Coef
echo '';
if ($action == 'edit' && $range->ik->id == $id && $range->rowid == $fk_range && $range->fk_c_exp_tax_cat == $fk_c_exp_tax_cat) {
diff --git a/htdocs/admin/expensereport_rules.php b/htdocs/admin/expensereport_rules.php
index dc1dd8b6782..8fbf0edb9a7 100644
--- a/htdocs/admin/expensereport_rules.php
+++ b/htdocs/admin/expensereport_rules.php
@@ -166,7 +166,7 @@ if (empty($reshook)) {
$tab_apply = array(
'A' => $langs->trans('All'),
- 'G' => $langs->trans('Group'),
+ 'G' => $langs->trans('UserGroup'),
'U' => $langs->trans('User')
);
$tab_rules_type = array(
@@ -176,22 +176,24 @@ if (empty($reshook)) {
'EX_EXP' => $langs->trans('OnExpense')
);
}
- /*
- * View
- */
- llxHeader('', $langs->trans("ExpenseReportsSetup"));
- $form = new Form($db);
+/*
+ * View
+ */
- $linkback = '' . $langs->trans("BackToModuleList") . '';
- print load_fiche_titre($langs->trans("ExpenseReportsSetup"), $linkback, 'title_setup');
+llxHeader('', $langs->trans("ExpenseReportsSetup"));
- $head = expensereport_admin_prepare_head();
- print dol_get_fiche_head($head, 'expenserules', $langs->trans("ExpenseReportsRules"), -1, 'trip');
+$form = new Form($db);
- echo '' . $langs->trans('ExpenseReportRulesDesc') . '';
- print '
';
+$linkback = '' . $langs->trans("BackToModuleList") . '';
+print load_fiche_titre($langs->trans("ExpenseReportsSetup"), $linkback, 'title_setup');
+
+$head = expensereport_admin_prepare_head();
+print dol_get_fiche_head($head, 'expenserules', $langs->trans("ExpenseReportsRules"), -1, 'trip');
+
+echo '' . $langs->trans('ExpenseReportRulesDesc') . '';
+print '
';
if ($action != 'edit') {
echo '';
- echo ' |