Alexandre SPANGARO
|
d88647f574
|
Page name in description
|
2022-08-27 05:39:27 +02:00 |
|
Alexandre SPANGARO
|
c2d87ad75c
|
TakePos - Use isModEnabled
|
2022-08-26 17:03:20 +02:00 |
|
Frédéric France
|
582f6b196e
|
use isModEnabled
|
2022-08-23 20:02:37 +02:00 |
|
Frédéric France
|
4bef0f5745
|
use isModEnabled
|
2022-08-23 20:01:34 +02:00 |
|
Laurent Destailleur
|
6f34072a27
|
Merge pull request #21806 from frederic34/patch-5
fix php8 warnings
|
2022-08-22 10:50:59 +02:00 |
|
Laurent Destailleur
|
301d14d58e
|
Merge pull request #21824 from ptibogxiv/patch-40
Fix hook in takepos/pay.php
|
2022-08-22 10:42:26 +02:00 |
|
Laurent Destailleur
|
0258da808c
|
FIX MVC and missing http header in TakePOS
|
2022-08-22 01:56:19 +02:00 |
|
Laurent Destailleur
|
8e15f95890
|
Fix missing llxHeader()
|
2022-08-22 00:04:04 +02:00 |
|
ptibogxiv
|
c582f060ec
|
Fix hook in takepos.pay.php
|
2022-08-21 12:28:00 +02:00 |
|
Frédéric FRANCE
|
7f60a34799
|
use isModEnabled
|
2022-08-19 18:07:21 +02:00 |
|
Laurent Destailleur
|
8557257a37
|
Merge pull request #21720 from altairisfr/takepospay
NEW : TakePOS - add hook to complete payment
|
2022-08-12 00:12:33 +02:00 |
|
Christophe Battarel
|
1faa9d8231
|
add hook to complete payment
|
2022-08-11 16:29:55 +02:00 |
|
Christophe Battarel
|
c14d7a93f9
|
NEW : add margin infos to takepos invoice lines
|
2022-08-11 16:01:29 +02:00 |
|
ptibogxiv
|
852dc909aa
|
NEW add hook un takepos/pay.php
add hook for new payment method
|
2022-08-04 14:46:20 +02:00 |
|
Laurent Destailleur
|
514b216864
|
Merge pull request #21588 from altairisfr/termname
NEW : TAKEPOS - setup terminal name
|
2022-08-03 18:34:16 +02:00 |
|
Laurent Destailleur
|
42e0e1b978
|
Merge pull request #21580 from altairisfr/takeposhook
TAKEPOS : better hook management
|
2022-08-03 18:24:13 +02:00 |
|
Christophe Battarel
|
4b3fdcc9f6
|
use getDolGlobal...
|
2022-07-28 17:36:58 +02:00 |
|
Christophe Battarel
|
0fe441bc2a
|
use getDolGlobal...
|
2022-07-28 17:29:09 +02:00 |
|
ptibogxiv
|
524c2e932c
|
NEW display currency in takepos menu
|
2022-07-28 13:35:43 +02:00 |
|
Christophe Battarel
|
fd6838776f
|
NEW : TAKEPOS - setup terminal name
|
2022-07-27 11:09:02 +02:00 |
|
Christophe Battarel
|
3e930f92b8
|
add reshook test
|
2022-07-26 15:47:03 +02:00 |
|
Christophe Battarel
|
0c416a1e38
|
better hook management
|
2022-07-26 15:38:50 +02:00 |
|
jove@bisquerra.com
|
46f7c8cad5
|
Eliminate double checking if it is sent to the kitchen
|
2022-07-11 20:37:42 +02:00 |
|
Laurent Destailleur
|
e48fa05f9c
|
Merge pull request #21175 from altairis-melina/parameters
NEW : TAKEPOS-Add setup parameters
|
2022-07-11 01:54:27 +02:00 |
|
Laurent Destailleur
|
a7515cb620
|
Merge pull request #21227 from ptibogxiv/patch-454
NEW support of Stripe Terminal with Takepos
|
2022-07-10 19:34:39 +02:00 |
|
Laurent Destailleur
|
ca42be7478
|
Fix error management
|
2022-07-07 22:46:06 +02:00 |
|
Laurent Destailleur
|
f6a39383d3
|
Fix error management
|
2022-07-07 22:35:56 +02:00 |
|
Frédéric France
|
889856d55f
|
use getDolGlobalString
|
2022-06-21 23:39:31 +02:00 |
|
Frédéric France
|
9f32100fef
|
Merge remote-tracking branch 'upstream/develop' into useismodenabled
|
2022-06-21 20:27:57 +02:00 |
|
Frédéric France
|
1f7fc7a2ae
|
getDolGlobalString
|
2022-06-21 20:25:25 +02:00 |
|
ptibogxiv
|
87f98b5bcb
|
Update pay.php
|
2022-06-12 21:44:17 +02:00 |
|
ptibogxiv
|
627f346933
|
Update pay.php
|
2022-06-12 21:40:21 +02:00 |
|
ptibogxiv
|
348fb8e9f2
|
Stripe Terminal
|
2022-06-12 21:34:35 +02:00 |
|
Laurent Destailleur
|
58ac0f61a5
|
Merge pull request #21161 from altairis-melina/freezone
NEW : TAKEPOS - Use constant TAKEPOS_CHANGE_PRICE_HT for freezone
|
2022-06-12 19:07:28 +02:00 |
|
stickler-ci
|
fb3f2698ae
|
Fixing style errors.
|
2022-06-09 08:46:46 +00:00 |
|
melina
|
9ad5553c47
|
Add setup parameters
|
2022-06-08 17:56:11 +02:00 |
|
Laurent Destailleur
|
ec52502089
|
CSS Makes clear you have to click OK.
|
2022-06-08 02:55:45 +02:00 |
|
melina
|
1cf8b3421f
|
add constant for freezone
|
2022-06-07 17:46:17 +02:00 |
|
andreubisquerra
|
9343e1d503
|
TakePOS without bank accounts index.php
|
2022-06-06 06:46:42 +02:00 |
|
andreubisquerra
|
a53e3ca3f3
|
TakePOS without bank accounts invoice.php
|
2022-06-06 06:45:25 +02:00 |
|
andreubisquerra
|
1f09151a25
|
TakePOS without bank account pay.php
|
2022-06-06 06:44:15 +02:00 |
|
Laurent Destailleur
|
bfd5ed3281
|
Trans
|
2022-06-03 02:31:09 +02:00 |
|
andreubisquerra
|
0489e51cc0
|
Avoid AutoPrint in TakePOS history
|
2022-05-31 08:39:48 +02:00 |
|
Laurent Destailleur
|
536f888ba2
|
Fix search hook in takepos
|
2022-05-24 12:59:27 +02:00 |
|
Laurent Destailleur
|
b8764c4804
|
Doc
|
2022-05-24 12:48:48 +02:00 |
|
Laurent Destailleur
|
5534284d9b
|
css
|
2022-05-24 12:36:11 +02:00 |
|
Christophe Battarel
|
179716ac00
|
add constant to hide stock on cart
|
2022-05-17 09:17:36 +02:00 |
|
Laurent Destailleur
|
3271522971
|
Merge pull request #20790 from altairis-melina/empty_search
NEW : TakePos - Empty search results when emptying search term
|
2022-05-10 11:42:00 +02:00 |
|
Laurent Destailleur
|
bfa19bc065
|
Merge pull request #20797 from altairis-melina/hookaddline
add hook for takepos addline
|
2022-05-10 11:41:22 +02:00 |
|
melina
|
0ac89a5eae
|
test reshook
|
2022-05-09 08:23:26 +02:00 |
|
stickler-ci
|
a12c0f6dbf
|
Fixing style errors.
|
2022-05-08 18:33:23 +00:00 |
|
Laurent Destailleur
|
c718b86f9b
|
Update index.php
|
2022-05-08 20:28:37 +02:00 |
|
Laurent Destailleur
|
4779b8d3e1
|
Merge branch 'develop' into categorydescription
|
2022-05-08 20:26:48 +02:00 |
|
melina
|
7747489259
|
add hook for takepos addline
|
2022-05-06 15:49:44 +02:00 |
|
melina
|
5a76385d91
|
add hook for cart display
|
2022-05-06 11:34:05 +02:00 |
|
melina
|
bfab24f848
|
merge develop
|
2022-05-06 10:32:12 +02:00 |
|
Laurent Destailleur
|
81b30d584b
|
Merge branch 'develop' into completeJSProductDisplay
|
2022-05-04 01:18:43 +02:00 |
|
melina
|
3c85577d91
|
fix parameter oh hook
|
2022-05-03 09:52:20 +02:00 |
|
melina
|
ce56dc132c
|
add missing class
|
2022-05-03 09:44:18 +02:00 |
|
melina
|
ed6eeb3533
|
add hook doaction in takepos invoice
|
2022-05-03 09:35:06 +02:00 |
|
melina
|
7063b7cdb8
|
fix missing line in PR
|
2022-05-02 08:37:37 +02:00 |
|
Laurent Destailleur
|
316ef3371d
|
Fix phpcs
|
2022-04-29 19:30:04 +02:00 |
|
Laurent Destailleur
|
498c6a4804
|
Merge branch 'develop' into productinstock
|
2022-04-29 18:52:46 +02:00 |
|
Laurent Destailleur
|
18f1539015
|
Merge pull request #20671 from Easya-Solutions/fix-takepos-barcode-rule-get-const
FIX get TAKEPOS_BARCODE_RULE_TO_INSERT_PRODUCE const in TakePos
|
2022-04-29 18:51:02 +02:00 |
|
Laurent Destailleur
|
62529bbf1e
|
Merge pull request #20678 from altairis-melina/completeAjaxReturnArray
NEW : TakePos - add hooks to complete ajax return array
|
2022-04-29 18:17:47 +02:00 |
|
Laurent Destailleur
|
2da48cea0b
|
Update ajax.php
|
2022-04-29 18:16:48 +02:00 |
|
Laurent Destailleur
|
d00a4baeab
|
Merge pull request #20687 from fred1201/fred01dev
Fix display in take post when special caracter are store in database
|
2022-04-29 18:02:49 +02:00 |
|
Laurent Destailleur
|
bc03658f18
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
|
2022-04-29 16:42:43 +02:00 |
|
Laurent Destailleur
|
fbfb003c9b
|
Merge pull request #20731 from altairisfr/fixtakepos
FIX TakePos - fix select fields
|
2022-04-29 16:30:20 +02:00 |
|
Laurent Destailleur
|
3dd90ecf41
|
js escape
|
2022-04-29 16:02:05 +02:00 |
|
Laurent Destailleur
|
cc55b4444f
|
Merge pull request #20746 from altairisfr/pagin
NEW TakePos - pagination on search results
|
2022-04-29 15:59:50 +02:00 |
|
Laurent Destailleur
|
bdd9b2acf4
|
Clean css
|
2022-04-29 12:36:38 +02:00 |
|
Christophe Battarel
|
d682cb3103
|
please Travis
|
2022-04-29 11:09:32 +02:00 |
|
Christophe Battarel
|
812b9adee7
|
still trying to please Travis... losing my time
|
2022-04-29 10:58:04 +02:00 |
|
melina
|
407efccd55
|
Merge branch 'productinstock' of github.com-melina:altairis-melina/dolibarr into productinstock
|
2022-04-29 10:44:15 +02:00 |
|
melina
|
6d79d03cb2
|
add comment to fix stickler
|
2022-04-29 10:43:35 +02:00 |
|
Christophe Battarel
|
a11b5b4399
|
escape sql string for my Travais friend
|
2022-04-29 10:12:53 +02:00 |
|
Christophe Battarel
|
fb076a9282
|
FIX pagination on search results
|
2022-04-29 10:00:25 +02:00 |
|
Christophe Battarel
|
78f46bb98b
|
search next or previous page of products if asked
|
2022-04-29 09:49:10 +02:00 |
|
Christophe Battarel
|
accb900d4f
|
ajax load only one page of search results
|
2022-04-29 09:45:36 +02:00 |
|
Christophe Battarel
|
729d1f57aa
|
fix select fields
|
2022-04-28 10:53:16 +02:00 |
|
melina
|
f634d7e503
|
fix commit
|
2022-04-28 08:42:44 +02:00 |
|
melina
|
0c8a6bd6f0
|
fix commit
|
2022-04-28 08:39:02 +02:00 |
|
fred1201
|
d9521d40e4
|
Update index.php
Replace call function
text( ) by html() to fix display in take post when spécial caracter are store in database:
éèà become éàè
|
2022-04-21 07:39:51 +02:00 |
|
melina
|
5cb114df61
|
fix empty search
|
2022-04-20 17:46:16 +02:00 |
|
melina
|
db3edba578
|
Delete comments
|
2022-04-20 14:51:55 +02:00 |
|
melina
|
c23ed7c47b
|
Add hooks completeJSProductDisplay
|
2022-04-20 14:47:36 +02:00 |
|
melina
|
6788cd179c
|
Add hooks completeAjaxReturnArray
|
2022-04-20 12:01:17 +02:00 |
|
altairis-melina
|
ea2e1c0ff2
|
Merge branch 'develop' into productinstock
|
2022-04-20 09:59:10 +02:00 |
|
melina
|
0faec59f56
|
FIX conflict and integrate Lionel fix
|
2022-04-20 08:13:01 +02:00 |
|
lvessiller
|
68cfe61fb8
|
FIX get TAKEPOS_BARCODE_RULE_TO_INSERT_PRODUCE const in TakePos
|
2022-04-19 17:59:59 +02:00 |
|
lmarcouiller
|
c90d758b0f
|
New : add of unique(entity,label)
|
2022-04-14 11:06:54 +02:00 |
|
Laurent Destailleur
|
1f73f19ff7
|
php8
|
2022-04-08 00:42:39 +02:00 |
|
andreubisquerra
|
7f4e71f66f
|
Comments
|
2022-03-31 21:43:48 +02:00 |
|
andreubisquerra
|
e46541708c
|
Avoid grouping lines with ordered lines
|
2022-03-30 17:49:54 +02:00 |
|
Laurent Destailleur
|
35c57988a0
|
Responsive
|
2022-03-26 20:06:50 +01:00 |
|
lvessiller
|
1db60116e1
|
FIX search bracode rule and avoid undefined quantity on search in takepos
|
2022-03-24 18:02:32 +01:00 |
|
andreubisquerra
|
3715659880
|
Set to default place after close sale in TakePOS
Set to default place after close sale in TakePOS when Bar Restaurant mode is enabled
|
2022-03-06 12:27:59 +01:00 |
|
Laurent Destailleur
|
893e1571b8
|
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2022-03-04 22:43:35 +01:00 |
|
Laurent Destailleur
|
c45d6a3bc7
|
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
|
2022-03-04 19:45:02 +01:00 |
|
Laurent Destailleur
|
0aa7e7df88
|
Fix translation on ticket
|
2022-03-01 00:33:24 +01:00 |
|
lvessiller
|
0d68846b3a
|
FIX add filter on categories
|
2022-02-09 17:44:48 +01:00 |
|
lvessiller
|
25497018c7
|
FIX group by qty in update line
|
2022-02-09 16:49:40 +01:00 |
|
lvessiller
|
44e9b13f30
|
NEW barcode rule to insert product in takepos
|
2022-02-09 16:37:41 +01:00 |
|
andreubisquerra
|
3ec2769a05
|
FIX pay value
|
2022-01-28 18:11:38 +01:00 |
|
andreubisquerra
|
9d228b13de
|
FIX pay value
|
2022-01-28 17:22:41 +01:00 |
|
Laurent Destailleur
|
0d54f8df5f
|
Merge pull request #19847 from andreubisquerra/develop
Create new line when add ordered product in TakePOS
|
2022-01-25 14:29:07 +01:00 |
|
Laurent Destailleur
|
49f0e2f765
|
Merge pull request #19521 from altairis-melina/displaysku
NEW : Show product reference in Takepos
|
2022-01-19 02:32:51 +01:00 |
|
Laurent Destailleur
|
eb3bce9759
|
Merge pull request #19527 from altairis-melina/nocategory
NEW : Add constant to hide categories in TakePos
|
2022-01-19 02:30:52 +01:00 |
|
Laurent Destailleur
|
6179d7a4e6
|
Merge pull request #19618 from altairis-melina/hookproduct
Add Hooks for takepos ajax search
|
2022-01-19 02:30:09 +01:00 |
|
andreubisquerra
|
9cd4bfabff
|
Create new line when add ordered product in TakePOS
When TAKEPOS_GROUP_SAME_PRODUCT is enabled in TakePOS and you add product, avoid group it if product is ordered
|
2022-01-15 21:53:49 +01:00 |
|
Laurent Destailleur
|
f97ed1b3a3
|
Merge pull request #19623 from altairis-melina/changepriceht
NEW : Add constant to change price HT in TakePos
|
2022-01-10 21:07:41 +01:00 |
|
Laurent Destailleur
|
7e11677117
|
Fix: Add token to the url logout
|
2021-12-31 14:33:12 +01:00 |
|
Mélina
|
a85f542668
|
double quotes
|
2021-12-31 09:29:56 +01:00 |
|
Mélina
|
2729bd32e6
|
Single quotes
|
2021-12-30 16:14:06 +01:00 |
|
Mélina
|
81bee064af
|
add getDolGlobalInt
|
2021-12-28 11:28:58 +01:00 |
|
Mélina
|
9e24785972
|
add getDolGlobalInt
|
2021-12-28 11:23:46 +01:00 |
|
Mélina
|
649d5b009e
|
Correction of a condition of the constant
|
2021-12-21 10:10:28 +01:00 |
|
Mélina
|
d267d90ef7
|
escape constant
|
2021-12-20 14:22:35 +01:00 |
|
Laurent Destailleur
|
0465afbc34
|
Fix css for takepos
|
2021-12-20 13:39:34 +01:00 |
|
Mélina
|
e90c382345
|
fix prefix
|
2021-12-20 11:09:54 +01:00 |
|
Mélina
|
8738dc93b5
|
fix prefix
|
2021-12-20 11:06:53 +01:00 |
|
Mélina
|
dccd74b0ef
|
fix prefix
|
2021-12-20 10:42:10 +01:00 |
|
Mélina
|
882bf4b12d
|
cast fk_entrepot
|
2021-12-20 10:02:58 +01:00 |
|
Mélina
|
fca26827ec
|
Add constant TAKEPOS_CHANGE_PRICE_HT
|
2021-12-15 10:47:30 +01:00 |
|
Mélina
|
c3ac93b917
|
Add Hooks for takepos ajax search
|
2021-12-14 16:03:12 +01:00 |
|
Mélina
|
a28ddb5ac6
|
sql correction
|
2021-12-14 09:18:44 +01:00 |
|
Mélina
|
0c7cf34125
|
Change the name of the constant
|
2021-12-13 17:02:16 +01:00 |
|
Mélina
|
631de455a4
|
Change line 136
|
2021-12-13 16:51:53 +01:00 |
|
Mélina
|
abf7368886
|
Change constant
|
2021-12-13 16:28:24 +01:00 |
|
Mélina
|
c9ae805e7a
|
Change constant
|
2021-12-13 10:43:02 +01:00 |
|
Mélina
|
e3a18d117e
|
Only the products in stock
|
2021-12-13 10:32:07 +01:00 |
|
Laurent Destailleur
|
4e744dec65
|
Merge pull request #19542 from andreubisquerra/develop
FIX Avoid move line to the same place in TakePOS
|
2021-12-08 19:16:40 +01:00 |
|
Laurent Destailleur
|
69cd7ae2ab
|
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/don/card.php
htdocs/public/test/badges.php
htdocs/public/test/test_exec.php
|
2021-12-08 18:27:03 +01:00 |
|
Laurent Destailleur
|
eb60e3c16d
|
Fix click on "C" on pad, reset correctly pad edition.
|
2021-12-06 02:13:15 +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 |
|
Laurent Destailleur
|
131c00ffb6
|
css
|
2021-12-05 13:00:23 +01:00 |
|
andreubisquerra
|
2b5bcda8d8
|
FIX Avoid move line to the same place in TakePOS
|
2021-12-02 23:08:22 +01:00 |
|
andreubisquerra
|
c23914f367
|
FIX load css file
|
2021-12-02 23:05:18 +01:00 |
|
stickler-ci
|
cc3ef5a3fb
|
Fixing style errors.
|
2021-12-01 09:53:28 +00:00 |
|
Mélina
|
9190581d0a
|
No category
|
2021-12-01 10:45:56 +01:00 |
|
Mélina
|
16ab6ce800
|
No Category
|
2021-12-01 10:26:24 +01:00 |
|
Mélina
|
5c1638227d
|
Correction description catégorie
|
2021-12-01 09:58:01 +01:00 |
|
Mélina
|
7dff30126d
|
Show subcategories description
|
2021-11-30 18:22:59 +01:00 |
|
Mélina
|
3ca6743469
|
Show category description
|
2021-11-30 16:19:36 +01:00 |
|
stickler-ci
|
7c3b2f1e9b
|
Fixing style errors.
|
2021-11-30 15:07:59 +00:00 |
|
Mélina
|
e43b95f05a
|
Show reference product
|
2021-11-30 15:41:46 +01:00 |
|
Laurent Destailleur
|
055cb5c0c9
|
Merge pull request #18526 from cfoellmann/PR/deprecated-html
deprecated html attributes
|
2021-11-30 14:27:12 +01:00 |
|
Laurent Destailleur
|
429c4406c4
|
Merge pull request #19441 from andreubisquerra/develop
TakePOS Direct Payment (Cash) Button doesn't work
|
2021-11-30 12:24:58 +01:00 |
|