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

Fix warning

Browse Source
This commit is contained in:
Laurent Destailleur 2020-11-25 18:07:52 +01:00
parent 8ee9e59173
commit 74605cec12
27 changed files with 47 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/bom/tpl/objectline_create.tpl.php
View File

@ -60,7 +60,7 @@ if ($nolinesbefore) {
print '<div id="add"></div><span class="hideonsmartphone">'.$langs->trans('AddNewLine').'</span>';
print '</td>';
print '<td class="linecolqty right">'.$langs->trans('Qty').'</td>';
if ($conf->global->PRODUCT_USE_UNITS)
if (!empty($conf->global->PRODUCT_USE_UNITS))
{
print '<td class="linecoluseunit left">';
print '<span id="title_units">';
@ -109,7 +109,7 @@ $coldisplay++;
print '<td class="bordertop nobottom linecolqty right"><input type="text" size="2" name="qty" id="qty" class="flat right" value="'.(GETPOSTISSET("qty") ? GETPOST("qty", 'alpha', 2) : 1).'">';
print '</td>';
if ($conf->global->PRODUCT_USE_UNITS)
if (!empty($conf->global->PRODUCT_USE_UNITS))
{
$coldisplay++;
print '<td class="nobottom linecoluseunit left">';

2
htdocs/bom/tpl/objectline_edit.tpl.php
View File

@ -108,7 +108,7 @@ if (($line->info_bits & 2) != 2) {
}
print '</td>';
if ($conf->global->PRODUCT_USE_UNITS)
if (!empty($conf->global->PRODUCT_USE_UNITS))
{
$coldisplay++;
print '<td class="nobottom linecoluseunit left">';

2
htdocs/bom/tpl/objectline_title.tpl.php
View File

@ -54,7 +54,7 @@ print '<td class="linecoldescription">'.$langs->trans('Description').'</td>';
// Qty
print '<td class="linecolqty right">'.$form->textwithpicto($langs->trans('Qty'), $langs->trans("QtyRequiredIfNoLoss")).'</td>';
if ($conf->global->PRODUCT_USE_UNITS)
if (!empty($conf->global->PRODUCT_USE_UNITS))
{
print '<td class="linecoluseunit left">'.$langs->trans('Unit').'</td>';
}

2
htdocs/bom/tpl/objectline_view.tpl.php
View File

@ -79,7 +79,7 @@ $coldisplay++;
echo price($line->qty, 0, '', 0, 0); // Yes, it is a quantity, not a price, but we just want the formating role of function price
print '</td>';
if ($conf->global->PRODUCT_USE_UNITS)
if (!empty($conf->global->PRODUCT_USE_UNITS))
{
print '<td class="linecoluseunit nowrap left">';
$label = $tmpproduct->getLabelOfUnit('long');

8
htdocs/contrat/card.php
View File

@ -1477,7 +1477,7 @@ if ($action == 'create')
// print '<td width="80" class="right">'.$langs->trans("PriceUHTCurrency").'</td>';
//}
print '<td width="30" class="center">'.$langs->trans("Qty").'</td>';
if ($conf->global->PRODUCT_USE_UNITS) print '<td width="30" class="left">'.$langs->trans("Unit").'</td>';
if (!empty($conf->global->PRODUCT_USE_UNITS)) print '<td width="30" class="left">'.$langs->trans("Unit").'</td>';
print '<td width="50" class="right">'.$langs->trans("ReductionShort").'</td>';
if (!empty($conf->margin->enabled) && !empty($conf->global->MARGIN_SHOW_ON_CONTRACT)) print '<td width="50" class="right">'.$langs->trans("BuyingPrice").'</td>';
print '<td width="30">&nbsp;</td>';
@ -1538,7 +1538,7 @@ if ($action == 'create')
// Quantity
print '<td class="center">'.$objp->qty.'</td>';
// Unit
if ($conf->global->PRODUCT_USE_UNITS) print '<td class="left">'.$langs->trans($object->lines[$cursorline - 1]->getLabelOfUnit()).'</td>';
if (!empty($conf->global->PRODUCT_USE_UNITS)) print '<td class="left">'.$langs->trans($object->lines[$cursorline - 1]->getLabelOfUnit()).'</td>';
// Discount
if ($objp->remise_percent > 0)
{
@ -1682,7 +1682,7 @@ if ($action == 'create')
print '<td class="center"><input size="2" type="text" name="elqty" value="'.$objp->qty.'"></td>';
// Unit
if ($conf->global->PRODUCT_USE_UNITS)
if (!empty($conf->global->PRODUCT_USE_UNITS))
{
print '<td class="left">';
print $form->selectUnits($objp->fk_unit, "unit");
@ -1706,7 +1706,7 @@ if ($action == 'create')
$colspan = 6;
if (!empty($conf->margin->enabled) && !empty($conf->global->MARGIN_SHOW_ON_CONTRACT)) $colspan++;
if ($conf->global->PRODUCT_USE_UNITS) $colspan++;
if (!empty($conf->global->PRODUCT_USE_UNITS)) $colspan++;
// Ligne dates prevues
print '<tr class="oddeven">';

2
htdocs/core/class/commondocgenerator.class.php
View File

@ -625,7 +625,7 @@ abstract class CommonDocGenerator
);
// Units
if ($conf->global->PRODUCT_USE_UNITS)
if (!empty($conf->global->PRODUCT_USE_UNITS))
{
$resarray['line_unit'] = $outputlangs->trans($line->getLabelOfUnit('long'));
$resarray['line_unit_short'] = $outputlangs->trans($line->getLabelOfUnit('short'));

4
htdocs/core/class/commonobject.class.php
View File

@ -4252,7 +4252,7 @@ abstract class CommonObject
print '<td class="right">'.$langs->trans('PriceUHT').'</td>';
if (!empty($conf->multicurrency->enabled)) print '<td class="right">'.$langs->trans('PriceUHTCurrency').'</td>';
print '<td class="right">'.$langs->trans('Qty').'</td>';
if ($conf->global->PRODUCT_USE_UNITS)
if (!empty($conf->global->PRODUCT_USE_UNITS))
{
print '<td class="left">'.$langs->trans('Unit').'</td>';
}
@ -4395,7 +4395,7 @@ abstract class CommonObject
$this->tpl['price'] = price($line->subprice);
$this->tpl['multicurrency_price'] = price($line->multicurrency_subprice);
$this->tpl['qty'] = (($line->info_bits & 2) != 2) ? $line->qty : '&nbsp;';
if ($conf->global->PRODUCT_USE_UNITS) $this->tpl['unit'] = $langs->transnoentities($line->getLabelOfUnit('long'));
if (!empty($conf->global->PRODUCT_USE_UNITS)) $this->tpl['unit'] = $langs->transnoentities($line->getLabelOfUnit('long'));
$this->tpl['remise_percent'] = (($line->info_bits & 2) != 2) ? vatrate($line->remise_percent, true) : '&nbsp;';
// Is the line strike or not

10
htdocs/core/class/html.form.class.php
View File

@ -2113,7 +2113,7 @@ class Form
$outarray = array();
// Units
if ($conf->global->PRODUCT_USE_UNITS) {
if (!empty($conf->global->PRODUCT_USE_UNITS)) {
$langs->load('other');
}
@ -2752,7 +2752,7 @@ class Form
$langs->load('stocks');
// Units
if ($conf->global->PRODUCT_USE_UNITS) {
if (!empty($conf->global->PRODUCT_USE_UNITS)) {
$langs->load('other');
}
@ -2761,7 +2761,7 @@ class Form
$sql .= " pfp.fk_supplier_price_expression, pfp.fk_product, pfp.tva_tx, pfp.fk_soc, s.nom as name,";
$sql .= " pfp.supplier_reputation";
// Units
if ($conf->global->PRODUCT_USE_UNITS) {
if (!empty($conf->global->PRODUCT_USE_UNITS)) {
$sql .= ", u.label as unit_long, u.short_label as unit_short, p.weight, p.weight_units, p.length, p.length_units, p.width, p.width_units, p.height, p.height_units, p.surface, p.surface_units, p.volume, p.volume_units";
}
if (!empty($conf->barcode->enabled)) $sql .= ", pfp.barcode";
@ -2770,7 +2770,7 @@ class Form
if ($socid) $sql .= " AND pfp.fk_soc = ".$socid;
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON pfp.fk_soc = s.rowid";
// Units
if ($conf->global->PRODUCT_USE_UNITS) {
if (!empty($conf->global->PRODUCT_USE_UNITS)) {
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_units u ON u.rowid = p.fk_unit";
}
$sql .= " WHERE p.entity IN (".getEntity('product').")";
@ -2837,7 +2837,7 @@ class Form
// Units
$outvalUnits = '';
if ($conf->global->PRODUCT_USE_UNITS) {
if (!empty($conf->global->PRODUCT_USE_UNITS)) {
if (!empty($objp->unit_short)) {
$outvalUnits .= ' - '.$objp->unit_short;
}

6
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
View File

@ -166,7 +166,7 @@ class pdf_einstein extends ModelePDFCommandes
// Define position of columns
$this->posxdesc = $this->marge_gauche + 1;
if ($conf->global->PRODUCT_USE_UNITS)
if (!empty($conf->global->PRODUCT_USE_UNITS))
{
$this->posxtva = 101;
$this->posxup = 118;
@ -490,7 +490,7 @@ class pdf_einstein extends ModelePDFCommandes
$pdf->MultiCell($this->posxunit - $this->posxqty - 0.8, 4, $qty, 0, 'R'); // Enough for 6 chars
// Unit
if ($conf->global->PRODUCT_USE_UNITS)
if (!empty($conf->global->PRODUCT_USE_UNITS))
{
$unit = pdf_getlineunit($object, $i, $outputlangs, $hidedetails, $hookmanager);
$pdf->SetXY($this->posxunit, $curY);
@ -1207,7 +1207,7 @@ class pdf_einstein extends ModelePDFCommandes
$pdf->MultiCell($this->posxunit - $this->posxqty - 1, 2, $outputlangs->transnoentities("Qty"), '', 'C');
}
if ($conf->global->PRODUCT_USE_UNITS) {
if (!empty($conf->global->PRODUCT_USE_UNITS)) {
$pdf->line($this->posxunit - 1, $tab_top, $this->posxunit - 1, $tab_top + $tab_height);
if (empty($hidetop)) {
$pdf->SetXY($this->posxunit - 1, $tab_top + 1);

2
htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
View File

@ -1815,7 +1815,7 @@ class pdf_eratosthene extends ModelePDFCommandes
),
'border-left' => true, // add left line separator
);
if ($conf->global->PRODUCT_USE_UNITS) {
if (!empty($conf->global->PRODUCT_USE_UNITS)) {
$this->cols['unit']['status'] = true;
}

2
htdocs/core/modules/facture/doc/pdf_sponge.modules.php
View File

@ -2321,7 +2321,7 @@ class pdf_sponge extends ModelePDFFactures
),
'border-left' => true, // add left line separator
);
if ($conf->global->PRODUCT_USE_UNITS) {
if (!empty($conf->global->PRODUCT_USE_UNITS)) {
$this->cols['unit']['status'] = true;
}

2
htdocs/core/modules/product/doc/pdf_standard.modules.php
View File

@ -656,7 +656,7 @@ class pdf_standard extends ModelePDFProduct
$pdf->MultiCell($this->posxunit - $this->posxqty - 1, 2, $outputlangs->transnoentities("Qty"), '', 'C');
}
if ($conf->global->PRODUCT_USE_UNITS) {
if (!empty($conf->global->PRODUCT_USE_UNITS)) {
$pdf->line($this->posxunit - 1, $tab_top, $this->posxunit - 1, $tab_top + $tab_height);
if (empty($hidetop)) {
$pdf->SetXY($this->posxunit - 1, $tab_top + 1);

6
htdocs/core/modules/propale/doc/pdf_azur.modules.php
View File

@ -166,7 +166,7 @@ class pdf_azur extends ModelePDFPropales
// Define position of columns
$this->posxdesc = $this->marge_gauche + 1;
if ($conf->global->PRODUCT_USE_UNITS)
if (!empty($conf->global->PRODUCT_USE_UNITS))
{
$this->posxtva = 101;
$this->posxup = 118;
@ -583,7 +583,7 @@ class pdf_azur extends ModelePDFPropales
$pdf->MultiCell($this->posxunit - $this->posxqty - 0.8, 4, $qty, 0, 'R'); // Enough for 6 chars
// Unit
if ($conf->global->PRODUCT_USE_UNITS)
if (!empty($conf->global->PRODUCT_USE_UNITS))
{
$unit = pdf_getlineunit($object, $i, $outputlangs, $hidedetails, $hookmanager);
$pdf->SetXY($this->posxunit, $curY);
@ -1381,7 +1381,7 @@ class pdf_azur extends ModelePDFPropales
$pdf->MultiCell($this->posxunit - $this->posxqty - 1, 2, $outputlangs->transnoentities("Qty"), '', 'C');
}
if ($conf->global->PRODUCT_USE_UNITS) {
if (!empty($conf->global->PRODUCT_USE_UNITS)) {
$pdf->line($this->posxunit - 1, $tab_top, $this->posxunit - 1, $tab_top + $tab_height);
if (empty($hidetop)) {
$pdf->SetXY($this->posxunit - 1, $tab_top + 1);

2
htdocs/core/modules/propale/doc/pdf_cyan.modules.php
View File

@ -1968,7 +1968,7 @@ class pdf_cyan extends ModelePDFPropales
),
'border-left' => true, // add left line separator
);
if ($conf->global->PRODUCT_USE_UNITS) {
if (!empty($conf->global->PRODUCT_USE_UNITS)) {
$this->cols['unit']['status'] = true;
}

2
htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
View File

@ -161,7 +161,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
$this->posxdiscount = 162;
$this->postotalht = 174;
if ($conf->global->PRODUCT_USE_UNITS) {
if (!empty($conf->global->PRODUCT_USE_UNITS)) {
$this->posxtva = 99;
$this->posxup = 114;
$this->posxqty = 130;

2
htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
View File

@ -1562,7 +1562,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
),
'border-left' => true, // add left line separator
);
if ($conf->global->PRODUCT_USE_UNITS) {
if (!empty($conf->global->PRODUCT_USE_UNITS)) {
$this->cols['unit']['status'] = true;
}

6
htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
View File

@ -162,7 +162,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
$this->posxdiscount = 162;
$this->postotalht = 174;
if ($conf->global->PRODUCT_USE_UNITS)
if (!empty($conf->global->PRODUCT_USE_UNITS))
{
$this->posxtva = 95;
$this->posxup = 114;
@ -528,7 +528,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
$pdf->MultiCell($this->posxunit - $this->posxqty - 0.8, 4, $qty, 0, 'R'); // Enough for 6 chars
// Unit
if ($conf->global->PRODUCT_USE_UNITS)
if (!empty($conf->global->PRODUCT_USE_UNITS))
{
$unit = pdf_getlineunit($object, $i, $outputlangs, $hidedetails, $hookmanager);
$pdf->SetXY($this->posxunit, $curY);
@ -1057,7 +1057,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
$pdf->MultiCell($this->posxunit - $this->posxqty - 1, 2, $outputlangs->transnoentities("Qty"), '', 'C');
}
if ($conf->global->PRODUCT_USE_UNITS) {
if (!empty($conf->global->PRODUCT_USE_UNITS)) {
$pdf->line($this->posxunit - 1, $tab_top, $this->posxunit - 1, $tab_top + $tab_height);
if (empty($hidetop)) {
$pdf->SetXY($this->posxunit - 1, $tab_top + 1);

6
htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
View File

@ -159,7 +159,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
$this->posxdiscount = 162;
$this->postotalht = 174;
if ($conf->global->PRODUCT_USE_UNITS)
if (!empty($conf->global->PRODUCT_USE_UNITS))
{
$this->posxtva = 101;
$this->posxup = 118;
@ -521,7 +521,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
$pdf->MultiCell($this->posxunit - $this->posxqty - 0.8, 4, $qty, 0, 'R'); // Enough for 6 chars
// Unit
if ($conf->global->PRODUCT_USE_UNITS)
if (!empty($conf->global->PRODUCT_USE_UNITS))
{
$unit = pdf_getlineunit($object, $i, $outputlangs, $hidedetails, $hookmanager);
$pdf->SetXY($this->posxunit, $curY);
@ -1216,7 +1216,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
$pdf->MultiCell($this->posxunit - $this->posxqty - 1, 2, $outputlangs->transnoentities("Qty"), '', 'C');
}
if ($conf->global->PRODUCT_USE_UNITS) {
if (!empty($conf->global->PRODUCT_USE_UNITS)) {
$pdf->line($this->posxunit - 1, $tab_top, $this->posxunit - 1, $tab_top + $tab_height);
if (empty($hidetop)) {
$pdf->SetXY($this->posxunit - 1, $tab_top + 1);

2
htdocs/core/tpl/objectline_create.tpl.php
View File

@ -105,7 +105,7 @@ if ($nolinesbefore) {
<?php } ?>
<td class="linecolqty right"><?php echo $langs->trans('Qty'); ?></td>
<?php
if ($conf->global->PRODUCT_USE_UNITS)
if (!empty($conf->global->PRODUCT_USE_UNITS))
{
print '<td class="linecoluseunit left">';
print '<span id="title_units">';

2
htdocs/core/tpl/objectline_edit.tpl.php
View File

@ -189,7 +189,7 @@ $coldisplay++;
</td>
<?php
if ($conf->global->PRODUCT_USE_UNITS)
if (!empty($conf->global->PRODUCT_USE_UNITS))
{
$coldisplay++;
print '<td class="left">';

2
htdocs/core/tpl/objectline_title.tpl.php
View File

@ -89,7 +89,7 @@ if ($inputalsopricewithtax) print '<td class="right" style="width: 80px">'.$lang
// Qty
print '<td class="linecolqty right">'.$langs->trans('Qty').'</td>';
if ($conf->global->PRODUCT_USE_UNITS)
if (!empty($conf->global->PRODUCT_USE_UNITS))
{
print '<td class="linecoluseunit left">'.$langs->trans('Unit').'</td>';
}

2
htdocs/core/tpl/objectline_view.tpl.php
View File

@ -223,7 +223,7 @@ if ((($line->info_bits & 2) != 2) && $line->special_code != 3) {
} else print '&nbsp;';
print '</td>';
if ($conf->global->PRODUCT_USE_UNITS)
if (!empty($conf->global->PRODUCT_USE_UNITS))
{
print '<td class="linecoluseunit nowrap left">';
$label = $line->getLabelOfUnit('short');

2
htdocs/core/tpl/originproductline.tpl.php
View File

@ -36,7 +36,7 @@ if (!empty($conf->multicurrency->enabled))
print '<td class="right">'.$this->tpl['multicurrency_price'].'</td>';
print '<td class="right">'.$this->tpl['qty'].'</td>';
if ($conf->global->PRODUCT_USE_UNITS)
if (!empty($conf->global->PRODUCT_USE_UNITS))
print '<td class="left">'.$langs->trans($this->tpl['unit']).'</td>';
print '<td class="right">'.$this->tpl['remise_percent'].'</td>';

2
htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php
View File

@ -1300,7 +1300,7 @@ class pdf_standard_myobject extends ModelePDFMyObject
),
'border-left' => true, // add left line separator
);
if ($conf->global->PRODUCT_USE_UNITS) {
if (!empty($conf->global->PRODUCT_USE_UNITS)) {
$this->cols['unit']['status'] = true;
}

4
htdocs/product/card.php
View File

@ -1151,7 +1151,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
}
// Units
if ($conf->global->PRODUCT_USE_UNITS)
if (!empty($conf->global->PRODUCT_USE_UNITS))
{
print '<tr><td>'.$langs->trans('DefaultUnitToShow').'</td>';
print '<td colspan="3">';
@ -1610,7 +1610,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
}
}
// Units
if ($conf->global->PRODUCT_USE_UNITS)
if (!empty($conf->global->PRODUCT_USE_UNITS))
{
print '<tr><td>'.$langs->trans('DefaultUnitToShow').'</td>';
print '<td colspan="3">';

6
htdocs/product/fournisseurs.php
View File

@ -519,7 +519,7 @@ if ($id > 0 || $ref)
print '<input class="flat" name="qty" size="5" value="'.$quantity.'">';
}
// Units
if ($conf->global->PRODUCT_USE_UNITS) {
if (!empty($conf->global->PRODUCT_USE_UNITS)) {
$unit = $object->getLabelOfUnit();
if ($unit !== '') {
print '&nbsp;&nbsp;'.$langs->trans($unit);
@ -537,7 +537,7 @@ if ($id > 0 || $ref)
print '<input class="flat" name="packaging" size="5" value="'.$packaging.'">';
// Units
if ($conf->global->PRODUCT_USE_UNITS) {
if (!empty($conf->global->PRODUCT_USE_UNITS)) {
$unit = $object->getLabelOfUnit();
if ($unit !== '') {
print '&nbsp;&nbsp;'.$langs->trans($unit);
@ -1000,7 +1000,7 @@ END;
print '<td class="right">';
print $productfourn->fourn_qty;
// Units
if ($conf->global->PRODUCT_USE_UNITS) {
if (!empty($conf->global->PRODUCT_USE_UNITS)) {
$unit = $object->getLabelOfUnit();
if ($unit !== '') {
print '&nbsp;&nbsp;'.$langs->trans($unit);

2
htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php
View File

@ -1213,7 +1213,7 @@ class pdf_standard_recruitmentjobposition extends ModelePDFRecruitmentJobPositio
),
'border-left' => true, // add left line separator
);
if ($conf->global->PRODUCT_USE_UNITS) {
if (!empty($conf->global->PRODUCT_USE_UNITS)) {
$this->cols['unit']['status'] = true;
}