Commit Graph

79396 Commits

Author SHA1 Message Date
Laurent Destailleur
8ac0383fa0 FIX Send email from expense report card.
FIX Alias name is not into the email recipient label.
2019-09-23 12:36:12 +02:00
Laurent Destailleur
1584a4bf79 Add trigger event USER_SENTBYMAIL in agenda 2019-09-23 12:27:51 +02:00
Laurent Destailleur
d5877e9c36 FIX Bad currency var used in stripe for connect 2019-09-23 11:36:45 +02:00
Laurent Destailleur
bf9f25fd74 Ehance getPaymentIntent to use it for offline payment 2019-09-23 11:35:11 +02:00
Frédéric FRANCE
31094936c1
wip 2019-09-23 10:56:11 +02:00
Frédéric FRANCE
cb8cfef7b1
Merge remote-tracking branch 'upstream/develop' into zapier 2019-09-23 08:02:49 +02:00
stickler-ci
cc5c6c0c76 Fixing style errors. 2019-09-22 19:09:02 +00:00
Laurent Destailleur
3faca1dbd1 Enhancement for SCA 2019-09-22 21:09:01 +02:00
ATM john
913c298a91 Auto remove basic stats if in new opened dashboard 2019-09-22 20:59:28 +02:00
ATM john
e9c6e96a9e Merge branch 'patch-13' of github.com:frederic34/dolibarr into develop_dashboard_global_stat_basic 2019-09-22 14:11:10 +02:00
ATM john
65c48475dd Merge branch 'develop_dashboard_global_stat_basic' of github.com:atm-john/dolibarr into develop_dashboard_global_stat_basic 2019-09-22 13:47:40 +02:00
ATM john
9e55fee6e4 Prepare global stats replacement 2019-09-22 13:46:11 +02:00
stickler-ci
0660229602 Fixing style errors. 2019-09-22 10:05:13 +00:00
ATM john
98acfd6929 Add basic stats to new dashboard 2019-09-22 11:57:33 +02:00
stickler-ci
aed017deab Fixing style errors. 2019-09-22 09:36:18 +00:00
oscim
14c98bea15
Update livraison.class.php
for correct display object link in card other object (shipping)
2019-09-22 11:34:28 +02:00
ATM john
86e8abde65 Fix warning 2019-09-22 11:18:54 +02:00
Frédéric FRANCE
44ba0deae6
fix badge linked resources on fichinter 2019-09-20 17:58:22 +02:00
Alexandre SPANGARO
1e49fd0d45 Translate 2019-09-20 15:07:58 +02:00
ptibogxiv
d3b5197956
FIX new display for stripe account
invert col and row for better display
2019-09-20 13:02:50 +02:00
Alexandre SPANGARO
e32772fdc5 Translate 2019-09-20 09:44:49 +02:00
Alexandre SPANGARO
bf6fd2a5e2 Translate & style 2019-09-20 09:25:46 +02:00
Alexandre SPANGARO
278312f38f Translate 2019-09-20 07:02:14 +02:00
Laurent Destailleur
b30c55a2ee CSS 2019-09-19 23:40:38 +02:00
Alexandre SPANGARO
b3807bbb20 Merge branch 'develop' into 11.0_translation 2019-09-19 22:34:43 +02:00
Alexandre SPANGARO
4819414d3a Translate and some fix 2019-09-19 22:33:26 +02:00
gauthier
575e4d11d0 FIX : wrong test 2019-09-19 17:28:51 +02:00
atm-quentin
a46ed62e81 Merge branch 'NEW_stock_categories' of github.com:atm-quentin/dolibarr into NEW_stock_categories 2019-09-19 16:43:49 +02:00
atm-quentin
769ef78d8e FIX missing comment 2019-09-19 16:43:21 +02:00
stickler-ci
774ec5a274 Fixing style errors. 2019-09-19 14:30:23 +00:00
atm-quentin
80d5be56f6 Fix trans 2019-09-19 16:26:53 +02:00
atm-quentin
c09f2d8c4e NEW stock categories 2019-09-19 16:21:03 +02:00
gauthier
d40534e8fa FIX : change product type must be allowed if we activate hidden conf 2019-09-19 15:21:52 +02:00
Laurent Destailleur
76cc40973d Fix icon size 2019-09-19 12:51:40 +02:00
florian HENRY
3b555797d1 fix regex 2019-09-19 12:32:26 +02:00
florian HENRY
536e99e3c9 fix regex main.inc.php fatal 2019-09-19 09:59:05 +02:00
Frédéric FRANCE
61e358bb9d
Merge remote-tracking branch 'upstream/develop' into zapier 2019-09-18 21:23:26 +02:00
Laurent Destailleur
2286cc2a5f Fix autojump when 1 record found 2019-09-18 20:16:39 +02:00
Laurent Destailleur
9bf387d43c Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/admin/mails_templates.php
	htdocs/main.inc.php
	htdocs/user/card.php
2019-09-18 15:12:38 +02:00
Laurent Destailleur
00d5cff00d Fix XSS injection into textarea 2019-09-18 14:44:31 +02:00
Laurent Destailleur
e52788eb75 Fix xss 2019-09-18 14:31:03 +02:00
Laurent Destailleur
771104bc68 Fix XSS 2019-09-18 14:25:53 +02:00
Laurent Destailleur
345ac28c89 Fix js injection
Conflicts:
	htdocs/core/lib/functions.lib.php
	htdocs/user/group/card.php
2019-09-18 14:21:02 +02:00
Laurent Destailleur
7b512587aa FIX XSS 2019-09-18 14:15:20 +02:00
John Botella
d72548bd76 add filters 2019-09-18 13:43:34 +02:00
Laurent Destailleur
ad3d21578c Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-09-18 13:13:02 +02:00
Laurent Destailleur
2da5071642 Fix VAT in New caledonia is now called TGC 2019-09-18 13:12:22 +02:00
VESSILLER
cf7193691f FIX dol_print_date format in buying price tooltip 2019-09-18 11:22:32 +02:00
com4WEB
7455d772a2
Update README.md 2019-09-18 10:50:07 +02:00
VESSILLER
ca18448b48 NEW add units fields in buying price tab of product card 2019-09-18 10:36:13 +02:00