Laurent Destailleur
|
5987504fa5
|
Better test
|
2020-08-17 04:34:03 +02:00 |
|
Laurent Destailleur
|
fab78de569
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-08-17 04:06:38 +02:00 |
|
Laurent Destailleur
|
75f8fe8276
|
Merge pull request #14427 from asolslk/patch-2
FIX Visible 0 on accounting account
|
2020-08-17 01:34:57 +02:00 |
|
Laurent Destailleur
|
4043e4ed3b
|
Merge pull request #14429 from grandoc/new_branch_08_08_2020
New branch 08 08 2020
|
2020-08-17 00:04:08 +02:00 |
|
Laurent Destailleur
|
9aa861bbac
|
Merge pull request #14438 from egils-consulting/patch-7
Update README.md
|
2020-08-16 23:59:28 +02:00 |
|
Laurent Destailleur
|
960c56c443
|
Merge branch 'develop' into patch-7
|
2020-08-16 23:59:22 +02:00 |
|
Laurent Destailleur
|
942a236c2c
|
Update README.md
|
2020-08-16 23:57:49 +02:00 |
|
Laurent Destailleur
|
bd5ad1aef2
|
Update README.md
|
2020-08-16 23:57:01 +02:00 |
|
Laurent Destailleur
|
867ae0c32d
|
Update README.md
|
2020-08-16 23:56:08 +02:00 |
|
Laurent Destailleur
|
ab871f44be
|
Update README.md
|
2020-08-16 23:55:27 +02:00 |
|
Laurent Destailleur
|
bc01d7f992
|
Merge pull request #14440 from egils-consulting/patch-8
Update README.md
|
2020-08-16 23:54:12 +02:00 |
|
Laurent Destailleur
|
0d59ac34d2
|
Merge branch 'develop' into patch-8
|
2020-08-16 23:54:04 +02:00 |
|
Laurent Destailleur
|
d0ffba3e22
|
Update doc
|
2020-08-16 23:51:57 +02:00 |
|
Laurent Destailleur
|
b7c38f4617
|
Merge pull request #14433 from c3do/patch-1
NEW Triggers Attributes and Attributes values
|
2020-08-16 23:45:32 +02:00 |
|
Laurent Destailleur
|
0b16e3bfda
|
Merge pull request #14436 from egils-consulting/patch-6
Update README.md
|
2020-08-16 23:38:27 +02:00 |
|
Laurent Destailleur
|
d2db1a3557
|
Update README.md
|
2020-08-16 23:38:19 +02:00 |
|
Laurent Destailleur
|
99809b487e
|
Standardize code
|
2020-08-16 23:33:50 +02:00 |
|
Laurent Destailleur
|
816aeadcba
|
Merge pull request #14465 from atm-john/develop_declinaison_price_multiple_merge
NEW : Declinaison price level compatibility
|
2020-08-16 23:18:49 +02:00 |
|
Laurent Destailleur
|
c407a19563
|
Remove type= from script tags
|
2020-08-16 22:03:11 +02:00 |
|
Laurent Destailleur
|
fadadc992f
|
Merge pull request #14479 from Tim-Otte/fix-smtps-FORCE-SENDTO
FIX: Fixed the smtps recipent to use the forced address
|
2020-08-16 21:18:04 +02:00 |
|
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 |
|
Tim Otte
|
4e1a66916e
|
Merge branch 'develop' into fix-smtps-FORCE-SENDTO
|
2020-08-14 11:52:20 +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 |
|
Tim Otte
|
b57c2585ad
|
Fixed the smtps recipent to use the forced address
|
2020-08-14 10:00:40 +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 |
|
stickler-ci
|
959ccce777
|
Fixing style errors.
|
2020-08-13 09:48:28 +00:00 |
|
John Botella
|
2405082bb1
|
Merge branch 'develop_declinaison_price_multiple_merge' of github.com:atm-john/dolibarr into develop_declinaison_price_multiple_merge
|
2020-08-13 11:46:07 +02:00 |
|
John Botella
|
4e1f554c15
|
Fix - add variation price fallback behavior
|
2020-08-13 11:43:33 +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 |
|