From cf5265d40561fea9da00832599c99d823e4d4942 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 7 Dec 2017 21:44:12 +0100 Subject: [PATCH 1/2] Minor fix --- htdocs/core/lib/order.lib.php | 6 ++++-- htdocs/install/mysql/migration/6.0.0-7.0.0.sql | 3 +++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/htdocs/core/lib/order.lib.php b/htdocs/core/lib/order.lib.php index 92a11c907d4..430808da074 100644 --- a/htdocs/core/lib/order.lib.php +++ b/htdocs/core/lib/order.lib.php @@ -64,10 +64,12 @@ function commande_prepare_head(Commande $object) $nbShipments=$object->getNbOfShipments(); $nbReceiption=0; $head[$h][0] = DOL_URL_ROOT.'/expedition/shipment.php?id='.$object->id; if ($conf->expedition_bon->enabled) $text=$langs->trans("Shipments"); - if ($nbShipments > 0) $text.= ' '.$nbShipments.''; if ($conf->expedition_bon->enabled && $conf->livraison_bon->enabled) $text.='/'; if ($conf->livraison_bon->enabled) $text.=$langs->trans("Receivings"); - if ($nbReceiption > 0) $text.= ' '.$nbReceiption.''; + if ($nbShipments > 0 || $nbReceiption > 0) $text.= ' '.($nbShipments?$nbShipments:0); + if ($conf->expedition_bon->enabled && $conf->livraison_bon->enabled) $text.='/'; + if ($conf->expedition_bon->enabled && $conf->livraison_bon->enabled && ($nbShipments > 0 || $nbReceiption > 0)) $text.= ($nbReceiption?$nbReceiption:0); + if ($nbShipments > 0 || $nbReceiption > 0) $text.= ''; $head[$h][1] = $text; $head[$h][2] = 'shipping'; $h++; diff --git a/htdocs/install/mysql/migration/6.0.0-7.0.0.sql b/htdocs/install/mysql/migration/6.0.0-7.0.0.sql index 25a5ac10716..bf49e8730fb 100644 --- a/htdocs/install/mysql/migration/6.0.0-7.0.0.sql +++ b/htdocs/install/mysql/migration/6.0.0-7.0.0.sql @@ -69,6 +69,9 @@ ALTER TABLE llx_website_page ADD COLUMN type_container varchar(16) NOT NULL DEFA -- For 7.0 +UPDATE llx_contrat SET ref = rowid WHERE ref IS NULL OR ref = ''; +ALTER TABLE llx_contratdet ADD COLUMN vat_src_code varchar(10) DEFAULT ''; + INSERT INTO llx_c_type_contact(rowid, element, source, code, libelle, active ) values (42, 'propal', 'external', 'SHIPPING', 'Customer contact for delivery', 1); ALTER TABLE llx_inventory ADD UNIQUE INDEX uk_inventory_ref (ref, entity); From acf2d2ee9a3fa2cf749e94379b46322d44d3715f Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 11 Dec 2017 11:48:11 +0100 Subject: [PATCH 2/2] Fix scrutinizer reported bugs --- htdocs/core/class/stats.class.php | 3 +++ htdocs/core/lib/admin.lib.php | 9 --------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/htdocs/core/class/stats.class.php b/htdocs/core/class/stats.class.php index c90e63e0606..dfb070aa5b9 100644 --- a/htdocs/core/class/stats.class.php +++ b/htdocs/core/class/stats.class.php @@ -449,6 +449,7 @@ abstract class Stats for ($i = 1 ; $i < 13 ; $i++) { + $month='unknown'; if ($format == 0) $month=$langs->transnoentitiesnoconv('MonthShort'.sprintf("%02d", $i)); elseif ($format == 1) $month=$i; elseif ($format == 2) $month=$langs->transnoentitiesnoconv('MonthVeryShort'.sprintf("%02d", $i)); @@ -503,6 +504,7 @@ abstract class Stats for ($i = 1 ; $i < 13 ; $i++) { + $month='unknown'; if ($format == 0) $month=$langs->transnoentitiesnoconv('MonthShort'.sprintf("%02d", $i)); elseif ($format == 1) $month=$i; elseif ($format == 2) $month=$langs->transnoentitiesnoconv('MonthVeryShort'.sprintf("%02d", $i)); @@ -555,6 +557,7 @@ abstract class Stats for ($i = 1 ; $i < 13 ; $i++) { + $month='unknown'; if ($format == 0) $month=$langs->transnoentitiesnoconv('MonthShort'.sprintf("%02d", $i)); elseif ($format == 1) $month=$i; elseif ($format == 2) $month=$langs->transnoentitiesnoconv('MonthVeryShort'.sprintf("%02d", $i)); diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php index 3f8ee99d432..a03b15207e7 100644 --- a/htdocs/core/lib/admin.lib.php +++ b/htdocs/core/lib/admin.lib.php @@ -1162,15 +1162,6 @@ function activateModulesRequiredByCountry($country_code) include_once $dir.$file; $objMod = new $modName($db); - if ($objMod->numero > 0) - { - $j = $objMod->numero; - } - else - { - $j = 1000 + $i; - } - $modulequalified=1; // We discard modules according to features level (PS: if module is activated we always show it)