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

Merge pull request #23375 from grandoc/new_branch_30_12_2022

Browse Source 
update code toward php8 compliance
This commit is contained in:
Laurent Destailleur 2023-01-04 08:33:25 +01:00 committed by GitHub
commit 268f0b7c36
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
22 changed files with 51 additions and 51 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

@ -73,7 +73,7 @@ if ($nolinesbefore) {
print '<td class="linecolqty right">'.$langs->trans('Qty').'</td>'; print '<td class="linecolqty right">'.$langs->trans('Qty').'</td>';
if ($filtertype != 1) { if ($filtertype != 1) {
if (!empty($conf->global->PRODUCT_USE_UNITS)) { if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
print '<td class="linecoluseunit left">'; print '<td class="linecoluseunit left">';
print '<span id="title_units">'; print '<span id="title_units">';
print $langs->trans('Unit'); print $langs->trans('Unit');
@ -145,7 +145,7 @@ print '<td class="bordertop nobottom linecolqty right"><input type="text" size="
print '</td>'; print '</td>';
if ($filtertype != 1) { if ($filtertype != 1) {
if (!empty($conf->global->PRODUCT_USE_UNITS)) { if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
$coldisplay++; $coldisplay++;
print '<td class="nobottom linecoluseunit left">'; print '<td class="nobottom linecoluseunit left">';
print '</td>'; print '</td>';

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

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

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

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

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

@ -119,7 +119,7 @@ echo price($line->qty, 0, '', 0, 0); // Yes, it is a quantity, not a price, but
print '</td>'; print '</td>';
if ($filtertype != 1) { if ($filtertype != 1) {
if (!empty($conf->global->PRODUCT_USE_UNITS)) { if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
print '<td class="linecoluseunit nowrap left">'; print '<td class="linecoluseunit nowrap left">';
$label = $tmpproduct->getLabelOfUnit('long'); $label = $tmpproduct->getLabelOfUnit('long');
if ($label !== '') { if ($label !== '') {

8
htdocs/contrat/card.php
View File

@ -1513,7 +1513,7 @@ if ($action == 'create') {
// print '<td width="80" class="right">'.$langs->trans("PriceUHTCurrency").'</td>'; // print '<td width="80" class="right">'.$langs->trans("PriceUHTCurrency").'</td>';
//} //}
print '<td width="30" class="center">'.$langs->trans("Qty").'</td>'; print '<td width="30" class="center">'.$langs->trans("Qty").'</td>';
if (!empty($conf->global->PRODUCT_USE_UNITS)) { if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
print '<td width="30" class="left">'.$langs->trans("Unit").'</td>'; print '<td width="30" class="left">'.$langs->trans("Unit").'</td>';
} }
print '<td width="50" class="right">'.$langs->trans("ReductionShort").'</td>'; print '<td width="50" class="right">'.$langs->trans("ReductionShort").'</td>';
@ -1594,7 +1594,7 @@ if ($action == 'create') {
// Quantity // Quantity
print '<td class="center">'.$objp->qty.'</td>'; print '<td class="center">'.$objp->qty.'</td>';
// Unit // Unit
if (!empty($conf->global->PRODUCT_USE_UNITS)) { if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
print '<td class="left">'.$langs->trans($object->lines[$cursorline - 1]->getLabelOfUnit()).'</td>'; print '<td class="left">'.$langs->trans($object->lines[$cursorline - 1]->getLabelOfUnit()).'</td>';
} }
// Discount // Discount
@ -1739,7 +1739,7 @@ if ($action == 'create') {
print '<td class="center"><input size="2" type="text" name="elqty" value="'.$objp->qty.'"></td>'; print '<td class="center"><input size="2" type="text" name="elqty" value="'.$objp->qty.'"></td>';
// Unit // Unit
if (!empty($conf->global->PRODUCT_USE_UNITS)) { if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
print '<td class="left">'; print '<td class="left">';
print $form->selectUnits($objp->fk_unit, "unit"); print $form->selectUnits($objp->fk_unit, "unit");
print '</td>'; print '</td>';
@ -1765,7 +1765,7 @@ if ($action == 'create') {
if (isModEnabled('margin') && !empty($conf->global->MARGIN_SHOW_ON_CONTRACT)) { if (isModEnabled('margin') && !empty($conf->global->MARGIN_SHOW_ON_CONTRACT)) {
$colspan++; $colspan++;
} }
if (!empty($conf->global->PRODUCT_USE_UNITS)) { if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
$colspan++; $colspan++;
} }

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

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

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

@ -5121,7 +5121,7 @@ abstract class CommonObject
print '<td class="linecoluht_currency right">'.$langs->trans('PriceUHTCurrency').'</td>'; print '<td class="linecoluht_currency right">'.$langs->trans('PriceUHTCurrency').'</td>';
} }
print '<td class="linecolqty right">'.$langs->trans('Qty').'</td>'; print '<td class="linecolqty right">'.$langs->trans('Qty').'</td>';
if (!empty($conf->global->PRODUCT_USE_UNITS)) { if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
print '<td class="linecoluseunit left">'.$langs->trans('Unit').'</td>'; print '<td class="linecoluseunit left">'.$langs->trans('Unit').'</td>';
} }
print '<td class="linecoldiscount right">'.$langs->trans('ReductionShort').'</td>'; print '<td class="linecoldiscount right">'.$langs->trans('ReductionShort').'</td>';
@ -5259,7 +5259,7 @@ abstract class CommonObject
$this->tpl['total_ht'] = price($line->total_ht); $this->tpl['total_ht'] = price($line->total_ht);
$this->tpl['multicurrency_price'] = price($line->multicurrency_subprice); $this->tpl['multicurrency_price'] = price($line->multicurrency_subprice);
$this->tpl['qty'] = (($line->info_bits & 2) != 2) ? $line->qty : '&nbsp;'; $this->tpl['qty'] = (($line->info_bits & 2) != 2) ? $line->qty : '&nbsp;';
if (!empty($conf->global->PRODUCT_USE_UNITS)) { if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
$this->tpl['unit'] = $langs->transnoentities($line->getLabelOfUnit('long')); $this->tpl['unit'] = $langs->transnoentities($line->getLabelOfUnit('long'));
} }
$this->tpl['remise_percent'] = (($line->info_bits & 2) != 2) ? vatrate($line->remise_percent, true) : '&nbsp;'; $this->tpl['remise_percent'] = (($line->info_bits & 2) != 2) ? vatrate($line->remise_percent, true) : '&nbsp;';

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

@ -2545,7 +2545,7 @@ class Form
$outarray = array(); $outarray = array();
// Units // Units
if (!empty($conf->global->PRODUCT_USE_UNITS)) { if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
$langs->load('other'); $langs->load('other');
} }
@ -2589,7 +2589,7 @@ class Form
$selectFields .= ", idprodcustprice, custprice, custprice_ttc, custprice_base_type, custtva_tx, custdefault_vat_code, custref"; $selectFields .= ", idprodcustprice, custprice, custprice_ttc, custprice_base_type, custtva_tx, custdefault_vat_code, custref";
} }
// Units // Units
if (!empty($conf->global->PRODUCT_USE_UNITS)) { if (getDolGlobalInt('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"; $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";
$selectFields .= ', unit_long, 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'; $selectFields .= ', unit_long, 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';
} }
@ -2634,7 +2634,7 @@ class Form
$sql .= " LEFT JOIN ".$this->db->prefix()."product_customer_price as pcp ON pcp.fk_soc=".((int) $socid)." AND pcp.fk_product=p.rowid"; $sql .= " LEFT JOIN ".$this->db->prefix()."product_customer_price as pcp ON pcp.fk_soc=".((int) $socid)." AND pcp.fk_product=p.rowid";
} }
// Units // Units
if (!empty($conf->global->PRODUCT_USE_UNITS)) { if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
$sql .= " LEFT JOIN ".$this->db->prefix()."c_units u ON u.rowid = p.fk_unit"; $sql .= " LEFT JOIN ".$this->db->prefix()."c_units u ON u.rowid = p.fk_unit";
} }
// Multilang : we add translation // Multilang : we add translation
@ -2941,7 +2941,7 @@ class Form
// Units // Units
$outvalUnits = ''; $outvalUnits = '';
if (!empty($conf->global->PRODUCT_USE_UNITS)) { if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
if (!empty($objp->unit_short)) { if (!empty($objp->unit_short)) {
$outvalUnits .= ' - '.$objp->unit_short; $outvalUnits .= ' - '.$objp->unit_short;
} }
@ -3277,7 +3277,7 @@ class Form
$langs->load('stocks'); $langs->load('stocks');
// Units // Units
if (!empty($conf->global->PRODUCT_USE_UNITS)) { if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
$langs->load('other'); $langs->load('other');
} }
@ -3292,7 +3292,7 @@ class Form
$sql .= ", p.description"; $sql .= ", p.description";
} }
// Units // Units
if (!empty($conf->global->PRODUCT_USE_UNITS)) { if (getDolGlobalInt('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"; $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 (isModEnabled('barcode')) { if (isModEnabled('barcode')) {
@ -3305,7 +3305,7 @@ class Form
} }
$sql .= " LEFT JOIN ".$this->db->prefix()."societe as s ON pfp.fk_soc = s.rowid"; $sql .= " LEFT JOIN ".$this->db->prefix()."societe as s ON pfp.fk_soc = s.rowid";
// Units // Units
if (!empty($conf->global->PRODUCT_USE_UNITS)) { if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
$sql .= " LEFT JOIN ".$this->db->prefix()."c_units u ON u.rowid = p.fk_unit"; $sql .= " LEFT JOIN ".$this->db->prefix()."c_units u ON u.rowid = p.fk_unit";
} }
$sql .= " WHERE p.entity IN (".getEntity('product').")"; $sql .= " WHERE p.entity IN (".getEntity('product').")";
@ -3398,7 +3398,7 @@ class Form
// Units // Units
$outvalUnits = ''; $outvalUnits = '';
if (!empty($conf->global->PRODUCT_USE_UNITS)) { if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
if (!empty($objp->unit_short)) { if (!empty($objp->unit_short)) {
$outvalUnits .= ' - '.$objp->unit_short; $outvalUnits .= ' - '.$objp->unit_short;
} }

2
htdocs/core/modules/asset/doc/pdf_standard_asset.modules.php
View File

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

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

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

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

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

6
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
View File

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

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

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

6
htdocs/core/modules/modProduct.class.php
View File

@ -233,7 +233,7 @@ class modProduct extends DolibarrModules
if (getDolGlobalInt('MAIN_MULTILANGS')) { if (getDolGlobalInt('MAIN_MULTILANGS')) {
$this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('l.lang'=>'Language', 'l.label'=>'TranslatedLabel', 'l.description'=>'TranslatedDescription', 'l.note'=>'TranslatedNote')); $this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('l.lang'=>'Language', 'l.label'=>'TranslatedLabel', 'l.description'=>'TranslatedDescription', 'l.note'=>'TranslatedNote'));
} }
if (!empty($conf->global->PRODUCT_USE_UNITS)) { if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
$this->export_fields_array[$r]['p.fk_unit'] = 'Unit'; $this->export_fields_array[$r]['p.fk_unit'] = 'Unit';
} }
$this->export_TypeFields_array[$r] = array( $this->export_TypeFields_array[$r] = array(
@ -640,7 +640,7 @@ class modProduct extends DolibarrModules
if (isModEnabled('barcode')) { if (isModEnabled('barcode')) {
$this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('p.barcode'=>'BarCode')); $this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('p.barcode'=>'BarCode'));
} }
if (!empty($conf->global->PRODUCT_USE_UNITS)) { if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
$this->import_fields_array[$r]['p.fk_unit'] = 'Unit'; $this->import_fields_array[$r]['p.fk_unit'] = 'Unit';
} }
@ -724,7 +724,7 @@ class modProduct extends DolibarrModules
if (isModEnabled('barcode')) { if (isModEnabled('barcode')) {
$import_sample = array_merge($import_sample, array('p.barcode'=>'')); $import_sample = array_merge($import_sample, array('p.barcode'=>''));
} }
if (!empty($conf->global->PRODUCT_USE_UNITS)) { if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
$import_sample = array_merge( $import_sample = array_merge(
$import_sample, $import_sample,
array( array(

6
htdocs/core/modules/modService.class.php
View File

@ -198,7 +198,7 @@ class modService extends DolibarrModules
if (getDolGlobalInt('MAIN_MULTILANGS')) { if (getDolGlobalInt('MAIN_MULTILANGS')) {
$this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('l.lang'=>'Language', 'l.label'=>'TranslatedLabel', 'l.description'=>'TranslatedDescription', 'l.note'=>'TranslatedNote')); $this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('l.lang'=>'Language', 'l.label'=>'TranslatedLabel', 'l.description'=>'TranslatedDescription', 'l.note'=>'TranslatedNote'));
} }
if (!empty($conf->global->PRODUCT_USE_UNITS)) { if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
$this->export_fields_array[$r]['p.fk_unit'] = 'Unit'; $this->export_fields_array[$r]['p.fk_unit'] = 'Unit';
} }
$this->export_TypeFields_array[$r] = array( $this->export_TypeFields_array[$r] = array(
@ -587,7 +587,7 @@ class modService extends DolibarrModules
if (isModEnabled('barcode')) { if (isModEnabled('barcode')) {
$this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('p.barcode'=>'BarCode')); $this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('p.barcode'=>'BarCode'));
} }
if (!empty($conf->global->PRODUCT_USE_UNITS)) { if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
$this->import_fields_array[$r]['p.fk_unit'] = 'Unit'; $this->import_fields_array[$r]['p.fk_unit'] = 'Unit';
} }
// Add extra fields // Add extra fields
@ -678,7 +678,7 @@ class modService extends DolibarrModules
if (isModEnabled('barcode')) { if (isModEnabled('barcode')) {
$import_sample = array_merge($import_sample, array('p.barcode'=>'')); $import_sample = array_merge($import_sample, array('p.barcode'=>''));
} }
if (!empty($conf->global->PRODUCT_USE_UNITS)) { if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
$import_sample = array_merge( $import_sample = array_merge(
$import_sample, $import_sample,
array( array(

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

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

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

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

6
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->posxdiscount = 162;
$this->postotalht = 174; $this->postotalht = 174;
if (!empty($conf->global->PRODUCT_USE_UNITS)) { if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
$this->posxtva = 99; $this->posxtva = 99;
$this->posxup = 114; $this->posxup = 114;
$this->posxqty = 130; $this->posxqty = 130;
@ -480,7 +480,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
$pdf->MultiCell($this->posxunit - $this->posxqty - 0.8, 4, $qty, 0, 'R'); // Enough for 6 chars $pdf->MultiCell($this->posxunit - $this->posxqty - 0.8, 4, $qty, 0, 'R'); // Enough for 6 chars
// Unit // Unit
if (!empty($conf->global->PRODUCT_USE_UNITS)) { if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
$unit = pdf_getlineunit($object, $i, $outputlangs, $hidedetails, $hookmanager); $unit = pdf_getlineunit($object, $i, $outputlangs, $hidedetails, $hookmanager);
$pdf->SetXY($this->posxunit, $curY); $pdf->SetXY($this->posxunit, $curY);
$pdf->MultiCell($this->posxdiscount - $this->posxunit - 0.8, 4, $unit, 0, 'L'); $pdf->MultiCell($this->posxdiscount - $this->posxunit - 0.8, 4, $unit, 0, 'L');
@ -932,7 +932,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
$pdf->MultiCell($this->posxunit - $this->posxqty - 1, 2, $outputlangs->transnoentities("Qty"), '', 'C'); $pdf->MultiCell($this->posxunit - $this->posxqty - 1, 2, $outputlangs->transnoentities("Qty"), '', 'C');
} }
if (!empty($conf->global->PRODUCT_USE_UNITS)) { if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
$pdf->line($this->posxunit - 1, $tab_top, $this->posxunit - 1, $tab_top + $tab_height); $pdf->line($this->posxunit - 1, $tab_top, $this->posxunit - 1, $tab_top + $tab_height);
if (empty($hidetop)) { if (empty($hidetop)) {
$pdf->SetXY($this->posxunit - 1, $tab_top + 1); $pdf->SetXY($this->posxunit - 1, $tab_top + 1);

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

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

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

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

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

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

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

@ -127,7 +127,7 @@ if ($nolinesbefore) {
<?php } ?> <?php } ?>
<td class="linecolqty right"><?php echo $langs->trans('Qty'); ?></td> <td class="linecolqty right"><?php echo $langs->trans('Qty'); ?></td>
<?php <?php
if (!empty($conf->global->PRODUCT_USE_UNITS)) { if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
print '<td class="linecoluseunit left">'; print '<td class="linecoluseunit left">';
print '<span id="title_units">'; print '<span id="title_units">';
print $langs->trans('Unit'); print $langs->trans('Unit');
@ -424,7 +424,7 @@ if ($nolinesbefore) {
<input type="text" name="qty" id="qty" class="flat width40 right" value="<?php echo (GETPOSTISSET("qty") ? GETPOST("qty", 'alpha', 2) : 1); ?>"> <input type="text" name="qty" id="qty" class="flat width40 right" value="<?php echo (GETPOSTISSET("qty") ? GETPOST("qty", 'alpha', 2) : 1); ?>">
</td> </td>
<?php <?php
if (!empty($conf->global->PRODUCT_USE_UNITS)) { if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
$coldisplay++; $coldisplay++;
print '<td class="nobottom linecoluseunit left">'; print '<td class="nobottom linecoluseunit left">';
print $form->selectUnits(empty($line->fk_unit) ? $conf->global->PRODUCT_USE_UNITS : $line->fk_unit, "units"); print $form->selectUnits(empty($line->fk_unit) ? $conf->global->PRODUCT_USE_UNITS : $line->fk_unit, "units");