Commit Graph

34 Commits

Author SHA1 Message Date
Laurent Destailleur
bcf1d57456 Fix default page is not always index.php 2019-02-27 04:21:12 +01:00
andreubisquerra
57ee8b7991 Fix no JPG images in TakePOS and other image improvements. 2019-02-24 21:15:11 +01:00
andreubisquerra
3f9b37d3d4 Fix TakePOS categories bug 2019-02-13 22:29:55 +01:00
Frédéric FRANCE
970392adb8
Merge remote-tracking branch 'upstream/develop' into psr2squizwhite 2019-02-03 22:41:57 +01:00
Laurent Destailleur
a6dde3d6bd
Merge branch 'develop' into nospaceaftercomma 2019-02-03 19:27:16 +01:00
Laurent Destailleur
8dd64b0dc1
Update takepos.php 2019-02-03 19:15:41 +01:00
Frédéric FRANCE
80a12fcd1c
psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent 2019-02-03 14:29:45 +01:00
andreubisquerra
8b1b8bb7a3 CSS improvements and Takepos setup check 2019-02-02 23:57:38 +01:00
Frédéric FRANCE
f5b2cf75f2
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-02-01 18:31:44 +01:00
Laurent Destailleur
7fc00001d5
Merge pull request #10470 from frederic34/patch-2
remove psr2 else if warning
2019-02-01 15:34:23 +01:00
Laurent Destailleur
75252283c0
Merge branch 'develop' into master 2019-02-01 15:33:36 +01:00
Frédéric FRANCE
b89b0e683a
remove psr2 else if warning 2019-01-31 18:32:39 +01:00
Frédéric FRANCE
ff39491f15
wip 2019-01-27 23:31:37 +01:00
Frédéric FRANCE
b10558bacd
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-27 23:23:38 +01:00
andreubisquerra
e0af2a3597 Subcategories 2019-01-27 21:49:48 +01:00
Laurent Destailleur
ecc30b8ffe Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/facture/card.php
2019-01-27 18:27:58 +01:00
Laurent Destailleur
4f9f0fd7b5
Merge branch 'develop' into elseif 2019-01-27 17:54:06 +01:00
Frédéric FRANCE
7ee086b402
PSR2 space after comma in function call 2019-01-27 11:55:16 +01:00
Frédéric FRANCE
6e91b3cefc
PSR2 usage of else if is discouraged 2019-01-27 10:49:34 +01:00
andreubisquerra
bec25fb45c Remove absolut divs and add Dolistore POS category link to TakePOS 2019-01-27 01:28:32 +01:00
andreubisquerra
5b3559418f Bills and coins pad, or Num pad in TakePOS 2019-01-23 20:59:34 +01:00
Regis Houssin
0a36a487c4 FIX remove unused option 2019-01-21 18:43:12 +01:00
Regis Houssin
406f26b9d2 FIX JSON.parse not needeed and missing simple quote escaping 2019-01-21 16:48:14 +01:00
Josep Lluís
88a2b73ae7
FIX: only show products with status for sell
On TakePos, only show products with status=1 (for sell)
2019-01-11 20:09:38 +01:00
andreubisquerra
c4be1b141d Temporary ticket improvement in TakePOS 2018-12-19 22:52:16 +01:00
andreubisquerra
bce696ee36 Improve responsive design in TakePOS 2018-12-17 22:43:02 +01:00
aurelien goudeneche
94a19cde4b
Add temporary Ticket
update
2018-12-07 01:20:59 +01:00
aurelien goudeneche
c66297a713
add temporary Ticket button 2018-12-07 01:07:25 +01:00
aurelien goudeneche
04dfc5dc8c
New: TakePOS +add Temporary ticket
New: TakePOS  +add Temporary ticket with verbose invoice data (more exhaustive than the existing order printing)
                           +add some little invoice printing layouts improvements (Unit Price, Misc company  Info, Cashier name, Table Border) 

Temporary ticket is usefull in some restaurant when a customer ask for a bill from his table before to check it  out. The waiter usually don't how the customer will pay (card,cash,cheque).
Works with  the Andreu Bisquerra's java TakePOSconnector  like  the existing orderprinting so it doesn't affect the ulterior payment validation process and printing from CashDesk.
This feature needs the BAR/RESTAURANT order/printing to be enabled.
2018-12-07 00:40:00 +01:00
andreubisquerra
8f1a00bbf1 Fix issues on TakePOS 2018-12-01 19:55:35 +01:00
andreubisquerra
463aff4540 Cash drawer button 2018-11-21 16:54:40 +01:00
Laurent Destailleur
fc4103b469 Clean code 2018-10-01 00:44:07 +02:00
Laurent Destailleur
5f897eb7ee Clean code 2018-10-01 00:40:02 +02:00
Laurent Destailleur
f990719daa Add experimental module TakePOS 2018-09-28 13:31:41 +02:00