From 406f26b9d2a8c27904ac36be4c4b4ba2edd0b9be Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Mon, 21 Jan 2019 16:48:14 +0100 Subject: [PATCH 1/5] FIX JSON.parse not needeed and missing simple quote escaping --- htdocs/takepos/takepos.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/takepos/takepos.php b/htdocs/takepos/takepos.php index 44da2914fe8..145e560940a 100644 --- a/htdocs/takepos/takepos.php +++ b/htdocs/takepos/takepos.php @@ -58,7 +58,7 @@ top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss); $categorie = new Categorie($db); $categories = $categorie->get_full_arbo('product'); ?> -var categories = JSON.parse( '' ); +var categories = ; var currentcat; var pageproducts=0; var pagecategories=0; From 0a36a487c461878f5f167aaf89bee39004568375 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Mon, 21 Jan 2019 18:43:12 +0100 Subject: [PATCH 2/5] FIX remove unused option --- htdocs/takepos/takepos.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/takepos/takepos.php b/htdocs/takepos/takepos.php index 145e560940a..c8033351913 100644 --- a/htdocs/takepos/takepos.php +++ b/htdocs/takepos/takepos.php @@ -58,7 +58,7 @@ top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss); $categorie = new Categorie($db); $categories = $categorie->get_full_arbo('product'); ?> -var categories = ; +var categories = ; var currentcat; var pageproducts=0; var pagecategories=0; From b3dfbaf38ca1f1ff2bf4e51a884ff8668a46217e Mon Sep 17 00:00:00 2001 From: jfefe Date: Wed, 23 Jan 2019 02:44:34 +0100 Subject: [PATCH 3/5] FIX: wrong permission test for inventory creation --- htdocs/product/inventory/card.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/product/inventory/card.php b/htdocs/product/inventory/card.php index 24848ad26c5..a9cff0e79c7 100644 --- a/htdocs/product/inventory/card.php +++ b/htdocs/product/inventory/card.php @@ -78,12 +78,12 @@ include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be inclu if (empty($conf->global->MAIN_USE_ADVANCED_PERMS)) { - $permissiontoadd = $user->rights->stock->write; - $permissiontodelete = $user->rights->stock->write; + $permissiontoadd = $user->rights->stock->creer; + $permissiontodelete = $user->rights->stock->supprimer; } else { - $permissiontoadd = $user->rights->stock->inventory_advance->create; + $permissiontoadd = $user->rights->stock->inventory_advance->write; $permissiontodelete = $user->rights->stock->inventory_advance->write; } From 4c70c05e200099e16034de8f579735423dd25dd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Wed, 23 Jan 2019 23:35:57 +0100 Subject: [PATCH 4/5] fix travis --- htdocs/website/index.php | 1 - 1 file changed, 1 deletion(-) diff --git a/htdocs/website/index.php b/htdocs/website/index.php index 31fc81280c2..f67160bf6d8 100644 --- a/htdocs/website/index.php +++ b/htdocs/website/index.php @@ -1858,7 +1858,6 @@ if (! GETPOST('hide_websitemenu')) } print $form->textwithpicto($linktotestonwebserver, $htmltext, 1, 'none', 'valignmiddle', 0, 2, 'helpvirtualhost'); print ''; - } if (in_array($action, array('editcss','editmenu','file_manager'))) From 822706000f3ea4ed847822f67d32a671488ce0c1 Mon Sep 17 00:00:00 2001 From: florian HENRY Date: Thu, 24 Jan 2019 18:01:40 +0100 Subject: [PATCH 5/5] fix broken link into contact tpl --- htdocs/core/tpl/contacts.tpl.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/tpl/contacts.tpl.php b/htdocs/core/tpl/contacts.tpl.php index f1dfdf3d7a8..a603f0f9bbe 100644 --- a/htdocs/core/tpl/contacts.tpl.php +++ b/htdocs/core/tpl/contacts.tpl.php @@ -207,7 +207,7 @@ if ($permission) { if ($tab[$i]['source']=='external') { $contactstatic->fetch($tab[$i]['id']); - echo $contactstatic->getNomUrl(1, '', 0, 0, 0, 0, '', 'valignmiddle'); + echo $contactstatic->getNomUrl(1, '', 0, '', 0, 0, '', 'valignmiddle'); } ?>