2
0
forked from Wavyzz/dolibarr
Commit Graph

17941 Commits

Author SHA1 Message Date
Laurent Destailleur
f1c6f1b375 Fix can replace PclZip with ZipArchive 2019-08-14 04:00:08 +02:00
Laurent Destailleur
b0172f136b FIX Option to use ZipArchive instead of PclZip bugged with large files. 2019-08-14 03:43:15 +02:00
Laurent Destailleur
bc230c2d25 FIX Bad error management in zip compress and web site export 2019-08-14 01:43:06 +02:00
Laurent Destailleur
df53826426 FIX Missing some replacements in website module 2019-08-13 18:22:18 +02:00
ptibogxiv
93d64bb84e Update functions.lib.php 2019-08-13 17:59:19 +02:00
ptibogxiv
8198276d64 FIX for MAIN_MAXTABS_IN_CARD = $i card 2019-08-13 17:47:30 +02:00
Regis Houssin
34579dd4db FIX phpcs 2019-08-13 07:46:03 +02:00
Regis Houssin
7c8b3c9a38 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu 2019-08-13 07:34:02 +02:00
Laurent Destailleur
49e61e237c Better log 2019-08-13 07:08:45 +02:00
Laurent Destailleur
91cdb2a5a8 Add more logs 2019-08-13 07:05:06 +02:00
Laurent Destailleur
7891c8d856 Enhance logs 2019-08-13 06:52:07 +02:00
Laurent Destailleur
99473097a9 FIX Add log and type of content in dolWebsiteOutput and
dolWebsiteReplacementOfLinks

Conflicts:
	htdocs/website/index.php
2019-08-13 06:43:28 +02:00
Laurent Destailleur
277a693c16 FIX Add log and type of content in dolWebsiteOutput and
dolWebsiteReplacementOfLinks
2019-08-13 06:37:06 +02:00
Laurent Destailleur
8e0a023270 FIX Disabling a website does not put it offline 2019-08-13 05:05:19 +02:00
Laurent Destailleur
983dc80d9e FIX Disabling a website does not put it offline 2019-08-13 05:03:45 +02:00
Laurent Destailleur
ae4bead85c Fix missing function 2019-08-13 04:43:50 +02:00
Laurent Destailleur
7824731f17 NEW Add feature to search a string into containers 2019-08-13 00:34:42 +02:00
ATM john
b193f1b34e Fix travis 2019-08-12 23:33:00 +02:00
Laurent Destailleur
8ad2081555 NEW Can select website templates from available default templates 2019-08-12 22:19:24 +02:00
Laurent Destailleur
c986dbc71f NEW Add search into template 2019-08-12 20:32:18 +02:00
Laurent Destailleur
de1af78ae6 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-12 17:38:54 +02:00
Laurent Destailleur
18e4d1b334 Fix to avoid to die page when there is a redirect. 2019-08-12 17:22:46 +02:00
Laurent Destailleur
5346135a0c Fix removed duplicate load 2019-08-12 17:12:57 +02:00
Laurent Destailleur
4d38e5cdb5 Fix removed duplicate load 2019-08-12 17:12:17 +02:00
ATM john
1ffb013371 add filter 2019-08-12 15:24:07 +02:00
ptibogxiv
a489207122 Fix force recalculate price with multicurrency 2019-08-12 13:56:12 +02:00
Laurent Destailleur
446f0590dc FIX VAT number for Monaco (it uses FR) 2019-08-12 13:45:04 +02:00
Ferran Marcet
f1c0442a77 FIX: Add comment before protected functions 2019-08-12 10:16:04 +02:00
ATM john
f10f29f632 Add filters 2019-08-12 01:01:16 +02:00
ptibogxiv
b06bfef632 NEW display supplier in objectline if defined 2019-08-11 13:08:17 +02:00
ATM john
22c4a1b49e Merge branch 'develop_new_dashboard' of github.com:atm-john/dolibarr into develop_new_task_progress_bar 2019-08-11 09:57:13 +02:00
ATM john
53721ae606 move late warning sign 2019-08-10 23:09:27 +02:00
ATM john
89447acaf3 remove tooltip on progress bar 2019-08-10 23:07:12 +02:00
ATM john
eedd065f48 remove useless function usage 2019-08-10 22:59:09 +02:00
ATM john
09c1289802 Fix task widget and improve its display 2019-08-10 22:48:07 +02:00
wdammak
909dbfab96 Update objectline_edit.tpl.php
optimization code (double declaration deletion)
2019-08-10 16:35:02 +02:00
ATM john
527e4dcf46 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_new_task_progress_bar 2019-08-10 15:41:49 +02:00
ATM john
3f0f7e2ad5 Add progress bar for task list and visual status badges 2019-08-10 15:41:21 +02:00
Laurent Destailleur
8647a20c18 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	ChangeLog
	htdocs/langs/en_US/admin.lang
	htdocs/product/dynamic_price/class/price_parser.class.php
	htdocs/product/stats/facture.php
2019-08-10 01:57:43 +02:00
Laurent Destailleur
deb6186338 Merge pull request #11569 from aspangaro/11.0_fiscalyear
NEW Box use fiscal year
2019-08-10 01:47:55 +02:00
Laurent Destailleur
96fb4c52ea Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
2019-08-10 01:43:52 +02:00
Laurent Destailleur
76d721559c Merge pull request #11630 from hregis/9.0_html
FIX adding a "div" for better interaction with login submit button
2019-08-10 01:41:19 +02:00
Laurent Destailleur
31fa26c2be Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-08-10 01:36:50 +02:00
Laurent Destailleur
2824dee11a Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/langs/en_US/admin.lang
	htdocs/product/dynamic_price/class/price_parser.class.php
2019-08-10 01:20:17 +02:00
Laurent Destailleur
dd2c35f866 Merge pull request #11648 from atm-john/develop_chart_color
NEW more living colors for charts and option for "color bind" people
2019-08-10 00:39:53 +02:00
VESSILLER
ae144a6910 NEW compute column value from others columns in import module 2019-08-08 17:31:16 +02:00
John Botella
401dc12b93 Add color blind option in body for css impact 2019-08-07 12:15:55 +02:00
John Botella
63191dab7d Add user color blind option 2019-08-07 12:03:19 +02:00
John Botella
4aeaa580ea Add color blind option 2019-08-07 11:11:47 +02:00
John Botella
cafd4fc599 New living color for chart 2019-08-06 15:24:42 +02:00