diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index dd2bd1dd9c3ee41a21df0aea8f5ce2caa925f900..9b466e3d9b796cbc20059e984e4f83505d6206dd 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -87,7 +87,9 @@ $pid=GETPOST("projectid","int",3);
$status=GETPOST("status");
$type=GETPOST("type");
$maxprint=(isset($_GET["maxprint"])?GETPOST("maxprint"):$conf->global->AGENDA_MAX_EVENTS_DAY_VIEW);
-$actioncode=GETPOST("actioncode","alpha",3)?GETPOST("actioncode","alpha",3):(GETPOST("actioncode")=='0'?'0':'');
+$actioncode=GETPOST("actioncode","array",3) ? GETPOST("actioncode","array",3):(GETPOST("actioncode")=='0'?'0':'');
+if(is_array($actioncode))$actioncode =implode(',', $actioncode);
+
if ($actioncode == '') $actioncode=(empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE)?'':$conf->global->AGENDA_DEFAULT_FILTER_TYPE);
if ($status == '' && ! isset($_GET['status']) && ! isset($_POST['status'])) $status=(empty($conf->global->AGENDA_DEFAULT_FILTER_STATUS)?'':$conf->global->AGENDA_DEFAULT_FILTER_STATUS);
@@ -437,7 +439,7 @@ if ($filtert > 0 || $usergroup > 0) $sql.=", ".MAIN_DB_PREFIX."actioncomm_resour
if ($usergroup > 0) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."usergroup_user as ugu ON ugu.fk_user = ar.fk_element";
$sql.= ' WHERE a.fk_action = ca.id';
$sql.= ' AND a.entity IN ('.getEntity('agenda', 1).')';
-if ($actioncode) $sql.=" AND ca.code='".$db->escape($actioncode)."'";
+if ($actioncode) $sql.=" AND ca.code IN ('".implode("','", explode(',',$actioncode))."')";
if ($pid) $sql.=" AND a.fk_project=".$db->escape($pid);
if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND (a.fk_soc IS NULL OR sc.fk_user = " .$user->id . ")";
if ($socid > 0) $sql.= ' AND a.fk_soc = '.$socid;
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index a1b6cb45db85f6aec10645c1dfebf0f10b6a073e..555b44423e145616deec598e326f3c2eb669639a 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -4687,7 +4687,7 @@ class Form
foreach ($array as $key => $value)
{
$out.= '<option value="'.$key.'"';
- if (is_array($selected) && ! empty($selected) && in_array($key, $selected))
+ if (is_array($selected) && ! empty($selected) && in_array($key, $selected) && !empty($key))
{
$out.= ' selected';
}
diff --git a/htdocs/core/class/html.formactions.class.php b/htdocs/core/class/html.formactions.class.php
index 60fbdc0c467f68bb90249e34ad648c75a85d0b64..a5404135982a20c16ade8dd43c451cc4c3cfc2fb 100644
--- a/htdocs/core/class/html.formactions.class.php
+++ b/htdocs/core/class/html.formactions.class.php
@@ -246,10 +246,11 @@ class FormActions
* @param string $htmlname Nom champ formulaire
* @param string $excludetype Type to exclude
* @param string $onlyautoornot Group list by auto events or not: We keep only the 2 generic lines (AC_OTH and AC_OTH_AUTO)
- * @param int $hideinfohelp 1=Do not show info help
+ * @param int $hideinfohelp 1=Do not show info help
+ * @param int $multiselect 1=Allow multiselect of action type for filter or search
* @return void
*/
- function select_type_actions($selected='',$htmlname='actioncode',$excludetype='',$onlyautoornot=0, $hideinfohelp=0)
+ function select_type_actions($selected='',$htmlname='actioncode',$excludetype='',$onlyautoornot=0, $hideinfohelp=0, $multiselect=0)
{
global $langs,$user,$form,$conf;
@@ -269,7 +270,16 @@ class FormActions
if (! empty($conf->global->AGENDA_ALWAYS_HIDE_AUTO)) unset($arraylist['AC_OTH_AUTO']);
- print $form->selectarray($htmlname, $arraylist, $selected);
+ if($multiselect==1) {
+ if(!is_array($selected) && !empty($selected)) $selected = explode(',', $selected);
+ print $form->multiselectarray($htmlname, $arraylist,$selected,0, 0, '', 0, 200);
+
+ }
+ else {
+ print $form->selectarray($htmlname, $arraylist, $selected);
+ }
+
+
if ($user->admin && empty($onlyautoornot) && empty($hideinfohelp)) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
}
diff --git a/htdocs/core/lib/agenda.lib.php b/htdocs/core/lib/agenda.lib.php
index e95bfaa94ef38a4e5dd4fff5bf193b5f54d1d0a2..55600543e64c78ba773f049cea8507d9c0ad2f84 100644
--- a/htdocs/core/lib/agenda.lib.php
+++ b/htdocs/core/lib/agenda.lib.php
@@ -53,7 +53,7 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh
$langs->load("companies");
// Filters
- print '<form name="listactionsfilter" class="listactionsfilter" action="' . $_SERVER["PHP_SELF"] . '" method="POST">';
+ print '<form name="listactionsfilter" class="listactionsfilter" action="' . $_SERVER["PHP_SELF"] . '" method="get">';
print '<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">';
print '<input type="hidden" name="year" value="' . $year . '">';
print '<input type="hidden" name="month" value="' . $month . '">';
@@ -86,7 +86,8 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh
print '<td class="nowrap" style="padding-bottom: 2px; padding-right: 4px;">';
print $langs->trans("Type");
print ' </td><td class="nowrap maxwidthonsmartphone" style="padding-bottom: 2px; padding-right: 4px;">';
- print $formactions->select_type_actions($actioncode, "actioncode", '', (empty($conf->global->AGENDA_USE_EVENT_TYPE) ? 1 : 0));
+ //select_type_actions($selected='',$htmlname='actioncode',$excludetype='',$onlyautoornot=0, $hideinfohelp=0, $multiselect=true)
+ print $formactions->select_type_actions($actioncode, "actioncode", '', (empty($conf->global->AGENDA_USE_EVENT_TYPE) ? 1 : 0), 0, 1);
print '</td></tr>';
print '<tr>';
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index 497f676ae8c3409685c3816cde1aa31b3b4b404c..3f16a20d98b19a160ed082ffc685e51e60cda574 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -179,12 +179,6 @@ if (empty($reshook))
);
}
- if (!$error && $object->update($object->id, $user) < 1) {
- $error++;
- setEventMessage($object->error, 'errors');
- $action = 'edit_price';
- }
-
if (!$error) {
$db->begin();
@@ -215,6 +209,11 @@ if (empty($reshook))
}
}
+ if (!$error && $object->update($object->id, $user) < 0) {
+ $error++;
+ setEventMessage($object->error, 'errors');
+ }
+
if (empty($error)) {
$action = '';
setEventMessage($langs->trans("RecordSaved"));
@@ -713,7 +712,7 @@ print "</table>\n";
print '</div>';
print '<div style="clear:both"></div>';
-
+
dol_fiche_end();
@@ -793,7 +792,7 @@ if ($action == 'edit_vat' && ($user->rights->produit->creer || $user->rights->se
print '<br></form><br>';
}
-if ($action == 'edit_price' && ($user->rights->produit->creer || $user->rights->service->creer))
+if ($action == 'edit_price' && $object->getRights()->creer)
{
print load_fiche_titre($langs->trans("NewPrice"), '');
@@ -809,7 +808,7 @@ if ($action == 'edit_price' && ($user->rights->produit->creer || $user->rights->
print '<table class="border" width="100%">';
// VAT
- print '<tr><td>' . $langs->trans("VATRate") . '</td><td>';
+ print '<tr><td>' . $langs->trans("VATRate") . '</td><td colspan="2">';
print $form->load_tva("tva_tx", $object->tva_tx, $mysoc, '', $object->id, $object->tva_npr);
print '</td></tr>';
@@ -817,7 +816,7 @@ if ($action == 'edit_price' && ($user->rights->produit->creer || $user->rights->
print '<tr><td width="20%">';
print $langs->trans('PriceBase');
print '</td>';
- print '<td>';
+ print '<td colspan="2">';
print $form->selectPriceBaseType($object->price_base_type, "price_base_type");
print '</td>';
print '</tr>';
@@ -825,7 +824,7 @@ if ($action == 'edit_price' && ($user->rights->produit->creer || $user->rights->
// Only show price mode and expression selector if module is enabled
if (! empty($conf->dynamicprices->enabled)) {
// Price mode selector
- print '<tr><td>'.$langs->trans("PriceMode").'</td><td>';
+ print '<tr><td>'.$langs->trans("PriceMode").'</td><td colspan="2">';
$price_expression = new PriceExpression($db);
$price_expression_list = array(0 => $langs->trans("PriceNumeric")); //Put the numeric mode as first option
foreach ($price_expression->list_price_expression() as $entry) {
@@ -835,17 +834,18 @@ if ($action == 'edit_price' && ($user->rights->produit->creer || $user->rights->
print $form->selectarray('eid', $price_expression_list, $price_expression_preselection);
print ' <div id="expression_editor" class="button">'.$langs->trans("PriceExpressionEditor").'</div>';
print '</td></tr>';
+
// This code hides the numeric price input if is not selected, loads the editor page if editor button is pressed
- print '<script type="text/javascript">
- jQuery(document).ready(run);
- function run() {
- jQuery("#expression_editor").click(on_click);
+ ?>
+
+ <script type="text/javascript">
+ jQuery(document).ready(function() {
+ jQuery("#expression_editor").click(function() {
+ window.location = "<?php echo DOL_URL_ROOT ?>/product/dynamic_price/editor.php?id=<?php echo $id ?>&tab=price&eid=" + $("#eid").attr("value");
+ });
jQuery("#eid").change(on_change);
on_change();
- }
- function on_click() {
- window.location = "'.DOL_URL_ROOT.'/product/dynamic_price/editor.php?id='.$id.'&tab=price&eid=" + $("#eid").attr("value");
- }
+ });
function on_change() {
if ($("#eid").attr("value") == 0) {
jQuery("#price_numeric").show();
@@ -853,7 +853,8 @@ if ($action == 'edit_price' && ($user->rights->produit->creer || $user->rights->
jQuery("#price_numeric").hide();
}
}
- </script>';
+ </script>
+ <?php
}
// Price
@@ -862,7 +863,7 @@ if ($action == 'edit_price' && ($user->rights->produit->creer || $user->rights->
print '<tr id="price_numeric"><td width="20%">';
$text = $langs->trans('SellingPrice');
print $form->textwithpicto($text, $langs->trans("PrecisionUnitIsLimitedToXDecimals", $conf->global->MAIN_MAX_DECIMALS_UNIT), 1, 1);
- print '</td><td>';
+ print '</td><td colspan="2">';
if ($object->price_base_type == 'TTC') {
print '<input name="price" size="10" value="' . price($product->price_ttc) . '">';
} else {
@@ -874,16 +875,22 @@ if ($action == 'edit_price' && ($user->rights->produit->creer || $user->rights->
print '<tr><td>';
$text = $langs->trans('MinPrice');
print $form->textwithpicto($text, $langs->trans("PrecisionUnitIsLimitedToXDecimals", $conf->global->MAIN_MAX_DECIMALS_UNIT), 1, 1);
+ print '</td><td';
+ if (empty($conf->global->PRODUCT_MINIMUM_RECOMMENDED_PRICE)) {
+ print ' colspan="2"';
+ }
+ print '>';
if ($object->price_base_type == 'TTC') {
- print '<td><input name="price_min" size="10" value="' . price($object->price_min_ttc) . '">';
+ print '<input name="price_min" size="10" value="' . price($object->price_min_ttc) . '">';
} else {
- print '<td><input name="price_min" size="10" value="' . price($object->price_min) . '">';
+ print '<input name="price_min" size="10" value="' . price($object->price_min) . '">';
}
+ print '</td>';
if ( !empty($conf->global->PRODUCT_MINIMUM_RECOMMENDED_PRICE))
{
print '<td align="left">'.$langs->trans("MinimumRecommendedPrice", price($maxpricesupplier,0,'',1,-1,-1,'auto')).' '.img_warning().'</td>';
}
- print '</td></tr>';
+ print '</tr>';
print '</table>';
@@ -906,8 +913,8 @@ if ($action == 'edit_price' && ($user->rights->produit->creer || $user->rights->
<script>
var showHidePriceRules = function () {
- var otherPrices = $('div.fiche form table:not(:first), div.fiche form table:first tr:not(:first)');
- var minPrice1 = $('div.fiche form:first tr:eq(1)');
+ var otherPrices = $('div.fiche form table tbody tr:not(:first)');
+ var minPrice1 = $('div.fiche form input[name="price_min[1]"]');
if (jQuery('input#usePriceRules').prop('checked')) {
otherPrices.hide();
@@ -927,65 +934,72 @@ if ($action == 'edit_price' && ($user->rights->produit->creer || $user->rights->
<?php
print '<form action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '" method="POST">';
+ print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
+ print '<input type="hidden" name="action" value="update_price">';
+ print '<input type="hidden" name="id" value="' . $object->id . '">';
- for($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i ++)
- {
+ if (! empty($conf->global->PRODUIT_MULTIPRICES) && ! empty($conf->global->PRODUIT_MULTIPRICES_ALLOW_AUTOCALC_PRICELEVEL)) {
+ print $langs->trans('UseMultipriceRules'). ' <input type="checkbox" id="usePriceRules" name="usePriceRules" '.($object->price_autogen ? 'checked' : '').'><br><br>';
+ }
- if ($i > 1) print '<br>';
- elseif (! empty($conf->global->PRODUIT_MULTIPRICES) && ! empty($conf->global->PRODUIT_MULTIPRICES_ALLOW_AUTOCALC_PRICELEVEL)) {
- print $langs->trans('UseMultipriceRules'). ' <input type="checkbox" id="usePriceRules" name="usePriceRules" '.($object->price_autogen ? 'checked' : '').'><br><br>';
- }
- print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
- print '<input type="hidden" name="action" value="update_price">';
- print '<input type="hidden" name="id" value="' . $object->id . '">';
- if (empty($conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL))
- {
- print '<input type="hidden" name="tva_tx[' . $i . ']" value="' . $object->tva_tx . '">';
- }
-
- print '<table class="border" width="100%">';
+ print '<table class="noborder">';
+ print '<thead><tr class="liste_titre">
+ <td style="text-align: center">'.$langs->trans("PriceLevel").'</td>';
+ if (!empty($conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL)) {
+ print '<td style="text-align: center">'.$langs->trans("VATRate").'</td>';
+ }
+ print '<td style="text-align: center">'.$langs->trans("SellingPrice").'</td>
+ <td style="text-align: center">'.$langs->trans("MinPrice").'</td>';
+ if (!empty($conf->global->PRODUCT_MINIMUM_RECOMMENDED_PRICE)) {
+ print '<td></td>';
+ }
+ print '</tr></thead><tbody>';
+
+ for ($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i ++) {
+ $var = !$var;
+
+ print '<tr '.$bc[$var].'>';
+ print '<td>';
+ print $form->textwithpicto($langs->trans('SellingPrice') . ' ' . $i, $langs->trans("PrecisionUnitIsLimitedToXDecimals", $conf->global->MAIN_MAX_DECIMALS_UNIT), 1, 1);
+ print '</td>';
// VAT
- if (! empty($conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL)) // This option is kept for backward compatibility but has no sense
- {
- print '<tr><td>' . $langs->trans("VATRate") . '</td><td>';
+ if (empty($conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL)) {
+ print '<input type="hidden" name="tva_tx[' . $i . ']" value="' . $object->tva_tx . '">';
+ } else {
+ // This option is kept for backward compatibility but has no sense
+ print '<td style="text-align: center">';
print $form->load_tva("tva_tx[" . $i.']', $object->multiprices_tva_tx[$i], $mysoc, '', $object->id);
- print '</td></tr>';
+ print '</td>';
}
-
+
// Selling price
- print '<tr><td width="20%">';
- $text = $langs->trans('SellingPrice') . ' ' . $i;
- print $form->textwithpicto($text, $langs->trans("PrecisionUnitIsLimitedToXDecimals", $conf->global->MAIN_MAX_DECIMALS_UNIT), 1, 1);
- print '</td><td>';
+ print '<td style="text-align: center">';
if ($object->multiprices_base_type [$i] == 'TTC') {
print '<input name="price[' . $i . ']" size="10" value="' . price($object->multiprices_ttc [$i]) . '">';
} else {
print '<input name="price[' . $i . ']" size="10" value="' . price($object->multiprices [$i]) . '">';
}
print ' '.$form->selectPriceBaseType($object->multiprices_base_type [$i], "multiprices_base_type[" . $i."]");
- print '</td></tr>';
+ print '</td>';
// Min price
- print '<tr><td>';
- $text = $langs->trans('MinPrice') . ' ' . $i;
- print $form->textwithpicto($text, $langs->trans("PrecisionUnitIsLimitedToXDecimals", $conf->global->MAIN_MAX_DECIMALS_UNIT), 1, 1);
+ print '<td style="text-align: center">';
if ($object->multiprices_base_type [$i] == 'TTC') {
- print '<td><input name="price_min[' . $i . ']" size="10" value="' . price($object->multiprices_min_ttc [$i]) . '">';
+ print '<input name="price_min[' . $i . ']" size="10" value="' . price($object->multiprices_min_ttc [$i]) . '">';
} else {
- print '<td><input name="price_min[' . $i . ']" size="10" value="' . price($object->multiprices_min [$i]) . '">';
+ print '<input name="price_min[' . $i . ']" size="10" value="' . price($object->multiprices_min [$i]) . '">';
}
if ( !empty($conf->global->PRODUCT_MINIMUM_RECOMMENDED_PRICE))
{
print '<td align="left">'.$langs->trans("MinimumRecommendedPrice", price($maxpricesupplier,0,'',1,-1,-1,'auto')).' '.img_warning().'</td>';
}
- print '</td></tr>';
-
- print '</table>';
+ print '</td>';
+ print '</tr>';
}
- print '<br><div style="text-align: center">';
+ print '</tbody></table><br><div style="text-align: center">';
print '<input type="submit" class="button" value="' . $langs->trans("Save") . '">';
print ' ';
print '<input type="submit" class="button" name="cancel" value="' . $langs->trans("Cancel") . '"></div>';