Commit Graph

20632 Commits

Author SHA1 Message Date
Laurent Destailleur
247acdd274 Fix position of custom groups of modules 2020-05-06 03:47:28 +02:00
Laurent Destailleur
e7f0035237 Merge pull request #13811 from frederic34/patch-4
nowtime is not defined
2020-05-06 02:23:58 +02:00
Laurent Destailleur
eacb1b3b2e Debug modulebuilder 2020-05-05 21:45:10 +02:00
Frédéric FRANCE
93cac43306 Merge remote-tracking branch 'upstream/develop' into free_email 2020-05-05 18:37:56 +02:00
Laurent Destailleur
e354e71425 Fix link to themes on dolistore 2020-05-05 18:19:48 +02:00
Laurent Destailleur
49f9e88cc1 Look and feel v12 2020-05-05 18:16:30 +02:00
Laurent Destailleur
ded0526ca1 Merge pull request #13738 from bb2a/patch-6
links color for table title line is equal to Text color for table title line
2020-05-05 18:12:07 +02:00
Laurent Destailleur
b2a9791dca Fix pagination on pages "Related items" 2020-05-05 16:33:02 +02:00
atm-quentin
1b35380dda NEW stats invoice graph with 3 bars 2020-05-05 16:13:04 +02:00
Laurent Destailleur
36a0780f14 More complete fix for #13817 2020-05-05 15:20:40 +02:00
Laurent Destailleur
7e6b5a384d Code comment 2020-05-05 15:16:30 +02:00
atm-lena
78a427c996 FIX wrong user right's name to top menu "commercial" 2020-05-05 14:35:03 +02:00
Frédéric FRANCE
93e69d515d nowtime is not defined 2020-05-05 06:38:24 +02:00
Laurent Destailleur
d2d9ce3576 Merge pull request #13794 from atm-maxime/fix_addline_titles
Fix addline titles
2020-05-04 22:08:34 +02:00
Laurent Destailleur
2afd38e2f6 FIX Combo list of available users to filter on the list of leaves. 2020-05-04 21:59:31 +02:00
Laurent Destailleur
5e4ef9266e Fix update template to use for notifications 2020-05-04 20:30:02 +02:00
Laurent Destailleur
6d894b7abd Fix missing link in message 2020-05-04 19:08:31 +02:00
Laurent Destailleur
821e11ca3c Look and feel v12 2020-05-04 17:13:31 +02:00
Laurent Destailleur
3857c08277 Fix quick search on MO 2020-05-04 13:24:09 +02:00
Laurent Destailleur
4b34a6bd4a Look and feel 2020-05-04 12:43:47 +02:00
Laurent Destailleur
535ae612f3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-03 22:48:48 +02:00
Laurent Destailleur
4d6a45d491 Major doxygen fix 2020-05-03 22:48:35 +02:00
Laurent Destailleur
dc5731dcd6 Merge pull request #13789 from simicar29/dev-selectproduits
Add / as a delimiter for replacement pattern in select_produits*
2020-05-03 21:47:26 +02:00
Laurent Destailleur
f0f6d6e314 Merge pull request #13793 from andreubisquerra/master
NEW tab for Bar Restaurant parameters and new AUTO ORDER
2020-05-03 21:45:08 +02:00
Laurent Destailleur
da91a857a5 Fix pb of lang subdir in cloning website 2020-05-03 14:49:06 +02:00
stickler-ci
5c1eb08b3f Fixing style errors. 2020-05-03 08:42:45 +00:00
Anthony Berton
87d86f32ee Update usergroups.lib.php 2020-05-03 10:40:52 +02:00
Maxime Kohlhaas
e0ebe85c13 Fix addline titles 2020-05-03 09:15:12 +02:00
andreubisquerra
fe98e430ce Fix travis 2020-05-03 00:10:12 +02:00
jove@bisquerra.com
81c808692e NEW Bar Restaurant tab and Auto order 2020-05-02 22:00:04 +02:00
Marc Guenneugues
b5abb72c5b Add / as a delimiter for replacement pattern in select_produits* 2020-05-02 16:36:40 +02:00
Laurent Destailleur
48e62eca0c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-02 15:19:09 +02:00
Laurent Destailleur
a88ab40384 Clean phpcs 2020-05-02 15:18:59 +02:00
Frédéric FRANCE
44f914fede Merge remote-tracking branch 'upstream/develop' into free_email 2020-05-02 13:29:56 +02:00
Laurent Destailleur
099871e217 Merge pull request #13649 from atm-john/12.0_add_class_unitstools
NEW class tool for converting units
2020-05-02 13:05:51 +02:00
Frédéric FRANCE
39ac031aa9 Merge remote-tracking branch 'upstream/develop' into free_email 2020-05-02 06:59:54 +02:00
Marc Guenneugues
fbabfe9a71 Correct typo 2020-05-02 06:53:11 +02:00
Marc Guenneugues
79647b35cd Enable multiple mass actions on a single page - dev branch 2020-05-02 06:42:12 +02:00
Scrutinizer Auto-Fixer
8f0e00b4aa Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-05-02 01:39:56 +00:00
Laurent Destailleur
62a2469c71 Fix position of modules 2020-05-02 00:41:27 +02:00
Frédéric FRANCE
f89131e2a0 Merge remote-tracking branch 'upstream/develop' into free_email 2020-05-01 22:27:04 +02:00
Laurent Destailleur
18a36de69b Merge pull request #13779 from frederic34/patch-4
$tmpplugin was defined after use
2020-05-01 22:02:04 +02:00
Laurent Destailleur
75dd5f268f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/lib/files.lib.php
	htdocs/core/lib/sendings.lib.php
2020-05-01 22:00:00 +02:00
Laurent Destailleur
160009630f Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/admin/tools/dolibarr_export.php
2020-05-01 21:57:28 +02:00
Laurent Destailleur
aab9a2ff75 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-05-01 21:03:38 +02:00
Laurent Destailleur
b41b22996f Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/core/class/utils.class.php
	htdocs/core/lib/files.lib.php
2020-05-01 21:03:16 +02:00
Laurent Destailleur
385f998254 Fix restore param --quick 2020-05-01 21:01:40 +02:00
Frédéric FRANCE
3c7265e357 Merge remote-tracking branch 'upstream/develop' into free_email 2020-05-01 17:12:17 +02:00
Laurent Destailleur
c1b530f58f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/get_menudiv.php
2020-05-01 15:56:01 +02:00
Laurent Destailleur
1c7873b4f4 FIX Sanitizing menu parameter 2020-05-01 15:53:56 +02:00