';
print '| '.$langs->trans("Description").' | ';
- if (!empty($conf->productbatch->enabled))
- {
+ if (!empty($conf->productbatch->enabled)) {
print ''.$langs->trans("batch_number").' | ';
print ''.$langs->trans("EatByDate").' | ';
print ''.$langs->trans("SellByDate").' | ';
@@ -731,11 +729,9 @@ if ($id > 0 || !empty($ref)) {
print ''.$langs->trans("Warehouse");
// Select warehouse to force it everywhere
- if (count($listwarehouses) > 1)
- {
+ if (count($listwarehouses) > 1) {
print '
'.$langs->trans("ForceTo").' '.$form->selectarray('fk_default_warehouse', $listwarehouses, $fk_default_warehouse, 1, 0, 0, '', 0, 0, $disabled);
- } elseif (count($listwarehouses) == 1)
- {
+ } elseif (count($listwarehouses) == 1) {
print '
'.$langs->trans("ForceTo").' '.$form->selectarray('fk_default_warehouse', $listwarehouses, $fk_default_warehouse, 0, 0, 0, '', 0, 0, $disabled);
}
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 04c55b6dae4..0cde9145a51 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -1716,14 +1716,12 @@ if ($action == 'create')
}
// when payment condition is empty (means not override by payment condition form a other object, like third-party), try to use default value
- if(empty($cond_reglement_id))
- {
+ if (empty($cond_reglement_id)) {
$cond_reglement_id = GETPOST("cond_reglement_id");
}
// when payment mode is empty (means not override by payment condition form a other object, like third-party), try to use default value
- if(empty($mode_reglement_id))
- {
+ if (empty($mode_reglement_id)) {
$mode_reglement_id = GETPOST("mode_reglement_id");
}
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index ef8830b2f35..42b0a4a3bc7 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -2040,7 +2040,7 @@ function top_menu_quickadd()
if (! empty($conf->service->enabled) && $user->rights->service->creer) {
$langs->load("products");
- $dropDownQuickAddHtml.= '
+ $dropDownQuickAddHtml .= '
';
- $dropDownQuickAddHtml.= '';
+ $dropDownQuickAddHtml .= '';
+ $dropDownQuickAddHtml .= '';
$html.= '
';
print '';
- }
- // Fiche en mode visu
- else {
+ } else {
+ // Fiche en mode visu
$showbarcode = empty($conf->barcode->enabled) ? 0 : 1;
if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->lire_advance)) $showbarcode = 0;
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 9bb3589b936..8a069418c4a 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -1603,9 +1603,8 @@ class Product extends CommonObject
if (isset($this->multiprices_recuperableonly[$thirdparty_buyer->price_level])) $tva_npr = $this->multiprices_recuperableonly[$thirdparty_buyer->price_level];
if (empty($tva_tx)) $tva_npr = 0;
}
- }
- // If price per customer
- elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
+ } elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
+ // If price per customer
require_once DOL_DOCUMENT_ROOT.'/product/class/productcustomerprice.class.php';
$prodcustprice = new Productcustomerprice($db);
@@ -1624,14 +1623,12 @@ class Product extends CommonObject
if (empty($tva_tx)) $tva_npr = 0;
}
}
- }
- // If price per quantity
- elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY)) {
- if ($this->prices_by_qty[0]) // yes, this product has some prices per quantity
- {
+ } elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY)) {
+ // If price per quantity
+ if ($this->prices_by_qty[0]) {
+ // yes, this product has some prices per quantity
// Search price into product_price_by_qty from $this->id
- foreach ($this->prices_by_qty_list[0] as $priceforthequantityarray)
- {
+ foreach ($this->prices_by_qty_list[0] as $priceforthequantityarray) {
if ($priceforthequantityarray['rowid'] != $pqp) continue;
// We found the price
if ($priceforthequantityarray['price_base_type'] == 'HT')
@@ -1643,11 +1640,10 @@ class Product extends CommonObject
break;
}
}
- }
- // If price per quantity and customer
- elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) {
- if ($this->prices_by_qty[$thirdparty_buyer->price_level]) // yes, this product has some prices per quantity
- {
+ } elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) {
+ // If price per quantity and customer
+ if ($this->prices_by_qty[$thirdparty_buyer->price_level]) {
+ // yes, this product has some prices per quantity
// Search price into product_price_by_qty from $this->id
foreach ($this->prices_by_qty_list[$thirdparty_buyer->price_level] as $priceforthequantityarray)
{
@@ -3777,9 +3773,8 @@ class Product extends CommonObject
$this->error = $this->db->lasterror();
return -1;
}
- }
- // If the supplier price already exists for this product and quantity
- else {
+ } else {
+ // If the supplier price already exists for this product and quantity
$this->product_fourn_price_id = $obj->rowid;
return 0;
}
|