Merge branch 'develop' into project_update_single_array_option_element
This commit is contained in:
commit
7dc797c62b
80 changed files with 605 additions and 357 deletions
|
|
@ -7,7 +7,7 @@ English Dolibarr ChangeLog
|
|||
|
||||
For users:
|
||||
----------
|
||||
NEW: Compatibility with PHP 8.3
|
||||
NEW: Compatibility with PHP 8.2 (with no need to disable warnings)
|
||||
...
|
||||
|
||||
For developers or integrators:
|
||||
|
|
@ -34,6 +34,10 @@ The following changes may create regressions for some external modules, but were
|
|||
the deprecated field $fk_user_done in actioncomm table is removed. Please use $fk_user_action instead.
|
||||
* The table commande_fournisseur_dispatch has been renamed into receptiondet_batch to better match its goal and the field fk_commande
|
||||
and fk_commandefourndet were renamed into fk_element and fk_elementdet
|
||||
* Removed trigger BILLREC_CREATEBILL. This trigger was not a CRUD event. If you used it, you can already use the trigger BILL_CREATE and
|
||||
test that ($object->fac_rec > 0) to know if creation trigger is from a recurring invoice or not. Also this old trigger was never enabled
|
||||
into table llx_c_action_trigger.
|
||||
|
||||
|
||||
|
||||
***** ChangeLog for 19.0.1 compared to 19.0.0 *****
|
||||
|
|
|
|||
|
|
@ -512,7 +512,7 @@ $html .= '<body>'."\n";
|
|||
$html .= '<header>'."\n";
|
||||
$html .= '<h1>Advanced Project Statistics</h1>'."\n";
|
||||
$currentDate = date("Y-m-d H:i:s"); // Format: Year-Month-Day Hour:Minute:Second
|
||||
$html .= '<span class="opacitymedium">Generated on '.$currentDate.' in '.($timeend - $timestart).' seconds</span>'."\n";
|
||||
$html .= '<span class="opacitymedium">Generated on '.$currentDate.' in '.($timeend - $timestart).' seconds by <a target="_blank" href="https://github.com/Dolibarr/dolibarr/blob/develop/dev/tools/apstats.php">apstats</a></span>'."\n";
|
||||
$html .= '</header>'."\n";
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -404,11 +404,6 @@ EventFee
|
|||
EventIntoASerie
|
||||
EventOrganizationArea
|
||||
EventParticipant
|
||||
ExampleOnlyForATBEDEITNLESCustomers
|
||||
ExampleOnlyForBECustomers
|
||||
ExampleOnlyForDECustomers
|
||||
ExampleOnlyForKlarnaCustomers
|
||||
ExampleOnlyForNLCustomers
|
||||
Expedition
|
||||
Experimental
|
||||
Expired
|
||||
|
|
@ -519,7 +514,6 @@ MO
|
|||
MRP
|
||||
MYDATA_AADE_KEY
|
||||
MYDATA_AADE_USER
|
||||
Mailman
|
||||
MainAccountForRevenueStampSaleNotDefined
|
||||
Manual
|
||||
Map
|
||||
|
|
@ -755,18 +749,11 @@ Roles
|
|||
Rowid
|
||||
RulesPurchaseTurnoverCollectedOfExpenseAccounts
|
||||
SID
|
||||
SOAPError
|
||||
SPIP
|
||||
SQL
|
||||
SQLSort
|
||||
STATE_
|
||||
STATE_IPP_
|
||||
STRIPE_APPLICATION_FEE_PLATFORM
|
||||
STRIPE_BANCONTACT
|
||||
STRIPE_GIROPAY
|
||||
STRIPE_IDEAL
|
||||
STRIPE_KLARNA
|
||||
STRIPE_SOFORT
|
||||
ST_
|
||||
SaveFailed
|
||||
Saved
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@ $search_date_endmonth = GETPOSTINT('search_date_endmonth');
|
|||
$search_date_endyear = GETPOSTINT('search_date_endyear');
|
||||
$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver
|
||||
$search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear);
|
||||
$search_country = GETPOST('search_country', 'alpha');
|
||||
$search_country = GETPOST('search_country', 'aZ09');
|
||||
$search_tvaintra = GETPOST('search_tvaintra', 'alpha');
|
||||
|
||||
// Load variable for pagination
|
||||
|
|
|
|||
|
|
@ -71,7 +71,7 @@ $search_date_endmonth = GETPOSTINT('search_date_endmonth');
|
|||
$search_date_endyear = GETPOSTINT('search_date_endyear');
|
||||
$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver
|
||||
$search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear);
|
||||
$search_country = GETPOST('search_country', 'alpha');
|
||||
$search_country = GETPOST('search_country', 'aZ09');
|
||||
$search_tvaintra = GETPOST('search_tvaintra', 'alpha');
|
||||
|
||||
// Define begin binding date
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@ $search_date_endmonth = GETPOSTINT('search_date_endmonth');
|
|||
$search_date_endyear = GETPOSTINT('search_date_endyear');
|
||||
$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver
|
||||
$search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear);
|
||||
$search_country = GETPOST('search_country', 'alpha');
|
||||
$search_country = GETPOST('search_country', 'aZ09');
|
||||
$search_tvaintra = GETPOST('search_tvaintra', 'alpha');
|
||||
|
||||
// Load variable for pagination
|
||||
|
|
|
|||
|
|
@ -73,7 +73,7 @@ $search_date_endmonth = GETPOSTINT('search_date_endmonth');
|
|||
$search_date_endyear = GETPOSTINT('search_date_endyear');
|
||||
$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver
|
||||
$search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear);
|
||||
$search_country = GETPOST('search_country', 'alpha');
|
||||
$search_country = GETPOST('search_country', 'aZ09');
|
||||
$search_tvaintra = GETPOST('search_tvaintra', 'alpha');
|
||||
|
||||
// Load variable for pagination
|
||||
|
|
|
|||
|
|
@ -361,13 +361,17 @@ llxHeader('', $langs->trans("Setup"), $help_url, '', '', '', $morejs, $morecss,
|
|||
// Search modules dirs
|
||||
$modulesdir = dolGetModulesDirs();
|
||||
|
||||
$arrayofnatures = array('core' => $langs->transnoentitiesnoconv("NativeModules"), 'external' => $langs->transnoentitiesnoconv("External").' - ['.$langs->trans("AllPublishers").']');
|
||||
$arrayofnatures = array(
|
||||
'core' => array('label' => $langs->transnoentitiesnoconv("NativeModules")),
|
||||
'external' => array('label' => $langs->transnoentitiesnoconv("External").' - ['.$langs->trans("AllPublishers").']')
|
||||
);
|
||||
$arrayofwarnings = array(); // Array of warning each module want to show when activated
|
||||
$arrayofwarningsext = array(); // Array of warning each module want to show when we activate an external module
|
||||
$filename = array();
|
||||
$modules = array();
|
||||
$orders = array();
|
||||
$categ = array();
|
||||
$publisherlogoarray = array();
|
||||
|
||||
$i = 0; // is a sequencer of modules found
|
||||
$j = 0; // j is module number. Automatically affected if module number not defined.
|
||||
|
|
@ -427,9 +431,16 @@ foreach ($modulesdir as $dir) {
|
|||
$external = ($objMod->isCoreOrExternalModule() == 'external');
|
||||
if ($external) {
|
||||
if ($publisher) {
|
||||
$arrayofnatures['external_'.$publisher] = $langs->trans("External").' - '.$publisher;
|
||||
// Check if there is a logo forpublisher
|
||||
/* Do not show the company logo in combo. Make combo list dirty.
|
||||
if (!empty($objMod->editor_squarred_logo)) {
|
||||
$publisherlogoarray['external_'.$publisher] = img_picto('', $objMod->editor_squarred_logo, 'class="publisherlogoinline"');
|
||||
}
|
||||
$publisherlogo = empty($publisherlogoarray['external_'.$publisher]) ? '' : $publisherlogoarray['external_'.$publisher];
|
||||
*/
|
||||
$arrayofnatures['external_'.$publisher] = array('label' => $langs->trans("External").' - '.$publisher, 'data-html' => $langs->trans("External").' - <span class="opacitymedium inine-block valignmiddle">'.$publisher.'</span>');
|
||||
} else {
|
||||
$arrayofnatures['external_'] = $langs->trans("External").' - '.$langs->trans("UnknownPublishers");
|
||||
$arrayofnatures['external_'] = array('label' => $langs->trans("External").' - ['.$langs->trans("UnknownPublishers").']');
|
||||
}
|
||||
}
|
||||
ksort($arrayofnatures);
|
||||
|
|
@ -641,7 +652,7 @@ if ($mode == 'common' || $mode == 'commonkanban') {
|
|||
$moreforfilter .= '</div>';
|
||||
$moreforfilter .= ' ';
|
||||
$moreforfilter .= '<div class="divsearchfield valignmiddle inline-block">';
|
||||
$moreforfilter .= '<input type="submit" name="buttonsubmit" class="button small" value="'.dol_escape_htmltag($langs->trans("Refresh")).'">';
|
||||
$moreforfilter .= '<input type="submit" name="buttonsubmit" class="button small nomarginleft" value="'.dol_escape_htmltag($langs->trans("Refresh")).'">';
|
||||
if ($search_keyword || ($search_nature && $search_nature != '-1') || ($search_version && $search_version != '-1') || ($search_status && $search_status != '-1')) {
|
||||
$moreforfilter .= ' ';
|
||||
$moreforfilter .= '<input type="submit" name="buttonreset" class="buttonreset noborderbottom" value="'.dol_escape_htmltag($langs->trans("Reset")).'">';
|
||||
|
|
|
|||
|
|
@ -196,11 +196,11 @@ if ($filtertype != 1) {
|
|||
print '</td>';
|
||||
}
|
||||
|
||||
$coldisplay += $colspan;
|
||||
print '<td class="bordertop nobottom linecoledit center valignmiddle" colspan="' . $colspan . '">';
|
||||
print '<input type="submit" class="button button-add" name="addline" id="addline" value="' . $langs->trans('Add') . '">';
|
||||
print '</td>';
|
||||
print '</tr>';
|
||||
$coldisplay += $colspan;
|
||||
print '<td class="bordertop nobottom linecoledit right valignmiddle" colspan="' . $colspan . '">';
|
||||
print '<input type="submit" class="button button-add small" name="addline" id="addline" value="' . $langs->trans('Add') . '">';
|
||||
print '</td>';
|
||||
print '</tr>';
|
||||
|
||||
?>
|
||||
|
||||
|
|
|
|||
|
|
@ -351,11 +351,12 @@ if ($resql) {
|
|||
print '<span class="amount">'.price(price2num($sub_bom_product->pmp * $sub_bom_line->qty * (float) $line->qty, 'MT')).'</span></td>';
|
||||
$total_cost .= $sub_bom_product->pmp * $sub_bom_line->qty * (float) $line->qty;
|
||||
} else { // Minimum purchase price if cost price and PMP aren't defined
|
||||
$sql_supplier_price = 'SELECT MIN(price) AS min_price, quantity AS qty FROM '.MAIN_DB_PREFIX.'product_fournisseur_price';
|
||||
$sql_supplier_price .= ' WHERE fk_product = '. (int) $sub_bom_product->id;
|
||||
$sql_supplier_price = "SELECT MIN(price) AS min_price, quantity AS qty FROM ".MAIN_DB_PREFIX."product_fournisseur_price";
|
||||
$sql_supplier_price .= " WHERE fk_product = ". (int) $sub_bom_product->id;
|
||||
$sql_supplier_price .= " GROUP BY quantity ORDER BY quantity ASC";
|
||||
$resql_supplier_price = $object->db->query($sql_supplier_price);
|
||||
if ($resql_supplier_price) {
|
||||
$obj = $object->db->fetch_object($resql_supplier_price);
|
||||
$obj = $object->db->fetch_object($resql_supplier_price); // Take first value so the ref with the smaller minimum quantity
|
||||
if (!empty($obj->qty) && !empty($sub_bom_line->qty) && !empty($line->qty)) {
|
||||
$line_cost = $obj->min_price / $obj->qty * $sub_bom_line->qty * (float) $line->qty;
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -44,8 +44,9 @@ if (isset($user->socid) && $user->socid > 0) {
|
|||
$socid = $user->socid;
|
||||
}
|
||||
|
||||
$max = 5;
|
||||
$now = dol_now();
|
||||
$NBMAX = getDolGlobalString('MAIN_SIZE_SHORTLIST_LIMIT');
|
||||
$max = getDolGlobalInt('MAIN_SIZE_SHORTLIST_LIMIT', 5);
|
||||
|
||||
|
||||
/*
|
||||
|
|
@ -137,9 +138,6 @@ if ($user->hasRight('bookcal', 'availabilities', 'read') && isModEnabled('bookca
|
|||
print '</div><div class="fichetwothirdright">';
|
||||
|
||||
|
||||
$NBMAX = getDolGlobalString('MAIN_SIZE_SHORTLIST_LIMIT');
|
||||
$max = getDolGlobalInt('MAIN_SIZE_SHORTLIST_LIMIT');
|
||||
|
||||
/* BEGIN MODULEBUILDER LASTMODIFIED MYOBJECT
|
||||
// Last modified myobject
|
||||
if (isModEnabled('bookcal')) {
|
||||
|
|
|
|||
|
|
@ -489,9 +489,6 @@ if ($optioncss != '') {
|
|||
print '<input type="hidden" name="token" value="'.newToken().'">';
|
||||
print '<input type="hidden" name="mode" value="'.$mode.'">';
|
||||
|
||||
//print dol_get_fiche_head($head, $tabactive, $langs->trans('Agenda'), 0, 'action');
|
||||
//print_actions_filter($form, $canedit, $status, $year, $month, $day, $showbirthday, 0, $filtert, 0, $pid, $socid, $action, $listofextcals, $actioncode, $usergroup, '', $resourceid);
|
||||
//print dol_get_fiche_end();
|
||||
|
||||
$viewmode = '<div class="navmode inline-block">';
|
||||
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@ if (isset($user->socid) && $user->socid > 0) {
|
|||
}
|
||||
|
||||
|
||||
$max = getDolGlobalInt('MAIN_SIZE_SHORTLIST_LIMIT');
|
||||
$max = getDolGlobalInt('MAIN_SIZE_SHORTLIST_LIMIT', 5);
|
||||
$maxofloop = (!getDolGlobalString('MAIN_MAXLIST_OVERLOAD') ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD);
|
||||
$now = dol_now();
|
||||
|
||||
|
|
@ -479,6 +479,7 @@ if ((isModEnabled("fournisseur") && !getDolGlobalString('MAIN_USE_NEW_SUPPLIERMO
|
|||
$companystatic->name_alias = $obj->name_alias;
|
||||
$companystatic->code_client = $obj->code_client;
|
||||
$companystatic->code_compta = $obj->code_compta;
|
||||
$companystatic->code_compta_client = $obj->code_compta;
|
||||
$companystatic->client = $obj->client;
|
||||
$companystatic->code_fournisseur = $obj->code_fournisseur;
|
||||
$companystatic->code_compta_fournisseur = $obj->code_compta_fournisseur;
|
||||
|
|
@ -705,6 +706,189 @@ if (isModEnabled("societe") && $user->hasRight('societe', 'lire')) {
|
|||
}
|
||||
|
||||
|
||||
/*
|
||||
* Last modified proposals
|
||||
*/
|
||||
|
||||
if (isModEnabled('proposal')) {
|
||||
$sql = "SELECT c.rowid, c.entity, c.ref, c.fk_statut as status, date_cloture as datec, c.tms as datem,";
|
||||
$sql .= " s.nom as socname, s.rowid as socid, s.canvas, s.client, s.email, s.code_compta";
|
||||
$sql .= " FROM ".MAIN_DB_PREFIX."propal as c,";
|
||||
$sql .= " ".MAIN_DB_PREFIX."societe as s";
|
||||
$sql .= " WHERE c.entity IN (".getEntity($propalstatic->element).")";
|
||||
$sql .= " AND c.fk_soc = s.rowid";
|
||||
// If the internal user must only see his customers, force searching by him
|
||||
$search_sale = 0;
|
||||
if (!$user->hasRight('societe', 'client', 'voir')) {
|
||||
$search_sale = $user->id;
|
||||
}
|
||||
// Search on sale representative
|
||||
if ($search_sale && $search_sale != '-1') {
|
||||
if ($search_sale == -2) {
|
||||
$sql .= " AND NOT EXISTS (SELECT sc.fk_soc FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc WHERE sc.fk_soc = c.fk_soc)";
|
||||
} elseif ($search_sale > 0) {
|
||||
$sql .= " AND EXISTS (SELECT sc.fk_soc FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc WHERE sc.fk_soc = c.fk_soc AND sc.fk_user = ".((int) $search_sale).")";
|
||||
}
|
||||
}
|
||||
// Search on socid
|
||||
if ($socid) {
|
||||
$sql .= " AND c.fk_soc = ".((int) $socid);
|
||||
}
|
||||
$sql .= " ORDER BY c.tms DESC";
|
||||
|
||||
$sql .= $db->plimit($max, 0);
|
||||
|
||||
$resql = $db->query($sql);
|
||||
if ($resql) {
|
||||
$num = $db->num_rows($resql);
|
||||
|
||||
startSimpleTable($langs->trans("LastModifiedProposals", $max), "comm/propal/list.php", "sortfield=p.tms&sortorder=DESC", 2, -1, 'propal');
|
||||
|
||||
if ($num) {
|
||||
$i = 0;
|
||||
while ($i < $num) {
|
||||
$obj = $db->fetch_object($resql);
|
||||
|
||||
$propalstatic->id = $obj->rowid;
|
||||
$propalstatic->ref = $obj->ref;
|
||||
|
||||
$companystatic->id = $obj->socid;
|
||||
$companystatic->name = $obj->socname;
|
||||
$companystatic->client = $obj->client;
|
||||
$companystatic->canvas = $obj->canvas;
|
||||
$companystatic->email = $obj->email;
|
||||
$companystatic->code_compta = $obj->code_compta;
|
||||
|
||||
$filename = dol_sanitizeFileName($obj->ref);
|
||||
$filedir = $conf->propal->multidir_output[$obj->entity].'/'.dol_sanitizeFileName($obj->ref);
|
||||
$urlsource = $_SERVER['PHP_SELF'].'?id='.$obj->rowid;
|
||||
|
||||
print '<tr class="oddeven">';
|
||||
|
||||
print '<td class="nowrap">';
|
||||
print '<table class="nobordernopadding">';
|
||||
print '<tr class="nocellnopadd">';
|
||||
print '<td width="96" class="nobordernopadding nowrap">'.$propalstatic->getNomUrl(1).'</td>';
|
||||
print '<td width="16" class="nobordernopadding nowrap"></td>';
|
||||
print '<td width="16" class="nobordernopadding right">'.$formfile->getDocumentsLink($propalstatic->element, $filename, $filedir).'</td>';
|
||||
print '</tr>';
|
||||
print '</table>';
|
||||
print '</td>';
|
||||
|
||||
print '<td>'.$companystatic->getNomUrl(1, 'customer').'</td>';
|
||||
|
||||
$datem = $db->jdate($obj->datem);
|
||||
print '<td class="center" title="'.dol_escape_htmltag($langs->trans("DateModification").': '.dol_print_date($datem, 'dayhour', 'tzuserrel')).'">';
|
||||
print dol_print_date($datem, 'day', 'tzuserrel');
|
||||
print '</td>';
|
||||
|
||||
print '<td class="right">'.$propalstatic->LibStatut($obj->status, 3).'</td>';
|
||||
|
||||
print '</tr>';
|
||||
|
||||
$i++;
|
||||
}
|
||||
}
|
||||
|
||||
finishSimpleTable(true);
|
||||
$db->free($resql);
|
||||
} else {
|
||||
dol_print_error($db);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Latest modified orders
|
||||
*/
|
||||
|
||||
if (isModEnabled('order')) {
|
||||
$commandestatic = new Commande($db);
|
||||
|
||||
$sql = "SELECT c.rowid, c.entity, c.ref, c.fk_statut as status, c.facture, c.date_cloture as datec, c.tms as datem,";
|
||||
$sql .= " s.nom as name, s.rowid as socid";
|
||||
$sql .= ", s.client";
|
||||
$sql .= ", s.code_client";
|
||||
$sql .= ", s.canvas";
|
||||
$sql .= " FROM ".MAIN_DB_PREFIX."commande as c,";
|
||||
$sql .= " ".MAIN_DB_PREFIX."societe as s";
|
||||
if (!$user->hasRight('societe', 'client', 'voir')) {
|
||||
$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
|
||||
}
|
||||
$sql .= " WHERE c.fk_soc = s.rowid";
|
||||
$sql .= " AND c.entity IN (".getEntity('commande').")";
|
||||
//$sql.= " AND c.fk_statut > 2";
|
||||
if ($socid) {
|
||||
$sql .= " AND c.fk_soc = ".((int) $socid);
|
||||
}
|
||||
if (!$user->hasRight('societe', 'client', 'voir')) {
|
||||
$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
|
||||
}
|
||||
$sql .= " ORDER BY c.tms DESC";
|
||||
$sql .= $db->plimit($max, 0);
|
||||
|
||||
$resql = $db->query($sql);
|
||||
if ($resql) {
|
||||
$num = $db->num_rows($resql);
|
||||
|
||||
startSimpleTable($langs->trans("LastModifiedOrders", $max), "commande/list.php", "sortfield=c.tms&sortorder=DESC", 2, -1, 'order');
|
||||
|
||||
if ($num) {
|
||||
$i = 0;
|
||||
while ($i < $num) {
|
||||
$obj = $db->fetch_object($resql);
|
||||
|
||||
print '<tr class="oddeven">';
|
||||
print '<td width="20%" class="nowrap">';
|
||||
|
||||
$commandestatic->id = $obj->rowid;
|
||||
$commandestatic->ref = $obj->ref;
|
||||
|
||||
$companystatic->id = $obj->socid;
|
||||
$companystatic->name = $obj->name;
|
||||
$companystatic->client = $obj->client;
|
||||
$companystatic->code_client = $obj->code_client;
|
||||
$companystatic->canvas = $obj->canvas;
|
||||
|
||||
print '<table class="nobordernopadding"><tr class="nocellnopadd">';
|
||||
print '<td width="96" class="nobordernopadding nowrap">';
|
||||
print $commandestatic->getNomUrl(1);
|
||||
print '</td>';
|
||||
|
||||
print '<td width="16" class="nobordernopadding nowrap">';
|
||||
print ' ';
|
||||
print '</td>';
|
||||
|
||||
print '<td width="16" class="nobordernopadding hideonsmartphone right">';
|
||||
$filename = dol_sanitizeFileName($obj->ref);
|
||||
$filedir = $conf->commande->multidir_output[$obj->entity].'/'.dol_sanitizeFileName($obj->ref);
|
||||
$urlsource = $_SERVER['PHP_SELF'].'?id='.$obj->rowid;
|
||||
print $formfile->getDocumentsLink($commandestatic->element, $filename, $filedir);
|
||||
print '</td></tr></table>';
|
||||
|
||||
print '</td>';
|
||||
|
||||
print '<td class="nowrap">';
|
||||
print $companystatic->getNomUrl(1, 'company', 16);
|
||||
print '</td>';
|
||||
|
||||
$datem = $db->jdate($obj->datem);
|
||||
print '<td class="center" title="'.dol_escape_htmltag($langs->trans("DateModification").': '.dol_print_date($datem, 'dayhour', 'tzuserrel')).'">';
|
||||
print dol_print_date($datem, 'day', 'tzuserrel');
|
||||
print '</td>';
|
||||
|
||||
print '<td class="right">'.$commandestatic->LibStatut($obj->status, $obj->facture, 3).'</td>';
|
||||
print '</tr>';
|
||||
$i++;
|
||||
}
|
||||
}
|
||||
finishSimpleTable(true);
|
||||
} else {
|
||||
dol_print_error($db);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Last suppliers
|
||||
*/
|
||||
|
|
@ -739,7 +923,7 @@ if ((isModEnabled("supplier_order") || isModEnabled("supplier_invoice")) && $use
|
|||
$resql = $db->query($sql);
|
||||
if ($resql) {
|
||||
$num = $db->num_rows($resql);
|
||||
startSimpleTable($langs->trans("BoxTitleLastModifiedSuppliers", min($max, $num)), "societe/list.php", "type=f", 1);
|
||||
startSimpleTable($langs->trans("BoxTitleLastModifiedSuppliers", min($max, $num)), "societe/list.php", "type=f", 1, -1, 'company');
|
||||
|
||||
if ($num) {
|
||||
$i = 0;
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ $hookmanager->initHooks(array('proposalindex'));
|
|||
$langs->loadLangs(array('propal', 'companies'));
|
||||
|
||||
$now = dol_now();
|
||||
$max = 5;
|
||||
$max = getDolGlobalInt('MAIN_SIZE_SHORTLIST_LIMIT', 5);
|
||||
|
||||
// Security check
|
||||
$socid = GETPOSTINT('socid');
|
||||
|
|
@ -160,10 +160,10 @@ print '<div class="fichetwothirdright">';
|
|||
* Last modified proposals
|
||||
*/
|
||||
|
||||
$sql = "SELECT c.rowid, c.entity, c.ref, c.fk_statut, date_cloture as datec";
|
||||
$sql .= ", s.nom as socname, s.rowid as socid, s.canvas, s.client, s.email, s.code_compta";
|
||||
$sql .= " FROM ".MAIN_DB_PREFIX."propal as c";
|
||||
$sql .= ", ".MAIN_DB_PREFIX."societe as s";
|
||||
$sql = "SELECT c.rowid, c.entity, c.ref, c.fk_statut as status, date_cloture as datec, c.tms as datem,";
|
||||
$sql .= " s.nom as socname, s.rowid as socid, s.canvas, s.client, s.email, s.code_compta";
|
||||
$sql .= " FROM ".MAIN_DB_PREFIX."propal as c,";
|
||||
$sql .= " ".MAIN_DB_PREFIX."societe as s";
|
||||
$sql .= " WHERE c.entity IN (".getEntity($propalstatic->element).")";
|
||||
$sql .= " AND c.fk_soc = s.rowid";
|
||||
// If the internal user must only see his customers, force searching by him
|
||||
|
|
@ -190,7 +190,8 @@ $sql .= $db->plimit($max, 0);
|
|||
$resql = $db->query($sql);
|
||||
if ($resql) {
|
||||
$num = $db->num_rows($resql);
|
||||
startSimpleTable($langs->trans("LastModifiedProposals", $max), "", "", 3);
|
||||
|
||||
startSimpleTable($langs->trans("LastModifiedProposals", $max), "comm/propal/list.php", "sortfield=p.tms&sortorder=DESC", 2, -1, 'propal');
|
||||
|
||||
if ($num) {
|
||||
$i = 0;
|
||||
|
|
@ -213,7 +214,7 @@ if ($resql) {
|
|||
|
||||
print '<tr class="oddeven">';
|
||||
|
||||
print '<td width="20%" class="nowrap">';
|
||||
print '<td class="nowrap">';
|
||||
print '<table class="nobordernopadding">';
|
||||
print '<tr class="nocellnopadd">';
|
||||
print '<td width="96" class="nobordernopadding nowrap">'.$propalstatic->getNomUrl(1).'</td>';
|
||||
|
|
@ -224,8 +225,13 @@ if ($resql) {
|
|||
print '</td>';
|
||||
|
||||
print '<td>'.$companystatic->getNomUrl(1, 'customer').'</td>';
|
||||
print '<td>'.dol_print_date($db->jdate($obj->datec), 'day').'</td>';
|
||||
print '<td class="right">'.$propalstatic->LibStatut($obj->fk_statut, 3).'</td>';
|
||||
|
||||
$datem = $db->jdate($obj->datem);
|
||||
print '<td class="center" title="'.dol_escape_htmltag($langs->trans("DateModification").': '.dol_print_date($datem, 'dayhour', 'tzuserrel')).'">';
|
||||
print dol_print_date($datem, 'day', 'tzuserrel');
|
||||
print '</td>';
|
||||
|
||||
print '<td class="right">'.$propalstatic->LibStatut($obj->status, 3).'</td>';
|
||||
|
||||
print '</tr>';
|
||||
|
||||
|
|
|
|||
|
|
@ -73,6 +73,7 @@ $confirm = GETPOST('confirm', 'alpha');
|
|||
$cancel = GETPOST('cancel', 'alpha');
|
||||
$toselect = GETPOST('toselect', 'array');
|
||||
$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'proposallist';
|
||||
$optioncss = GETPOST('optioncss', 'alpha');
|
||||
$mode = GETPOST('mode', 'alpha');
|
||||
|
||||
// Search Fields
|
||||
|
|
@ -102,8 +103,8 @@ $search_product_category = GETPOSTINT('search_product_category');
|
|||
$search_town = GETPOST('search_town', 'alpha');
|
||||
$search_zip = GETPOST('search_zip', 'alpha');
|
||||
$search_state = GETPOST("search_state");
|
||||
$search_country = GETPOSTINT("search_country");
|
||||
$search_type_thirdparty = GETPOSTINT("search_type_thirdparty");
|
||||
$search_country = GETPOST("search_country", 'aZ09');
|
||||
$search_type_thirdparty = GETPOST("search_type_thirdparty", 'intcomma');
|
||||
$search_date_startday = GETPOSTINT('search_date_startday');
|
||||
$search_date_startmonth = GETPOSTINT('search_date_startmonth');
|
||||
$search_date_startyear = GETPOSTINT('search_date_startyear');
|
||||
|
|
@ -128,12 +129,12 @@ $search_date_delivery_endmonth = GETPOSTINT('search_date_delivery_endmonth');
|
|||
$search_date_delivery_endyear = GETPOSTINT('search_date_delivery_endyear');
|
||||
$search_date_delivery_start = dol_mktime(0, 0, 0, $search_date_delivery_startmonth, $search_date_delivery_startday, $search_date_delivery_startyear);
|
||||
$search_date_delivery_end = dol_mktime(23, 59, 59, $search_date_delivery_endmonth, $search_date_delivery_endday, $search_date_delivery_endyear);
|
||||
$search_availability = GETPOSTINT('search_availability');
|
||||
$search_categ_cus = GETPOSTINT("search_categ_cus");
|
||||
$search_fk_cond_reglement = GETPOSTINT("search_fk_cond_reglement");
|
||||
$search_fk_shipping_method = GETPOSTINT("search_fk_shipping_method");
|
||||
$search_fk_input_reason = GETPOSTINT("search_fk_input_reason");
|
||||
$search_fk_mode_reglement = GETPOSTINT("search_fk_mode_reglement");
|
||||
$search_availability = GETPOST('search_availability', 'intcomma');
|
||||
$search_categ_cus = GETPOST("search_categ_cus", 'intcomma');
|
||||
$search_fk_cond_reglement = GETPOST("search_fk_cond_reglement", 'intcomma');
|
||||
$search_fk_shipping_method = GETPOST("search_fk_shipping_method", 'intcomma');
|
||||
$search_fk_input_reason = GETPOST("search_fk_input_reason", 'intcomma');
|
||||
$search_fk_mode_reglement = GETPOST("search_fk_mode_reglement", 'intcomma');
|
||||
$search_date_signature_startday = GETPOSTINT('search_date_signature_startday');
|
||||
$search_date_signature_startmonth = GETPOSTINT('search_date_signature_startmonth');
|
||||
$search_date_signature_startyear = GETPOSTINT('search_date_signature_startyear');
|
||||
|
|
@ -144,8 +145,6 @@ $search_date_signature_start = dol_mktime(0, 0, 0, $search_date_signature_startm
|
|||
$search_date_signature_end = dol_mktime(23, 59, 59, $search_date_signature_endmonth, $search_date_signature_endday, $search_date_signature_endyear);
|
||||
$search_status = GETPOST('search_status', 'alpha');
|
||||
|
||||
$optioncss = GETPOST('optioncss', 'alpha');
|
||||
|
||||
// Pagination
|
||||
$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
|
||||
$sortfield = GETPOST('sortfield', 'aZ09comma');
|
||||
|
|
@ -1254,7 +1253,7 @@ if (!empty($arrayfields['country.code_iso']['checked'])) {
|
|||
// Company type
|
||||
if (!empty($arrayfields['typent.code']['checked'])) {
|
||||
print '<td class="liste_titre maxwidth100onsmartphone" align="center">';
|
||||
print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 1, 0, 0, '', 0, 0, 0, (!getDolGlobalString('SOCIETE_SORT_ON_TYPEENT') ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT), '', 1);
|
||||
print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 1, 0, 0, '', 0, 0, 0, getDolGlobalString('SOCIETE_SORT_ON_TYPEENT', 'ASC'), 'maxwidth100', 1);
|
||||
print ajax_combobox('search_type_thirdparty');
|
||||
print '</td>';
|
||||
}
|
||||
|
|
@ -1525,27 +1524,27 @@ if (!empty($arrayfields['state.nom']['checked'])) {
|
|||
$totalarray['nbfield']++;
|
||||
}
|
||||
if (!empty($arrayfields['country.code_iso']['checked'])) {
|
||||
print_liste_field_titre($arrayfields['country.code_iso']['label'], $_SERVER["PHP_SELF"], "country.code_iso", "", $param, 'class="center"', $sortfield, $sortorder);
|
||||
print_liste_field_titre($arrayfields['country.code_iso']['label'], $_SERVER["PHP_SELF"], "country.code_iso", "", $param, '', $sortfield, $sortorder, 'center ');
|
||||
$totalarray['nbfield']++;
|
||||
}
|
||||
if (!empty($arrayfields['typent.code']['checked'])) {
|
||||
print_liste_field_titre($arrayfields['typent.code']['label'], $_SERVER["PHP_SELF"], "typent.code", "", $param, 'class="center"', $sortfield, $sortorder);
|
||||
print_liste_field_titre($arrayfields['typent.code']['label'], $_SERVER["PHP_SELF"], "typent.code", "", $param, '', $sortfield, $sortorder, 'center ');
|
||||
$totalarray['nbfield']++;
|
||||
}
|
||||
if (!empty($arrayfields['p.date']['checked'])) {
|
||||
print_liste_field_titre($arrayfields['p.date']['label'], $_SERVER["PHP_SELF"], 'p.datep', '', $param, 'class="center"', $sortfield, $sortorder);
|
||||
print_liste_field_titre($arrayfields['p.date']['label'], $_SERVER["PHP_SELF"], 'p.datep', '', $param, '', $sortfield, $sortorder, 'center ');
|
||||
$totalarray['nbfield']++;
|
||||
}
|
||||
if (!empty($arrayfields['p.fin_validite']['checked'])) {
|
||||
print_liste_field_titre($arrayfields['p.fin_validite']['label'], $_SERVER["PHP_SELF"], 'dfv', '', $param, 'class="center"', $sortfield, $sortorder);
|
||||
print_liste_field_titre($arrayfields['p.fin_validite']['label'], $_SERVER["PHP_SELF"], 'dfv', '', $param, '', $sortfield, $sortorder, 'center ');
|
||||
$totalarray['nbfield']++;
|
||||
}
|
||||
if (!empty($arrayfields['p.date_livraison']['checked'])) {
|
||||
print_liste_field_titre($arrayfields['p.date_livraison']['label'], $_SERVER["PHP_SELF"], 'p.date_livraison', '', $param, 'class="center"', $sortfield, $sortorder);
|
||||
print_liste_field_titre($arrayfields['p.date_livraison']['label'], $_SERVER["PHP_SELF"], 'p.date_livraison', '', $param, '', $sortfield, $sortorder, 'center ');
|
||||
$totalarray['nbfield']++;
|
||||
}
|
||||
if (!empty($arrayfields['p.date_signature']['checked'])) {
|
||||
print_liste_field_titre($arrayfields['p.date_signature']['label'], $_SERVER["PHP_SELF"], 'p.date_signature', '', $param, 'class="center"', $sortfield, $sortorder);
|
||||
print_liste_field_titre($arrayfields['p.date_signature']['label'], $_SERVER["PHP_SELF"], 'p.date_signature', '', $param, '', $sortfield, $sortorder, 'center ');
|
||||
$totalarray['nbfield']++;
|
||||
}
|
||||
if (!empty($arrayfields['ava.rowid']['checked'])) {
|
||||
|
|
|
|||
|
|
@ -248,7 +248,7 @@ $h++;
|
|||
|
||||
complete_head_from_modules($conf, $langs, null, $head, $h, 'propal_stats');
|
||||
|
||||
print dol_get_fiche_head($head, 'byyear', $langs->trans("Statistics"), -1);
|
||||
print dol_get_fiche_head($head, 'byyear', '', -1);
|
||||
|
||||
|
||||
print '<div class="fichecenter"><div class="fichethirdleft">';
|
||||
|
|
|
|||
|
|
@ -56,9 +56,8 @@ if ($user->socid > 0) {
|
|||
$socid = $user->socid;
|
||||
}
|
||||
|
||||
$max = getDolGlobalInt('MAIN_SIZE_SHORTLIST_LIMIT');
|
||||
|
||||
// Maximum elements of the tables
|
||||
$max = getDolGlobalInt('MAIN_SIZE_SHORTLIST_LIMIT', 5);
|
||||
$maxDraftCount = !getDolGlobalString('MAIN_MAXLIST_OVERLOAD') ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD;
|
||||
$maxLatestEditCount = 5;
|
||||
$maxOpenCount = !getDolGlobalString('MAIN_MAXLIST_OVERLOAD') ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD;
|
||||
|
|
@ -154,13 +153,11 @@ if (isModEnabled('order')) {
|
|||
print '</div><div class="fichetwothirdright">';
|
||||
|
||||
|
||||
$max = 5;
|
||||
|
||||
/*
|
||||
* Latest modified orders
|
||||
*/
|
||||
|
||||
$sql = "SELECT c.rowid, c.entity, c.ref, c.fk_statut, c.facture, c.date_cloture as datec, c.tms as datem,";
|
||||
$sql = "SELECT c.rowid, c.entity, c.ref, c.fk_statut as status, c.facture, c.date_cloture as datec, c.tms as datem,";
|
||||
$sql .= " s.nom as name, s.rowid as socid";
|
||||
$sql .= ", s.client";
|
||||
$sql .= ", s.code_client";
|
||||
|
|
@ -184,12 +181,10 @@ $sql .= $db->plimit($max, 0);
|
|||
|
||||
$resql = $db->query($sql);
|
||||
if ($resql) {
|
||||
print '<div class="div-table-responsive-no-min">';
|
||||
print '<table class="noborder centpercent">';
|
||||
print '<tr class="liste_titre">';
|
||||
print '<th colspan="4">'.$langs->trans("LastModifiedOrders", $max).'</th></tr>';
|
||||
|
||||
$num = $db->num_rows($resql);
|
||||
|
||||
startSimpleTable($langs->trans("LastModifiedOrders", $max), "commande/list.php", "sortfield=c.tms&sortorder=DESC", 2, -1, 'order');
|
||||
|
||||
if ($num) {
|
||||
$i = 0;
|
||||
while ($i < $num) {
|
||||
|
|
@ -228,24 +223,28 @@ if ($resql) {
|
|||
print '<td class="nowrap">';
|
||||
print $companystatic->getNomUrl(1, 'company', 16);
|
||||
print '</td>';
|
||||
print '<td>'.dol_print_date($db->jdate($obj->datem), 'day').'</td>';
|
||||
print '<td class="right">'.$commandestatic->LibStatut($obj->fk_statut, $obj->facture, 3).'</td>';
|
||||
|
||||
$datem = $db->jdate($obj->datem);
|
||||
print '<td class="center" title="'.dol_escape_htmltag($langs->trans("DateModification").': '.dol_print_date($datem, 'dayhour', 'tzuserrel')).'">';
|
||||
print dol_print_date($datem, 'day', 'tzuserrel');
|
||||
print '</td>';
|
||||
|
||||
print '<td class="right">'.$commandestatic->LibStatut($obj->status, $obj->facture, 3).'</td>';
|
||||
print '</tr>';
|
||||
$i++;
|
||||
}
|
||||
}
|
||||
print "</table></div><br>";
|
||||
finishSimpleTable(true);
|
||||
} else {
|
||||
dol_print_error($db);
|
||||
}
|
||||
|
||||
$max = 10;
|
||||
|
||||
/*
|
||||
* Orders to process
|
||||
*/
|
||||
if (isModEnabled('order')) {
|
||||
$sql = "SELECT c.rowid, c.entity, c.ref, c.fk_statut, c.facture, c.date_commande as date, s.nom as name, s.rowid as socid";
|
||||
$sql = "SELECT c.rowid, c.entity, c.ref, c.fk_statut as status, c.facture, c.date_commande as date, s.nom as name, s.rowid as socid";
|
||||
$sql .= ", s.client";
|
||||
$sql .= ", s.code_client";
|
||||
$sql .= ", s.canvas";
|
||||
|
|
@ -314,7 +313,7 @@ if (isModEnabled('order')) {
|
|||
|
||||
print '<td class="right">'.dol_print_date($db->jdate($obj->date), 'day').'</td>'."\n";
|
||||
|
||||
print '<td class="right">'.$commandestatic->LibStatut($obj->fk_statut, $obj->facture, 3).'</td>';
|
||||
print '<td class="right">'.$commandestatic->LibStatut($obj->status, $obj->facture, 3).'</td>';
|
||||
|
||||
print '</tr>';
|
||||
$i++;
|
||||
|
|
@ -334,7 +333,7 @@ if (isModEnabled('order')) {
|
|||
* Orders that are in process
|
||||
*/
|
||||
if (isModEnabled('order')) {
|
||||
$sql = "SELECT c.rowid, c.entity, c.ref, c.fk_statut, c.facture, c.date_commande as date, s.nom as name, s.rowid as socid";
|
||||
$sql = "SELECT c.rowid, c.entity, c.ref, c.fk_statut as status, c.facture, c.date_commande as date, s.nom as name, s.rowid as socid";
|
||||
$sql .= ", s.client";
|
||||
$sql .= ", s.code_client";
|
||||
$sql .= ", s.canvas";
|
||||
|
|
@ -403,7 +402,7 @@ if (isModEnabled('order')) {
|
|||
|
||||
print '<td class="right">'.dol_print_date($db->jdate($obj->date), 'day').'</td>'."\n";
|
||||
|
||||
print '<td class="right">'.$commandestatic->LibStatut($obj->fk_statut, $obj->facture, 3).'</td>';
|
||||
print '<td class="right">'.$commandestatic->LibStatut($obj->status, $obj->facture, 3).'</td>';
|
||||
|
||||
print '</tr>';
|
||||
$i++;
|
||||
|
|
|
|||
|
|
@ -61,6 +61,7 @@ $show_files = GETPOSTINT('show_files');
|
|||
$confirm = GETPOST('confirm', 'alpha');
|
||||
$toselect = GETPOST('toselect', 'array');
|
||||
$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'orderlist';
|
||||
$optioncss = GETPOST('optioncss', 'alpha');
|
||||
$mode = GETPOST('mode', 'alpha');
|
||||
|
||||
if (getDolGlobalInt('MAIN_SEE_SUBORDINATES')) {
|
||||
|
|
@ -82,8 +83,9 @@ $search_datedelivery_start = dol_mktime(0, 0, 0, GETPOSTINT('search_datedelivery
|
|||
$search_datedelivery_end = dol_mktime(23, 59, 59, GETPOSTINT('search_datedelivery_end_month'), GETPOSTINT('search_datedelivery_end_day'), GETPOSTINT('search_datedelivery_end_year'));
|
||||
|
||||
$socid = GETPOSTINT('socid');
|
||||
|
||||
$search_all = trim((GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
|
||||
$search_product_category = GETPOSTINT('search_product_category');
|
||||
$search_product_category = GETPOST('search_product_category', 'intcomma');
|
||||
$search_ref = GETPOST('search_ref', 'alpha') != '' ? GETPOST('search_ref', 'alpha') : GETPOST('sref', 'alpha');
|
||||
$search_ref_customer = GETPOST('search_ref_customer', 'alpha');
|
||||
$search_company = GETPOST('search_company', 'alpha');
|
||||
|
|
@ -92,8 +94,8 @@ $search_parent_name = trim(GETPOST('search_parent_name', 'alphanohtml'));
|
|||
$search_town = GETPOST('search_town', 'alpha');
|
||||
$search_zip = GETPOST('search_zip', 'alpha');
|
||||
$search_state = GETPOST('search_state', 'alpha');
|
||||
$search_country = GETPOSTINT('search_country');
|
||||
$search_type_thirdparty = GETPOSTINT('search_type_thirdparty');
|
||||
$search_country = GETPOST('search_country', 'aZ09');
|
||||
$search_type_thirdparty = GETPOST('search_type_thirdparty', 'intcomma');
|
||||
$search_user = GETPOST('search_user', 'intcomma');
|
||||
$search_sale = GETPOST('search_sale', 'intcomma');
|
||||
$search_total_ht = GETPOST('search_total_ht', 'alpha');
|
||||
|
|
@ -108,18 +110,17 @@ $search_multicurrency_montant_vat = GETPOST('search_multicurrency_montant_vat',
|
|||
$search_multicurrency_montant_ttc = GETPOST('search_multicurrency_montant_ttc', 'alpha');
|
||||
|
||||
$search_login = GETPOST('search_login', 'alpha');
|
||||
$search_categ_cus = GETPOSTINT("search_categ_cus");
|
||||
$optioncss = GETPOST('optioncss', 'alpha');
|
||||
$search_billed = GETPOST('search_billed', 'int');
|
||||
$search_categ_cus = GETPOST("search_categ_cus", 'intcomma');
|
||||
$search_billed = GETPOST('search_billed', 'intcomma');
|
||||
$search_status = GETPOST('search_status', 'intcomma');
|
||||
$search_project_ref = GETPOST('search_project_ref', 'alpha');
|
||||
$search_project = GETPOST('search_project', 'alpha');
|
||||
$search_shippable = GETPOST('search_shippable', 'aZ09');
|
||||
|
||||
$search_fk_cond_reglement = GETPOSTINT('search_fk_cond_reglement');
|
||||
$search_fk_shipping_method = GETPOSTINT('search_fk_shipping_method');
|
||||
$search_fk_mode_reglement = GETPOSTINT('search_fk_mode_reglement');
|
||||
$search_fk_input_reason = GETPOSTINT('search_fk_input_reason');
|
||||
$search_fk_cond_reglement = GETPOST('search_fk_cond_reglement', 'intcomma');
|
||||
$search_fk_shipping_method = GETPOST('search_fk_shipping_method', 'intcomma');
|
||||
$search_fk_mode_reglement = GETPOST('search_fk_mode_reglement', 'intcomma');
|
||||
$search_fk_input_reason = GETPOST('search_fk_input_reason', 'intcomma');
|
||||
|
||||
$diroutputmassaction = $conf->commande->multidir_output[$conf->entity].'/temp/massgeneration/'.$user->id;
|
||||
|
||||
|
|
@ -231,7 +232,7 @@ $arrayfields = dol_sort_array($arrayfields, 'position');
|
|||
|
||||
|
||||
// Security check
|
||||
$id = (GETPOST('orderid') ? GETPOSTINT('orderid') : GETPOSTINT('id'));
|
||||
$id = GETPOSTINT('orderid', GETPOSTINT('id'));
|
||||
if ($user->socid) {
|
||||
$socid = $user->socid;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -63,6 +63,8 @@ $show_files = GETPOSTINT('show_files');
|
|||
$confirm = GETPOST('confirm', 'alpha');
|
||||
$toselect = GETPOST('toselect', 'array');
|
||||
$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'orderlistdet';
|
||||
$optioncss = GETPOST('optioncss', 'alpha');
|
||||
|
||||
$productobuy = GETPOST('productobuy', 'alpha');
|
||||
$productonly = GETPOST('productonly', 'alpha');
|
||||
$disablelinefree = GETPOST('disablelinefree', 'alpha');
|
||||
|
|
@ -90,7 +92,9 @@ if (isModEnabled('category')) {
|
|||
}
|
||||
}
|
||||
|
||||
// Détail commande
|
||||
$socid = GETPOSTINT('socid');
|
||||
|
||||
// Search filters
|
||||
$search_id = GETPOST('search_id', 'alpha');
|
||||
$search_refProduct = GETPOST('search_refProduct', 'alpha');
|
||||
$search_descProduct = GETPOST('search_descProduct', 'alpha');
|
||||
|
|
@ -102,10 +106,9 @@ $search_company_alias = GETPOST('search_company_alias', 'alpha');
|
|||
$search_town = GETPOST('search_town', 'alpha');
|
||||
$search_zip = GETPOST('search_zip', 'alpha');
|
||||
$search_state = GETPOST("search_state", 'alpha');
|
||||
$search_country = GETPOSTINT("search_country");
|
||||
$search_type_thirdparty = GETPOSTINT("search_type_thirdparty");
|
||||
$sall = trim((GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
|
||||
$socid = GETPOSTINT('socid');
|
||||
$search_country = GETPOST("search_country", 'aZ09');
|
||||
$search_type_thirdparty = GETPOST("search_type_thirdparty", 'intcomma');
|
||||
$search_all = trim((GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
|
||||
$search_user = GETPOST('search_user', 'intcomma');
|
||||
$search_sale = GETPOST('search_sale', 'intcomma');
|
||||
$search_total_ht = GETPOST('search_total_ht', 'alpha');
|
||||
|
|
@ -118,8 +121,7 @@ $search_multicurrency_montant_ht = GETPOST('search_multicurrency_montant_ht', 'a
|
|||
$search_multicurrency_montant_vat = GETPOST('search_multicurrency_montant_vat', 'alpha');
|
||||
$search_multicurrency_montant_ttc = GETPOST('search_multicurrency_montant_ttc', 'alpha');
|
||||
$search_login = GETPOST('search_login', 'alpha');
|
||||
$search_categ_cus = GETPOSTINT("search_categ_cus");
|
||||
$optioncss = GETPOST('optioncss', 'alpha');
|
||||
$search_categ_cus = GETPOST("search_categ_cus", 'intcomma');
|
||||
$search_billed = GETPOST('search_billed', 'intcomma') ? GETPOST('search_billed', 'intcomma') : GETPOST('billed', 'intcomma');
|
||||
$search_status = GETPOST('search_status', 'intcomma');
|
||||
$search_project_ref = GETPOST('search_project_ref', 'alpha');
|
||||
|
|
@ -373,7 +375,7 @@ $help_url = "EN:Module_Customers_Orders|FR:Module_Commandes_Clients|ES:Módulo_P
|
|||
// llxHeader('',$title,$help_url);
|
||||
|
||||
$sql = 'SELECT';
|
||||
if ($sall || $search_product_category_array > 0 || $search_user > 0) {
|
||||
if ($search_all || $search_product_category_array > 0 || $search_user > 0) {
|
||||
$sql = 'SELECT DISTINCT';
|
||||
}
|
||||
$sql .= ' s.rowid as socid, s.nom as name, s.name_alias as alias, s.email, s.phone, s.fax, s.address, s.town, s.zip, s.fk_pays, s.client, s.code_client,';
|
||||
|
|
@ -464,8 +466,8 @@ if ($search_ref) {
|
|||
if ($search_ref_customer) {
|
||||
$sql .= natural_search('c.ref_client', $search_ref_customer);
|
||||
}
|
||||
if ($sall) {
|
||||
$sql .= natural_search(array_keys($fieldstosearchall), $sall);
|
||||
if ($search_all) {
|
||||
$sql .= natural_search(array_keys($fieldstosearchall), $search_all);
|
||||
}
|
||||
if ($search_billed != '' && $search_billed >= 0) {
|
||||
$sql .= ' AND c.facture = '.((int) $search_billed);
|
||||
|
|
@ -697,7 +699,7 @@ if ($resql) {
|
|||
|
||||
$arrayofselected = is_array($toselect) ? $toselect : array();
|
||||
|
||||
if ($num == 1 && getDolGlobalString('MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE') && $sall) {
|
||||
if ($num == 1 && getDolGlobalString('MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE') && $search_all) {
|
||||
$obj = $db->fetch_object($resql);
|
||||
$id = $obj->rowid;
|
||||
header("Location: ".DOL_URL_ROOT.'/commande/card.php?id='.$id);
|
||||
|
|
@ -714,8 +716,8 @@ if ($resql) {
|
|||
if ($limit > 0 && $limit != $conf->liste_limit) {
|
||||
$param .= '&limit='.((int) $limit);
|
||||
}
|
||||
if ($sall) {
|
||||
$param .= '&sall='.urlencode($sall);
|
||||
if ($search_all) {
|
||||
$param .= '&search_all='.urlencode($search_all);
|
||||
}
|
||||
if ($socid > 0) {
|
||||
$param .= '&socid='.urlencode((string) ($socid));
|
||||
|
|
@ -902,11 +904,11 @@ if ($resql) {
|
|||
$trackid = 'ord'.$object->id;
|
||||
include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
|
||||
|
||||
if ($sall) {
|
||||
if ($search_all) {
|
||||
foreach ($fieldstosearchall as $key => $val) {
|
||||
$fieldstosearchall[$key] = $langs->trans($val);
|
||||
}
|
||||
print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall).implode(', ', $fieldstosearchall).'</div>';
|
||||
print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).implode(', ', $fieldstosearchall).'</div>';
|
||||
}
|
||||
|
||||
$moreforfilter = '';
|
||||
|
|
|
|||
|
|
@ -291,7 +291,7 @@ if ($mode == 'supplier') {
|
|||
|
||||
complete_head_from_modules($conf, $langs, null, $head, $h, $type);
|
||||
|
||||
print dol_get_fiche_head($head, 'byyear', $langs->trans("Statistics"), -1);
|
||||
print dol_get_fiche_head($head, 'byyear', '', -1);
|
||||
|
||||
|
||||
print '<div class="fichecenter"><div class="fichethirdleft">';
|
||||
|
|
|
|||
|
|
@ -227,7 +227,7 @@ $h++;
|
|||
|
||||
complete_head_from_modules($conf, $langs, null, $head, $h, 'trip_stats');
|
||||
|
||||
print dol_get_fiche_head($head, 'byyear', $langs->trans("Statistics"), -1);
|
||||
print dol_get_fiche_head($head, 'byyear', '', -1);
|
||||
|
||||
|
||||
print '<div class="fichecenter"><div class="fichethirdleft">';
|
||||
|
|
|
|||
|
|
@ -1391,16 +1391,6 @@ class FactureRec extends CommonInvoice
|
|||
$error++;
|
||||
}
|
||||
}
|
||||
if (!$error && !$notrigger) {
|
||||
// Call trigger
|
||||
$result = $facturerec->call_trigger('BILLREC_CREATEBILL', $user);
|
||||
if ($result < 0) {
|
||||
$this->errors = $facturerec->errors;
|
||||
$this->error = $facturerec->error;
|
||||
$error++;
|
||||
}
|
||||
// End call triggers
|
||||
}
|
||||
} else {
|
||||
$error++;
|
||||
$this->error = "Failed to load invoice template with id=".$line->rowid.", entity=".$conf->entity."\n";
|
||||
|
|
|
|||
|
|
@ -1090,7 +1090,6 @@ class Facture extends CommonInvoice
|
|||
if ($result < 0) {
|
||||
$error++;
|
||||
}
|
||||
// End call triggers
|
||||
}
|
||||
|
||||
if (!$error) {
|
||||
|
|
|
|||
|
|
@ -41,9 +41,8 @@ if (isset($user->socid) && $user->socid > 0) {
|
|||
$socid = $user->socid;
|
||||
}
|
||||
|
||||
$max = getDolGlobalInt('MAIN_SIZE_SHORTLIST_LIMIT');
|
||||
|
||||
// Maximum elements of the tables
|
||||
$max = getDolGlobalInt('MAIN_SIZE_SHORTLIST_LIMIT', 5);
|
||||
$maxDraftCount = !getDolGlobalString('MAIN_MAXLIST_OVERLOAD') ? $max : $conf->global->MAIN_MAXLIST_OVERLOAD;
|
||||
$maxOpenCount = !getDolGlobalString('MAIN_MAXLIST_OVERLOAD') ? $max : $conf->global->MAIN_MAXLIST_OVERLOAD;
|
||||
|
||||
|
|
|
|||
|
|
@ -106,16 +106,16 @@ $search_multicurrency_montant_ht = GETPOST('search_multicurrency_montant_ht', 'a
|
|||
$search_multicurrency_montant_vat = GETPOST('search_multicurrency_montant_vat', 'alpha');
|
||||
$search_multicurrency_montant_ttc = GETPOST('search_multicurrency_montant_ttc', 'alpha');
|
||||
$search_status = GETPOST('search_status', 'intcomma');
|
||||
$search_paymentmode = GETPOSTINT('search_paymentmode');
|
||||
$search_paymentterms = GETPOSTINT('search_paymentterms');
|
||||
$search_paymentmode = GETPOST('search_paymentmode', 'intcomma');
|
||||
$search_paymentterms = GETPOST('search_paymentterms', 'intcomma');
|
||||
$search_module_source = GETPOST('search_module_source', 'alpha');
|
||||
$search_pos_source = GETPOST('search_pos_source', 'alpha');
|
||||
$search_town = GETPOST('search_town', 'alpha');
|
||||
$search_zip = GETPOST('search_zip', 'alpha');
|
||||
$search_state = GETPOST("search_state");
|
||||
$search_country = GETPOST("search_country", 'alpha');
|
||||
$search_country = GETPOST("search_country", 'aZ09');
|
||||
$search_customer_code = GETPOST("search_customer_code", 'alphanohtml');
|
||||
$search_type_thirdparty = GETPOSTINT("search_type_thirdparty");
|
||||
$search_type_thirdparty = GETPOST("search_type_thirdparty", 'intcomma');
|
||||
$search_user = GETPOST('search_user', 'intcomma');
|
||||
$search_sale = GETPOST('search_sale', 'intcomma');
|
||||
$search_date_startday = GETPOSTINT('search_date_startday');
|
||||
|
|
@ -142,8 +142,8 @@ $search_datelimit_endmonth = GETPOSTINT('search_datelimit_endmonth');
|
|||
$search_datelimit_endyear = GETPOSTINT('search_datelimit_endyear');
|
||||
$search_datelimit_start = dol_mktime(0, 0, 0, $search_datelimit_startmonth, $search_datelimit_startday, $search_datelimit_startyear);
|
||||
$search_datelimit_end = dol_mktime(23, 59, 59, $search_datelimit_endmonth, $search_datelimit_endday, $search_datelimit_endyear);
|
||||
$search_categ_cus = GETPOSTINT("search_categ_cus");
|
||||
$search_product_category = GETPOSTINT('search_product_category');
|
||||
$search_categ_cus = GETPOST("search_categ_cus", 'intcomma');
|
||||
$search_product_category = GETPOST('search_product_category', 'intcomma');
|
||||
$search_fac_rec_source_title = GETPOST("search_fac_rec_source_title", 'alpha');
|
||||
|
||||
$search_late = GETPOST('search_late');
|
||||
|
|
|
|||
|
|
@ -263,7 +263,7 @@ if ($mode == 'supplier') {
|
|||
|
||||
complete_head_from_modules($conf, $langs, null, $head, $h, $type);
|
||||
|
||||
print dol_get_fiche_head($head, 'byyear', $langs->trans("Statistics"), -1);
|
||||
print dol_get_fiche_head($head, 'byyear', '', -1);
|
||||
|
||||
print '<div class="fichecenter"><div class="fichethirdleft">';
|
||||
|
||||
|
|
|
|||
|
|
@ -67,9 +67,8 @@ if ($user->socid > 0) {
|
|||
$socid = $user->socid;
|
||||
}
|
||||
|
||||
$max = getDolGlobalInt('MAIN_SIZE_SHORTLIST_LIMIT');
|
||||
|
||||
// Maximum elements of the tables
|
||||
$max = getDolGlobalInt('MAIN_SIZE_SHORTLIST_LIMIT', 5);
|
||||
$maxDraftCount = !getDolGlobalString('MAIN_MAXLIST_OVERLOAD') ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD;
|
||||
$maxLatestEditCount = 5;
|
||||
$maxOpenCount = !getDolGlobalString('MAIN_MAXLIST_OVERLOAD') ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD;
|
||||
|
|
|
|||
|
|
@ -177,8 +177,8 @@ foreach ($arrayofpaymentmodetomanage as $val) {
|
|||
print '<td class="nowraponall">'.$checkdepositstatic->getNomUrl(1).'</td>';
|
||||
print '<td>'.dol_print_date($db->jdate($objp->db), 'day').'</td>';
|
||||
print '<td class="nowraponall">'.$accountstatic->getNomUrl(1).'</td>';
|
||||
print '<td class="right">'.$objp->nbcheque.'</td>';
|
||||
print '<td class="right"><span class="amount">'.price($objp->amount).'</span></td>';
|
||||
print '<td class="right">'.dol_escape_htmltag($objp->nbcheque).'</td>';
|
||||
print '<td class="right"><span class="amount nowraponall">'.price($objp->amount).'</span></td>';
|
||||
print '<td class="right">'.$checkdepositstatic->LibStatut($objp->status, 3).'</td>';
|
||||
|
||||
print '</tr>';
|
||||
|
|
|
|||
|
|
@ -87,7 +87,7 @@ $month = GETPOSTINT("month");
|
|||
$search_societe = GETPOST("search_societe", 'alpha');
|
||||
$search_zip = GETPOST("search_zip", 'alpha');
|
||||
$search_town = GETPOST("search_town", 'alpha');
|
||||
$search_country = GETPOST("search_country", 'alpha');
|
||||
$search_country = GETPOST("search_country", 'aZ09');
|
||||
$date_startyear = GETPOSTINT("date_startyear");
|
||||
$date_startmonth = GETPOSTINT("date_startmonth");
|
||||
$date_startday = GETPOSTINT("date_startday");
|
||||
|
|
|
|||
|
|
@ -69,7 +69,7 @@ $hookmanager->initHooks(array('supplierturnoverbythirdpartylist'));
|
|||
$search_societe = GETPOST("search_societe", 'alpha');
|
||||
$search_zip = GETPOST("search_zip", 'alpha');
|
||||
$search_town = GETPOST("search_town", 'alpha');
|
||||
$search_country = GETPOST("search_country", 'alpha');
|
||||
$search_country = GETPOST("search_country", 'aZ09');
|
||||
|
||||
|
||||
// Date range
|
||||
|
|
|
|||
|
|
@ -101,20 +101,20 @@ if (isModEnabled('socialnetworks')) {
|
|||
}
|
||||
}
|
||||
$search_priv = GETPOST("search_priv", 'alpha');
|
||||
$search_sale = GETPOSTINT('search_sale');
|
||||
$search_categ = GETPOSTINT("search_categ");
|
||||
$search_categ_thirdparty = GETPOSTINT("search_categ_thirdparty");
|
||||
$search_categ_supplier = GETPOSTINT("search_categ_supplier");
|
||||
$search_sale = GETPOST('search_sale', 'intcomma');
|
||||
$search_categ = GETPOST("search_categ", 'intcomma');
|
||||
$search_categ_thirdparty = GETPOST("search_categ_thirdparty", 'intcomma');
|
||||
$search_categ_supplier = GETPOST("search_categ_supplier", 'intcomma');
|
||||
$search_status = GETPOST("search_status", "intcomma");
|
||||
$search_type = GETPOST('search_type', 'alpha');
|
||||
$search_address = GETPOST('search_address', 'alpha');
|
||||
$search_zip = GETPOST('search_zip', 'alpha');
|
||||
$search_town = GETPOST('search_town', 'alpha');
|
||||
$search_import_key = GETPOST("search_import_key", 'alpha');
|
||||
$search_country = GETPOST("search_country", 'intcomma');
|
||||
$search_country = GETPOST("search_country", 'aZ09');
|
||||
$search_roles = GETPOST("search_roles", 'array');
|
||||
$search_level = GETPOST("search_level", 'array');
|
||||
$search_stcomm = GETPOSTINT('search_stcomm');
|
||||
$search_stcomm = GETPOST('search_stcomm', 'intcomma');
|
||||
$search_birthday_start = dol_mktime(0, 0, 0, GETPOSTINT('search_birthday_startmonth'), GETPOSTINT('search_birthday_startday'), GETPOSTINT('search_birthday_startyear'));
|
||||
$search_birthday_end = dol_mktime(23, 59, 59, GETPOSTINT('search_birthday_endmonth'), GETPOSTINT('search_birthday_endday'), GETPOSTINT('search_birthday_endyear'));
|
||||
|
||||
|
|
|
|||
|
|
@ -44,6 +44,8 @@ $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTI
|
|||
|
||||
$statut = GETPOST('statut') ? GETPOST('statut') : 1;
|
||||
|
||||
$max = getDolGlobalInt('MAIN_SIZE_SHORTLIST_LIMIT', 5);
|
||||
|
||||
// Security check
|
||||
$socid = 0;
|
||||
$id = GETPOSTINT('id');
|
||||
|
|
@ -58,6 +60,7 @@ $staticcontratligne = new ContratLigne($db);
|
|||
$productstatic = new Product($db);
|
||||
|
||||
|
||||
|
||||
/*
|
||||
* Action
|
||||
*/
|
||||
|
|
@ -315,7 +318,6 @@ print '</div><div class="fichetwothirdright">';
|
|||
|
||||
|
||||
// Last modified contracts
|
||||
$max = 5;
|
||||
$sql = 'SELECT ';
|
||||
$sql .= " sum(".$db->ifsql("cd.statut=0", 1, 0).') as nb_initial,';
|
||||
$sql .= " sum(".$db->ifsql("cd.statut=4 AND (cd.date_fin_validite IS NULL OR cd.date_fin_validite >= '".$db->idate($now)."')", 1, 0).') as nb_running,';
|
||||
|
|
@ -353,7 +355,7 @@ if ($result) {
|
|||
print '<div class="div-table-responsive-no-min">';
|
||||
print '<table class="noborder centpercent">';
|
||||
|
||||
print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("LastContracts", 5).'</th>';
|
||||
print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("LastContracts", $max).'</th>';
|
||||
print '<th class="center">'.$langs->trans("DateModification").'</th>';
|
||||
//print '<th class="left">'.$langs->trans("Status").'</th>';
|
||||
print '<th class="center" width="80" colspan="4">'.$langs->trans("Services").'</th>';
|
||||
|
|
|
|||
|
|
@ -56,22 +56,23 @@ $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'co
|
|||
$optioncss = GETPOST('optioncss', 'alpha');
|
||||
$mode = GETPOST('mode', 'alpha');
|
||||
|
||||
$socid = GETPOSTINT('socid');
|
||||
|
||||
$search_name = GETPOST('search_name', 'alpha');
|
||||
$search_email = GETPOST('search_email', 'alpha');
|
||||
$search_town = GETPOST('search_town', 'alpha');
|
||||
$search_zip = GETPOST('search_zip', 'alpha');
|
||||
$search_state = GETPOST("search_state", 'alpha');
|
||||
$search_country = GETPOSTINT("search_country");
|
||||
$search_type_thirdparty = GETPOSTINT("search_type_thirdparty");
|
||||
$search_country = GETPOST("search_country", 'aZ09');
|
||||
$search_type_thirdparty = GETPOST("search_type_thirdparty", 'intcomma');
|
||||
$search_contract = GETPOST('search_contract', 'alpha');
|
||||
$search_ref_customer = GETPOST('search_ref_customer', 'alpha');
|
||||
$search_ref_supplier = GETPOST('search_ref_supplier', 'alpha');
|
||||
$search_all = (GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml');
|
||||
$search_status = GETPOST('search_status', 'alpha');
|
||||
$socid = GETPOSTINT('socid');
|
||||
$search_user = GETPOST('search_user', 'intcomma');
|
||||
$search_sale = GETPOSTINT('search_sale');
|
||||
$search_product_category = GETPOSTINT('search_product_category');
|
||||
$search_sale = GETPOST('search_sale', 'intcomma');
|
||||
$search_product_category = GETPOST('search_product_category', 'intcomma');
|
||||
$search_dfmonth = GETPOSTINT('search_dfmonth');
|
||||
$search_dfyear = GETPOSTINT('search_dfyear');
|
||||
$search_op2df = GETPOST('search_op2df', 'alpha');
|
||||
|
|
|
|||
|
|
@ -158,7 +158,7 @@ class Conf extends stdClass
|
|||
// TODO Remove this part.
|
||||
|
||||
/**
|
||||
* @var stdClass Supplier
|
||||
* @var stdClass Supplier
|
||||
*/
|
||||
public $fournisseur;
|
||||
|
||||
|
|
@ -582,10 +582,6 @@ class Conf extends stdClass
|
|||
} elseif (preg_match('/^MAIN_MODULE_([0-9A-Z_]+)$/i', $key, $reg)) {
|
||||
// If this is a module constant (must be at end)
|
||||
$modulename = strtolower($reg[1]);
|
||||
$mapping = $this->deprecatedProperties();
|
||||
if (array_key_exists($modulename, $mapping)) {
|
||||
$modulename = $mapping[$modulename];
|
||||
}
|
||||
$this->modules[$modulename] = $modulename; // Add this module in list of enabled modules
|
||||
|
||||
// deprecated in php 8.2
|
||||
|
|
@ -594,7 +590,18 @@ class Conf extends stdClass
|
|||
$this->$modulename = new stdClass(); // We need this to use the ->enabled and the ->multidir, ->dir...
|
||||
}
|
||||
$this->$modulename->enabled = true; // TODO Remove this
|
||||
//}
|
||||
|
||||
// Duplicate entry with the new name
|
||||
$mapping = $this->deprecatedProperties();
|
||||
if (array_key_exists($modulename, $mapping)) {
|
||||
$newmodulename = $mapping[$modulename];
|
||||
$this->modules[$newmodulename] = $newmodulename;
|
||||
|
||||
if (!isset($this->$newmodulename) || !is_object($this->$newmodulename)) {
|
||||
$this->$newmodulename = new stdClass(); // We need this to use the ->enabled and the ->multidir, ->dir...
|
||||
}
|
||||
$this->$newmodulename->enabled = true; // TODO Remove this
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6209,8 +6209,14 @@ function print_fleche_navigation($page, $file, $options = '', $nextpage = 0, $be
|
|||
$pagesizechoices = getDolGlobalString('MAIN_PAGESIZE_CHOICES');
|
||||
}
|
||||
|
||||
print '<li class="pagination">';
|
||||
print '<select class="flat selectlimit" name="limit" title="'.dol_escape_htmltag($langs->trans("MaxNbOfRecordPerPage")).'">';
|
||||
if (getDolGlobalString('MAIN_USE_HTML5_LIMIT_SELECTOR')) {
|
||||
print '<li class="pagination">';
|
||||
print '<input onfocus="this.value=null;" onchange="this.blur();" class="flat selectlimit nopadding maxwidth75 right pageplusone" id="limit" name="limit" list="limitlist" title="'.dol_escape_htmltag($langs->trans("MaxNbOfRecordPerPage")).'" value="'.$limit.'">';
|
||||
print '<datalist id="limitlist">';
|
||||
} else {
|
||||
print '<li class="paginationxxx">';
|
||||
print '<select class="flat selectlimit nopadding maxwidth75 center" id="limit" name="limit" title="'.dol_escape_htmltag($langs->trans("MaxNbOfRecordPerPage")).'">';
|
||||
}
|
||||
$tmpchoice = explode(',', $pagesizechoices);
|
||||
$tmpkey = $limit.':'.$limit;
|
||||
if (!in_array($tmpkey, $tmpchoice)) {
|
||||
|
|
@ -6233,7 +6239,13 @@ function print_fleche_navigation($page, $file, $options = '', $nextpage = 0, $be
|
|||
print '<option name="'.$key.'"'.$selected.'>'.dol_escape_htmltag($val).'</option>'."\n";
|
||||
}
|
||||
}
|
||||
print '</select>';
|
||||
if (getDolGlobalString('MAIN_USE_HTML5_LIMIT_SELECTOR')) {
|
||||
print '</datalist>';
|
||||
} else {
|
||||
print '</select>';
|
||||
print ajax_combobox("limit");
|
||||
}
|
||||
|
||||
if ($conf->use_javascript_ajax) {
|
||||
print '<!-- JS CODE TO ENABLE select limit to launch submit of page -->
|
||||
<script>
|
||||
|
|
@ -12641,14 +12653,14 @@ function getNonce()
|
|||
* @param string $header The first left header of the table (automatic translated)
|
||||
* @param string $link (optional) The link to a internal dolibarr page, when click on the number (without the first "/")
|
||||
* @param string $arguments (optional) Additional arguments for the link (e.g. "search_status=0")
|
||||
* @param integer $emptyRows (optional) The count of empty columns after the first column
|
||||
* @param integer $emptyColumns (optional) Number of empty columns to add after the first column
|
||||
* @param integer $number (optional) The number that is shown right after the first header, when not set the link is shown on the right side of the header as "FullList"
|
||||
* @param string $pictofulllist (optional) The picto to use for the full list link
|
||||
* @return void
|
||||
*
|
||||
* @see finishSimpleTable()
|
||||
*/
|
||||
function startSimpleTable($header, $link = "", $arguments = "", $emptyRows = 0, $number = -1, $pictofulllist = '')
|
||||
function startSimpleTable($header, $link = "", $arguments = "", $emptyColumns = 0, $number = -1, $pictofulllist = '')
|
||||
{
|
||||
global $langs;
|
||||
|
||||
|
|
@ -12656,7 +12668,7 @@ function startSimpleTable($header, $link = "", $arguments = "", $emptyRows = 0,
|
|||
print '<table class="noborder centpercent">';
|
||||
print '<tr class="liste_titre">';
|
||||
|
||||
print $emptyRows < 1 ? '<th>' : '<th colspan="'.($emptyRows + 1).'">';
|
||||
print ($emptyColumns < 1) ? '<th>' : '<th colspan="'.($emptyColumns + 1).'">';
|
||||
|
||||
print $langs->trans($header);
|
||||
|
||||
|
|
|
|||
|
|
@ -33,12 +33,12 @@ function mailmanspip_admin_prepare_head()
|
|||
return array(
|
||||
array(
|
||||
DOL_URL_ROOT.'/admin/mailman.php',
|
||||
$langs->trans('Mailman'),
|
||||
'Mailman',
|
||||
'mailman'
|
||||
),
|
||||
array(
|
||||
DOL_URL_ROOT.'/admin/spip.php',
|
||||
$langs->trans('SPIP'),
|
||||
'SPIP',
|
||||
'spip'
|
||||
)
|
||||
);
|
||||
|
|
|
|||
|
|
@ -1346,7 +1346,7 @@ function get_left_menu_thridparties($mainmenu, &$newmenu, $usemenuhider = 1, $le
|
|||
*/
|
||||
function get_left_menu_commercial($mainmenu, &$newmenu, $usemenuhider = 1, $leftmenu = 'none', $type_user = 0)
|
||||
{
|
||||
global $user, $conf, $langs;
|
||||
global $user, $langs;
|
||||
|
||||
if ($mainmenu == 'commercial') {
|
||||
$langs->load("companies");
|
||||
|
|
|
|||
|
|
@ -38,30 +38,33 @@
|
|||
class DolibarrModules // Can not be abstract, because we need to instantiate it into unActivateModule to be able to disable a module whose files were removed.
|
||||
{
|
||||
/**
|
||||
* @var DoliDB Database handler
|
||||
* @var DoliDB Database handler
|
||||
*/
|
||||
public $db;
|
||||
|
||||
/**
|
||||
* @var int Module unique ID
|
||||
* @var int Module unique ID
|
||||
* @see https://wiki.dolibarr.org/index.php/List_of_modules_id
|
||||
*/
|
||||
public $numero;
|
||||
|
||||
/**
|
||||
* @var string Publisher name
|
||||
* @since 4.0.0
|
||||
* @var string Publisher name
|
||||
*/
|
||||
public $editor_name;
|
||||
|
||||
/**
|
||||
* @var string URL of module at publisher site
|
||||
* @since 4.0.0
|
||||
* @var string URL of module at publisher site
|
||||
*/
|
||||
public $editor_url;
|
||||
|
||||
/**
|
||||
* @var string Family
|
||||
* @var string URL of logo of the publisher. Must be image filename into the module/img directory followed with @modulename. Example: 'myimage.png@mymodule'.
|
||||
*/
|
||||
public $editor_squarred_logo;
|
||||
|
||||
/**
|
||||
* @var string Family
|
||||
* @see $familyinfo
|
||||
*
|
||||
* Native values: 'crm', 'financial', 'hr', 'projects', 'products', 'ecm', 'technic', 'other'.
|
||||
|
|
@ -84,12 +87,12 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
|
|||
public $familyinfo;
|
||||
|
||||
/**
|
||||
* @var string Module position on 2 digits
|
||||
* @var string Module position on 2 digits
|
||||
*/
|
||||
public $module_position = '50';
|
||||
|
||||
/**
|
||||
* @var string Module name
|
||||
* @var string Module name
|
||||
*
|
||||
* Only used if Module[ID]Name translation string is not found.
|
||||
*
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@ if (!empty($extrafieldsobjectkey) && !empty($extrafields->attributes[$extrafield
|
|||
$totalarray['nbfield']++;
|
||||
}
|
||||
|
||||
if ($extrafields->attributes[$extrafieldsobjectkey]['totalizable'][$key]) {
|
||||
if (!empty($extrafields->attributes[$extrafieldsobjectkey]['totalizable'][$key])) {
|
||||
if (!$i) {
|
||||
// we keep position for the first line
|
||||
$totalarray['totalizable'][$key]['pos'] = $totalarray['nbfield'];
|
||||
|
|
@ -75,7 +75,7 @@ if (!empty($extrafieldsobjectkey) && !empty($extrafields->attributes[$extrafield
|
|||
$totalarray['totalizable'][$key]['total'] += $obj->$tmpkey;
|
||||
}
|
||||
}
|
||||
// key 'totalizable' if in extrafields same as 'isameasure' into ->$fields
|
||||
// The key 'totalizable' on extrafields, is the same as 'isameasure' into ->fields
|
||||
if (!empty($extrafields->attributes[$extrafieldsobjectkey]['totalizable'][$key]) && $extrafields->attributes[$extrafieldsobjectkey]['totalizable'][$key] == 1) {
|
||||
if (!$i) {
|
||||
$totalarray['pos'][$totalarray['nbfield']] = $extrafieldsobjectprefix.$tmpkey;
|
||||
|
|
@ -86,7 +86,12 @@ if (!empty($extrafieldsobjectkey) && !empty($extrafields->attributes[$extrafield
|
|||
if (!isset($totalarray['val'][$extrafieldsobjectprefix.$tmpkey])) {
|
||||
$totalarray['val'][$extrafieldsobjectprefix.$tmpkey] = 0;
|
||||
}
|
||||
$totalarray['val'][$extrafieldsobjectprefix.$tmpkey] += $obj->$tmpkey;
|
||||
if (isset($obj->$tmpkey) && is_numeric($obj->$tmpkey)) {
|
||||
if (!isset($totalarray['val'][$extrafieldsobjectprefix.$tmpkey])) {
|
||||
$totalarray['val'][$extrafieldsobjectprefix.$tmpkey] = 0;
|
||||
}
|
||||
$totalarray['val'][$extrafieldsobjectprefix.$tmpkey] += $obj->$tmpkey;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -190,7 +190,7 @@ $type = 'donation_stats';
|
|||
|
||||
complete_head_from_modules($conf, $langs, null, $head, $h, $type);
|
||||
|
||||
print dol_get_fiche_head($head, 'byyear', $langs->trans("Statistics"), -1);
|
||||
print dol_get_fiche_head($head, 'byyear', '', -1);
|
||||
|
||||
|
||||
print '<div class="fichecenter"><div class="fichethirdleft">';
|
||||
|
|
|
|||
|
|
@ -33,7 +33,8 @@ $langs->loadLangs(array("eventorganization"));
|
|||
|
||||
$action = GETPOST('action', 'aZ09');
|
||||
|
||||
$max = 5;
|
||||
$NBMAX = getDolGlobalString('MAIN_SIZE_SHORTLIST_LIMIT', 5);
|
||||
$max = getDolGlobalInt('MAIN_SIZE_SHORTLIST_LIMIT', 5);
|
||||
$now = dol_now();
|
||||
|
||||
// Security check
|
||||
|
|
@ -147,9 +148,6 @@ END MODULEBUILDER DRAFT MYOBJECT */
|
|||
print '</div><div class="fichetwothirdright">';
|
||||
|
||||
|
||||
$NBMAX = getDolGlobalString('MAIN_SIZE_SHORTLIST_LIMIT');
|
||||
$max = getDolGlobalInt('MAIN_SIZE_SHORTLIST_LIMIT');
|
||||
|
||||
/* BEGIN MODULEBUILDER LASTMODIFIED MYOBJECT
|
||||
// Last modified myobject
|
||||
if (isModEnabled('eventorganization') && $user->rights->eventorganization->read)
|
||||
|
|
|
|||
|
|
@ -60,9 +60,9 @@ $search_shipping_method_ids = GETPOST('search_shipping_method_ids', 'array:int')
|
|||
$search_tracking = GETPOST("search_tracking", 'alpha');
|
||||
$search_town = GETPOST('search_town', 'alpha');
|
||||
$search_zip = GETPOST('search_zip', 'alpha');
|
||||
$search_state = GETPOST("search_state");
|
||||
$search_country = GETPOSTINT("search_country");
|
||||
$search_type_thirdparty = GETPOSTINT("search_type_thirdparty");
|
||||
$search_state = GETPOST("search_state", 'alpha');
|
||||
$search_country = GETPOST("search_country", 'aZ09');
|
||||
$search_type_thirdparty = GETPOST("search_type_thirdparty", 'intcomma');
|
||||
$search_billed = GETPOST("search_billed", 'intcomma');
|
||||
$search_datedelivery_start = dol_mktime(0, 0, 0, GETPOSTINT('search_datedelivery_startmonth'), GETPOSTINT('search_datedelivery_startday'), GETPOSTINT('search_datedelivery_startyear'));
|
||||
$search_datedelivery_end = dol_mktime(23, 59, 59, GETPOSTINT('search_datedelivery_endmonth'), GETPOSTINT('search_datedelivery_endday'), GETPOSTINT('search_datedelivery_endyear'));
|
||||
|
|
@ -71,8 +71,8 @@ $search_datereceipt_end = dol_mktime(23, 59, 59, GETPOSTINT('search_datereceipt_
|
|||
$search_all = trim((GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
|
||||
$search_user = GETPOST('search_user', 'intcomma');
|
||||
$search_sale = GETPOST('search_sale', 'intcomma');
|
||||
$search_categ_cus = GETPOSTINT("search_categ_cus");
|
||||
$search_product_category = GETPOSTINT('search_product_category');
|
||||
$search_categ_cus = GETPOST("search_categ_cus", 'intcomma');
|
||||
$search_product_category = GETPOST('search_product_category', 'intcomma');
|
||||
|
||||
$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
|
||||
$sortfield = GETPOST('sortfield', 'aZ09comma');
|
||||
|
|
|
|||
|
|
@ -210,7 +210,7 @@ $type = 'shipment_stats';
|
|||
|
||||
complete_head_from_modules($conf, $langs, null, $head, $h, $type);
|
||||
|
||||
print dol_get_fiche_head($head, 'byyear', $langs->trans("Statistics"), -1);
|
||||
print dol_get_fiche_head($head, 'byyear', '', -1);
|
||||
|
||||
|
||||
print '<div class="fichecenter"><div class="fichethirdleft">';
|
||||
|
|
|
|||
|
|
@ -41,13 +41,6 @@ $hookmanager->initHooks(array('expensereportindex'));
|
|||
// Load translation files required by the page
|
||||
$langs->loadLangs(array('companies', 'users', 'trips'));
|
||||
|
||||
// Security check
|
||||
$socid = GETPOSTINT('socid');
|
||||
if ($user->socid) {
|
||||
$socid = $user->socid;
|
||||
}
|
||||
$result = restrictedArea($user, 'expensereport', '', '');
|
||||
|
||||
$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
|
||||
$sortfield = GETPOST('sortfield', 'aZ09comma');
|
||||
$sortorder = GETPOST('sortorder', 'aZ09comma');
|
||||
|
|
@ -66,7 +59,14 @@ if (!$sortfield) {
|
|||
}
|
||||
$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
|
||||
|
||||
$max = getDolGlobalInt('MAIN_SIZE_SHORTLIST_LIMIT');
|
||||
$max = getDolGlobalInt('MAIN_SIZE_SHORTLIST_LIMIT', 5);
|
||||
|
||||
// Security check
|
||||
$socid = GETPOSTINT('socid');
|
||||
if ($user->socid) {
|
||||
$socid = $user->socid;
|
||||
}
|
||||
$result = restrictedArea($user, 'expensereport', '', '');
|
||||
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -212,7 +212,7 @@ $h++;
|
|||
|
||||
complete_head_from_modules($conf, $langs, null, $head, $h, 'trip_stats');
|
||||
|
||||
print dol_get_fiche_head($head, 'byyear', $langs->trans("Statistics"), -1);
|
||||
print dol_get_fiche_head($head, 'byyear', '', -1);
|
||||
|
||||
|
||||
print '<div class="fichecenter"><div class="fichethirdleft">';
|
||||
|
|
|
|||
|
|
@ -50,6 +50,7 @@ if ($user->socid > 0) {
|
|||
$socid = $user->socid;
|
||||
}
|
||||
|
||||
$max = getDolGlobalInt('MAIN_SIZE_SHORTLIST_LIMIT', 5);
|
||||
|
||||
|
||||
/*
|
||||
|
|
@ -68,9 +69,7 @@ print load_fiche_titre($langs->trans("InterventionsArea"), '', 'intervention');
|
|||
|
||||
print '<div class="fichecenter"><div class="fichethirdleft">';
|
||||
|
||||
/*
|
||||
* Statistics
|
||||
*/
|
||||
// Statistics
|
||||
|
||||
$sql = "SELECT count(f.rowid), f.fk_statut";
|
||||
$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
|
||||
|
|
@ -217,8 +216,6 @@ if (isModEnabled('intervention')) {
|
|||
print '</div><div class="fichetwothirdright">';
|
||||
|
||||
|
||||
$max = 5;
|
||||
|
||||
/*
|
||||
* Last modified interventions
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -835,11 +835,12 @@ while ($i < $imaxinloop) {
|
|||
$totalarray['nbfield']++;
|
||||
}
|
||||
}
|
||||
|
||||
// Picto + Ref
|
||||
if (!empty($arrayfields['f.ref']['checked'])) {
|
||||
print "<td>";
|
||||
|
||||
print '<table class="nobordernopadding"><tr class="nocellnopadd">';
|
||||
// Picto + Ref
|
||||
print '<td class="nobordernopadding nowraponall">';
|
||||
print $objectstatic->getNomUrl(1);
|
||||
print '</td>';
|
||||
|
|
@ -871,8 +872,9 @@ while ($i < $imaxinloop) {
|
|||
$totalarray['nbfield']++;
|
||||
}
|
||||
}
|
||||
|
||||
// Customer ref
|
||||
if (!empty($arrayfields['f.ref_client']['checked'])) {
|
||||
// Customer ref
|
||||
print '<td class="nowrap tdoverflowmax200">';
|
||||
print dol_escape_htmltag($obj->ref_client);
|
||||
print '</td>';
|
||||
|
|
@ -880,16 +882,18 @@ while ($i < $imaxinloop) {
|
|||
$totalarray['nbfield']++;
|
||||
}
|
||||
}
|
||||
// Third party
|
||||
if (!empty($arrayfields['s.nom']['checked'])) {
|
||||
print '<td>';
|
||||
print '<td class="tdoverflowmax125">';
|
||||
print $companystatic->getNomUrl(1, '', 44);
|
||||
print '</td>';
|
||||
if (!$i) {
|
||||
$totalarray['nbfield']++;
|
||||
}
|
||||
}
|
||||
// Project ref
|
||||
if (!empty($arrayfields['pr.ref']['checked'])) {
|
||||
print '<td>';
|
||||
print '<td class="tdoverflowmax150">';
|
||||
$projetstatic->id = $obj->projet_id;
|
||||
$projetstatic->ref = $obj->projet_ref;
|
||||
$projetstatic->title = $obj->projet_title;
|
||||
|
|
@ -901,8 +905,9 @@ while ($i < $imaxinloop) {
|
|||
$totalarray['nbfield']++;
|
||||
}
|
||||
}
|
||||
// Contract
|
||||
if (!empty($arrayfields['c.ref']['checked'])) {
|
||||
print '<td>';
|
||||
print '<td class="tdoverflowmax150">';
|
||||
$contratstatic->id = $obj->contrat_id;
|
||||
$contratstatic->ref = $obj->contrat_ref;
|
||||
$contratstatic->ref_customer = $obj->contrat_ref_customer;
|
||||
|
|
@ -930,7 +935,7 @@ while ($i < $imaxinloop) {
|
|||
print $hookmanager->resPrint;
|
||||
// Date creation
|
||||
if (!empty($arrayfields['f.datec']['checked'])) {
|
||||
print '<td class="center">';
|
||||
print '<td class="center nowraponall">';
|
||||
print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser');
|
||||
print '</td>';
|
||||
if (!$i) {
|
||||
|
|
@ -939,7 +944,7 @@ while ($i < $imaxinloop) {
|
|||
}
|
||||
// Date modification
|
||||
if (!empty($arrayfields['f.tms']['checked'])) {
|
||||
print '<td class="center">';
|
||||
print '<td class="center nowraponall">';
|
||||
print dol_print_date($db->jdate($obj->date_modification), 'dayhour', 'tzuser');
|
||||
print '</td>';
|
||||
if (!$i) {
|
||||
|
|
@ -973,17 +978,24 @@ while ($i < $imaxinloop) {
|
|||
}
|
||||
// Fields of detail of line
|
||||
if (!empty($arrayfields['fd.description']['checked'])) {
|
||||
print '<td>'.dol_trunc(dolGetFirstLineOfText(dol_string_nohtmltag($obj->descriptiondetail, 1)), 48).'</td>';
|
||||
$text = dolGetFirstLineOfText(dol_string_nohtmltag($obj->descriptiondetail, 1));
|
||||
print '<td>';
|
||||
print '<div class="classfortooltip tdoverflowmax250" title="'.dol_escape_htmltag($obj->descriptiondetail, 1, 1).'">';
|
||||
print dol_escape_htmltag($text);
|
||||
print '</div>';
|
||||
print '</td>';
|
||||
if (!$i) {
|
||||
$totalarray['nbfield']++;
|
||||
}
|
||||
}
|
||||
// Date line
|
||||
if (!empty($arrayfields['fd.date']['checked'])) {
|
||||
print '<td class="center">'.dol_print_date($db->jdate($obj->dp), 'dayhour')."</td>\n";
|
||||
if (!$i) {
|
||||
$totalarray['nbfield']++;
|
||||
}
|
||||
}
|
||||
// Duration line
|
||||
if (!empty($arrayfields['fd.duree']['checked'])) {
|
||||
print '<td class="right">'.convertSecondToTime($obj->duree, 'allhourmin').'</td>';
|
||||
if (!$i) {
|
||||
|
|
|
|||
|
|
@ -208,7 +208,7 @@ $type = 'fichinter_stats';
|
|||
|
||||
complete_head_from_modules($conf, $langs, null, $head, $h, $type);
|
||||
|
||||
print dol_get_fiche_head($head, 'byyear', $langs->trans("Statistics"), -1);
|
||||
print dol_get_fiche_head($head, 'byyear', '', -1);
|
||||
|
||||
|
||||
print '<div class="fichecenter"><div class="fichethirdleft">';
|
||||
|
|
|
|||
|
|
@ -1502,9 +1502,9 @@ if (empty($reshook)) {
|
|||
$result_order = $soapclient_order->call("createOrder", $ws_parameters, $ws_ns, '');
|
||||
|
||||
if (empty($result_order["result"]["result_code"])) { //No result, check error str
|
||||
setEventMessages($langs->trans("SOAPError")." '".$soapclient_order->error_str."'", null, 'errors');
|
||||
setEventMessages($langs->trans("Error")." '".$soapclient_order->error_str."'", null, 'errors');
|
||||
} elseif ($result_order["result"]["result_code"] != "OK") { //Something went wrong
|
||||
setEventMessages($langs->trans("SOAPError")." '".$result_order["result"]["result_code"]."' - '".$result_order["result"]["result_label"]."'", null, 'errors');
|
||||
setEventMessages($langs->trans("Error")." '".$result_order["result"]["result_code"]."' - '".$result_order["result"]["result_label"]."'", null, 'errors');
|
||||
} else {
|
||||
setEventMessages($langs->trans("RemoteOrderRef")." ".$result_order["ref"], null, 'mesgs');
|
||||
}
|
||||
|
|
@ -2892,7 +2892,7 @@ if ($action == 'create') {
|
|||
$ws_parameters = array('authentication' => $ws_authentication, 'id' => '', 'ref' => $ref_supplier);
|
||||
$result_product = $soapclient_product->call("getProductOrService", $ws_parameters, $ws_ns, '');
|
||||
if (!$result_product) {
|
||||
setEventMessages($line_id.$langs->trans("SOAPError")." ".$soapclient_product->error_str." - ".$soapclient_product->response, null, 'errors');
|
||||
setEventMessages($line_id.$langs->trans("Error")." SOAP ".$soapclient_product->error_str." - ".$soapclient_product->response, null, 'errors');
|
||||
$error_occurred = true;
|
||||
break;
|
||||
}
|
||||
|
|
@ -2900,7 +2900,7 @@ if ($action == 'create') {
|
|||
// Check the result code
|
||||
$status_code = $result_product["result"]["result_code"];
|
||||
if (empty($status_code)) { //No result, check error str
|
||||
setEventMessages($langs->trans("SOAPError")." '".$soapclient_order->error_str."'", null, 'errors');
|
||||
setEventMessages($langs->trans("Error")." SOAP '".$soapclient_order->error_str."'", null, 'errors');
|
||||
} elseif ($status_code != "OK") { //Something went wrong
|
||||
if ($status_code == "NOT_FOUND") {
|
||||
setEventMessages($line_id.$langs->trans("SupplierMissingRef")." '".$ref_supplier."'", null, 'warnings');
|
||||
|
|
|
|||
|
|
@ -37,6 +37,12 @@ require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
|
|||
// Load translation files required by the page
|
||||
$langs->loadLangs(array("suppliers", "orders"));
|
||||
|
||||
$hookmanager = new HookManager($db);
|
||||
|
||||
// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array
|
||||
$hookmanager->initHooks(array('orderssuppliersindex'));
|
||||
|
||||
$max = getDolGlobalInt('MAIN_SIZE_SHORTLIST_LIMIT', 5);
|
||||
|
||||
// Security check
|
||||
$orderid = GETPOST('orderid');
|
||||
|
|
@ -45,12 +51,6 @@ if ($user->socid) {
|
|||
}
|
||||
$result = restrictedArea($user, 'fournisseur', $orderid, '', 'commande');
|
||||
|
||||
$hookmanager = new HookManager($db);
|
||||
|
||||
// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array
|
||||
$hookmanager->initHooks(array('orderssuppliersindex'));
|
||||
|
||||
|
||||
|
||||
/*
|
||||
* View
|
||||
|
|
@ -285,7 +285,6 @@ print '</div><div class="fichetwothirdright">';
|
|||
/*
|
||||
* Last modified orders
|
||||
*/
|
||||
$max = 5;
|
||||
|
||||
$sql = "SELECT c.rowid, c.ref, c.fk_statut as status, c.tms, c.billed, s.nom as name, s.rowid as socid";
|
||||
$sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as c";
|
||||
|
|
|
|||
|
|
@ -96,7 +96,7 @@ $search_date_approve_endyear = GETPOSTINT('search_date_approve_endyear');
|
|||
$search_date_approve_start = dol_mktime(0, 0, 0, $search_date_approve_startmonth, $search_date_approve_startday, $search_date_approve_startyear); // Use tzserver
|
||||
$search_date_approve_end = dol_mktime(23, 59, 59, $search_date_approve_endmonth, $search_date_approve_endday, $search_date_approve_endyear);
|
||||
|
||||
$sall = trim((GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
|
||||
$search_all = trim((GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
|
||||
|
||||
$search_product_category = GETPOSTINT('search_product_category');
|
||||
$search_ref = GETPOST('search_ref', 'alpha');
|
||||
|
|
@ -106,8 +106,8 @@ $search_company_alias = GETPOST('search_company_alias', 'alpha');
|
|||
$search_town = GETPOST('search_town', 'alpha');
|
||||
$search_zip = GETPOST('search_zip', 'alpha');
|
||||
$search_state = GETPOST("search_state", 'alpha');
|
||||
$search_country = GETPOSTINT("search_country");
|
||||
$search_type_thirdparty = GETPOSTINT("search_type_thirdparty");
|
||||
$search_country = GETPOST("search_country", 'aZ09');
|
||||
$search_type_thirdparty = GETPOST("search_type_thirdparty", 'intcomma');
|
||||
$search_user = GETPOST('search_user', 'intcomma');
|
||||
$search_request_author = GETPOST('search_request_author', 'alpha');
|
||||
$optioncss = GETPOST('optioncss', 'alpha');
|
||||
|
|
@ -606,8 +606,8 @@ if (empty($reshook)) {
|
|||
if ($limit > 0 && $limit != $conf->liste_limit) {
|
||||
$param .= '&limit='.((int) $limit);
|
||||
}
|
||||
if ($sall) {
|
||||
$param .= '&sall='.urlencode($sall);
|
||||
if ($search_all) {
|
||||
$param .= '&search_all='.urlencode($search_all);
|
||||
}
|
||||
if ($socid > 0) {
|
||||
$param .= '&socid='.urlencode((string) ($socid));
|
||||
|
|
@ -779,7 +779,7 @@ $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
|
|||
$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
|
||||
|
||||
$sql = 'SELECT';
|
||||
if ($sall) {
|
||||
if ($search_all) {
|
||||
$sql = 'SELECT DISTINCT';
|
||||
}
|
||||
$sql .= ' s.rowid as socid, s.nom as name, s.name_alias as alias, s.town, s.zip, s.fk_pays, s.client, s.fournisseur, s.code_client, s.email,';
|
||||
|
|
@ -813,7 +813,7 @@ $sql .= ", ".MAIN_DB_PREFIX."commande_fournisseur as cf";
|
|||
if (!empty($extrafields->attributes[$object->table_element]['label']) && is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
|
||||
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (cf.rowid = ef.fk_object)";
|
||||
}
|
||||
if ($sall) {
|
||||
if ($search_all) {
|
||||
$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'commande_fournisseurdet as pd ON cf.rowid=pd.fk_commande';
|
||||
}
|
||||
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as u ON cf.fk_user_author = u.rowid";
|
||||
|
|
@ -832,8 +832,8 @@ if ($search_ref) {
|
|||
if ($search_refsupp) {
|
||||
$sql .= natural_search("cf.ref_supplier", $search_refsupp);
|
||||
}
|
||||
if ($sall) {
|
||||
$sql .= natural_search(array_keys($fieldstosearchall), $sall);
|
||||
if ($search_all) {
|
||||
$sql .= natural_search(array_keys($fieldstosearchall), $search_all);
|
||||
}
|
||||
if (empty($arrayfields['s.name_alias']['checked']) && $search_company) {
|
||||
$sql .= natural_search(array("s.nom", "s.name_alias"), $search_company);
|
||||
|
|
@ -1014,7 +1014,7 @@ if ($resql) {
|
|||
|
||||
$arrayofselected = is_array($toselect) ? $toselect : array();
|
||||
|
||||
if ($num == 1 && getDolGlobalString('MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE') && $sall) {
|
||||
if ($num == 1 && getDolGlobalString('MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE') && $search_all) {
|
||||
$obj = $db->fetch_object($resql);
|
||||
$id = $obj->rowid;
|
||||
header("Location: ".DOL_URL_ROOT.'/fourn/commande/card.php?id='.$id);
|
||||
|
|
@ -1033,14 +1033,14 @@ if ($resql) {
|
|||
if ($limit > 0 && $limit != $conf->liste_limit) {
|
||||
$param .= '&limit='.((int) $limit);
|
||||
}
|
||||
if ($sall) {
|
||||
$param .= '&sall='.urlencode($sall);
|
||||
if ($search_all) {
|
||||
$param .= '&search_all='.urlencode($search_all);
|
||||
}
|
||||
if ($socid > 0) {
|
||||
$param .= '&socid='.urlencode((string) ($socid));
|
||||
}
|
||||
if ($sall) {
|
||||
$param .= "&search_all=".urlencode($sall);
|
||||
if ($search_all) {
|
||||
$param .= "&search_all=".urlencode($search_all);
|
||||
}
|
||||
if ($search_date_order_startday) {
|
||||
$param .= '&search_date_order_startday='.urlencode((string) ($search_date_order_startday));
|
||||
|
|
@ -1284,11 +1284,11 @@ if ($resql) {
|
|||
print '<br>';
|
||||
}
|
||||
|
||||
if ($sall) {
|
||||
if ($search_all) {
|
||||
foreach ($fieldstosearchall as $key => $val) {
|
||||
$fieldstosearchall[$key] = $langs->trans($val);
|
||||
}
|
||||
print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall).implode(', ', $fieldstosearchall).'</div>';
|
||||
print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).implode(', ', $fieldstosearchall).'</div>';
|
||||
}
|
||||
|
||||
$moreforfilter = '';
|
||||
|
|
|
|||
|
|
@ -38,9 +38,8 @@ if (isset($user->socid) && $user->socid > 0) {
|
|||
$socid = $user->socid;
|
||||
}
|
||||
|
||||
$max = getDolGlobalInt('MAIN_SIZE_SHORTLIST_LIMIT');
|
||||
|
||||
// Maximum elements of the tables
|
||||
$max = getDolGlobalInt('MAIN_SIZE_SHORTLIST_LIMIT', 5);
|
||||
$maxDraftCount = getDolGlobalInt('MAIN_MAXLIST_OVERLOAD', 500);
|
||||
$maxLatestEditCount = 5;
|
||||
$maxOpenCount = getDolGlobalInt('MAIN_MAXLIST_OVERLOAD', 500);
|
||||
|
|
|
|||
|
|
@ -90,8 +90,8 @@ $search_paymentcond = GETPOST('search_paymentcond', 'intcomma');
|
|||
$search_town = GETPOST('search_town', 'alpha');
|
||||
$search_zip = GETPOST('search_zip', 'alpha');
|
||||
$search_state = GETPOST("search_state");
|
||||
$search_country = GETPOST("search_country", 'alpha');
|
||||
$search_type_thirdparty = GETPOSTINT("search_type_thirdparty");
|
||||
$search_country = GETPOST("search_country", 'aZ09');
|
||||
$search_type_thirdparty = GETPOST("search_type_thirdparty", 'intcomma');
|
||||
$search_user = GETPOST('search_user', 'intcomma');
|
||||
$search_sale = GETPOST('search_sale', 'intcomma');
|
||||
$search_date_start = GETPOSTDATE('search_date_start', '', 'tzserver');
|
||||
|
|
@ -104,8 +104,8 @@ $search_datelimit_endmonth = GETPOSTINT('search_datelimit_endmonth');
|
|||
$search_datelimit_endyear = GETPOSTINT('search_datelimit_endyear');
|
||||
$search_datelimit_start = dol_mktime(0, 0, 0, $search_datelimit_startmonth, $search_datelimit_startday, $search_datelimit_startyear);
|
||||
$search_datelimit_end = dol_mktime(23, 59, 59, $search_datelimit_endmonth, $search_datelimit_endday, $search_datelimit_endyear);
|
||||
$search_categ_sup = GETPOSTINT("search_categ_sup");
|
||||
$search_product_category = GETPOSTINT('search_product_category');
|
||||
$search_categ_sup = GETPOST("search_categ_sup", 'intcomma');
|
||||
$search_product_category = GETPOST('search_product_category', 'intcomma');
|
||||
|
||||
$option = GETPOST('search_option');
|
||||
if ($option == 'late') {
|
||||
|
|
|
|||
|
|
@ -72,7 +72,7 @@ if (!getDolGlobalString('MAIN_INFO_SOCIETE_NOM') || !getDolGlobalString('MAIN_IN
|
|||
$setupcompanynotcomplete = 1;
|
||||
}
|
||||
|
||||
$max = getDolGlobalInt('MAIN_SIZE_SHORTLIST_LIMIT');
|
||||
$max = getDolGlobalInt('MAIN_SIZE_SHORTLIST_LIMIT', 5);
|
||||
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -192,11 +192,9 @@ insert into llx_c_action_trigger (code,label,description,elementtype,rang) value
|
|||
insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILLREC_CREATE','Template invoices created','Executed when a Template invoices is created','facturerec',900);
|
||||
insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILLREC_MODIFY','Template invoices update','Executed when a Template invoices is updated','facturerec',901);
|
||||
insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILLREC_DELETE','Template invoices deleted','Executed when a Template invoices is deleted','facturerec',902);
|
||||
--insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILLREC_AUTOCREATEBILL','Template invoices use to create invoices with auto batch','Executed when a Template invoices is use to create invoice with auto batch','facturerec',903);
|
||||
|
||||
-- partnership module
|
||||
insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PARTNERSHIP_CREATE','Partnership created','Executed when a partnership is created','partnership',58000);
|
||||
insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PARTNERSHIP_MODIFY','Partnership modified','Executed when a partnership is modified','partnership',58002);
|
||||
insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PARTNERSHIP_SENTBYMAIL','Mails sent from partnership file','Executed when you send email from partnership file','partnership',58004);
|
||||
insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PARTNERSHIP_DELETE','Partnership deleted','Executed when a partnership is deleted','partnership',58006);
|
||||
|
||||
|
|
|
|||
|
|
@ -77,4 +77,13 @@ TERMINAL_LOCATION=Location (address) for Stripe Terminals
|
|||
RequestDirectDebitWithStripe=Request Direct Debit with Stripe
|
||||
RequesCreditTransferWithStripe=Request Credit Transfer with Stripe
|
||||
STRIPE_SEPA_DIRECT_DEBIT=Enable the Direct Debit payments through Stripe
|
||||
StripeConnect_Mode=Stripe Connect mode
|
||||
STRIPE_KLARNA=Enable the payments using Klarna
|
||||
STRIPE_BANCONTACT=Enable the payments using BANCONTACT
|
||||
STRIPE_IDEAL=Enable the payments using IDEAL
|
||||
STRIPE_GIROPAY=Enable the payments using GIROPAY
|
||||
STRIPE_SOFORT=Enable the payments using SOFORT
|
||||
StripeConnect_Mode=Stripe Connect mode
|
||||
ExampleOnlyForBECustomers=Only for belgium customers
|
||||
ExampleOnlyForDECustomers=Only for german customers
|
||||
ExampleOnlyForNLCustomers=Only for dutch customers
|
||||
ExampleOnlyForATBEDEITNLESCustomers=Only for customers from Austria, Belgium, Germany, Italy, Netherlands, Spain
|
||||
|
|
|
|||
|
|
@ -42,6 +42,7 @@ class modMyModule extends DolibarrModules
|
|||
public function __construct($db)
|
||||
{
|
||||
global $langs, $conf;
|
||||
|
||||
$this->db = $db;
|
||||
|
||||
// Id for module (must be unique).
|
||||
|
|
@ -70,7 +71,8 @@ class modMyModule extends DolibarrModules
|
|||
|
||||
// Author
|
||||
$this->editor_name = 'Editor name';
|
||||
$this->editor_url = 'https://www.example.com';
|
||||
$this->editor_url = 'https://www.example.com'; // Must be an external online web site
|
||||
$this->editor_squarred_logo = ''; // Must be image filename into the module/img directory followed with @modulename. Example: 'myimage.png@mymodule'
|
||||
|
||||
// Possible values for version are: 'development', 'experimental', 'dolibarr', 'dolibarr_deprecated', 'experimental_deprecated' or a version string like 'x.y.z'
|
||||
$this->version = '1.0';
|
||||
|
|
|
|||
|
|
@ -64,8 +64,7 @@ $langs->loadLangs(array("mymodule@mymodule"));
|
|||
$action = GETPOST('action', 'aZ09');
|
||||
|
||||
$now = dol_now();
|
||||
|
||||
$max = getDolGlobalInt('MAIN_SIZE_SHORTLIST_LIMIT');
|
||||
$max = getDolGlobalInt('MAIN_SIZE_SHORTLIST_LIMIT', 5);
|
||||
|
||||
// Security check - Protection if external user
|
||||
$socid = GETPOST('socid', 'int');
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ $langs->loadLangs(array("companies", "mrp"));
|
|||
// Security check
|
||||
$result = restrictedArea($user, 'bom|mrp');
|
||||
|
||||
$max = getDolGlobalInt('MAIN_SIZE_SHORTLIST_LIMIT');
|
||||
$max = getDolGlobalInt('MAIN_SIZE_SHORTLIST_LIMIT', 5);
|
||||
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -78,7 +78,7 @@ if (GETPOST('addbox')) {
|
|||
}
|
||||
}
|
||||
|
||||
$max = getDolGlobalInt('MAIN_SIZE_SHORTLIST_LIMIT');
|
||||
$max = getDolGlobalInt('MAIN_SIZE_SHORTLIST_LIMIT', 5);
|
||||
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -69,9 +69,13 @@ $massaction = GETPOST('massaction', 'alpha');
|
|||
$show_files = GETPOSTINT('show_files');
|
||||
$confirm = GETPOST('confirm', 'alpha');
|
||||
$toselect = GETPOST('toselect', 'array');
|
||||
$optioncss = GETPOST('optioncss', 'alpha');
|
||||
$mode = GETPOST('mode', 'alpha');
|
||||
|
||||
$fourn_id = GETPOSTINT("fourn_id");
|
||||
|
||||
// Search Criteria
|
||||
$sall = trim((GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
|
||||
$search_all = trim((GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
|
||||
$search_id = GETPOST("search_id", 'alpha');
|
||||
$search_ref = GETPOST("search_ref", 'alpha');
|
||||
$search_ref_supplier = GETPOST("search_ref_supplier", 'alpha');
|
||||
|
|
@ -93,9 +97,8 @@ if (!empty($catid) && empty($searchCategoryProductList)) {
|
|||
}
|
||||
$search_tosell = GETPOST("search_tosell");
|
||||
$search_tobuy = GETPOST("search_tobuy");
|
||||
$search_country = GETPOSTINT("search_country");
|
||||
$search_state = GETPOSTINT("state_id");
|
||||
$fourn_id = GETPOSTINT("fourn_id");
|
||||
$search_country = GETPOST("search_country", 'aZ09');
|
||||
$search_state = GETPOST("state_id", 'intcomma');
|
||||
$search_tobatch = GETPOST("search_tobatch");
|
||||
$search_accountancy_code_sell = GETPOST("search_accountancy_code_sell", 'alpha');
|
||||
$search_accountancy_code_sell_intra = GETPOST("search_accountancy_code_sell_intra", 'alpha');
|
||||
|
|
@ -104,10 +107,8 @@ $search_accountancy_code_buy = GETPOST("search_accountancy_code_buy", 'alpha');
|
|||
$search_accountancy_code_buy_intra = GETPOST("search_accountancy_code_buy_intra", 'alpha');
|
||||
$search_accountancy_code_buy_export = GETPOST("search_accountancy_code_buy_export", 'alpha');
|
||||
$search_finished = GETPOST("search_finished");
|
||||
$search_units = GETPOSTINT('search_units');
|
||||
$optioncss = GETPOST('optioncss', 'alpha');
|
||||
$type = GETPOSTINT("type");
|
||||
$mode = GETPOST('mode', 'alpha');
|
||||
$search_units = GETPOST('search_units', 'alpha');
|
||||
$type = GETPOST("type", 'alpha');
|
||||
|
||||
// Show/hide child product variants
|
||||
$show_childproducts = 0;
|
||||
|
|
@ -348,7 +349,7 @@ if (empty($reshook)) {
|
|||
|
||||
// Purge search criteria
|
||||
if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All tests are required to be compatible with all browsers
|
||||
$sall = "";
|
||||
$search_all = "";
|
||||
$search_id = '';
|
||||
$search_ref = "";
|
||||
$search_ref_supplier = "";
|
||||
|
|
@ -505,20 +506,20 @@ $reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters, $object
|
|||
$sql .= $hookmanager->resPrint;
|
||||
|
||||
$sql .= ' WHERE p.entity IN ('.getEntity('product').')';
|
||||
if ($sall) {
|
||||
if ($search_all) {
|
||||
// Clean $fieldstosearchall
|
||||
$newfieldstosearchall = $fieldstosearchall;
|
||||
unset($newfieldstosearchall['pfp.ref_fourn']);
|
||||
unset($newfieldstosearchall['pfp.barcode']);
|
||||
|
||||
$sql .= ' AND (';
|
||||
$sql .= natural_search(array_keys($newfieldstosearchall), $sall, 0, 1);
|
||||
$sql .= natural_search(array_keys($newfieldstosearchall), $search_all, 0, 1);
|
||||
// Search also into a supplier reference 'pfp.ref_fourn'="RefSupplier"
|
||||
$sql .= ' OR EXISTS (SELECT rowid FROM '.MAIN_DB_PREFIX.'product_fournisseur_price as pfp WHERE pfp.fk_product = p.rowid';
|
||||
$sql .= ' AND ('.natural_search('pfp.ref_fourn', $sall, 0, 1);
|
||||
$sql .= ' AND ('.natural_search('pfp.ref_fourn', $search_all, 0, 1);
|
||||
if (isModEnabled('barcode')) {
|
||||
// Search also into a supplier barcode 'pfp.barcode'='GencodBuyPrice';
|
||||
$sql .= ' OR '.natural_search('pfp.barcode', $sall, 0, 1);
|
||||
$sql .= ' OR '.natural_search('pfp.barcode', $search_all, 0, 1);
|
||||
}
|
||||
$sql .= ')))';
|
||||
}
|
||||
|
|
@ -703,7 +704,7 @@ $num = $db->num_rows($resql);
|
|||
|
||||
|
||||
// Direct jump if only one record found
|
||||
if ($num == 1 && getDolGlobalString('MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE') && $sall) {
|
||||
if ($num == 1 && getDolGlobalString('MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE') && $search_all) {
|
||||
$obj = $db->fetch_object($resql);
|
||||
$id = $obj->rowid;
|
||||
header("Location: ".DOL_URL_ROOT.'/product/card.php?id='.$id);
|
||||
|
|
@ -751,8 +752,8 @@ if ($limit > 0 && $limit != $conf->liste_limit) {
|
|||
if ($optioncss != '') {
|
||||
$param .= '&optioncss='.urlencode($optioncss);
|
||||
}
|
||||
if ($sall) {
|
||||
$param .= "&sall=".urlencode($sall);
|
||||
if ($search_all) {
|
||||
$param .= "&search_all=".urlencode($search_all);
|
||||
}
|
||||
if ($searchCategoryProductOperator == 1) {
|
||||
$param .= "&search_category_product_operator=".urlencode((string) ($searchCategoryProductOperator));
|
||||
|
|
@ -922,14 +923,14 @@ if (!empty($catid)) {
|
|||
print "</div><br>";
|
||||
}
|
||||
|
||||
if ($sall) {
|
||||
if ($search_all) {
|
||||
$setupstring = '';
|
||||
foreach ($fieldstosearchall as $key => $val) {
|
||||
$fieldstosearchall[$key] = $langs->trans($val);
|
||||
$setupstring .= $key."=".$val.";";
|
||||
}
|
||||
print '<!-- Search done like if PRODUCT_QUICKSEARCH_ON_FIELDS = '.$setupstring.' -->'."\n";
|
||||
print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall).implode(', ', $fieldstosearchall).'</div>'."\n";
|
||||
print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).implode(', ', $fieldstosearchall).'</div>'."\n";
|
||||
}
|
||||
|
||||
// Filter on categories
|
||||
|
|
|
|||
|
|
@ -50,6 +50,11 @@ if ($search_project_user == $user->id) {
|
|||
$mine = 1;
|
||||
}
|
||||
|
||||
$sortfield = GETPOST('sortfield', 'aZ09comma');
|
||||
$sortorder = GETPOST('sortorder', 'aZ09comma');
|
||||
|
||||
$max = getDolGlobalInt('MAIN_SIZE_SHORTLIST_LIMIT', 5);
|
||||
|
||||
// Security check
|
||||
$socid = 0;
|
||||
//if ($user->socid > 0) $socid = $user->socid; // For external user, no check is done on company because readability is managed by public status of project and assignment.
|
||||
|
|
@ -57,11 +62,6 @@ if (!$user->hasRight('projet', 'lire')) {
|
|||
accessforbidden();
|
||||
}
|
||||
|
||||
$sortfield = GETPOST('sortfield', 'aZ09comma');
|
||||
$sortorder = GETPOST('sortorder', 'aZ09comma');
|
||||
|
||||
$max = getDolGlobalInt('MAIN_SIZE_SHORTLIST_LIMIT');
|
||||
|
||||
|
||||
/*
|
||||
* Actions
|
||||
|
|
@ -220,11 +220,7 @@ $sql .= $db->plimit($max, 0);
|
|||
|
||||
$resql = $db->query($sql);
|
||||
if ($resql) {
|
||||
print '<div class="div-table-responsive-no-min">';
|
||||
print '<table class="noborder centpercent">';
|
||||
print '<tr class="liste_titre">';
|
||||
print '<th colspan="5">'.$langs->trans("LatestModifiedProjects", $max).'</th>';
|
||||
print '</tr>';
|
||||
startSimpleTable($langs->trans("LatestModifiedProjects", $max), "projet/list.php", "sortfield=p.tms&sortorder=DESC", 3, -1, 'project');
|
||||
|
||||
$num = $db->num_rows($resql);
|
||||
|
||||
|
|
@ -303,7 +299,8 @@ if ($resql) {
|
|||
} else {
|
||||
print '<tr><td colspan="4"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>';
|
||||
}
|
||||
print "</table></div>";
|
||||
|
||||
finishSimpleTable(true);
|
||||
} else {
|
||||
dol_print_error($db);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -221,7 +221,7 @@ $h++;
|
|||
|
||||
complete_head_from_modules($conf, $langs, null, $head, $h, 'project_stats');
|
||||
|
||||
print dol_get_fiche_head($head, 'byyear', $langs->trans("Statistics"), -1, '');
|
||||
print dol_get_fiche_head($head, 'byyear', '', -1, '');
|
||||
|
||||
|
||||
print '<div class="fichecenter"><div class="fichethirdleft">';
|
||||
|
|
|
|||
|
|
@ -142,7 +142,7 @@ $h++;
|
|||
|
||||
complete_head_from_modules($conf, $langs, null, $head, $h, 'project_tasks_stats');
|
||||
|
||||
print dol_get_fiche_head($head, 'byyear', $langs->trans("Statistics"), -1, '');
|
||||
print dol_get_fiche_head($head, 'byyear', '', -1, '');
|
||||
|
||||
|
||||
print '<div class="fichecenter"><div class="fichethirdleft">';
|
||||
|
|
|
|||
|
|
@ -1928,11 +1928,11 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
|
|||
}
|
||||
// Author
|
||||
if (!empty($arrayfields['author']['checked'])) {
|
||||
print '<td class="liste_titre">'.$form->select_dolusers(($search_user > 0 ? $search_user : -1), 'search_user', 1, null, 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth150').'</td>';
|
||||
print '<td class="liste_titre">'.$form->select_dolusers(($search_user > 0 ? $search_user : -1), 'search_user', 1, null, 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth125').'</td>';
|
||||
}
|
||||
// Note
|
||||
if (!empty($arrayfields['t.note']['checked'])) {
|
||||
print '<td class="liste_titre"><input type="text" class="flat maxwidth100" name="search_note" value="' . dol_escape_htmltag($search_note) . '"></td>';
|
||||
print '<td class="liste_titre"><input type="text" class="flat maxwidth75" name="search_note" value="' . dol_escape_htmltag($search_note) . '"></td>';
|
||||
}
|
||||
// Duration
|
||||
if (!empty($arrayfields['t.element_duration']['checked'])) {
|
||||
|
|
@ -1987,6 +1987,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
|
|||
}
|
||||
print '</tr>' . "\n";
|
||||
|
||||
|
||||
$totalarray = array();
|
||||
$totalarray['nbfield'] = 0;
|
||||
|
||||
|
|
@ -2246,7 +2247,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
|
|||
// Task label
|
||||
if (!empty($arrayfields['t.element_label']['checked'])) {
|
||||
if ((empty($id) && empty($ref)) || !empty($projectidforalltimes)) { // Not a dedicated task
|
||||
print '<td class="tdoverflowmax300" title="'.dol_escape_htmltag($task_time->label).'">';
|
||||
print '<td class="tdoverflowmax250" title="'.dol_escape_htmltag($task_time->label).'">';
|
||||
print dol_escape_htmltag($task_time->label);
|
||||
print '</td>';
|
||||
if (!$i) {
|
||||
|
|
@ -2696,7 +2697,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
|
|||
|
||||
// User
|
||||
if (!empty($arrayfields['author']['checked'])) {
|
||||
print '<td class="nowraponall">';
|
||||
print '<td class="nowraponall tdoverflowmax100">';
|
||||
if ($action == 'splitline' && GETPOSTINT('lineid') == $task_time->rowid) {
|
||||
if (empty($object->id)) {
|
||||
$object->fetch($id);
|
||||
|
|
|
|||
|
|
@ -110,7 +110,7 @@ if (empty($reshook)) {
|
|||
|
||||
// Visible
|
||||
$alwayscheckedmodules = array('barcode', 'bookmark', 'categorie', 'externalrss', 'fckeditor', 'geoipmaxmind', 'gravatar', 'memcached', 'syslog', 'user', 'webservices'); // Technical module we always want
|
||||
$alwaysuncheckedmodules = array('dav', 'dynamicprices', 'incoterm', 'loan', 'multicurrency', 'paybox', 'paypal', 'stripe', 'google', 'printing', 'scanner', 'socialnetworks', 'website'); // Module we don't want by default
|
||||
$alwaysuncheckedmodules = array('ai', 'dav', 'dynamicprices', 'incoterm', 'loan', 'multicurrency', 'paybox', 'paypal', 'stripe', 'google', 'printing', 'scanner', 'socialnetworks', 'webhook', 'webportal', 'website', 'zapier'); // Module we don't want by default
|
||||
// Not visible
|
||||
$alwayshiddencheckedmodules = array('accounting', 'api', 'barcode', 'blockedlog', 'bookmark', 'clicktodial', 'comptabilite', 'cron', 'document', 'domain', 'externalrss', 'externalsite', 'fckeditor', 'geoipmaxmind', 'gravatar', 'label', 'ldap',
|
||||
'mailmanspip', 'notification', 'oauth', 'syslog', 'user', 'webservices', 'workflow',
|
||||
|
|
@ -328,7 +328,7 @@ foreach ($demoprofiles as $profilearray) {
|
|||
print '<div id="div'.$profilearray['key'].'" summary="Dolibarr online demonstration for profile '.$profilearray['label'].'" class="center inline-block CTable CTableRow'.($i % 2 == 0 ? '1' : '0').'">'."\n";
|
||||
|
||||
|
||||
print '<div id="a1'.$profilearray['key'].'" class="demobox '.(empty($profilearray['url']) ? 'modulelineshow cursorpointer' : 'nomodulelines').'">';
|
||||
print '<div id="a1'.$profilearray['key'].'" class="demobox '.(empty($profilearray['url']) ? 'modulelineshow cursorpointer maxwidth1000' : 'nomodulelines').'">';
|
||||
|
||||
print '<a href="'.$urlwithmod.'" class="'.(empty($profilearray['url']) ? 'modulelineshow' : 'nomodulelines').'">';
|
||||
print '<div style="padding: 10px;">';
|
||||
|
|
@ -347,9 +347,9 @@ foreach ($demoprofiles as $profilearray) {
|
|||
|
||||
// Modules (a profile you must choose modules)
|
||||
if (empty($profilearray['url'])) {
|
||||
print '<div id="tr1'.$profilearray['key'].'" class="moduleline hidden" style="margin-left: 8px; margin-right: 8px; text-align: justify; font-size:0.75em; line-height: 130%; padding-bottom: 8px">';
|
||||
print '<div id="tr1'.$profilearray['key'].'" class="moduleline hidden" style="margin-left: 8px; margin-right: 8px; text-align: justify; font-size:0.75em; padding-bottom: 8px">';
|
||||
|
||||
print '<span class="opacitymedium">'.$langs->trans("ThisIsListOfModules").'</span><br><br>';
|
||||
print '<span class="opacitymedium small">'.$langs->trans("ThisIsListOfModules").'</span><br><br>';
|
||||
|
||||
print '<div class="csscolumns">';
|
||||
|
||||
|
|
|
|||
|
|
@ -57,8 +57,8 @@ $search_company = GETPOST("search_company");
|
|||
$search_town = GETPOST('search_town', 'alpha');
|
||||
$search_zip = GETPOST('search_zip', 'alpha');
|
||||
$search_state = GETPOST("search_state");
|
||||
$search_country = GETPOSTINT("search_country");
|
||||
$search_type_thirdparty = GETPOSTINT("search_type_thirdparty");
|
||||
$search_country = GETPOST("search_country", 'aZ09');
|
||||
$search_type_thirdparty = GETPOST("search_type_thirdparty", 'intcomma');
|
||||
$search_date_delivery_startday = GETPOSTINT('search_date_delivery_startday');
|
||||
$search_date_delivery_startmonth = GETPOSTINT('search_date_delivery_startmonth');
|
||||
$search_date_delivery_startyear = GETPOSTINT('search_date_delivery_startyear');
|
||||
|
|
|
|||
|
|
@ -205,7 +205,7 @@ $type = 'reception_stats';
|
|||
|
||||
complete_head_from_modules($conf, $langs, null, $head, $h, $type);
|
||||
|
||||
print dol_get_fiche_head($head, 'byyear', $langs->trans("Statistics"), -1);
|
||||
print dol_get_fiche_head($head, 'byyear', '', -1);
|
||||
|
||||
|
||||
print '<div class="fichecenter"><div class="fichethirdleft">';
|
||||
|
|
|
|||
|
|
@ -35,7 +35,8 @@ $langs->loadLangs(array("recruitment", "boxes"));
|
|||
|
||||
$action = GETPOST('action', 'aZ09');
|
||||
|
||||
$max = 5;
|
||||
$NBMAX = getDolGlobalString('MAIN_SIZE_SHORTLIST_LIMIT', 5);
|
||||
$max = getDolGlobalInt('MAIN_SIZE_SHORTLIST_LIMIT', 5);
|
||||
$now = dol_now();
|
||||
|
||||
$socid = GETPOSTINT('socid');
|
||||
|
|
@ -329,9 +330,6 @@ END MODULEBUILDER DRAFT MYOBJECT */
|
|||
print '</div><div class="fichetwothirdright">';
|
||||
|
||||
|
||||
$NBMAX = getDolGlobalString('MAIN_SIZE_SHORTLIST_LIMIT');
|
||||
$max = getDolGlobalInt('MAIN_SIZE_SHORTLIST_LIMIT');
|
||||
|
||||
// Last modified job position
|
||||
if (isModEnabled('recruitment') && $user->hasRight('recruitment', 'recruitmentjobposition', 'read')) {
|
||||
$sql = "SELECT s.rowid, s.ref, s.label, s.date_creation, s.tms, s.status, COUNT(rc.rowid) as nbapplications";
|
||||
|
|
|
|||
|
|
@ -197,7 +197,7 @@ $h++;
|
|||
|
||||
complete_head_from_modules($conf, $langs, null, $head, $h, 'salaries_stats');
|
||||
|
||||
print dol_get_fiche_head($head, 'byyear', $langs->trans("Statistics"), -1);
|
||||
print dol_get_fiche_head($head, 'byyear', '', -1);
|
||||
|
||||
|
||||
print '<div class="fichecenter"><div class="fichethirdleft">';
|
||||
|
|
|
|||
|
|
@ -74,7 +74,7 @@ if (GETPOST('addbox')) {
|
|||
}
|
||||
}
|
||||
|
||||
$max = getDolGlobalInt('MAIN_SIZE_SHORTLIST_LIMIT');
|
||||
$max = getDolGlobalInt('MAIN_SIZE_SHORTLIST_LIMIT', 5);
|
||||
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -103,8 +103,8 @@ $search_categ_sup = GETPOSTINT("search_categ_sup");
|
|||
$searchCategoryCustomerOperator = 0;
|
||||
$searchCategorySupplierOperator = 0;
|
||||
if (GETPOSTISSET('formfilteraction')) {
|
||||
$searchCategoryCustomerOperator = GETPOSTINT('search_category_customer_operator');
|
||||
$searchCategorySupplierOperator = GETPOSTINT('search_category_supplier_operator');
|
||||
$searchCategoryCustomerOperator = GETPOST('search_category_customer_operator');
|
||||
$searchCategorySupplierOperator = GETPOST('search_category_supplier_operator');
|
||||
} elseif (getDolGlobalString('MAIN_SEARCH_CAT_OR_BY_DEFAULT')) {
|
||||
$searchCategoryCustomerOperator = getDolGlobalString('MAIN_SEARCH_CAT_OR_BY_DEFAULT');
|
||||
$searchCategorySupplierOperator = getDolGlobalString('MAIN_SEARCH_CAT_OR_BY_DEFAULT');
|
||||
|
|
@ -117,10 +117,10 @@ $searchCategorySupplierList = GETPOST('search_category_supplier_list', 'array');
|
|||
if (!empty($search_categ_sup) && empty($searchCategorySupplierList)) {
|
||||
$searchCategorySupplierList = array($search_categ_sup);
|
||||
}
|
||||
$search_country = GETPOST("search_country", 'intcomma');
|
||||
$search_type_thirdparty = GETPOSTINT("search_type_thirdparty");
|
||||
$search_price_level = GETPOSTINT('search_price_level');
|
||||
$search_staff = GETPOSTINT("search_staff");
|
||||
$search_country = GETPOST("search_country", 'aZ09');
|
||||
$search_type_thirdparty = GETPOST("search_type_thirdparty", 'intcomma');
|
||||
$search_price_level = GETPOST('search_price_level', 'int');
|
||||
$search_staff = GETPOST("search_staff", 'int');
|
||||
$search_status = GETPOST("search_status", 'intcomma');
|
||||
$search_type = GETPOST('search_type', 'alpha');
|
||||
$search_level = GETPOST("search_level", "array:alpha");
|
||||
|
|
@ -146,7 +146,6 @@ $search_date_modif_endyear = GETPOSTINT('search_date_modif_endyear');
|
|||
$search_date_modif_endday = GETPOSTINT('search_date_modif_endday');
|
||||
$search_date_modif_end = dol_mktime(23, 59, 59, $search_date_modif_endmonth, $search_date_modif_endday, $search_date_modif_endyear); // Use tzserver
|
||||
|
||||
|
||||
$type = GETPOST('type', 'alpha');
|
||||
$place = GETPOST('place', 'aZ09') ? GETPOST('place', 'aZ09') : '0'; // $place is string id of table for Bar or Restaurant
|
||||
|
||||
|
|
|
|||
|
|
@ -474,7 +474,6 @@ if (getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 2) { // TODO Not used by current c
|
|||
$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
|
||||
print $form->selectarray("STRIPE_KLARNA", $arrval, $conf->global->STRIPE_KLARNA);
|
||||
}
|
||||
print ' <span class="opacitymedium">'.$langs->trans("ExampleOnlyForKlarnaCustomers").'</span>';
|
||||
print '</td></tr>';
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -58,6 +58,7 @@ $show_files = GETPOSTINT('show_files');
|
|||
$confirm = GETPOST('confirm', 'alpha');
|
||||
$toselect = GETPOST('toselect', 'array');
|
||||
$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'supplierproposallist';
|
||||
$optioncss = GETPOST('optioncss', 'alpha');
|
||||
$mode = GETPOST('mode', 'alpha');
|
||||
|
||||
$search_user = GETPOST('search_user', 'intcomma');
|
||||
|
|
@ -69,7 +70,7 @@ $search_login = GETPOST('search_login', 'alpha');
|
|||
$search_town = GETPOST('search_town', 'alpha');
|
||||
$search_zip = GETPOST('search_zip', 'alpha');
|
||||
$search_state = GETPOST("search_state");
|
||||
$search_country = GETPOSTINT("search_country");
|
||||
$search_country = GETPOST("search_country", 'aZ09');
|
||||
$search_date_startday = GETPOSTINT('search_date_startday');
|
||||
$search_date_startmonth = GETPOSTINT('search_date_startmonth');
|
||||
$search_date_startyear = GETPOSTINT('search_date_startyear');
|
||||
|
|
@ -86,7 +87,7 @@ $search_date_valid_endmonth = GETPOSTINT('search_date_valid_endmonth');
|
|||
$search_date_valid_endyear = GETPOSTINT('search_date_valid_endyear');
|
||||
$search_date_valid_start = dol_mktime(0, 0, 0, $search_date_valid_startmonth, $search_date_valid_startday, $search_date_valid_startyear); // Use tzserver
|
||||
$search_date_valid_end = dol_mktime(23, 59, 59, $search_date_valid_endmonth, $search_date_valid_endday, $search_date_valid_endyear);
|
||||
$search_type_thirdparty = GETPOSTINT("search_type_thirdparty");
|
||||
$search_type_thirdparty = GETPOST("search_type_thirdparty", 'intcomma');
|
||||
$search_montant_ht = GETPOST('search_montant_ht', 'alpha');
|
||||
$search_montant_vat = GETPOST('search_montant_vat', 'alpha');
|
||||
$search_montant_ttc = GETPOST('search_montant_ttc', 'alpha');
|
||||
|
|
@ -96,17 +97,13 @@ $search_multicurrency_montant_ht = GETPOST('search_multicurrency_montant_ht', 'a
|
|||
$search_multicurrency_montant_vat = GETPOST('search_multicurrency_montant_vat', 'alpha');
|
||||
$search_multicurrency_montant_ttc = GETPOST('search_multicurrency_montant_ttc', 'alpha');
|
||||
$search_status = GETPOST('search_status', 'intcomma');
|
||||
$search_product_category = GETPOSTINT('search_product_category');
|
||||
$search_product_category = GETPOST('search_product_category', 'int');
|
||||
$search_all = trim((GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
|
||||
|
||||
$object_statut = $db->escape(GETPOST('supplier_proposal_statut'));
|
||||
$object_statut = GETPOST('supplier_proposal_statut', 'intcomma');
|
||||
$search_btn = GETPOST('button_search', 'alpha');
|
||||
$search_remove_btn = GETPOST('button_removefilter', 'alpha');
|
||||
|
||||
$sall = trim((GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
|
||||
|
||||
$mesg = (GETPOST("msg") ? GETPOST("msg") : GETPOST("mesg"));
|
||||
|
||||
$optioncss = GETPOST('optioncss', 'alpha');
|
||||
$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
|
||||
$sortfield = GETPOST('sortfield', 'aZ09comma');
|
||||
$sortorder = GETPOST('sortorder', 'aZ09comma');
|
||||
|
|
@ -306,7 +303,7 @@ $help_url = 'EN:Ask_Price_Supplier|FR:Demande_de_prix_fournisseur';
|
|||
// Build and execute select
|
||||
// --------------------------------------------------------------------
|
||||
$sql = 'SELECT';
|
||||
if ($sall || $search_user > 0) {
|
||||
if ($search_all || $search_user > 0) {
|
||||
$sql = 'SELECT DISTINCT';
|
||||
}
|
||||
$sql .= ' s.rowid as socid, s.nom as name, s.name_alias as alias, s.town, s.zip, s.fk_pays, s.client, s.code_client,';
|
||||
|
|
@ -335,7 +332,7 @@ $sql .= ', '.MAIN_DB_PREFIX.'supplier_proposal as sp';
|
|||
if (isset($extrafields->attributes[$object->table_element]['label']) && is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
|
||||
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (sp.rowid = ef.fk_object)";
|
||||
}
|
||||
if ($sall) {
|
||||
if ($search_all) {
|
||||
$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'supplier_proposaldet as pd ON sp.rowid=pd.fk_supplier_proposal';
|
||||
}
|
||||
$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'user as u ON sp.fk_user_author = u.rowid';
|
||||
|
|
@ -401,8 +398,8 @@ if ($search_multicurrency_montant_vat != '') {
|
|||
if ($search_multicurrency_montant_ttc != '') {
|
||||
$sql .= natural_search('sp.multicurrency_total_ttc', $search_multicurrency_montant_ttc, 1);
|
||||
}
|
||||
if ($sall) {
|
||||
$sql .= natural_search(array_keys($fieldstosearchall), $sall);
|
||||
if ($search_all) {
|
||||
$sql .= natural_search(array_keys($fieldstosearchall), $search_all);
|
||||
}
|
||||
if ($socid > 0) {
|
||||
$sql .= ' AND s.rowid = '.((int) $socid);
|
||||
|
|
@ -507,7 +504,7 @@ if ($resql) {
|
|||
|
||||
$arrayofselected = is_array($toselect) ? $toselect : array();
|
||||
|
||||
if ($num == 1 && getDolGlobalString('MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE') && $sall) {
|
||||
if ($num == 1 && getDolGlobalString('MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE') && $search_all) {
|
||||
$obj = $db->fetch_object($resql);
|
||||
|
||||
$id = $obj->rowid;
|
||||
|
|
@ -531,8 +528,8 @@ if ($resql) {
|
|||
if ($limit > 0 && $limit != $conf->liste_limit) {
|
||||
$param .= '&limit='.((int) $limit);
|
||||
}
|
||||
if ($sall) {
|
||||
$param .= '&sall='.urlencode($sall);
|
||||
if ($search_all) {
|
||||
$param .= '&search_all='.urlencode($search_all);
|
||||
}
|
||||
if ($search_date_startday) {
|
||||
$param .= '&search_date_startday='.urlencode((string) ($search_date_startday));
|
||||
|
|
@ -671,11 +668,11 @@ if ($resql) {
|
|||
$trackid = 'spro'.$object->id;
|
||||
include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
|
||||
|
||||
if ($sall) {
|
||||
if ($search_all) {
|
||||
foreach ($fieldstosearchall as $key => $val) {
|
||||
$fieldstosearchall[$key] = $langs->trans($val);
|
||||
}
|
||||
print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall).implode(', ', $fieldstosearchall).'</div>';
|
||||
print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).implode(', ', $fieldstosearchall).'</div>';
|
||||
}
|
||||
|
||||
$i = 0;
|
||||
|
|
|
|||
|
|
@ -1095,6 +1095,12 @@ i.fa-mars::before, i.fa-venus::before, i.fa-genderless::before, i.fa-transgender
|
|||
.stockmovement {
|
||||
font-size: 1.4em;
|
||||
}
|
||||
.publisherlogoinline {
|
||||
vertical-align: middle;
|
||||
height: 14px;
|
||||
width: 14px;
|
||||
margin-left: 5px;
|
||||
}
|
||||
|
||||
body[class*="colorblind-"] .text-warning{
|
||||
color : <?php print $colorblind_deuteranopes_textWarning; ?>
|
||||
|
|
@ -1378,7 +1384,7 @@ ul.attendees li {
|
|||
vertical-align: middle;
|
||||
}
|
||||
select.flat.selectlimit {
|
||||
max-width: 62px;
|
||||
width: 102px;
|
||||
text-align: end;
|
||||
border-bottom: 1px solid var(--inputbordercolor);
|
||||
border-bottom-left-radius: 0;
|
||||
|
|
@ -1815,8 +1821,8 @@ maxscreenheightless200 {
|
|||
.width100p { width:100%; }
|
||||
|
||||
|
||||
/* Force values for small screen 1400 */
|
||||
@media only screen and (max-width: 1400px)
|
||||
/* Force values for small screen 1440 */
|
||||
@media only screen and (max-width: 1440px)
|
||||
{
|
||||
.titlefield { /* width: 30% !important; */ }
|
||||
.titlefieldcreate { width: 30% !important; }
|
||||
|
|
@ -1862,8 +1868,8 @@ select.widthcentpercentminusxx, span.widthcentpercentminusxx:not(.select2-select
|
|||
}
|
||||
|
||||
|
||||
/* Force values for small screen 767 */
|
||||
@media only screen and (max-width: 767px)
|
||||
/* Force values for small screen 768 */
|
||||
@media only screen and (max-width: 768px)
|
||||
{
|
||||
div.refidno {
|
||||
font-size: <?php print is_numeric($fontsize) ? ((int) $fontsize + 3).'px' : $fontsize; ?> !important;
|
||||
|
|
@ -2393,7 +2399,7 @@ div.secondcolumn div.box {
|
|||
|
||||
|
||||
/* Force values on one column for small screen */
|
||||
@media only screen and (max-width: 1000px)
|
||||
@media only screen and (max-width: 1024px)
|
||||
{
|
||||
div.fiche {
|
||||
margin-<?php print $left; ?>: <?php print(GETPOST('optioncss', 'aZ09') == 'print' ? 6 : ($dol_hide_leftmenu ? '6' : '20')); ?>px;
|
||||
|
|
@ -2436,7 +2442,7 @@ div.secondcolumn div.box {
|
|||
}
|
||||
|
||||
/* Force values on one column for small screen */
|
||||
@media only screen and (max-width: 1499px)
|
||||
@media only screen and (max-width: 1440px)
|
||||
{
|
||||
div.fichehalfleft-lg {
|
||||
float: none;
|
||||
|
|
@ -2530,10 +2536,11 @@ span.widthpictotitle.pictotitle {
|
|||
}
|
||||
.pictofixedwidth {
|
||||
text-align: start;
|
||||
width: 21px;
|
||||
width: 20px;
|
||||
/* padding-right: 0; */
|
||||
}
|
||||
|
||||
|
||||
.colorthumb {
|
||||
padding-left: 1px !important;
|
||||
padding-right: 1px;
|
||||
|
|
@ -4687,7 +4694,7 @@ ul.noborder li:nth-child(even):not(.liste_titre) {
|
|||
}
|
||||
|
||||
|
||||
@media only screen and (max-width: 767px)
|
||||
@media only screen and (max-width: 768px)
|
||||
{
|
||||
.tabBar .arearef .pagination.paginationref {
|
||||
max-width: calc(50%);
|
||||
|
|
@ -7279,7 +7286,7 @@ div.tabsElem a.tab {
|
|||
padding-right: 10px;
|
||||
padding-bottom: 2px;
|
||||
}
|
||||
@media only screen and (max-width: 767px)
|
||||
@media only screen and (max-width: 768px)
|
||||
{
|
||||
.menu_choix1 a, .menu_choix2 a {
|
||||
background-size: 36px 36px;
|
||||
|
|
@ -7319,7 +7326,7 @@ div.tabsElem a.tab {
|
|||
color: var(--colortextbackvmenu);
|
||||
}
|
||||
|
||||
@media only screen and (max-width: 767px)
|
||||
@media only screen and (max-width: 768px)
|
||||
{
|
||||
.publicnewmemberform div.tabBarWithBottom {
|
||||
padding: 10px;
|
||||
|
|
@ -7347,7 +7354,7 @@ div.tabsElem a.tab {
|
|||
padding-right: 50px;
|
||||
padding-top: 30px;
|
||||
}
|
||||
@media only screen and (max-width: 767px)
|
||||
@media only screen and (max-width: 768px)
|
||||
{
|
||||
.ticketlargemargin {
|
||||
padding-left: 5px; padding-right: 5px;
|
||||
|
|
@ -7878,7 +7885,7 @@ table.jPicker {
|
|||
background-size: 22px auto;
|
||||
top: 2px;
|
||||
}
|
||||
@media only screen and (max-width: 767px)
|
||||
@media only screen and (max-width: 768px)
|
||||
{
|
||||
.imgopensurveywizard, .imgautosize { width:95%; height: auto; }
|
||||
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ if (!defined('ISLOADEDBYSTEELSHEET')) {
|
|||
.info-box {
|
||||
display: block;
|
||||
position: relative;
|
||||
min-height: 90px;
|
||||
min-height: 94px; /* must be same height than info-box-icon */
|
||||
background: var(--colorbacklineimpair2);
|
||||
width: 100%;
|
||||
box-shadow: 1px 1px 15px rgba(192, 192, 192, 0.2);
|
||||
|
|
@ -83,11 +83,11 @@ if (!defined('ISLOADEDBYSTEELSHEET')) {
|
|||
display: block;
|
||||
overflow: hidden;
|
||||
float: left;
|
||||
height: 90px;
|
||||
line-height: 94px; /* must be same height as min-height of .info-box */
|
||||
height: 94px; /* must be same height as min-height of .info-box */
|
||||
width: 88px;
|
||||
text-align: center;
|
||||
font-size: 2.8em;
|
||||
line-height: 90px;
|
||||
background: var(--colorbacktitle1) !important;
|
||||
}
|
||||
|
||||
|
|
@ -540,12 +540,27 @@ if (GETPOSTISSET('THEME_SATURATE_RATIO')) {
|
|||
}
|
||||
}
|
||||
|
||||
@media only screen and (max-width: 767px) {
|
||||
@media only screen and (max-width: 768px) {
|
||||
.info-box-module {
|
||||
min-width: 260px;
|
||||
}
|
||||
.box-flex-item {
|
||||
width: 280px;
|
||||
}
|
||||
}
|
||||
|
||||
@media only screen and (max-width: 480px) {
|
||||
.info-box-module {
|
||||
min-width: 250px;
|
||||
}
|
||||
.box-flex-item {
|
||||
width: 250px;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
.info-box-module .info-box-content {
|
||||
height: 98px;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -146,7 +146,7 @@ a.info-box-text-a i.fa.fa-exclamation-triangle {
|
|||
.info-box {
|
||||
display: block;
|
||||
position: relative;
|
||||
min-height: 90px;
|
||||
min-height: 94px;
|
||||
background: var(--colorbacklineimpair2);
|
||||
width: 100%;
|
||||
/* box-shadow: 1px 1px 2px rgba(0, 0, 0, 0.1); */
|
||||
|
|
@ -197,11 +197,11 @@ a.info-box-text-a i.fa.fa-exclamation-triangle {
|
|||
display: block;
|
||||
overflow: hidden;
|
||||
float: left;
|
||||
/* height: 90px; */
|
||||
width: 86px;
|
||||
text-align: center;
|
||||
font-size: 45px;
|
||||
line-height: 90px;
|
||||
line-height: 94px;; /* must be same height as min-height of .info-box */
|
||||
height: 94px;; /* must be same height as min-height of .info-box */
|
||||
width: 86px;
|
||||
background: var(--colorbacktitle1) !important;
|
||||
<?php if (isset($conf->global->THEME_SATURATE_RATIO)) { ?>
|
||||
filter: saturate(<?php echo $conf->global->THEME_SATURATE_RATIO; ?>);
|
||||
|
|
@ -595,7 +595,7 @@ if (GETPOSTISSET('THEME_SATURATE_RATIO')) {
|
|||
max-width: 315px;
|
||||
}
|
||||
}
|
||||
@media only screen and (max-width: 767px) {
|
||||
@media only screen and (max-width: 768px) {
|
||||
.info-box-module {
|
||||
min-width: 260px;
|
||||
}
|
||||
|
|
@ -616,3 +616,12 @@ if (GETPOSTISSET('THEME_SATURATE_RATIO')) {
|
|||
max-width: calc(100% - 82px);
|
||||
}
|
||||
}
|
||||
|
||||
@media only screen and (max-width: 480px) {
|
||||
.info-box-module {
|
||||
min-width: 250px;
|
||||
}
|
||||
.box-flex-item {
|
||||
width: 250px;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -363,7 +363,7 @@ print '*/'."\n";
|
|||
--amountremaintopaybackcolor:none;
|
||||
--productlinestockod: #002200;
|
||||
--productlinestocktoolow: #884400;
|
||||
--infoboxmoduleenabledbgcolor : linear-gradient(0.4turn, #2b2d2f, #2b2d2f, #2b2d2f, #e4efe8);
|
||||
--infoboxmoduleenabledbgcolor : linear-gradient(0.4turn, #fff, #fff, #fff, #e4efe8);
|
||||
--tablevalidbgcolor: rgb(252, 248, 227);
|
||||
--butactionbg : #<?php print $butactionbg; ?>;
|
||||
--textbutaction : #<?php print $textbutaction; ?>;
|
||||
|
|
@ -1273,6 +1273,12 @@ i.fa-mars::before, i.fa-venus::before, i.fa-genderless::before, i.fa-transgender
|
|||
.stockmovement {
|
||||
font-size: 1.4em;
|
||||
}
|
||||
.publisherlogoinline {
|
||||
vertical-align: middle;
|
||||
height: 14px;
|
||||
width: 14px;
|
||||
margin-left: 5px;
|
||||
}
|
||||
|
||||
.text-warning{
|
||||
color : <?php print $textWarning; ?>
|
||||
|
|
@ -2648,8 +2654,8 @@ img.hideonsmartphone.pictoactionview {
|
|||
}
|
||||
|
||||
.pictofixedwidth {
|
||||
text-align: <?php echo $left; ?>;
|
||||
width: 21px;
|
||||
text-align: start;
|
||||
width: 20px;
|
||||
/* padding-right: 0; */
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -144,7 +144,7 @@ $type = 'ticket_stats';
|
|||
|
||||
complete_head_from_modules($conf, $langs, null, $head, $h, $type);
|
||||
|
||||
print dol_get_fiche_head($head, 'byyear', $langs->trans("Statistics"), -1);
|
||||
print dol_get_fiche_head($head, 'byyear', '', -1);
|
||||
|
||||
|
||||
print '<div class="fichecenter"><div class="fichethirdleft">';
|
||||
|
|
|
|||
|
|
@ -4013,7 +4013,7 @@ if ($action == 'createsite') {
|
|||
$head[$h][2] = 'card';
|
||||
$h++;
|
||||
|
||||
print dol_get_fiche_head($head, 'card', $langs->trans("AddSite"), -1, 'globe');
|
||||
print dol_get_fiche_head($head, 'card', '', -1, 'globe');
|
||||
*/
|
||||
if ($action == 'createcontainer') {
|
||||
print load_fiche_titre($langs->trans("AddSite"));
|
||||
|
|
@ -4168,7 +4168,7 @@ if ($action == 'editmeta' || $action == 'createcontainer') { // Edit properties
|
|||
$head[$h][2] = 'card';
|
||||
$h++;
|
||||
|
||||
print dol_get_fiche_head($head, 'card', $langs->trans("AddPage"), -1, 'globe');
|
||||
print dol_get_fiche_head($head, 'card', '', -1, 'globe');
|
||||
*/
|
||||
if ($action == 'createcontainer') {
|
||||
print load_fiche_titre($langs->trans("AddPage"));
|
||||
|
|
|
|||
Loading…
Reference in a new issue