lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
109,623 Commits 43 Branches 150 Tags 886 MiB
develop
Commit Graph

975 Commits

Author SHA1 Message Date
David Beniamine
833da30af1
Use any dolibarr enabled paiement mode 2019-03-24 21:01:42 +01:00
David Beniamine
4b61f0d606
Grouped VAT 
Add an option to group VAT by rate in receipt
 2019-03-24 20:17:41 +01:00
David Beniamine
10ab6f480d
Automatically print receipt 2019-03-22 09:28:58 +01:00
andreubisquerra
3665e9137a In a previous commit the command to change 'ref' has been deleted. And now TakePOS don't work. 
In Dolibarr the next command not work on draft invoice:
$invoice->ref = "(PROV-POS-".$place.")";
So I return to the previous command:
$sql="UPDATE ".MAIN_DB_PREFIX."facture set ref='(PROV-POS-".$place.")' where rowid=".$placeid;
 2019-03-19 23:05:08 +01:00
Philippe GRAND
13c49d2946 update with html5 compliant code 2019-03-17 10:27:06 +01:00
Philippe GRAND
7b1fd917eb update with html5 compliant code 2019-03-17 10:25:37 +01:00
Philippe GRAND
cbb865b960 update with html5 compliant code 2019-03-17 10:22:50 +01:00
Laurent Destailleur
86c5dc20e3 NEW Can choose the root category to show for TakePOS module 2019-03-15 02:12:40 +01:00
Laurent Destailleur
0ef6fd36f9 Merge and clean TakePOS CSS 2019-03-15 00:49:44 +01:00
Laurent Destailleur
6aa9a5f13a Fix link to backoffice 2019-03-14 23:36:55 +01:00
Regis Houssin
56104e6d89 FIX regression 2019-03-14 17:58:32 +01:00
Regis Houssin
a40cba194f FIX wrong url 2019-03-14 17:24:42 +01:00
Regis Houssin
fd393218d3 FIX you should prefer "elseif" than "else if" 2019-03-14 17:07:49 +01:00
Regis Houssin
daa940d75b FIX multiple bugs for show products/categories 2019-03-14 16:35:36 +01:00
Josep Lluís
869f6680da
FIX: free product description not printed 
The description of a free product/service is not printed on receipt.
 2019-03-13 15:43:34 +01:00
andreubisquerra
b1e9a0fe38 Add Order Notes to TakePOS 2019-03-03 12:50:36 +01:00
Laurent Destailleur
56d921ea52 CSS 2019-03-02 12:57:07 +01:00
Laurent Destailleur
825705179c Fix phpcs 2019-02-27 12:49:44 +01:00
Laurent Destailleur
bcf1d57456 Fix default page is not always index.php 2019-02-27 04:21:12 +01:00
Laurent Destailleur
4634312306 Fix phpcs 2019-02-27 04:18:25 +01:00
andreubisquerra
57ee8b7991 Fix no JPG images in TakePOS and other image improvements. 2019-02-24 21:15:11 +01:00
Laurent Destailleur
6b46a927f1
Merge branch 'develop' into PSR2MethodsFunctionCallSignatureSpaceBeforeOpenBracket 2019-02-24 20:53:54 +01:00
Frédéric FRANCE
894123fb06
PSR2.Methods.FunctionCallSignature.SpaceBeforeOpenBracket 2019-02-24 20:06:55 +01:00
Frédéric FRANCE
390766babf
replace html code by html5 2019-02-23 23:36:21 +01:00
Laurent Destailleur
e4698fb6a5 Merge 2019-02-18 19:14:25 +01:00
Laurent Destailleur
b2e0b1216e Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-02-18 17:05:03 +01:00
Laurent Destailleur
b2ec340a48 FIX Show button POS Ticket only if invoice was generated by POS 2019-02-18 17:04:53 +01:00
andreubisquerra
8cc2662f01 Update TakePOS in Dolibarr 9 2019-02-14 20:59:32 +01:00
andreubisquerra
3f9b37d3d4 Fix TakePOS categories bug 2019-02-13 22:29:55 +01:00
Laurent Destailleur
e054b080a5
Merge branch 'develop' into GenericFunctionsFunctionCallArgumentSpacing 2019-02-12 13:33:39 +01:00
klemens
beb2791dde spelling fixes 2019-02-10 12:59:09 +01:00
Frédéric FRANCE
152d8ffcbf
Merge remote-tracking branch 'upstream/develop' into GenericFunctionsFunctionCallArgumentSpacing 2019-02-10 11:08:59 +01:00
Frédéric FRANCE
580e5c42d2
GenericFunctionsFunctionCallArgumentSpacing 2019-02-09 12:00:49 +01:00
Laurent Destailleur
5483856543 Fix phpcs 2019-02-08 23:53:40 +01:00
Laurent Destailleur
7625eb7cd4 Fix missing error management after afterPDFCreation hook. 
Removed dead code
 2019-02-08 19:54:24 +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
3a5372b59c
Merge pull request #10484 from andreubisquerra/master 
CSS improvements and Takepos setup check
 2019-02-03 19:16:08 +01:00
Laurent Destailleur
8dd64b0dc1
Update takepos.php 2019-02-03 19:15:41 +01:00
Frédéric FRANCE
273d68381c
psr2 end file new line none found 2019-02-03 15:21:21 +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
Philippe GRAND
4bf5a52f4b update with html5 compliant code 2019-01-21 10:12:28 +01:00
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
Regis Houssin
569d59d251 FIX change my deprecated email 2018-10-27 14:43:12 +02:00
andreubisquerra
b396aaebc5 Fix delete without any selected line 2018-10-18 16:31:37 +02:00
Laurent Destailleur
35d5a495de Save pos_source with id of POS station 2018-10-08 22:51:20 +02:00
Laurent Destailleur
41f2289ffa Save pos station into invoice 2018-10-08 22:28:30 +02:00
Laurent Destailleur
19cf649b48 Add field to track source module of invoice 2018-10-07 13:59:40 +02:00
Alexey Pyltsyn
49de7a5881 Replace multiple load calls with loadLangs method 2018-10-01 09:22:23 +03:00
Laurent Destailleur
93fb945ba2
Merge pull request #9645 from frederic34/patch-15 
remove link to custom in actions_takepos.class.php
 2018-10-01 01:19:20 +02:00
Laurent Destailleur
8ccbdfa39d
Merge pull request #9638 from frederic34/patch-11 
remove $var from takepos admin setup
 2018-10-01 01:16:33 +02: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
Frédéric FRANCE
0ac56fde1b
Update actions_takepos.class.php 2018-09-30 14:26:35 +02:00
Frédéric FRANCE
84ff287c36
remove $var from takepos admin setup 2018-09-30 10:56:55 +02:00
Laurent Destailleur
aaa5efc77e Clean Take pos module 2018-09-28 22:06:04 +02:00
Laurent Destailleur
a4ec613d73 Move sql table 2018-09-28 19:40:44 +02:00
Laurent Destailleur
78fbb6cd89 Rename label 2018-09-28 13:48:11 +02:00
Laurent Destailleur
603db250f0 Clean takepos 2018-09-28 13:36:46 +02:00
Laurent Destailleur
f990719daa Add experimental module TakePOS 2018-09-28 13:31:41 +02:00