From 5873d41f647e267d96ffa8b8dd541779bc992ad7 Mon Sep 17 00:00:00 2001
From: bahfir abbes <bafbes@gmail.com>
Date: Fri, 13 Mar 2020 11:51:18 +0100
Subject: [PATCH 01/17] Fix: DEFAULT_WAREHOUSE to define default in warehouse
 selections

---
 htdocs/product/stock/tpl/stockcorrection.tpl.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/product/stock/tpl/stockcorrection.tpl.php b/htdocs/product/stock/tpl/stockcorrection.tpl.php
index 6d63d258c9c..a1d7af8a74a 100644
--- a/htdocs/product/stock/tpl/stockcorrection.tpl.php
+++ b/htdocs/product/stock/tpl/stockcorrection.tpl.php
@@ -70,7 +70,9 @@ if ($object->element == 'product')
 {
 	print '<td class="fieldrequired">'.$langs->trans("Warehouse").'</td>';
 	print '<td>';
-	print $formproduct->selectWarehouses((GETPOST("dwid") ?GETPOST("dwid", 'int') : (GETPOST('id_entrepot') ?GETPOST('id_entrepot', 'int') : ($object->element == 'product' && $object->fk_default_warehouse ? $object->fk_default_warehouse : 'ifone'))), 'id_entrepot', 'warehouseopen,warehouseinternal', 1, 0, 0, '', 0, 0, null, 'minwidth100');
+	$ident=(GETPOST("dwid") ?GETPOST("dwid", 'int') : (GETPOST('id_entrepot') ?GETPOST('id_entrepot', 'int') : ($object->element == 'product' && $object->fk_default_warehouse ? $object->fk_default_warehouse : 'ifone')));
+if(empty($ident)&&!empty($conf->global->DEFAULT_WAREHOUSE))$ident=$conf->global->DEFAULT_WAREHOUSE;
+	print $formproduct->selectWarehouses($ident, 'id_entrepot', 'warehouseopen,warehouseinternal', 1, 0, 0, '', 0, 0, null, 'minwidth100');
 	print ' &nbsp; <select name="mouvement" id="mouvement">';
 	print '<option value="0">'.$langs->trans("Add").'</option>';
 	print '<option value="1"'.(GETPOST('mouvement') ? ' selected="selected"' : '').'>'.$langs->trans("Delete").'</option>';

From 0813329070558974746026beffa644168ca39a5c Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Sat, 30 May 2020 23:39:16 +0000
Subject: [PATCH 02/17] Fixing style errors.

---
 htdocs/product/stock/tpl/stockcorrection.tpl.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/product/stock/tpl/stockcorrection.tpl.php b/htdocs/product/stock/tpl/stockcorrection.tpl.php
index a1d7af8a74a..cce3868b0e8 100644
--- a/htdocs/product/stock/tpl/stockcorrection.tpl.php
+++ b/htdocs/product/stock/tpl/stockcorrection.tpl.php
@@ -71,7 +71,7 @@ if ($object->element == 'product')
 	print '<td class="fieldrequired">'.$langs->trans("Warehouse").'</td>';
 	print '<td>';
 	$ident=(GETPOST("dwid") ?GETPOST("dwid", 'int') : (GETPOST('id_entrepot') ?GETPOST('id_entrepot', 'int') : ($object->element == 'product' && $object->fk_default_warehouse ? $object->fk_default_warehouse : 'ifone')));
-if(empty($ident)&&!empty($conf->global->DEFAULT_WAREHOUSE))$ident=$conf->global->DEFAULT_WAREHOUSE;
+	if (empty($ident)&&!empty($conf->global->DEFAULT_WAREHOUSE))$ident=$conf->global->DEFAULT_WAREHOUSE;
 	print $formproduct->selectWarehouses($ident, 'id_entrepot', 'warehouseopen,warehouseinternal', 1, 0, 0, '', 0, 0, null, 'minwidth100');
 	print ' &nbsp; <select name="mouvement" id="mouvement">';
 	print '<option value="0">'.$langs->trans("Add").'</option>';

From 819984cfe098d57a03c355f84d9857f520da2c8e Mon Sep 17 00:00:00 2001
From: Bahfir Abbes <bafbes@gmail.com>
Date: Sun, 31 May 2020 00:43:05 +0100
Subject: [PATCH 03/17] replace with better normalized constant

---
 htdocs/product/stock/tpl/stockcorrection.tpl.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/product/stock/tpl/stockcorrection.tpl.php b/htdocs/product/stock/tpl/stockcorrection.tpl.php
index cce3868b0e8..fdff86bf810 100644
--- a/htdocs/product/stock/tpl/stockcorrection.tpl.php
+++ b/htdocs/product/stock/tpl/stockcorrection.tpl.php
@@ -71,7 +71,7 @@ if ($object->element == 'product')
 	print '<td class="fieldrequired">'.$langs->trans("Warehouse").'</td>';
 	print '<td>';
 	$ident=(GETPOST("dwid") ?GETPOST("dwid", 'int') : (GETPOST('id_entrepot') ?GETPOST('id_entrepot', 'int') : ($object->element == 'product' && $object->fk_default_warehouse ? $object->fk_default_warehouse : 'ifone')));
-	if (empty($ident)&&!empty($conf->global->DEFAULT_WAREHOUSE))$ident=$conf->global->DEFAULT_WAREHOUSE;
+	if (empty($ident)&&!empty($conf->global->MAIN_DEFAULT_WAREHOUSE))$ident=$conf->global->MAIN_DEFAULT_WAREHOUSE;
 	print $formproduct->selectWarehouses($ident, 'id_entrepot', 'warehouseopen,warehouseinternal', 1, 0, 0, '', 0, 0, null, 'minwidth100');
 	print ' &nbsp; <select name="mouvement" id="mouvement">';
 	print '<option value="0">'.$langs->trans("Add").'</option>';

From cf68317ae74a664bb0a8981cfa1bb50f97fffa5f Mon Sep 17 00:00:00 2001
From: bahfir abbes <bafbes@gmail.com>
Date: Fri, 24 Apr 2020 15:42:24 +0100
Subject: [PATCH 04/17] =?UTF-8?q?fix:Cl=C3=A9=20de=20langue=20dans=20les?=
 =?UTF-8?q?=20titres=20de=20menus?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../template/core/modules/modMyModule.class.php              | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/htdocs/modulebuilder/template/core/modules/modMyModule.class.php b/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
index 74dbac7b870..8c2ea9cf19e 100644
--- a/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
+++ b/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
@@ -299,7 +299,7 @@ class modMyModule extends DolibarrModules
 		$this->menu[$r++]=array(
 			'fk_menu'=>'fk_mainmenu=mymodule,fk_leftmenu=myobject',	    // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
 			'type'=>'left',			                // This is a Left menu entry
-			'titre'=>'List MyObject',
+			'titre'=>'List_MyObject',
 			'mainmenu'=>'mymodule',
 			'leftmenu'=>'mymodule_myobject_list',
 			'url'=>'/mymodule/myobject_list.php',
@@ -313,7 +313,7 @@ class modMyModule extends DolibarrModules
 		$this->menu[$r++]=array(
 			'fk_menu'=>'fk_mainmenu=mymodule,fk_leftmenu=myobject',	    // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
 			'type'=>'left',			                // This is a Left menu entry
-			'titre'=>'New MyObject',
+			'titre'=>'New_MyObject',
 			'mainmenu'=>'mymodule',
 			'leftmenu'=>'mymodule_myobject_new',
 			'url'=>'/mymodule/myobject_card.php?action=create',
@@ -325,7 +325,6 @@ class modMyModule extends DolibarrModules
 			'user'=>2,				                // 0=Menu for internal users, 1=external users, 2=both
 		);
 		END MODULEBUILDER LEFTMENU MYOBJECT */
-
 		// Exports profiles provided by this module
 		$r = 1;
 		/* BEGIN MODULEBUILDER EXPORT MYOBJECT */

From fe525397872f0163022e951c87c6c4839fe7b401 Mon Sep 17 00:00:00 2001
From: bahfir abbes <bafbes@gmail.com>
Date: Fri, 24 Apr 2020 17:26:52 +0100
Subject: [PATCH 05/17] =?UTF-8?q?fix:rempalcement=20de=20qqes=20valeurs=20?=
 =?UTF-8?q?de=20champs=20de=20BDDs=20par=20les=20valeurs=20ad=C3=A9quates?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/modulebuilder/index.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index 2209dbf92d4..0872345b5be 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -700,7 +700,9 @@ if ($dirins && $action == 'initobject' && $module && GETPOST('createtablearray',
 			$fieldname = $obj->Field;
 			// type
 			$type = $obj->Type;
-			if ($type == 'int(11)') $type = 'integer';
+			if ($type == 'int(11)') $type='integer';
+			if ($type == 'float') $type='real';
+			if (strchr($type,'tinyint')) $type='boolean';
 			if ($obj->Field == 'fk_soc') $type = 'integer:Societe:societe/class/societe.class.php';
 			if (preg_match('/^fk_proj/', $obj->Field)) $type = 'integer:Project:projet/class/project.class.php:1:fk_statut=1';
 			if (preg_match('/^fk_prod/', $obj->Field)) $type = 'integer:Product:product/class/product.class.php:1';

From 5f49586f122f92b7156ecfe1f104afba11a5f258 Mon Sep 17 00:00:00 2001
From: "jove@bisquerra.com" <jove@bisquerra.com>
Date: Sun, 31 May 2020 02:17:33 +0200
Subject: [PATCH 06/17] TakePOS customer menu QR

---
 htdocs/langs/en_US/cashdesk.lang    |   4 +-
 htdocs/takepos/admin/bar.php        |  27 +++++-
 htdocs/takepos/genimg/qr.php        |  13 ++-
 htdocs/takepos/public/css/style.css | 144 ++++++++++++++++++++++++++++
 htdocs/takepos/public/js/script.js  |   1 +
 htdocs/takepos/public/menu.php      | 117 ++++++++++++++++++++++
 6 files changed, 299 insertions(+), 7 deletions(-)
 create mode 100644 htdocs/takepos/public/css/style.css
 create mode 100644 htdocs/takepos/public/js/script.js
 create mode 100644 htdocs/takepos/public/menu.php

diff --git a/htdocs/langs/en_US/cashdesk.lang b/htdocs/langs/en_US/cashdesk.lang
index 52c2004c1c7..8d1f50007ea 100644
--- a/htdocs/langs/en_US/cashdesk.lang
+++ b/htdocs/langs/en_US/cashdesk.lang
@@ -107,4 +107,6 @@ OrderPrinterToUse=Order printer to use
 MainTemplateToUse=Main template to use
 OrderTemplateToUse=Order template to use
 BarRestaurant=Bar Restaurant
-AutoOrder=Customer auto order
\ No newline at end of file
+AutoOrder=Customer auto order
+RestaurantMenu=Menu
+CustomerMenu=Customer menu
\ No newline at end of file
diff --git a/htdocs/takepos/admin/bar.php b/htdocs/takepos/admin/bar.php
index 81eaf319295..0f47990cb4a 100644
--- a/htdocs/takepos/admin/bar.php
+++ b/htdocs/takepos/admin/bar.php
@@ -127,11 +127,17 @@ if ($conf->global->TAKEPOS_SUPPLEMENTS)
 }
 
 print '<tr class="oddeven value"><td>';
-print $langs->trans("AutoOrder");
+print 'QR - '.$langs->trans("AutoOrder");
 print '<td colspan="2">';
 print ajax_constantonoff("TAKEPOS_AUTO_ORDER", array(), $conf->entity, 0, 0, 1, 0);
 print '</td></tr>';
 
+print '<tr class="oddeven value"><td>';
+print 'QR - '.$langs->trans("CustomerMenu");
+print '<td colspan="2">';
+print ajax_constantonoff("TAKEPOS_QR_MENU", array(), $conf->entity, 0, 0, 1, 0);
+print '</td></tr>';
+
 
 print '</table>';
 
@@ -155,13 +161,30 @@ if ($conf->global->TAKEPOS_AUTO_ORDER)
 		print '<td>';
 		print "<a target='_blank' href='".$urlwithroot."/takepos/public/auto_order.php?key=".dol_encode($row['rowid'])."'>".$urlwithroot."/takepos/public/auto_order.php?key=".dol_encode($row['rowid'])."</a>";
 		print '<td>';
-		print "<img src='".DOL_URL_ROOT."/takepos/genimg/qr.php?id=".dol_encode($row['rowid'])."' height='42' width='42'>";
+		print "<img src='".DOL_URL_ROOT."/takepos/genimg/qr.php?key=".dol_encode($row['rowid'])."' height='42' width='42'>";
 		print '</td></tr>';
     }
 
 	print '</table>';
 }
 
+if ($conf->global->TAKEPOS_QR_MENU)
+{
+	$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
+	$urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file
+	print '<br>';
+	print '<table class="noborder centpercent">';
+	print '<tr class="liste_titre">';
+	print '<td>'.$langs->trans("URL").'</td><td>'.$langs->trans("QR").'</td>';
+	print "</tr>\n";
+	print '<tr class="oddeven value"><td>';
+	print "<a target='_blank' href='".$urlwithroot."/takepos/public/menu.php'>".$urlwithroot."/takepos/public/menu.php</a>";
+	print '<td>';
+	print "<img src='".DOL_URL_ROOT."/takepos/genimg/qr.php' height='42' width='42'>";
+	print '</td></tr>';
+	print '</table>';
+}
+
 print '</div>';
 
 print '<br>';
diff --git a/htdocs/takepos/genimg/qr.php b/htdocs/takepos/genimg/qr.php
index 3aca3b22ebf..452eb7023e2 100644
--- a/htdocs/takepos/genimg/qr.php
+++ b/htdocs/takepos/genimg/qr.php
@@ -27,10 +27,15 @@ if (!defined('NOREQUIREAJAX'))		define('NOREQUIREAJAX', '1');
 require '../../main.inc.php'; // Load $user and permissions
 require '../../core/modules/barcode/doc/tcpdfbarcode.modules.php';
 
-$key = GETPOST('key');
-
 $urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
 $urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file
 
-$module = new modTcpdfbarcode();
-$result = $module->buildBarCode($urlwithroot."/takepos/public/auto_order.php?key=".dol_encode($key), 'QRCODE', 'Y');
+if (GETPOSTISSET("key")) {
+	$key = GETPOST('key');
+	$module = new modTcpdfbarcode();
+	$result = $module->buildBarCode($urlwithroot."/takepos/public/auto_order.php?key=".$key, 'QRCODE', 'Y');
+}
+else {
+	$module = new modTcpdfbarcode();
+	$result = $module->buildBarCode($urlwithroot."/takepos/public/menu.php", 'QRCODE', 'Y');
+}
diff --git a/htdocs/takepos/public/css/style.css b/htdocs/takepos/public/css/style.css
new file mode 100644
index 00000000000..418945cf5f5
--- /dev/null
+++ b/htdocs/takepos/public/css/style.css
@@ -0,0 +1,144 @@
+/* -- footer -- */
+html {
+  position: relative;
+  min-height: 100%;
+}
+body {
+  margin-bottom: 60px;
+  font-family: 'Khand', sans-serif;
+}
+.footer {
+  position: absolute;
+  bottom: 0;
+  width: 100%;
+  height: 60px;
+  background-color: #f5f5f5;
+}
+.container .text-muted {
+  margin: 20px 0;
+}
+.footer > .container {
+  padding-right: 15px;
+  padding-left: 15px;
+}
+/* -- -- */
+h3 {
+  display:inline-block;
+  font-size: 32px;
+  line-height: 36px;
+  position: relative;
+  margin-top:28px;
+  margin-bottom:15px;
+}
+h3:before{
+  left: -40px;
+  height: 0;
+  height:1px;
+}
+h3:before, h3:after {
+  content: "";
+  position: absolute;
+  bottom: 10px;
+  height: 1px;
+  width: 40px;
+  margin: 0 -15px;
+  background-color: #533834;
+}
+h3:after{
+  right: -40px;
+}
+h5 {
+  font-size: 16px;
+  line-height: 22px;
+  margin: 0 0 15px;
+  font-weight: 400;
+}
+.item {
+  position: relative;
+  overflow: hidden;
+  margin-bottom:20px;
+}
+.item h4, .price {
+  z-index: 0;
+  position: relative;
+  background-color: #fff;
+  right: 0;
+  position: absolute;
+}
+.item .price {
+  padding-left: 8px;
+}
+.item h4, .item p {
+  display: block;
+  clear: both;
+  color: #533834;
+}
+.item p {
+  clear: both;
+  color: #938372;
+  margin-left:10px;
+}
+.dots {
+  background-image: linear-gradient(to right,rgba(56,47,47,.5) 33%,rgba(0,0,0,0) 0%);
+  background-position: bottom;
+  background-size: 3px 1px;
+  background-repeat: repeat-x;
+  height: 1px;
+  width: 100%;
+  position: absolute;
+  top: 22px;
+}
+/* Dots in IE */
+@media screen and (-ms-high-contrast: active), (-ms-high-contrast: none) {
+  .dots {
+    background: transparent url('/img/dot.gif') repeat-x bottom left;
+  }
+}
+.badge {
+  display: inline-block;
+  padding: 0 10px;
+  background: #d2c82a;
+  font-size: 12px;
+  font-weight: 300;
+  line-height: 26px;
+  color: #fff;
+  text-align: center;
+  vertical-align: middle;
+  text-transform: uppercase;
+  border: 1px solid rgba(0,0,0,.05);
+  letter-spacing: 1px;
+  border-radius: 3px;
+  margin: -5px 5px 0 0;
+}
+.note {
+  padding: 0 6px;
+  min-width: 23px;
+  background: rgba(0,0,0,0);
+  border: 1px solid #382f2f;
+  color: #382f2f;
+  box-sizing: border-box;
+  border-radius: 500px;
+  line-height: 21px;
+}
+.veggie {
+  color:#82b440;
+  border-color:#82b440;
+}
+.spicy {
+  color:#ec4e00;
+  border-color:#ec4e00;
+}
+.price {
+  position: absolute;
+  font-size:22px;
+  font-weight:400;
+  right: 0;
+}
+.item h4 {
+  display: inline-block;
+  padding-right: 8px;
+  max-width: 80%;
+  text-transform: capitalize;
+  margin-bottom:4px;
+  position: relative;
+}
\ No newline at end of file
diff --git a/htdocs/takepos/public/js/script.js b/htdocs/takepos/public/js/script.js
new file mode 100644
index 00000000000..c3c8817354f
--- /dev/null
+++ b/htdocs/takepos/public/js/script.js
@@ -0,0 +1 @@
+$(document).foundation();
\ No newline at end of file
diff --git a/htdocs/takepos/public/menu.php b/htdocs/takepos/public/menu.php
new file mode 100644
index 00000000000..c15df6d1b9c
--- /dev/null
+++ b/htdocs/takepos/public/menu.php
@@ -0,0 +1,117 @@
+<?php
+/* Copyright (C) - 2020	Andreu Bisquerra Gaya <jove@bisquerra.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *       \file       htdocs/takepos/public/menu.php
+ *       \ingroup    takepos
+ *       \brief      Public menu for customers
+ */
+
+if (!defined("NOLOGIN"))       define("NOLOGIN", '1'); // If this page is public (can be called outside logged session)
+if (!defined('NOIPCHECK'))	   define('NOIPCHECK', '1'); // Do not check IP defined into conf $dolibarr_main_restrict_ip
+
+require '../../main.inc.php';
+
+require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+
+if (!$conf->global->TAKEPOS_QR_MENU) accessforbidden(); // If Restaurant Menu is disabled never allow NO LOGIN access
+?>
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="UTF-8">
+  <title><?php echo $mysoc->name; ?></title>
+  <link rel='stylesheet' href='https://cdn.jsdelivr.net/npm/foundation-sites@6.6.3/dist/css/foundation.min.css'>
+<link rel='stylesheet' href='https://fonts.googleapis.com/css?family=Khand:400,300,500,600,700'><link rel="stylesheet" href="css/style.css">
+<meta name="viewport" content="width=device-width, initial-scale=1">
+</head>
+<body>
+<!-- partial:index.partial.html -->
+<body>
+    <div class="grid-container">
+      <div class="grid-x grid-padding-x menu2">
+        <div class="cell small-12">
+          <h1><?php print $mysoc->name; ?> <small><?php print $langs->trans('RestaurantMenu'); ?></small></h1>
+
+<?php
+$categorie = new Categorie($db);
+$categories = $categorie->get_full_arbo('product', (($conf->global->TAKEPOS_ROOT_CATEGORY_ID > 0) ? $conf->global->TAKEPOS_ROOT_CATEGORY_ID : 0), 1);
+$levelofrootcategory = 0;
+if ($conf->global->TAKEPOS_ROOT_CATEGORY_ID > 0)
+{
+    foreach ($categories as $key => $categorycursor)
+    {
+        if ($categorycursor['id'] == $conf->global->TAKEPOS_ROOT_CATEGORY_ID)
+        {
+            $levelofrootcategory = $categorycursor['level'];
+            break;
+        }
+    }
+}
+$levelofmaincategories = $levelofrootcategory + 1;
+
+$maincategories = array();
+$subcategories = array();
+foreach ($categories as $key => $categorycursor)
+{
+    if ($categorycursor['level'] == $levelofmaincategories)
+    {
+        $maincategories[$key] = $categorycursor;
+    } else {
+        $subcategories[$key] = $categorycursor;
+    }
+}
+
+$maincategories = dol_sort_array($maincategories, 'label');
+
+foreach ($maincategories as $cat){
+	print '<div class="text-center">
+            <a id="'.$cat['id'].'"></a><h3>'.$cat['label'].'</h3>
+          </div>
+		  <div class="grid-x grid-padding-x">';
+		  
+	$object = new Categorie($db);
+	$result = $object->fetch($cat['id']);
+	$prods = $object->getObjectsInCateg("product", 0, 0, 0, $conf->global->TAKEPOS_SORTPRODUCTFIELD, 'ASC');
+	foreach ($prods as $pro){
+		print '
+		<div class="cell small-6 medium-4">
+			<div class="item">
+                <h4>'.$pro->label.'</h4>
+                <span class="dots"></span>
+                <span class="price">'.price($pro->price_ttc,1).'</span>
+            </div>
+        </div>';
+	}
+	print '</div>';
+} 
+?>		  
+			</div>
+		</div>
+    </div>
+    <footer class="footer">
+      <div class="container">
+        <p class="text-muted"><?php print $mysoc->name; ?></p>
+      </div>
+    </footer>
+  </body>
+<!-- partial -->
+  <script src='https://ajax.googleapis.com/ajax/libs/jquery/3.5.1/jquery.min.js'></script>
+<script src='https://cdn.jsdelivr.net/npm/foundation-sites@6.6.3/dist/js/foundation.min.js'></script><script  src="js/script.js"></script>
+
+</body>
+</html>

From a5ed630a57427e24046467937d9add00990b4743 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Sun, 31 May 2020 00:19:21 +0000
Subject: [PATCH 07/17] Fixing style errors.

---
 htdocs/modulebuilder/index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index 0872345b5be..2e1a8666a1c 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -702,7 +702,7 @@ if ($dirins && $action == 'initobject' && $module && GETPOST('createtablearray',
 			$type = $obj->Type;
 			if ($type == 'int(11)') $type='integer';
 			if ($type == 'float') $type='real';
-			if (strchr($type,'tinyint')) $type='boolean';
+			if (strchr($type, 'tinyint')) $type='boolean';
 			if ($obj->Field == 'fk_soc') $type = 'integer:Societe:societe/class/societe.class.php';
 			if (preg_match('/^fk_proj/', $obj->Field)) $type = 'integer:Project:projet/class/project.class.php:1:fk_statut=1';
 			if (preg_match('/^fk_prod/', $obj->Field)) $type = 'integer:Product:product/class/product.class.php:1';

From d6247bfc9724964b64612c2aa720c906fbb2d5ce Mon Sep 17 00:00:00 2001
From: bahfir abbes <bafbes@gmail.com>
Date: Sun, 10 May 2020 19:30:28 +0100
Subject: [PATCH 08/17] =?UTF-8?q?fix:le=20r=C3=A9sultat=20de=20explode=20e?=
 =?UTF-8?q?st=20troujours=20un=20array?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/core/class/commonobject.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 64623bea822..2da4e6cb912 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -6037,7 +6037,7 @@ abstract class CommonObject
 						// Several field into label (eq table:code|libelle:rowid)
 						$notrans = false;
 						$fields_label = explode('|', $InfoFieldList[1]);
-						if (is_array($fields_label))
+						if (count($fields_label)>1)
 						{
 							$notrans = true;
 							foreach ($fields_label as $field_toshow)
@@ -6199,7 +6199,7 @@ abstract class CommonObject
 						$notrans = false;
 						// Several field into label (eq table:code|libelle:rowid)
 						$fields_label = explode('|', $InfoFieldList[1]);
-						if (is_array($fields_label)) {
+						if (count($fields_label)>1) {
 							$notrans = true;
 							foreach ($fields_label as $field_toshow) {
 								$labeltoshow .= $obj->$field_toshow.' ';

From 26f280b74bc9cc2d4fbffeeef53b8eded5869dfb Mon Sep 17 00:00:00 2001
From: bahfir abbes <bafbes@gmail.com>
Date: Mon, 11 May 2020 14:55:37 +0100
Subject: [PATCH 09/17] fix:non editable fields must not be editable in
 creation either

---
 htdocs/core/tpl/commonfields_add.tpl.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/tpl/commonfields_add.tpl.php b/htdocs/core/tpl/commonfields_add.tpl.php
index a31cd3eb778..0bf2a60d0fe 100644
--- a/htdocs/core/tpl/commonfields_add.tpl.php
+++ b/htdocs/core/tpl/commonfields_add.tpl.php
@@ -56,7 +56,8 @@ foreach ($object->fields as $key => $val)
 	if (in_array($val['type'], array('int', 'integer'))) $value = GETPOST($key, 'int');
 	elseif ($val['type'] == 'text' || $val['type'] == 'html') $value = GETPOST($key, 'none');
 	else $value = GETPOST($key, 'alpha');
-	print $object->showInputField($val, $key, $value, '', '', '', 0);
+	if ($val['noteditable']) print $object->showOutputField($val, $key, $value, '', '', '', 0);
+	else print $object->showInputField($val, $key, $value, '', '', '', 0);
 	print '</td>';
 	print '</tr>';
 }

From 3ddce9f0dfe50b4fd620d353af458f0d0f8238fc Mon Sep 17 00:00:00 2001
From: andreubisquerra <jove@bisquerra.com>
Date: Sun, 31 May 2020 02:34:46 +0200
Subject: [PATCH 10/17] Fix travis

---
 htdocs/takepos/public/menu.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/takepos/public/menu.php b/htdocs/takepos/public/menu.php
index c15df6d1b9c..c051ae4d673 100644
--- a/htdocs/takepos/public/menu.php
+++ b/htdocs/takepos/public/menu.php
@@ -83,7 +83,7 @@ foreach ($maincategories as $cat){
             <a id="'.$cat['id'].'"></a><h3>'.$cat['label'].'</h3>
           </div>
 		  <div class="grid-x grid-padding-x">';
-		  
+
 	$object = new Categorie($db);
 	$result = $object->fetch($cat['id']);
 	$prods = $object->getObjectsInCateg("product", 0, 0, 0, $conf->global->TAKEPOS_SORTPRODUCTFIELD, 'ASC');
@@ -93,12 +93,12 @@ foreach ($maincategories as $cat){
 			<div class="item">
                 <h4>'.$pro->label.'</h4>
                 <span class="dots"></span>
-                <span class="price">'.price($pro->price_ttc,1).'</span>
+                <span class="price">'.price($pro->price_ttc, 1).'</span>
             </div>
         </div>';
 	}
 	print '</div>';
-} 
+}
 ?>		  
 			</div>
 		</div>

From e5a51eb732031b6058f4a59360e86491ca03e6a5 Mon Sep 17 00:00:00 2001
From: bahfir abbes <bafbes@gmail.com>
Date: Tue, 12 May 2020 15:39:17 +0100
Subject: [PATCH 11/17] fix:bad database quotation for booleans

---
 htdocs/core/class/commonobject.class.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 64623bea822..0103102d191 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -7551,6 +7551,10 @@ abstract class CommonObject
 	{
 		if (is_null($value)) return 'NULL';
 		elseif (preg_match('/^(int|double|real|price)/i', $fieldsentry['type'])) return $this->db->escape("$value");
+		elseif($fieldsentry['type']=='boolean'){
+		    if($value) return 'true';
+		    else return 'false';
+        }
 		else return "'".$this->db->escape($value)."'";
 	}
 

From f76c025a7bb2113c8f72d558419a883f79db58e9 Mon Sep 17 00:00:00 2001
From: bahfir abbes <bafbes@gmail.com>
Date: Mon, 18 May 2020 06:22:49 +0100
Subject: [PATCH 12/17] fix:this is required to navigate by id

---
 htdocs/core/class/commonobject.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 64623bea822..fb5af568707 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -1806,7 +1806,7 @@ abstract class CommonObject
 		} elseif ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe as s"; // If we need to link to societe to limit select to socid
 		elseif ($this->restrictiononfksoc == 2 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON te.fk_soc = s.rowid"; // If we need to link to societe to limit select to socid
 		if ($this->restrictiononfksoc && !$user->rights->societe->client->voir && !$socid)  $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON ".$aliastablesociete.".rowid = sc.fk_soc";
-		$sql .= " WHERE te.".$fieldid." < '".$this->db->escape($this->ref)."'"; // ->ref must always be defined (set to id if field does not exists)
+		$sql .= " WHERE te.".$fieldid." < '".$this->db->escape($fieldid=='rowid'?$this->id:$this->$fieldid)."'"; // ->ref must always be defined (set to id if field does not exists)
 		if ($this->restrictiononfksoc == 1 && !$user->rights->societe->client->voir && !$socid) $sql .= " AND sc.fk_user = ".$user->id;
 		if ($this->restrictiononfksoc == 2 && !$user->rights->societe->client->voir && !$socid) $sql .= " AND (sc.fk_user = ".$user->id.' OR te.fk_soc IS NULL)';
 		if (!empty($filter))
@@ -1858,7 +1858,7 @@ abstract class CommonObject
 		elseif ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe as s"; // If we need to link to societe to limit select to socid
 		elseif ($this->restrictiononfksoc == 2 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON te.fk_soc = s.rowid"; // If we need to link to societe to limit select to socid
 		if ($this->restrictiononfksoc && !$user->rights->societe->client->voir && !$socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON ".$aliastablesociete.".rowid = sc.fk_soc";
-		$sql .= " WHERE te.".$fieldid." > '".$this->db->escape($this->ref)."'"; // ->ref must always be defined (set to id if field does not exists)
+		$sql .= " WHERE te.".$fieldid." > '".$this->db->escape($fieldid=='rowid'?$this->id:$this->$fieldid)."'"; // ->ref must always be defined (set to id if field does not exists)
 		if ($this->restrictiononfksoc == 1 && !$user->rights->societe->client->voir && !$socid) $sql .= " AND sc.fk_user = ".$user->id;
 		if ($this->restrictiononfksoc == 2 && !$user->rights->societe->client->voir && !$socid) $sql .= " AND (sc.fk_user = ".$user->id.' OR te.fk_soc IS NULL)';
 		if (!empty($filter))

From 0362d28cf7753f88812a9d7991b4ee0fff83c2be Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 1 Jun 2020 20:13:27 +0200
Subject: [PATCH 13/17] Update commonobject.class.php

---
 htdocs/core/class/commonobject.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index fb5af568707..cf852728349 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -1806,7 +1806,7 @@ abstract class CommonObject
 		} elseif ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe as s"; // If we need to link to societe to limit select to socid
 		elseif ($this->restrictiononfksoc == 2 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON te.fk_soc = s.rowid"; // If we need to link to societe to limit select to socid
 		if ($this->restrictiononfksoc && !$user->rights->societe->client->voir && !$socid)  $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON ".$aliastablesociete.".rowid = sc.fk_soc";
-		$sql .= " WHERE te.".$fieldid." < '".$this->db->escape($fieldid=='rowid'?$this->id:$this->$fieldid)."'"; // ->ref must always be defined (set to id if field does not exists)
+		$sql .= " WHERE te.".$fieldid." < '".$this->db->escape($fieldid=='rowid' ? $this->id : $this->ref)."'"; // ->ref must always be defined (set to id if field does not exists)
 		if ($this->restrictiononfksoc == 1 && !$user->rights->societe->client->voir && !$socid) $sql .= " AND sc.fk_user = ".$user->id;
 		if ($this->restrictiononfksoc == 2 && !$user->rights->societe->client->voir && !$socid) $sql .= " AND (sc.fk_user = ".$user->id.' OR te.fk_soc IS NULL)';
 		if (!empty($filter))
@@ -1858,7 +1858,7 @@ abstract class CommonObject
 		elseif ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe as s"; // If we need to link to societe to limit select to socid
 		elseif ($this->restrictiononfksoc == 2 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON te.fk_soc = s.rowid"; // If we need to link to societe to limit select to socid
 		if ($this->restrictiononfksoc && !$user->rights->societe->client->voir && !$socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON ".$aliastablesociete.".rowid = sc.fk_soc";
-		$sql .= " WHERE te.".$fieldid." > '".$this->db->escape($fieldid=='rowid'?$this->id:$this->$fieldid)."'"; // ->ref must always be defined (set to id if field does not exists)
+		$sql .= " WHERE te.".$fieldid." > '".$this->db->escape($fieldid=='rowid' ? $this->id : $this->ref)."'"; // ->ref must always be defined (set to id if field does not exists)
 		if ($this->restrictiononfksoc == 1 && !$user->rights->societe->client->voir && !$socid) $sql .= " AND sc.fk_user = ".$user->id;
 		if ($this->restrictiononfksoc == 2 && !$user->rights->societe->client->voir && !$socid) $sql .= " AND (sc.fk_user = ".$user->id.' OR te.fk_soc IS NULL)';
 		if (!empty($filter))

From 2dac87621a6afcc5dd585c044c41c1828154ddbd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 1 Jun 2020 20:39:49 +0200
Subject: [PATCH 14/17] Update commonobject.class.php

---
 htdocs/core/class/commonobject.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 0103102d191..c8aef800128 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -7551,8 +7551,8 @@ abstract class CommonObject
 	{
 		if (is_null($value)) return 'NULL';
 		elseif (preg_match('/^(int|double|real|price)/i', $fieldsentry['type'])) return $this->db->escape("$value");
-		elseif($fieldsentry['type']=='boolean'){
-		    if($value) return 'true';
+		elseif ($fieldsentry['type'] == 'boolean') {
+		    if ($value) return 'true';
 		    else return 'false';
         }
 		else return "'".$this->db->escape($value)."'";

From 52d0c1a9ae7531b8e4cdbfe2997c953674d97434 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 1 Jun 2020 20:54:24 +0200
Subject: [PATCH 15/17] Update index.php

---
 htdocs/modulebuilder/index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index 2e1a8666a1c..cebad040a8a 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -702,7 +702,7 @@ if ($dirins && $action == 'initobject' && $module && GETPOST('createtablearray',
 			$type = $obj->Type;
 			if ($type == 'int(11)') $type='integer';
 			if ($type == 'float') $type='real';
-			if (strchr($type, 'tinyint')) $type='boolean';
+			if (strstr($type, 'tinyint')) $type='integer';
 			if ($obj->Field == 'fk_soc') $type = 'integer:Societe:societe/class/societe.class.php';
 			if (preg_match('/^fk_proj/', $obj->Field)) $type = 'integer:Project:projet/class/project.class.php:1:fk_statut=1';
 			if (preg_match('/^fk_prod/', $obj->Field)) $type = 'integer:Product:product/class/product.class.php:1';

From d3a769a0ab1fd743330ff33765ea4e60c1f08f1b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 1 Jun 2020 21:02:05 +0200
Subject: [PATCH 16/17] Update commonobject.class.php

---
 htdocs/core/class/commonobject.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 2da4e6cb912..e1a98fa6254 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -6037,7 +6037,7 @@ abstract class CommonObject
 						// Several field into label (eq table:code|libelle:rowid)
 						$notrans = false;
 						$fields_label = explode('|', $InfoFieldList[1]);
-						if (count($fields_label)>1)
+						if (count($fields_label) > 1)
 						{
 							$notrans = true;
 							foreach ($fields_label as $field_toshow)
@@ -6199,7 +6199,7 @@ abstract class CommonObject
 						$notrans = false;
 						// Several field into label (eq table:code|libelle:rowid)
 						$fields_label = explode('|', $InfoFieldList[1]);
-						if (count($fields_label)>1) {
+						if (count($fields_label) > 1) {
 							$notrans = true;
 							foreach ($fields_label as $field_toshow) {
 								$labeltoshow .= $obj->$field_toshow.' ';

From ebc65f7df7ce2ee947e2e93571996964deef597b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 1 Jun 2020 21:05:32 +0200
Subject: [PATCH 17/17] Update stockcorrection.tpl.php

---
 htdocs/product/stock/tpl/stockcorrection.tpl.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/product/stock/tpl/stockcorrection.tpl.php b/htdocs/product/stock/tpl/stockcorrection.tpl.php
index fdff86bf810..c4627bf75f5 100644
--- a/htdocs/product/stock/tpl/stockcorrection.tpl.php
+++ b/htdocs/product/stock/tpl/stockcorrection.tpl.php
@@ -70,8 +70,8 @@ if ($object->element == 'product')
 {
 	print '<td class="fieldrequired">'.$langs->trans("Warehouse").'</td>';
 	print '<td>';
-	$ident=(GETPOST("dwid") ?GETPOST("dwid", 'int') : (GETPOST('id_entrepot') ?GETPOST('id_entrepot', 'int') : ($object->element == 'product' && $object->fk_default_warehouse ? $object->fk_default_warehouse : 'ifone')));
-	if (empty($ident)&&!empty($conf->global->MAIN_DEFAULT_WAREHOUSE))$ident=$conf->global->MAIN_DEFAULT_WAREHOUSE;
+	$ident = (GETPOST("dwid") ?GETPOST("dwid", 'int') : (GETPOST('id_entrepot') ? GETPOST('id_entrepot', 'int') : ($object->element == 'product' && $object->fk_default_warehouse ? $object->fk_default_warehouse : 'ifone')));
+	if (empty($ident) && !empty($conf->global->MAIN_DEFAULT_WAREHOUSE)) $ident = $conf->global->MAIN_DEFAULT_WAREHOUSE;
 	print $formproduct->selectWarehouses($ident, 'id_entrepot', 'warehouseopen,warehouseinternal', 1, 0, 0, '', 0, 0, null, 'minwidth100');
 	print ' &nbsp; <select name="mouvement" id="mouvement">';
 	print '<option value="0">'.$langs->trans("Add").'</option>';