lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
121,269 Commits 43 Branches 150 Tags 886 MiB
add_rest_api_region
Commit Graph

1116 Commits

Author SHA1 Message Date
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
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
Nicolas
589c757fbf Correct stickler 2021-02-24 15:57:33 +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
026259ebd7 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/ajax.lib.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/product/fournisseurs.php
 2021-02-15 13:12:27 +01:00
Laurent Destailleur
f4c23654f8 FIX #16275 #15604 2021-02-14 22:44:04 +01:00
Laurent Destailleur
408aefd46c FIX vat value when code contains number 2021-02-10 01:10:31 +01:00
Frédéric FRANCE
f394e55ade
deprecate non camelCaps functions 2021-02-09 10:26:17 +01:00
Laurent Destailleur
fd3354142b Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/categories/viewcat.php
 2021-02-06 01:17:05 +01:00
ptibogxiv
4477578766
FIX takepos : load date function 
fix loading dol_get_first_hour()
 2021-02-05 17:30:41 +01:00
Laurent Destailleur
6e7e8d7d36 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	test/phpunit/CodingPhpTest.php
 2021-02-03 23:26:08 +01:00
Laurent Destailleur
c3b409df31 Fix do not use CURDATE() 2021-02-03 23:18:44 +01:00
Laurent Destailleur
e89cc08ffa Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-02-03 23:04:50 +01:00
Laurent Destailleur
91c594a66a Fix syntax error 2021-02-03 23:03:47 +01:00
Laurent Destailleur
f301635681 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formmail.class.php
 2021-02-03 21:02:32 +01:00
Laurent Destailleur
787e03a10d Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/core/class/html.formmail.class.php
 2021-02-03 20:46:22 +01:00
ptibogxiv
3132877349
FIX cash fence for takepos with multientity 2021-02-02 23:09:23 +01:00
Laurent Destailleur
452aea1d8b Fix bad test 2021-01-23 17:59:56 +01:00
Laurent Destailleur
dd69aed27b Fix error test 2021-01-23 17:49:08 +01:00
andreubisquerra
b6d8a81ae8
Fix special chars in free text with TakePOS 
Sending the description with the post method avoid chars problems
 2021-01-15 18:12:55 +01:00
jove@bisquerra.com
087978cf69 Improve free zone saving in TakePOS 2021-01-06 22:08:53 +01:00
Laurent Destailleur
f16be78167 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/admin/limits.php
	htdocs/takepos/invoice.php
 2021-01-02 15:49:30 +01:00
Laurent Destailleur
d46eb08083 More log and use id to refresh/reload an invoice. 2021-01-02 15:36:19 +01:00
Laurent Destailleur
60d1b08f84 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/compta/paiement/class/paiement.class.php
	htdocs/takepos/invoice.php
 2020-12-30 22:58:40 +01:00
Laurent Destailleur
65edc377c3 FIX Visible date of payment 2020-12-30 22:53:21 +01:00
Laurent Destailleur
79da047802 FIX Dates of sales start in TakePOS 
Conflicts:
	htdocs/langs/en_US/cashdesk.lang
 2020-12-30 21:46:40 +01:00
Laurent Destailleur
6ef7d3db79 FIX Dates of sales start in TakePOS 2020-12-30 21:43:04 +01:00
Laurent Destailleur
255b943b99 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/takepos/invoice.php
 2020-12-30 21:25:02 +01:00
Laurent Destailleur
1ec763fc14 FIX When creating a new POS sell, the creation date must be modified. 2020-12-30 21:22:54 +01:00
jove@bisquerra.com
ba4f6c5a6b FIX Open Drawer with new TakePOS connector 2020-12-19 22:28:16 +01:00
Laurent Destailleur
cad93fd585 Fix stock popup when line is not a predefined product on TakePOS 2020-12-07 22:26:08 +01:00
ptibogxiv
b3fe38d6bb
Fix list current ticket in takepos with multicompany 2020-12-06 14:20:16 +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
e7adde4019 css 2020-12-03 23:50:45 +01:00
Laurent Destailleur
701d7668a5
Merge pull request #15617 from teleassist/teleassist-takepos-numpadLabelsForIcons 
NEW Takepos - Add labels to icons in Numpad
 2020-12-03 14:32:02 +01:00
Laurent Destailleur
1f58b49aea
No xml inside HTML 2020-12-03 14:31:39 +01:00
teleassist
b75a5f596e Merge branch 'teleassist-takepos-numpadLabelsForIcons' of https://github.com/teleassist/dolibarr into teleassist-takepos-numpadLabelsForIcons 2020-12-03 10:13:55 +01:00
teleassist
f6adb6ae55
Update pay.php 
Always show labels with payment icons
 2020-12-03 10:12:03 +01:00
teleassist
450b04c1ad Revert "Add TAKEPOS_NUMPAD_FORCE_PAYMENT_ICONS_LABELS" 
This reverts commit 7e9a12a2f8.
 2020-12-03 10:04:28 +01:00
stickler-ci
87ee62c2ff Fixing style errors. 2020-12-02 08:54:33 +00:00
teleassist
dd2d5259de
Add icons labels for payment buttons 
Add labels to icons when TAKEPOS_NUMPAD_FORCE_PAYMENT_ICONS_LABELS is set
 2020-12-02 09:46:53 +01:00
teleassist
0730cab90f
Add class for icons labels 2020-12-02 09:38:30 +01:00
teleassist
7e9a12a2f8
Add TAKEPOS_NUMPAD_FORCE_PAYMENT_ICONS_LABELS 
Add option TAKEPOS_NUMPAD_FORCE_PAYMENT_ICONS_LABELS to show labels at the bottom of payment icons of the numpad
 2020-12-02 09:19:18 +01:00
Laurent Destailleur
c215764627 Fix phpcs 2020-12-01 15:45:19 +01:00
Laurent Destailleur
3538e485a8 Fix phpunit 2020-12-01 11:38:46 +01:00
Laurent Destailleur
e689df8359 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/commande/list.php
	htdocs/takepos/invoice.php
	htdocs/user/list.php
 2020-12-01 10:04:51 +01:00
Scrutinizer Auto-Fixer
6df4954b20 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-12-01 01:41:19 +00:00
Laurent Destailleur
7870a33fd3
Update invoice.php 2020-11-30 15:39:35 +01:00
stickler-ci
9ee37153f7 Fixing style errors. 2020-11-30 10:32:58 +00:00
teleassist
560194c3b9
FIX #15374 : "New" doesn't clear total amounts 
Invoice's total amounts where not updated because of direct lines deleting in database.
 2020-11-30 11:22:49 +01:00
Laurent Destailleur
7e6af6a54f FIX translation not loaded for error message of numbering modules 2020-11-28 02:09:27 +01:00
andreubisquerra
f6eadbbc3f
Order receipt improvements in TakePOS 2020-11-24 21:48:08 +01:00
andreubisquerra
8aa2ca3489
NEW TakePOS occupied tables visualitzation 2020-11-23 12:51:19 +01:00
Laurent Destailleur
af2eabb24d Fix warning 2020-11-22 15:06:53 +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
lvessiller
8de5925f8b FIX remove LOG_ERR in syslog 2020-11-18 14:32:11 +01:00
lvessiller
3048a16b42 NEW log sale without lines as error in cash desk 2020-11-17 10:11:58 +01:00
andreubisquerra
5e7f1a545e
Fix travis 2020-11-12 22:50:46 +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
jove@bisquerra.com
43ced3c681 Credit note improvement in TakePOS 2020-11-10 21:45:15 +01:00
Scrutinizer Auto-Fixer
ab25e047c0 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-10-31 17:51:30 +00: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
Scrutinizer Auto-Fixer
a2a9c51e50 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-10-27 18:46:07 +00:00
javierybar
d23b6e145a
Fixes 2020-10-25 20:24:17 +01:00
javierybar
a66be11e71
Update index.php 2020-10-25 20:06:50 +01:00
javierybar
81ed97c9ba
NEW Credit invoice in TakePOS 2020-10-25 20:03:25 +01:00
Laurent Destailleur
d042562996 Disable browser notification on public pages 2020-10-25 13:48:08 +01:00
Frédéric FRANCE
9a470fa42d
replace deprecated 2020-10-22 22:50:03 +02:00
Laurent Destailleur
30d39f890c
Merge pull request #15054 from ptibogxiv/patch-387 
NEW display date range if exist in takepos
 2020-10-22 17:16:46 +02:00
ptibogxiv
7e8891bef9
NEW display date range if exist in takepos 
usefull for membership via POS (ie use in adherentsplus before pushing in core)
 2020-10-18 12:40:10 +02:00
jove@bisquerra.com
1283c6e095 TakePOS connector compatibility with templates 2020-10-18 09:29:33 +02:00
Laurent Destailleur
7a7e1ad7cf CSS 2020-10-16 00:29:35 +02:00
Laurent Destailleur
69432284d0
Merge pull request #14999 from andreubisquerra/master 
NEW: Add third order printer to TakePOS
 2020-10-13 11:03:41 +02:00
Laurent Destailleur
64e20959f6 Fix bad link 2020-10-13 11:00:56 +02:00
andreubisquerra
d80931429e
Fix travis 2020-10-12 22:34:05 +02:00
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