Merge remote-tracking branch 'origin/3.3' into 3.4

Conflicts: ChangeLog build/debian/changelog build/exe/doliwamp/doliwamp.iss build/makepack-dolibarr.pl build/pad/pad_dolibarr.xml build/pad/pad_doliwamp.xml build/rpm/dolibarr_fedora.spec build/rpm/dolibarr_generic.spec build/rpm/dolibarr_mandriva.spec build/rpm/dolibarr_opensuse.spec htdocs/filefunc.inc.php
Dolibarr · Dec 31, 2013 · b1ea05e · b1ea05e
2 parents 50df4e1 + 0e54780
commit b1ea05e
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 28 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -2,6 +2,7 @@
 English Dolibarr ChangeLog
 --------------------------------------------------------------
 
+
 ***** ChangeLog for 3.4.2 compared to 3.4.1 *****
 Fix: field's problem into company's page (RIB)
 Fix: Document cerfa doesn't contained firstname & lastname from donator
@@ -149,6 +150,12 @@ backport commit 384e3812eb73a15adafb472cacfb93397a54459b to fix W3C/edit contrac
 
 
 
+***** ChangeLog for 3.3.5 compared to 3.3.4 *****
+- Fix: jcrop file to match debian rules
+- Fix: Add missing country UK.
+- Fix: Minor fix into package.
+- Fix: Add missing label on project field.
+
 ***** ChangeLog for 3.3.4 compared to 3.3.3 *****
 - Fix: [ bug #1001 ] Social Contribution : State not correct
 - Fix: Better management of pdf generation when tcpdf is not available.
@@ -319,7 +326,6 @@ Dolibarr license has also been updated from GPLv2+ to GPLv3+.
 
 
 ***** ChangeLog for 3.2.3 compared to 3.2.2 *****
-
 - Fix: Some permission into agenda module.
 - Fix: Generation of PDF was not using correct font for some languages.
 - Fix some translations.
@@ -473,7 +479,6 @@ WARNING: To reduce technic debt, all functions dolibarr_xxx were renamed int dol
 
 
 ***** ChangeLog for 3.1.3 compared to 3.1.2 *****
-
 Fix: PgSQL - property must be set if success
 Fix: Provide a solution for backup when mysqldump is not available
 Fix: Bug #460 - Wrong entity assignment when creating a warehouse
@@ -482,7 +487,6 @@ Fix: bug #405 - Late icon always displayed on comm/propal.php
 
 
 ***** ChangeLog for 3.1.2 compared to 3.1.1 *****
-
 - Fix: Can clone a proposal
 - Fix: Add member ID in substitution method
 - Fix: Duplicate end tag and missing form parts
@@ -495,7 +499,6 @@ Fix: bug #405 - Late icon always displayed on comm/propal.php
 
 
 ***** ChangeLog for 3.1.1 compared to 3.1.0 *****
-
 - New: Add option FACTURE_DEPOSITS_ARE_JUST_PAYMENTS. With this option added, 
        credit notes are not removed from total amount of invoice but are just 
        payments used to reducs remain to pay.
@@ -617,7 +620,6 @@ For translators:
 
 
 ***** ChangeLog for 3.0 compared to 2.9.* *****
-
 For users:
 - New: Can edit date of cheque receipts.
 - New: Add Sales journal and Purchase journal report.
@@ -713,7 +715,6 @@ For developers:
 
 
 ***** ChangeLog for 2.9 compared to 2.8.* *****
-
 For users:
 - New: POS module allow to choose which warehouse to use.
 - New: Support "Department/State" field on company setup, contact, 
@@ -831,7 +832,6 @@ For users:
 
 
 ***** ChangeLog for 2.8 compared to 2.7.* *****
-
 For users:
 - New: Support note on trips module
 - New: Can link contacts to projects
@@ -882,7 +882,6 @@ For developers:
 
 
 ***** ChangeLog for 2.7.1 compared to 2.7 *****
-
 For users:
 - Fix: Bad decimal management for it_IT and fr_BE languages.
 - Fix: A third party created from a member is created as a 
@@ -895,7 +894,6 @@ For users:
 
 
 ***** ChangeLog for 2.7 compared to 2.6.* *****
-
 For users:
 - New: Add a print icon to show a page to print without menus.
 - New: Can add a free text on bank cheque receipts.
@@ -994,7 +992,6 @@ For developers:
 
 
 ***** ChangeLog for 2.6 compared to 2.5.* *****
-
 For users:
 - New: Add filter on status in emailing selector for Dolibarr users.
 - New: Can add bookmarks on all pages.
@@ -1077,7 +1074,6 @@ For developers:
 
 
 ***** ChangeLog for 2.5 compared to 2.4.* *****
-
 For users:
 - Sessions timeout can be configured to overwrite PHP setup.
 - Can filter on date in services list.
@@ -1141,7 +1137,6 @@ For developers:
 
 
 ***** ChangeLog for 2.4 compared to 2.2.* *****
-
 For users:
 - Add a calendar module (module agenda) with ical/vcal/rss export.
 - Look enhancement in graphics (thanks artichow).
@@ -1196,7 +1191,6 @@ For developers:
 
 
 ***** ChangeLog for 2.2 compared to 2.1.* *****
-
 - Add more statistics on main page.
 - Add option to add message on login page.
 - Management of categories for third parties.
@@ -1230,7 +1224,6 @@ For developers:
 
 
 ***** ChangeLog for 2.1 compared to 2.0.* *****
-
 - Added a better installer.
 - Support user and groups permissions.
 - Translation in english and support for several languages.
@@ -1295,12 +1288,10 @@ For developers:
 
 
 ***** ChangeLog for 2.0.1 compared to 2.0 *****
-
 Minor bug fixes
 
 
 
 ***** ChangeLog for 2.0 compared to 1.0.* *****
-
 ChangeLog file size is so important, that it is not included inside Dolibarr
 package. You can find it at www.dolibarr.org
diff --git a/build/debian/changelog b/build/debian/changelog
@@ -3,7 +3,7 @@ dolibarr (3.4.2) unstable; 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>  Mon, 30 Dec 2013 12:00:00 +0100     
 
 dolibarr (3.4.1) unstable; urgency=low
 
@@ -17,4 +17,4 @@ dolibarr (3.4.0) unstable; urgency=low
   [ Laurent Destailleur (eldy) ]
   * New upstream release.
 
- -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net>  Mon, 22 Apr 2013 12:00:00 +0100     
+ -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net>  Mon, 30 Dec 2013 12:00:00 +0100     
diff --git a/build/pad/pad_dolibarr.xml b/build/pad/pad_dolibarr.xml
@@ -35,9 +35,9 @@
 	<Program_Info>
 		<Program_Name>Dolibarr</Program_Name>
 		<Program_Version>3.4</Program_Version>
-		<Program_Release_Month>07</Program_Release_Month>
-		<Program_Release_Day>07</Program_Release_Day>
-		<Program_Release_Year>2013</Program_Release_Year>
+		<Program_Release_Month>01</Program_Release_Month>
+		<Program_Release_Day>01</Program_Release_Day>
+		<Program_Release_Year>2014</Program_Release_Year>
 		<Program_Cost_Dollars />
 		<Program_Cost_Other_Code />
 		<Program_Cost_Other />

diff --git a/build/pad/pad_doliwamp.xml b/build/pad/pad_doliwamp.xml
@@ -35,9 +35,9 @@
 	<Program_Info>
 		<Program_Name>DoliWamp</Program_Name>
 		<Program_Version>3.4</Program_Version>
-		<Program_Release_Month>07</Program_Release_Month>
-		<Program_Release_Day>07</Program_Release_Day>
-		<Program_Release_Year>2013</Program_Release_Year>
+		<Program_Release_Month>01</Program_Release_Month>
+		<Program_Release_Day>01</Program_Release_Day>
+		<Program_Release_Year>2014</Program_Release_Year>
 		<Program_Cost_Dollars />
 		<Program_Cost_Other_Code />
 		<Program_Cost_Other />

diff --git a/build/rpm/dolibarr_fedora.spec b/build/rpm/dolibarr_fedora.spec
@@ -330,5 +330,5 @@ 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
-* Sun Feb 17 2013 Laurent Destailleur 3.4.2-0.3
+* Mon Dec 30 2013 Laurent Destailleur 3.4.2-0.3
 - Initial version (#723326)
diff --git a/build/rpm/dolibarr_generic.spec b/build/rpm/dolibarr_generic.spec
@@ -558,5 +558,5 @@ 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
-* Sun Feb 17 2013 Laurent Destailleur 3.4.2-0.3
+* Mon Dec 30 2013 Laurent Destailleur 3.4.2-0.3
 - Initial version (#723326)
diff --git a/build/rpm/dolibarr_mandriva.spec b/build/rpm/dolibarr_mandriva.spec
@@ -335,5 +335,5 @@ 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
-* Sun Feb 17 2013 Laurent Destailleur 3.4.2-0.3
+* Mon Dec 30 2013 Laurent Destailleur 3.4.2-0.3
 - Initial version (#723326)
diff --git a/build/rpm/dolibarr_opensuse.spec b/build/rpm/dolibarr_opensuse.spec
@@ -345,5 +345,5 @@ 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
-* Sun Feb 17 2013 Laurent Destailleur 3.4.2-0.3
+* Mon Dec 30 2013 Laurent Destailleur 3.4.2-0.3
 - Initial version (#723326)
diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php