Commit Graph

20258 Commits

Author SHA1 Message Date
Laurent Destailleur
1bf677f537 Can set status of a websitepage 2020-05-14 18:14:55 +02:00
Laurent Destailleur
ab07330668 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-05-14 16:34:45 +02:00
Laurent Destailleur
3d26351c6b Fix function if hours. 2020-05-14 16:03:31 +02:00
Laurent Destailleur
7c01b54d73 Fix version on module list 2020-05-14 15:42:37 +02:00
Laurent Destailleur
6ec5dd02b6 Fix Fatal error with bad triggers 2020-05-14 15:27:10 +02:00
Laurent Destailleur
68512e0281 Look and feel v12 2020-05-14 14:56:15 +02:00
Laurent Destailleur
ae0e6e4dc8 FIX dol_concatdesc to escape <
Better help
2020-05-14 14:30:36 +02:00
Laurent Destailleur
0b3e917155 CSS 2020-05-14 14:30:26 +02:00
ATM john
9f6a5d4cc9 Fix multicompany supplier product price filter 2020-05-14 10:50:20 +02:00
Laurent Destailleur
ed68b73ef5
Merge pull request #13821 from atm-quentin/NEW_invoice_stat_graph_and_categ_search
NEW Add invoice stat graph and categ search
2020-05-12 03:31:09 +02:00
Laurent Destailleur
632ca40b1d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-12 03:04:59 +02:00
Laurent Destailleur
75cd7d7e72 Code comment 2020-05-12 03:04:48 +02:00
Laurent Destailleur
7be47097e9
Merge pull request #13867 from frederic34/patch-4
Only add empty select if no multiselect
2020-05-12 03:00:10 +02:00
Laurent Destailleur
4584fa1aa6 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/asset/list.php
	htdocs/compta/bank/list.php
	htdocs/contrat/services_list.php
	htdocs/core/lib/date.lib.php
	htdocs/expensereport/list.php
	htdocs/fichinter/list.php
	htdocs/holiday/list.php
	htdocs/projet/tasks/list.php
	htdocs/supplier_proposal/list.php
	htdocs/user/list.php
2020-05-11 19:43:06 +02:00
Laurent Destailleur
44d36815bd Look and feel v12 2020-05-11 19:00:27 +02:00
Frédéric FRANCE
097de7b3cd
Only add empty select if no multiselect 2020-05-11 18:34:54 +02:00
Laurent Destailleur
a2bc46f1c0 CSS 2020-05-11 12:50:24 +02:00
Laurent Destailleur
a8dcd2d09b Clean code 2020-05-11 11:53:13 +02:00
Laurent Destailleur
c511af69fe Debug look and feel v12 2020-05-10 21:07:49 +02:00
Laurent Destailleur
501f1ba2c4 Fix look and feel v12 2020-05-10 15:45:07 +02:00
Laurent Destailleur
796f97c671 Support tag $capture in input of files 2020-05-10 15:08:01 +02:00
Laurent Destailleur
c28a3e85a3 Fix constructor 2020-05-08 14:35:03 +02:00
Laurent Destailleur
6a2bb08107 Fix constructor 2020-05-08 14:34:02 +02:00
Laurent Destailleur
0138ab3f7c Fix $weblangs must be initialized with language of page 2020-05-08 14:29:04 +02:00
Laurent Destailleur
42ee755ea5 Look and feel v12 2020-05-08 02:52:55 +02:00
Laurent Destailleur
206b16410e Revert the option to avoid to introduce a feature that is duplicate with
already existing view "Events/Agenda". It also keeps a common behaviour
between other tools.
Maxi debug on messages of tickets
2020-05-07 22:52:32 +02:00
Laurent Destailleur
0cd05887ce FIX count of open day when date and start are not open should be 0 2020-05-07 17:21:27 +02:00
Frédéric FRANCE
c28e6630bb
Update functions.lib.php 2020-05-07 15:41:21 +02:00
Frédéric FRANCE
dd1d29f983
add some substitutions for date datetime 2020-05-07 15:37:32 +02:00
Laurent Destailleur
6c8d302dd9 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/prelevement/list.php
	htdocs/compta/prelevement/rejets.php
	htdocs/fourn/commande/index.php
2020-05-07 12:03:49 +02:00
Laurent Destailleur
d6887f3ca4 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/compta/prelevement/bons.php
	htdocs/compta/prelevement/list.php
	htdocs/core/class/notify.class.php
2020-05-07 11:59:13 +02:00
Laurent Destailleur
d4400cf80f FIX links into emails of notifications 2020-05-07 11:39:32 +02:00
Laurent Destailleur
1ec8b31e46 Fix remove action param in url to allow a second try without the error
message
2020-05-06 15:15:12 +02:00
atm-quentin
b6aa766c72 FIX stickler 2020-05-06 09:37:17 +02:00
Laurent Destailleur
b09f179a16 NEW Website logs are now into a separated log file. 2020-05-06 04:32:48 +02:00
Laurent Destailleur
30fede216c Fix Add '_pw' var as var sensibles. 2020-05-06 04:03:07 +02:00
Laurent Destailleur
8512fba7db Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-06 03:49:25 +02:00
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
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