Commit Graph

86542 Commits

Author SHA1 Message Date
Laurent Destailleur
aec5200a98 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/variants/class/ProductCombination.class.php
2020-05-23 15:37:00 +02:00
Laurent Destailleur
7c92bb218e Fix no hreflang if not a canonical page 2020-05-23 15:33:04 +02:00
Laurent Destailleur
5f3a82423f Fix regression in look and feel v12 2020-05-23 14:38:37 +02:00
Laurent Destailleur
fe1fcfbbae
Merge pull request #13945 from atm-maxime/fix_board_expensereport_toapprove
Fix board expense report to approve
2020-05-23 14:33:04 +02:00
Laurent Destailleur
b4223dbdec
Merge branch '12.0' into fix_board_expensereport_toapprove 2020-05-23 14:32:12 +02:00
Tobias Sekan
babcdfc99a Fix not working default value (re...) 2020-05-23 14:22:40 +02:00
Tobias Sekan
58e32aa2ff Fix not wokring default values for date (re...) 2020-05-23 14:22:30 +02:00
Frédéric FRANCE
8b4dcbaa64 Update datapolicycron.class.php 2020-05-23 14:19:28 +02:00
Frédéric FRANCE
3a93dcf2c4 Update paymentloan.class.php
same picto in loan
2020-05-23 14:18:47 +02:00
Laurent Destailleur
1979647650
Merge pull request #13954 from fappels/12_fix_batch
Fix migration, missing batch update to varchar(128)
2020-05-23 13:54:12 +02:00
Laurent Destailleur
3a15688f17 FIX #13951 2020-05-23 13:53:47 +02:00
Laurent Destailleur
0db549469c
Merge pull request #13951 from Langlais115/keep_child_label_if_modified
FIX #13908 keep child label if modified by user
2020-05-23 13:51:29 +02:00
Laurent Destailleur
a9b5feb680
Merge branch 'develop' into keep_child_label_if_modified 2020-05-23 13:51:13 +02:00
Laurent Destailleur
726f86e73d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-23 13:49:22 +02:00
Laurent Destailleur
acaab1fd45 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-23 13:49:15 +02:00
Laurent Destailleur
41664c1a0e
Merge pull request #13941 from bsene/fixes-13807-issue
Fix #13807 Docker: PHP installation does not support GD graphical functions
2020-05-23 13:48:15 +02:00
Laurent Destailleur
83ecbef9bc FIX #13911 #13940 2020-05-23 13:46:37 +02:00
Laurent Destailleur
536f0b4664
Merge pull request #13956 from laudeco/feature/docker
Docker - add a mail server
2020-05-23 13:40:19 +02:00
Laurent Destailleur
493becde8b Update list.php 2020-05-23 13:39:06 +02:00
Laurent Destailleur
15de6194c4 Update list.php 2020-05-23 13:38:59 +02:00
gael.langlais
af5de05a31 Change some curly braces #13929 2020-05-23 13:38:50 +02:00
Laurent Destailleur
4884dcd62e
Merge pull request #13950 from Langlais115/fix_some_curly_braces
Change some curly braces #13929
2020-05-23 13:37:56 +02:00
Laurent Destailleur
9e95342e2f
Update list.php 2020-05-23 13:36:39 +02:00
Laurent Destailleur
072d8c6222
Update list.php 2020-05-23 13:36:02 +02:00
Laurent Destailleur
b4fa56d07e
Merge pull request #13947 from TobiasSekan/FixDefaultValuesForPaymentOnInvoices
FIX not working default values for payment on new invoices
2020-05-23 13:33:01 +02:00
Laurent Destailleur
d4b1485c97 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-23 13:11:30 +02:00
Laurent Destailleur
755c47f900 Fix save of wrapper missing 2020-05-23 13:10:33 +02:00
Laurent Destailleur
333ae9d496 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-23 12:58:18 +02:00
Laurent Destailleur
aff2872fc1 Fix RSS 2020-05-23 12:57:58 +02:00
Laurent Destailleur
50d063256e NEW Povide a RSS Feed for blogposts 2020-05-23 12:54:06 +02:00
Laurent Destailleur
e947ddba10 Fix RSS feed 2020-05-23 12:51:44 +02:00
Laurent Destailleur
f2c02f5559 FIX Language for RSS 2020-05-23 12:41:06 +02:00
Laurent De Coninck
0bf6b26117
add a mail server 2020-05-23 12:20:56 +02:00
Francis Appels
875230ed13 Fix missing batch update to varchar(128) 2020-05-23 10:23:26 +02:00
Laurent Destailleur
c460cff01c Fix calculation and add tooltip to understand it. 2020-05-23 01:17:01 +02:00
gael.langlais
dce93197d7 FIX #13908 keep child label if modified by user 2020-05-22 17:58:24 +02:00
gael.langlais
e349b9323f Change some curly braces #13929 2020-05-22 17:42:06 +02:00
Laurent Destailleur
2f8b364454 Code comment 2020-05-22 13:18:47 +02:00
stickler-ci
2873f4dacf Fixing style errors. 2020-05-22 06:08:12 +00:00
Tobias Sekan
53080be245
fix not working default values for payment 2020-05-22 08:01:29 +02:00
Tobias Sekan
d9a2d2b982
fix not working default values for payment 2020-05-22 08:00:26 +02:00
Laurent Destailleur
38c8ebd627 Add link into toolbar to create website tags 2020-05-22 01:01:27 +02:00
Laurent Destailleur
60f865fbb8 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-22 00:58:27 +02:00
Laurent Destailleur
43103f40a5 Fix make page of categories of web site working 2020-05-22 00:55:34 +02:00
Laurent Destailleur
e81e4032f7 Fix make page of categories of web site working 2020-05-22 00:54:53 +02:00
Maxime Kohlhaas
6b1eef9827 Fix board exepense report to approve 2020-05-22 00:50:13 +02:00
Laurent Destailleur
5d78f6dac5 NEW Add link to edit property from search result of website pages 2020-05-22 00:38:01 +02:00
Laurent Destailleur
76823d3e39 Clean CSS, clean code 2020-05-21 20:59:02 +02:00
Laurent Destailleur
9e295d44f0 Code comment 2020-05-21 17:14:42 +02:00
Birame SENE
e6a5d4c8d9 Add PNG/JPEG packages to build GD extension 2020-05-21 17:01:27 +02:00