From 146b73fc3ea44c869c71ff4b657eb7ec7a4288f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Fri, 25 May 2018 17:44:33 +0200 Subject: [PATCH 01/11] Fix Travis --- htdocs/commande/list.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php index 8ff8a32a9ff..da4734a3f80 100644 --- a/htdocs/commande/list.php +++ b/htdocs/commande/list.php @@ -420,7 +420,7 @@ if ($resql) if ($search_project_ref >= 0) $param.="&search_project_ref=".urlencode($search_project_ref); if ($search_town != '') $param.='&search_town='.urlencode($search_town); if ($search_zip != '') $param.='&search_zip='.urlencode($search_zip); - if ($search_state != '') $param.='&search_state='.urlencode$search_state); + if ($search_state != '') $param.='&search_state='.urlencode($search_state); if ($search_country != '') $param.='&search_country='.urlencode($search_country); if ($search_type_thirdparty != '') $param.='&search_type_thirdparty='.urlencode($search_type_thirdparty); if ($search_product_category != '') $param.='&search_product_category='.urlencode($search_product_category); From 455f8099687d54d95f8b96801216312857ae2c37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Sat, 26 May 2018 09:40:00 +0200 Subject: [PATCH 02/11] Update admin.php --- htdocs/variants/admin/admin.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/htdocs/variants/admin/admin.php b/htdocs/variants/admin/admin.php index 57d4640633e..dc039bf6d5f 100644 --- a/htdocs/variants/admin/admin.php +++ b/htdocs/variants/admin/admin.php @@ -20,8 +20,7 @@ require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php'; -$langs->load("admin"); -$langs->load("products"); +$langs->loadLangs(array("admin", "products")); // Security check if (! $user->admin || (empty($conf->product->enabled) && empty($conf->service->enabled))) @@ -59,9 +58,9 @@ print ''; print ''.$langs->trans("Parameters").''."\n"; print ''.$langs->trans("Value").''."\n"; print ' '."\n"; -print ''.$langs->trans('HideProductCombinations').''; +print ''.$langs->trans('HideProductCombinations').''; print $form->selectyesno("PRODUIT_ATTRIBUTES_HIDECHILD",$conf->global->PRODUIT_ATTRIBUTES_HIDECHILD,1).''; -print ''.$langs->trans('CombinationsSeparator').''; +print ''.$langs->trans('CombinationsSeparator').''; if(isset($conf->global->PRODUIT_ATTRIBUTES_SEPARATOR)) { $separator = $conf->global->PRODUIT_ATTRIBUTES_SEPARATOR; } else { From af73e6cd4d707b2a199d298287b4c452c5b3e96c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Sat, 26 May 2018 11:23:49 +0200 Subject: [PATCH 03/11] Update llx_paiementfourn.sql --- htdocs/install/mysql/tables/llx_paiementfourn.sql | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/install/mysql/tables/llx_paiementfourn.sql b/htdocs/install/mysql/tables/llx_paiementfourn.sql index 3ce0d027ea9..7b321f7b31c 100644 --- a/htdocs/install/mysql/tables/llx_paiementfourn.sql +++ b/htdocs/install/mysql/tables/llx_paiementfourn.sql @@ -28,6 +28,7 @@ create table llx_paiementfourn amount double(24,8) DEFAULT 0, -- montant multicurrency_amount double(24,8) DEFAULT 0, -- multicurrency amount fk_user_author integer, -- auteur + fk_user_modif integer, fk_paiement integer NOT NULL, -- moyen de paiement num_paiement varchar(50), -- numero de paiement (cheque) note text, From d67bed57d9af81649f99fb0868a0da0e796aeb0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Sat, 26 May 2018 11:26:20 +0200 Subject: [PATCH 04/11] Update 7.0.0-8.0.0.sql --- htdocs/install/mysql/migration/7.0.0-8.0.0.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/install/mysql/migration/7.0.0-8.0.0.sql b/htdocs/install/mysql/migration/7.0.0-8.0.0.sql index 5e0990165ba..cf7fa800dfa 100644 --- a/htdocs/install/mysql/migration/7.0.0-8.0.0.sql +++ b/htdocs/install/mysql/migration/7.0.0-8.0.0.sql @@ -473,7 +473,7 @@ UPDATE llx_c_email_templates SET lang = '' WHERE lang IS NULL; ALTER TABLE llx_entrepot ADD COLUMN model_pdf VARCHAR(255) AFTER fk_user_author; ALTER TABLE llx_stock_mouvement ADD COLUMN model_pdf VARCHAR(255) AFTER origintype; - +ALTER TABLE llx_paiementfourn ADD COLUMN fk_user_modif integer AFTER fk_user_author; From 667e4c30d6b3e18aceb6cae38527fec62e2dcbd0 Mon Sep 17 00:00:00 2001 From: el00ruobuob <37215310+el00ruobuob@users.noreply.github.com> Date: Sat, 26 May 2018 12:05:39 +0200 Subject: [PATCH 05/11] Update main.inc.php charset missing, causing display issues. --- htdocs/main.inc.php | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index eaea0dc420c..707430e36e7 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -1160,6 +1160,7 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs print "\n"; if (GETPOST('dol_basehref','alpha')) print ''."\n"; // Displays meta + print ''."\n"; print ''."\n"; // Do not index print ''."\n"; // Scale for mobile device print ''."\n"; From a487cf6806fb96d69a4267b310407a98a85a854a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Sat, 26 May 2018 15:15:38 +0200 Subject: [PATCH 06/11] Update price.php --- htdocs/product/price.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/htdocs/product/price.php b/htdocs/product/price.php index ad73b57d76f..dd0f6f6f5d1 100644 --- a/htdocs/product/price.php +++ b/htdocs/product/price.php @@ -45,9 +45,7 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) { $prodcustprice = new Productcustomerprice($db); } -$langs->load("products"); -$langs->load("bills"); -$langs->load("companies"); +$langs->loadLangs(array("products", "bills", "companies")); $mesg=''; $error=0; $errors=array(); @@ -945,6 +943,7 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES) || ! empty($conf->global->PRODUI } print ''; + print '(' . $langs->trans("DisablePriceByQty").')'; } else { print $langs->trans("No"); print '  (' . $langs->trans("Activate") . ')'; From 03bfb9a941f019f403acaa94fd1c0ec873675918 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Sun, 27 May 2018 00:14:43 +0200 Subject: [PATCH 07/11] Update setup.php --- htdocs/asset/admin/setup.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/asset/admin/setup.php b/htdocs/asset/admin/setup.php index 8708396fb7f..2dd62c4e3db 100644 --- a/htdocs/asset/admin/setup.php +++ b/htdocs/asset/admin/setup.php @@ -17,13 +17,13 @@ */ /** - * \file htdocs/assets/admin/setup.php + * \file htdocs/asset/admin/setup.php * \ingroup assets * \brief Assets setup page. */ require '../../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/core/lib/assets.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/asset.lib.php'; require_once DOL_DOCUMENT_ROOT . "/core/lib/admin.lib.php"; global $langs, $user; From ec7516728dfa96f68380090a204f32dd6eabbf5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Sun, 27 May 2018 00:15:46 +0200 Subject: [PATCH 08/11] Update assets_type_extrafields.php --- htdocs/asset/admin/assets_type_extrafields.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/htdocs/asset/admin/assets_type_extrafields.php b/htdocs/asset/admin/assets_type_extrafields.php index 261c7de99b7..e496351b267 100644 --- a/htdocs/asset/admin/assets_type_extrafields.php +++ b/htdocs/asset/admin/assets_type_extrafields.php @@ -16,14 +16,13 @@ * or see http://www.gnu.org/ */ -/** /** * \file htdocs/asset/admin/assets_type_extrafields.php * \ingroup asset * \brief Page to setup extra fields type of assets */ require '../../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/core/lib/assets.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/asset.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; $langs->load("assets"); From 753ba7ee176c14333db43d065d23d0be564f9378 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Sun, 27 May 2018 00:16:44 +0200 Subject: [PATCH 09/11] Update assets_extrafields.php --- htdocs/asset/admin/assets_extrafields.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/asset/admin/assets_extrafields.php b/htdocs/asset/admin/assets_extrafields.php index 52c1f042836..b15ede972bb 100644 --- a/htdocs/asset/admin/assets_extrafields.php +++ b/htdocs/asset/admin/assets_extrafields.php @@ -23,7 +23,7 @@ */ require '../../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/core/lib/assets.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/asset.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; $langs->loadLangs(array("assets","admin","companies")); From 4b58158588f002eada3c1974f5a5699c33303fe4 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 29 May 2018 10:47:14 +0200 Subject: [PATCH 10/11] Update 7.0.0-8.0.0.sql --- htdocs/install/mysql/migration/7.0.0-8.0.0.sql | 3 --- 1 file changed, 3 deletions(-) diff --git a/htdocs/install/mysql/migration/7.0.0-8.0.0.sql b/htdocs/install/mysql/migration/7.0.0-8.0.0.sql index 85c5a627fb4..5bfcda6051c 100644 --- a/htdocs/install/mysql/migration/7.0.0-8.0.0.sql +++ b/htdocs/install/mysql/migration/7.0.0-8.0.0.sql @@ -483,9 +483,6 @@ UPDATE llx_c_email_templates SET lang = '' WHERE lang IS NULL; ALTER TABLE llx_entrepot ADD COLUMN model_pdf VARCHAR(255) AFTER fk_user_author; ALTER TABLE llx_stock_mouvement ADD COLUMN model_pdf VARCHAR(255) AFTER origintype; -ALTER TABLE llx_paiementfourn ADD COLUMN fk_user_modif integer AFTER fk_user_author; - - insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 118, 11801, '', 0, 'Indonesia', 1); From cf5f7bf06d3f671a0dd997c9a5bed5245fa0e81a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 29 May 2018 10:52:55 +0200 Subject: [PATCH 11/11] Update price.php --- htdocs/product/price.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/product/price.php b/htdocs/product/price.php index f87fbc60ba3..93474b16554 100644 --- a/htdocs/product/price.php +++ b/htdocs/product/price.php @@ -944,7 +944,7 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES) || ! empty($conf->global->PRODUI } print ''; - print '(' . $langs->trans("DisablePriceByQty").')'; + print '(' . $langs->trans("DisablePriceByQty").')'; } else { print $langs->trans("No"); print '  (' . $langs->trans("Activate") . ')';