217 Commits

Author	SHA1	Message	Date
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