Commit Graph

1117 Commits

Author SHA1 Message Date
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