Laurent Destailleur
|
8992d38bea
|
Merge pull request #14482 from b92/develop
NEW Add __MEMBER_TYPE__ substitution key
|
2020-08-16 21:17:09 +02:00 |
|
Laurent Destailleur
|
f6c1a14d50
|
CSS
|
2020-08-14 21:22:45 +02:00 |
|
Laurent Destailleur
|
695420eb8b
|
CSS
|
2020-08-14 21:18:06 +02:00 |
|
Laurent Destailleur
|
2adac8e233
|
CSS
|
2020-08-14 21:11:55 +02:00 |
|
Bernard Saulme
|
52b84a3ea2
|
Update functions.lib.php
|
2020-08-14 18:08:59 +02:00 |
|
Laurent Destailleur
|
73c1184195
|
Fix phpcs
|
2020-08-14 13:23:41 +02:00 |
|
Laurent Destailleur
|
d8c6e17efd
|
Fix travis
|
2020-08-14 11:59:51 +02:00 |
|
Laurent Destailleur
|
a916f6af59
|
Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop
|
2020-08-14 11:09:06 +02:00 |
|
Laurent Destailleur
|
0381cf5665
|
Merge branch '12.0' of https://github.com/dolibarr/dolibarr into develop
Conflicts:
htdocs/core/modules/modPaymentByBankTransfer.class.php
htdocs/filefunc.inc.php
|
2020-08-14 11:08:53 +02:00 |
|
Laurent Destailleur
|
056a503200
|
Merge branch '11.0' of https://github.com/dolibarr/dolibarr into 12.0
Conflicts:
htdocs/product/composition/card.php
|
2020-08-14 11:06:39 +02:00 |
|
Laurent Destailleur
|
2b393d04e1
|
Merge branch '11.0' of https://github.com/dolibarr/dolibarr into 11.0
|
2020-08-14 11:03:48 +02:00 |
|
Laurent Destailleur
|
d35c7ed49b
|
Fix trans
|
2020-08-14 11:03:12 +02:00 |
|
Laurent Destailleur
|
9e8ed3bf54
|
Merge pull request #14445 from atm-john/11.0_fix_lang
Fix lang fr
|
2020-08-14 03:28:42 +02:00 |
|
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
|
48323059e8
|
Merge pull request #14475 from atm-adrien/FIX_task_leftmenu
Fix missings tasks leftmenu parameters
|
2020-08-14 02:25:37 +02:00 |
|
stickler-ci
|
d784c621c9
|
Fixing style errors.
|
2020-08-13 15:07:06 +00:00 |
|
Adrien Raze
|
990217fcb0
|
FIX : task leftmenu
|
2020-08-13 16:59:27 +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 |
|
Laurent Destailleur
|
f22398a9d3
|
Merge branch '12.0' of https://github.com/dolibarr/dolibarr into 12.0
|
2020-08-12 20:26:01 +02:00 |
|
Laurent Destailleur
|
355d62e7db
|
FIX Update line of BOM
|
2020-08-12 20:24:44 +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 |
|
Juanjo Menent
|
3eb23d3325
|
FIX: MySql Strict mode
|
2020-08-11 10:12:19 +02:00 |
|
Juanjo Menent
|
4e6b7289f2
|
FIX: MySql Strict mode
|
2020-08-11 10:07:38 +02:00 |
|
Juanjo Menent
|
b1735b0f80
|
FIX: MySql Strict mode
|
2020-08-11 10:02:46 +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 |
|
John Botella
|
f014365b65
|
Fix lang fr
|
2020-08-10 10:35:50 +02: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
|
6e01ffd5ac
|
Prepare for 12.0.3
|
2020-08-08 13:00:57 +02:00 |
|
Laurent Destailleur
|
dde83c8fcc
|
Fix debian package
|
2020-08-08 10:17:52 +02:00 |
|
Laurent Destailleur
|
4e6158d23c
|
Work on recruitment module
|
2020-08-08 02:54:14 +02:00 |
|
Laurent Destailleur
|
deabfcf403
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
|
2020-08-08 02:34:36 +02:00 |
|
Laurent Destailleur
|
537b58b446
|
Introduce workaround to allow integrator to suggest list of modules in
old style by default instead of kanban style #14075
|
2020-08-08 02:34:22 +02:00 |
|
Laurent Destailleur
|
b5749af5b4
|
Merge pull request #14379 from fappels/12_fix_search_stock_list
FIX filter warehouse list on status
|
2020-08-08 02:25:54 +02:00 |
|