Commit Graph

182 Commits

Author SHA1 Message Date
Frédéric FRANCE
ebfba19778 code syntax s... t.. dir 2021-02-26 21:17:52 +01:00
Nicolas
49c0967a3e NEW option for Takepos to show the total price without tax 2021-02-24 15:48:15 +01:00
Laurent Destailleur
dd69aed27b Fix error test 2021-01-23 17:49:08 +01:00
Laurent Destailleur
6b0092c30a Several minor bugfixes. Hide option TAKEPOS_NUMPAD_USE_PAYMENT_ICON. 2020-12-04 00:58:51 +01:00
Laurent Destailleur
7e6af6a54f FIX translation not loaded for error message of numbering modules 2020-11-28 02:09:27 +01:00
Laurent Destailleur
60bfbe2e57 Merge pull request #15448 from Givriz/dev
Feature : creation of a "button-save" class
2020-11-21 23:44:30 +01:00
andreubisquerra
d24ac5109d FIX TakePOS order_notes extrafield 2020-11-20 18:40:04 +01:00
Givriz
c48129e279 Ajout de la class "button-save"
Ajout de cette class sur les boutons pour pour cloturer une issue ouverte (feature)
2020-11-19 20:23:38 +01:00
jove@bisquerra.com
a5ffac1935 Compatibility with new TakePOS connector 2020-11-12 22:31:32 +01:00
Laurent Destailleur
e68284871b Update receipt.php 2020-11-12 12:44:34 +01:00
jove@bisquerra.com
71f09dc2d8 Update receipt tab in TakePOS 2020-11-11 21:51:32 +01:00
Scrutinizer Auto-Fixer
7f52920716 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-31 13:32:18 +00:00
Frédéric FRANCE
9a470fa42d replace deprecated 2020-10-22 22:50:03 +02:00
jove@bisquerra.com
1283c6e095 TakePOS connector compatibility with templates 2020-10-18 09:29:33 +02:00
jove@bisquerra.com
54f9ed6346 NEW: Add third order printer to TakePOS 2020-10-12 22:07:05 +02:00
Laurent Destailleur
f442dac2c9 Add token on most GET url for admin action 2020-09-30 15:13:28 +02:00
Laurent Destailleur
a16788f753 Fix syntax error 2020-09-24 00:06:02 +02:00
Laurent Destailleur
bfbb217607 Fix GETPOST on 'action' 2020-09-16 19:39:50 +02:00
jove@bisquerra.com
e55c16c039 NEW Weighing Scale compatibility with TakePOS connector 2020-09-13 21:12:14 +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
5c1680e9c5 Merge branch 'develop' into master 2020-08-27 19:58:29 +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
88c07e86ad Organization of setup for Takepos bar features 2020-08-13 13:46:53 +02:00
jove@bisquerra.com
3be723f3a1 NEW: Delayed payment in TakePOS 2020-08-11 07:49:54 +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
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
Laurent Destailleur
4f1ac84a19 Fix can't find link to edit table plan 2020-06-30 12:07:24 +02:00
Laurent Destailleur
9c23890c26 Fix phpcs 2020-06-24 20:03:12 +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
VESSILLER
f010184008 FIX replace filter parameter "none" by "restricthtml" 2020-06-08 11:48:31 +02:00
VESSILLER
81fbb80823 FIX end div for responsive table 2020-06-05 14:20:38 +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