From b2e995279e3d95c31f37b1e7b793673b332ce746 Mon Sep 17 00:00:00 2001
From: andreubisquerra <jove@bisquerra.com>
Date: Mon, 25 Nov 2019 19:29:07 +0100
Subject: [PATCH 1/2] Fix takepos.lib.php to add Receipt tab and delete
 unnecessary takepos.lib.php

---
 htdocs/core/lib/takepos.lib.php    |  8 ++++
 htdocs/takepos/lib/takepos.lib.php | 60 ------------------------------
 2 files changed, 8 insertions(+), 60 deletions(-)
 delete mode 100644 htdocs/takepos/lib/takepos.lib.php

diff --git a/htdocs/core/lib/takepos.lib.php b/htdocs/core/lib/takepos.lib.php
index e3a80e5d1df..8967f4b7d27 100644
--- a/htdocs/core/lib/takepos.lib.php
+++ b/htdocs/core/lib/takepos.lib.php
@@ -37,6 +37,14 @@ function takepos_prepare_head()
 	$head[$h][1] = $langs->trans("Parameters");
 	$head[$h][2] = 'setup';
 	$h++;
+	
+	if ($conf->global->TAKEPOS_CUSTOM_RECEIPT)
+	{
+		$head[$h][0] = DOL_URL_ROOT.'/takepos/admin/receipt.php';
+		$head[$h][1] = $langs->trans("Receipt");
+		$head[$h][2] = 'receipt';
+		$h++;
+	}
 
 	$numterminals = max(1, $conf->global->TAKEPOS_NUM_TERMINALS);
 	for ($i = 1; $i <= $numterminals; $i++)
diff --git a/htdocs/takepos/lib/takepos.lib.php b/htdocs/takepos/lib/takepos.lib.php
deleted file mode 100644
index af1ea6aa100..00000000000
--- a/htdocs/takepos/lib/takepos.lib.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-/* Copyright (C) 2018 SuperAdmin
- *
- * 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    takepos/lib/takepos.lib.php
- * \ingroup takepos
- * \brief   Library files with common functions for TakePos
- */
-
-/**
- * Prepare admin pages header
- *
- * @return array
- */
-function takeposAdminPrepareHead()
-{
-	global $langs, $conf;
-
-	$langs->load("cashdesk");
-
-	$h = 0;
-	$head = array();
-
-	$head[$h][0] = dol_buildpath("/takepos/admin/setup.php", 1);
-	$head[$h][1] = $langs->trans("Settings");
-	$head[$h][2] = 'settings';
-	$h++;
-	$head[$h][0] = dol_buildpath("/takepos/admin/about.php", 1);
-	$head[$h][1] = $langs->trans("About");
-	$head[$h][2] = 'about';
-	$h++;
-
-	// Show more tabs from modules
-	// Entries must be declared in modules descriptor with line
-	//$this->tabs = array(
-	//	'entity:+tabname:Title:@takepos:/takepos/mypage.php?id=__ID__'
-	//); // to add new tab
-	//$this->tabs = array(
-	//	'entity:-tabname:Title:@takepos:/takepos/mypage.php?id=__ID__'
-	//); // to remove a tab
-	complete_head_from_modules($conf, $langs, null, $head, $h, 'takepos');
-
-	complete_head_from_modules($conf, $langs, null, $head, $h, 'takepos', 'remove');
-
-	return $head;
-}

From 6baa1c8d4a1d99a5c0a8cd9a132cec541cc2cab4 Mon Sep 17 00:00:00 2001
From: andreubisquerra <jove@bisquerra.com>
Date: Mon, 25 Nov 2019 23:32:40 +0100
Subject: [PATCH 2/2] Fix travis

---
 htdocs/core/lib/takepos.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/lib/takepos.lib.php b/htdocs/core/lib/takepos.lib.php
index 8967f4b7d27..dc86853859e 100644
--- a/htdocs/core/lib/takepos.lib.php
+++ b/htdocs/core/lib/takepos.lib.php
@@ -37,7 +37,7 @@ function takepos_prepare_head()
 	$head[$h][1] = $langs->trans("Parameters");
 	$head[$h][2] = 'setup';
 	$h++;
-	
+
 	if ($conf->global->TAKEPOS_CUSTOM_RECEIPT)
 	{
 		$head[$h][0] = DOL_URL_ROOT.'/takepos/admin/receipt.php';