Commit Graph

1145 Commits

Author SHA1 Message Date
Laurent Destailleur
f2cd7a7a56 Removed the div class="ficheaddleft" 2021-10-24 00:37:37 +02:00
Scrutinizer Auto-Fixer
f7a41f1848 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2021-10-23 20:22:10 +00:00
Laurent Destailleur
02aae5144d Merge pull request #19151 from andreubisquerra/develop
BUG Supplements is not showed from TakePOS
2021-10-23 18:24:56 +02:00
andreubisquerra
6b45d68f83 Close cash with some terminals in TakePOS 2021-10-23 17:51:07 +02:00
andreubisquerra
5fe516770e Supplements BUG 2021-10-23 16:59:25 +02:00
andreubisquerra
a95a99afef TakePOS Split Sale fixes and improvements 2021-10-23 11:59:40 +02:00
lvessiller
d71d33939b NEW max terminals number on cash desk setup 2021-10-21 14:17:23 +02:00
Laurent Destailleur
f8010dfcbc Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	ChangeLog
	htdocs/reception/list.php
	htdocs/takepos/pay.php
2021-10-16 13:01:03 +02:00
lvessiller
ab4da186c5 FIX 2 columns for total labels 2021-10-12 15:52:59 +02:00
Laurent Destailleur
605aea62ca FIX TAKEPOS_CAN_FORCE_BANK_ACCOUNT_DURING_PAYMENT #18957 2021-10-12 15:25:44 +02:00
lvessiller
1788508963 FIX payment style and html5 tags 2021-10-12 14:11:19 +02:00
Laurent Destailleur
dc7143cb77 Merge pull request #18919 from OPEN-DSI/new-takepos-receipt-free-label
NEW print without details
2021-10-11 11:23:54 +02:00
andreubisquerra
be60293554 Travis fix 2021-10-10 08:58:17 +02:00
andreubisquerra
92756e1864 Improve public note 2021-10-09 23:48:35 +02:00
lvessiller
da52ee55a4 FIX sickler-ci errors 2021-10-07 10:13:30 +02:00
lvessiller
cc21257e3e NEW print without details 2021-10-07 09:51:55 +02:00
Alexandre SPANGARO
7f47df6ea4 HTML5 - <font> tag is deprecated, replace by <span> 2021-10-05 11:44:48 +02:00
Laurent Destailleur
d064ab2b17 Add more action to GET action to check 2021-10-02 12:58:15 +02:00
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