From cf28fcc8cd14bc562d0ba405f7a8b19fbe6673eb Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 23 Jun 2021 02:22:49 +0200 Subject: [PATCH] CSS --- htdocs/core/class/html.formbarcode.class.php | 2 +- htdocs/langs/en_US/products.lang | 3 ++- htdocs/product/card.php | 6 +++--- htdocs/product/price.php | 7 ++++--- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/htdocs/core/class/html.formbarcode.class.php b/htdocs/core/class/html.formbarcode.class.php index 34bcbd86cfa..23811b1f5b7 100644 --- a/htdocs/core/class/html.formbarcode.class.php +++ b/htdocs/core/class/html.formbarcode.class.php @@ -213,7 +213,7 @@ class FormBarCode $out .= ''; $out .= $this->selectBarcodeType($selected, $htmlname, 1); $out .= ''; - $out .= ''; + $out .= ''; $out .= ''; } return $out; diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang index 9638dfe5a25..fecbe7450c2 100644 --- a/htdocs/langs/en_US/products.lang +++ b/htdocs/langs/en_US/products.lang @@ -277,7 +277,7 @@ PriceByCustomer=Different prices for each customer PriceCatalogue=A single sell price per product/service PricingRule=Rules for selling prices AddCustomerPrice=Add price by customer -ForceUpdateChildPriceSoc=Set same price on customer subsidiaries +ForceUpdateChildPriceSoc=Set same price on customer's subsidiaries PriceByCustomerLog=Log of previous customer prices MinimumPriceLimit=Minimum price can't be lower then %s MinimumRecommendedPrice=Minimum recommended price is: %s @@ -296,6 +296,7 @@ ComposedProductIncDecStock=Increase/Decrease stock on parent change ComposedProduct=Child products MinSupplierPrice=Minimum buying price MinCustomerPrice=Minimum selling price +NoDynamicPrice=No dynamic price DynamicPriceConfiguration=Dynamic price configuration DynamicPriceDesc=You may define mathematical formulae to calculate Customer or Vendor prices. Such formulas can use all mathematical operators, some constants and variables. You can define here the variables you wish to use. If the variable needs an automatic update, you may define the external URL to allow Dolibarr to update the value automatically. AddVariable=Add Variable diff --git a/htdocs/product/card.php b/htdocs/product/card.php index 3528d5ef299..0aff87cc28b 100644 --- a/htdocs/product/card.php +++ b/htdocs/product/card.php @@ -2024,7 +2024,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) { print $langs->trans("BarcodeType"); print ''; if (($action != 'editbarcodetype') && $usercancreate && $createbarcode) { - print 'id.'">'.img_edit($langs->trans('Edit'), 1).''; + print 'id.'&token='.newToken().'">'.img_edit($langs->trans('Edit'), 1).''; } print ''; print ''; @@ -2050,7 +2050,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) { print $langs->trans("BarcodeValue"); print ''; if (($action != 'editbarcode') && $usercancreate && $createbarcode) { - print 'id.'">'.img_edit($langs->trans('Edit'), 1).''; + print 'id.'&token='.newToken().'">'.img_edit($langs->trans('Edit'), 1).''; } print ''; print ''; @@ -2065,7 +2065,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) { print ''; print ''; print ''; - print ' '; + print ' '; print ''; } else { print showValueWithClipboardCPButton($object->barcode); diff --git a/htdocs/product/price.php b/htdocs/product/price.php index 6cb782f00dd..aad0311502d 100644 --- a/htdocs/product/price.php +++ b/htdocs/product/price.php @@ -50,7 +50,6 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) { // Load translation files required by the page $langs->loadLangs(array('products', 'bills', 'companies', 'other')); -$mesg = ''; $error = 0; $errors = array(); @@ -1212,15 +1211,17 @@ if ($action == 'edit_price' && $object->getRights()->creer) { // Only show price mode and expression selector if module is enabled if (!empty($conf->dynamicprices->enabled)) { // Price mode selector + print ''."\n"; print ''.$langs->trans("PriceMode").''; + print img_picto('', 'dynamicprice', 'class="pictofixedwidth"'); $price_expression = new PriceExpression($db); - $price_expression_list = array(0 => $langs->trans("PriceNumeric")); //Put the numeric mode as first option + $price_expression_list = array(0 => $langs->trans("Numeric").' ('.$langs->trans("NoDynamicPrice").')'); //Put the numeric mode as first option foreach ($price_expression->list_price_expression() as $entry) { $price_expression_list[$entry->id] = $entry->title; } $price_expression_preselection = GETPOST('eid') ? GETPOST('eid') : ($object->fk_price_expression ? $object->fk_price_expression : '0'); print $form->selectarray('eid', $price_expression_list, $price_expression_preselection); - print ' 
'.$langs->trans("PriceExpressionEditor").'
'; + print '  '.$langs->trans("PriceExpressionEditor").''; print ''; // This code hides the numeric price input if is not selected, loads the editor page if editor button is pressed