lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CSS

Browse Source
This commit is contained in:
Laurent Destailleur 2021-06-23 02:22:49 +02:00
parent 62822c424c
commit cf28fcc8cd
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/class/html.formbarcode.class.php
View File

@ -213,7 +213,7 @@ class FormBarCode
$out .= '<tr><td>';
$out .= $this->selectBarcodeType($selected, $htmlname, 1);
$out .= '</td>';
$out .= '<td class="left"><input type="submit" class="button" value="'.$langs->trans("Modify").'">';
$out .= '<td class="left"><input type="submit" class="button smallpaddingimp" value="'.$langs->trans("Modify").'">';
$out .= '</td></tr></table></form>';
}
return $out;

3
htdocs/langs/en_US/products.lang
View File

@ -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

6
htdocs/product/card.php
View File

@ -2024,7 +2024,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
print $langs->trans("BarcodeType");
print '</td>';
if (($action != 'editbarcodetype') && $usercancreate && $createbarcode) {
print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editbarcodetype&amp;id='.$object->id.'">'.img_edit($langs->trans('Edit'), 1).'</a></td>';
print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editbarcodetype&id='.$object->id.'&token='.newToken().'">'.img_edit($langs->trans('Edit'), 1).'</a></td>';
}
print '</tr></table>';
print '</td><td>';
@ -2050,7 +2050,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
print $langs->trans("BarcodeValue");
print '</td>';
if (($action != 'editbarcode') && $usercancreate && $createbarcode) {
print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editbarcode&amp;id='.$object->id.'">'.img_edit($langs->trans('Edit'), 1).'</a></td>';
print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editbarcode&id='.$object->id.'&token='.newToken().'">'.img_edit($langs->trans('Edit'), 1).'</a></td>';
}
print '</tr></table>';
print '</td><td>';
@ -2065,7 +2065,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
print '<input type="hidden" name="action" value="setbarcode">';
print '<input type="hidden" name="barcode_type_code" value="'.$object->barcode_type_code.'">';
print '<input size="40" class="maxwidthonsmartphone" type="text" name="barcode" value="'.$tmpcode.'">';
print '&nbsp;<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
print '&nbsp;<input type="submit" class="button smallpaddingimp" value="'.$langs->trans("Modify").'">';
print '</form>';
} else {
print showValueWithClipboardCPButton($object->barcode);

7
htdocs/product/price.php
View File

@ -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 '<!-- Show price mode of dynamicprices editor -->'."\n";
print '<tr><td>'.$langs->trans("PriceMode").'</td><td>';
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").' <span class="opacitymedium">('.$langs->trans("NoDynamicPrice").')</span>'); //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 '&nbsp; <div id="expression_editor" class="button">'.$langs->trans("PriceExpressionEditor").'</div>';
print '&nbsp; <a id="expression_editor" class="classlink">'.$langs->trans("PriceExpressionEditor").'</a>';
print '</td></tr>';
// This code hides the numeric price input if is not selected, loads the editor page if editor button is pressed