lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'bug-1784' of https://github.com/marcosgdf/dolibarr into

Browse Source 
marcosgdf-bug-1784

Conflicts:
	ChangeLog
This commit is contained in:
Laurent Destailleur 2015-01-18 15:13:26 +01:00
commit 7b7b8f376f
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -16,6 +16,7 @@ English Dolibarr ChangeLog
- Fix: [ bug #1796 ] Unable to use numeration modules from an external module - Fix: [ bug #1796 ] Unable to use numeration modules from an external module
- Fix: [ bug #1783 ] SQL error when enabling 3rd party module with PostgreSQL and MySQL strict mode ON - Fix: [ bug #1783 ] SQL error when enabling 3rd party module with PostgreSQL and MySQL strict mode ON
- Fix: [ bug #1717 ] Sorting unpaid invoices by amount received brings due amount - Fix: [ bug #1717 ] Sorting unpaid invoices by amount received brings due amount
- Fix: [ bug #1784 ] MOTD doesn't show up in Amarok theme
***** ChangeLog for 3.6.2 compared to 3.6.1 ***** ***** ChangeLog for 3.6.2 compared to 3.6.1 *****
- Fix: fix ErrorBadValueForParamNotAString error message in price customer multiprice. - Fix: fix ErrorBadValueForParamNotAString error message in price customer multiprice.

2
htdocs/core/tpl/login.tpl.php
View File

@ -203,7 +203,7 @@ if (isset($conf->file->main_authentication) && preg_match('/openid/',$conf->file
<?php if ($main_home) <?php if ($main_home)
{ {
?> ?>
<div class="center" class="login_main_home" style="max-width: 80%"> <div class="login_main_home" style="max-width: 80%">
<?php echo $main_home; ?> <?php echo $main_home; ?>
</div><br> </div><br>
<?php <?php