From 4d9e64bfcfe9e3ee5346d8767da8ff0355c257b0 Mon Sep 17 00:00:00 2001
From: AurelienGoudeneche
 <44634756+AurelienGoudeneche@users.noreply.github.com>
Date: Wed, 28 Nov 2018 13:04:59 +0100
Subject: [PATCH 1/3] Add files via upload

---
 htdocs/takepos/invoice.php |  2 ++
 htdocs/takepos/pay.php     | 13 +++++++------
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php
index c71f7f861a3..7a3443cbee3 100644
--- a/htdocs/takepos/invoice.php
+++ b/htdocs/takepos/invoice.php
@@ -57,6 +57,7 @@ else{
 if ($action == 'valid' && $user->rights->facture->creer){
 	if ($pay=="cash") $bankaccount=$conf->global->CASHDESK_ID_BANKACCOUNT_CASH;
 	else if ($pay=="card") $bankaccount=$conf->global->CASHDESK_ID_BANKACCOUNT_CB;
+	else if ($pay=="cheque") $bankaccount=$conf->global->CASHDESK_ID_BANKACCOUNT_CHEQUE;
 	$now=dol_now();
 	$invoice = new Facture($db);
 	$invoice->fetch($placeid);
@@ -69,6 +70,7 @@ if ($action == 'valid' && $user->rights->facture->creer){
 	$payment->amounts[$invoice->id]=$invoice->total_ttc;
 	if ($pay=="cash") $payment->paiementid=4;
 	else if ($pay=="card") $payment->paiementid=6;
+	else if ($pay=="cheque") $payment->paiementid=7;
 	$payment->num_paiement=$invoice->facnumber;
 	$payment->create($user);
 	$payment->addPaymentToBank($user, 'payment', '(CustomerInvoicePayment)', $bankaccount, '', '');
diff --git a/htdocs/takepos/pay.php b/htdocs/takepos/pay.php
index 898b9069ba0..a31a72f2e56 100644
--- a/htdocs/takepos/pay.php
+++ b/htdocs/takepos/pay.php
@@ -41,7 +41,7 @@ $sql="SELECT rowid FROM ".MAIN_DB_PREFIX."facture where facnumber='(PROV-POS-".$
 $resql = $db->query($sql);
 $row = $db->fetch_array ($resql);
 $placeid=$row[0];
-if (! $placeid) $placeid=0; // Invoice not exist
+if (! $placeid) $placeid=0; // Developing error message with no lines
 else{
 	$invoice = new Facture($db);
 	$invoice->fetch($placeid);
@@ -101,20 +101,21 @@ $langs->loadLangs(array("main", "bills", "cashdesk"));
 <button type="button" class="calcbutton" onclick="addreceived(10);">10</button>
 <button type="button" class="calcbutton" onclick="addreceived(20);">20</button>
 <button type="button" class="calcbutton" onclick="addreceived(50);">50</button>
-<button type="button" <?php if ($placeid==0) echo "disabled";?> class="calcbutton2" onclick="Validate('cash');"><?php echo $langs->trans("Cash"); ?></button>
+<button type="button" class="calcbutton2" onclick="Validate('cash');"><?php echo $langs->trans("Cash"); ?></button>
 <button type="button" class="calcbutton" onclick="addreceived(1);">1</button>
 <button type="button" class="calcbutton" onclick="addreceived(2);">2</button>
 <button type="button" class="calcbutton" onclick="addreceived(5);">5</button>
-<button type="button" <?php if ($placeid==0) echo "disabled";?> class="calcbutton2" onclick="Validate('card');"><?php echo $langs->trans("PaymentTypeCB"); ?></button>
+<button type="button" class="calcbutton2" onclick="Validate('card');"><?php echo $langs->trans("PaymentTypeCB"); ?></button>
 <button type="button" class="calcbutton" onclick="addreceived(0.10);">0.10</button>
 <button type="button" class="calcbutton" onclick="addreceived(0.20);">0.20</button>
 <button type="button" class="calcbutton" onclick="addreceived(0.50);">0.50</button>
-<button type="button" class="calcbutton2" onclick="parent.$.colorbox.close();"><span id="printtext"><?php echo $langs->trans("GoBack"); ?></span></button>
+<button type="button" class="calcbutton2" onclick="Validate('cheque');"><?php echo $langs->trans("Cheque"); ?></button>
 <button type="button" class="calcbutton" onclick="addreceived(0.01);">0.01</button>
 <button type="button" class="calcbutton" onclick="addreceived(0.02);">0.02</button>
 <button type="button" class="calcbutton" onclick="addreceived(0.05);">0.05</button>
-<button type="button" class="calcbutton2" onclick="reset();"><span style='font-size: 150%;'>C</span></button>
+<button type="button" class="calcbutton3" onclick="reset();"><span style='font-size: 150%;'>C</span></button>
+<button type="button" class="calcbutton3" onclick="printclick();"><span id="printtext"><?php echo $langs->trans("GoBack"); ?></span></button>
 </div>
 
 </body>
-</html>
\ No newline at end of file
+</html>

From 2edaa0e1d9b631297d29ce236c9abbd1f9e38375 Mon Sep 17 00:00:00 2001
From: AurelienGoudeneche
 <44634756+AurelienGoudeneche@users.noreply.github.com>
Date: Wed, 28 Nov 2018 13:05:59 +0100
Subject: [PATCH 2/3] Add files via upload

---
 htdocs/takepos/css/pos.css | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/htdocs/takepos/css/pos.css b/htdocs/takepos/css/pos.css
index 8a2122de9f3..62a0865482f 100644
--- a/htdocs/takepos/css/pos.css
+++ b/htdocs/takepos/css/pos.css
@@ -47,6 +47,21 @@ button.calcbutton2 {
 	height:24%;
 }
 
+button.calcbutton3 {
+	display: inline-block;
+	position: relative;
+	padding: 0;
+	line-height: normal;
+	cursor: pointer;
+	vertical-align: middle;
+	text-align: center;
+	font-size:120%;
+	overflow: visible; /* removes extra width in IE */
+	width:12%;
+	height:24%;
+
+}
+
 button.actionbutton {
 	display: inline-block;
 	position: relative;
@@ -110,5 +125,5 @@ div.description{
 p.description_content{
 	padding:10px;
 	margin:0px;
-	
+
 }

From 4282a46bb2d5fa4896ac2bfc5761692374b8034c Mon Sep 17 00:00:00 2001
From: AurelienGoudeneche
 <44634756+AurelienGoudeneche@users.noreply.github.com>
Date: Wed, 28 Nov 2018 13:20:44 +0100
Subject: [PATCH 3/3] Add files via upload

revert previous comment l44
---
 htdocs/takepos/pay.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/takepos/pay.php b/htdocs/takepos/pay.php
index a31a72f2e56..e6c519e460a 100644
--- a/htdocs/takepos/pay.php
+++ b/htdocs/takepos/pay.php
@@ -41,7 +41,7 @@ $sql="SELECT rowid FROM ".MAIN_DB_PREFIX."facture where facnumber='(PROV-POS-".$
 $resql = $db->query($sql);
 $row = $db->fetch_array ($resql);
 $placeid=$row[0];
-if (! $placeid) $placeid=0; // Developing error message with no lines
+if (! $placeid) $placeid=0; // Invoice not exist
 else{
 	$invoice = new Facture($db);
 	$invoice->fetch($placeid);