Laurent Destailleur
74da63c0e4
Merge pull request #14448 from 418sec/develop
...
Security Fix for Cross-site Scripting (XSS) - huntr.dev
2020-08-14 03:17:35 +02:00
Laurent Destailleur
a2f50770f8
Merge pull request #14449 from cfoellmann/default-unit
...
set default unit to `PRODUCT_USE_UNITS` value
2020-08-14 03:04:09 +02:00
Laurent Destailleur
f0046672fc
Merge pull request #14461 from atm-john/NEW_fill_service_dates
...
NEW: new line template: hidden conf to fill service dates from the last service line
2020-08-14 02:50:24 +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
aeb11344c6
Merge pull request #14464 from atm-thibaultf/FIX_allow_float_on_stock_alert
...
Allow float for stock limit alert and desired stock
2020-08-14 02:46:08 +02:00
Laurent Destailleur
88c07e86ad
Organization of setup for Takepos bar features
2020-08-13 13:46:53 +02:00
atm-thibaultf
10810bc5bb
Modify int to float for stock limit alert and desired stock
2020-08-12 09:09:59 +02:00
andreubisquerra
8c5a86cb72
Avoid empty sales and orders when all lines are removed.
2020-08-12 07:07:18 +02:00
stickler-ci
ef78b85062
Fixing style errors.
2020-08-11 10:42:27 +00:00
John Botella
47e664df8d
Merge tag 'develop' of github.com:Dolibarr/dolibarr into NEW_fill_service_dates
2020-08-11 12:28:40 +02:00
stickler-ci
3e168f9495
Fixing style errors.
2020-08-10 14:06:22 +00:00
Christian Foellmann
821e7e2894
set default unit to PRODUCT_USE_UNITS value
2020-08-10 15:39:05 +02:00
Jamie Slome
7359c95efa
Merge pull request #9 from spooky360/develop
...
Fix for Self XSS vuln in dolibarr
2020-08-10 14:25:31 +01:00
Laurent Destailleur
a53f7ff9c9
Merge pull request #14428 from asolslk/patch-3
...
Fix group by finance account error #14221
2020-08-08 13:33:10 +02:00
Laurent Destailleur
cab9f6daae
Comment must be in english
2020-08-08 13:22:55 +02:00
Laurent Destailleur
a32587d993
Merge pull request #14420 from egils-consulting/patch-5
...
New function count_all_categories
2020-08-08 13:16:12 +02:00
Laurent Destailleur
7a7548b5fc
Merge pull request #14426 from asolslk/patch-1
...
Update listbyaccount.php
2020-08-08 13:15:43 +02:00
Laurent Destailleur
f8557879fb
Update listbyaccount.php
2020-08-08 13:15:29 +02:00
asolslk
41bb83f107
Update listbyaccount.php
...
fixed #14221
2020-08-08 19:10:50 +08:00
stickler-ci
d3cb704a0e
Fixing style errors.
2020-08-08 11:05:19 +00:00
asolslk
5291746252
Update listbyaccount.php
...
fixed #14408
2020-08-08 19:04:38 +08:00
Laurent Destailleur
4e6158d23c
Work on recruitment module
2020-08-08 02:54:14 +02:00
Laurent Destailleur
8f8f7ecf5d
Update categorie.class.php
2020-08-08 02:24:01 +02:00
stickler-ci
fc58d92db4
Fixing style errors.
2020-08-07 21:20:55 +00:00
Egils Consulting
9f130aa2af
New function count_all_categories
...
This is useful to count the total number of categories e.g. to decide whether to load the full tree or not. It might make most sense to wait with merging until there is code in viewcat.php or index.php using it.
2020-08-07 23:17:43 +02:00
Laurent Destailleur
6f7b65d9f2
css
2020-08-07 20:44:49 +02:00
Laurent Destailleur
aa699bacc6
css
2020-08-07 20:10:31 +02:00
Laurent Destailleur
9876e37309
A little perf and memory enhancement when building category tree
2020-08-07 15:47:02 +02:00
Laurent Destailleur
3c6f122a81
Fix phpunit
2020-08-07 14:59:22 +02:00
Laurent Destailleur
5e90286a2e
Fix permission on type of email templates must depends on user perms.
2020-08-07 14:38:03 +02:00
Laurent Destailleur
7e15abc972
Fix missing translation
2020-08-07 14:34:21 +02:00
Laurent Destailleur
1bb24de555
Can set the language of a user.
2020-08-07 14:22:43 +02:00
Laurent Destailleur
dd510901a4
Fix duplicate field
2020-08-07 14:05:15 +02:00
Laurent Destailleur
aaaf690006
FIX Language visible just after login does not match user choice.
2020-08-07 14:05:05 +02:00
Laurent Destailleur
e72e05d5f5
Add field default_lang for users
2020-08-07 13:31:23 +02:00
Laurent Destailleur
7128e658cb
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-08-07 12:49:33 +02:00
Laurent Destailleur
940b4e7bea
Fix #14413
2020-08-07 12:49:21 +02:00
Laurent Destailleur
7a03521664
Doc
2020-08-07 12:07:34 +02:00
Laurent Destailleur
e8b5453976
Merge pull request #14387 from bafbes/abb120133
...
fix: fetch reception on supplier order dispatch fetch
2020-08-07 12:07:24 +02:00
Laurent Destailleur
4468c5cfb0
Merge pull request #14412 from egils-consulting/patch-3
...
Update api_products.class.php
2020-08-07 12:03:40 +02:00
Laurent Destailleur
d3b16374fe
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/fourn/class/api_supplier_invoices.class.php
2020-08-07 12:00:52 +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
Laurent Destailleur
3a7b53cb22
Merge pull request #14386 from egils-consulting/fix-typos-and-clarify-403-error
...
Update api_supplier_invoices.class.php
2020-08-07 11:47:37 +02:00
Laurent Destailleur
ed6acfa1e7
Better compatibility
2020-08-07 11:45:15 +02:00
Egils Consulting
c52c4229c5
Update api_supplier_invoices.class.php
...
fixes #14831
2020-08-07 11:43:04 +02:00
Laurent Destailleur
669660df4c
Merge pull request #14383 from egils-consulting/patch-1
...
Update api_supplier_invoices.class.php
2020-08-07 11:42:42 +02:00
Laurent Destailleur
d8e38201d9
Merge pull request #14378 from grandoc/patch-5
...
Update pdf_crabe.modules.php
2020-08-07 11:42:12 +02:00
Laurent Destailleur
fb105f1501
Merge pull request #14377 from grandoc/patch-4
...
Update pdf_ban.modules.php
2020-08-07 11:41:58 +02:00
Laurent Destailleur
a2e4e2d3b2
Merge pull request #14380 from grandoc/patch-6
...
Update pdf_blochet.class.php
2020-08-07 11:41:44 +02:00
Laurent Destailleur
9320ba1b37
Merge pull request #14376 from grandoc/patch-3
...
Update pdf_rouget.modules.php
2020-08-07 11:41:28 +02:00