Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
102,696 Commits 36 Branches 189 Tags
adda436dab9acc806ff33c5ea25e9f21df41f90d
Commit Graph

802 Commits

Author SHA1 Message Date
Laurent Destailleur
0aa7e7df88 Fix translation on ticket 2022-03-01 00:33:24 +01:00
Laurent Destailleur
49e3344a58 Fix link 2021-12-05 15:11:10 +01:00
Laurent Destailleur
305d8af76a Fix use a standard link insted of js to open a window. 2021-12-05 14:58:07 +01:00
andreubisquerra
bc6f38c556 TakePOS Direct Payment (Cash) Button doesn't work 2021-11-20 15:25:51 +01:00
Laurent Destailleur
f5a7275077 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/takepos/index.php
 2021-11-11 18:34:04 +01:00
Laurent Destailleur
a725ffefdd Fix sql error 2021-11-11 18:30:17 +01:00
Laurent Destailleur
ddad00c8e4 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/takepos/index.php
 2021-11-11 16:14:48 +01:00
Laurent Destailleur
f24c38db73 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/datapolicy/class/datapolicy.class.php
	htdocs/takepos/index.php
 2021-11-11 16:06:21 +01:00
lvessiller
33e40c12c8 FIX close cash with some terminals in TakePOS 2021-11-09 14:12:28 +01:00
lvessiller
ab4da186c5 FIX 2 columns for total labels 2021-10-12 15:52:59 +02:00
lvessiller
1788508963 FIX payment style and html5 tags 2021-10-12 14:11:19 +02:00
Laurent Destailleur
ed264182c6 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/admin/dict.php
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/product/card.php
	htdocs/takepos/receipt.php
 2021-09-30 16:28:42 +02:00
Laurent Destailleur
dbf7a9a0d0 FIX payment using wrong type in takepos when too many payment mode 2021-09-24 11:48:43 +02:00
Laurent De Coninck
70e66627fe restrict the html 2021-09-22 20:14:47 +02:00
Laurent De Coninck
5e2d8eac2b Allow to edit the header of receipt by using HTML 
In the current version the WYSIWYG oesn't allow any HTML by thus fix you
can use any button from the wysiwyg and it displays on the receipe.

[see: X]
 2021-09-20 22:51:43 +02:00
Laurent Dinclaux
c8af143468 Fix coding standards 2021-09-07 23:27:31 +11:00
Laurent Dinclaux
807b4bf93e Fix cash payment in some cases. Make pay requests language independant and rely on payment method code. 2021-09-07 22:42:17 +11:00
Laurent Dinclaux
a39f469a50 Only check takepos configuration if a terminal is choosen, to prevent error message 2021-09-07 22:31:09 +11:00
Laurent Destailleur
8485fee5f9 Cast numeric into on sql request 2021-08-23 19:33:24 +02:00
Laurent Destailleur
0d9cf07035 Show ref of invoice into tooltip 2021-07-13 14:07:35 +02:00
Laurent Destailleur
1380344fdb Fix PHP 8 2021-07-08 12:17:32 +02:00
Laurent Destailleur
9fc2d9fc03 Fix phpcs 2021-07-06 19:02:03 +02:00
Laurent Destailleur
61ed899608 Fix set discount on line in TakePos 2021-07-06 03:53:42 +02:00
Laurent Destailleur
61bd572a9c Fix token for ajax call 2021-06-17 03:37:52 +02:00
Laurent Destailleur
fb46ece906 Fix yogosha 6347 2021-06-09 15:36:47 +02:00
Laurent Destailleur
daababb97f Update index.php 2021-05-25 19:39:06 +02:00
jove@bisquerra.com
83245d321b FIX Search bug when hide product images 2021-05-23 09:55:01 +02:00
Laurent Destailleur
a22d3f8627 Merge pull request #17301 from andreubisquerra/master 
NEW More permission in TakePOS (Can edit added line, can modify once order sent to kitchen)
 2021-05-06 17:20:46 +02:00
Laurent Destailleur
18e911a636 FIX dol_print_date for %a and %b with some Timezone 2021-04-28 20:44:22 +02:00
Laurent Destailleur
d4651c4721 Fix trad 2021-04-28 18:32:49 +02:00
Laurent Destailleur
2dc597f5d0 Make setup easier to understand 2021-04-28 18:04:00 +02:00
Laurent Destailleur
2738985689 Fix translation 2021-04-28 17:53:05 +02:00
Laurent Destailleur
d9d7019de4 Clean page 2021-04-28 17:12:34 +02:00
Laurent Destailleur
3f7f166fb6 Make option label easier to understand. 2021-04-27 19:33:11 +02:00
jove@bisquerra.com
712e1c4e7c NEW Edit sales lines rights in TakePOS 2021-04-17 01:06:30 +02:00
andreubisquerra
88f95b7f9b Update index.php 2021-04-14 00:32:49 +02:00
jove@bisquerra.com
db83428e89 Notes improvements 2021-04-14 00:15:02 +02:00
Laurent Destailleur
8a62d97b89 Remove one thousand of useless files 2021-04-12 15:57:16 +02:00
Laurent Destailleur
12e847ade1 Fix color of reports. Fix include_once into include. 2021-04-06 22:18:32 +02:00
Laurent Destailleur
be6bb3a756 FIX #yogosha5746 - next step (work in progress) 2021-03-30 19:12:07 +02:00
Laurent Destailleur
50635cea89 With a shopping-cart, it is clearer what is the hour in top bar menu 2021-03-29 14:03:19 +02:00
Laurent Destailleur
a5034d44f7 $_POST war 2021-03-24 19:53:31 +01:00
Laurent Destailleur
ca1715df96 Add some protection for SQL injection 2021-03-22 13:31:06 +01:00
Laurent Destailleur
6a0e0f4c06 Fix #ygosha5698 2021-03-22 12:10:51 +01:00
Frédéric FRANCE
3b673d0acd fix nested comments 2021-03-20 09:28:21 +01:00
UT from dolibit
eedf76dd46 Update setup.php 
$help_url = 'EN:Module_Point_of_sale_(TakePOS)';

llxHeader('', $langs->trans("CashDeskSetup"), $help_url);
 2021-03-16 16:40:25 +01:00
Laurent Destailleur
619df7bf23 Use internal linke 2021-03-14 17:18:04 +01:00
Laurent Destailleur
12f50a76d7 Fix yogosha #5627 2021-03-14 11:48:39 +01:00
Frédéric FRANCE
ebfba19778 code syntax s... t.. dir 2021-02-26 21:17:52 +01:00
Nicolas
0c424db506 Correct stickler 2021-02-24 16:03:24 +01:00