| '.$langs->trans("Label").' | '; -/*print ''.$langs->trans("Code").' | '; - print ''.$langs->trans("Label").' | ';*/ -//print ''.$langs->trans("NbOfTargetedContacts").' | '; -print "||
';
-$i = 0;
-foreach ($listofnotifiedevents as $notifiedevent)
-{
- $label = $langs->trans("Notify_".$notifiedevent['code']); //!=$langs->trans("Notify_".$notifiedevent['code'])?$langs->trans("Notify_".$notifiedevent['code']):$notifiedevent['label'];
- $elementLabel = $langs->trans(ucfirst($notifiedevent['elementtype']));
+if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {
+ // Editing global variables not related to a specific theme
+ $constantes=array();
+ foreach ($listofnotifiedevents as $notifiedevent)
+ {
+ $label = $langs->trans("Notify_".$notifiedevent['code']); //!=$langs->trans("Notify_".$notifiedevent['code'])?$langs->trans("Notify_".$notifiedevent['code']):$notifiedevent['label'];
+ $elementLabel = $langs->trans(ucfirst($notifiedevent['elementtype']));
- if ($notifiedevent['elementtype'] == 'order_supplier') $elementLabel = $langs->trans('SupplierOrder');
- elseif ($notifiedevent['elementtype'] == 'propal') $elementLabel = $langs->trans('Proposal');
- elseif ($notifiedevent['elementtype'] == 'facture') $elementLabel = $langs->trans('Bill');
- elseif ($notifiedevent['elementtype'] == 'commande') $elementLabel = $langs->trans('Order');
- elseif ($notifiedevent['elementtype'] == 'ficheinter') $elementLabel = $langs->trans('Intervention');
- elseif ($notifiedevent['elementtype'] == 'shipping') $elementLabel = $langs->trans('Shipping');
- elseif ($notifiedevent['elementtype'] == 'expensereport') $elementLabel = $langs->trans('ExpenseReport');
+ if ($notifiedevent['elementtype'] == 'order_supplier') $elementLabel = $langs->trans('SupplierOrder');
+ elseif ($notifiedevent['elementtype'] == 'propal') $elementLabel = $langs->trans('Proposal');
+ elseif ($notifiedevent['elementtype'] == 'facture') $elementLabel = $langs->trans('Bill');
+ elseif ($notifiedevent['elementtype'] == 'commande') $elementLabel = $langs->trans('Order');
+ elseif ($notifiedevent['elementtype'] == 'ficheinter') $elementLabel = $langs->trans('Intervention');
+ elseif ($notifiedevent['elementtype'] == 'shipping') $elementLabel = $langs->trans('Shipping');
+ elseif ($notifiedevent['elementtype'] == 'expensereport') $elementLabel = $langs->trans('ExpenseReport');
- if ($i) print ', ';
- print $label;
+ if ($notifiedevent['elementtype'] == 'propal') $model = 'propal_send';
+ elseif ($notifiedevent['elementtype'] == 'commande') $model = 'order_send';
+ elseif ($notifiedevent['elementtype'] == 'facture') $model = 'facture_send';
+ elseif ($notifiedevent['elementtype'] == 'shipping') $model = 'shipping_send';
+ elseif ($notifiedevent['elementtype'] == 'ficheinter') $model = 'fichinter_send';
+ elseif ($notifiedevent['elementtype'] == 'expensereport') $model = 'expensereport_send';
+ elseif ($notifiedevent['elementtype'] == 'order_supplier') $model = 'order_supplier_send';
+ //elseif ($notifiedevent['elementtype'] == 'invoice_supplier') $model = 'invoice_supplier_send';
+ elseif ($notifiedevent['elementtype'] == 'member') $model = 'member';
- $i++;
+ $constantes[$notifiedevent['code'].'_TEMPLATE'] = array('type'=>'emailtemplate:'.$model, 'label'=>$label);
+ }
+
+ $helptext='';
+ form_constantes($constantes, 0, $helptext);
+} else {
+ print '
|
| '.$module->name." | \n"; - print $module->info(); - print ' | '; + if ($module->isEnabled()) { + print '||||||
| '.$module->name." | \n"; + print $module->info(); + print ' | '; - // Show example of numbering model - print '';
- $tmp = $module->getExample();
- if (preg_match('/^Error/', $tmp)) {
- print ' '.$langs->trans($tmp).' ';
- } elseif ($tmp == 'NotConfigured') {
- print $langs->trans($tmp);
- } else {
- print $tmp;
- }
+ // Show example of numbering model
+ print ' | ';
+ $tmp = $module->getExample();
+ if (preg_match('/^Error/', $tmp)) {
+ print ' '.$langs->trans($tmp).' ';
+ } elseif ($tmp == 'NotConfigured') {
+ print $langs->trans($tmp);
+ } else {
+ print $tmp;
+ }
- print ' | '."\n";
+ print ''."\n";
- print ''; - if ($conf->global->TICKET_ADDON == 'mod_'.$classname) { - print img_picto($langs->trans("Activated"), 'switch_on'); - } else { - print ''.img_picto($langs->trans("Disabled"), 'switch_off').''; - } - print ' | '; + print ''; + if ($conf->global->TICKET_ADDON == 'mod_'.$classname) { + print img_picto($langs->trans("Activated"), 'switch_on'); + } else { + print ''.img_picto($langs->trans("Disabled"), 'switch_off').''; + } + print ' | '; - $ticket = new Ticket($db); - $ticket->initAsSpecimen(); + $ticket = new Ticket($db); + $ticket->initAsSpecimen(); - // Info - $htmltooltip = ''; - $htmltooltip .= ''.$langs->trans("Version").': '.$module->getVersion().''; - print $form->textwithpicto('', $htmltooltip, 1, 0); - print ' | '; + print ''; + print $form->textwithpicto('', $htmltooltip, 1, 0); + print ' | '; - print '
| '.$langs->trans("Email").' | '; print "\n"; if (empty($conf->global->FCKEDITOR_ENABLE_MAIL)) { - print '||
'.$langs->trans("TicketCkEditorEmailNotActivated").' | ';
- print "||
'.$langs->trans("TicketCkEditorEmailNotActivated").' | ';
+ print "||
| ' . $langs->trans("TicketsLogEnableEmail") . ' | '; -print ''; -if ($conf->use_javascript_ajax) { - print ajax_constantonoff('TICKET_ACTIVATE_LOG_BY_EMAIL'); -} else { - $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes")); - print $form->selectarray("TICKET_ACTIVATE_LOG_BY_EMAIL", $arrval, $conf->global->TICKET_ACTIVATE_LOG_BY_EMAIL); -} -print ' | '; -print ''; -print $form->textwithpicto('', $langs->trans("TicketsLogEnableEmailHelp"), 1, 'help'); -print ' | '; -print '
| '.$langs->trans("TicketEmailNotificationTo").' | '; +// Email for notification of TICKET_CREATE +print '||
| '.$langs->trans("TicketEmailNotificationTo").' ('.$langs->trans("Creation").') | '; print ''; -print ' | '; +print ''; print ''; print $form->textwithpicto('', $langs->trans("TicketEmailNotificationToHelp"), 1, 'help'); print ' | '; print '
| '.$langs->trans("TicketsEmailAlsoSendToMainAddress").' | '; + print ''; + if ($conf->use_javascript_ajax) { + print ajax_constantonoff('TICKET_NOTIFICATION_ALSO_MAIN_ADDRESS'); + } else { + $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes")); + print $form->selectarray("TICKET_NOTIFICATION_ALSO_MAIN_ADDRESS", $arrval, $conf->global->TICKET_NOTIFICATION_ALSO_MAIN_ADDRESS); + } + print ' | '; + print ''; + print $form->textwithpicto('', $langs->trans("TicketsEmailAlsoSendToMainAddressHelp"), 1, 'help'); + print ' | '; + print '
| '.$langs->trans("TicketMessageMailIntroLabelAdmin").''; +print ' | ||
| '.$langs->trans("TicketMessageMailIntroLabelAdmin").' ('.$langs->trans("Responses").')'; print ' | ';
require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
$doleditor = new DolEditor('TICKET_MESSAGE_MAIL_INTRO', $mail_intro, '100%', 120, 'dolibarr_mailings', '', false, true, $conf->global->FCKEDITOR_ENABLE_MAIL, ROWS_2, 70);
diff --git a/htdocs/admin/tools/listsessions.php b/htdocs/admin/tools/listsessions.php
index eb4caa4bf3d..253f4919092 100644
--- a/htdocs/admin/tools/listsessions.php
+++ b/htdocs/admin/tools/listsessions.php
@@ -41,11 +41,12 @@ if ($user->socid > 0)
$socid = $user->socid;
}
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
$sortfield = GETPOST("sortfield", 'alpha');
$sortorder = GETPOST("sortorder", 'alpha');
$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
if (empty($page) || $page == -1) { $page = 0; } // If $page is not defined, or '' or -1
-$offset = $conf->liste_limit * $page;
+$offset = $limit * $page;
$pageprev = $page - 1;
$pagenext = $page + 1;
if (!$sortorder) $sortorder = "DESC";
diff --git a/htdocs/asset/document.php b/htdocs/asset/document.php
index c6762c5c946..4724173cd19 100644
--- a/htdocs/asset/document.php
+++ b/htdocs/asset/document.php
@@ -45,11 +45,12 @@ $ref = GETPOST('ref', 'alpha');
//$result = restrictedArea($user, 'asset', $id);
// Get parameters
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
$sortfield = GETPOST("sortfield", 'alpha');
$sortorder = GETPOST("sortorder", 'alpha');
$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
if (empty($page) || $page == -1) { $page = 0; } // If $page is not defined, or '' or -1
-$offset = $conf->liste_limit * $page;
+$offset = $limit * $page;
$pageprev = $page - 1;
$pagenext = $page + 1;
if (!$sortorder) $sortorder = "ASC";
diff --git a/htdocs/asset/list.php b/htdocs/asset/list.php
index e414193fb83..39fd0e0761d 100644
--- a/htdocs/asset/list.php
+++ b/htdocs/asset/list.php
@@ -328,12 +328,11 @@ print '';
print '';
print '';
-print '';
print '';
$newcardbutton = dolGetButtonTitle($langs->trans('NewAsset'), '', 'fa fa-plus-circle', dol_buildpath('/asset/card.php', 1).'?action=create&backtopage='.urlencode($_SERVER['PHP_SELF']), '', $permissiontoadd);
-print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'accountancy', 0, $newcardbutton, '', $limit);
+print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'accountancy', 0, $newcardbutton, '', $limit, 0, 0, 1);
// Add code for pre mass action (confirmation or email presend form)
$topicmail = "SendAssetsRef";
diff --git a/htdocs/barcode/codeinit.php b/htdocs/barcode/codeinit.php
index dd700de8ce3..d2afa5e6871 100644
--- a/htdocs/barcode/codeinit.php
+++ b/htdocs/barcode/codeinit.php
@@ -253,7 +253,7 @@ if ($conf->product->enabled || $conf->product->service)
$nbno = $nbtotal = 0;
- print load_fiche_titre($langs->trans("BarcodeInitForProductsOrServices"), '', 'products');
+ print load_fiche_titre($langs->trans("BarcodeInitForProductsOrServices"), '', 'product');
print ' '."\n"; $sql = "SELECT count(rowid) as nb, fk_product_type, datec"; diff --git a/htdocs/bom/bom_card.php b/htdocs/bom/bom_card.php index 1f4498cf9cc..48e9c9d965a 100644 --- a/htdocs/bom/bom_card.php +++ b/htdocs/bom/bom_card.php @@ -256,7 +256,7 @@ jQuery(document).ready(function() { // Part to create if ($action == 'create') { - print load_fiche_titre($langs->trans("NewBOM"), '', 'cubes'); + print load_fiche_titre($langs->trans("NewBOM"), '', 'bom'); print ' | |