diff --git a/ChangeLog b/ChangeLog
index e845af8b95291e9f49a6214a55eb4f5d800687e2..a5d67d88d7f777b968a7bc99ae649e1cabe61320 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -322,6 +322,14 @@ removed. You must now use the 6 parameters way. See file modMyModule.class.php f
***** ChangeLog for 3.5.6 compared to 3.5.5 *****
Fix: Avoid missing class error for fetch_thirdparty method #1973
+Fix: Can't update phone_pro from web service
+Fix: Some security holes.
+Fix: copy extrafields when creating order from proposal.
+Fix: report on action was not filtering by environment.
+Fix: Avoid missing class error.
+Fix: Add function dolEscapeXML.
+Fix: Bad days and month reported by function.
+Fix: Bad margin calculation.
***** ChangeLog for 3.5.5 compared to 3.5.4 *****
Fix: Holiday module was broken. Initializaion of amount of holidays failed.
diff --git a/build/debian/changelog b/build/debian/changelog
index d3772a7678586db2e07a4a5088f0731c0de567c6..e8ea7be482392e289d95dd913067eb6a21d25e7a 100644
--- a/build/debian/changelog
+++ b/build/debian/changelog
@@ -3,81 +3,4 @@ dolibarr (3.7.0-3) UNRELEASED; urgency=low
[ Laurent Destailleur (eldy) ]
* New upstream release.
- -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net> Tue, 21 Oct 2014 12:00:00 +0100
-
-dolibarr (3.6.1-3) UNRELEASED; urgency=low
-
- [ Laurent Destailleur (eldy) ]
- * New upstream release.
-
- -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net> Tue, 23 Sep 2014 12:00:00 +0100
-
-dolibarr (3.6.0-3) UNRELEASED; urgency=low
-
- [ Laurent Destailleur (eldy) ]
- * New upstream release.
-
- -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net> Tue, 15 July 2014 12:00:00 +0100
-
-dolibarr (3.5.5-3) UNRELEASED; urgency=low
-
- [ Laurent Destailleur (eldy) ]
- * New upstream release.
-
- -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net> Tue, 8 July 2014 12:00:00 +0100
-
-dolibarr (3.5.4-3) UNRELEASED; urgency=low
-
- [ Laurent Destailleur (eldy) ]
- * New upstream release.
-
- -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net> Tue, 1 July 2014 12:00:00 +0100
-
-dolibarr (3.5.3-3) UNRELEASED; urgency=low
-
- [ Laurent Destailleur (eldy) ]
- * New upstream release.
-
- -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net> Fri, 2 May 2014 12:00:00 +0100
-
-dolibarr (3.5.2-3) UNRELEASED; urgency=low
-
- [ Laurent Destailleur (eldy) ]
- * New upstream release.
-
- -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net> Fri, 14 March 2014 12:00:00 +0100
-
-dolibarr (3.5.1-3) UNRELEASED; urgency=low
-
- [ Laurent Destailleur (eldy) ]
- * New upstream release.
-
- -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net> Fri, 7 Feb 2014 12:00:00 +0100
-
-dolibarr (3.5.0-3) UNRELEASED; urgency=low
-
- [ Laurent Destailleur (eldy) ]
- * New upstream release.
-
- -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net> Fri, 31 Jan 2014 12:00:00 +0100
-
-dolibarr (3.4.2-3) UNRELEASED; urgency=low
-
- [ Laurent Destailleur (eldy) ]
- * Maintenance release.
-
- -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net> Mon, 30 Dec 2013 12:00:00 +0100
-
-dolibarr (3.4.1-3) UNRELEASED; urgency=low
-
- [ Laurent Destailleur (eldy) ]
- * Maintenance release.
-
- -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net> Mon, 27 Apr 2013 12:00:00 +0100
-
-dolibarr (3.4.0-3) UNRELEASED; urgency=low
-
- [ Laurent Destailleur (eldy) ]
- * Maintenance release.
-
- -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net> Mon, 22 Apr 2013 12:00:00 +0100
+ -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net> Tue, 21 Oct 2014 12:00:00 +0100
\ No newline at end of file
diff --git a/build/rpm/dolibarr_fedora.spec b/build/rpm/dolibarr_fedora.spec
index 1007c84eb96f4566c41c9b28bf663b7710dac204..37bcdf8e96b3c271a9d2ed2e639c09925ee50b49 100755
--- a/build/rpm/dolibarr_fedora.spec
+++ b/build/rpm/dolibarr_fedora.spec
@@ -340,21 +340,3 @@ fi
* Wed Jul 15 2014 Laurent Destailleur 3.6.0-0.3
- Upstream release
-
-* Tue Jul 8 2014 Laurent Destailleur 3.5.5-0.3
-- Upstream release
-
-* Tue Jul 1 2014 Laurent Destailleur 3.5.4-0.3
-- Upstream release
-
-* Fri May 2 2014 Laurent Destailleur 3.5.3-0.3
-- Upstream release
-
-* Fri Feb 14 2014 Laurent Destailleur 3.5.2-0.3
-- Upstream release
-
-* Fri Feb 7 2014 Laurent Destailleur 3.5.1-0.3
-- Upstream release
-
-* Mon Dec 30 2013 Laurent Destailleur 3.5.0-0.3
-- Initial version (#723326)
diff --git a/build/rpm/dolibarr_generic.spec b/build/rpm/dolibarr_generic.spec
index 5fd9a74f1a6de360bbc8c231e08b5f2f84a54418..812e0d3a1c0ae6f4391725d4928d2ea8f19c05f7 100755
--- a/build/rpm/dolibarr_generic.spec
+++ b/build/rpm/dolibarr_generic.spec
@@ -577,20 +577,3 @@ fi
* Wed Jul 15 2014 Laurent Destailleur 3.6.0-0.3
- Upstream release
-* Tue Jul 8 2014 Laurent Destailleur 3.5.5-0.3
-- Upstream release
-
-* Tue Jul 1 2014 Laurent Destailleur 3.5.4-0.3
-- Upstream release
-
-* Fri May 2 2014 Laurent Destailleur 3.5.3-0.3
-- Upstream release
-
-* Fri Feb 14 2014 Laurent Destailleur 3.5.2-0.3
-- Upstream release
-
-* Fri Feb 7 2014 Laurent Destailleur 3.5.1-0.3
-- Upstream release
-
-* Mon Dec 30 2013 Laurent Destailleur 3.5.0-0.3
-- Initial version (#723326)
diff --git a/build/rpm/dolibarr_mandriva.spec b/build/rpm/dolibarr_mandriva.spec
index c6fda416db07e80e5c9894305b2afaf8c6b367c2..5a81827f5fa7abd317dd831f10338a3f4a5e8905 100755
--- a/build/rpm/dolibarr_mandriva.spec
+++ b/build/rpm/dolibarr_mandriva.spec
@@ -346,20 +346,3 @@ fi
* Wed Jul 15 2014 Laurent Destailleur 3.6.0-0.3
- Upstream release
-* Tue Jul 8 2014 Laurent Destailleur 3.5.5-0.3
-- Upstream release
-
-* Tue Jul 1 2014 Laurent Destailleur 3.5.4-0.3
-- Upstream release
-
-* Fri May 2 2014 Laurent Destailleur 3.5.3-0.3
-- Upstream release
-
-* Fri Feb 14 2014 Laurent Destailleur 3.5.2-0.3
-- Upstream release
-
-* Fri Feb 7 2014 Laurent Destailleur 3.5.1-0.3
-- Upstream release
-
-* Mon Dec 30 2013 Laurent Destailleur 3.5.0-0.3
-- Initial version (#723326)
diff --git a/build/rpm/dolibarr_opensuse.spec b/build/rpm/dolibarr_opensuse.spec
index 935ebf2e6df189fae39597d8c2a5fea1d4f9470b..5d1e1e19765afdff3a3097ca3cb645ce636ed397 100755
--- a/build/rpm/dolibarr_opensuse.spec
+++ b/build/rpm/dolibarr_opensuse.spec
@@ -357,20 +357,3 @@ fi
* Wed Jul 15 2014 Laurent Destailleur 3.6.0-0.3
- Upstream release
-* Tue Jul 8 2014 Laurent Destailleur 3.5.5-0.3
-- Upstream release
-
-* Tue Jul 1 2014 Laurent Destailleur 3.5.4-0.3
-- Upstream release
-
-* Fri May 2 2014 Laurent Destailleur 3.5.3-0.3
-- Upstream release
-
-* Fri Feb 14 2014 Laurent Destailleur 3.5.2-0.3
-- Upstream release
-
-* Fri Feb 7 2014 Laurent Destailleur 3.5.1-0.3
-- Upstream release
-
-* Mon Dec 30 2013 Laurent Destailleur 3.5.0-0.3
-- Initial version (#723326)
diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php
index bd2ffa6634271fa16651e543e6854ed3259b9590..db0f9de94bba06e7a9a79c5f6577e4ec94fa4fa7 100644
--- a/htdocs/admin/ihm.php
+++ b/htdocs/admin/ihm.php
@@ -119,7 +119,7 @@ if ($action == 'edit') // Edit
print_fiche_titre($langs->trans("Language"),'','').'<br>';
print '<table summary="edit" class="noborder" width="100%">';
- print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td>';
+ print '<tr class="liste_titre"><td>'.$langs->trans("Parameters").'</td><td>'.$langs->trans("Value").'</td>';
print '<td width="20"> </td>';
print '</tr>';
@@ -161,7 +161,7 @@ if ($action == 'edit') // Edit
// Other
print '<table summary="edit" class="noborder" width="100%">';
- print '<tr class="liste_titre"><td width="35%">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td>';
+ print '<tr class="liste_titre"><td width="35%">'.$langs->trans("Parameters").'</td><td>'.$langs->trans("Value").'</td>';
print '<td width="20"> </td>';
print '</tr>';
@@ -301,7 +301,7 @@ else // Show
// Language
print_fiche_titre($langs->trans("Language"),'','').'<br>';
print '<table class="noborder" width="100%">';
- print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td><td> </td></tr>';
+ print '<tr class="liste_titre"><td>'.$langs->trans("Parameters").'</td><td>'.$langs->trans("Value").'</td><td> </td></tr>';
$var=!$var;
print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("DefaultLanguage").'</td><td>';
@@ -345,7 +345,7 @@ else // Show
// Other
$var=true;
print '<table class="noborder" width="100%">';
- print '<tr class="liste_titre"><td width="35%">'.$langs->trans("Parameter").'</td><td colspan="2">'.$langs->trans("Value").'</td></tr>';
+ print '<tr class="liste_titre"><td width="35%">'.$langs->trans("Parameters").'</td><td colspan="2">'.$langs->trans("Value").'</td></tr>';
$var=!$var;
print '<tr '.$bc[$var].'><td>'.$langs->trans("EnableShowLogo").'</td><td>' . yn($conf->global->MAIN_SHOW_LOGO) . '</td>';
diff --git a/htdocs/core/datepicker.php b/htdocs/core/datepicker.php
index 7e0333bc5aa0cda19c3220d3f4777d435db96619..67af3c7e08350ef67fd13e80a3adb85820bdaa2e 100644
--- a/htdocs/core/datepicker.php
+++ b/htdocs/core/datepicker.php
@@ -39,6 +39,7 @@ require_once '../main.inc.php';
if (GETPOST('lang')) $langs->setDefaultLang(GETPOST('lang')); // If language was forced on URL by the main.inc.php
$langs->load("main");
+$langs->load("agenda");
$right=($langs->trans("DIRECTION")=='rtl'?'left':'right');
$left=($langs->trans("DIRECTION")=='rtl'?'right':'left');
@@ -57,7 +58,7 @@ if (GETPOST('mode') && GETPOST('mode') == 'test')
}
else
{
- print '<title>Calendar</title>';
+ print '<title>'.$langs->trans("Calendar").'</title>';
}
// Define tradMonths javascript array (we define this in datapicker AND in parent page to avoid errors with IE8)
diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php
index 543b0724de22abb554be4f83980e375f13d7bf35..6037f6c77c92610467ac39f3d19505ffed94d798 100644
--- a/htdocs/core/tpl/objectline_create.tpl.php
+++ b/htdocs/core/tpl/objectline_create.tpl.php
@@ -108,10 +108,10 @@ else {
echo '> ';
// Show type selector
echo $langs->trans("FreeLineOfType");
- echo ' ';
echo '</label>';
+ echo ' ';
}
- else
+ else
{
echo '<input type="hidden" id="prod_entry_mode_free" name="prod_entry_mode" value="free">';
// Show type selector