Commit Graph

1145 Commits

Author SHA1 Message Date
VESSILLER
ded7b79a6f FIX free text on cash desk 2020-06-05 12:10:03 +02:00
VESSILLER
304c44560d NEW add free text on each terminal of cash desk 2020-06-05 10:47:45 +02:00
Laurent Destailleur
9a30d4ca44 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-02 13:32:02 +02:00
andreubisquerra
b0f904508a Fix travis 2020-06-01 17:52:38 +02:00
andreubisquerra
8abe60db0b Add Restaurant QR menu 2020-06-01 17:05:22 +02:00
andreubisquerra
3cc249a887 Update QR 2020-06-01 17:04:23 +02:00
andreubisquerra
5325971517 Update settings 2020-06-01 17:02:11 +02:00
Laurent Destailleur
2836368017 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/extrafields.class.php
	htdocs/filefunc.inc.php
	htdocs/takepos/css/phone.css
	htdocs/takepos/invoice.php
2020-05-28 20:20:39 +02:00
andreubisquerra
3b884c4051 Fix travis 2020-05-27 07:03:57 +02:00
andreubisquerra
8891595993 Fix travis 2020-05-27 06:57:12 +02:00
andreubisquerra
896e3166b7 Update phone.css 2020-05-27 06:49:37 +02:00
andreubisquerra
7d323f4379 Update index.php 2020-05-27 06:48:40 +02:00
andreubisquerra
abf7fce108 Update auto_order.php 2020-05-27 06:44:00 +02:00
andreubisquerra
7e792928e0 Update invoice.php for Auto Order 2020-05-26 23:03:47 +02:00
andreubisquerra
56708e8c35 Update phone.php for Auto Order 2020-05-26 22:52:55 +02:00
stickler-ci
5fe4520385 Fixing style errors. 2020-05-25 20:43:35 +00:00
Laurent Destailleur
40816c02ce Merge branch 'develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword 2020-05-25 22:40:59 +02:00
Laurent Destailleur
4e0d8ba518 Merge pull request #13962 from andreubisquerra/develop
TakePOS Auto Order improvements
2020-05-25 22:34:22 +02:00
Laurent Destailleur
0b9e1e6ec6 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-25 13:01:49 +02:00
Laurent Destailleur
6158e41822 CSS 2020-05-24 23:44:04 +02:00
andreubisquerra
d60bcb871f Fix travis 2020-05-24 18:24:41 +02:00
andreubisquerra
957c40e072 Fix travis 2020-05-24 18:03:07 +02:00
andreubisquerra
3632111705 Fix travis 2020-05-24 17:29:35 +02:00
andreubisquerra
c80989d74f phone.php improvements 2020-05-24 16:31:22 +02:00
andreubisquerra
221e8d8ce1 invoice.php improvements 2020-05-24 16:30:42 +02:00
andreubisquerra
26ee0d1949 genimg improvements 2020-05-24 16:29:42 +02:00
Frédéric FRANCE
6522bb70fd fix merge 2020-05-23 19:06:01 +02:00
Frédéric FRANCE
5aa84c64d0 Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword 2020-05-23 18:54:33 +02:00
Laurent Destailleur
697d4d684e Merge pull request #13899 from andreubisquerra/master
TakePOS Auto Order improvements
2020-05-23 15:11:01 +02:00
Frédéric FRANCE
5940d3705a add new rule 2020-05-21 16:00:12 +02:00
Frédéric FRANCE
b41ac00b98 add new rule 2020-05-21 15:05:19 +02:00
Frédéric FRANCE
ee6fadd0d5 add new rule 2020-05-21 01:41:27 +02:00
Laurent Destailleur
bd564486ff Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-17 20:03:09 +02:00
Laurent Destailleur
608d3ce32f Responsive 2020-05-17 16:10:29 +02:00
andreubisquerra
38346afe0e Clean 2020-05-16 00:26:42 +02:00
andreubisquerra
ceafbb9855 Fix travis 2020-05-16 00:07:13 +02:00
jove@bisquerra.com
0847f5350a TakePOS Auto Order improvements 2020-05-15 23:44:19 +02:00
Laurent Destailleur
b8aa635955 Merge pull request #13890 from andreubisquerra/master
Public photos for customers with TakePOS
2020-05-15 14:36:07 +02:00
Laurent Destailleur
f35a618699 Update index.php 2020-05-15 14:29:04 +02:00
Scrutinizer Auto-Fixer
9699ee7263 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-05-15 11:55:31 +00:00
jove@bisquerra.com
991996697d Public photos for customers with TakePOS 2020-05-14 18:03:22 +02:00
Laurent Destailleur
bc581ead3b Merge branch 'develop' into master 2020-05-14 16:17:37 +02:00
Laurent Destailleur
f0d14662b9 Fix scrutinizer 2020-05-13 00:38:12 +02:00
andreubisquerra
8bd1179b82 Update qr.php 2020-05-12 17:03:24 +02:00
Laurent Destailleur
c89e8efec3 responsive 2020-05-12 14:08:28 +02:00
andreubisquerra
b89b6d7679 Name fix 2020-05-08 18:51:49 +02:00
andreubisquerra
f8ad954854 Fix URLs 2020-05-08 18:04:38 +02:00
andreubisquerra
1674048c81 Fix travis 2020-05-08 17:56:42 +02:00
jove@bisquerra.com
b93a3ceb29 TakePOS Auto Order improvements 2020-05-08 17:25:48 +02:00
Laurent Destailleur
a649dcecf7 Look and field 2020-05-08 03:01:51 +02:00