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

Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop

Browse Source
This commit is contained in:
markus 2019-02-19 13:19:58 +01:00
commit 7f24a2be2f
6 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -669,7 +669,7 @@ class Form
* *
* @param string $selected Id or Code or Label of preselected country * @param string $selected Id or Code or Label of preselected country
* @param string $htmlname Name of html select object * @param string $htmlname Name of html select object
* @param string $htmloption Options html on select object * @param string $htmloption More html options on select object
* @param integer $maxlength Max length for labels (0=no limit) * @param integer $maxlength Max length for labels (0=no limit)
* @param string $morecss More css class * @param string $morecss More css class
* @param string $usecodeaskey ''=Use id as key (default), 'code3'=Use code on 3 alpha as key, 'code2"=Use code on 2 alpha as key * @param string $usecodeaskey ''=Use id as key (default), 'code3'=Use code on 3 alpha as key, 'code2"=Use code on 2 alpha as key

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'

3
htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql
View File

@ -35,6 +35,5 @@ create table llx_prelevement_facture_demande
number varchar(255), number varchar(255),
cle_rib varchar(5), cle_rib varchar(5),
ext_payment_id varchar(128), ext_payment_id varchar(128),
ext_payment_site varchar(128), ext_payment_site varchar(128)
)ENGINE=innodb; )ENGINE=innodb;

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