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
jove@bisquerra.com
54f9ed6346 NEW: Add third order printer to TakePOS 2020-10-12 22:07:05 +02:00
Laurent Destailleur
1b92e03f47
Merge pull request #14921 from ptibogxiv/patch-383 
NEW set entity when creating invoice on takepos
 2020-10-08 19:30:37 +02:00
Scrutinizer Auto-Fixer
1512521d91 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-10-07 13:01:28 +00:00
Laurent Destailleur
351f80c540
Update index.php 2020-10-06 09:57:04 +02:00
ptibogxiv
bb0b9dc128
FIX php error in takepos 2020-10-05 18:16:32 +02:00
Laurent Destailleur
9309048bda
Merge pull request #14923 from ptibogxiv/patch-385 
New display currency in takepos payment
 2020-10-05 16:45:17 +02:00
Laurent Destailleur
bb39d7b205
Merge pull request #14916 from ptibogxiv/patch-382 
Fix  and save change of currency in invoice (takepos)
 2020-10-05 16:44:28 +02:00
Laurent Destailleur
44ecc15a07
Merge pull request #14915 from ptibogxiv/patch-380 
Fix reload display when invoice deleting in takepos
 2020-10-05 16:43:55 +02:00
Laurent Destailleur
0fdad1b63d
Merge pull request #14914 from ptibogxiv/patch-379 
Fix better display print/send button on takepos
 2020-10-05 16:43:11 +02:00
Laurent Destailleur
10d21eee03
Merge pull request #14911 from ptibogxiv/patch-376 
Fix display stock rights in takepos
 2020-10-05 16:42:31 +02:00
Laurent Destailleur
ffc0f51827
Merge pull request #14909 from ptibogxiv/patch-374 
Fix multicurrency modal in takepos
 2020-10-05 16:41:56 +02:00
Laurent Destailleur
099c19cefb
Merge pull request #14912 from ptibogxiv/patch-378 
NEW multicurrency total in takepos
 2020-10-05 16:40:59 +02:00
Laurent Destailleur
243d576f83
Update invoice.php 
Log for debug
 2020-10-05 16:38:40 +02:00
ptibogxiv
078459fc44
New display currency in takepos payment 
to do in next PR (payment with multicurrency in other currency that principal)
 2020-10-04 23:35:19 +02:00
andreubisquerra
1c34a7acda
NEW: TakePOS connector compatibility with RECEIPT PRINTERS module 2020-10-04 22:50:27 +02:00
ptibogxiv
1a407e4c22
NEW set entity when creating invoice on takepos 
usefull for marketplace, coworking, multibranding shop
 2020-10-04 22:09:40 +02:00
ptibogxiv
55764779c4
Update invoice.php 2020-10-04 17:12:01 +02:00
ptibogxiv
e280fc3ad1
Fix and save change of currency in invoice (takepos) 2020-10-04 16:53:31 +02:00
stickler-ci
32a882e83c Fixing style errors. 2020-10-04 13:56:36 +00:00
ptibogxiv
fac60bdf24
Fix reload display when invoice deleting 2020-10-04 15:54:23 +02:00
ptibogxiv
eaedcff2a8
Fix better display print/send button on takepos 2020-10-04 15:01:22 +02:00
ptibogxiv
1e6ad59856
Update invoice.php 2020-10-04 14:42:16 +02:00
stickler-ci
d25c5bf36a Fixing style errors. 2020-10-04 12:40:52 +00:00
ptibogxiv
31dd9885e6
NEW multicurrency total in takepos 2020-10-04 14:39:02 +02:00
ptibogxiv
415deb1500
Fix display stock rights in takepos 
only display if user have read right
 2020-10-04 14:27:03 +02:00
ptibogxiv
36fc987f1e
Fix multicurrency modal 
+ avoid loud page if not used
 2020-10-04 14:04:44 +02:00
Laurent Destailleur
f09258713e
Merge pull request #14907 from andreubisquerra/master 
NEW: TakePOS Multicurrency compatibility
 2020-10-04 11:26:58 +02:00
andreubisquerra
4c64b99235
Lang fix 2020-10-03 23:16:13 +02:00
andreubisquerra
d43d1e8519
Clean 2020-10-03 23:03:08 +02:00
andreubisquerra
18cd870307
Fix travis 2020-10-03 22:31:55 +02:00
jove@bisquerra.com
017d4946fe NEW: TakePOS Multicurrency compatibility 2020-10-03 22:13:32 +02:00
Laurent Destailleur
50ca9f4145 Clean code 2020-10-02 19:10:30 +02:00
Laurent Destailleur
500ef243e2
Merge pull request #14815 from ptibogxiv/patch-365 
NEW restrict thirdparty to customer in takepos
 2020-10-02 14:41:11 +02:00
Laurent Destailleur
ce1c5c6873 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/stripe/class/stripe.class.php
	htdocs/takepos/invoice.php
 2020-10-01 19:43:23 +02:00
Laurent Destailleur
0fa139f4e3 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/takepos/invoice.php
 2020-10-01 19:37:56 +02:00
Laurent Destailleur
4d134ade72 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/takepos/invoice.php
 2020-10-01 19:35:49 +02:00
Laurent Destailleur
7b3a7c9921 Add token on all url with action=delete 2020-10-01 10:50:54 +02:00
Laurent Destailleur
f442dac2c9 Add token on most GET url for admin action 2020-09-30 15:13:28 +02:00
lvessiller
259737f082 FIX set paid on total discount of a product in cash desk 2020-09-30 15:09:45 +02:00
ptibogxiv
09f7220470
Update index.php 2020-09-29 17:10:08 +02:00
Laurent Destailleur
ac897b5b4d Fix css 2020-09-29 17:06:08 +02:00
andreubisquerra
12b2c33895
Footer removed 2020-09-27 22:22:56 +02:00
andreubisquerra
80641e54c9
Footer removed 2020-09-27 22:19:49 +02:00
andreubisquerra
494348356a
Fix travis 2020-09-27 11:35:07 +02:00
jove@bisquerra.com
ec54e33d81 NEW: Introducing new modal boxes in TakePOS 2020-09-27 11:11:31 +02:00
Laurent Destailleur
0e820d4c2b FIX link to home in takepos 2020-09-24 13:00:56 +02:00
Laurent Destailleur
1d6a4f528a Fix css 2020-09-24 00:07:55 +02:00
Laurent Destailleur
a16788f753 Fix syntax error 2020-09-24 00:06:02 +02:00
ptibogxiv
5f8f9c6a4a
NEW restrict thirdparty to customer in takepos 
only display customer (better when long list and avoid supplier)
 2020-09-23 22:38:06 +02:00
Laurent Destailleur
32a93eb067
Update invoice.php 2020-09-23 19:50:39 +02:00
jove@bisquerra.com
c596f80fd5 NEW Show available stock in TakePOS 2020-09-20 23:29:59 +02:00
Laurent Destailleur
a6a2c6cfe1
Merge pull request #14748 from andreubisquerra/master 
Show buttons on products when 'Hide Product Images' is enabled
 2020-09-20 17:43:35 +02:00
Laurent Destailleur
aba6fbb306
Merge pull request #14791 from andreubisquerra/develop 
Avoid errors when Weighing Scale from the cloud in TakePOS
 2020-09-20 17:12:48 +02:00
Laurent Destailleur
e5cca13ea0 Fix escaping 2020-09-20 03:32:43 +02:00
andreubisquerra
55a0e5f2e7
Avoid errors when Weighing Scale from the cloud in TakePOS 2020-09-19 17:12:41 +02:00
Laurent Destailleur
d75e1e5771 Fix #yogosha4525 2020-09-18 16:10:11 +02:00
Laurent Destailleur
bfbb217607 Fix GETPOST on 'action' 2020-09-16 19:39:50 +02:00
Laurent Destailleur
295c2b1d17 FIX #yogosha4435 2020-09-16 17:56:26 +02:00
andreubisquerra
ffb1b5c2ca
Fix travis 2020-09-16 07:59:36 +02:00
andreubisquerra
9bb41e949d
Fix travis 2020-09-16 07:39:48 +02:00
jove@bisquerra.com
31eecae2a6 Show buttons on products when 'Hide Product Images' is enabled 2020-09-16 06:54:01 +02:00
jove@bisquerra.com
e55c16c039 NEW Weighing Scale compatibility with TakePOS connector 2020-09-13 21:12:14 +02:00
Scrutinizer Auto-Fixer
c263c8a76c Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-09-08 19:27:28 +00:00
Laurent Destailleur
c91338198d Add some fields in candidature 
Look and feel v13
 2020-09-08 01:53:37 +02:00
Scrutinizer Auto-Fixer
b78ff67d7e Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-09-07 08:18:17 +00:00
Laurent Destailleur
54c1be3717
Merge pull request #14560 from ptibogxiv/patch-349 
NEW display resiliate status in takepos for member
 2020-08-31 16:16:39 +02:00
Laurent Destailleur
d11d02a23a
Merge pull request #14586 from ptibogxiv/patch-353 
NEW change thirdparty with barcode scan in takepos
 2020-08-31 16:15:59 +02:00
stickler-ci
59542cfbcd Fixing style errors. 2020-08-30 07:41:57 +00:00
jove@bisquerra.com
862c55ea07 NEW Keep takepos terminal when login/logout 2020-08-30 09:19:35 +02:00
stickler-ci
e18b85ea87 Fixing style errors. 2020-08-29 14:08:42 +00:00
ptibogxiv
d3024fdd1c
Update index.php 2020-08-29 16:07:01 +02:00
ptibogxiv
a963d6c0fc
NEW change thirdparty with barcode scan in takepos 2020-08-29 16:05:14 +02:00
ptibogxiv
6eeb1d3a96
Update invoice.php 2020-08-29 13:36:52 +02:00
Laurent Destailleur
4ecd15b7ab Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/commande/card.php
	htdocs/langs/en_US/main.lang
 2020-08-27 21:57:42 +02:00
Laurent Destailleur
5c1680e9c5
Merge branch 'develop' into master 2020-08-27 19:58:29 +02:00
stickler-ci
eecab28203 Fixing style errors. 2020-08-26 10:22:33 +00:00
ptibogxiv
989130c0ad
Update invoice.php 2020-08-26 12:20:49 +02:00
ptibogxiv
76e276e8e8
Update invoice.php 2020-08-26 12:00:45 +02:00
stickler-ci
32ecf4dd9a Fixing style errors. 2020-08-26 09:46:49 +00:00
ptibogxiv
66cdb1dad0
NEW display resiliate status in takepos for member 2020-08-26 11:44:35 +02:00
ptibogxiv
ff621cb146
Update pay.php 2020-08-24 12:27:19 +02:00
ptibogxiv
9da4946955
Fix for better code 2020-08-24 12:26:40 +02:00
andreubisquerra
915aa56a95
Change variable to pos_change 2020-08-23 22:29:55 +02:00
andreubisquerra
8f933c324a
Change variable to pos_change 2020-08-23 22:28:26 +02:00
Laurent Destailleur
c784c002fd
Merge pull request #14517 from aspangaro/13.0_a5 
Some fix on complete_head_from_modules
 2020-08-23 18:09:15 +02:00
andreubisquerra
e8c8cb53cb
Fix travis 2020-08-22 18:45:54 +02:00
jove@bisquerra.com
d9cbd8f998 NEW: Print payment method and change in TakePOS 2020-08-22 18:28:15 +02:00
Alexandre SPANGARO
f1f579ad67 Some fix on complete_head_from_modules 2020-08-20 22:17:34 +02:00
Laurent Destailleur
25dfd32e0b
Merge pull request #14456 from andreubisquerra/master 
NEW: Delayed payment in TakePOS
 2020-08-19 14:36:34 +02:00
Laurent Destailleur
ea478721e7
Update invoice.php 2020-08-19 14:36:03 +02:00
Laurent Destailleur
f57f729d40
Update invoice.php 2020-08-19 14:35:15 +02:00
Laurent Destailleur
1d18c83439
Merge pull request #14463 from andreubisquerra/develop 
Avoid empty sales and orders when all lines are removed.
 2020-08-14 02:48:48 +02:00
Laurent Destailleur
7ce1d36b59 FIX Category for suplements not saved 2020-08-13 13:51:08 +02:00
Laurent Destailleur
88c07e86ad Organization of setup for Takepos bar features 2020-08-13 13:46:53 +02:00
andreubisquerra
8c5a86cb72
Avoid empty sales and orders when all lines are removed. 2020-08-12 07:07:18 +02:00
jove@bisquerra.com
3be723f3a1 NEW: Delayed payment in TakePOS 2020-08-11 07:49:54 +02:00
Laurent Destailleur
6fd433167f Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/CMailFile.class.php
 2020-08-07 11:59:55 +02:00
jove@bisquerra.com
022fb23cee FIX: Get some taxes in TakePOS 2020-08-07 10:01:11 +02:00
Laurent Destailleur
01babc452c More logs 2020-08-06 03:52:49 +02:00
andreubisquerra
0347f2a46b
More elegant 2020-08-04 08:19:27 +02:00
jove@bisquerra.com
6d957c276c Improving TakePOS search informing the user if there is no record or clearing the box if it exists avoiding manually clear every scan 2020-08-04 08:11:44 +02:00
Laurent Destailleur
be34a2c607 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/extrafields.class.php
	htdocs/core/class/html.form.class.php
	htdocs/langs/en_US/cashdesk.lang
	htdocs/product/stock/list.php
 2020-08-02 16:06:51 +02:00
jove@bisquerra.com
593c7242c4 NEW: TakePOS Gift Receipt 2020-08-02 11:13:41 +02:00
Laurent Destailleur
0b46fcb4f8 Debug 2020-07-31 14:02:08 +02:00
Laurent Destailleur
0d71cd4279 Fix td not closed 2020-07-31 13:51:49 +02:00
Laurent Destailleur
255dc71823 Missing translation 2020-07-31 13:20:05 +02:00
Laurent Destailleur
cb5577826d Look and feel v13 2020-07-07 03:50:14 +02:00
Laurent Destailleur
83eaddb17b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/core/class/evalmath.class.php
	htdocs/core/class/extrafields.class.php
	htdocs/install/mysql/migration/11.0.0-12.0.0.sql
	htdocs/langs/en_US/cashdesk.lang
	htdocs/societe/class/societe.class.php
 2020-07-04 13:13:17 +02:00
andreubisquerra
452cca503a
Fixes 2020-07-02 00:11:17 +02:00
andreubisquerra
d2a78b8aa4
Update appearance.php 2020-07-01 22:44:18 +02:00
jove@bisquerra.com
76f3724191 NEW: Appearance tab in TakePOS with more visual parameters 2020-07-01 22:34:35 +02:00
stickler-ci
92f4744d11 Fixing style errors. 2020-07-01 13:22:43 +00:00
ptibogxiv
5e259d26ab
FIX takepos hook 
can add more than 1 button within 1 module
 2020-07-01 15:20:42 +02:00
Laurent Destailleur
4f1ac84a19 Fix can't find link to edit table plan 2020-06-30 12:07:24 +02:00
Laurent Destailleur
146c521efd Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/security.lib.php
	htdocs/filefunc.inc.php
 2020-06-29 18:06:42 +02:00
Laurent Destailleur
bb74804b74 NEW Add option TAKEPOS_CAN_FORCE_BANK_ACCOUNT_DURING_PAYMENT 2020-06-29 17:58:04 +02:00
Laurent Destailleur
68b4866438 Trans 2020-06-29 09:43:39 +02:00
Laurent Destailleur
9c23890c26 Fix phpcs 2020-06-24 20:03:12 +02:00
Laurent Destailleur
4cfb9dc7c5 css 2020-06-22 04:40:04 +02:00
Laurent Destailleur
0139a840ae Fix setup 2020-06-21 20:49:34 +02:00
Laurent Destailleur
501fd2f7a3 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/takepos/admin/receipt.php
 2020-06-21 20:48:41 +02:00
Laurent Destailleur
ccc55dcb1e Debug Receipt printer module and reduce duplicate translation key 2020-06-20 15:19:19 +02:00
Laurent Destailleur
c54294285a Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/mailing/class/html.formadvtargetemailing.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.form.class.php
 2020-06-20 12:28:14 +02:00
andreubisquerra
515d18020d Add security check 2020-06-20 12:21:14 +02:00
andreubisquerra
532fe82c6e Fix travis 2020-06-20 12:21:06 +02:00
jove@bisquerra.com
ad432e1e9b Printable QR 2020-06-20 12:20:53 +02:00
Laurent Destailleur
d632f1c6b2 Fix url 2020-06-19 23:08:29 +02:00
VESSILLER
f010184008 FIX replace filter parameter "none" by "restricthtml" 2020-06-08 11:48:31 +02:00
VESSILLER
7bba9db2f0 FIX replace filter parameter "none" by "restricthtml" 2020-06-08 11:28:05 +02:00
VESSILLER
81fbb80823 FIX end div for responsive table 2020-06-05 14:20:38 +02:00
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
Laurent Destailleur
830a117aa7 Suggest fix for #13824 2020-05-07 23:39:03 +02:00
Laurent Destailleur
f4a9490e7f Fix a page with NOLOGIN const set to 1 must be into "public" dir. 2020-05-04 16:55:53 +02:00
andreubisquerra
8530db6dab
Fix travis 2020-05-03 00:09:17 +02:00
andreubisquerra
32923daa9d
Fix travis 2020-05-03 00:07:52 +02:00
andreubisquerra
ac75cf318e
Fix travis 2020-05-03 00:07:04 +02:00
andreubisquerra
35713ef004
Fix travis 2020-05-03 00:05:59 +02:00
jove@bisquerra.com
81c808692e NEW Bar Restaurant tab and Auto order 2020-05-02 22:00:04 +02:00
andreubisquerra
281a97404a
Fix travis 2020-04-30 01:27:55 +02:00
jove@bisquerra.com
4dbd16077e Finish send receipt by email from TakePOS 2020-04-30 01:10:12 +02:00
Laurent Destailleur
b20d85b198 Fix phpcs 2020-04-26 23:06:52 +02:00
Laurent Destailleur
c7fab6a83e Fix no tooltip of not predefined products 2020-04-20 13:26:06 +02:00
Laurent Destailleur
b92c03cdf6 Fix Look and feel v12 2020-04-20 13:20:09 +02:00
Scrutinizer Auto-Fixer
387ea73bf3 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-04-13 11:24:42 +00:00
Laurent Destailleur
d47c566c4d Fix class not found 2020-04-12 18:15:38 +02:00
Laurent Destailleur
27782a244c
Merge pull request #13565 from andreubisquerra/develop 
4 rows of actions buttons in TakePOS
 2020-04-12 17:02:28 +02:00
Laurent Destailleur
78b455e42a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-04-12 17:01:53 +02:00
Laurent Destailleur
422e33a68b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/ihm.php
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/compta/stats/cabyprodserv.php
	htdocs/filefunc.inc.php
	htdocs/takepos/invoice.php
 2020-04-12 17:01:44 +02:00
andreubisquerra
323a62f1e7
travis fix 2020-04-11 22:38:59 +02:00
andreubisquerra
5dc3b8dfd5
Travis fix 2020-04-11 22:36:46 +02:00
jove@bisquerra.com
78b43ddb1f TakePOS connector update 2020-04-11 22:19:36 +02:00
andreubisquerra
9270e2c614
4 rows of actions buttons in TakePOS 2020-04-11 16:31:08 +02:00
jove@bisquerra.com
66659f0693 Two diferents order printers 2020-04-10 19:18:42 +02:00
Scrutinizer Auto-Fixer
444c293c01 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-04-10 08:59:32 +00:00
andreubisquerra
4ac978303b
FIX TakePOS buying price 2020-04-10 08:36:16 +02:00
Laurent Destailleur
09f1536c27
Merge pull request #13537 from andreubisquerra/master 
Add langs and print only no printed order lines
 2020-04-09 19:38:30 +02:00
andreubisquerra
e43e9a0daa
FIX TakePOS buying price 2020-04-09 14:56:50 +02:00
andreubisquerra
7d11a36beb
FIX TakePOS buying price 2020-04-09 14:42:42 +02:00
jove@bisquerra.com
ea79c91482 Add langs and print only no printed order lines 2020-04-08 20:02:54 +02:00
Laurent Destailleur
b8a657ec0f
Merge pull request #13509 from andreubisquerra/develop 
Order printer with 'Receipt printers' module
 2020-04-08 14:51:23 +02:00
Frédéric FRANCE
fc34b5a4cb
compress png with zopflipng 2020-04-06 19:03:48 +02:00
andreubisquerra
aec1c177e3
Order printer with 'Receipt printers' module 2020-04-06 16:07:05 +02:00
andreubisquerra
27eec2e5db
Travis fix 2020-04-02 23:28:25 +02:00
andreubisquerra
3255c18567
Receipt compatibility with receipt printer module 2020-04-02 22:11:16 +02:00
jove@bisquerra.com
d9614ac6fc Integrate Cash Control in TakePOS 2020-03-30 20:05:45 +02:00
andreubisquerra
0db7c2bf21
TakePOS CSS fix in action buttons 2020-03-27 23:19:56 +01:00
andreubisquerra
58a10c9c16
Unnecessary line 2020-03-23 23:10:55 +01:00
andreubisquerra
585c46b181
Avoid print customer name when is default 2020-03-23 22:58:04 +01:00
andreubisquerra
53850caa87
No reload page to load other sale in TakePOS 2020-03-23 22:44:26 +01:00
Laurent Destailleur
b9088c1ce3 css 2020-03-23 17:39:35 +01:00
Laurent Destailleur
0905b3a6b2 Fix function not found 2020-03-23 15:46:16 +01:00
Laurent Destailleur
aab3ca4fa1
Merge pull request #13402 from andreubisquerra/develop 
Fix TakePOS DirectPayment when place is higher 0
 2020-03-23 15:12:38 +01:00
Laurent Destailleur
d662bb97dc Debug parallel sale feature 2020-03-23 15:02:15 +01:00
Laurent Destailleur
d965aad6e6 Some fix to support correctly parallel sales 2020-03-23 14:31:59 +01:00
Laurent Destailleur
2177afecd9 Sort order 2020-03-23 14:12:48 +01:00
andreubisquerra
fbe6711353
Fix TakePOS DirectPayment when place is higher 0 2020-03-22 22:46:40 +01:00
andreubisquerra
618da0a808
Fix TakePOS DirectPayment when place is higher 0 2020-03-22 22:39:41 +01:00
Laurent Destailleur
4b3d2bfb64
Merge pull request #13398 from andreubisquerra/master 
NEW: Multiple sales in TakePOS
 2020-03-22 20:19:40 +01:00
Laurent Destailleur
1cb598290a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-03-22 20:17:10 +01:00
Laurent Destailleur
1fdef022f0 css 2020-03-22 20:16:14 +01:00
andreubisquerra
40e5e7a46b
Travis fixes 2020-03-22 15:24:32 +01:00
jove@bisquerra.com
a2b973f9f7 NEW: Multiple sales in TakePOS 2020-03-22 14:50:09 +01:00
andreubisquerra
4b7de1e5f5
Remove vars to avoid conficts in TakePOS setup 2020-03-21 15:48:25 +01:00
Laurent Destailleur
5f0f376817
Merge pull request #13334 from OPEN-DSI/new-takepos-group-same-product 
NEW add a parameter to group same product
 2020-03-20 10:45:06 +01:00
Laurent Destailleur
9f65c4a7db
Merge pull request #13369 from OPEN-DSI/new-takepos-freezone-vat-rate 
NEW add VAT rates on free zone in cash desk
 2020-03-18 19:37:04 +01:00
Laurent Destailleur
a141f46e91
Merge pull request #13354 from OPEN-DSI/new-takepos-reduction-global-labels 
NEW labels on reduction buttons in cash desk
 2020-03-18 19:28:08 +01:00
VESSILLER
0e171e81e6 Merge branch 'develop' of github.com:OPEN-DSI/dolibarr into new-takepos-freezone-vat-rate 2020-03-17 09:57:21 +01:00
VESSILLER
a74dca4a20 FIX resolve conflicts 2020-03-17 09:52:26 +01:00
VESSILLER
f7cf5f8784 NEW add VAT rates in free zone for product/service in cash desk 2020-03-17 09:44:59 +01:00
Laurent Destailleur
73f2e9e5de WIP migrate num_paiement into num_payment 
Fix label for free product in takepos
 2020-03-16 19:23:18 +01:00
Laurent Destailleur
01724894ad Fix useless BR 2020-03-16 18:33:06 +01:00
Laurent Destailleur
ffc861d4e2 FIX Autoadd product when barcode match 
Show barcode value in tooltips
 2020-03-16 18:04:22 +01:00
Laurent Destailleur
1212a63365 css 2020-03-16 15:53:00 +01:00
Laurent Destailleur
4b1dd27c5f Move takepos.php file into index.php to match other dir structure 2020-03-16 15:41:21 +01:00
Laurent Destailleur
41ae8f6f68 TakePOS: Move all information of customer in the header 2020-03-16 13:27:10 +01:00
VESSILLER
5a4bd28417 NEW labels on reduction buttons in cash desk 2020-03-16 11:56:47 +01:00
VESSILLER
350408d2ac Merge branch 'develop' of github.com:OPEN-DSI/dolibarr into new-takepos-group-same-product 2020-03-16 11:10:41 +01:00
VESSILLER
1268bab958 Merge branch 'develop' of github.com:OPEN-DSI/dolibarr into new-takepos-group-same-product 2020-03-13 17:27:04 +01:00
VESSILLER
04c0332bee FIX travis errors 2020-03-12 18:31:43 +01:00
VESSILLER
70ebc61c1f Module TakePos - NEW add numbering module for cash desk 2020-03-12 17:43:59 +01:00
Scrutinizer Auto-Fixer
f413ce6aac Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-03-12 11:45:44 +00:00
VESSILLER
e7056a9ade NEW add a parameter to group same product 2020-03-12 11:00:17 +01:00
Laurent Destailleur
fb8e565b53 Better position on screen 2020-03-12 00:13:42 +01:00
Laurent Destailleur
af227ae164 Add picto on selection of terminal button 2020-03-11 23:57:36 +01:00
Laurent Destailleur
54da1e73ff Option to show the n first line of desc into the basket 2020-03-11 23:56:48 +01:00
Laurent Destailleur
efeda2e747 Fix add global check on perm 2020-03-11 20:14:33 +01:00
Laurent Destailleur
7b93b39bb8
Merge pull request #13310 from OPEN-DSI/new-takepos-ticket-paid 
NEW no confirm discard ticket if paid
 2020-03-11 20:08:40 +01:00
Laurent Destailleur
c3b51b177e
Merge pull request #13327 from OPEN-DSI/new-takepos-auto-print-ticket-paid 
NEW only auto print paid ticket in cash desk
 2020-03-11 20:07:50 +01:00
VESSILLER
5d740d16fb NEW set payment method on paid ticket in cash desk 2020-03-11 17:42:30 +01:00
VESSILLER
e4c97f0b15 FIX user permission on ajax request getInvoice 2020-03-11 17:16:44 +01:00
Laurent Destailleur
4088553d61
Merge pull request #13321 from OPEN-DSI/new-takepos-product-sorted-by-label 
NEW add a parameter to sort product by label in cash desk
 2020-03-11 17:07:30 +01:00
Laurent Destailleur
40973cfca9
Merge pull request #13320 from OPEN-DSI/new-takepos-search-on-keycode 
New takepos search on keycode
 2020-03-11 17:07:03 +01:00
Laurent Destailleur
8609bf9c9c
Merge pull request #13318 from OPEN-DSI/new-takepos-payment-buttons 
NEW add icon on payment buttons in cash desk
 2020-03-11 17:06:04 +01:00
Laurent Destailleur
57440cc0dd
Merge pull request #13311 from OPEN-DSI/new-takepos-categories-sorted 
NEW categories and subcategories sorted by label in TakePOS
 2020-03-11 17:05:40 +01:00
VESSILLER
e95e182419 NEW only auto print paid ticket in cash desk 2020-03-11 16:53:27 +01:00
Laurent Destailleur
a25cf8448d
Merge pull request #13306 from andreubisquerra/develop 
Black head bar with Colorfull TakePOS theme
 2020-03-11 16:48:05 +01:00
Laurent Destailleur
27e32fc353
Merge pull request #13305 from andreubisquerra/master 
Move customer name to TakePOS headbar
 2020-03-11 16:42:32 +01:00
VESSILLER
fc4a98b29c NEW add const TAKEPOS_NUMPAD_USE_PAYMENT_ICON to use icons on payment buttons 2020-03-11 15:36:36 +01:00
VESSILLER
898007f0b4 NEW add global reduction in cash desk 2020-03-11 12:30:07 +01:00
VESSILLER
e4608a1ee5 FIX add only one product if no key code defined 2020-03-11 09:15:52 +01:00
VESSILLER
8f768c6eca NEW add a parameter to sort product by label in cash desk 2020-03-10 14:33:58 +01:00
VESSILLER
31e59bbe87 NEW add product if only one found 2020-03-10 14:18:39 +01:00
VESSILLER
cef2685368 NEW search on key code "enter" if defined in cash desk 2020-03-10 14:08:28 +01:00
VESSILLER
e2a918b9d2 FIX blank failure 2020-03-10 11:33:39 +01:00
VESSILLER
c707cef022 NEW add icon on payment buttons in cash desk 2020-03-10 11:20:15 +01:00
VESSILLER
07eda6a2c3 NEW categories and subcategories sorted by label (takepos) 2020-03-09 17:56:09 +01:00
VESSILLER
99d5b175c6 NEW no confirm discard ticket if paid 2020-03-09 17:40:32 +01:00
andreubisquerra
4d3e91fbc3
Black head bar with Colorfull TakePOS theme 2020-03-08 23:10:49 +01:00
andreubisquerra
5b7183efdd
Empty by default 2020-03-08 22:40:22 +01:00
jove@bisquerra.com
e71d312acd Customer name on TakePOS headbar 2020-03-08 22:33:56 +01:00
Laurent Destailleur
068f435146
Merge pull request #13302 from andreubisquerra/develop 
Avoid higher payments than remain in TakePOS
 2020-03-08 18:19:53 +01:00
andreubisquerra
2af9904c04
Avoid higher payments than remain in TakePOS 2020-03-07 22:56:43 +01:00
jove@bisquerra.com
73f7c8958b Remove unused variables in TakePOS 2020-03-07 22:07:20 +01:00
Laurent Destailleur
799e795871
Merge pull request #13242 from javierybar/develop 
NEW TakePOS numbering
 2020-03-02 23:27:26 +01:00
javierybar
8776880a12
Update terminal.php 2020-03-02 22:51:06 +01:00
javierybar
4aced13dbf
Update terminal.php 2020-03-02 22:47:12 +01:00
javierybar
9d869587cc
Update setup.php 2020-03-02 22:39:56 +01:00
andreubisquerra
ba543896d4
Fix Terminal popup in new head barTakePOS 2020-03-01 21:19:48 +01:00
javierybar
a4b01e3025
Update invoice.php 2020-03-01 19:47:27 +01:00
javierybar
9fabc7de81
Update setup.php 2020-03-01 19:46:53 +01:00
javierybar
c9b6c89861
Update terminal.php 2020-03-01 19:46:21 +01:00
Laurent Destailleur
1bc18931f8 Fix phpcs 2020-02-27 18:13:26 +01:00
Laurent Destailleur
2cfc62d753
Update invoice.php 2020-02-27 00:11:13 +01:00
javierybar
3fa55a59b7
New TAKEPOS_NUMBERING_PREFIX const 2020-02-26 22:45:32 +01:00
Laurent Destailleur
0fbde14b33 Clean syntax of code 2020-02-25 12:58:15 +01:00
Laurent Destailleur
16b3e6f7bb Move external access on dedicated tab 
Translate field to sort products
 2020-02-25 12:44:18 +01:00
Laurent Destailleur
ace5f2844a Make Setup of TakePOS faster with Ajax ON-Off Button. 2020-02-25 12:37:44 +01:00
VESSILLER
9cec0a254b Merge branch 'develop' of github.com:OPEN-DSI/dolibarr into new-takepos-add-product-on-key-enter 2020-02-25 08:37:28 +01:00
Laurent Destailleur
4fc3158962 Clean code 2020-02-24 20:20:09 +01:00
Laurent Destailleur
dfe6861241 Responsive 2020-02-24 19:42:21 +01:00
Laurent Destailleur
2e377112b5 Enhanc top bar of TakePOS (more similar than backoffice) 2020-02-24 19:24:38 +01:00
VESSILLER
73da62d842 NEW Add product on key "Enter" in search bar 2020-02-24 13:57:36 +01:00
Laurent Destailleur
f931b92d36 Merge branch 'new-takepos-batch-decrement' of 
https://github.com/OPEN-DSI/dolibarr into develop

# Conflicts:
#	htdocs/langs/en_US/errors.lang
 2020-02-23 22:49:03 +01:00
javierybar
fddcc844ff Add orders to Receipt Printers module 2020-02-22 11:30:48 +01:00
Laurent Destailleur
e4b00c5c20
Merge branch 'develop' into master 2020-02-21 18:20:10 +01:00
Scrutinizer Auto-Fixer
e44865d8b5 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-02-21 16:53:37 +00:00
VESSILLER
71c9b94b22 NEW add const CASHDESK_FORCE_DECREASE_STOCK to force batch decrementation 2020-02-21 11:08:34 +01:00
andreubisquerra
7200472427
Travis fix 2020-02-20 15:45:42 +01:00
javierybar
2942e85e47 More elegant and easy to understand printer setup 2020-02-20 15:16:17 +01:00
David Beniamine
1cd566f1ae
Merge tag 'develop' of https://github.com/Dolibarr/dolibarr into takepos-sort-product 2020-02-18 11:09:45 +01:00
Scrutinizer Auto-Fixer
5fda829023 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-01-30 00:48:28 +00:00
Laurent Destailleur
2ce3ea8234
Merge pull request #12953 from andreubisquerra/develop 
Wait search finished before add product with enter
 2020-01-29 11:05:26 +01:00
andreubisquerra
13ee716b78
Min. sell price updatereduction 2020-01-28 22:21:19 +01:00
andreubisquerra
691514be24
Min. sell price updateprice 2020-01-28 22:18:23 +01:00
andreubisquerra
0beb78a978
Min. sell price when updateprice 2020-01-28 22:14:13 +01:00
andreubisquerra
63af8594ab
Wait search finished before add product with enter 2020-01-28 21:22:25 +01:00
Laurent Destailleur
80707d6a5e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-28 17:24:26 +01:00
Laurent Destailleur
89e9b9391b Fix responsive 2020-01-27 02:26:07 +01:00
Laurent Destailleur
0271a43e80
Merge branch 'develop' into master 2020-01-27 02:17:14 +01:00
Laurent Destailleur
2d77765613 css 2020-01-27 02:11:37 +01:00
Laurent Destailleur
d4223c3d82 TakePOS can use the same CSS properties than app 2020-01-27 02:06:34 +01:00
Laurent Destailleur
42db2a33eb Fix phpcs 2020-01-27 01:52:35 +01:00
Laurent Destailleur
37f5922bf8 Fix conflict 2020-01-27 01:38:50 +01:00
andreubisquerra
a8656fe612 Travis fix 2020-01-27 01:36:31 +01:00
Laurent Destailleur
539348bbbb Responsive TakePOS with Bar. 2020-01-27 01:31:39 +01:00
Laurent Destailleur
08841d4475 Update receipt.php 2020-01-26 22:14:31 +01:00
Laurent Destailleur
eff9fae261 Update receipt.php 2020-01-26 22:14:27 +01:00
javierybar
cb0986db8b TakePOS price rounding 2020-01-26 22:14:11 +01:00
Laurent Destailleur
ce981e558c
Merge pull request #12921 from javierybar/develop 
TakePOS price rounding in receipt
 2020-01-26 22:13:42 +01:00
Laurent Destailleur
9a1051116e
Update receipt.php 2020-01-26 22:12:52 +01:00
Laurent Destailleur
3e8d2407c8
Update receipt.php 2020-01-26 22:12:26 +01:00
Laurent Destailleur
0f2141269a Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/supplier_proposal/class/supplier_proposal.class.php
 2020-01-25 14:43:57 +01:00
Laurent Destailleur
f2771b3365 FIX #12896 2020-01-25 14:23:23 +01:00
javierybar
c46f255408
TakePOS price rounding 2020-01-24 09:22:46 +01:00
Laurent Destailleur
e679e05f57 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-19 19:49:04 +01:00
andreubisquerra
98789c908e Colorful theme for TakePOS 2020-01-19 19:16:45 +01:00
andreubisquerra
83d1b673bb Visible receipt printer settings without stock module in TakePOS 2020-01-18 20:22:54 +01:00
andreubisquerra
3c1d789482 Visible receipt printer settings without stock module in TakePOS 2020-01-16 08:25:36 +01:00
Laurent Destailleur
97f62c68f2 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-08 13:38:03 +01:00
Laurent Destailleur
e3c56cea5f Fix missing lang 2020-01-07 14:19:41 +01:00
Laurent Destailleur
d5ad0180a0
Merge pull request #12786 from andreubisquerra/master 
TakePOS press 'ENTER' event
 2020-01-03 20:41:41 +01:00
Laurent Destailleur
afd32135f2 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/takepos/invoice.php
 2020-01-01 22:37:13 +01:00
Laurent Destailleur
2e8fd25299 FIX Local taxes was not correctly supported in TakePOS. 2020-01-01 21:54:47 +01:00
andreubisquerra
e005416189 If press enter add automatically the product. Widely used with barcodes. 2020-01-01 21:19:23 +01:00
Laurent Destailleur
fc49825eaa
Merge pull request #12659 from andreubisquerra/master 
NEW: Takepos supplements
 2019-12-30 22:07:19 +01:00
Laurent Destailleur
dd9f25b13a CSS 2019-12-22 16:33:15 +01:00
Laurent Destailleur
f44b85f557 Fix $_SESSION['newtoken'] must be newToken() 2019-12-18 23:12:31 +01:00
David Beniamine
305a821b62
TakePOS : setting to choose product field for sort 2019-12-16 17:33:45 +01:00
Laurent Destailleur
838633d0de Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/system/filecheck.php
	htdocs/api/class/api_setup.class.php
	htdocs/compta/facture/card.php
	htdocs/compta/stats/index.php
	htdocs/core/actions_massactions.inc.php
	htdocs/install/upgrade2.php
	htdocs/loan/card.php
	htdocs/loan/document.php
	htdocs/loan/info.php
	htdocs/loan/note.php
	htdocs/loan/schedule.php
	htdocs/product/list.php
	htdocs/ticket/card.php
	htdocs/user/class/user.class.php
 2019-12-14 14:53:49 +01:00
Frédéric FRANCE
12f84d8254
doxygen 2019-12-11 23:04:27 +01:00
andreubisquerra
acbd8efa7d NEW: Takepos supplements 2019-12-08 23:16:49 +01:00