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

Merge pull request #10629 from hregis/develop_mc

Browse Source 
FIX wrong class name "CUnits instead CMeasuringUnits"
This commit is contained in:
Laurent Destailleur 2019-02-19 13:19:01 +01:00 committed by GitHub
commit f0f45858f5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/comm/remx.php
View File

@ -859,7 +859,7 @@ if ($socid > 0)
print $obj->description; print $obj->description;
print '</td>'; print '</td>';
} }
print '<td class="left nowrap"><a href="'.DOL_URL_ROOT.'/compta/facture/card.php?facid='.$obj->rowid.'">'.img_object($langs->trans("ShowBill"),'bill').' '.$obj->ref.'</a></td>'; print '<td class="left nowrap"><a href="'.DOL_URL_ROOT.'/compta/facture/card.php?facid='.$obj->rowid.'">'.img_object($langs->trans("ShowBill"), 'bill').' '.$obj->ref.'</a></td>';
print '<td class="right">'.price($obj->amount_ht).'</td>'; print '<td class="right">'.price($obj->amount_ht).'</td>';
if (! empty($conf->multicurrency->enabled)) if (! empty($conf->multicurrency->enabled))
{ {
@ -1029,7 +1029,7 @@ if ($socid > 0)
print $obj->description; print $obj->description;
print '</td>'; print '</td>';
} }
print '<td class="left nowrap"><a href="'.DOL_URL_ROOT.'/fourn/facture/card.php?facid='.$obj->rowid.'">'.img_object($langs->trans("ShowBill"),'bill').' '.$obj->ref.'</a></td>'; print '<td class="left nowrap"><a href="'.DOL_URL_ROOT.'/fourn/facture/card.php?facid='.$obj->rowid.'">'.img_object($langs->trans("ShowBill"), 'bill').' '.$obj->ref.'</a></td>';
print '<td class="right">'.price($obj->amount_ht).'</td>'; print '<td class="right">'.price($obj->amount_ht).'</td>';
if (! empty($conf->multicurrency->enabled)) if (! empty($conf->multicurrency->enabled))
{ {

4
htdocs/core/lib/product.lib.php
View File

@ -472,8 +472,8 @@ function show_stats_for_company($product, $socid)
function measuring_units_string($unit, $measuring_style = '') function measuring_units_string($unit, $measuring_style = '')
{ {
global $langs, $db; global $langs, $db;
require_once DOL_DOCUMENT_ROOT.'/core/class/cmeasuringunits.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/cunits.class.php';
$measuringUnits= new CMeasuringUnits($db); $measuringUnits= new CUnits($db);
$result = $measuringUnits->fetchAll('', '', 0, 0, array( $result = $measuringUnits->fetchAll('', '', 0, 0, array(
't.code' => $unit, 't.code' => $unit,
't.unit_type' => $measuring_style, 't.unit_type' => $measuring_style,

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

@ -351,48 +351,48 @@ class modProduct extends DolibarrModules
$this->import_convertvalue_array[$r] = array( $this->import_convertvalue_array[$r] = array(
'p.weight_units' => array( 'p.weight_units' => array(
'rule' => 'fetchidfromcodeunits', 'rule' => 'fetchidfromcodeunits',
'classfile' => '/core/class/cmeasuringunits.class.php', 'classfile' => '/core/class/cunits.class.php',
'class' => 'CMeasuringUnits', 'class' => 'CUnits',
'method' => 'fetch', 'method' => 'fetch',
'units' => 'weight', 'units' => 'weight',
'dict' => 'DictionaryMeasuringUnits' 'dict' => 'DictionaryMeasuringUnits'
), ),
'p.length_units' => array( 'p.length_units' => array(
'rule' => 'fetchidfromcodeunits', 'rule' => 'fetchidfromcodeunits',
'classfile' => '/core/class/cmeasuringunits.class.php', 'classfile' => '/core/class/cunits.class.php',
'class' => 'CMeasuringUnits', 'class' => 'CUnits',
'method' => 'fetch', 'method' => 'fetch',
'units' => 'size', 'units' => 'size',
'dict' => 'DictionaryMeasuringUnits' 'dict' => 'DictionaryMeasuringUnits'
), ),
'p.width_units' => array( 'p.width_units' => array(
'rule' => 'fetchidfromcodeunits', 'rule' => 'fetchidfromcodeunits',
'classfile' => '/core/class/cmeasuringunits.class.php', 'classfile' => '/core/class/cunits.class.php',
'class' => 'CMeasuringUnits', 'class' => 'CUnits',
'method' => 'fetch', 'method' => 'fetch',
'units' => 'size', 'units' => 'size',
'dict' => 'DictionaryMeasuringUnits' 'dict' => 'DictionaryMeasuringUnits'
), ),
'p.height_units' => array( 'p.height_units' => array(
'rule' => 'fetchidfromcodeunits', 'rule' => 'fetchidfromcodeunits',
'classfile' => '/core/class/cmeasuringunits.class.php', 'classfile' => '/core/class/cunits.class.php',
'class' => 'CMeasuringUnits', 'class' => 'CUnits',
'method' => 'fetch', 'method' => 'fetch',
'units' => 'size', 'units' => 'size',
'dict' => 'DictionaryMeasuringUnits' 'dict' => 'DictionaryMeasuringUnits'
), ),
'p.surface_units' => array( 'p.surface_units' => array(
'rule' => 'fetchidfromcodeunits', 'rule' => 'fetchidfromcodeunits',
'classfile' => '/core/class/cmeasuringunits.class.php', 'classfile' => '/core/class/cunits.class.php',
'class' => 'CMeasuringUnits', 'class' => 'CUnits',
'method' => 'fetch', 'method' => 'fetch',
'units' => 'surface', 'units' => 'surface',
'dict' => 'DictionaryMeasuringUnits' 'dict' => 'DictionaryMeasuringUnits'
), ),
'p.volume_units' => array( 'p.volume_units' => array(
'rule' => 'fetchidfromcodeunits', 'rule' => 'fetchidfromcodeunits',
'classfile' => '/core/class/cmeasuringunits.class.php', 'classfile' => '/core/class/cunits.class.php',
'class' => 'CMeasuringUnits', 'class' => 'CUnits',
'method' => 'fetch', 'method' => 'fetch',
'units' => 'volume', 'units' => 'volume',
'dict' => 'DictionaryMeasuringUnits' 'dict' => 'DictionaryMeasuringUnits'

4
htdocs/product/class/html.formproduct.class.php
View File

@ -318,8 +318,8 @@ class FormProduct
$measuring_units = array(); $measuring_units = array();
require_once DOL_DOCUMENT_ROOT . '/core/class/cmeasuringunits.class.php'; require_once DOL_DOCUMENT_ROOT . '/core/class/cunits.class.php';
$measuringUnits = new CMeasuringUnits($db); $measuringUnits = new CUnits($db);
$result = $measuringUnits->fetchAll('', '', 0, 0, array( $result = $measuringUnits->fetchAll('', '', 0, 0, array(
't.unit_type' => $measuring_style, 't.unit_type' => $measuring_style,
't.active' => 1 't.active' => 1