diff --git a/ChangeLog b/ChangeLog
index 9aefed13ba47be511407595ba312a86cf64edecf..4bfb6e735959297de11f65aa24d92b6ed703ec60 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -299,6 +299,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.
@@ -469,7 +475,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.
@@ -623,7 +628,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
@@ -632,7 +636,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
@@ -645,7 +648,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.
@@ -767,7 +769,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.
@@ -863,7 +864,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,
@@ -981,7 +981,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
@@ -1032,7 +1031,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
@@ -1045,7 +1043,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.
@@ -1144,7 +1141,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.
@@ -1227,7 +1223,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.
@@ -1291,7 +1286,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).
@@ -1346,7 +1340,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.
@@ -1380,7 +1373,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.
@@ -1445,12 +1437,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
index 69ee52832c152814933e54fc0974103427ec5f9d..213f8bc04001db44e5441197520a5d316f9e5cff 100644
--- a/build/debian/changelog
+++ b/build/debian/changelog
@@ -3,39 +3,32 @@ dolibarr (3.6.0-1) 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
-dolibarr (3.5.0-1) unstable; urgency=low
+dolibarr (3.5.0-3) 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
-dolibarr (3.4.1-3) unstable; urgency=low
+dolibarr (3.4.2-3) 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.0-3) unstable; urgency=low
+dolibarr (3.4.1-3) unstable; urgency=low
[ Laurent Destailleur (eldy) ]
* Maintenance release.
-- Laurent Destailleur (eldy) <eldy@users.sourceforge.net> Mon, 22 Apr 2013 12:00:00 +0100
-dolibarr (3.4.1) unstable; urgency=low
+dolibarr (3.4.0-3) unstable; urgency=low
[ Laurent Destailleur (eldy) ]
* Maintenance release.
-- Laurent Destailleur (eldy) <eldy@users.sourceforge.net> Mon, 22 Apr 2013 12:00:00 +0100
-
-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
diff --git a/build/pad/DoliWamp.pml b/build/pad/DoliWamp.pml
index dcd0c4447927f9c8c9ae235ff2602e2546eebba4..9209bdbe061425f7a918c468a76b2c12e17842d4 100644
--- a/build/pad/DoliWamp.pml
+++ b/build/pad/DoliWamp.pml
@@ -4,10 +4,10 @@
<CompanyName />
<Program_Info>
<Program_Name>DoliWamp</Program_Name>
- <Program_Version>3.3.0</Program_Version>
- <Program_Release_Month>08</Program_Release_Month>
- <Program_Release_Day>10</Program_Release_Day>
- <Program_Release_Year>2012</Program_Release_Year>
+ <Program_Version>3.5.0</Program_Version>
+ <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/Dolibarr.pml b/build/pad/Dolibarr.pml
index ae62df0dfe32f96c6c292ed6440047eb827369ef..6dafb6b0d7d129a3b022a9885803d10846399e13 100644
--- a/build/pad/Dolibarr.pml
+++ b/build/pad/Dolibarr.pml
@@ -4,10 +4,10 @@
<CompanyName />
<Program_Info>
<Program_Name>Dolibarr</Program_Name>
- <Program_Version>3.3.0</Program_Version>
- <Program_Release_Month>08</Program_Release_Month>
- <Program_Release_Day>10</Program_Release_Day>
- <Program_Release_Year>2012</Program_Release_Year>
+ <Program_Version>3.5.0</Program_Version>
+ <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_dolibarr.xml b/build/pad/pad_dolibarr.xml
index bd379443cf726bd183576e0c1433d38dbd9b649a..0f09644cb9a9bb70e2ecf2d7d455075f9bc8b2b1 100644
--- a/build/pad/pad_dolibarr.xml
+++ b/build/pad/pad_dolibarr.xml
@@ -34,10 +34,10 @@
</Company_Info>
<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_Version>3.5</Program_Version>
+ <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
index 320751fd48934ca2c424b4c8c8f2087f8d5be864..0da0b1891138a636ea8712ef0a268056c5b68e66 100644
--- a/build/pad/pad_doliwamp.xml
+++ b/build/pad/pad_doliwamp.xml
@@ -17,15 +17,15 @@
<Contact_Info>
<Author_First_Name>NLTechno</Author_First_Name>
<Author_Last_Name>NLTechno</Author_Last_Name>
- <Author_Email>dolibarr@nltechno.com</Author_Email>
+ <Author_Email>contact@nltechno.com</Author_Email>
<Contact_First_Name>NLTechno</Contact_First_Name>
<Contact_Last_Name>NLTechno</Contact_Last_Name>
- <Contact_Email>dolibarr@nltechno.com</Contact_Email>
+ <Contact_Email>contact@nltechno.com</Contact_Email>
</Contact_Info>
<Support_Info>
- <Sales_Email>dolibarr@nltechno.com</Sales_Email>
- <Support_Email>dolibarr@nltechno.com</Support_Email>
- <General_Email>dolibarr@nltechno.com</General_Email>
+ <Sales_Email>support@nltechno.com</Sales_Email>
+ <Support_Email>support@nltechno.com</Support_Email>
+ <General_Email>support@nltechno.com</General_Email>
<Sales_Phone />
<Support_Phone />
<General_Phone />
@@ -34,10 +34,10 @@
</Company_Info>
<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_Version>3.5</Program_Version>
+ <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
index 06d9f469f8b2edfa941279189786706c51e8ef26..e509deb8f4b9c0c8e3820fdb0d4dc8321c88a9cd 100755
--- a/build/rpm/dolibarr_fedora.spec
+++ b/build/rpm/dolibarr_fedora.spec
@@ -331,5 +331,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
-* Wed Nov 6 2013 Laurent Destailleur 3.6.0-0.12.b
+* Mon Dec 30 2013 Laurent Destailleur 3.6.0-0.2.b
- Initial version (#723326)
diff --git a/build/rpm/dolibarr_generic.spec b/build/rpm/dolibarr_generic.spec
index 6e1677b4c34473efd887286f8dfd0c4e746671d0..5a7f9eb1db5c100c6911aa840e9395cbc590b2a5 100755
--- a/build/rpm/dolibarr_generic.spec
+++ b/build/rpm/dolibarr_generic.spec
@@ -559,5 +559,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
-* Wed Nov 6 2013 Laurent Destailleur 3.6.0-0.1.b
+* Mon Dec 30 2013 Laurent Destailleur 3.6.0-0.2.b
- Initial version (#723326)
diff --git a/build/rpm/dolibarr_mandriva.spec b/build/rpm/dolibarr_mandriva.spec
index 6ecefbe68237912bf3cbff381ffa16b0db8d5b33..e0ca516608ef29cce8645660fec004d8ad7c7f11 100755
--- a/build/rpm/dolibarr_mandriva.spec
+++ b/build/rpm/dolibarr_mandriva.spec
@@ -336,5 +336,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
-* Wed Nov 6 2013 Laurent Destailleur 3.6.0-0.1.b
+* Mon Dec 30 2013 Laurent Destailleur 3.6.0-0.2.b
- Initial version (#723326)
diff --git a/build/rpm/dolibarr_opensuse.spec b/build/rpm/dolibarr_opensuse.spec
index 1cf4505484b7bc872d6cf4af53711e1872d8f51c..a919ef0d566f31775cb56ae8d1ecf7b75779710e 100755
--- a/build/rpm/dolibarr_opensuse.spec
+++ b/build/rpm/dolibarr_opensuse.spec
@@ -346,5 +346,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
-* Wed Nov 6 2013 Laurent Destailleur 3.6.0-0.1.b
+* Mon Dec 30 2013 Laurent Destailleur 3.6.0-0.2.b
- Initial version (#723326)