diff --git a/ChangeLog b/ChangeLog
index bbbd2a97e8970f7924f5e0ddef10e527363564b5..68d6b1848f14a0d16a5a755cf7f541cd6194680f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,7 +6,7 @@ WARNING: Do not try to make any Dolibarr upgrade if you are running Mysql versio
Mysql version 5.5.40 has a very critical bug making your data beeing definitely lost.
You may also experience troubles with Mysql 5.5.41 with error "Lost connection" during migration.
Upgrading to any other version or any other database system is abolutely required BEFORE trying
-to make a migration.
+make a Dolibarr upgrade.
***** ChangeLog for 3.8 compared to 3.7.* *****
@@ -48,6 +48,18 @@ Dolibarr better:
- Fix: [ Bug #2714 ] Members -> Memberxy-> Agenda -> technical Error
- Fix: [ Bug #2713 ] 3.7.0 mailing-unsubscribe.php not unsubscribe
+- Path to save photos of products was moved in 3.7.0 to match path of other attached files. If you had loose
+ your photo on the photo tab of products, you can set the constant "PRODUCT_USE_OLD_PATH_FOR_PHOTO" to
+ restore old path.
+
+WARNING:
+
+Do not try to make any Dolibarr upgrade if you are running Mysql version 5.5.40.
+Mysql version 5.5.40 has a very critical bug making your data beeing definitely lost.
+You may also experience troubles with Mysql 5.5.41 with error "Lost connection" during migration.
+Upgrading to any other version or database system is abolutely required BEFORE trying to
+make a Dolibarr upgrade.
+
***** ChangeLog for 3.7 compared to 3.6.* *****
For users:
- New: Match other auth system: Login can be done entering login or user
@@ -203,9 +215,19 @@ For developers:
- Qual: Replace all constants ACCOUNTINGEX_* by ACCOUNTING_* to simplify migration of the module
- Fix: [ bug #1724 ] Can't add a submenu to projects
+WARNING:
+
+Do not try to make any Dolibarr upgrade if you are running Mysql version 5.5.40.
+Mysql version 5.5.40 has a very critical bug making your data beeing definitely lost.
+You may also experience troubles with Mysql 5.5.41 with error "Lost connection" during migration.
+Upgrading to any other version or database system is abolutely required BEFORE trying to
+make a Dolibarr upgrade.
+
WARNING: Following changes may create regression for some external modules, but was necessary to make
Dolibarr better:
+- Path to save photos of products was moved to match path of other attached files. If you had loose your photo
+ on the photo tab of products, you can set the constant "PRODUCT_USE_OLD_PATH_FOR_PHOTO" to restore old path.
- If you can't see trips and expenses records, check that you have the new permission "read all
trips and expenses".
- Deprecated module "oscommerce" were removed.
@@ -217,8 +239,9 @@ Dolibarr better:
- A lot of pages called fiche.php were renamed into card.php
- A lot of pages called liste.php were renamed into list.php
- If you used warehouse/stock module, recheck setup of stock increase/decrease rules of the
- warehouse module and your Point Of Sale module if you use one.
-- Replaced USER_UPDATE_SESSION trigger with an updateSession hook
+ warehouse module and your Point Of Sale module setup if you use one.
+- Replaced USER_UPDATE_SESSION trigger with an updateSession hook may break modules using it.
+
***** ChangeLog for 3.6.3 compared to 3.6.2 *****
- Fix: ref_ext was not saved when recording a customer order from web service
@@ -429,6 +452,7 @@ Fix: [ bug #2583 ] Unable to create a bank transfer with localized numbers
Fix: [ bug #2577 ] Incorrect invoice status in "Linked objects" page of a project
Fix: [ bug #2576 ] Unable to edit a dictionary entry that has # in its ref
Fix: [ bug #2758 ] Product::update sets product note to "null" when $prod->note is null
+Fix: [ bug #2757 ] Deleting product category photo gives "Forbidden access" error
***** ChangeLog for 3.5.6 compared to 3.5.5 *****
Fix: Avoid missing class error for fetch_thirdparty method #1973
diff --git a/build/debian/changelog b/build/debian/changelog
index a8d056d77ab857d5dfc46444bc366c26e1f8765b..72718de7c6c5a449b4ec9611e878aa9c9783ba1f 100644
--- a/build/debian/changelog
+++ b/build/debian/changelog
@@ -3,4 +3,4 @@ dolibarr (3.8.0-3) UNRELEASED; urgency=low
[ Laurent Destailleur (eldy) ]
* New upstream release.
- -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net> Sun, 21 March 2015 12:00:00 +0100
+ -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net> Tue, 12 May 2015 12:00:00 +0100
diff --git a/build/makepack-howto.txt b/build/makepack-howto.txt
index 8c9e3e5b4b76177a588359f8ab25e404857026cc..7f814a826df47232abe620268816f60b43e7adbe 100644
--- a/build/makepack-howto.txt
+++ b/build/makepack-howto.txt
@@ -11,7 +11,6 @@ beta version of Dolibarr, step by step.
- Update version/info in ChangeLog. To generate a changelog, you can do "git log `git merge-base x.y origin/develop`..x.y --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -i -e '^FIX\|NEW'"
- Update version number with x.y.z-w in htdocs/filefunc.inc.php
- Update version number with x.y.z-w in build/debian/changelog
-- Update version number with x.y.z-w in build/rpm/*.spec
- Commit all changes.
- Add a Tag (x.y.betaz_YYYYMMDD) and push it: git push --tags
- Create a branch (x.y).
@@ -33,7 +32,6 @@ complete release of Dolibarr, step by step.
- Update version/info in ChangeLog. To generate a changelog, you can do "git log `git merge-base x.y origin/develop`..x.y --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -i -e '^FIX\|NEW'"
- Update version number with x.y.z in htdocs/filefunc.inc.php
- Update version number with x.y.z in build/debian/changelog
-- Update version number with x.y.z in build/rpm/*.spec
- Commit all changes.
- Run makepack-dolibarr.pl to generate all packages.
diff --git a/build/rpm/dolibarr_fedora.spec b/build/rpm/dolibarr_fedora.spec
index c34cd4e9d616ba85743097ef5669eb206d9d8ce7..f4e1fe2b3309b1d0a831822c015e4c8ab86743b0 100755
--- a/build/rpm/dolibarr_fedora.spec
+++ b/build/rpm/dolibarr_fedora.spec
@@ -335,5 +335,4 @@ fi
# version x.y.z-0.1.a for alpha, x.y.z-0.2.b for beta, x.y.z-0.3 for release
%changelog
-* Wed Oct 29 2014 Laurent Destailleur 3.7.0-0.3
-- Upstream release
+__CHANGELOGSTRING__
diff --git a/build/rpm/dolibarr_generic.spec b/build/rpm/dolibarr_generic.spec
index c3c3b2a79398fac7152ef2c4ecca62343f1b317d..171132aaf513a18d20b1371c8dfacf3946f688d7 100755
--- a/build/rpm/dolibarr_generic.spec
+++ b/build/rpm/dolibarr_generic.spec
@@ -571,7 +571,4 @@ fi
# version x.y.z-0.1.a for alpha, x.y.z-0.2.b for beta, x.y.z-0.3 for release
%changelog
-* Wed Oct 29 2014 Laurent Destailleur 3.7.0-0.3
-- Upstream release
-
-
+__CHANGELOGSTRING__
diff --git a/build/rpm/dolibarr_mandriva.spec b/build/rpm/dolibarr_mandriva.spec
index efe55e2aa7ac2bee041c3903631370a3979fd03a..4d020ad97decb1cee31c992d33648d6fc13713b8 100755
--- a/build/rpm/dolibarr_mandriva.spec
+++ b/build/rpm/dolibarr_mandriva.spec
@@ -340,7 +340,4 @@ fi
# version x.y.z-0.1.a for alpha, x.y.z-0.2.b for beta, x.y.z-0.3 for release
%changelog
-* Wed Oct 29 2014 Laurent Destailleur 3.7.0-0.3
-- Upstream release
-
-
+__CHANGELOGSTRING__
diff --git a/build/rpm/dolibarr_opensuse.spec b/build/rpm/dolibarr_opensuse.spec
index 6a86f9e3ffa7e5c3e12399d7b781b102cb69d49a..f92bf828ed9d64f27eecb776f698ee63668c0a50 100755
--- a/build/rpm/dolibarr_opensuse.spec
+++ b/build/rpm/dolibarr_opensuse.spec
@@ -351,7 +351,4 @@ fi
# version x.y.z-0.1.a for alpha, x.y.z-0.2.b for beta, x.y.z-0.3 for release
%changelog
-* Wed Oct 29 2014 Laurent Destailleur 3.7.0-0.3
-- Upstream release
-
-
+__CHANGELOGSTRING__
diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php
index 94eac327fcdec039806485f25de5e3149cae2679..d0e101054716a9fcb3c7cd5d504ea89ac686942e 100644
--- a/htdocs/expedition/list.php
+++ b/htdocs/expedition/list.php
@@ -122,16 +122,17 @@ if ($resql)
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
+
print_liste_field_titre($langs->trans("Ref"), $_SERVER["PHP_SELF"],"e.ref","",$param,'',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("Company"), $_SERVER["PHP_SELF"],"s.nom", "", $param,'align="left"',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("DateDeliveryPlanned"), $_SERVER["PHP_SELF"],"e.date_delivery","",$param, 'align="center"',$sortfield,$sortorder);
- if($conf->livraison_bon->enabled)
+ if($conf->livraison_bon->enabled)
{
print_liste_field_titre($langs->trans("DeliveryOrder"), $_SERVER["PHP_SELF"],"l.ref","",$param, '',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("DateReceived"), $_SERVER["PHP_SELF"],"l.date_delivery","",$param, 'align="center"',$sortfield,$sortorder);
}
print_liste_field_titre($langs->trans("Status"), $_SERVER["PHP_SELF"],"e.fk_statut","",$param,'align="right"',$sortfield,$sortorder);
- print '<td class="liste_titre"> </td>';
+ print_liste_field_titre('');
print "</tr>\n";
// Lignes des champs de filtre
@@ -149,7 +150,7 @@ if ($resql)
print '<td class="liste_titre">';
print '<input class="flat" size="10" type="text" name="search_ref_liv" value="'.$search_ref_liv.'"';
print '</td>';
-
+
print '<td class="liste_titre"> </td>';
}
print '<td class="liste_titre" align="right"><input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
@@ -168,7 +169,7 @@ if ($resql)
$objp = $db->fetch_object($resql);
$var=!$var;
-
+
// Ref
print "<tr ".$bc[$var].">";
print "<td>";
@@ -198,17 +199,17 @@ if ($resql)
print '<td align="center">';
print dol_print_date($db->jdate($objp->date_expedition),"day");
print '</td>'."\n";
-
- if ($conf->livraison_bon->enabled)
+
+ if ($conf->livraison_bon->enabled)
{
$shipment->fetchObjectLinked($shipment->id,$shipment->element);
$receiving=(! empty($shipment->linkedObjects['delivery'][0])?$shipment->linkedObjects['delivery'][0]:'');
-
+
// Ref
print '<td>';
print !empty($receiving) ? $receiving->getNomUrl($db) : '';
print '</td>';
-
+
print '<td align="center">';
print dol_print_date($db->jdate($objp->date_reception),"day");
print '</td>'."\n";
diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php
index 7dfc7ef1e71888f4712c660f23545bbfd4dd1f09..7c0e9f14a0bb29a221dfedd47610044da71e31a5 100644
--- a/htdocs/filefunc.inc.php
+++ b/htdocs/filefunc.inc.php
@@ -31,6 +31,7 @@
*/
if (! defined('DOL_VERSION')) define('DOL_VERSION','3.8.0-alpha');
+
if (! defined('EURO')) define('EURO',chr(128));
// Define syslog constants
diff --git a/htdocs/theme/amarok/img/stcomm-1.png b/htdocs/theme/amarok/img/stcomm-1.png
index 8b77cfcae4a649bcf4c481f7e216ea431d63c4dc..2e3f98bb6fd1c7b8be370b877b05800b0ed09d29 100644
Binary files a/htdocs/theme/amarok/img/stcomm-1.png and b/htdocs/theme/amarok/img/stcomm-1.png differ
diff --git a/htdocs/theme/auguria/img/stcomm-1.png b/htdocs/theme/auguria/img/stcomm-1.png
index df442fc1edaa803c7a3304408a2259aaa95ec7f4..2e3f98bb6fd1c7b8be370b877b05800b0ed09d29 100644
Binary files a/htdocs/theme/auguria/img/stcomm-1.png and b/htdocs/theme/auguria/img/stcomm-1.png differ
diff --git a/htdocs/theme/cameleo/img/stcomm-1.png b/htdocs/theme/cameleo/img/stcomm-1.png
index af1e72ed8975ad6ea78a9c79ce98aabca4f3a406..2e3f98bb6fd1c7b8be370b877b05800b0ed09d29 100644
Binary files a/htdocs/theme/cameleo/img/stcomm-1.png and b/htdocs/theme/cameleo/img/stcomm-1.png differ
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index ac9b67d975c231444a9cc5e7683cf0184f833127..b1836ef8cdecb80d45e6b487e4f342484443aff7 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -1479,10 +1479,10 @@ class User extends CommonObject
/**
- * Envoie mot de passe par mail
+ * Send new password by email
*
- * @param User $user Object user de l'utilisateur qui fait l'envoi
- * @param string $password Nouveau mot de passe
+ * @param User $user Object user that send email
+ * @param string $password New password
* @param int $changelater 1=Change password only after clicking on confirm email
* @return int < 0 si erreur, > 0 si ok
*/
@@ -1528,7 +1528,7 @@ class User extends CommonObject
$mesg.= $outputlangs->transnoentitiesnoconv("Login")." = ".$this->login."\n";
$mesg.= $outputlangs->transnoentitiesnoconv("Password")." = ".$password."\n\n";
$mesg.= "\n";
- $url = $urlwithroot;
+ $url = $urlwithroot.'/';
$mesg.= $outputlangs->transnoentitiesnoconv("ClickHereToGoTo", $conf->global->MAIN_APPLICATION_TITLE).': '.$url."\n\n";
$mesg.= "--\n";
$mesg.= $user->getFullName($outputlangs); // Username that make then sending
@@ -1847,7 +1847,7 @@ class User extends CommonObject
$result.=($link.img_object(($notooltip?'':$label), 'user', ($notooltip?'':'class="classfortooltip"')).$linkend);
if ($withpicto != 2) $result.=' ';
}
- $result.= $link . $this->getFullName($langs,'','',$maxlen) . $companylink . $linkend;
+ $result.= $link . $this->getFullName($langs,'',-1,$maxlen) . $companylink . $linkend;
return $result;
}