Commit Graph

827 Commits

Author SHA1 Message Date
Laurent Destailleur
673a2982a5 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/opensurvey/card.php
2021-09-30 16:32:40 +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
37603b451a Fix token in url 2021-09-27 12:24:01 +02:00
Laurent Destailleur
0176ab6057 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
2021-09-27 11:40:47 +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 Destailleur
deb1965cd5 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/comm/action/card.php
	htdocs/compta/paiement/list.php
	htdocs/core/class/commonobject.class.php
	htdocs/mrp/mo_list.php
	htdocs/projet/tasks/task.php
	htdocs/public/payment/newpayment.php
2021-09-20 17:15:12 +02:00
Laurent Destailleur
1d597e8a72 Fix add unset* action as sensible GET actions 2021-09-19 18:03:38 +02:00
Laurent Destailleur
6810bbf3bb css 2021-09-10 14:28:38 +02:00
Laurent Destailleur
5de3d7d5d2 Clean var not initialized 2021-09-09 03:49:07 +02:00
Laurent Destailleur
7533092f27 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2021-09-09 03:42:12 +02:00
Laurent Destailleur
88cd9afe84 Merge pull request #18643 from Gecka-Apps/14-takepos-fast-product-search
TakePos - fast product search
2021-09-09 03:37:52 +02:00
Laurent Destailleur
66a7992441 Fix var init 2021-09-09 03:34:51 +02:00
Laurent Dinclaux
5ee51f965e Fixes coding standard 2021-09-08 00:12:55 +11:00
Laurent Dinclaux
303313b168 Takepos: set proper image directly when searching products
Bypasses genimg/index.php that either redirects to viewimage.php or to nophoto.png. That was making lots of request to the server and excessive load on the database server, that queues them slowing down the UI.
2021-09-08 00:02:27 +11:00
Laurent Dinclaux
10780a343e TakePos: add temporization when searching products.
Adds a temporization after each typed letter, giving the user 700ms to type next letter before sending the search request
It prevents hammering the server for each typed letter and "results jumping" effect, which is error-prone.
2021-09-07 23:48:30 +11: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
0d6296e417 Merge pull request #18539 from GurvanKervern/undef4
Undef4
2021-09-05 01:57:16 +02:00
Laurent Destailleur
f79b883a4a Update invoice.php 2021-09-05 01:57:05 +02:00
Laurent Destailleur
7ca855d192 Update invoice.php 2021-09-02 21:14:01 +02:00
Gurvan Kervern
1061a9f9fe Update invoice.php 2021-09-03 01:27:43 +08:00
Laurent Destailleur
d2d7b0defd Fix duplicate ; 2021-08-31 20:15:41 +02:00
stickler-ci
6417d3ddf7 Fixing style errors. 2021-08-29 14:48:25 +00:00
GurvanKervern
ebd1b49d2a Fix undef 4-1
PHP8 warnings
2021-08-29 22:41:22 +08:00
Laurent Destailleur
3d72a21396 Clean code 2021-08-28 03:09:41 +02:00
Laurent Destailleur
3b6559b1a6 Clean code by adding cast int. 2021-08-27 18:53:45 +02:00
Laurent Destailleur
22339a3ed3 Merge pull request #18451 from cfoellmann/PR/form-buttons-function
improve forms - buttonsSaveCreate()
2021-08-24 15:26:03 +02:00
Laurent Destailleur
169282c82b Merge pull request #18458 from andreubisquerra/develop
NEW Split Sale in TakePOS
2021-08-24 14:51:08 +02:00
Laurent Destailleur
dc006b0ebb Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/html.form.class.php
2021-08-23 19:44:02 +02:00
Laurent Destailleur
8485fee5f9 Cast numeric into on sql request 2021-08-23 19:33:24 +02:00
andreubisquerra
c4075605da CSS 2021-08-21 22:31:03 +02:00
andreubisquerra
fc06c557c2 New split.php 2021-08-21 22:30:13 +02:00
andreubisquerra
f020a7dba2 Update index.php 2021-08-21 22:29:18 +02:00
Christian Foellmann
d706c3b1ec use Forms::buttonsSaveCreate() to generate most of the Save|Cancel forms combination 2021-08-20 14:41:30 +02:00
Laurent Destailleur
60c9a882f1 Code comment 2021-08-18 22:15:20 +02:00
Laurent Destailleur
88ccaeb13f Help setup 2021-08-17 05:08:15 +02:00
andreubisquerra
ea531a4c88 Customer display settings 2021-08-08 19:16:11 +02:00
andreubisquerra
8a513ea468 Customer display on addline 2021-08-08 19:15:18 +02:00
andreubisquerra
bae5b39706 Customer display on click product 2021-08-08 19:14:28 +02:00
andreubisquerra
49b53e04f4 Customer Display total on pay 2021-08-08 19:13:31 +02:00
Laurent Destailleur
841176fdfd Fix set cookie with tag "secure" when https is forced. 2021-08-04 14:38:05 +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