Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-20 16:31:51 +01:00
Code Issues Packages Projects Releases Wiki Activity
77,916 Commits 36 Branches 190 Tags
c72e7e6a973bcb58ffb51a22944b68f371769bc0
Commit Graph

217 Commits

Author SHA1 Message Date
andreubisquerra
99002529c3 Revert "New Use ajax switch into setup of TakePos" 2019-01-17 14:07:15 +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
Laurent Destailleur
5ebada065f Merge pull request #10284 from ptibogxiv/patch-101 
New Use ajax switch into setup of TakePos
 2019-01-02 20:01:16 +01:00
andreubisquerra
8dee9de8f5 Add header and footer to TakePOS receipt 2018-12-30 22:20:55 +01:00
ptibogxiv
d2f54bb41c Fix ajax toogle 2018-12-30 17:51:09 +01:00
Laurent Destailleur
3d509910dd Merge branch 'develop' into master 2018-12-22 18:24:23 +01:00
Laurent Destailleur
ae6596cac7 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-12-21 09:57:29 +01:00
andreubisquerra
c4be1b141d Temporary ticket improvement in TakePOS 2018-12-19 22:52:16 +01:00
Laurent Destailleur
b0652494b5 Debug cash fence 2018-12-19 15:40:01 +01:00
andreubisquerra
bce696ee36 Improve responsive design in TakePOS 2018-12-17 22:43:02 +01:00
Laurent Destailleur
db15f85798 Update setup.php 2018-12-17 21:08:24 +01:00
andreubisquerra
a53688151d Fix some TakePOS small bugs from last third-party commits 2018-12-16 19:24:49 +01:00
Laurent Destailleur
c06e4ecd68 Merge pull request #10192 from AurelGDN/develop 
New: TakePOS +add Temporary ticket
 2018-12-16 17:44:18 +01:00
Laurent Destailleur
9ce07b9582 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/admin.lang
 2018-12-16 15:36:18 +01:00
Laurent Destailleur
988ba172ae Clean code of POS modules 2018-12-16 14:59:51 +01:00
Laurent Destailleur
8b718d0cb1 Fix phpcs 2018-12-16 13:01:53 +01:00
Laurent Destailleur
2d1cf59f34 Merge pull request #10204 from andreubisquerra/master 
Improve TakePOS responsive design
 2018-12-15 16:37:51 +01:00
Laurent Destailleur
8a01944a0c Update invoice.php 2018-12-15 16:12:47 +01:00
Laurent Destailleur
b7ee2458a3 Update invoice.php 2018-12-15 16:10:44 +01:00
Laurent Destailleur
3032ef1235 Merge branch 'develop' into develop 2018-12-15 16:08:58 +01:00
Laurent Destailleur
f97b561af0 Merge branch 'develop' into qual_rename_facnumber 2018-12-13 20:24:12 +01:00
andreubisquerra
337b204f9c Improve TakePOS responsive design 2018-12-07 21:33:40 +01:00
aurelien goudeneche
5a5b2c8a60 Revert wrong tag introduced with phpbcf fix 2018-12-07 17:33:35 +01:00
aurelien goudeneche
c5e773fcfd space cast statement fix 2018-12-07 17:20:05 +01:00
aurelien goudeneche
fb0b208df7 phpcbf fix 2018-12-07 17:02:06 +01:00
aurelien goudeneche
b9ca32a7f2 beautify code 2018-12-07 08:04:40 +01:00
aurelien goudeneche
ab0750cbbf Update invoice.php 2018-12-07 02:29:22 +01:00
aurelien goudeneche
6f5752ae2c Update invoice.php 2018-12-07 01:58:58 +01:00
aurelien goudeneche
1bf3c51f60 Temporary ticket 
Update function
 2018-12-07 01:47:06 +01:00
aurelien goudeneche
b98e52a2ce Update invoice.php 2018-12-07 01:32:10 +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
aurelien goudeneche
1f089d3ee2 Update pay.php 2018-12-03 09:37:45 +01:00
aurelien goudeneche
41ee56c9e9 Apply andreubisquerra's fix to cheque payment 
Apply andreubisquerra's fix (#10147) to cheque payment button
 2018-12-03 09:30:47 +01:00
Maxime Kohlhaas
2e496ea83a QUAL rename facnumber by ref 2018-12-02 17:33:44 +01:00
andreubisquerra
8f1a00bbf1 Fix issues on TakePOS 2018-12-01 19:55:35 +01:00
andreubisquerra
1009588592 TakeBOX now is 'TakePOS Connector' 2018-12-01 17:09:21 +01:00
Laurent Destailleur
03f0922325 Merge pull request #10087 from AurelGDN/develop 
New Takepos: cheque payment button in cashdesk
 2018-12-01 15:03:19 +01:00
AurelienGoudeneche
4282a46bb2 Add files via upload 
revert previous comment l44
 2018-11-28 13:20:44 +01:00
AurelienGoudeneche
2edaa0e1d9 Add files via upload 2018-11-28 13:05:59 +01:00
AurelienGoudeneche
4d9e64bfcf Add files via upload 2018-11-28 13:04:59 +01:00
Philippe GRAND
a59a4c60e0 FIX : Typo errors 2018-11-26 16:09:05 +01:00
andreubisquerra
463aff4540 Cash drawer button 2018-11-21 16:54:40 +01:00
Regis Houssin
89389baeac Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email 2018-11-09 15:37:29 +01:00
Laurent Destailleur
66ffcf287a Fix filter on extrafields 2018-11-07 12:49:17 +01:00
Laurent Destailleur
4a25317f10 Fix security on GETPOST('action'). Param must be sanitized. 2018-11-05 20:29:07 +01:00
Laurent Destailleur
c0f4ec5a3e FIX sanitize param $action 2018-11-05 17:53:31 +01:00
Laurent Destailleur
90729c03c4 Fix dependencies of new modules 2018-11-05 10:28:44 +01:00
andreubisquerra
86b98db2a2 No posibility to validate if invoice not exist 2018-11-04 20:36:23 +01:00