';
+ // Line id
+ print '' . $objp->rowid . ' ';
+
// Ref Expense report
$expensereport_static->ref = $objp->ref;
$expensereport_static->id = $objp->erid;
@@ -306,9 +309,6 @@ if ($result) {
print $formventilation->select_account($objp->aarowid_suggest, 'codeventil'.$objp->rowid, 1);
print '';
- // Line id
- print '' . $objp->rowid . ' ';
-
// Colonne choix ligne a ventiler
print '';
print ''."\n";
print '';
+ print_liste_field_titre($langs->trans("LineId"), $_SERVER["PHP_SELF"], "l.rowid", "", $param, 'align="right"', $sortfield, $sortorder);
print_liste_field_titre($langs->trans("Invoice"), $_SERVER["PHP_SELF"], "f.ref", "", $param, '', $sortfield, $sortorder);
print_liste_field_titre($langs->trans("Ref"), $_SERVER["PHP_SELF"], "p.ref", "", $param, '', $sortfield, $sortorder);
print_liste_field_titre($langs->trans("Label"), $_SERVER["PHP_SELF"], "p.label", "", $param, '', $sortfield, $sortorder);
@@ -244,20 +245,20 @@ if ($result) {
print_liste_field_titre($langs->trans("Amount"), $_SERVER["PHP_SELF"], "l.total_ht", "", $param, 'align="right"', $sortfield, $sortorder);
print_liste_field_titre($langs->trans("VATRate"), $_SERVER["PHP_SELF"], "l.tva_tx", "", $param, 'align="center"', $sortfield, $sortorder);
print_liste_field_titre($langs->trans("Account"), $_SERVER["PHP_SELF"], "aa.account_number", "", $param, 'align="center"', $sortfield, $sortorder);
- print_liste_field_titre($langs->trans("LineId"), $_SERVER["PHP_SELF"], "l.rowid", "", $param, 'align="right"', $sortfield, $sortorder);
print_liste_field_titre('');
print_liste_field_titre('', '', '', '', '', 'align="center"');
print " \n";
- print '';
+ print '';
$searchpitco=$form->showFilterAndCheckAddButtons(1);
print $searchpitco;
@@ -275,6 +276,8 @@ if ($result) {
print ' ';
+ print '' . $objp->rowid . ' ';
+
// Ref Invoice
$facturefournisseur_static->ref = $objp->facnumber;
$facturefournisseur_static->id = $objp->facid;
@@ -297,7 +300,6 @@ if ($result) {
print '' . price($objp->total_ht) . ' ';
print '' . price($objp->tva_tx) . ' ';
print '' . $codeCompta . ' ';
- print '' . $objp->rowid . ' ';
print '';
print img_edit();
print ' '."\n";
print '';
+ print_liste_field_titre($langs->trans("LineId"), $_SERVER["PHP_SELF"], "l.rowid", "", $param, 'align="right"', $sortfield, $sortorder);
print_liste_field_titre($langs->trans("Invoice"), $_SERVER["PHP_SELF"], "f.ref", "", $param, '', $sortfield, $sortorder);
print_liste_field_titre($langs->trans("Ref"), $_SERVER["PHP_SELF"], "p.ref", "", $param, '', $sortfield, $sortorder);
print_liste_field_titre($langs->trans("Label"), $_SERVER["PHP_SELF"], "p.label", "", $param, '', $sortfield, $sortorder);
@@ -251,20 +253,19 @@ if ($result) {
print_liste_field_titre($langs->trans("VATRate"), $_SERVER["PHP_SELF"], "l.tva_tx", "", $param, 'align="right"', $sortfield, $sortorder);
print_liste_field_titre($langs->trans("AccountAccountingSuggest"), '', '', '', '', 'align="center"');
print_liste_field_titre($langs->trans("IntoAccount"), '', '', '', '', 'align="center"');
- print_liste_field_titre($langs->trans("LineId"), $_SERVER["PHP_SELF"], "l.rowid", "", $param, 'align="right"', $sortfield, $sortorder);
print_liste_field_titre('', '', '', '', '', 'align="center"');
print " \n";
print '';
- print '';
$searchpitco=$form->showFilterAndCheckAddButtons(1);
print $searchpitco;
@@ -286,39 +287,36 @@ if ($result) {
$objp->code_buy_l = '';
$objp->code_buy_p = '';
$objp->aarowid_suggest = '';
- $code_buy_p_l_differ = '';
$code_buy_p_notset = '';
-
$objp->aarowid_suggest = $objp->aarowid;
- if (! empty($objp->code_buy)) {
- $objp->code_buy_p = $objp->code_buy;
- } else {
- $code_buy_p_notset = 'color:red';
- if ($objp->type == 1) {
- $objp->code_buy_p = (! empty($conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT : $langs->trans("CodeNotDef"));
- }
-
- elseif ($objp->type == 0) {
- $objp->code_buy_p = (! empty($conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT : $langs->trans("CodeNotDef"));
- }
- }
if ($objp->type_l == 1) {
- $objp->code_buy_l = (! empty($conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT : $langs->trans("CodeNotDef"));
+ $objp->code_buy_l = (! empty($conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT : '');
if ($objp->aarowid == '')
$objp->aarowid_suggest = $aarowid_s;
} elseif ($objp->type_l == 0) {
- $objp->code_buy_l = (! empty($conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT : $langs->trans("CodeNotDef"));
+ $objp->code_buy_l = (! empty($conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT : '');
if ($objp->aarowid == '')
$objp->aarowid_suggest = $aarowid_p;
}
-
- if ($objp->code_buy_l != $objp->code_buy_p)
- $code_buy_p_l_differ = 'color:red';
+ if ($objp->code_buy_l == -1) $objp->code_buy_l='';
+ if (! empty($objp->code_buy)) {
+ $objp->code_buy_p = $objp->code_buy;
+ } else {
+ $code_buy_p_notset = 'color:orange';
+ }
+ if (empty($objp->code_buy_l) && empty($objp->code_buy_p)) $code_buy_p_notset = 'color:red';
+
+ // $objp->code_buy_p is now code of product/service
+ // $objp->code_buy_l is now default code of product/service
+
print ' ';
+ // Line id
+ print '' . $objp->rowid . ' ';
+
// Ref Invoice
$facturefourn_static->ref = $objp->ref;
$facturefourn_static->id = $objp->facid;
@@ -335,11 +333,11 @@ if ($result) {
print ' ';
print '';
- print '' . dol_trunc($objp->product_label, 24) . ' ';
+ print '' . dol_trunc($objp->product_label, 24) . ' ';
// TODO: we should set a user defined value to adjust user square / wide screen size
$trunclength = defined('ACCOUNTING_LENGTH_DESCRIPTION') ? ACCOUNTING_LENGTH_DESCRIPTION : 32;
- print '' . nl2br(dol_trunc($objp->description, $trunclength)) . ' ';
+ print '' . nl2br(dol_trunc($objp->description, $trunclength)) . ' ';
print '';
print price($objp->price);
@@ -354,24 +352,19 @@ if ($result) {
// Accounting account suggested
print ' ';
- if ($objp->code_buy_l == $objp->code_buy_p) { // Test if there is a difference between code by default and code on product
- if ($objp->code_buy_l > 0) print $objp->code_buy_l;
- else print $langs->trans("Unknown");
- } else {
- print $langs->trans("Default") . ' = ' . ($objp->code_buy_l > 0 ? $objp->code_buy_l : $langs->trans("Unknown"));
+ print (($objp->type_l == 1)?$langs->trans("DefaultForService"):$langs->trans("DefaultForProduct")) . ' = ' . ($objp->code_buy_l > 0 ? length_accountg($objp->code_buy_l) : $langs->trans("Unknown"));
+ if ($objp->product_id > 0)
+ {
print ' ';
- // Colonne choix du compte
+ // Suggested accounting account
print '';
print $formventilation->select_account($objp->aarowid_suggest, 'codeventil'.$objp->rowid, 1);
print ' ';
- // Line id
- print '' . $objp->rowid . ' ';
-
// Colonne choix ligne a ventiler
print '';
print ''.$langs->trans("MemberStatusActiveShort").' '.img_picto($langs->trans('MemberStatusActive'),'statut1');
+ elseif ($date_end_subscription < time()) return ''.$langs->trans("MemberStatusActiveLateShort").' '.img_picto($langs->trans('MemberStatusActiveLate'),'statut3');
+ else return ''.$langs->trans("MemberStatusPaidShort").' '.img_picto($langs->trans('MemberStatusPaid'),'statut4');
+ }
+ if ($statut == 0) return ''.$langs->trans("MemberStatusResiliated").' '.img_picto($langs->trans('MemberStatusResiliated'),'statut5');
+ }
+ if ($mode == 6)
{
if ($statut == -1) return $langs->trans("MemberStatusDraft").' '.img_picto($langs->trans('MemberStatusDraft'),'statut0');
if ($statut >= 1)
diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index d3e7e96a793..0727002aa59 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -129,44 +129,49 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
}
}
+
/*
* Actions
*/
if (GETPOST('cancel')) { $action='list'; $massaction=''; }
-if (! GETPOST('confirmmassaction')) { $massaction=''; }
+if (! GETPOST('confirmmassaction') && $massaction != 'presend' && $massaction != 'confirm_presend' && $massaction != 'confirm_createbills') { $massaction=''; }
$parameters=array('socid'=>$socid);
$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action); // Note that $action and $object may have been modified by some hooks
if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
-
-// Purge search criteria
-if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers
+if (empty($reshook))
{
- $search="";
- $search_ref="";
- $search_lastname="";
- $search_firstname="";
- $search_login="";
- $search_company="";
- $type="";
- $search_email="";
- $search_address="";
- $search_zip="";
- $search_town="";
- $search_state="";
- $search_country='';
- $search_phone='';
- $search_phone_perso='';
- $search_phone_mobile='';
- $search_morphy="";
- $search_categ="";
- $catid="";
- $sall="";
- $statut='';
- $search_array_options=array();
+ // Selection of new fields
+ include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+
+ // Purge search criteria
+ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // All tests are required to be compatible with all browsers
+ {
+ $search="";
+ $search_ref="";
+ $search_lastname="";
+ $search_firstname="";
+ $search_login="";
+ $search_company="";
+ $type="";
+ $search_email="";
+ $search_address="";
+ $search_zip="";
+ $search_town="";
+ $search_state="";
+ $search_country='';
+ $search_phone='';
+ $search_phone_perso='';
+ $search_phone_mobile='';
+ $search_morphy="";
+ $search_categ="";
+ $catid="";
+ $sall="";
+ $statut='';
+ $search_array_options=array();
+ }
}
@@ -179,8 +184,6 @@ $formother=new FormOther($db);
$membertypestatic=new AdherentType($db);
$memberstatic=new Adherent($db);
-llxHeader('',$langs->trans("Member"),'EN:Module_Foundations|FR:Module_Adhérents|ES:Módulo_Miembros');
-
$now=dol_now();
$sql = "SELECT d.rowid, d.login, d.lastname, d.firstname, d.societe as company, d.fk_soc,";
@@ -259,263 +262,510 @@ $sql.= $db->plimit($limit+1, $offset);
dol_syslog("get list", LOG_DEBUG);
$resql = $db->query($sql);
-if ($resql)
+if (! $resql)
{
- $num = $db->num_rows($resql);
- $i = 0;
+ dol_print_error($db);
+ exit;
+}
- $titre=$langs->trans("MembersList");
- if (isset($_GET["statut"]))
- {
- if ($statut == '-1,1') { $titre=$langs->trans("MembersListQualified"); }
- if ($statut == '-1') { $titre=$langs->trans("MembersListToValid"); }
- if ($statut == '1' && ! $filter) { $titre=$langs->trans("MembersListValid"); }
- if ($statut == '1' && $filter=='uptodate') { $titre=$langs->trans("MembersListUpToDate"); }
- if ($statut == '1' && $filter=='outofdate') { $titre=$langs->trans("MembersListNotUpToDate"); }
- if ($statut == '0') { $titre=$langs->trans("MembersListResiliated"); }
- }
- elseif ($action == 'search')
- {
- $titre=$langs->trans("MembersListQualified");
- }
+$num = $db->num_rows($resql);
- if ($type > 0)
- {
- $membertype=new AdherentType($db);
- $result=$membertype->fetch(GETPOST("type"));
- $titre.=" (".$membertype->libelle.")";
- }
+if ($num == 1 && ! empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $sall)
+{
+ $obj = $db->fetch_object($resql);
+ $id = $obj->rowid;
+ header("Location: ".DOL_URL_ROOT.'/adherents/card.php?id='.$id);
+ exit;
+}
- $param='';
- if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.urlencode($limit);
- if ($statut != "") $param.="&statut=".urlencode($statut);
- if ($search_ref) $param.="&search_ref=".urlencode($search_ref);
- if ($search_nom) $param.="&search_nom=".urlencode($search_nom);
- if ($search_firstname) $param.="&search_firstname=".urlencode($search_firstname);
- if ($search_lastname) $param.="&search_lastname=".urlencode($search_lastname);
- if ($search_login) $param.="&search_login=".urlencode($search_login);
- if ($search_email) $param.="&search_email=".urlencode($search_email);
- if ($search_company) $param.="&search_company=".urlencode($search_company);
- if ($search_address != '') $param.= "&search_address=".urlencode($search_address);
- if ($search_town != '') $param.= "&search_town=".urlencode($search_town);
- if ($search_zip != '') $param.= "&search_zip=".urlencode($search_zip);
- if ($search_state != '') $param.= "&search_state=".urlencode($search_state);
- if ($search_country != '') $param.= "&search_country=".urlencode($search_country);
- if ($search_phone != '') $param.= "&search_phone=".urlencode($search_phone);
- if ($search_phone_perso != '') $param.= "&search_phone_perso=".urlencode($search_phone_perso);
- if ($search_phone_mobile != '') $param.= "&search_phone_mobile=".urlencode($search_phone_mobile);
- if ($filter) $param.="&filter=".urlencode($filter);
- if ($type > 0) $param.="&type=".urlencode($type);
- if ($optioncss != '') $param.='&optioncss='.urlencode($optioncss);
- // Add $param from extra fields
- foreach ($search_array_options as $key => $val)
- {
- $crit=$val;
- $tmpkey=preg_replace('/search_options_/','',$key);
- if ($val != '') $param.='&search_options_'.$tmpkey.'='.urlencode($val);
- }
+llxHeader('',$langs->trans("Member"),'EN:Module_Foundations|FR:Module_Adhérents|ES:Módulo_Miembros');
+
+$titre=$langs->trans("MembersList");
+if (isset($_GET["statut"]))
+{
+ if ($statut == '-1,1') { $titre=$langs->trans("MembersListQualified"); }
+ if ($statut == '-1') { $titre=$langs->trans("MembersListToValid"); }
+ if ($statut == '1' && ! $filter) { $titre=$langs->trans("MembersListValid"); }
+ if ($statut == '1' && $filter=='uptodate') { $titre=$langs->trans("MembersListUpToDate"); }
+ if ($statut == '1' && $filter=='outofdate') { $titre=$langs->trans("MembersListNotUpToDate"); }
+ if ($statut == '0') { $titre=$langs->trans("MembersListResiliated"); }
+}
+elseif ($action == 'search')
+{
+ $titre=$langs->trans("MembersListQualified");
+}
+
+if ($type > 0)
+{
+ $membertype=new AdherentType($db);
+ $result=$membertype->fetch(GETPOST("type"));
+ $titre.=" (".$membertype->libelle.")";
+}
+
+$param='';
+if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
+if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
+if ($sall != "") $param.="&sall=".urlencode($sall);
+if ($statut != "") $param.="&statut=".urlencode($statut);
+if ($search_ref) $param.="&search_ref=".urlencode($search_ref);
+if ($search_nom) $param.="&search_nom=".urlencode($search_nom);
+if ($search_firstname) $param.="&search_firstname=".urlencode($search_firstname);
+if ($search_lastname) $param.="&search_lastname=".urlencode($search_lastname);
+if ($search_login) $param.="&search_login=".urlencode($search_login);
+if ($search_email) $param.="&search_email=".urlencode($search_email);
+if ($search_company) $param.="&search_company=".urlencode($search_company);
+if ($search_address != '') $param.= "&search_address=".urlencode($search_address);
+if ($search_town != '') $param.= "&search_town=".urlencode($search_town);
+if ($search_zip != '') $param.= "&search_zip=".urlencode($search_zip);
+if ($search_state != '') $param.= "&search_state=".urlencode($search_state);
+if ($search_country != '') $param.= "&search_country=".urlencode($search_country);
+if ($search_phone != '') $param.= "&search_phone=".urlencode($search_phone);
+if ($search_phone_perso != '') $param.= "&search_phone_perso=".urlencode($search_phone_perso);
+if ($search_phone_mobile != '') $param.= "&search_phone_mobile=".urlencode($search_phone_mobile);
+if ($filter) $param.="&filter=".urlencode($filter);
+if ($type > 0) $param.="&type=".urlencode($type);
+if ($optioncss != '') $param.='&optioncss='.urlencode($optioncss);
+// Add $param from extra fields
+foreach ($search_array_options as $key => $val)
+{
+ $crit=$val;
+ $tmpkey=preg_replace('/search_options_/','',$key);
+ if ($val != '') $param.='&search_options_'.$tmpkey.'='.urlencode($val);
+}
+
+//$massactionbutton=$form->selectMassAction('', $massaction == 'presend' ? array() : array('presend'=>$langs->trans("SendByMail"), 'builddoc'=>$langs->trans("PDFMerge")));
+
+print '';
+
+if ($num > $limit || $page) print_barre_liste('', $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_generic.png', 0, '', '', $limit, 1);
+
llxFooter();
-
$db->close();
diff --git a/htdocs/admin/agenda_other.php b/htdocs/admin/agenda_other.php
index 9ea048c27fd..e6bb4a2914f 100644
--- a/htdocs/admin/agenda_other.php
+++ b/htdocs/admin/agenda_other.php
@@ -1,9 +1,9 @@
+/* Copyright (C) 2008-2016 Laurent Destailleur
* Copyright (C) 2011 Regis Houssin
- * Copyright (C) 2011-2013 Juanjo Menent
- * Copyright (C) 2015 Jean-François Ferry
- * Copyright (C) 2016 Charlie Benke
+ * Copyright (C) 2011-2013 Juanjo Menent
+ * Copyright (C) 2015 Jean-François Ferry
+ * Copyright (C) 2016 Charlie Benke
*
* 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
@@ -28,7 +28,7 @@
require '../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/agenda.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
if (!$user->admin)
accessforbidden();
@@ -370,6 +370,7 @@ print ' '."\n";
if (! empty($conf->global->AGENDA_USE_EVENT_TYPE))
{
$var=!$var;
+ print '';
print ''."\n";
print ''.$langs->trans("AGENDA_USE_EVENT_TYPE_DEFAULT").' '."\n";
print ' '."\n";
@@ -384,7 +385,7 @@ print ' '."\n";
print ''.$langs->trans("AGENDA_DEFAULT_FILTER_TYPE").' '."\n";
print ' '."\n";
print ''."\n";
-$formactions->select_type_actions($conf->global->AGENDA_DEFAULT_FILTER_TYPE, "AGENDA_DEFAULT_FILTER_TYPE", '', (empty($conf->global->AGENDA_USE_EVENT_TYPE) ? 1 : 0), 1);
+$formactions->select_type_actions($conf->global->AGENDA_DEFAULT_FILTER_TYPE, "AGENDA_DEFAULT_FILTER_TYPE", '', (empty($conf->global->AGENDA_USE_EVENT_TYPE) ? 1 : -1), 1);
print ' '."\n";
// AGENDA_DEFAULT_FILTER_STATUS
@@ -393,7 +394,7 @@ print ''."\n";
print ''.$langs->trans("AGENDA_DEFAULT_FILTER_STATUS").' '."\n";
print ' '."\n";
print ''."\n";
-$formactions->form_select_status_action('agenda',$conf->global->AGENDA_DEFAULT_FILTER_STATUS,1,'AGENDA_DEFAULT_FILTER_STATUS',1,2);
+$formactions->form_select_status_action('agenda', $conf->global->AGENDA_DEFAULT_FILTER_STATUS, 1, 'AGENDA_DEFAULT_FILTER_STATUS', 1, 2);
print ' '."\n";
// AGENDA_DEFAULT_VIEW
diff --git a/htdocs/admin/confexped.php b/htdocs/admin/confexped.php
index bf4a09c0ada..859534d53fd 100644
--- a/htdocs/admin/confexped.php
+++ b/htdocs/admin/confexped.php
@@ -87,14 +87,14 @@ else if ($action == 'disable_delivery')
$dir = DOL_DOCUMENT_ROOT."/core/modules/expedition/";
$form=new Form($db);
-llxHeader("","");
+llxHeader("",$langs->trans("SendingsSetup"));
$linkback=''.$langs->trans("BackToModuleList").' ';
print load_fiche_titre($langs->trans("SendingsSetup"),$linkback,'title_setup');
print ''.$langs->trans("BackToModuleList").' ';
print load_fiche_titre($langs->trans("SendingsSetup"),$linkback,'title_setup');
diff --git a/htdocs/admin/supplier_order.php b/htdocs/admin/supplier_order.php
index 5d0cf665d7c..5c288b9e78a 100644
--- a/htdocs/admin/supplier_order.php
+++ b/htdocs/admin/supplier_order.php
@@ -497,7 +497,7 @@ $var=false;
print $form->textwithpicto($langs->trans("UseDoubleApproval"), $langs->trans("Use3StepsApproval"), 1, 'help').'';
- print ' ';
print ' \n";
diff --git a/htdocs/admin/system/database.php b/htdocs/admin/system/database.php
index 365cfaa449d..ff7a16d1893 100644
--- a/htdocs/admin/system/database.php
+++ b/htdocs/admin/system/database.php
@@ -88,7 +88,7 @@ else
{
$arraytest=array(
'character_set_database'=>array('var'=>'dolibarr_main_db_character_set','valifempty'=>'utf8'),
- 'collation_database'=>array('var'=>'dolibarr_main_db_collation','valifempty'=>'utf8_general_ci')
+ 'collation_database'=>array('var'=>'dolibarr_main_db_collation','valifempty'=>'utf8_unicode_ci')
);
}
diff --git a/htdocs/admin/system/dolibarr.php b/htdocs/admin/system/dolibarr.php
index eeea93a2fea..2fe87a02e63 100644
--- a/htdocs/admin/system/dolibarr.php
+++ b/htdocs/admin/system/dolibarr.php
@@ -40,20 +40,22 @@ if (! $user->admin)
$form=new Form($db);
-llxHeader();
+$title=$langs->trans("InfoDolibarr");
-print load_fiche_titre($langs->trans("InfoDolibarr"),'','title_setup');
+llxHeader('', $title);
+
+print load_fiche_titre($title,'','title_setup');
// Version
$var=true;
print '';
-print ''.$langs->trans("Version").' '.$langs->trans("Value").' '.$langs->trans("Version").' '.$langs->trans("Value").' '.$langs->trans("VersionLastInstall").' '.$conf->global->MAIN_VERSION_LAST_INSTALL.' '.$langs->trans("VersionLastInstall").' '.$conf->global->MAIN_VERSION_LAST_INSTALL.' '.$langs->trans("VersionLastUpgrade").' '.$conf->global->MAIN_VERSION_LAST_UPGRADE.' '.$langs->trans("VersionLastUpgrade").' '.$conf->global->MAIN_VERSION_LAST_UPGRADE.' '.$langs->trans("VersionProgram").' '.DOL_VERSION;
+print ' '.$langs->trans("VersionProgram").' '.DOL_VERSION;
// If current version differs from last upgrade
if (empty($conf->global->MAIN_VERSION_LAST_UPGRADE))
{
@@ -72,30 +74,30 @@ print '';
-print ''.$langs->trans("Session").' '.$langs->trans("Value").' '.$langs->trans("Session").' '.$langs->trans("Value").' '.$langs->trans("SessionSavePath").' '.session_save_path().' '.$langs->trans("SessionSavePath").' '.session_save_path().' '.$langs->trans("SessionName").' '.session_name().' '.$langs->trans("SessionName").' '.session_name().' '.$langs->trans("SessionId").' '.session_id().' '.$langs->trans("SessionId").' '.session_id().' '.$langs->trans("CurrentSessionTimeOut").' '.ini_get('session.gc_maxlifetime').' '.$langs->trans("seconds");
+print ' '.$langs->trans("CurrentSessionTimeOut").' '.ini_get('session.gc_maxlifetime').' '.$langs->trans("seconds");
print ' ';
print $form->textwithpicto('',$langs->trans("SessionExplanation",ini_get("session.gc_probability"),ini_get("session.gc_divisor")));
print " '.$langs->trans("CurrentTheme").' '.$conf->theme.' '.$langs->trans("CurrentTheme").' '.$conf->theme.' '.$langs->trans("CurrentMenuHandler").' ';
+print ' '.$langs->trans("CurrentMenuHandler").' ';
print $conf->standard_menu;
print ' '.$langs->trans("Screen").' ';
+print ' '.$langs->trans("Screen").' ';
print $_SESSION['dol_screenwidth'].' x '.$_SESSION['dol_screenheight'];
print ' '.$langs->trans("Session").' ';
+print ' '.$langs->trans("Session").' ';
$i=0;
foreach($_SESSION as $key => $val)
{
@@ -116,7 +118,7 @@ if (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_S
$var=true;
print '';
print '';
- print ''.$langs->trans("LanguageFilesCachedIntoShmopSharedMemory").' ';
+ print ''.$langs->trans("LanguageFilesCachedIntoShmopSharedMemory").' ';
print ''.$langs->trans("NbOfEntries").' ';
print ''.$langs->trans("Address").' ';
print ' '."\n";
@@ -124,7 +126,7 @@ if (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_S
foreach($shmoparray as $key => $val)
{
$var=!$var;
- print ''.$key.' ';
+ print ''.$key.' ';
print ''.count($val).' ';
print ''.dol_getshmopaddress($key).' ';
print '';
-print ''.$langs->trans("LocalisationDolibarrParameters").' '.$langs->trans("Value").' '.$langs->trans("LocalisationDolibarrParameters").' '.$langs->trans("Value").' '.$langs->trans("LanguageBrowserParameter","HTTP_ACCEPT_LANGUAGE").' '.$_SERVER["HTTP_ACCEPT_LANGUAGE"].' '.$langs->trans("LanguageBrowserParameter","HTTP_ACCEPT_LANGUAGE").' '.$_SERVER["HTTP_ACCEPT_LANGUAGE"].' '.$langs->trans("CurrentUserLanguage").' '.$langs->getDefaultLang().' '.$langs->trans("CurrentUserLanguage").' '.$langs->getDefaultLang().' '.$langs->trans("CurrentValueSeparatorThousand").' '.($thousand==' '?$langs->transnoentitiesnoconv("Space"):$thousand).' '.$langs->trans("CurrentValueSeparatorThousand").' '.($thousand==' '?$langs->transnoentitiesnoconv("Space"):$thousand).' '.$langs->trans("CurrentValueSeparatorDecimal").' '.$dec.' '.$langs->trans("CurrentValueSeparatorDecimal").' '.$dec.' => price2num(1233.56+1) '.price2num(1233.56+1,'2').' => price2num(1233.56+1) '.price2num(1233.56+1,'2').' => price2num('."'1".$thousand."234".$dec."56') ".price2num("1".$thousand."234".$dec."56",'2')." => price2num('."'1".$thousand."234".$dec."56') ".price2num("1".$thousand."234".$dec."56",'2')." => price2num('."'1 234.56') ".price2num("1 234.56",'2')." ";
+ print " => price2num('."'1 234.56') ".price2num("1 234.56",'2')." ";
print " => price(1234.56) '.price(1234.56).' => price(1234.56) '.price(1234.56).' '.$langs->trans("CurrentTimeZone").' '; // Timezone server PHP
+print ' '.$langs->trans("CurrentTimeZone").' '; // Timezone server PHP
$a=getServerTimeZoneInt('now');
$b=getServerTimeZoneInt('winter');
$c=getServerTimeZoneInt('summer');
@@ -185,18 +187,18 @@ $val.=' '.$langs->trans("DaylingSavingTime").': '.($dayligh
print $form->textwithtooltip($val,$txt,2,1,img_info(''));
print ' => '.$langs->trans("CurrentHour").' '.dol_print_date(dol_now(),'dayhour','tzserver').' => '.$langs->trans("CurrentHour").' '.dol_print_date(dol_now(),'dayhour','tzserver').' => dol_print_date(0,"dayhourtext") '.dol_print_date(0,"dayhourtext").' ';
+print ' => dol_print_date(0,"dayhourtext") '.dol_print_date(0,"dayhourtext").' ';
$var=!$var;
-print ' => dol_get_first_day(1970,1,false) '.dol_get_first_day(1970,1,false).' (=> dol_print_date() or idate() of this value = '.dol_print_date(dol_get_first_day(1970,1,false),'dayhour').') ';
+print ' => dol_get_first_day(1970,1,false) '.dol_get_first_day(1970,1,false).' (=> dol_print_date() or idate() of this value = '.dol_print_date(dol_get_first_day(1970,1,false),'dayhour').') ';
$var=!$var;
-print ' => dol_get_first_day(1970,1,true) '.dol_get_first_day(1970,1,true).' (=> dol_print_date() or idate() of this value = '.dol_print_date(dol_get_first_day(1970,1,true),'dayhour').') ';
+print ' => dol_get_first_day(1970,1,true) '.dol_get_first_day(1970,1,true).' (=> dol_print_date() or idate() of this value = '.dol_print_date(dol_get_first_day(1970,1,true),'dayhour').') ';
// Database timezone
if ($conf->db->type == 'mysql' || $conf->db->type == 'mysqli')
{
$var=!$var;
- print ''.$langs->trans("MySQLTimeZone").' (database) '; // Timezone server base
+ print ' '.$langs->trans("MySQLTimeZone").' (database) '; // Timezone server base
$sql="SHOW VARIABLES where variable_name = 'system_time_zone'";
$resql = $db->query($sql);
if ($resql)
@@ -209,7 +211,7 @@ if ($conf->db->type == 'mysql' || $conf->db->type == 'mysqli')
// Client
$var=!$var;
$tz=(int) $_SESSION['dol_tz'] + (int) $_SESSION['dol_dst'];
-print ' '.$langs->trans("ClientTZ").' '.($tz?($tz>=0?'+':'').$tz:'').' ('.($tz>=0?'+':'').($tz*60*60).')';
+print ' '.$langs->trans("ClientTZ").' '.($tz?($tz>=0?'+':'').$tz:'').' ('.($tz>=0?'+':'').($tz*60*60).')';
print ' '.$_SESSION['dol_tz_string'];
print ' '.$langs->trans("DaylingSavingTime").': ';
if ($_SESSION['dol_dst']>0) print yn(1);
@@ -218,18 +220,18 @@ if (! empty($_SESSION['dol_dst_first'])) print ' ('.dol_print_date
print ' => '.$langs->trans("ClientHour").' '.dol_print_date(dol_now(),'dayhour','tzuser').' => '.$langs->trans("ClientHour").' '.dol_print_date(dol_now(),'dayhour','tzuser').' '.$langs->trans("File encoding").' (php.ini unicode.filesystem_encoding) '.$filesystemencoding.' '.$langs->trans("File encoding").' (php.ini unicode.filesystem_encoding) '.$filesystemencoding.' => '.$langs->trans("File encoding").' '.$tmp.' => '.$langs->trans("File encoding").' '.$tmp.'
';
print '';
print '';
-print ''.$langs->trans("Parameters").' ';
+print ' '.$langs->trans("Parameters").' ';
print $langs->trans("ConfigurationFile").' ('.$conffiletoshowshort.')';
print ' ';
print ''.$langs->trans("Parameter").' ';
@@ -357,9 +359,9 @@ print '';
print '';
-print ''.$langs->trans("Parameters").' '.$langs->trans("Database").' ';
+print ''.$langs->trans("Parameters").' '.$langs->trans("Database").' ';
print ''.$langs->trans("Value").' ';
-if (empty($conf->multicompany->enabled) || !$user->entity) print ''.$langs->trans("Entity").' '; // If superadmin or multicompany disabled
+if (empty($conf->multicompany->enabled) || !$user->entity) print ''.$langs->trans("Entity").' '; // If superadmin or multicompany disabled
print " \n";
$sql = "SELECT";
@@ -394,9 +396,9 @@ if ($resql)
$var=!$var;
print '';
- print ''.$obj->name.' '."\n";
- print ''.$obj->value.' '."\n";
- if (empty($conf->multicompany->enabled) || !$user->entity) print ''.$obj->entity.' '."\n"; // If superadmin or multicompany disabled
+ print ''.$obj->name.' '."\n";
+ print ''.$obj->value.' '."\n";
+ if (empty($conf->multicompany->enabled) || !$user->entity) print ''.$obj->entity.' '."\n"; // If superadmin or multicompany disabled
print " \n";
$i++;
diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index d38270b8827..c917925e87e 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -795,7 +795,7 @@ if ($action == 'create')
}
print '';
}
- if(!empty($origin) && !empty($originid))
+ if (!empty($origin) && !empty($originid))
{
include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
print ''.$langs->trans("LinkedObject").' ';
diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index 419b32cdea4..f8d2913028c 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -1113,15 +1113,26 @@ class ActionComm extends CommonObject
if (! empty($conf->dol_no_mouse_hover)) $notooltip=1; // Force disable tooltips
+ $label = $this->label;
+ if (empty($label)) $label=$this->libelle; // For backward compatibility
+
$result='';
+ // Set label of typ
+ $labeltype = ($langs->transnoentities("Action".$this->type_code) != "Action".$this->type_code)?$langs->transnoentities("Action".$this->type_code):$this->type_label;
+ if (empty($conf->global->AGENDA_USE_EVENT_TYPE))
+ {
+ if ($this->type_code != 'AC_OTH_AUTO') $labeltype = $langs->trans('ActionAC_MANUAL');
+ }
+
+
$tooltip = '' . $langs->trans('ShowAction'.$objp->code) . ' ';
if (! empty($this->ref))
$tooltip .= '' . $langs->trans('Ref') . ': ' . $this->ref;
- $label = $this->label;
- if (empty($label)) $label=$this->libelle; // For backward compatibility
if (! empty($label))
$tooltip .= '' . $langs->trans('Title') . ': ' . $label;
+ if (! empty($labeltype))
+ $tooltip .= '' . $langs->trans('Type') . ': ' . $labeltype;
if (! empty($this->location))
$tooltip .= '' . $langs->trans('Location') . ': ' . $this->location;
@@ -1129,11 +1140,11 @@ class ActionComm extends CommonObject
if (! empty($conf->global->AGENDA_USE_EVENT_TYPE) && $this->type_color)
$linkclose = ' style="background-color:#'.$this->type_color.'"';
- if (empty($notooltip) && $user->rights->propal->lire)
+ if (empty($notooltip))
{
if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
{
- $label=$langs->trans("ShowSupplierProposal");
+ $label=$langs->trans("ShowAction");
$linkclose.=' alt="'.dol_escape_htmltag($tooltip, 1).'"';
}
$linkclose.=' title="'.dol_escape_htmltag($tooltip, 1).'"';
@@ -1166,13 +1177,13 @@ class ActionComm extends CommonObject
if ($withpicto == 2)
{
$libelle=$label;
- if (! empty($conf->global->AGENDA_USE_EVENT_TYPE)) $libelle=$langs->transnoentities("Action".$this->type_code);
+ if (! empty($conf->global->AGENDA_USE_EVENT_TYPE)) $libelle=$labeltype;
$libelleshort='';
}
else
{
$libelle=(empty($this->libelle)?$label:$this->libelle.(($label && $label != $this->libelle)?' '.$label:''));
- if (! empty($conf->global->AGENDA_USE_EVENT_TYPE) && empty($libelle)) $libelle=($langs->transnoentities("Action".$this->type_code) != "Action".$this->type_code)?$langs->transnoentities("Action".$this->type_code):$this->type_label;
+ if (! empty($conf->global->AGENDA_USE_EVENT_TYPE) && empty($libelle)) $libelle=$labeltype;
if ($maxlength < 0) $libelleshort=$this->ref;
else $libelleshort=dol_trunc($libelle,$maxlength);
}
diff --git a/htdocs/comm/action/class/cactioncomm.class.php b/htdocs/comm/action/class/cactioncomm.class.php
index 237a1043ac6..c03763c13a6 100644
--- a/htdocs/comm/action/class/cactioncomm.class.php
+++ b/htdocs/comm/action/class/cactioncomm.class.php
@@ -105,9 +105,9 @@ class CActionComm
* @param string|int $active 1 or 0 to filter on event state active or not ('' by default = no filter)
* @param string $idorcode 'id' or 'code'
* @param string $excludetype Type to exclude ('system' or 'systemauto')
- * @param int $onlyautoornot 1=Group all type AC_XXX into 1 line AC_MANUAL. 0=Keep details of type
+ * @param int $onlyautoornot 1=Group all type AC_XXX into 1 line AC_MANUAL. 0=Keep details of type, -1=Keep details and add a combined line "All manual"
* @param string $morefilter Add more SQL filter
- * @return mixed Array of all event types if OK, <0 if KO
+ * @return mixed Array of all event types if OK, <0 if KO. Key of array is id or code depending on parameter $idorcode.
*/
function liste_array($active='',$idorcode='id',$excludetype='',$onlyautoornot=0, $morefilter='')
{
@@ -123,7 +123,7 @@ class CActionComm
if ($active != '') $sql.=" AND active=".$active;
if (! empty($excludetype)) $sql.=" AND type <> '".$excludetype."'";
if ($morefilter) $sql.=" AND ".$morefilter;
- $sql.= " ORDER BY module, position";
+ $sql.= " ORDER BY module, position, type";
dol_syslog(get_class($this)."::liste_array", LOG_DEBUG);
$resql=$this->db->query($sql);
@@ -140,7 +140,7 @@ class CActionComm
$qualified=1;
// $obj->type can be system, systemauto, module, moduleauto, xxx, xxxauto
- if ($qualified && $onlyautoornot && preg_match('/^system/',$obj->type) && ! preg_match('/^AC_OTH/',$obj->code)) $qualified=0; // We discard detailed system events. We keep only the 2 generic lines (AC_OTH and AC_OTH_AUTO)
+ if ($qualified && $onlyautoornot > 0 && preg_match('/^system/',$obj->type) && ! preg_match('/^AC_OTH/',$obj->code)) $qualified=0; // We discard detailed system events. We keep only the 2 generic lines (AC_OTH and AC_OTH_AUTO)
if ($qualified && $obj->module)
{
@@ -155,12 +155,19 @@ class CActionComm
if ($qualified)
{
$code=$obj->code;
- if ($onlyautoornot && $code == 'AC_OTH') $code='AC_MANUAL';
- if ($onlyautoornot && $code == 'AC_OTH_AUTO') $code='AC_AUTO';
+ if ($onlyautoornot > 0 && $code == 'AC_OTH') $code='AC_MANUAL';
+ if ($onlyautoornot > 0 && $code == 'AC_OTH_AUTO') $code='AC_AUTO';
$transcode=$langs->trans("Action".$code);
- $repid[$obj->id] = ($transcode!="Action".$code?$transcode:$langs->trans($obj->label));
- $repcode[$obj->code] = ($transcode!="Action".$code?$transcode:$langs->trans($obj->label));
- if ($onlyautoornot && preg_match('/^module/',$obj->type) && $obj->module) $repcode[$obj->code].=' ('.$langs->trans("Module").': '.$obj->module.')';
+ $label = ($transcode!="Action".$code?$transcode:$langs->trans($obj->label));
+ if ($onlyautoornot == -1 && ! empty($conf->global->AGENDA_USE_EVENT_TYPE) && ! preg_match('/auto/i', $code))
+ {
+ $label=' '.$label;
+ $repid[-99]=$langs->trans("ActionAC_MANUAL");
+ $repcode['AC_NON_AUTO']=$langs->trans("ActionAC_MANUAL");
+ }
+ $repid[$obj->id] = $label;
+ $repcode[$obj->code] = $label;
+ if ($onlyautoornot > 0 && preg_match('/^module/',$obj->type) && $obj->module) $repcode[$obj->code].=' ('.$langs->trans("Module").': '.$obj->module.')';
}
$i++;
}
diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index f70b8d171a1..f63bbd7ab79 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -450,7 +450,29 @@ if ($filtert > 0 || $usergroup > 0) $sql.=", ".MAIN_DB_PREFIX."actioncomm_resour
if ($usergroup > 0) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."usergroup_user as ugu ON ugu.fk_user = ar.fk_element";
$sql.= ' WHERE a.fk_action = ca.id';
$sql.= ' AND a.entity IN ('.getEntity('agenda', 1).')';
-if ($actioncode) $sql.=" AND ca.code IN ('".implode("','", explode(',',$actioncode))."')";
+// Condition on actioncode
+if (! empty($actioncode))
+{
+ if (empty($conf->global->AGENDA_USE_EVENT_TYPE))
+ {
+ if ($actioncode == 'AC_NON_AUTO') $sql.= " AND ca.type != 'systemauto'";
+ elseif ($actioncode == 'AC_ALL_AUTO') $sql.= " AND ca.type = 'systemauto'";
+ else
+ {
+ if ($actioncode == 'AC_OTH') $sql.= " AND ca.type != 'systemauto'";
+ if ($actioncode == 'AC_OTH_AUTO') $sql.= " AND ca.type = 'systemauto'";
+ }
+ }
+ else
+ {
+ if ($actioncode == 'AC_NON_AUTO') $sql.= " AND ca.type != 'systemauto'";
+ elseif ($actioncode == 'AC_ALL_AUTO') $sql.= " AND ca.type = 'systemauto'";
+ else
+ {
+ $sql.=" AND ca.code IN ('".implode("','", explode(',',$actioncode))."')";
+ }
+ }
+}
if ($resourceid > 0) $sql.=" AND r.element_type = 'action' AND r.element_id = a.id AND r.resource_id = ".$db->escape($resourceid);
if ($pid) $sql.=" AND a.fk_project=".$db->escape($pid);
if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND (a.fk_soc IS NULL OR sc.fk_user = " .$user->id . ")";
@@ -970,7 +992,15 @@ if (empty($action) || $action == 'show_month') // View by month
$i=0;
while ($i < 7)
{
- echo ' '.$langs->trans("Day".(($i+(isset($conf->global->MAIN_START_WEEK)?$conf->global->MAIN_START_WEEK:1)) % 7))." \n";
+ print ' ';
+ $numdayinweek=(($i+(isset($conf->global->MAIN_START_WEEK)?$conf->global->MAIN_START_WEEK:1)) % 7);
+ if (! empty($conf->dol_optimize_smallscreen))
+ {
+ $labelshort=array(0=>'SundayMin',1=>'MondayMin',2=>'TuesdayMin',3=>'WednesdayMin',4=>'ThursdayMin',5=>'FridayMin',6=>'SaturdayMin');
+ print $langs->trans($labelshort[$numdayinweek]);
+ }
+ else print $langs->trans("Day".$numdayinweek);
+ print " \n";
$i++;
}
echo "
* Copyright (C) 2005-2010 Regis Houssin
*
* This program is free software; you can redistribute it and/or modify
@@ -125,11 +125,11 @@ if ($result)
print '';
print '';
- print ' ';
// Title
print '';
- print ' ';
print ' ';
if (! $filteremail) print ' ';
@@ -145,7 +145,7 @@ if ($result)
$email=new Mailing($db);
- while ($i < min($num,$conf->liste_limit))
+ while ($i < min($num,$limit))
{
$obj = $db->fetch_object($result);
diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 6b47d5205b6..1fe8f76efaa 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -777,7 +777,7 @@ if (empty($reshook))
$pu_ht = price($prodcustprice->lines [0]->price);
$pu_ttc = price($prodcustprice->lines [0]->price_ttc);
$price_base_type = $prodcustprice->lines [0]->price_base_type;
- $prod->tva_tx = $prodcustprice->lines [0]->tva_tx;
+ $tva_tx = $prodcustprice->lines [0]->tva_tx;
}
}
}
@@ -1808,7 +1808,7 @@ if ($action == 'create')
// Remise dispo de type non avoir
$filter = 'fk_facture_source IS NULL';
print ' ';
// Status
print ''.$langs->trans("Status").' ';
- $formpropal->selectProposalStatus($object_statut,0,1,1,$mode);
+ $formpropal->selectProposalStatus(($object_status!=''?$object_status:-1),0,0,1,$mode,'object_status');
print ' '.$langs->trans("Year").' ';
diff --git a/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php b/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
index cc84e87ddba..dd325da7297 100644
--- a/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
@@ -35,27 +35,44 @@ $linkedObjectBlock = $GLOBALS['linkedObjectBlock'];
$langs->load("propal");
+$total=0; $ilink=0;
$var=true;
-$total=0;
foreach($linkedObjectBlock as $key => $objectlink)
{
- $var=!$var;
+ $ilink++;
+ $var=!$var;
+ $trclass=($var?'pair':'impair');
+ if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass.=' liste_sub_total';
?>
- >
- trans("Proposal"); ?>
- getNomUrl(1); ?>
- ref_client; ?>
- date,'day'); ?>
- rights->propale->lire) {
- $total = $total + $objectlink->total_ht;
- echo price($objectlink->total_ht);
- } ?>
- getLibStatut(3); ?>
- ">transnoentitiesnoconv("RemoveLink")); ?>
+
+ trans("Proposal"); ?>
+ getNomUrl(1); ?>
+ ref_client; ?>
+ date,'day'); ?>
+ rights->propale->lire) {
+ $total = $total + $objectlink->total_ht;
+ echo price($objectlink->total_ht);
+ } ?>
+ getLibStatut(3); ?>
+ ">transnoentitiesnoconv("RemoveLink")); ?>
1)
+{
+ ?>
+
+ trans("Total"); ?>
+
+
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 313fef16e2c..9495895beda 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -730,7 +730,7 @@ if (empty($reshook))
$pu_ht = price($prodcustprice->lines [0]->price);
$pu_ttc = price($prodcustprice->lines [0]->price_ttc);
$price_base_type = $prodcustprice->lines [0]->price_base_type;
- $prod->tva_tx = $prodcustprice->lines [0]->tva_tx;
+ $tva_tx = $prodcustprice->lines [0]->tva_tx;
}
}
else
@@ -2019,7 +2019,7 @@ if ($action == 'create' && $user->rights->commande->creer)
} else {
// Remise dispo de type remise fixe (not credit note)
print ''.$langs->trans("ShowOrder").' ';
- if (!empty($this->ref)) {
- $label .= ''.$langs->trans('Ref').': '.$this->ref;
- }
- if (!empty($this->ref_client)) {
- $label .= ''.$langs->trans('RefCustomer').': '.$this->ref_client;
- }
+ $label .= ''.$langs->trans('Ref').': '.$this->ref;
+ $label .= ''.$langs->trans('RefCustomer').': '.($this->ref_customer ? $this->ref_customer : $this->ref_client);
if (!empty($this->total_ht)) {
$label .= ''.$langs->trans('AmountHT').': '.price($this->total_ht, 0, $langs, 0, -1, -1, $conf->currency);
}
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 455db14e3ed..87a95062323 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -161,41 +161,43 @@ $parameters=array('socid'=>$socid);
$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action); // Note that $action and $object may have been modified by some hooks
if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
-
-// Purge search criteria
-if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // All test are required to be compatible with all browsers
-{
- $search_categ='';
- $search_user='';
- $search_sale='';
- $search_product_category='';
- $search_ref='';
- $search_ref_customer='';
- $search_company='';
- $search_town='';
- $search_zip="";
- $search_state="";
- $search_type='';
- $search_country='';
- $search_type_thirdparty='';
- $search_total_ht='';
- $search_total_vat='';
- $search_total_ttc='';
- $orderyear='';
- $ordermonth='';
- $orderday='';
- $deliveryday='';
- $deliverymonth='';
- $deliveryyear='';
- $viewstatut='';
- $billed='';
- $toselect='';
- $search_array_options=array();
-}
-
if (empty($reshook))
{
+ // Selection of new fields
+ include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+
+ // Purge search criteria
+ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // All tests are required to be compatible with all browsers
+ {
+ $search_categ='';
+ $search_user='';
+ $search_sale='';
+ $search_product_category='';
+ $search_ref='';
+ $search_ref_customer='';
+ $search_company='';
+ $search_town='';
+ $search_zip="";
+ $search_state="";
+ $search_type='';
+ $search_country='';
+ $search_type_thirdparty='';
+ $search_total_ht='';
+ $search_total_vat='';
+ $search_total_ttc='';
+ $orderyear='';
+ $ordermonth='';
+ $orderday='';
+ $deliveryday='';
+ $deliverymonth='';
+ $deliveryyear='';
+ $viewstatut='';
+ $billed='';
+ $toselect='';
+ $search_array_options=array();
+ }
+
+ // Mass actions
$objectclass='Commande';
$objectlabel='Orders';
$permtoread = $user->rights->commande->lire;
@@ -205,7 +207,7 @@ if (empty($reshook))
}
-if($massaction == 'confirm_createbills') {
+if ($massaction == 'confirm_createbills') {
$orders = GETPOST('toselect');
$createbills_onebythird = GETPOST('createbills_onebythird', 'int');
@@ -1012,11 +1014,11 @@ if ($resql)
{
print '';
$liststatus=array(
- '0'=>$langs->trans("StatusOrderDraftShort"),
- '1'=>$langs->trans("StatusOrderValidated"),
- '2'=>$langs->trans("StatusOrderSentShort"),
- '3'=>$langs->trans("StatusOrderDelivered"),
- '-1'=>$langs->trans("StatusOrderCanceledShort")
+ Commande::STATUS_DRAFT=>$langs->trans("StatusOrderDraftShort"),
+ Commande::STATUS_VALIDATED=>$langs->trans("StatusOrderValidated"),
+ Commande::STATUS_ACCEPTED=>$langs->trans("StatusOrderSentShort"),
+ Commande::STATUS_CLOSED=>$langs->trans("StatusOrderDelivered"),
+ Commande::STATUS_CANCELED=>$langs->trans("StatusOrderCanceledShort")
);
print $form->selectarray('viewstatut', $liststatus, $viewstatut, -4);
print ' ';
diff --git a/htdocs/commande/stats/index.php b/htdocs/commande/stats/index.php
index 1f0f763bfd1..55b82d1063c 100644
--- a/htdocs/commande/stats/index.php
+++ b/htdocs/commande/stats/index.php
@@ -28,6 +28,7 @@
require '../../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
require_once DOL_DOCUMENT_ROOT.'/commande/class/commandestats.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formorder.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
$WIDTH=DolGraph::getDefaultGraphSizeForStats('width');
@@ -37,6 +38,8 @@ $mode=GETPOST("mode")?GETPOST("mode"):'customer';
if ($mode == 'customer' && ! $user->rights->commande->lire) accessforbidden();
if ($mode == 'supplier' && ! $user->rights->fournisseur->commande->lire) accessforbidden();
+$object_status=GETPOST('object_status');
+
$userid=GETPOST('userid','int');
$socid=GETPOST('socid','int');
// Security check
@@ -63,6 +66,7 @@ $langs->load('suppliers');
*/
$form=new Form($db);
+$formorder=new FormOrder($db);
if ($mode == 'customer')
{
@@ -82,9 +86,19 @@ print load_fiche_titre($title,'','title_commercial.png');
dol_mkdir($dir);
$stats = new CommandeStats($db, $socid, $mode, ($userid>0?$userid:0));
+if ($mode == 'customer')
+{
+ if ($object_status != '' && $object_status >= -1) $stats->where .= ' AND c.fk_statut IN ('.$object_status.')';
+}
+if ($mode == 'supplier')
+{
+ if ($object_status != '' && $object_status >= 0) $stats->where .= ' AND c.fk_statut IN ('.$object_status.')';
+}
+
// Build graphic number of object
$data = $stats->getNbByMonthWithPrevYear($endyear,$startyear);
+
//var_dump($data);
// $data = array(array('Lib',val1,val2,val3),...)
@@ -261,6 +275,24 @@ print '';
// User
print '
'.$langs->trans("CreatedBy").' ';
print $form->select_dolusers($userid, 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
+ // Status
+ print ' '.$langs->trans("Status").' ';
+ if ($mode == 'customer')
+ {
+ $liststatus=array(
+ Commande::STATUS_DRAFT=>$langs->trans("StatusOrderDraft"),
+ Commande::STATUS_VALIDATED=>$langs->trans("StatusOrderValidated"),
+ Commande::STATUS_ACCEPTED=>$langs->trans("StatusOrderSent"),
+ Commande::STATUS_CLOSED=>$langs->trans("StatusOrderDelivered"),
+ Commande::STATUS_CANCELED=>$langs->trans("StatusOrderCanceled")
+ );
+ print $form->selectarray('object_status', $liststatus, GETPOST('object_status'), -4);
+ }
+ if ($mode == 'supplier')
+ {
+ $formorder->selectSupplierOrderStatus((strstr($object_status, ',')?-1:$object_status), 0, 'object_status');
+ }
+ print ' ';
// Year
print '
'.$langs->trans("Year").' ';
if (! in_array($year,$arrayyears)) $arrayyears[$year]=$year;
diff --git a/htdocs/commande/tpl/linkedobjectblock.tpl.php b/htdocs/commande/tpl/linkedobjectblock.tpl.php
index 98e931db9f8..38efbc91ca2 100644
--- a/htdocs/commande/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/commande/tpl/linkedobjectblock.tpl.php
@@ -24,41 +24,60 @@
load("orders");
+$total=0; $ilink=0;
$var=true;
-$total=0;
foreach($linkedObjectBlock as $key => $objectlink)
{
- $var=!$var;
+ $ilink++;
+ $var=!$var;
+ $trclass=($var?'pair':'impair');
+ if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass.=' liste_sub_total';
?>
- >
- trans("CustomerOrder"); ?>
- getNomUrl(1); ?>
- ref_client; ?>
- date,'day'); ?>
- rights->commande->lire) {
- $total = $total + $objectlink->total_ht;
- echo price($objectlink->total_ht);
- } ?>
- getLibStatut(3); ?>
-
- element != 'shipping') {
- ?>
- ">transnoentitiesnoconv("RemoveLink")); ?>
-
-
-
+
+ trans("CustomerOrder"); ?>
+ getNomUrl(1); ?>
+ ref_client; ?>
+ date,'day'); ?>
+ rights->commande->lire) {
+ $total = $total + $objectlink->total_ht;
+ echo price($objectlink->total_ht);
+ } ?>
+ getLibStatut(3); ?>
+
+ element != 'shipping') {
+ ?>
+ ">transnoentitiesnoconv("RemoveLink")); ?>
+
+
+
1)
+{
+ ?>
+
+ trans("Total"); ?>
+
+
\ No newline at end of file
diff --git a/htdocs/compta/bank/bankentries.php b/htdocs/compta/bank/bankentries.php
index bb56c494854..20a5a2e8b85 100644
--- a/htdocs/compta/bank/bankentries.php
+++ b/htdocs/compta/bank/bankentries.php
@@ -108,14 +108,13 @@ if (! $sortfield) $sortfield='b.datev';
$mode_balance_ok=false;
//if (($sortfield == 'b.datev' || $sortfield == 'b.datev, b.dateo, b.rowid')) // TODO Manage balance when account not selected
-if (($sortfield == 'b.datev' || $sortfield == 'b.datev, b.dateo, b.rowid') && ($id > 0 || ! empty($ref)))
+if (($sortfield == 'b.datev' || $sortfield == 'b.datev, b.dateo, b.rowid'))
{
$sortfield = 'b.datev, b.dateo, b.rowid';
- $mode_balance_ok = true;
+ if ($id > 0 || ! empty($ref) || $account > 0) $mode_balance_ok = true;
}
if (strtolower($sortorder) == 'desc') $mode_balance_ok = false;
-
$object = new Account($db);
if ($id > 0 || ! empty($ref))
{
@@ -527,6 +526,9 @@ if ($page >= $nbtotalofpages)
if ($page < 0) $page = 0;
}
+// If not account defined $mode_balance_ok=false
+if (empty($account)) $mode_balance_ok=false;
+// If a search is done $mode_balance_ok=false
if (! empty($search_ref)) $mode_balance_ok=false;
if (! empty($req_nb)) $mode_balance_ok=false;
if (! empty($type)) $mode_balance_ok=false;
@@ -879,6 +881,12 @@ if ($resql)
// If we are in a situation where we need/can show balance, we calculate the start of balance
if (! $balancecalculated && ! empty($arrayfields['balance']['checked']) && $mode_balance_ok)
{
+ if (! $account)
+ {
+ dol_print_error('', 'account is not defined but $mode_balance_ok is true');
+ exit;
+ }
+
//Loop on each record
$sign = 1;
$i = 0;
diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index f786158ccbe..29f04d8f82d 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -1244,7 +1244,7 @@ class Account extends CommonObject
}
if ($withpicto) $result.=($link.img_object($label, 'account', 'class="classfortooltip"').$linkend.' ');
- $result.=$link.$this->label.$linkend;
+ $result.=$link.$this->ref.$linkend;
return $result;
}
diff --git a/htdocs/compta/bank/index.php b/htdocs/compta/bank/index.php
index 7d3073d7129..56735d15fce 100644
--- a/htdocs/compta/bank/index.php
+++ b/htdocs/compta/bank/index.php
@@ -39,6 +39,9 @@ $show_files=GETPOST('show_files','int');
$confirm=GETPOST('confirm','alpha');
$toselect = GETPOST('toselect', 'array');
+$search_ref=GETPOST('search_ref','alpha');
+$search_label=GETPOST('search_label','alpha');
+$search_number=GETPOST('search_number','alpha');
$statut=GETPOST('statut')?GETPOST('statut', 'alpha'):'opened'; // 'all' or ''='opened'
$optioncss = GETPOST('optioncss','alpha');
@@ -115,7 +118,10 @@ include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // All test are required to be compatible with all browsers
{
$statut = 'all';
-
+ $search_ref='';
+ $search_label='';
+ $search_number='';
+ $search_statut='';
}
@@ -124,6 +130,8 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETP
* View
*/
+$form=new Form($db);
+
$title=$langs->trans('BankAccounts');
// Load array of financial accounts (opened by default)
@@ -139,9 +147,11 @@ $sql.=$hookmanager->resPrint;
$sql.= " FROM ".MAIN_DB_PREFIX."bank_account as b";
if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."bankcacount_extrafields as ef on (c.rowid = ef.fk_object)";
$sql.= " WHERE entity IN (".getEntity('bank_account', 1).")";
-if ($statut == 'opened') $sql.= " AND clos = 0";
-if ($statut == 'closed') $sql.= " AND clos = 1";
-
+if ($statut == 'opened') $sql.= " AND clos = 0";
+if ($statut == 'closed') $sql.= " AND clos = 1";
+if ($search_ref != '') $sql.=natural_search('b.ref', $search_ref);
+if ($search_label != '') $sql.=natural_search('b.label', $search_label);
+if ($search_number != '') $sql.=natural_search('b.number', $search_number);
// Add where from extra fields
foreach ($search_array_options as $key => $val)
{
@@ -202,6 +212,9 @@ $arrayofselected=is_array($toselect)?$toselect:array();
$param='';
if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
+if ($search_ref != '') $param.='&search_ref='.$search_ref;
+if ($search_label != '') $param.='&search_label='.$search_label;
+if ($search_number != '') $param.='&search_number='.$search_number;
if ($statut != '') $param.='&statut='.$statut;
if ($show_files) $param.='&show_files=' .$show_files;
if ($optioncss != '') $param.='&optioncss='.$optioncss;
@@ -266,8 +279,8 @@ print '
';
if (! empty($arrayfields['b.ref']['checked'])) print_liste_field_titre($arrayfields['b.ref']['label'],$_SERVER["PHP_SELF"],'b.ref','',$param,'',$sortfield,$sortorder);
-if (! empty($arrayfields['accountype']['checked'])) print_liste_field_titre($arrayfields['accountype']['label'],$_SERVER["PHP_SELF"],'','',$param,'',$sortfield,$sortorder);
if (! empty($arrayfields['b.label']['checked'])) print_liste_field_titre($arrayfields['b.label']['label'],$_SERVER["PHP_SELF"],'b.label','',$param,'',$sortfield,$sortorder);
+if (! empty($arrayfields['accountype']['checked'])) print_liste_field_titre($arrayfields['accountype']['label'],$_SERVER["PHP_SELF"],'','',$param,'',$sortfield,$sortorder);
if (! empty($arrayfields['b.number']['checked'])) print_liste_field_titre($arrayfields['b.number']['label'],$_SERVER["PHP_SELF"],'b.number','',$param,'',$sortfield,$sortorder);
if (! empty($arrayfields['toreconcile']['checked'])) print_liste_field_titre($arrayfields['toreconcile']['label'],$_SERVER["PHP_SELF"],'','',$param,'align="center"',$sortfield,$sortorder);
if (! empty($arrayfields['b.clos']['checked'])) print_liste_field_titre($arrayfields['b.clos']['label'],$_SERVER["PHP_SELF"],'b.clos','',$param,'align="center"',$sortfield,$sortorder);
@@ -300,19 +313,19 @@ if (! empty($arrayfields['b.ref']['checked']))
print '';
- print ' ';
-}
-// Ref
+// Label
if (! empty($arrayfields['b.label']['checked']))
{
print '';
print ' ';
}
+// Account type
+if (! empty($arrayfields['accountype']['checked']))
+{
+ print '';
+ print ' ';
+}
// Number
if (! empty($arrayfields['b.number']['checked']))
{
@@ -403,10 +416,10 @@ foreach ($accounts as $key=>$type)
print '';
print ''.$acc->getNomUrl(1).' ';
+ print ''.$acc->label.' ';
print '';
print $acc->type_lib[$acc->type];
print ' ';
- print ''.$acc->bank.' ';
print ''.$acc->number.' ';
print '';
if ($acc->rappro)
@@ -421,7 +434,9 @@ foreach ($accounts as $key=>$type)
}
else print $langs->trans("FeatureDisabled");
print ' ';
- print ''.$acc->getLibStatut(2).' ';
+ // Status
+ print ''.$acc->getLibStatut(5).' ';
+ //
print '';
print ''.price($solde, 0, $langs, 0, 0, -1, $acc->currency_code).' ';
print ' ';
@@ -442,7 +457,7 @@ foreach ($accounts as $key=>$type)
$total[$acc->currency_code] += $solde;
//}
}
-if (! $found) print ' '.$langs->trans("None").' '.$langs->trans("None").' ';
print '
'.$langs->trans("CreatedBy").' ';
print $form->select_dolusers($userid, 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
print ' ';
+ // Status
+ print '
'.$langs->trans("Status").' ';
+ if ($mode == 'customer')
+ {
+ $liststatus=array('0'=>$langs->trans("BillStatusDraft"), '1'=>$langs->trans("BillStatusNotPaid"), '2'=>$langs->trans("BillStatusPaid"), '3'=>$langs->trans("BillStatusCanceled"));
+ print $form->selectarray('object_status', $liststatus, $object_status, 1);
+ }
+ if ($mode == 'supplier')
+ {
+ $liststatus=array('0'=>$langs->trans("BillStatusDraft"),'1'=>$langs->trans("BillStatusNotPaid"), '2'=>$langs->trans("BillStatusPaid"));
+ print $form->selectarray('object_status', $liststatus, $object_status, 1);
+ }
+ print ' ';
// Year
print '
'.$langs->trans("Year").' ';
if (! in_array($year,$arrayyears)) $arrayyears[$year]=$year;
diff --git a/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php b/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
index 56e8645b8c7..16aa54e229d 100644
--- a/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
@@ -24,32 +24,51 @@
load("bills");
+$total=0; $ilink=0;
$var=true;
-$total=0;
foreach($linkedObjectBlock as $key => $objectlink)
{
- $var=!$var;
+ $ilink++;
+ $var=!$var;
+ $trclass=($var?'pair':'impair');
+ if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass.=' liste_sub_total';
?>
- >
- trans("CustomerInvoice"); ?>
- getNomUrl(1); ?>
- ref_client; ?>
- date,'day'); ?>
- rights->facture->lire) {
- $total = $total + $objectlink->total_ht;
- echo price($objectlink->total_ht);
- } ?>
- getLibStatut(3); ?>
- ">transnoentitiesnoconv("RemoveLink")); ?>
+
+ trans("CustomerInvoice"); ?>
+ getNomUrl(1); ?>
+ ref_client; ?>
+ date,'day'); ?>
+ rights->facture->lire) {
+ $total = $total + $objectlink->total_ht;
+ echo price($objectlink->total_ht);
+ } ?>
+ getLibStatut(3); ?>
+ ">transnoentitiesnoconv("RemoveLink")); ?>
1)
+{
+ ?>
+
+ trans("Total"); ?>
+
+
\ No newline at end of file
diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php
index 1dd1c46299a..40e3b80a510 100644
--- a/htdocs/compta/index.php
+++ b/htdocs/compta/index.php
@@ -577,7 +577,7 @@ if (! empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
print '
';
print '';
- print ''.$langs->trans("ContributionsToPay").($num?' '.$num.' ':'').' ';
+ print ''.$langs->trans("ContributionsToPay").($num?' '.$num.' ';
print ''.$langs->trans("DateDue").' ';
print ''.$langs->trans("AmountTTC").' ';
print ''.$langs->trans("Paid").' ';
@@ -663,7 +663,7 @@ if (! empty($conf->facture->enabled) && ! empty($conf->commande->enabled) && $us
$i = 0;
print '';
print "";
- print ''.$langs->trans("OrdersToBill").' '.$num.' ';
+ print ''.$langs->trans("OrdersDeliveredToBill").' '.$num.' ';
if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print ''.$langs->trans("AmountHT").' ';
print ''.$langs->trans("AmountTTC").' ';
print ''.$langs->trans("ToBill").' ';
diff --git a/htdocs/compta/sociales/index.php b/htdocs/compta/sociales/index.php
index fc106de2ad1..6a4f7f836e7 100644
--- a/htdocs/compta/sociales/index.php
+++ b/htdocs/compta/sociales/index.php
@@ -40,6 +40,7 @@ $result = restrictedArea($user, 'tax', '', '', 'charges');
$search_ref = GETPOST('search_ref','int');
$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;
$sortfield = GETPOST("sortfield",'alpha');
@@ -52,8 +53,8 @@ $pagenext = $page + 1;
if (! $sortfield) $sortfield="cs.date_ech";
if (! $sortorder) $sortorder="DESC";
-$year=$_GET["year"];
-$filtre=$_GET["filtre"];
+$year=GETPOST("year",'int');
+$filtre=GETPOST("filtre",'int');
if (empty($_REQUEST['typeid']))
{
@@ -75,6 +76,7 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETP
$search_ref="";
$search_label="";
$search_amount="";
+ $search_status='';
$typeid="";
$year="";
$month="";
@@ -88,7 +90,7 @@ $form = new Form($db);
$formsocialcontrib = new FormSocialContrib($db);
$chargesociale_static=new ChargeSociales($db);
-llxHeader();
+llxHeader('', $langs->trans("SocialContributions"));
$sql = "SELECT cs.rowid as id, cs.fk_type as type, ";
$sql.= " cs.amount, cs.date_ech, cs.libelle, cs.paye, cs.periode,";
@@ -99,11 +101,11 @@ $sql.= " ".MAIN_DB_PREFIX."chargesociales as cs";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."paiementcharge as pc ON pc.fk_charge = cs.rowid";
$sql.= " WHERE cs.fk_type = c.id";
$sql.= " AND cs.entity = ".$conf->entity;
-
// Search criteria
-if ($search_ref) $sql.=" AND cs.rowid=".$search_ref;
+if ($search_ref) $sql.=" AND cs.rowid=".$db->escape($search_ref);
if ($search_label) $sql.=natural_search("cs.libelle", $search_label);
if ($search_amount) $sql.=natural_search("cs.amount", price2num(trim($search_amount)), 1);
+if ($search_status != '' && $search_status >= 0) $sql.=" AND cs.paye = ".$db->escape($search_status);
if ($year > 0)
{
$sql .= " AND (";
@@ -118,7 +120,7 @@ if ($filtre) {
$sql .= " AND ".$filtre;
}
if ($typeid) {
- $sql .= " AND cs.fk_type=".$typeid;
+ $sql .= " AND cs.fk_type=".$db->escape($typeid);
}
$sql.= " GROUP BY cs.rowid, cs.fk_type, cs.amount, cs.date_ech, cs.libelle, cs.paye, cs.periode, c.libelle";
$sql.= $db->order($sortfield,$sortorder);
@@ -204,7 +206,10 @@ if ($resql)
print '';
print ' ';
// Status
- print ' ';
+ print '';
+ $liststatus=array('0'=>$langs->trans("Unpaid"), '1'=>$langs->trans("Paid"));
+ print $form->selectarray('search_status', $liststatus, $search_status, 1);
+ print ' ';
print '';
$searchpitco=$form->showFilterAndCheckAddButtons(0);
diff --git a/htdocs/conf/conf.php.example b/htdocs/conf/conf.php.example
index aab5290a663..83dbd300f60 100644
--- a/htdocs/conf/conf.php.example
+++ b/htdocs/conf/conf.php.example
@@ -134,7 +134,7 @@ $dolibarr_main_db_type='';
// dolibarr_main_db_character_set
-// Database character set used to store data (forced during database creation).
+// Database character set used to store data (forced during database creation. value of database is then used).
// Default value: depends on database driver
// Examples:
// dolibarr_main_db_character_set='utf8';
@@ -143,12 +143,12 @@ $dolibarr_main_db_character_set='utf8';
// dolibarr_main_db_collation
-// Database character set used to sort data (forced during database creation).
+// Database character set used to sort data (forced during database creation. value of database is then used).
// Default value: depends on database driver
// Examples:
-// dolibarr_main_db_collation='utf8_general_ci';
+// dolibarr_main_db_collation='utf8_unicode_ci';
//
-$dolibarr_main_db_collation='utf8_general_ci';
+$dolibarr_main_db_collation='utf8_unicode_ci';
diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php
index 23242559f1f..a2f97d9ad93 100644
--- a/htdocs/contact/card.php
+++ b/htdocs/contact/card.php
@@ -1254,9 +1254,9 @@ else
print load_fiche_titre($langs->trans("TasksHistoryForThisContact"),$out,'');
- print show_actions_todo($conf,$langs,$db,$objsoc,$object);
+ //print show_actions_todo($conf,$langs,$db,$objsoc,$object);
- print show_actions_done($conf,$langs,$db,$objsoc,$object);
+ print show_actions_done($conf,$langs,$db,$objsoc,$object,0,'','');
}
}
}
diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index 4e045ccd449..cd45378ba86 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -123,15 +123,16 @@ class Contact extends CommonObject
$sql = "SELECT count(sp.rowid) as nb";
$sql.= " FROM ".MAIN_DB_PREFIX."socpeople as sp";
- $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON (sp.fk_soc = s.rowid)";
if (!$user->rights->societe->client->voir && !$user->societe_id)
{
- $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
+ $sql.= " OUTER JOIN ".MAIN_DB_PREFIX."societe as s ON sp.fk_soc = s.rowid";
+ $sql.= " OUTER JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
$sql.= " WHERE sc.fk_user = " .$user->id;
$clause = "AND";
}
- $sql.= ' '.$clause.' s.entity IN ('.getEntity($this->element, 1).')';
-
+ $sql.= ' '.$clause.' sp.entity IN ('.getEntity($this->element, 1).')';
+ if ($user->societe_id > 0) $sql.=" AND sp.fk_soc = ".$user->societe_id;
+
$resql=$this->db->query($sql);
if ($resql)
{
diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index b8c96884e96..7b2e5528eb6 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -165,39 +165,51 @@ if (($id > 0 || ! empty($ref)) && $action != 'add')
* Actions
*/
+if (GETPOST('cancel')) { $action='list'; $massaction=''; }
+if (! GETPOST('confirmmassaction') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction=''; }
+
$parameters=array();
$reshook=$hookmanager->executeHooks('doActions',$parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
-
if (empty($reshook))
{
-
+ // Selection of new fields
+ include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+
+ // Purge search criteria
+ if (GETPOST('button_removefilter_x') || GETPOST('button_removefilter.x') || GETPOST('button_removefilter')) // All tests are required to be compatible with all browsers
+ {
+ $sall="";
+ $search_firstlast_only="";
+ $search_lastname="";
+ $search_firstname="";
+ $search_societe="";
+ $search_poste="";
+ $search_phone="";
+ $search_phone_perso="";
+ $search_phone_pro="";
+ $search_phone_mobile="";
+ $search_fax="";
+ $search_email="";
+ $search_skype="";
+ $search_priv="";
+ $search_status=-1;
+ $search_categ='';
+ $search_categ_thirdparty='';
+ $search_categ_supplier='';
+ $search_array_options=array();
+ }
+
+ // Mass actions
+ $objectclass='Contact';
+ $objectlabel='Contact';
+ $permtoread = $user->rights->societe->lire;
+ $permtodelete = $user->rights->societe->delete;
+ $uploaddir = $conf->societe->dir_output;
+ include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
}
-if (GETPOST('button_removefilter_x') || GETPOST('button_removefilter.x') || GETPOST('button_removefilter')) // All tests are required to be compatible with all browsers
-{
- $sall="";
- $search_firstlast_only="";
- $search_lastname="";
- $search_firstname="";
- $search_societe="";
- $search_poste="";
- $search_phone="";
- $search_phone_perso="";
- $search_phone_pro="";
- $search_phone_mobile="";
- $search_fax="";
- $search_email="";
- $search_skype="";
- $search_priv="";
- $search_status=-1;
- $search_categ='';
- $search_categ_thirdparty='';
- $search_categ_supplier='';
- $search_array_options=array();
-}
if ($search_priv < 0) $search_priv='';
@@ -210,7 +222,6 @@ $formother=new FormOther($db);
$contactstatic=new Contact($db);
$title = (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("Contacts") : $langs->trans("ContactsAddresses"));
-llxHeader('',$title,'EN:Module_Third_Parties|FR:Module_Tiers|ES:Módulo_Empresas');
$sql = "SELECT s.rowid as socid, s.nom as name,";
$sql.= " p.rowid as cidp, p.lastname as lastname, p.statut, p.firstname, p.zip, p.town, p.poste, p.email, p.skype,";
@@ -343,7 +354,6 @@ foreach ($search_array_options as $key => $val)
$parameters=array();
$reshook=$hookmanager->executeHooks('printFieldListWhere',$parameters); // Note that $action and $object may have been modified by hook
$sql.=$hookmanager->resPrint;
-
// Add order
if ($view == "recent")
{
@@ -367,219 +377,371 @@ $sql.= $db->plimit($limit+1, $offset);
//print $sql;
dol_syslog("contact/list.php", LOG_DEBUG);
$result = $db->query($sql);
-if ($result)
+if (! $result)
{
- $num = $db->num_rows($result);
- $i = 0;
+ dol_print_error($db);
+ exit;
+}
- $param='';
- if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
- if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
- $param.='&begin='.urlencode($begin).'&view='.urlencode($view).'&userid='.urlencode($userid).'&contactname='.urlencode($sall);
- $param.='&type='.urlencode($type).'&view='.urlencode($view);
- if (!empty($search_categ)) $param.='&search_categ='.urlencode($search_categ);
- if (!empty($search_categ_thirdparty)) $param.='&search_categ_thirdparty='.urlencode($search_categ_thirdparty);
- if (!empty($search_categ_supplier)) $param.='&search_categ_supplier='.urlencode($search_categ_supplier);
- if ($sall != '') $param.='&sall='.urlencode($sall);
- if ($search_lastname != '') $param.='&search_lastname='.urlencode($search_lastname);
- if ($search_firstname != '') $param.='&search_firstname='.urlencode($search_firstname);
- if ($search_societe != '') $param.='&search_societe='.urlencode($search_societe);
- if ($search_zip != '') $param.='&search_zip='.urlencode($search_zip);
- if ($search_town != '') $param.='&search_town='.urlencode($search_town);
- if ($search_job != '') $param.='&search_job='.urlencode($search_job);
- if ($search_phone_pro != '') $param.='&search_phone_pro='.urlencode($search_phone_pro);
- if ($search_phone_perso != '') $param.='&search_phone_perso='.urlencode($search_phone_perso);
- if ($search_phone_mobile != '') $param.='&search_phone_mobile='.urlencode($search_phone_mobile);
- if ($search_fax != '') $param.='&search_fax='.urlencode($search_fax);
- if ($search_email != '') $param.='&search_email='.urlencode($search_email);
- if ($search_status != '') $param.='&search_status='.urlencode($search_status);
- if ($search_priv == '0' || $search_priv == '1') $param.="&search_priv=".urlencode($search_priv);
- if ($optioncss != '') $param.='&optioncss='.$optioncss;
- // Add $param from extra fields
- foreach ($search_array_options as $key => $val)
- {
- $crit=$val;
- $tmpkey=preg_replace('/search_options_/','',$key);
- if ($val != '') $param.='&search_options_'.$tmpkey.'='.urlencode($val);
- }
-
- print '';
+
+$db->free($result);
llxFooter();
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 86e45ade086..3c29f4e8fca 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -494,7 +494,7 @@ if (empty($reshook))
$pu_ht = price($prodcustprice->lines [0]->price);
$pu_ttc = price($prodcustprice->lines [0]->price_ttc);
$price_base_type = $prodcustprice->lines [0]->price_base_type;
- $prod->tva_tx = $prodcustprice->lines [0]->tva_tx;
+ $tva_tx = $prodcustprice->lines [0]->tva_tx;
}
}
}
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index cdd8b89a1ad..e3e899eceba 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -3280,7 +3280,7 @@ abstract class CommonObject
{
global $conf, $hookmanager, $langs, $user;
// TODO We should not use global var for this !
- global $inputalsopricewithtax, $usemargins, $disableedit, $disablemove, $disableremove;
+ global $inputalsopricewithtax, $usemargins, $disableedit, $disablemove, $disableremove, $outputalsopricetotalwithtax;
// Define usemargins
$usemargins=0;
@@ -3343,6 +3343,8 @@ abstract class CommonObject
// Multicurrency
if (!empty($conf->multicurrency->enabled)) print ' '.$langs->trans('TotalHTShortCurrency').' ';
+ if ($outputalsopricetotalwithtax) print ''.$langs->trans('TotalTTCShort').' ';
+
print ' ';
+ $out .= ' ';
+ $out .= ' ';
- $numoutput=0;
+ $nboftypesoutput=0;
foreach($object->linkedObjects as $objecttype => $objects)
{
@@ -5286,23 +5292,28 @@ class Form
$dirtpls=array_merge($conf->modules_parts['tpl'],array('/'.$tplpath.'/tpl'));
foreach($dirtpls as $reldir)
{
+ if ($nboftypesoutput == ($nbofdifferenttypes - 1)) // No more type to show after
+ {
+ global $noMoreLinkedObjectBlockAfter;
+ $noMoreLinkedObjectBlockAfter=1;
+ }
$res=@include dol_buildpath($reldir.'/'.$tplname.'.tpl.php');
if ($res)
{
- $numoutput++;
+ $nboftypesoutput++;
break;
}
}
}
- if (! $numoutput)
+ if (! $nboftypesoutput)
{
print ''.$langs->trans("None").'
';
- return $num;
+ return $nbofdifferenttypes;
}
}
@@ -5555,8 +5566,8 @@ class Form
//$previous_ref = $object->ref_previous?''.(empty($conf->dol_use_jmobile)?img_picto($langs->trans("Previous"),'previous.png'):' ').' ':'';
//$next_ref = $object->ref_next?''.(empty($conf->dol_use_jmobile)?img_picto($langs->trans("Next"),'next.png'):' ').' ':'';
- $previous_ref = $object->ref_previous?''.(empty($conf->dol_use_jmobile)?'<':' ').' ':''.(empty($conf->dol_use_jmobile)?'<':' ').' ';
- $next_ref = $object->ref_next?''.(empty($conf->dol_use_jmobile)?'>':' ').' ':''.(empty($conf->dol_use_jmobile)?'>':' ').' ';
+ $previous_ref = $object->ref_previous?''.(($conf->dol_use_jmobile != 4)?'<':' ').' ':''.(($conf->dol_use_jmobile != 4)?'<':' ').' ';
+ $next_ref = $object->ref_next?''.(($conf->dol_use_jmobile != 4)?'>':' ').' ':''.(($conf->dol_use_jmobile != 4)?'>':' ').' ';
//print "xx".$previous_ref."x".$next_ref;
$ret.='';
diff --git a/htdocs/core/class/html.formactions.class.php b/htdocs/core/class/html.formactions.class.php
index 503c1fbb739..16b63c16601 100644
--- a/htdocs/core/class/html.formactions.class.php
+++ b/htdocs/core/class/html.formactions.class.php
@@ -180,7 +180,10 @@ class FormActions
elseif ($typeelement == 'fichinter') $title=$langs->trans('ActionsOnFicheInter');
else $title=$langs->trans("Actions");
- print load_fiche_titre($title,'','');
+ $buttontoaddnewevent = '
';
+ $buttontoaddnewevent.= $langs->trans("AddEvent");
+ $buttontoaddnewevent.= ' ';
+ print load_fiche_titre($title, $buttontoaddnewevent, '');
$page=0; $param=''; $sortfield='a.datep';
@@ -250,13 +253,13 @@ class FormActions
* @param array|string $selected Type pre-selected (can be 'manual', 'auto' or 'AC_xxx'). Can be an array too.
* @param string $htmlname Name of select field
* @param string $excludetype A type to exclude ('systemauto', 'system', '')
- * @param integer $onlyautoornot 1=Group all type AC_XXX into 1 line AC_MANUAL. 0=Keep details of type
+ * @param integer $onlyautoornot 1=Group all type AC_XXX into 1 line AC_MANUAL. 0=Keep details of type, -1=Keep details and add a combined line "All manual"
* @param int $hideinfohelp 1=Do not show info help, 0=Show, -1=Show+Add info to tell how to set default value
* @param int $multiselect 1=Allow multiselect of action type
* @param int $nooutput 1=No output
* @return string
*/
- function select_type_actions($selected='',$htmlname='actioncode',$excludetype='',$onlyautoornot=0, $hideinfohelp=0, $multiselect=0, $nooutput=0)
+ function select_type_actions($selected='', $htmlname='actioncode', $excludetype='', $onlyautoornot=0, $hideinfohelp=0, $multiselect=0, $nooutput=0)
{
global $langs,$user,$form,$conf;
diff --git a/htdocs/core/class/html.formcompany.class.php b/htdocs/core/class/html.formcompany.class.php
index ef9141dbc94..ac800d480fc 100644
--- a/htdocs/core/class/html.formcompany.class.php
+++ b/htdocs/core/class/html.formcompany.class.php
@@ -358,9 +358,10 @@ class FormCompany
*
* @param string $selected Title preselected
* @param string $htmlname Name of HTML select combo field
+ * @param string $morecss Add more css on SELECT element
* @return string String with HTML select
*/
- function select_civility($selected='',$htmlname='civility_id')
+ function select_civility($selected='',$htmlname='civility_id',$morecss='maxwidth100')
{
global $conf,$langs,$user;
$langs->load("dict");
@@ -374,7 +375,7 @@ class FormCompany
$resql=$this->db->query($sql);
if ($resql)
{
- $out.= '
';
+ $out.= '';
$out.= ' ';
$num = $this->db->num_rows($resql);
$i = 0;
@@ -724,9 +725,10 @@ class FormCompany
* @param int $fieldsize Field size
* @param int $disableautocomplete 1 To disable ajax autocomplete features (browser autocomplete may still occurs)
* @param string $moreattrib Add more attribute on HTML input field
+ * @param string $morecss More css
* @return string
*/
- function select_ziptown($selected='', $htmlname='zipcode', $fields='', $fieldsize=0, $disableautocomplete=0, $moreattrib='')
+ function select_ziptown($selected='', $htmlname='zipcode', $fields='', $fieldsize=0, $disableautocomplete=0, $moreattrib='',$morecss='')
{
global $conf;
@@ -740,7 +742,7 @@ class FormCompany
$out.= ajax_multiautocompleter($htmlname,$fields,DOL_URL_ROOT.'/core/ajax/ziptown.php')."\n";
$moreattrib.=' autocomplete="off"';
}
- $out.= ''.$formfile->getDocumentsLink($element_doc, $filename, $filedir).'
';
*
* @param string $modulepart propal, facture, facture_fourn, ...
* @param string $modulesubdir Sub-directory to scan (Example: '0/1/10', 'FA/DD/MM/YY/9999'). Use '' if file is not into subdir of module.
diff --git a/htdocs/core/class/html.formpropal.class.php b/htdocs/core/class/html.formpropal.class.php
index 57dd6336a43..2cfeaadd368 100644
--- a/htdocs/core/class/html.formpropal.class.php
+++ b/htdocs/core/class/html.formpropal.class.php
@@ -50,9 +50,10 @@ class FormPropal
* @param int $excludedraft 0=All status, 1=Exclude draft status
* @param int $showempty 1=Add empty line
* @param string $mode 'customer', 'supplier'
+ * @param string $htmlname Name of select field
* @return void
*/
- function selectProposalStatus($selected='',$short=0, $excludedraft=0, $showempty=1, $mode='customer')
+ function selectProposalStatus($selected='',$short=0, $excludedraft=0, $showempty=1, $mode='customer',$htmlname='propal_statut')
{
global $langs;
@@ -63,7 +64,13 @@ class FormPropal
$prefix='SupplierProposalStatus';
$langs->load("supplier_proposal");
- $listofstatus=array(0=>array('code'=>'PR_DRAFT'), 1=>array('code'=>'PR_OPEN'), 2=>array('code'=>'PR_SIGNED'), 3=>array('code'=>'PR_NOTSIGNED'), 4=>array('code'=>'PR_CLOSED'));
+ $listofstatus=array(
+ 0=>array('id'=>0, 'code'=>'PR_DRAFT'),
+ 1=>array('id'=>1, 'code'=>'PR_OPEN'),
+ 2=>array('id'=>2, 'code'=>'PR_SIGNED'),
+ 3=>array('id'=>3, 'code'=>'PR_NOTSIGNED'),
+ 4=>array('id'=>4, 'code'=>'PR_CLOSED')
+ );
}
else
{
@@ -93,7 +100,7 @@ class FormPropal
}
}
- print '';
+ print '';
if ($showempty) print ' ';
foreach($listofstatus as $key => $obj)
@@ -115,15 +122,16 @@ class FormPropal
print '';
}
$key=$obj['code'];
- if ($langs->trans($prefix."PropalStatus".$key.($short?'Short':'')) != $prefix."PropalStatus".$key.($short?'Short':''))
+ if ($langs->trans($prefix.$key.($short?'Short':'')) != $prefix.$key.($short?'Short':''))
{
- print $langs->trans($prefix."PropalStatus".$key.($short?'Short':''));
+ print $langs->trans($prefix.$key.($short?'Short':''));
}
else
{
- $conv_to_new_code=array('PR_DRAFT'=>'Draft','PR_OPEN'=>'Opened','PR_CLOSED'=>'Closed','PR_SIGNED'=>'Signed','PR_NOTSIGNED'=>'NotSigned','PR_FAC'=>'Billed');
+ $conv_to_new_code=array('PR_DRAFT'=>'Draft','PR_OPEN'=>'Validated','PR_CLOSED'=>'Closed','PR_SIGNED'=>'Signed','PR_NOTSIGNED'=>'NotSigned','PR_FAC'=>'Billed');
if (! empty($conv_to_new_code[$obj['code']])) $key=$conv_to_new_code[$obj['code']];
- print ($langs->trans($prefix.$key.($short?'Short':''))!=$prefix.$key.($short?'Short':''))?$langs->trans($prefix.$key.($short?'Short':'')):$obj['label'];
+
+ print ($langs->trans($prefix.$key.($short?'Short':''))!=$prefix.$key.($short?'Short':''))?$langs->trans($prefix.$key.($short?'Short':'')):($obj['label']?$obj['label']:$obj['code']);
}
print ' ';
$i++;
diff --git a/htdocs/core/class/html.formsupplier_proposal.class.php b/htdocs/core/class/html.formsupplier_proposal.class.php
deleted file mode 100644
index ed8781731a0..00000000000
--- a/htdocs/core/class/html.formsupplier_proposal.class.php
+++ /dev/null
@@ -1,104 +0,0 @@
-
- *
- * 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 ';
- print ' ';
- $num = $this->db->num_rows($resql);
- $i = 0;
- if ($num)
- {
- while ($i < $num)
- {
- $obj = $this->db->fetch_object($resql);
- if ($selected == $obj->id)
- {
- print '';
- }
- else
- {
- print ' ';
- }
- $key=$obj->code;
- if ($langs->trans("PropalStatus".$key.($short?'Short':'')) != "PropalStatus".$key.($short?'Short':''))
- {
- print $langs->trans("PropalStatus".$key.($short?'Short':''));
- }
- else
- {
- $conv_to_new_code=array('PR_DRAFT'=>'Draft','PR_OPEN'=>'Opened','PR_CLOSED'=>'Closed','PR_SIGNED'=>'Signed','PR_NOTSIGNED'=>'NotSigned','PR_FAC'=>'Closed');
- if (! empty($conv_to_new_code[$obj->code])) $key=$conv_to_new_code[$obj->code];
- print ($langs->trans("PropalStatus".$key.($short?'Short':''))!="PropalStatus".$key.($short?'Short':''))?$langs->trans("PropalStatus".$key.($short?'Short':'')):$obj->label;
- }
- print ' ';
- $i++;
- }
- }
- print ' ';
- }
- else
- {
- dol_print_error($this->db);
- }
- }
-
-}
-
diff --git a/htdocs/core/db/DoliDB.class.php b/htdocs/core/db/DoliDB.class.php
index b8038056484..c63227e1601 100644
--- a/htdocs/core/db/DoliDB.class.php
+++ b/htdocs/core/db/DoliDB.class.php
@@ -36,7 +36,7 @@ abstract class DoliDB implements Database
/** @var string Charset used to force charset when creating database */
public $forcecharset='utf8';
/** @var string Collate used to force collate when creating database */
- public $forcecollate='utf8_general_ci';
+ public $forcecollate='utf8_unicode_ci';
/** @var resource Resultset of last query */
private $_results;
/** @var bool true if connected, else false */
diff --git a/htdocs/core/db/mysqli.class.php b/htdocs/core/db/mysqli.class.php
index 087abf709d9..d7ff764ce7a 100644
--- a/htdocs/core/db/mysqli.class.php
+++ b/htdocs/core/db/mysqli.class.php
@@ -854,7 +854,7 @@ class DoliDBMysqli extends DoliDB
}
/**
- * Return charset used to store data in database
+ * Return charset used to store data in current database (same result than using SELECT default_character_set_name FROM information_schema.SCHEMATA WHERE schema_name = "databasename";)
*
* @return string Charset
*/
@@ -897,7 +897,7 @@ class DoliDBMysqli extends DoliDB
}
/**
- * Return collation used in database
+ * Return collation used in current database
*
* @return string Collation value
*/
diff --git a/htdocs/core/lib/agenda.lib.php b/htdocs/core/lib/agenda.lib.php
index cdc45de825e..57a4c03c63f 100644
--- a/htdocs/core/lib/agenda.lib.php
+++ b/htdocs/core/lib/agenda.lib.php
@@ -108,7 +108,7 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh
{
$multiselect=(!empty($conf->global->AGENDA_USE_EVENT_TYPE));
}
- print $formactions->select_type_actions($actioncode, "actioncode", $excludetype, (empty($conf->global->AGENDA_USE_EVENT_TYPE)?1:0), 0, $multiselect);
+ print $formactions->select_type_actions($actioncode, "actioncode", $excludetype, (empty($conf->global->AGENDA_USE_EVENT_TYPE)?1:-1), 0, $multiselect);
print ' ';
}
diff --git a/htdocs/core/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php
index 4b0ae91ee3f..3914b59b9f6 100644
--- a/htdocs/core/lib/ajax.lib.php
+++ b/htdocs/core/lib/ajax.lib.php
@@ -322,7 +322,8 @@ function ajax_dialog($title,$message,$w=350,$h=150)
{
global $langs;
- $msg= '';
+ $newtitle=dol_textishtml($title)?dol_string_nohtmltag($title,1):$title;
+ $msg= '
';
$msg.= $message;
$msg.= '
'."\n";
$msg.= '';
- }
- if (empty($conf->dol_use_jmobile) || $conf->dol_use_jmobile != 3) print ''."\n";
+ // 3=???
+ // 4=all pages, not only menu
+ $tmp=basename($_SERVER["PHP_SELF"]);
+ if ($tmp == 'get_menudiv.php' || $conf->dol_use_jmobile == 4)
+ {
+ if (empty($conf->dol_use_jmobile) || ($conf->dol_use_jmobile != 2 && $conf->dol_use_jmobile != 3))
+ {
+ print '';
+ }
+ if (empty($conf->dol_use_jmobile) || $conf->dol_use_jmobile != 3) print ''."\n";
+ }
}
}
@@ -1878,7 +1887,7 @@ if (! function_exists("llxFooter"))
print '
'.$msg.'
';
}
- define("MAIN_CORE_ERROR",0);
+ //define("MAIN_CORE_ERROR",0); // Constant was defined and we can't change value of a constant
}
print "\n\n";
@@ -1898,7 +1907,7 @@ if (! function_exists("llxFooter"))
if (! empty($delayedhtmlcontent)) print $delayedhtmlcontent;
// Wrapper to show tooltips
- if ($conf->use_javascript_ajax)
+ if (! empty($conf->use_javascript_ajax) && empty($conf->dol_no_mouse_hover))
{
print "\n\n";
print '
+
@@ -52,9 +54,26 @@ if (empty($usedolheader))
}
else
{
- $arraycss=array();
- $arrayjs=array();
-
+ $arraycss=array();
+ $arrayjs=array();
+ /*
+ $arraycss=array('/includes/jquery/plugins/datatables/media/css/jquery.dataTables.css',
+ '/includes/jquery/plugins/datatables/extensions/Buttons/css/buttons.dataTables.min.css',
+ '/includes/jquery/plugins/datatables/extensions/ColReorder/css/colReorder.dataTables.min.css'
+ );
+ $arrayjs=array('/includes/jquery/plugins/datatables/media/js/jquery.dataTables.js',
+ '/includes/jquery/plugins/datatables/extensions/Buttons/js/dataTables.buttons.js',
+ '/includes/jquery/plugins/datatables/extensions/Buttons/js/buttons.colVis.min.js',
+ '/includes/jquery/plugins/datatables/extensions/Buttons/js/buttons.html5.min.js',
+ '/includes/jquery/plugins/datatables/extensions/Buttons/js/buttons.flash.min.js',
+ '/includes/jquery/plugins/datatables/extensions/Buttons/js/buttons.print.min.js',
+ '/includes/jquery/plugins/datatables/extensions/ColReorder/js/dataTables.colReorder.min.js',
+ '/includes/jszip/jszip.min.js',
+ '/includes/pdfmake/pdfmake.min.js',
+ '/includes/pdfmake/vfs_fonts.js'
+ );
+ */
+
llxHeader('','','','',0,0,$arrayjs,$arraycss);
}
@@ -66,9 +85,9 @@ else
This page is a sample of page using tables. It is designed to make test with">dol_use_jmobile=1&dol_optimize_smallscreen=1 and switch to small screen < 960 to enable view with jmobile)">dol_use_jmobile=4&dol_optimize_smallscreen=1 and switch to small screen < 1000 to enable view with jmobile)">dol_use_jmobile=1&dol_optimize_smallscreen=1 and switch to small screen < 570 to enable with emulated jmobile)">nojs=1 to force disable javascript)
@@ -79,10 +98,10 @@ This page is a sample of page using tables. It is designed to make test with
- aaaaaaaaaaaaaaafd sf sf gfd gfds fsd gfd fhfg hf dhfg hg fhfgdhfgdh gh gfdhdgf h gfdh dfhg dfgh dfgh fdgh gfd hfd hfd gs fgdf gaaaa gdfs gdf g sdfg dfg fdsg dsfg dfs gdfs gds fgs gdfdf gd aaaaaaaaaaaaaaafd sf sf gfd gfds fsd gfd fhfg hf dhfg hg fhfgdhfgdh gh gfdhdgf h gfdh dfhg dfgh dfgh fdgh gfd hfd hfd gs fgdf gaaaa gdfs gdf g sdfg dfg fdsg dsfg dfs gdfs gds fgs gdfdf gd
- aaaaaaaaaaaaaaafd sf sf gfd gfds fsd gfd fhfg hf dhfg hg fhfgdhfgdh gh gfdhdgf h gfdh dfhg dfgh dfgh fdgh gfd hfd hfd gs fgdf gaaaa gdfs gdf g sdfg dfg fdsg dsfg dfs gdfs gds fgs gdfdf gd aaaaaaaaaaaaaaafd sf sf gfd gfds fsd gfd fhfg hf dhfg hg fhfgdhfgdh gh gfdhdgf h gfdh dfhg dfgh dfgh fdgh gfd hfd hfd gs fgdf gaaaa gdfs gdf g sdfg dfg fdsg dsfg dfs gdfs gds fgs gdfdf gd
@@ -92,10 +111,10 @@ This page is a sample of page using tables. It is designed to make test with
@@ -105,10 +124,10 @@ This page is a sample of page using tables. It is designed to make test with
- aaaaaaaaaaaaaaafd sf sf gfd gfds fsd gfd fhfg hf dhfg hg fhfgdhfgdh gh gfdhdgf h gfdh dfhg dfgh dfgh fdgh gfd hfd hfd gs fgdf gaaaa gdfs gdf g sdfg dfg fdsg dsfg dfs gdfs gds fgs gdfdf gd aaaaaaaaaaaaaaafd sf sf gfd gfds fsd gfd fhfg hf dhfg hg fhfgdhfgdh gh gfdhdgf h gfdh dfhg dfgh dfgh fdgh gfd hfd hfd gs fgdf gaaaa gdfs gdf g sdfg dfg fdsg dsfg dfs gdfs gds fgs gdfdf gd
- aaaaaaaaaaaaaaafd sf sf gfd gfds fsd gfd fhfg hf dhfg hg fhfgdhfgdh gh gfdhdgf h gfdh dfhg dfgh dfgh fdgh gfd hfd hfd gs fgdf gaaaa gdfs gdf g sdfg dfg fdsg dsfg dfs gdfs gds fgs gdfdf gd aaaaaaaaaaaaaaafd sf sf gfd gfds fsd gfd fhfg hf dhfg hg fhfgdhfgdh gh gfdhdgf h gfdh dfhg dfgh dfgh fdgh gfd hfd hfd gs fgdf gaaaa gdfs gdf g sdfg dfg fdsg dsfg dfs gdfs gds fgs gdfdf gd
diff --git a/htdocs/public/test/test_forms.php b/htdocs/public/test/test_forms.php
index a697b371438..a53f812611a 100644
--- a/htdocs/public/test/test_forms.php
+++ b/htdocs/public/test/test_forms.php
@@ -17,7 +17,8 @@ llxHeader();
This page is a sample of page using Dolibarr HTML widget methods. It is designed to make test with">dol_use_jmobile=1&dol_optimize_smallscreen=1 to enable view with jmobile)">dol_use_jmobile=4&dol_optimize_smallscreen=1 and switch to small screen < 1000 to enable view with jmobile)">dol_use_jmobile=1&dol_optimize_smallscreen=1 and switch to small screen < 570 to enable with emulated jmobile)">nojs=1 to force disable javascript)
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 40ef1e6c896..6acae492c33 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -181,54 +181,58 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
* Actions
*/
+if (GETPOST('cancel')) { $action='list'; $massaction=''; }
+if (! GETPOST('confirmmassaction') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction=''; }
+
$parameters=array();
$reshook=$hookmanager->executeHooks('doActions',$parameters); // Note that $action and $object may have been modified by some hooks
if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
-
if (empty($reshook))
{
- if ($action == 'setstcomm')
- {
- $object = new Client($db);
- $result=$object->fetch(GETPOST('stcommsocid'));
- $object->stcomm_id=dol_getIdFromCode($db, GETPOST('stcomm','alpha'), 'c_stcomm');
- $result=$object->update($object->id, $user);
- if ($result < 0) setEventMessages($object->error,$object->errors,'errors');
+ // Selection of new fields
+ include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
- $action='';
- }
-}
+ // Do we click on purge search criteria ?
+ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // All tests are required to be compatible with all browsers
+ {
+ $search_nom='';
+ $search_categ=0;
+ $search_sale='';
+ $search_barcode="";
+ $search_customer_code='';
+ $search_supplier_code='';
+ $search_account_customer_code='';
+ $search_account_supplier_code='';
+ $search_town="";
+ $search_zip="";
+ $search_state="";
+ $search_country='';
+ $search_idprof1='';
+ $search_idprof2='';
+ $search_idprof3='';
+ $search_idprof4='';
+ $search_idprof5='';
+ $search_idprof6='';
+ $search_type='';
+ $search_type_thirdparty='';
+ $search_status='';
+ $search_stcomm='';
+ $search_level_from='';
+ $search_level_to='';
+ $search_array_options=array();
+ }
-// Do we click on purge search criteria ?
-if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers
-{
- $search_nom='';
- $search_categ=0;
- $search_sale='';
- $search_barcode="";
- $search_customer_code='';
- $search_supplier_code='';
- $search_account_customer_code='';
- $search_account_supplier_code='';
- $search_town="";
- $search_zip="";
- $search_state="";
- $search_country='';
- $search_idprof1='';
- $search_idprof2='';
- $search_idprof3='';
- $search_idprof4='';
- $search_idprof5='';
- $search_idprof6='';
- $search_type='';
- $search_type_thirdparty='';
- $search_status='';
- $search_stcomm='';
- $search_level_from='';
- $search_level_to='';
- $search_array_options=array();
+ if ($action == 'setstcomm')
+ {
+ $object = new Client($db);
+ $result=$object->fetch(GETPOST('stcommsocid'));
+ $object->stcomm_id=dol_getIdFromCode($db, GETPOST('stcomm','alpha'), 'c_stcomm');
+ $result=$object->update($object->id, $user);
+ if ($result < 0) setEventMessages($object->error,$object->errors,'errors');
+
+ $action='';
+ }
}
if ($search_status=='') $search_status=1; // always display active thirdparty first
@@ -439,8 +443,8 @@ if (! $resql)
}
$num = $db->num_rows($resql);
-$i = 0;
-if ($num == 1 && ! empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE))
+
+if ($num == 1 && ! empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $search_all && $action != 'list')
{
$obj = $db->fetch_object($resql);
$id = $obj->rowid;
@@ -848,7 +852,7 @@ print '';
print "\n";
$var=True;
-
+$i = 0;
while ($i < min($num, $limit))
{
$obj = $db->fetch_object($resql);
diff --git a/htdocs/societe/rib.php b/htdocs/societe/rib.php
index 1d8e9348f72..f6149690b7e 100644
--- a/htdocs/societe/rib.php
+++ b/htdocs/societe/rib.php
@@ -62,6 +62,10 @@ $extralabels=$extrafields->fetch_name_optionals_label($object->table_element);
$hookmanager->initHooks(array('thirdpartybancard','globalcard'));
+// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+$hookmanager->initHooks(array('thirdpartybancard'));
+
+
/*
* Actions
diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php
index accff491427..0220f775d7b 100644
--- a/htdocs/societe/soc.php
+++ b/htdocs/societe/soc.php
@@ -994,10 +994,11 @@ else
if ($conf->use_javascript_ajax)
{
print '
'.fieldLabel('FirstName','firstname').' ';
- print '';
- print '
'.fieldLabel('UserTitle','civility_id').' ';
- print $formcompany->select_civility($object->civility_id).' ';
+ // Title
+ print ''.fieldLabel('UserTitle','civility_id').' ';
+ print $formcompany->select_civility($object->civility_id, 'civility_id', 'maxwidth100').' ';
print '';
}
@@ -1070,9 +1071,9 @@ else
// Zip / Town
print '
'.fieldLabel('Zip','zipcode').' ';
- print $formcompany->select_ziptown($object->zip,'zipcode',array('town','selectcountry_id','state_id'),6);
+ print $formcompany->select_ziptown($object->zip,'zipcode',array('town','selectcountry_id','state_id'), 0, 0, '', 'maxwidth100 quatrevingtpercent');
print ' '.fieldLabel('Town','town').' ';
- print $formcompany->select_ziptown($object->town,'town',array('zipcode','selectcountry_id','state_id'));
+ print $formcompany->select_ziptown($object->town,'town',array('zipcode','selectcountry_id','state_id'), 0, 0, '', 'maxwidth100 quatrevingtpercent');
print ' ';
// Country
@@ -1092,15 +1093,15 @@ else
// Email web
print '
'.fieldLabel('EMail','email').(! empty($conf->global->SOCIETE_MAIL_REQUIRED)?'*':'').' ';
- print '';
+ print '
';
print '
'.fieldLabel('Web','url').' ';
- print '';
-
+ print '
';
+
// Skype
if (! empty($conf->skype->enabled))
{
print '
'.fieldLabel('Skype','skype').' ';
- print '';
+ print '
';
}
// Phone / Fax
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index 0658416797e..3ab1c159545 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -34,7 +34,6 @@
require '../main.inc.php';
require_once DOL_DOCUMENT_ROOT . '/core/class/html.formother.class.php';
require_once DOL_DOCUMENT_ROOT . '/core/class/html.formfile.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/class/html.formsupplier_proposal.class.php';
require_once DOL_DOCUMENT_ROOT . '/core/class/html.formmargin.class.php';
require_once DOL_DOCUMENT_ROOT . '/supplier_proposal/class/supplier_proposal.class.php';
require_once DOL_DOCUMENT_ROOT . '/comm/action/class/actioncomm.class.php';
@@ -997,7 +996,6 @@ llxHeader('', $langs->trans('CommRequests'), 'EN:Ask_Price_Supplier|FR:Demande_d
$form = new Form($db);
$formother = new FormOther($db);
$formfile = new FormFile($db);
-$formsupplier_proposal = new FormSupplierProposal($db);
$formmargin = new FormMargin($db);
$companystatic = new Societe($db);
if (! empty($conf->projet->enabled)) { $formproject = new FormProjets($db); }
@@ -1478,41 +1476,6 @@ if ($action == 'create')
}
print '';
- // Project
- /*
- if (! empty($conf->projet->enabled)) {
- $langs->load("projects");
- print '
';
- print '';
- print ' ';
- if ($action == 'classify') {
- $form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid');
- } else {
- $form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none');
- }
- print ' ';
- } else {
- print '
';
- if (! empty($object->fk_project)) {
- print '
';
- $proj = new Project($db);
- $proj->fetch($object->fk_project);
- print '';
- print $proj->ref;
- print ' ';
- print ' ';
- } else {
- print '
';
- }
- }
- print '';
- }*/
-
// Multicurrency
if (! empty($conf->multicurrency->enabled))
{
@@ -1596,14 +1559,32 @@ if ($action == 'create')
print '
';
+ if (!empty($conf->multicurrency->enabled) && ($object->multicurrency_code != $conf->currency))
+ {
+ // Multicurrency Amount HT
+ print '' . fieldLabel('MulticurrencyAmountHT','multicurrency_total_ht') . ' ';
+ print '' . price($object->multicurrency_total_ht, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . ' ';
+ print '' . fieldLabel('MulticurrencyAmountVAT','multicurrency_total_tva') . ' ';
+ print '' . price($object->multicurrency_total_tva, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . ' ';
+ print '' . fieldLabel('MulticurrencyAmountTTC','multicurrency_total_ttc') . ' ';
+ print '' . price($object->multicurrency_total_ttc, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . ' ';
+ print '' . $langs->trans('AmountHT') . ' ';
- print '' . price($object->total_ht, '', $langs, 0, - 1, - 1, $conf->currency) . ' ' . $langs->trans('AmountHT') . ' ';
+ print '' . price($object->total_ht, '', $langs, 0, - 1, - 1, $conf->currency) . ' ';
print '' . $langs->trans('AmountVAT') . ' ';
- print '' . price($object->total_tva, '', $langs, 0, - 1, - 1, $conf->currency) . ' ';
+ print '' . price($object->total_tva, '', $langs, 0, - 1, - 1, $conf->currency) . ' ';
print '' . price($object->total_ttc, '', $langs, 0, - 1, - 1, $conf->currency) . ' ';
print '';
- if (!empty($conf->multicurrency->enabled))
- {
- // Multicurrency Amount HT
- print '' . fieldLabel('MulticurrencyAmountHT','multicurrency_total_ht') . ' ';
- print '' . price($object->multicurrency_total_ht, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . ' ';
- print '' . fieldLabel('MulticurrencyAmountVAT','multicurrency_total_tva') . ' ';
- print '' . price($object->multicurrency_total_tva, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . ' ';
- print '' . fieldLabel('MulticurrencyAmountTTC','multicurrency_total_ttc') . ' ';
- print '' . price($object->multicurrency_total_ttc, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . ' ';
- print '' . $langs->trans('Status') . ' ' . $object->getLibStatut(4) . '
';
// Margin Infos
diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php
index 45dacd3805a..1d249ad627d 100644
--- a/htdocs/supplier_proposal/class/supplier_proposal.class.php
+++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php
@@ -2095,11 +2095,12 @@ class SupplierProposal extends CommonObject
if ($mode == 0) return $this->labelstatut[$statut];
if ($mode == 1) return $this->labelstatut_short[$statut];
- if ($mode == 2) return img_picto($this->labelstatut_short[$statut], $statuttrans).' '.$this->labelstatut_short[$statut];
+ if ($mode == 2) return img_picto($this->labelstatut[$statut], $statuttrans).' '.$this->labelstatut_short[$statut];
if ($mode == 3) return img_picto($this->labelstatut[$statut], $statuttrans);
if ($mode == 4) return img_picto($this->labelstatut[$statut],$statuttrans).' '.$this->labelstatut[$statut];
- if ($mode == 5) return '
'.$this->labelstatut_short[$statut].' '.img_picto($this->labelstatut_short[$statut],$statuttrans);
- }
+ if ($mode == 5) return '
'.$this->labelstatut_short[$statut].' '.img_picto($this->labelstatut[$statut],$statuttrans);
+ if ($mode == 6) return '
'.$this->labelstatut[$statut].' '.img_picto($this->labelstatut[$statut],$statuttrans);
+ }
/**
diff --git a/htdocs/supplier_proposal/list.php b/htdocs/supplier_proposal/list.php
index e51ddfcdceb..a50e8509ba5 100644
--- a/htdocs/supplier_proposal/list.php
+++ b/htdocs/supplier_proposal/list.php
@@ -34,8 +34,8 @@
require '../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formsupplier_proposal.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formpropal.class.php';
require_once DOL_DOCUMENT_ROOT.'/supplier_proposal/class/supplier_proposal.class.php';
if (! empty($conf->projet->enabled))
require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
@@ -191,7 +191,7 @@ llxHeader('',$langs->trans('CommRequest'),'EN:Ask_Price_Supplier|FR:Demande_de_p
$form = new Form($db);
$formother = new FormOther($db);
$formfile = new FormFile($db);
-$formsupplier_proposal = new FormSupplierProposal($db);
+$formpropal = new FormPropal($db);
$companystatic=new Societe($db);
$now=dol_now();
@@ -388,7 +388,7 @@ if ($result)
print '
';
print '';
print '
';
- $formsupplier_proposal->selectSupplierProposalStatus($viewstatut,1);
+ $formpropal->selectProposalStatus($viewstatut,1,0,1,'supplier');
print ' ';
// Check boxes
print '
';
diff --git a/htdocs/supplier_proposal/tpl/linkedobjectblock.tpl.php b/htdocs/supplier_proposal/tpl/linkedobjectblock.tpl.php
index 8f72744486a..8ba1f958918 100644
--- a/htdocs/supplier_proposal/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/supplier_proposal/tpl/linkedobjectblock.tpl.php
@@ -28,27 +28,44 @@ global $user;
$langs = $GLOBALS['langs'];
$linkedObjectBlock = $GLOBALS['linkedObjectBlock'];
+$total=0; $ilink=0;
$var=true;
-$total=0;
foreach($linkedObjectBlock as $key => $objectlink)
{
- $var=!$var;
+ $ilink++;
+ $var=!$var;
+ $trclass=($var?'pair':'impair');
+ if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass.=' liste_sub_total';
?>
- >
- trans("SupplierProposal"); ?>
- trans("ShowSupplierProposal"),"supplier_proposal").' '.$objectlink->ref; ?> datec,'day'); ?>
- rights->supplier_proposal->lire) {
- $total = $total + $objectlink->total_ht;
- echo price($objectlink->total_ht);
- } ?>
- getLibStatut(3); ?>
- ">transnoentitiesnoconv("RemoveLink")); ?>
+
+ trans("SupplierProposal"); ?>
+ trans("ShowSupplierProposal"),"supplier_proposal").' '.$objectlink->ref; ?> datec,'day'); ?>
+ rights->supplier_proposal->lire) {
+ $total = $total + $objectlink->total_ht;
+ echo price($objectlink->total_ht);
+ } ?>
+ getLibStatut(3); ?>
+ ">transnoentitiesnoconv("RemoveLink")); ?>
1)
+{
+ ?>
+
+ trans("Total"); ?>
+
+
diff --git a/htdocs/support/inc.php b/htdocs/support/inc.php
index 2db312ee630..869dace222d 100644
--- a/htdocs/support/inc.php
+++ b/htdocs/support/inc.php
@@ -184,7 +184,7 @@ function conf($dolibarr_main_document_root)
$conf->db->user = trim($dolibarr_main_db_user);
$conf->db->pass = trim($dolibarr_main_db_pass);
- if (empty($conf->db->dolibarr_main_db_collation)) $conf->db->dolibarr_main_db_collation='utf8_general_ci';
+ if (empty($conf->db->dolibarr_main_db_collation)) $conf->db->dolibarr_main_db_collation='utf8_unicode_ci';
return 1;
}
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index ae45643c9cb..f1368099864 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -257,6 +257,10 @@ a.tab { font-weight: bold !important; }
a:link, a:visited, a:hover, a:active { font-family: ; font-weight: normal; color: rgb(); text-decoration: none; }
a:hover { text-decoration: underline; color: rgb(); }
+input, input.flat, textarea, textarea.flat, form.flat select, select, select.flat, .dataTables_length label select {
+ background-color: #FFF;
+}
+
input:focus, textarea:focus, button:focus, select:focus {
@@ -270,8 +274,6 @@ textarea.cke_source:focus
input, input.flat, textarea, textarea.flat, form.flat select, select, select.flat, .dataTables_length label select {
font-size: px;
font-family: ;
- background: #FFF;
- /* color: #111; */
border: 1px solid #C0C0C0;
margin: 0px 0px 0px 0px;
}
@@ -546,6 +548,7 @@ div.myavailability {
.strikefordisabled {
text-decoration: line-through;
}
+/* using a tdoverflowxxx make the min-with not working */
.tdoverflow {
max-width: 0;
overflow: hidden;
@@ -618,6 +621,7 @@ div.myavailability {
.minwidth400imp { min-width: 400px !important; }
.minwidth500imp { min-width: 500px !important; }
}
+.maxwidth50 { max-width: 50px; }
.maxwidth100 { max-width: 100px; }
.maxwidth150 { max-width: 150px; }
.maxwidth200 { max-width: 200px; }
@@ -630,7 +634,7 @@ div.myavailability {
.titlefield { width: 25%; }
.titlefieldmiddle { width: 50%; }
-/* Force values for small screen */
+/* Force values for small screen 1400 */
@media only screen and (max-width: 1400px)
{
.titlefield { width: 30% !important; }
@@ -643,6 +647,7 @@ div.myavailability {
.minwidth500imp { min-width: 300px !important; }
}
+/* Force values for small screen 1000 */
@media only screen and (max-width: 1000px)
{
.maxwidthonsmartphone { max-width: 100px; }
@@ -654,14 +659,26 @@ div.myavailability {
.minwidth500imp { min-width: 100px !important; }
}
-/* Force values for small screen */
+/* Force values for small screen 570 */
@media only screen and (max-width: 570px)
{
- input[type=text] { min-width: 20px; }
-
+ div.titre {
+ line-height: 2em;
+ }
+
+ input[type=text], select, textarea {
+ min-width: 20px;
+ min-height: 1.4em;
+ line-height: 1.4em;
+ margin: .5em 0;
+ padding: .4em .1em;
+ border: 1px solid #BBB;
+ }
+
.hideonsmartphone { display: none; }
.noenlargeonsmartphone { width : 50px !important; display: inline !important; }
.maxwidthonsmartphone { max-width: 100px; }
+ .maxwidth50onsmartphone { max-width: 50px; }
.maxwidth100onsmartphone { max-width: 100px; }
.maxwidth150onsmartphone { max-width: 150px; }
.maxwidth200onsmartphone { max-width: 200px; }
@@ -675,6 +692,30 @@ div.myavailability {
.minwidth500imp { min-width: 50px !important; }
.titlefield { width: auto; }
.titlefieldcreate { width: auto; }
+
+ #tooltip {
+ position: absolute;
+ width: px;
+ }
+ select {
+ width: 98%;
+ dol_use_jmobile)) { ?>max-width: 100px;
+ min-width: 40px;
+ }
+ div.divphotoref {
+ padding-right: 5px;
+ }
+ img.photoref, div.photoref {
+ border: none;
+ -moz-box-shadow: none;
+ -webkit-box-shadow: none;
+ box-shadow: none;
+ padding: 4px;
+ height: 20px;
+ width: 20px;
+ object-fit: contain;
+ }
+
}
.linkobject { cursor: pointer; }
@@ -2449,7 +2490,7 @@ table.listwithfilterbefore {
/* Pagination */
div.refidpadding {
- padding-top: dol_use_jmobile)?'3':'7'; ?>px;
+ padding-top: dol_use_jmobile != 4)?'3':'7'; ?>px;
}
div.refid {
font-weight: bold;
@@ -2485,7 +2526,7 @@ div.pagination li {
display: inline-block;
padding-left: 0px;
padding-right: 0px;
-dol_use_jmobile)) { ?>
+dol_use_jmobile != 4) { ?>
padding-top: 6px;
padding-bottom: 5px;
@@ -2497,7 +2538,7 @@ div.pagination li {
}
div.pagination li.pagination a,
div.pagination li.pagination span {
-dol_use_jmobile)) { ?>
+dol_use_jmobile != 4) { ?>
padding: 6px 12px;
margin-left: -1px;
line-height: 1.42857143;
@@ -2544,13 +2585,13 @@ div.pagination li.litext a:hover {
background-color: transparent;
background-image: none;
}
-dol_use_jmobile)) { ?>
+dol_use_jmobile == 4) { ?>
div.pagination li.litext {
padding-top: 13px;
vertical-align: top;
}
-dol_use_jmobile)) { ?>
+dol_use_jmobile != 4) { ?>
div.pagination li.noborder a:hover {
border: none;
background-color: transparent;
@@ -2818,7 +2859,7 @@ form.liste_total div {
border-top: 1px solid #DDDDDD;
}
tr.liste_sub_total, tr.liste_sub_total td {
- border-bottom: 2px solid #aaa;
+ border-bottom: 1px solid #aaa;
}
.tableforservicepart1 .impair, .tableforservicepart1 .pair, .tableforservicepart2 .impair, .tableforservicepart2 .pair {
@@ -4623,30 +4664,6 @@ img.demothumb {
div.mainmenu {
min-width: 20px;
}
-
- #tooltip {
- position: absolute;
- width: px;
- }
- select {
- width: 100%;
- max-width: 100px;
- min-width: 50px;
- }
- div.divphotoref {
- padding-right: 5px;
- }
- img.photoref, div.photoref {
- border: none;
- -moz-box-shadow: none;
- -webkit-box-shadow: none;
- box-shadow: none;
- padding: 4px;
- height: 20px;
- width: 20px;
- object-fit: contain;
- }
-
}
; font-weight: normal; color: rgb(); text-decoration: none; }
a:hover { text-decoration: underline; color: rgb(); }
+input, input.flat, textarea, textarea.flat, form.flat select, select, select.flat, .dataTables_length label select {
+ background-color: #FDFDFD;
+}
+
input:focus, textarea:focus, button:focus, select:focus {
@@ -264,7 +274,6 @@ textarea.cke_source:focus
input, input.flat, textarea, textarea.flat, form.flat select, select, select.flat, .dataTables_length label select {
font-size: px;
font-family: ;
- background: #FDFDFD;
border: 1px solid #C0C0C0;
margin: 0px 0px 0px 0px;
}
@@ -286,7 +295,7 @@ input.removedassigned {
vertical-align: text-bottom;
margin-bottom: -3px;
}
-input.smallpadd {
+input.smallpadd { /* Used for timesheet input */
padding-left: 1px !important;
padding-right: 1px !important;
}
@@ -304,9 +313,6 @@ span.timesheetalreadyrecorded input {
select.flat, form.flat select {
font-weight: normal;
}
-input:disabled {
- background:#f4f4f4;
-}
.optiongrey, .opacitymedium {
opacity: 0.5;
}
@@ -316,6 +322,10 @@ input:disabled {
.opacitytransp {
opacity: 0;
}
+select:invalid { color: gray; }
+input:disabled {
+ background:#f4f4f4;
+}
input.liste_titre {
box-shadow: none !important;
@@ -331,6 +341,7 @@ input.removedfile {
textarea:disabled {
background:#f4f4f4;
}
+input[type=file ] { background-color: transparent; border-top: none; border-left: none; border-right: none; box-shadow: none; }
input[type=checkbox] { background-color: transparent; border: none; box-shadow: none; }
input[type=radio] { background-color: transparent; border: none; box-shadow: none; }
input[type=image] { background-color: transparent; border: none; box-shadow: none; }
@@ -600,17 +611,22 @@ div.myavailability {
.clearboth { clear:both; }
.hideobject { display: none; }
.minwidth50 { min-width: 50px; }
-.minwidth100 { min-width: 100px; }
-.minwidth200 { min-width: 200px; }
-.minwidth300 { min-width: 300px; }
-.minwidth400 { min-width: 400px; }
-.minwidth500 { min-width: 500px; }
-.minwidth50imp { min-width: 50px !important; }
-.minwidth100imp { min-width: 100px !important; }
-.minwidth200imp { min-width: 200px !important; }
-.minwidth300imp { min-width: 300px !important; }
-.minwidth400imp { min-width: 400px !important; }
-.minwidth500imp { min-width: 500px !important; }
+/* rule to reduce top menu - 3rd reduction */
+@media only screen and (min-width: px)
+{
+ .minwidth100 { min-width: 100px; }
+ .minwidth200 { min-width: 200px; }
+ .minwidth300 { min-width: 300px; }
+ .minwidth400 { min-width: 400px; }
+ .minwidth500 { min-width: 500px; }
+ .minwidth50imp { min-width: 50px !important; }
+ .minwidth100imp { min-width: 100px !important; }
+ .minwidth200imp { min-width: 200px !important; }
+ .minwidth300imp { min-width: 300px !important; }
+ .minwidth400imp { min-width: 400px !important; }
+ .minwidth500imp { min-width: 500px !important; }
+}
+.maxwidth50 { max-width: 50px; }
.maxwidth100 { max-width: 100px; }
.maxwidth150 { max-width: 150px; }
.maxwidth200 { max-width: 200px; }
@@ -623,7 +639,7 @@ div.myavailability {
.titlefield { width: 25%; }
.titlefieldmiddle { width: 50%; }
-/* Force values for small screen */
+/* Force values for small screen 1400 */
@media only screen and (max-width: 1400px)
{
.titlefield { width: 30% !important; }
@@ -636,6 +652,7 @@ div.myavailability {
.minwidth500imp { min-width: 300px !important; }
}
+/* Force values for small screen 1000 */
@media only screen and (max-width: 1000px)
{
.maxwidthonsmartphone { max-width: 100px; }
@@ -647,12 +664,26 @@ div.myavailability {
.minwidth500imp { min-width: 100px !important; }
}
-/* Force values for small screen */
+/* Force values for small screen 570 */
@media only screen and (max-width: 570px)
{
+ div.titre {
+ line-height: 2em;
+ }
+
+ input[type=text], select, textarea {
+ min-width: 20px;
+ min-height: 1.4em;
+ line-height: 1.4em;
+ margin: .5em 0;
+ padding: .4em .1em;
+ border: 1px solid #BBB;
+ }
+
.hideonsmartphone { display: none; }
.noenlargeonsmartphone { width : 50px !important; display: inline !important; }
.maxwidthonsmartphone { max-width: 100px; }
+ .maxwidth50onsmartphone { max-width: 50px; }
.maxwidth100onsmartphone { max-width: 100px; }
.maxwidth150onsmartphone { max-width: 150px; }
.maxwidth200onsmartphone { max-width: 200px; }
@@ -2083,7 +2114,7 @@ span.butAction, span.butActionDelete {
color: #ffffff !important;
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
background-color: #006dcc;
- dol_use_jmobile)) { ?>
+ dol_use_jmobile != 4)) { ?>
background-image: -moz-linear-gradient(top, #0088cc, #0044cc);
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc));
background-image: -webkit-linear-gradient(top, #0088cc, #0044cc);
@@ -2351,7 +2382,7 @@ table.listwithfilterbefore {
/* Pagination */
div.refidpadding {
- padding-top: dol_use_jmobile)?'3':'14'; ?>px;
+ padding-top: dol_use_jmobile != 4)?'3':'14'; ?>px;
}
div.refid {
font-weight: bold;
@@ -2387,7 +2418,7 @@ div.pagination li {
display: inline-block;
padding-left: 0px;
padding-right: 0px;
-dol_use_jmobile)) { ?>
+dol_use_jmobile != 4)) { ?>
padding-top: 6px;
padding-bottom: 5px;
@@ -2400,7 +2431,7 @@ div.pagination li {
div.pagination li.pagination a,
div.pagination li.pagination span {
-dol_use_jmobile)) { ?>
+dol_use_jmobile != 4) { ?>
padding: 6px 12px;
margin-left: -1px;
line-height: 1.42857143;
@@ -2427,13 +2458,13 @@ border: none;
padding-left: 4px;
font-weight: bold;
}
-dol_use_jmobile)) { ?>
+dol_use_jmobile == 4) { ?>
div.pagination li.litext {
padding-top: 13px;
vertical-align: top;
}
-dol_use_jmobile)) { ?>
+dol_use_jmobile != 4) { ?>
div.pagination li.noborder a:hover {
border: none;
background-color: transparent;
@@ -4362,6 +4393,8 @@ border-top-right-radius: 6px;
img.demothumb {
box-shadow: 2px 2px 8px #888;
margin-bottom: 4px;
+ margin-right: 20px;
+ margin-left: 10px;
}
@@ -4509,8 +4542,8 @@ img.demothumb {
width: px;
}
select {
- width: 100%;
- max-width: 100px;
+ width: 98%;
+ dol_use_jmobile)) { ?>max-width: 100px;
min-width: 0 !important;
}
div.divphotoref {
diff --git a/htdocs/user/index.php b/htdocs/user/index.php
index 459a89e573b..f5d9407d2e3 100644
--- a/htdocs/user/index.php
+++ b/htdocs/user/index.php
@@ -134,40 +134,46 @@ if ($mode == 'employee') $search_employee=1;
/*
* Actions
*/
-
+
+if (GETPOST('cancel')) { $action='list'; $massaction=''; }
+if (! GETPOST('confirmmassaction') && $massaction != 'presend' && $massaction != 'confirm_presend' && $massaction != 'confirm_createbills') { $massaction=''; }
+
$parameters=array();
$reshook=$hookmanager->executeHooks('doActions',$parameters); // Note that $action and $object may have been modified by some hooks
if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
-
-if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") ||GETPOST("button_removefilter")) // All test are required to be compatible with all browsers
+if (empty($reshook))
{
- $search_user="";
- $search_login="";
- $search_lastname="";
- $search_firstname="";
- $search_gender="";
- $search_employee="";
- $search_accountancy_code="";
- $search_email="";
- $search_statut="";
- $search_thirdparty="";
- $search_supervisor="";
- $search_datelastlogin="";
- $search_datepreviouslogin="";
- $search_date_creation="";
- $search_date_update="";
- $search_array_options=array();
+ // Selection of new fields
+ include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+
+ // Purge search criteria
+ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") ||GETPOST("button_removefilter")) // All test are required to be compatible with all browsers
+ {
+ $search_user="";
+ $search_login="";
+ $search_lastname="";
+ $search_firstname="";
+ $search_gender="";
+ $search_employee="";
+ $search_accountancy_code="";
+ $search_email="";
+ $search_statut="";
+ $search_thirdparty="";
+ $search_supervisor="";
+ $search_datelastlogin="";
+ $search_datepreviouslogin="";
+ $search_date_creation="";
+ $search_date_update="";
+ $search_array_options=array();
+ }
}
-
/*
* View
*/
-llxHeader('',$langs->trans("ListOfUsers"));
$buttonviewhierarchy='
';
@@ -239,150 +245,363 @@ if ($result)
$sql.= $db->plimit($limit+1, $offset);
$result = $db->query($sql);
-if ($result)
+if (! $result)
{
- $num = $db->num_rows($result);
- $i = 0;
+ dol_print_error($db);
+ exit;
+}
- $param='';
- if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
- if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
- if ($sall != '') $param.='&sall='.urlencode($sall);
- if ($search_user != '') $param.="&search_user=".$search_user;
- if ($search_login != '') $param.="&search_login=".$search_login;
- if ($search_lastname != '') $param.="&search_lastname=".$search_lastname;
- if ($search_firstname != '') $param.="&search_firstname=".$search_firstname;
- if ($search_gender != '') $param.="&search_gender=".$search_gender;
- if ($search_employee != '') $param.="&search_employee=".$search_employee;
- if ($search_accountancy_code != '') $param.="&search_accountancy_code=".$search_accountancy_code;
- if ($search_email != '') $param.="&search_email=".$search_email;
- if ($search_supervisor > 0) $param.="&search_supervisor=".$search_supervisor;
- if ($search_statut != '') $param.="&search_statut=".$search_statut;
- if ($optioncss != '') $param.='&optioncss='.$optioncss;
- if ($mode != '') $param.='&mode='.$mode;
- // Add $param from extra fields
- foreach ($search_array_options as $key => $val)
- {
- $crit=$val;
- $tmpkey=preg_replace('/search_options_/','',$key);
- if ($val != '') $param.='&search_options_'.$tmpkey.'='.urlencode($val);
- }
-
- $text = $langs->trans("ListOfUsers");
-
- print '
\n";
+$db->free($result);
+
+
llxFooter();
-
$db->close();
diff --git a/scripts/cron/cron_run_jobs.php b/scripts/cron/cron_run_jobs.php
index e10d089c2a8..d60218fba22 100755
--- a/scripts/cron/cron_run_jobs.php
+++ b/scripts/cron/cron_run_jobs.php
@@ -82,7 +82,7 @@ if ($key != $conf->global->CRON_KEY)
// If param userlogin is reserved word 'firstadmin'
if ($userlogin == 'firstadmin')
{
- $sql='SELECT login from '.MAIN_DB_PREFIX.'user WHERE admin = 1 ORDER BY entity LIMIT 1';
+ $sql='SELECT login from '.MAIN_DB_PREFIX.'user WHERE admin = 1 and statut = 1 ORDER BY entity LIMIT 1';
$resql=$db->query($sql);
if ($resql)
{