Laurent Destailleur 5f79b2d0c6 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	htdocs/accountancy/admin/account.php
	htdocs/accountancy/admin/categories.php
	htdocs/expensereport/class/expensereport.class.php
	htdocs/install/mysql/migration/4.0.0-5.0.0.sql

2017-03-05 22:11:35 +01:00

..

admin

[Qual] comments should be in english

2015-12-22 09:37:27 +01:00

class

Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop

2017-02-02 02:25:49 +01:00

stats

NEW Can filter on status on objects on the "statistics" page.

2016-11-03 19:50:04 +01:00

tpl

Miscellaneous fixes

2016-11-12 12:40:06 +01:00

apercu.php

NEW Add type "url" as possible extrafield.

2016-11-08 17:21:26 +01:00

contact.php

Continue work on dol_banner

2016-12-11 13:16:21 +01:00

document.php

Continue work on dol_banner

2016-12-11 13:16:21 +01:00

fiche-rec.php

FIX The vat rate line used when adding a predefined product was wrong if

2017-03-04 22:27:44 +01:00

index.html

Removed index.php and replaced them with blank index.html as it is more appropriate

2014-07-12 23:18:57 +02:00

info.php

Continue work on dol_banner

2016-12-11 13:16:21 +01:00

list.php

Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop

2017-02-10 17:34:23 +01:00

note.php

Continue work on dol_banner

2016-12-11 13:16:21 +01:00

prelevement.php

Continue work on dol_banner

2016-12-11 13:16:21 +01:00