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; - + } diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php index f7f79b03414..d79b957e1a3 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..e6c519e460a 100644 --- a/htdocs/takepos/pay.php +++ b/htdocs/takepos/pay.php @@ -101,20 +101,21 @@ $langs->loadLangs(array("main", "bills", "cashdesk")); - + - + - + - + + - \ No newline at end of file +