Commit Graph

17480 Commits

Author SHA1 Message Date
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
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
Frédéric FRANCE
7f23b77cbe
Update pdf_proforma.modules.php 2019-08-05 15:00:06 +02:00
Frédéric FRANCE
fde526f59d
Update pdf_einstein.modules.php 2019-08-05 14:58:50 +02:00
Regis Houssin
e81ccf1cff FIX addinf a "div" for better interaction with login submit button 2019-08-04 17:21:13 +02:00
Laurent Destailleur
d663657f15 FIX format of field with type timestamp 2019-08-04 13:06:48 +02:00
Laurent Destailleur
31648f856c FIX format of field with type timestamp 2019-08-04 13:04:37 +02:00
Laurent Destailleur
5b2ca3b631 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/commonobject.class.php
2019-08-03 16:37:25 +02:00
Laurent Destailleur
25ee539f92 FIX Missing where on entity
Conflicts:
	htdocs/core/class/commonobject.class.php
2019-08-03 16:35:15 +02:00
Laurent Destailleur
acf8314935 FIX Missing where on entity 2019-08-03 16:32:35 +02:00
Alexandre SPANGARO
7eb48a3f9c Fix month of the fiscal year start min 1 max 12 / january = 1 2019-08-03 06:04:42 +02:00
Alexandre SPANGARO
552f160235 Merge branch 'develop' into 11.0_fiscalyear 2019-08-03 05:59:57 +02:00
Laurent Destailleur
55e9335cd2 Fix code comment 2019-08-02 19:26:04 +02:00
Laurent Destailleur
c34739ab3f Fix A file for a hidden feature provides a service without security
checks.
2019-08-02 19:25:50 +02:00
Laurent Destailleur
5ee9a88181 NEW Add anonymous telemetry 2019-08-02 19:21:25 +02:00
Laurent Destailleur
4fb8f6663a Fix code comment 2019-08-02 17:16:13 +02:00
Laurent Destailleur
b9ee95314a SEC restrictedArea protects also the 'update' action 2019-08-02 17:12:59 +02:00
Laurent Destailleur
89a5a8188f Fix A file for a hidden feature provides a service without security
checks.
2019-08-02 17:12:03 +02:00
Laurent Destailleur
dc79f8d26b Code comment 2019-08-02 16:52:36 +02:00
Laurent Destailleur
0bc90d81c8 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-02 12:05:12 +02:00
Laurent Destailleur
c01ac05aec FIX Content of email for subscription 2019-08-02 12:04:06 +02:00
Laurent Destailleur
ded8a71b9a
Merge pull request #11614 from grandoc/patch_01_08_2019
add some translation
2019-08-01 16:39:05 +02:00
Laurent Destailleur
cd0d5c41f5
Update interface_20_modWorkflow_WorkflowManager.class.php 2019-08-01 16:37:40 +02:00
Laurent Destailleur
a03771ce61 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-01 16:30:40 +02:00
Laurent Destailleur
3d8f6dca76 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-01 16:30:32 +02:00
Laurent Destailleur
5a719769bc Fix phpcs 2019-08-01 16:29:18 +02:00
Laurent Destailleur
6512435f9f Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/core/modules/cheque/doc/pdf_blochet.class.php
	htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
2019-08-01 16:27:55 +02:00
Laurent Destailleur
bf14b4b3d5 Add Canada Dollar in currency that need symbol before 2019-08-01 16:20:18 +02:00
Laurent Destailleur
24bfd9d98b
Merge pull request #11605 from grandoc/new_branch_01_08_2019
add CAN$ within list of currencies before
2019-08-01 16:18:37 +02:00
Laurent Destailleur
73715f00af
Update functions.lib.php 2019-08-01 16:18:26 +02:00
Laurent Destailleur
008a54ea19
Update functions.lib.php 2019-08-01 16:14:53 +02:00
Philippe GRAND
18a56c7ef2 add some translation 2019-08-01 15:59:37 +02:00
dolibarr95
b066431e0e
Add phone format for Jamaica 2019-08-01 15:46:34 +02:00
Philippe GRAND
b32dbbfb74 Merge remote-tracking branch 'upstream/develop' into develop 2019-08-01 15:43:30 +02:00