diff --git a/htdocs/product/admin/product.php b/htdocs/product/admin/product.php index 23b1cb43f56..5427b6620dc 100644 --- a/htdocs/product/admin/product.php +++ b/htdocs/product/admin/product.php @@ -99,7 +99,7 @@ if ($action == 'other' && GETPOST('value_PRODUIT_MULTIPRICES_LIMIT') > 0) if ($action == 'other') { $princingrules = GETPOST('princingrule', 'alpha'); - foreach ($select_pricing_rules as $rule=>$label) // Loop on each possible mode + foreach ($select_pricing_rules as $rule => $label) // Loop on each possible mode { if ($rule == $princingrules) // We are on selected rule, we enable it { @@ -530,7 +530,7 @@ print '
| '.$langs->trans("Parameters").' | '."\n"; print ''.$langs->trans("Value").' | '."\n"; -print ''.$form->textwithpicto($langs->trans("PricingRule"), $langs->trans("SamePriceAlsoForSharedCompanies"), 1).' | '; } -print ''; +print ' | '; $current_rule = 'PRODUCT_PRICE_UNIQ'; if (!empty($conf->global->PRODUIT_MULTIPRICES)) $current_rule = 'PRODUIT_MULTIPRICES'; if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY)) $current_rule = 'PRODUIT_CUSTOMER_PRICES_BY_QTY'; if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) $current_rule = 'PRODUIT_CUSTOMER_PRICES'; if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) $current_rule = 'PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES'; print $form->selectarray("princingrule", $select_pricing_rules, $current_rule); -print ' | '; -print ''; print ' | '; print ''; @@ -577,7 +575,7 @@ if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_ print '
| '.$langs->trans("AssociatedProductsAbility").' | '; -print ''; +print ' | '; print $form->selectyesno("PRODUIT_SOUSPRODUITS", $conf->global->PRODUIT_SOUSPRODUITS, 1); print ' | '; print '|||
| '.$form->textwithpicto($langs->trans("UseSearchToSelectProduct"), $langs->trans('UseSearchToSelectProductTooltip'), 1).' | '; if (empty($conf->use_javascript_ajax)) { - print ''; + print ' | '; print $langs->trans("NotAvailableWhenAjaxDisabled"); print ' | '; } else { - print ''; + print ' | '; $arrval = array( '0'=>$langs->trans("No"), '1'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch", 1).')', @@ -615,7 +613,7 @@ if (empty($conf->global->PRODUIT_USE_SEARCH_TO_SELECT)) // Visualiser description produit dans les formulaires activation/desactivation print ' | |
| '.$langs->trans("ViewProductDescInFormAbility").' | '; -print ''; +print ' | '; print $form->selectyesno("activate_viewProdDescInForm", $conf->global->PRODUIT_DESC_IN_FORM, 1); print ' | '; print '|||
| '.$langs->trans("MergePropalProductCard").' | '; -print ''; +print ' | '; print $form->selectyesno("activate_mergePropalProductCard",$conf->global->PRODUIT_PDF_MERGE_PROPAL,1); print ' | '; print '|||
| '.$langs->trans("UseUnits").' | '; -print ''; +print ' | '; print $form->selectyesno("activate_units",$conf->global->PRODUCT_USE_UNITS,1); print ' | '; print '|||
| '.$langs->trans("ViewProductDescInThirdpartyLanguageAbility").' | '; - print ''; + print ' | '; print $form->selectyesno("activate_viewProdTextsInThirdpartyLanguage", (!empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE) ? $conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE : 0), 1); print ' | '; print '|||
| '.$langs->trans("UseProductFournDesc").' | '; - print ''; + print ' | '; print $form->selectyesno("activate_useProdFournDesc", (!empty($conf->global->PRODUIT_FOURN_TEXTS) ? $conf->global->PRODUIT_FOURN_TEXTS : 0), 1); print ' | '; print '|||
| '.$langs->trans("UseProductSupplierPackaging").' | '; - print ''; + print ' | '; print $form->selectyesno("activate_useProdSupplierPackaging", (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING) ? $conf->global->PRODUCT_USE_SUPPLIER_PACKAGING : 0), 1); print ' | '; print '|||
| '.$langs->trans("ProductSpecial").' | '."\n"; - print ''.$langs->trans("Value").' | '."\n"; - print ''.$langs->trans("Value").' | '."\n"; + print ''."\n"; if (is_dir($dir)) { @@ -733,6 +731,8 @@ if (!empty($conf->global->PRODUCT_CANVAS_ABILITY)) print '|||