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

Merge remote-tracking branch 'origin/3.5' into develop

Browse Source 
Conflicts:
	build/debian/changelog
	build/exe/doliwamp/doliwamp.iss
	build/makepack-dolibarr.pl
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/filefunc.inc.php
This commit is contained in:
Laurent Destailleur 2013-12-31 16:33:36 +01:00
commit ddde3339f8
10 changed files with 41 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ChangeLog
View File

@ -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 ***** ***** ChangeLog for 3.3.4 compared to 3.3.3 *****
- Fix: [ bug #1001 ] Social Contribution : State not correct - Fix: [ bug #1001 ] Social Contribution : State not correct
- Fix: Better management of pdf generation when tcpdf is not available. - 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 ***** ***** ChangeLog for 3.2.3 compared to 3.2.2 *****
- Fix: Some permission into agenda module. - Fix: Some permission into agenda module.
- Fix: Generation of PDF was not using correct font for some languages. - Fix: Generation of PDF was not using correct font for some languages.
- Fix some translations. - 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 ***** ***** ChangeLog for 3.1.3 compared to 3.1.2 *****
Fix: PgSQL - property must be set if success Fix: PgSQL - property must be set if success
Fix: Provide a solution for backup when mysqldump is not available Fix: Provide a solution for backup when mysqldump is not available
Fix: Bug #460 - Wrong entity assignment when creating a warehouse 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 ***** ***** ChangeLog for 3.1.2 compared to 3.1.1 *****
- Fix: Can clone a proposal - Fix: Can clone a proposal
- Fix: Add member ID in substitution method - Fix: Add member ID in substitution method
- Fix: Duplicate end tag and missing form parts - 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 ***** ***** ChangeLog for 3.1.1 compared to 3.1.0 *****
- New: Add option FACTURE_DEPOSITS_ARE_JUST_PAYMENTS. With this option added, - 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 credit notes are not removed from total amount of invoice but are just
payments used to reducs remain to pay. payments used to reducs remain to pay.
@ -767,7 +769,6 @@ For translators:
***** ChangeLog for 3.0 compared to 2.9.* ***** ***** ChangeLog for 3.0 compared to 2.9.* *****
For users: For users:
- New: Can edit date of cheque receipts. - New: Can edit date of cheque receipts.
- New: Add Sales journal and Purchase journal report. - New: Add Sales journal and Purchase journal report.
@ -863,7 +864,6 @@ For developers:
***** ChangeLog for 2.9 compared to 2.8.* ***** ***** ChangeLog for 2.9 compared to 2.8.* *****
For users: For users:
- New: POS module allow to choose which warehouse to use. - New: POS module allow to choose which warehouse to use.
- New: Support "Department/State" field on company setup, contact, - New: Support "Department/State" field on company setup, contact,
@ -981,7 +981,6 @@ For users:
***** ChangeLog for 2.8 compared to 2.7.* ***** ***** ChangeLog for 2.8 compared to 2.7.* *****
For users: For users:
- New: Support note on trips module - New: Support note on trips module
- New: Can link contacts to projects - New: Can link contacts to projects
@ -1032,7 +1031,6 @@ For developers:
***** ChangeLog for 2.7.1 compared to 2.7 ***** ***** ChangeLog for 2.7.1 compared to 2.7 *****
For users: For users:
- Fix: Bad decimal management for it_IT and fr_BE languages. - Fix: Bad decimal management for it_IT and fr_BE languages.
- Fix: A third party created from a member is created as a - 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.* ***** ***** ChangeLog for 2.7 compared to 2.6.* *****
For users: For users:
- New: Add a print icon to show a page to print without menus. - New: Add a print icon to show a page to print without menus.
- New: Can add a free text on bank cheque receipts. - New: Can add a free text on bank cheque receipts.
@ -1144,7 +1141,6 @@ For developers:
***** ChangeLog for 2.6 compared to 2.5.* ***** ***** ChangeLog for 2.6 compared to 2.5.* *****
For users: For users:
- New: Add filter on status in emailing selector for Dolibarr users. - New: Add filter on status in emailing selector for Dolibarr users.
- New: Can add bookmarks on all pages. - New: Can add bookmarks on all pages.
@ -1227,7 +1223,6 @@ For developers:
***** ChangeLog for 2.5 compared to 2.4.* ***** ***** ChangeLog for 2.5 compared to 2.4.* *****
For users: For users:
- Sessions timeout can be configured to overwrite PHP setup. - Sessions timeout can be configured to overwrite PHP setup.
- Can filter on date in services list. - Can filter on date in services list.
@ -1291,7 +1286,6 @@ For developers:
***** ChangeLog for 2.4 compared to 2.2.* ***** ***** ChangeLog for 2.4 compared to 2.2.* *****
For users: For users:
- Add a calendar module (module agenda) with ical/vcal/rss export. - Add a calendar module (module agenda) with ical/vcal/rss export.
- Look enhancement in graphics (thanks artichow). - Look enhancement in graphics (thanks artichow).
@ -1346,7 +1340,6 @@ For developers:
***** ChangeLog for 2.2 compared to 2.1.* ***** ***** ChangeLog for 2.2 compared to 2.1.* *****
- Add more statistics on main page. - Add more statistics on main page.
- Add option to add message on login page. - Add option to add message on login page.
- Management of categories for third parties. - Management of categories for third parties.
@ -1380,7 +1373,6 @@ For developers:
***** ChangeLog for 2.1 compared to 2.0.* ***** ***** ChangeLog for 2.1 compared to 2.0.* *****
- Added a better installer. - Added a better installer.
- Support user and groups permissions. - Support user and groups permissions.
- Translation in english and support for several languages. - Translation in english and support for several languages.
@ -1445,12 +1437,10 @@ For developers:
***** ChangeLog for 2.0.1 compared to 2.0 ***** ***** ChangeLog for 2.0.1 compared to 2.0 *****
Minor bug fixes Minor bug fixes
***** ChangeLog for 2.0 compared to 1.0.* ***** ***** ChangeLog for 2.0 compared to 1.0.* *****
ChangeLog file size is so important, that it is not included inside Dolibarr ChangeLog file size is so important, that it is not included inside Dolibarr
package. You can find it at www.dolibarr.org package. You can find it at www.dolibarr.org

27
build/debian/changelog
View File

@ -3,14 +3,21 @@ dolibarr (3.6.0-1) unstable; urgency=low
[ Laurent Destailleur (eldy) ] [ Laurent Destailleur (eldy) ]
* New upstream release. * 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) ] [ Laurent Destailleur (eldy) ]
* New upstream release. * 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.2-3) unstable; 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) unstable; urgency=low dolibarr (3.4.1-3) unstable; urgency=low
@ -25,17 +32,3 @@ dolibarr (3.4.0-3) unstable; urgency=low
* Maintenance release. * 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, 22 Apr 2013 12:00:00 +0100
dolibarr (3.4.1) 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

8
build/pad/DoliWamp.pml
View File

@ -4,10 +4,10 @@
<CompanyName /> <CompanyName />
<Program_Info> <Program_Info>
<Program_Name>DoliWamp</Program_Name> <Program_Name>DoliWamp</Program_Name>
<Program_Version>3.3.0</Program_Version> <Program_Version>3.5.0</Program_Version>
<Program_Release_Month>08</Program_Release_Month> <Program_Release_Month>01</Program_Release_Month>
<Program_Release_Day>10</Program_Release_Day> <Program_Release_Day>01</Program_Release_Day>
<Program_Release_Year>2012</Program_Release_Year> <Program_Release_Year>2014</Program_Release_Year>
<Program_Cost_Dollars /> <Program_Cost_Dollars />
<Program_Cost_Other_Code /> <Program_Cost_Other_Code />
<Program_Cost_Other /> <Program_Cost_Other />

8
build/pad/Dolibarr.pml
View File

@ -4,10 +4,10 @@
<CompanyName /> <CompanyName />
<Program_Info> <Program_Info>
<Program_Name>Dolibarr</Program_Name> <Program_Name>Dolibarr</Program_Name>
<Program_Version>3.3.0</Program_Version> <Program_Version>3.5.0</Program_Version>
<Program_Release_Month>08</Program_Release_Month> <Program_Release_Month>01</Program_Release_Month>
<Program_Release_Day>10</Program_Release_Day> <Program_Release_Day>01</Program_Release_Day>
<Program_Release_Year>2012</Program_Release_Year> <Program_Release_Year>2014</Program_Release_Year>
<Program_Cost_Dollars /> <Program_Cost_Dollars />
<Program_Cost_Other_Code /> <Program_Cost_Other_Code />
<Program_Cost_Other /> <Program_Cost_Other />

8
build/pad/pad_dolibarr.xml
View File

@ -34,10 +34,10 @@
</Company_Info> </Company_Info>
<Program_Info> <Program_Info>
<Program_Name>Dolibarr</Program_Name> <Program_Name>Dolibarr</Program_Name>
<Program_Version>3.4</Program_Version> <Program_Version>3.5</Program_Version>
<Program_Release_Month>07</Program_Release_Month> <Program_Release_Month>01</Program_Release_Month>
<Program_Release_Day>07</Program_Release_Day> <Program_Release_Day>01</Program_Release_Day>
<Program_Release_Year>2013</Program_Release_Year> <Program_Release_Year>2014</Program_Release_Year>
<Program_Cost_Dollars /> <Program_Cost_Dollars />
<Program_Cost_Other_Code /> <Program_Cost_Other_Code />
<Program_Cost_Other /> <Program_Cost_Other />

18
build/pad/pad_doliwamp.xml
View File

@ -17,15 +17,15 @@
<Contact_Info> <Contact_Info>
<Author_First_Name>NLTechno</Author_First_Name> <Author_First_Name>NLTechno</Author_First_Name>
<Author_Last_Name>NLTechno</Author_Last_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_First_Name>NLTechno</Contact_First_Name>
<Contact_Last_Name>NLTechno</Contact_Last_Name> <Contact_Last_Name>NLTechno</Contact_Last_Name>
<Contact_Email>dolibarr@nltechno.com</Contact_Email> <Contact_Email>contact@nltechno.com</Contact_Email>
</Contact_Info> </Contact_Info>
<Support_Info> <Support_Info>
<Sales_Email>dolibarr@nltechno.com</Sales_Email> <Sales_Email>support@nltechno.com</Sales_Email>
<Support_Email>dolibarr@nltechno.com</Support_Email> <Support_Email>support@nltechno.com</Support_Email>
<General_Email>dolibarr@nltechno.com</General_Email> <General_Email>support@nltechno.com</General_Email>
<Sales_Phone /> <Sales_Phone />
<Support_Phone /> <Support_Phone />
<General_Phone /> <General_Phone />
@ -34,10 +34,10 @@
</Company_Info> </Company_Info>
<Program_Info> <Program_Info>
<Program_Name>DoliWamp</Program_Name> <Program_Name>DoliWamp</Program_Name>
<Program_Version>3.4</Program_Version> <Program_Version>3.5</Program_Version>
<Program_Release_Month>07</Program_Release_Month> <Program_Release_Month>01</Program_Release_Month>
<Program_Release_Day>07</Program_Release_Day> <Program_Release_Day>01</Program_Release_Day>
<Program_Release_Year>2013</Program_Release_Year> <Program_Release_Year>2014</Program_Release_Year>
<Program_Cost_Dollars /> <Program_Cost_Dollars />
<Program_Cost_Other_Code /> <Program_Cost_Other_Code />
<Program_Cost_Other /> <Program_Cost_Other />

2
build/rpm/dolibarr_fedora.spec
View File

@ -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 # 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 %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) - Initial version (#723326)

2
build/rpm/dolibarr_generic.spec
View File

@ -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 # 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 %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) - Initial version (#723326)

2
build/rpm/dolibarr_mandriva.spec
View File

@ -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 # 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 %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) - Initial version (#723326)

2
build/rpm/dolibarr_opensuse.spec
View File

@ -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 # 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 %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) - Initial version (#723326)