Skip to content

Commit

Permalink
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
Browse files Browse the repository at this point in the history
Conflicts:
	ChangeLog
	htdocs/filefunc.inc.php
	htdocs/product/list.php
  • Loading branch information
eldy committed Nov 6, 2017
2 parents 1d9873e + 7d4b43f commit 6eb2204
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 1 deletion.
17 changes: 17 additions & 0 deletions ChangeLog
Expand Up @@ -252,6 +252,23 @@ Following changes may create regression for some external modules, but were nece
content by doing a print into function, sometimes by returning content into "resprint". This has been fixed to follow
hook specifications so you must return output into "resprint".


***** ChangeLog for 5.0.7 compared to 5.0.6 *****
FIX: #7000 Dashboard link for late pending payment supplier invoices do not work
FIX: #7148
FIX: #7325 Default VAT rate when editing template invoices is 0%
FIX: #7366 renaming table with pgsql
FIX: #7391
FIX: #7510 Bug: extrafield content disappear when generate pdf within intervention
FIX: Agenda events are not exported in the ICAL, VCAL if begin exactly with the same $datestart
FIX: Bad link to unpayed suppliers invoices
FIX: bankentries search conciliated if val 0
FIX: multicompany better accuracy in rounding and with revenue stamp.
FIX: PDF output was sharing 2 different currencies in same total
FIX: Upgrade missing on field
FIX: wrong key in selectarray
FIX: wrong personnal project time spent

***** ChangeLog for 5.0.6 compared to 5.0.5 *****
FIX: Removed a bad symbolic link into custom directory.
FIX: Renaming a resource ref rename also the directory of attached files.
Expand Down
2 changes: 1 addition & 1 deletion htdocs/product/list.php
Expand Up @@ -251,7 +251,7 @@

if ($search_type != '' && $search_type != '-1')
{
if ($search_type==1)
if ($search_type == 1)
{
$texte = $langs->trans("Services");
}
Expand Down

0 comments on commit 6eb2204

Please sign in to comment.