From 163db3d132e07c7b6ad2d6c71367048f11a0cb9e Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Feb 2019 19:41:23 +0100 Subject: [PATCH 1/4] Code comment --- htdocs/core/class/html.form.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 1eb83393652..647460e049c 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -669,7 +669,7 @@ class Form * * @param string $selected Id or Code or Label of preselected country * @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 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 From 1c3541295bec30b9c8f8d5b11ecaaf1215c8cca2 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Tue, 19 Feb 2019 09:24:30 +0100 Subject: [PATCH 2/4] FIX wrong class name "CUnits instead CMeasuringUnits" --- htdocs/core/lib/product.lib.php | 4 ++-- htdocs/core/modules/modProduct.class.php | 24 +++++++++---------- .../product/class/html.formproduct.class.php | 4 ++-- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/htdocs/core/lib/product.lib.php b/htdocs/core/lib/product.lib.php index 478c69d4fe5..162bee68128 100644 --- a/htdocs/core/lib/product.lib.php +++ b/htdocs/core/lib/product.lib.php @@ -472,8 +472,8 @@ function show_stats_for_company($product, $socid) function measuring_units_string($unit, $measuring_style = '') { global $langs, $db; - require_once DOL_DOCUMENT_ROOT.'/core/class/cmeasuringunits.class.php'; - $measuringUnits= new CMeasuringUnits($db); + require_once DOL_DOCUMENT_ROOT.'/core/class/cunits.class.php'; + $measuringUnits= new CUnits($db); $result = $measuringUnits->fetchAll('', '', 0, 0, array( 't.code' => $unit, 't.unit_type' => $measuring_style, diff --git a/htdocs/core/modules/modProduct.class.php b/htdocs/core/modules/modProduct.class.php index 9c0da6c5b8d..4c6c420aa50 100644 --- a/htdocs/core/modules/modProduct.class.php +++ b/htdocs/core/modules/modProduct.class.php @@ -351,48 +351,48 @@ class modProduct extends DolibarrModules $this->import_convertvalue_array[$r] = array( 'p.weight_units' => array( 'rule' => 'fetchidfromcodeunits', - 'classfile' => '/core/class/cmeasuringunits.class.php', - 'class' => 'CMeasuringUnits', + 'classfile' => '/core/class/cunits.class.php', + 'class' => 'CUnits', 'method' => 'fetch', 'units' => 'weight', 'dict' => 'DictionaryMeasuringUnits' ), 'p.length_units' => array( 'rule' => 'fetchidfromcodeunits', - 'classfile' => '/core/class/cmeasuringunits.class.php', - 'class' => 'CMeasuringUnits', + 'classfile' => '/core/class/cunits.class.php', + 'class' => 'CUnits', 'method' => 'fetch', 'units' => 'size', 'dict' => 'DictionaryMeasuringUnits' ), 'p.width_units' => array( 'rule' => 'fetchidfromcodeunits', - 'classfile' => '/core/class/cmeasuringunits.class.php', - 'class' => 'CMeasuringUnits', + 'classfile' => '/core/class/cunits.class.php', + 'class' => 'CUnits', 'method' => 'fetch', 'units' => 'size', 'dict' => 'DictionaryMeasuringUnits' ), 'p.height_units' => array( 'rule' => 'fetchidfromcodeunits', - 'classfile' => '/core/class/cmeasuringunits.class.php', - 'class' => 'CMeasuringUnits', + 'classfile' => '/core/class/cunits.class.php', + 'class' => 'CUnits', 'method' => 'fetch', 'units' => 'size', 'dict' => 'DictionaryMeasuringUnits' ), 'p.surface_units' => array( 'rule' => 'fetchidfromcodeunits', - 'classfile' => '/core/class/cmeasuringunits.class.php', - 'class' => 'CMeasuringUnits', + 'classfile' => '/core/class/cunits.class.php', + 'class' => 'CUnits', 'method' => 'fetch', 'units' => 'surface', 'dict' => 'DictionaryMeasuringUnits' ), 'p.volume_units' => array( 'rule' => 'fetchidfromcodeunits', - 'classfile' => '/core/class/cmeasuringunits.class.php', - 'class' => 'CMeasuringUnits', + 'classfile' => '/core/class/cunits.class.php', + 'class' => 'CUnits', 'method' => 'fetch', 'units' => 'volume', 'dict' => 'DictionaryMeasuringUnits' diff --git a/htdocs/product/class/html.formproduct.class.php b/htdocs/product/class/html.formproduct.class.php index afd62525135..93d239cc207 100644 --- a/htdocs/product/class/html.formproduct.class.php +++ b/htdocs/product/class/html.formproduct.class.php @@ -318,8 +318,8 @@ class FormProduct $measuring_units = array(); - require_once DOL_DOCUMENT_ROOT . '/core/class/cmeasuringunits.class.php'; - $measuringUnits = new CMeasuringUnits($db); + require_once DOL_DOCUMENT_ROOT . '/core/class/cunits.class.php'; + $measuringUnits = new CUnits($db); $result = $measuringUnits->fetchAll('', '', 0, 0, array( 't.unit_type' => $measuring_style, 't.active' => 1 From 36a730304932286e8eb24a3868b1056e114e9c63 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Tue, 19 Feb 2019 10:28:17 +0100 Subject: [PATCH 3/4] FIX No space found after comma in function call --- htdocs/comm/remx.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/comm/remx.php b/htdocs/comm/remx.php index f9b2003718a..0d49e938c54 100644 --- a/htdocs/comm/remx.php +++ b/htdocs/comm/remx.php @@ -859,7 +859,7 @@ if ($socid > 0) print $obj->description; print ''; } - print ''.img_object($langs->trans("ShowBill"),'bill').' '.$obj->ref.''; + print ''.img_object($langs->trans("ShowBill"), 'bill').' '.$obj->ref.''; print ''.price($obj->amount_ht).''; if (! empty($conf->multicurrency->enabled)) { @@ -1029,7 +1029,7 @@ if ($socid > 0) print $obj->description; print ''; } - print ''.img_object($langs->trans("ShowBill"),'bill').' '.$obj->ref.''; + print ''.img_object($langs->trans("ShowBill"), 'bill').' '.$obj->ref.''; print ''.price($obj->amount_ht).''; if (! empty($conf->multicurrency->enabled)) { From 51441242bf75e6c550b012ab07e6a7d3ae78db2f Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 19 Feb 2019 13:15:11 +0100 Subject: [PATCH 4/4] Fix sql error --- .../install/mysql/tables/llx_prelevement_facture_demande.sql | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql b/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql index 3887980d718..cfcb672400b 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql @@ -35,6 +35,5 @@ create table llx_prelevement_facture_demande number varchar(255), cle_rib varchar(5), ext_payment_id varchar(128), - ext_payment_site varchar(128), - + ext_payment_site varchar(128) )ENGINE=innodb;