[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] fc2bd4: Fix: [ bug #1380 ] Customer i
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] fc2bd4: Fix: [ bug #1380 ] Customer invoices are not group... |
|
Date: |
Wed, 06 Aug 2014 01:29:59 -0700 |
Branch: refs/heads/3.6_backported
Home: https://github.com/Dolibarr/dolibarr
Commit: fc2bd4ab4e1e8f7af0cced341374c5c8c1b000e8
https://github.com/Dolibarr/dolibarr/commit/fc2bd4ab4e1e8f7af0cced341374c5c8c1b000e8
Author: Laurent Destailleur <address@hidden>
Date: 2014-06-02 (Mon, 02 Jun 2014)
Changed paths:
M ChangeLog
M htdocs/compta/resultat/clientfourn.php
Log Message:
-----------
Fix: [ bug #1380 ] Customer invoices are not grouped in company results
report
(cherry picked from commit bd061f4)
Commit: 1dc3412bbd4c4f30d734d2b831c566e6d2ac1070
https://github.com/Dolibarr/dolibarr/commit/1dc3412bbd4c4f30d734d2b831c566e6d2ac1070
Author: Laurent Destailleur <address@hidden>
Date: 2014-06-03 (Tue, 03 Jun 2014)
Changed paths:
M ChangeLog
M htdocs/compta/resultat/clientfourn.php
Log Message:
-----------
Merge pull request #1636 from marcosgdf/cp-1380
Fix: [ bug #1380 ] Customer invoices are not grouped in company results report
(cherry picked from commit bd061f4)
Commit: 13e434cf683833912653d4061ce14fa23580839f
https://github.com/Dolibarr/dolibarr/commit/13e434cf683833912653d4061ce14fa23580839f
Author: Florian HENRY <address@hidden>
Date: 2014-07-12 (Sat, 12 Jul 2014)
Changed paths:
M build/rpm/dolibarr_fedora.spec
M build/rpm/dolibarr_generic.spec
M build/rpm/dolibarr_mandriva.spec
M build/rpm/dolibarr_opensuse.spec
M htdocs/commande/orderstoinvoice.php
Log Message:
-----------
Merge branch '3.5' of address@hidden:Dolibarr/dolibarr.git into 3.5
Commit: 5309fb380b46e6842968ca9f3069bcedb6a380a8
https://github.com/Dolibarr/dolibarr/commit/5309fb380b46e6842968ca9f3069bcedb6a380a8
Author: Florian HENRY <address@hidden>
Date: 2014-07-21 (Mon, 21 Jul 2014)
Changed paths:
M ChangeLog
M build/makepack-dolibarr.pl
M htdocs/compta/facture/impayees.php
M htdocs/core/class/html.formfile.class.php
M htdocs/core/modules/modSociete.class.php
M htdocs/langs/en_US/admin.lang
M htdocs/margin/productMargins.php
M htdocs/product/class/product.class.php
M htdocs/projet/element.php
M htdocs/theme/amarok/style.css.php
M htdocs/theme/auguria/style.css.php
M htdocs/theme/bureau2crea/style.css.php
M htdocs/theme/cameleo/style.css.php
M htdocs/theme/eldy/style.css.php
Log Message:
-----------
Merge branch '3.5' of address@hidden:Dolibarr/dolibarr.git into 3.5
Commit: 30b41fbd1803c2e628123ba496f780b5cdc448f0
https://github.com/Dolibarr/dolibarr/commit/30b41fbd1803c2e628123ba496f780b5cdc448f0
Author: Florian HENRY <address@hidden>
Date: 2014-07-28 (Mon, 28 Jul 2014)
Changed paths:
M ChangeLog
M build/debian/changelog
M build/doxygen/dolibarr-doxygen.doxyfile
M build/exe/doliwamp/doliwamp.iss
M build/makepack-howto.txt
M build/rpm/dolibarr_fedora.spec
M build/rpm/dolibarr_generic.spec
M build/rpm/dolibarr_mandriva.spec
M build/rpm/dolibarr_opensuse.spec
M htdocs/adherents/liste.php
M htdocs/core/modules/product/mod_codeproduct_leopard.php
M htdocs/core/modules/societe/mod_codeclient_leopard.php
M htdocs/filefunc.inc.php
Log Message:
-----------
Merge branch '3.5' of address@hidden:Dolibarr/dolibarr.git into 3.5
Commit: 23974daca47aee42dc14cf45e518b58fcaa6a3ee
https://github.com/Dolibarr/dolibarr/commit/23974daca47aee42dc14cf45e518b58fcaa6a3ee
Author: Maxime Kohlhaas <address@hidden>
Date: 2014-08-01 (Fri, 01 Aug 2014)
Changed paths:
M htdocs/expedition/index.php
Log Message:
-----------
Fix : shipping list SQL request was not filtering on shipping element
Commit: 8f8c6a9c9eb66841c192908876aabf0d1a9cd562
https://github.com/Dolibarr/dolibarr/commit/8f8c6a9c9eb66841c192908876aabf0d1a9cd562
Author: Florian HENRY <address@hidden>
Date: 2014-08-01 (Fri, 01 Aug 2014)
Changed paths:
M build/debian/dolibarr.postinst
Log Message:
-----------
Merge branch '3.5' of address@hidden:Dolibarr/dolibarr.git into 3.5
Commit: 139dfa5b80ff82ef5acb128e303b298cef3caf22
https://github.com/Dolibarr/dolibarr/commit/139dfa5b80ff82ef5acb128e303b298cef3caf22
Author: Florian HENRY <address@hidden>
Date: 2014-08-01 (Fri, 01 Aug 2014)
Changed paths:
M ChangeLog
M htdocs/core/class/html.formfile.class.php
Log Message:
-----------
Fix : Fusion PDF button on unpaid invoice is no more displayed
Commit: 44f06bef2272fa3ff219a2210b27fda6f9dea806
https://github.com/Dolibarr/dolibarr/commit/44f06bef2272fa3ff219a2210b27fda6f9dea806
Author: Florian HENRY <address@hidden>
Date: 2014-08-01 (Fri, 01 Aug 2014)
Changed paths:
M ChangeLog
M htdocs/compta/facture/impayees.php
M htdocs/core/class/html.formfile.class.php
Log Message:
-----------
Unpaid invoice launch fusion PDF action even if it is only search (with
enter keyboard input instead of lens click)
Commit: 17e272c8ace22ff1410d9dab71227e816b8b9598
https://github.com/Dolibarr/dolibarr/commit/17e272c8ace22ff1410d9dab71227e816b8b9598
Author: Florian HENRY <address@hidden>
Date: 2014-08-01 (Fri, 01 Aug 2014)
Changed paths:
M htdocs/core/class/extrafields.class.php
Log Message:
-----------
Fix extrafield parameters for sellist
Commit: 767ca073749494559929a1751919529f7083db7e
https://github.com/Dolibarr/dolibarr/commit/767ca073749494559929a1751919529f7083db7e
Author: Florian HENRY <address@hidden>
Date: 2014-08-01 (Fri, 01 Aug 2014)
Changed paths:
M .tx/config
M build/debian/dolibarr.postinst
M htdocs/compta/bank/bankid_fr.php
M htdocs/contrat/fiche.php
A htdocs/includes/ckeditor/skins/moono/skin.js
M htdocs/langs/ar_SA/admin.lang
M htdocs/langs/ar_SA/compta.lang
M htdocs/langs/ar_SA/errors.lang
M htdocs/langs/ar_SA/main.lang
M htdocs/langs/bg_BG/admin.lang
M htdocs/langs/bg_BG/compta.lang
M htdocs/langs/bg_BG/errors.lang
M htdocs/langs/bg_BG/main.lang
M htdocs/langs/bs_BA/admin.lang
M htdocs/langs/bs_BA/compta.lang
M htdocs/langs/bs_BA/errors.lang
M htdocs/langs/bs_BA/main.lang
M htdocs/langs/ca_ES/admin.lang
M htdocs/langs/ca_ES/compta.lang
M htdocs/langs/ca_ES/errors.lang
M htdocs/langs/ca_ES/main.lang
M htdocs/langs/cs_CZ/admin.lang
M htdocs/langs/cs_CZ/compta.lang
M htdocs/langs/cs_CZ/errors.lang
M htdocs/langs/cs_CZ/main.lang
M htdocs/langs/da_DK/admin.lang
M htdocs/langs/da_DK/compta.lang
M htdocs/langs/da_DK/errors.lang
M htdocs/langs/da_DK/main.lang
M htdocs/langs/de_DE/admin.lang
M htdocs/langs/de_DE/compta.lang
M htdocs/langs/de_DE/errors.lang
M htdocs/langs/de_DE/main.lang
M htdocs/langs/el_GR/admin.lang
M htdocs/langs/el_GR/companies.lang
M htdocs/langs/el_GR/compta.lang
M htdocs/langs/el_GR/errors.lang
M htdocs/langs/el_GR/main.lang
M htdocs/langs/es_ES/admin.lang
M htdocs/langs/es_ES/bills.lang
M htdocs/langs/es_ES/compta.lang
M htdocs/langs/es_ES/errors.lang
M htdocs/langs/es_ES/main.lang
M htdocs/langs/et_EE/admin.lang
M htdocs/langs/et_EE/bills.lang
M htdocs/langs/et_EE/compta.lang
M htdocs/langs/et_EE/errors.lang
M htdocs/langs/et_EE/install.lang
M htdocs/langs/et_EE/main.lang
M htdocs/langs/et_EE/margins.lang
M htdocs/langs/et_EE/members.lang
M htdocs/langs/et_EE/orders.lang
M htdocs/langs/et_EE/projects.lang
M htdocs/langs/et_EE/stocks.lang
M htdocs/langs/et_EE/users.lang
M htdocs/langs/et_EE/withdrawals.lang
M htdocs/langs/eu_ES/admin.lang
M htdocs/langs/eu_ES/compta.lang
M htdocs/langs/eu_ES/errors.lang
M htdocs/langs/eu_ES/main.lang
M htdocs/langs/fa_IR/admin.lang
M htdocs/langs/fa_IR/compta.lang
M htdocs/langs/fa_IR/errors.lang
M htdocs/langs/fa_IR/main.lang
M htdocs/langs/fi_FI/admin.lang
M htdocs/langs/fi_FI/compta.lang
M htdocs/langs/fi_FI/errors.lang
M htdocs/langs/fi_FI/main.lang
M htdocs/langs/fr_FR/admin.lang
M htdocs/langs/fr_FR/compta.lang
M htdocs/langs/fr_FR/cron.lang
M htdocs/langs/fr_FR/errors.lang
M htdocs/langs/fr_FR/main.lang
M htdocs/langs/he_IL/admin.lang
M htdocs/langs/he_IL/compta.lang
M htdocs/langs/he_IL/errors.lang
M htdocs/langs/he_IL/main.lang
M htdocs/langs/hr_HR/admin.lang
M htdocs/langs/hr_HR/compta.lang
M htdocs/langs/hr_HR/errors.lang
M htdocs/langs/hr_HR/main.lang
M htdocs/langs/hu_HU/admin.lang
M htdocs/langs/hu_HU/compta.lang
M htdocs/langs/hu_HU/errors.lang
M htdocs/langs/hu_HU/main.lang
M htdocs/langs/id_ID/admin.lang
M htdocs/langs/id_ID/compta.lang
M htdocs/langs/id_ID/errors.lang
M htdocs/langs/id_ID/main.lang
M htdocs/langs/is_IS/admin.lang
M htdocs/langs/is_IS/compta.lang
M htdocs/langs/is_IS/errors.lang
M htdocs/langs/is_IS/main.lang
M htdocs/langs/it_IT/admin.lang
M htdocs/langs/it_IT/compta.lang
M htdocs/langs/it_IT/errors.lang
M htdocs/langs/it_IT/main.lang
M htdocs/langs/ja_JP/admin.lang
M htdocs/langs/ja_JP/compta.lang
M htdocs/langs/ja_JP/errors.lang
M htdocs/langs/ja_JP/main.lang
M htdocs/langs/ko_KR/admin.lang
M htdocs/langs/ko_KR/compta.lang
M htdocs/langs/ko_KR/errors.lang
M htdocs/langs/ko_KR/main.lang
M htdocs/langs/lt_LT/admin.lang
M htdocs/langs/lt_LT/compta.lang
M htdocs/langs/lt_LT/errors.lang
M htdocs/langs/lt_LT/main.lang
M htdocs/langs/lv_LV/admin.lang
M htdocs/langs/lv_LV/banks.lang
M htdocs/langs/lv_LV/bills.lang
M htdocs/langs/lv_LV/boxes.lang
M htdocs/langs/lv_LV/cashdesk.lang
M htdocs/langs/lv_LV/categories.lang
M htdocs/langs/lv_LV/commercial.lang
M htdocs/langs/lv_LV/companies.lang
M htdocs/langs/lv_LV/compta.lang
M htdocs/langs/lv_LV/contracts.lang
M htdocs/langs/lv_LV/cron.lang
M htdocs/langs/lv_LV/deliveries.lang
M htdocs/langs/lv_LV/ecm.lang
M htdocs/langs/lv_LV/errors.lang
M htdocs/langs/lv_LV/exports.lang
M htdocs/langs/lv_LV/help.lang
M htdocs/langs/lv_LV/holiday.lang
M htdocs/langs/lv_LV/install.lang
M htdocs/langs/lv_LV/ldap.lang
M htdocs/langs/lv_LV/mailmanspip.lang
M htdocs/langs/lv_LV/mails.lang
M htdocs/langs/lv_LV/main.lang
M htdocs/langs/lv_LV/margins.lang
M htdocs/langs/lv_LV/members.lang
M htdocs/langs/lv_LV/opensurvey.lang
M htdocs/langs/lv_LV/orders.lang
M htdocs/langs/lv_LV/other.lang
M htdocs/langs/lv_LV/paypal.lang
M htdocs/langs/lv_LV/products.lang
M htdocs/langs/lv_LV/projects.lang
M htdocs/langs/lv_LV/propal.lang
M htdocs/langs/lv_LV/sendings.lang
M htdocs/langs/lv_LV/stocks.lang
M htdocs/langs/lv_LV/suppliers.lang
M htdocs/langs/mk_MK/admin.lang
M htdocs/langs/mk_MK/compta.lang
M htdocs/langs/mk_MK/errors.lang
M htdocs/langs/mk_MK/main.lang
M htdocs/langs/nb_NO/admin.lang
M htdocs/langs/nb_NO/compta.lang
M htdocs/langs/nb_NO/errors.lang
M htdocs/langs/nb_NO/main.lang
M htdocs/langs/nl_NL/admin.lang
M htdocs/langs/nl_NL/compta.lang
M htdocs/langs/nl_NL/errors.lang
M htdocs/langs/nl_NL/main.lang
M htdocs/langs/pl_PL/admin.lang
M htdocs/langs/pl_PL/compta.lang
M htdocs/langs/pl_PL/errors.lang
M htdocs/langs/pl_PL/main.lang
M htdocs/langs/pt_PT/admin.lang
M htdocs/langs/pt_PT/compta.lang
M htdocs/langs/pt_PT/errors.lang
M htdocs/langs/pt_PT/main.lang
M htdocs/langs/ro_RO/admin.lang
M htdocs/langs/ro_RO/compta.lang
M htdocs/langs/ro_RO/errors.lang
M htdocs/langs/ro_RO/main.lang
M htdocs/langs/ru_RU/admin.lang
M htdocs/langs/ru_RU/compta.lang
M htdocs/langs/ru_RU/errors.lang
M htdocs/langs/ru_RU/main.lang
M htdocs/langs/sk_SK/admin.lang
M htdocs/langs/sk_SK/compta.lang
M htdocs/langs/sk_SK/errors.lang
M htdocs/langs/sk_SK/main.lang
M htdocs/langs/sl_SI/admin.lang
M htdocs/langs/sl_SI/agenda.lang
M htdocs/langs/sl_SI/commercial.lang
M htdocs/langs/sl_SI/companies.lang
M htdocs/langs/sl_SI/compta.lang
M htdocs/langs/sl_SI/errors.lang
M htdocs/langs/sl_SI/languages.lang
M htdocs/langs/sl_SI/mailmanspip.lang
M htdocs/langs/sl_SI/main.lang
M htdocs/langs/sl_SI/opensurvey.lang
M htdocs/langs/sl_SI/shop.lang
M htdocs/langs/sl_SI/users.lang
M htdocs/langs/sq_AL/admin.lang
M htdocs/langs/sq_AL/compta.lang
M htdocs/langs/sq_AL/errors.lang
M htdocs/langs/sq_AL/main.lang
M htdocs/langs/sv_SE/admin.lang
M htdocs/langs/sv_SE/compta.lang
M htdocs/langs/sv_SE/errors.lang
M htdocs/langs/sv_SE/main.lang
M htdocs/langs/th_TH/admin.lang
M htdocs/langs/th_TH/compta.lang
M htdocs/langs/th_TH/errors.lang
M htdocs/langs/th_TH/main.lang
M htdocs/langs/tr_TR/admin.lang
M htdocs/langs/tr_TR/agenda.lang
M htdocs/langs/tr_TR/commercial.lang
M htdocs/langs/tr_TR/companies.lang
M htdocs/langs/tr_TR/compta.lang
M htdocs/langs/tr_TR/errors.lang
M htdocs/langs/tr_TR/exports.lang
M htdocs/langs/tr_TR/main.lang
M htdocs/langs/tr_TR/projects.lang
M htdocs/langs/uk_UA/admin.lang
M htdocs/langs/uk_UA/compta.lang
M htdocs/langs/uk_UA/errors.lang
M htdocs/langs/uk_UA/main.lang
M htdocs/langs/uz_UZ/admin.lang
M htdocs/langs/uz_UZ/compta.lang
M htdocs/langs/uz_UZ/errors.lang
M htdocs/langs/uz_UZ/main.lang
M htdocs/langs/vi_VN/admin.lang
M htdocs/langs/vi_VN/compta.lang
M htdocs/langs/vi_VN/errors.lang
M htdocs/langs/vi_VN/main.lang
M htdocs/langs/zh_CN/admin.lang
M htdocs/langs/zh_CN/compta.lang
M htdocs/langs/zh_CN/errors.lang
M htdocs/langs/zh_CN/main.lang
M htdocs/langs/zh_TW/admin.lang
M htdocs/langs/zh_TW/compta.lang
M htdocs/langs/zh_TW/errors.lang
M htdocs/langs/zh_TW/main.lang
M htdocs/product/fiche.php
Log Message:
-----------
Merge branch '3.6' of address@hidden:Dolibarr/dolibarr.git into 3.6
Commit: b0011d051459ace3059e512fda3fa0183604ed1e
https://github.com/Dolibarr/dolibarr/commit/b0011d051459ace3059e512fda3fa0183604ed1e
Author: Florian HENRY <address@hidden>
Date: 2014-08-01 (Fri, 01 Aug 2014)
Changed paths:
M htdocs/core/class/extrafields.class.php
Log Message:
-----------
remove debug
Commit: 6ff57e57c2a03cf67bb079738b22e916978b555f
https://github.com/Dolibarr/dolibarr/commit/6ff57e57c2a03cf67bb079738b22e916978b555f
Author: Laurent Destailleur <address@hidden>
Date: 2014-08-02 (Sat, 02 Aug 2014)
Changed paths:
M htdocs/admin/dict.php
Log Message:
-----------
Fix: external link is visible when a module is using tabhelp of
dictionary.
Commit: 4c91788941df954a6f9562593cbcfadcef2a272e
https://github.com/Dolibarr/dolibarr/commit/4c91788941df954a6f9562593cbcfadcef2a272e
Author: Laurent Destailleur <address@hidden>
Date: 2014-08-03 (Sun, 03 Aug 2014)
Changed paths:
M htdocs/admin/agenda_other.php
Log Message:
-----------
Fix: Can not set option when using in nojs mode.
Commit: 9fb11cd13b3453a64084042c627f834433c83e1a
https://github.com/Dolibarr/dolibarr/commit/9fb11cd13b3453a64084042c627f834433c83e1a
Author: Laurent Destailleur <address@hidden>
Date: 2014-08-03 (Sun, 03 Aug 2014)
Changed paths:
M htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
Log Message:
-----------
Fix: Action created by triggers does not saved owner of action.
Commit: 51f1577c84506e4cdb6db2c0662b16b471a12f87
https://github.com/Dolibarr/dolibarr/commit/51f1577c84506e4cdb6db2c0662b16b471a12f87
Author: Laurent Destailleur <address@hidden>
Date: 2014-08-03 (Sun, 03 Aug 2014)
Changed paths:
M htdocs/comm/action/fiche.php
M htdocs/install/mysql/tables/llx_actioncomm.sql
M htdocs/langs/en_US/commercial.lang
Log Message:
-----------
Fix: Field for user into event is "owner".
Commit: 8ea52f52f5e7702f51cebb3778c37725d280176f
https://github.com/Dolibarr/dolibarr/commit/8ea52f52f5e7702f51cebb3778c37725d280176f
Author: Laurent Destailleur <address@hidden>
Date: 2014-08-03 (Sun, 03 Aug 2014)
Changed paths:
M htdocs/core/lib/agenda.lib.php
Log Message:
-----------
Fix: Missing counter into document tab
Commit: b16dc8dbcd7703dbdb2d672d2665ba4006bbed93
https://github.com/Dolibarr/dolibarr/commit/b16dc8dbcd7703dbdb2d672d2665ba4006bbed93
Author: Laurent Destailleur <address@hidden>
Date: 2014-08-03 (Sun, 03 Aug 2014)
Changed paths:
M htdocs/core/lib/agenda.lib.php
Log Message:
-----------
Fix: Tab not selected
Commit: 86b2887d4414daefa4f30fa4e06ef2c35efb0452
https://github.com/Dolibarr/dolibarr/commit/86b2887d4414daefa4f30fa4e06ef2c35efb0452
Author: Laurent Destailleur <address@hidden>
Date: 2014-08-03 (Sun, 03 Aug 2014)
Changed paths:
M htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.5' into 3.6
Commit: bf7a33494ef2e47a46291ff040b5544b4c2f267f
https://github.com/Dolibarr/dolibarr/commit/bf7a33494ef2e47a46291ff040b5544b4c2f267f
Author: Laurent Destailleur <address@hidden>
Date: 2014-08-03 (Sun, 03 Aug 2014)
Changed paths:
M htdocs/install/mysql/migration/3.5.0-3.6.0.sql
M htdocs/install/mysql/migration/repair.sql
Log Message:
-----------
Run request to clean data
Commit: 0834178bf5df02f07d7c37d91ddb13fd7c486069
https://github.com/Dolibarr/dolibarr/commit/0834178bf5df02f07d7c37d91ddb13fd7c486069
Author: Laurent Destailleur <address@hidden>
Date: 2014-08-04 (Mon, 04 Aug 2014)
Changed paths:
M htdocs/theme/eldy/graph-color.php
Log Message:
-----------
Add more colors to fix pb with agenda
Commit: b5bb4c639c5dd98a2716734c63619582b99038bf
https://github.com/Dolibarr/dolibarr/commit/b5bb4c639c5dd98a2716734c63619582b99038bf
Author: Laurent Destailleur <address@hidden>
Date: 2014-08-04 (Mon, 04 Aug 2014)
Changed paths:
M htdocs/install/mysql/migration/3.5.0-3.6.0.sql
M htdocs/install/mysql/migration/repair.sql
Log Message:
-----------
Fix: Clean data
Commit: 8167f308339308953267fae42aee1aa9397c8642
https://github.com/Dolibarr/dolibarr/commit/8167f308339308953267fae42aee1aa9397c8642
Author: Laurent Destailleur <address@hidden>
Date: 2014-08-04 (Mon, 04 Aug 2014)
Changed paths:
M build/makepack-dolibarr.pl
Log Message:
-----------
Fix: Exclude dev dir from bin package.
Commit: e56956110fb98f59faf5fc3c5a4d30d40b3e8860
https://github.com/Dolibarr/dolibarr/commit/e56956110fb98f59faf5fc3c5a4d30d40b3e8860
Author: Laurent Destailleur <address@hidden>
Date: 2014-08-04 (Mon, 04 Aug 2014)
Changed paths:
M htdocs/expedition/index.php
Log Message:
-----------
Merge pull request #1796 from atm-maxime/3.5
Fix : shipping list SQL request was not filtering on shipping element
Commit: d14fcf617c0b6bcae19d3a5578f2d172efa3c7d9
https://github.com/Dolibarr/dolibarr/commit/d14fcf617c0b6bcae19d3a5578f2d172efa3c7d9
Author: Laurent Destailleur <address@hidden>
Date: 2014-08-04 (Mon, 04 Aug 2014)
Changed paths:
M ChangeLog
M htdocs/compta/facture/impayees.php
M htdocs/core/class/html.formfile.class.php
Log Message:
-----------
Merge pull request #1799 from FHenry/3.5
Fix : Fusion PDF button on unpaid invoice is no more displayed
Commit: c7d4b1e3d519bbbd54f05ba7178f86a03fe07176
https://github.com/Dolibarr/dolibarr/commit/c7d4b1e3d519bbbd54f05ba7178f86a03fe07176
Author: Laurent Destailleur <address@hidden>
Date: 2014-08-04 (Mon, 04 Aug 2014)
Changed paths:
M htdocs/core/class/extrafields.class.php
Log Message:
-----------
Merge pull request #1802 from FHenry/3.6
Fix extrafield parameters for sellist
Commit: 863d57004ed232fbd397a7d422cd0330d6f5a98c
https://github.com/Dolibarr/dolibarr/commit/863d57004ed232fbd397a7d422cd0330d6f5a98c
Author: Laurent Destailleur <address@hidden>
Date: 2014-08-04 (Mon, 04 Aug 2014)
Changed paths:
M htdocs/user/fiche.php
Log Message:
-----------
Fix: Field must be invisible
Commit: 6a61587085f4fae34d9ce8bd1ea8b125486087b9
https://github.com/Dolibarr/dolibarr/commit/6a61587085f4fae34d9ce8bd1ea8b125486087b9
Author: Laurent Destailleur <address@hidden>
Date: 2014-08-04 (Mon, 04 Aug 2014)
Changed paths:
M htdocs/core/js/dst.js
M htdocs/core/lib/functions.lib.php
M htdocs/main.inc.php
Log Message:
-----------
Try a fix when timezone string is not standard
Conflicts:
htdocs/includes/adodbtime/adodb-time.inc.php
Commit: 76353bf4274be92687cc63794fc7043c1dfc6398
https://github.com/Dolibarr/dolibarr/commit/76353bf4274be92687cc63794fc7043c1dfc6398
Author: Laurent Destailleur <address@hidden>
Date: 2014-08-04 (Mon, 04 Aug 2014)
Changed paths:
M ChangeLog
M htdocs/compta/facture/impayees.php
M htdocs/core/class/html.formfile.class.php
M htdocs/expedition/index.php
M htdocs/user/fiche.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.5' into 3.6
Conflicts:
htdocs/compta/facture/impayees.php
htdocs/core/lib/functions.lib.php
htdocs/main.inc.php
Commit: ee3f92a1686868b38eb52bcba518eeea842e3869
https://github.com/Dolibarr/dolibarr/commit/ee3f92a1686868b38eb52bcba518eeea842e3869
Author: Laurent Destailleur <address@hidden>
Date: 2014-08-05 (Tue, 05 Aug 2014)
Changed paths:
M htdocs/societe/soc.php
Log Message:
-----------
Fix: When there is an error to update a thirdparty, the number for
supplier and customer code is kept to old value.
Commit: 5027222c339a13bb802685fd4f7c834ea408de7e
https://github.com/Dolibarr/dolibarr/commit/5027222c339a13bb802685fd4f7c834ea408de7e
Author: Laurent Destailleur <address@hidden>
Date: 2014-08-05 (Tue, 05 Aug 2014)
Changed paths:
M htdocs/societe/soc.php
Log Message:
-----------
Fix: When there is an error to update a thirdparty, the number for
supplier and customer code is kept to old value.
Commit: 3a4a1a4c724642adc081421b4adeb9c1031046e5
https://github.com/Dolibarr/dolibarr/commit/3a4a1a4c724642adc081421b4adeb9c1031046e5
Author: Laurent Destailleur <address@hidden>
Date: 2014-08-05 (Tue, 05 Aug 2014)
Changed paths:
M .tx/config
M ChangeLog
M build/debian/dolibarr.postinst
M build/makepack-dolibarr.pl
M htdocs/admin/agenda_other.php
M htdocs/admin/dict.php
M htdocs/comm/action/fiche.php
M htdocs/compta/bank/bankid_fr.php
M htdocs/compta/facture/impayees.php
M htdocs/contrat/fiche.php
M htdocs/core/class/extrafields.class.php
M htdocs/core/class/html.formfile.class.php
M htdocs/core/lib/agenda.lib.php
M htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
M htdocs/expedition/index.php
M htdocs/install/mysql/migration/3.5.0-3.6.0.sql
M htdocs/install/mysql/migration/repair.sql
M htdocs/install/mysql/tables/llx_actioncomm.sql
M htdocs/langs/ar_SA/admin.lang
M htdocs/langs/ar_SA/compta.lang
M htdocs/langs/ar_SA/errors.lang
M htdocs/langs/ar_SA/main.lang
M htdocs/langs/bg_BG/admin.lang
M htdocs/langs/bg_BG/compta.lang
M htdocs/langs/bg_BG/errors.lang
M htdocs/langs/bg_BG/main.lang
M htdocs/langs/bs_BA/admin.lang
M htdocs/langs/bs_BA/compta.lang
M htdocs/langs/bs_BA/errors.lang
M htdocs/langs/bs_BA/main.lang
M htdocs/langs/ca_ES/admin.lang
M htdocs/langs/ca_ES/compta.lang
M htdocs/langs/ca_ES/errors.lang
M htdocs/langs/ca_ES/main.lang
M htdocs/langs/cs_CZ/admin.lang
M htdocs/langs/cs_CZ/compta.lang
M htdocs/langs/cs_CZ/errors.lang
M htdocs/langs/cs_CZ/main.lang
M htdocs/langs/da_DK/admin.lang
M htdocs/langs/da_DK/compta.lang
M htdocs/langs/da_DK/errors.lang
M htdocs/langs/da_DK/main.lang
M htdocs/langs/de_DE/admin.lang
M htdocs/langs/de_DE/compta.lang
M htdocs/langs/de_DE/errors.lang
M htdocs/langs/de_DE/main.lang
M htdocs/langs/el_GR/admin.lang
M htdocs/langs/el_GR/companies.lang
M htdocs/langs/el_GR/compta.lang
M htdocs/langs/el_GR/errors.lang
M htdocs/langs/el_GR/main.lang
M htdocs/langs/en_US/commercial.lang
M htdocs/langs/es_ES/admin.lang
M htdocs/langs/es_ES/bills.lang
M htdocs/langs/es_ES/compta.lang
M htdocs/langs/es_ES/errors.lang
M htdocs/langs/es_ES/main.lang
M htdocs/langs/et_EE/admin.lang
M htdocs/langs/et_EE/bills.lang
M htdocs/langs/et_EE/compta.lang
M htdocs/langs/et_EE/errors.lang
M htdocs/langs/et_EE/install.lang
M htdocs/langs/et_EE/main.lang
M htdocs/langs/et_EE/margins.lang
M htdocs/langs/et_EE/members.lang
M htdocs/langs/et_EE/orders.lang
M htdocs/langs/et_EE/projects.lang
M htdocs/langs/et_EE/stocks.lang
M htdocs/langs/et_EE/users.lang
M htdocs/langs/et_EE/withdrawals.lang
M htdocs/langs/eu_ES/admin.lang
M htdocs/langs/eu_ES/compta.lang
M htdocs/langs/eu_ES/errors.lang
M htdocs/langs/eu_ES/main.lang
M htdocs/langs/fa_IR/admin.lang
M htdocs/langs/fa_IR/compta.lang
M htdocs/langs/fa_IR/errors.lang
M htdocs/langs/fa_IR/main.lang
M htdocs/langs/fi_FI/admin.lang
M htdocs/langs/fi_FI/compta.lang
M htdocs/langs/fi_FI/errors.lang
M htdocs/langs/fi_FI/main.lang
M htdocs/langs/fr_FR/admin.lang
M htdocs/langs/fr_FR/compta.lang
M htdocs/langs/fr_FR/cron.lang
M htdocs/langs/fr_FR/errors.lang
M htdocs/langs/fr_FR/main.lang
M htdocs/langs/he_IL/admin.lang
M htdocs/langs/he_IL/compta.lang
M htdocs/langs/he_IL/errors.lang
M htdocs/langs/he_IL/main.lang
M htdocs/langs/hr_HR/admin.lang
M htdocs/langs/hr_HR/compta.lang
M htdocs/langs/hr_HR/errors.lang
M htdocs/langs/hr_HR/main.lang
M htdocs/langs/hu_HU/admin.lang
M htdocs/langs/hu_HU/compta.lang
M htdocs/langs/hu_HU/errors.lang
M htdocs/langs/hu_HU/main.lang
M htdocs/langs/id_ID/admin.lang
M htdocs/langs/id_ID/compta.lang
M htdocs/langs/id_ID/errors.lang
M htdocs/langs/id_ID/main.lang
M htdocs/langs/is_IS/admin.lang
M htdocs/langs/is_IS/compta.lang
M htdocs/langs/is_IS/errors.lang
M htdocs/langs/is_IS/main.lang
M htdocs/langs/it_IT/admin.lang
M htdocs/langs/it_IT/compta.lang
M htdocs/langs/it_IT/errors.lang
M htdocs/langs/it_IT/main.lang
M htdocs/langs/ja_JP/admin.lang
M htdocs/langs/ja_JP/compta.lang
M htdocs/langs/ja_JP/errors.lang
M htdocs/langs/ja_JP/main.lang
M htdocs/langs/ko_KR/admin.lang
M htdocs/langs/ko_KR/compta.lang
M htdocs/langs/ko_KR/errors.lang
M htdocs/langs/ko_KR/main.lang
M htdocs/langs/lt_LT/admin.lang
M htdocs/langs/lt_LT/compta.lang
M htdocs/langs/lt_LT/errors.lang
M htdocs/langs/lt_LT/main.lang
M htdocs/langs/lv_LV/admin.lang
M htdocs/langs/lv_LV/banks.lang
M htdocs/langs/lv_LV/bills.lang
M htdocs/langs/lv_LV/boxes.lang
M htdocs/langs/lv_LV/cashdesk.lang
M htdocs/langs/lv_LV/categories.lang
M htdocs/langs/lv_LV/commercial.lang
M htdocs/langs/lv_LV/companies.lang
M htdocs/langs/lv_LV/compta.lang
M htdocs/langs/lv_LV/contracts.lang
M htdocs/langs/lv_LV/cron.lang
M htdocs/langs/lv_LV/deliveries.lang
M htdocs/langs/lv_LV/ecm.lang
M htdocs/langs/lv_LV/errors.lang
M htdocs/langs/lv_LV/exports.lang
M htdocs/langs/lv_LV/help.lang
M htdocs/langs/lv_LV/holiday.lang
M htdocs/langs/lv_LV/install.lang
M htdocs/langs/lv_LV/ldap.lang
M htdocs/langs/lv_LV/mailmanspip.lang
M htdocs/langs/lv_LV/mails.lang
M htdocs/langs/lv_LV/main.lang
M htdocs/langs/lv_LV/margins.lang
M htdocs/langs/lv_LV/members.lang
M htdocs/langs/lv_LV/opensurvey.lang
M htdocs/langs/lv_LV/orders.lang
M htdocs/langs/lv_LV/other.lang
M htdocs/langs/lv_LV/paypal.lang
M htdocs/langs/lv_LV/products.lang
M htdocs/langs/lv_LV/projects.lang
M htdocs/langs/lv_LV/propal.lang
M htdocs/langs/lv_LV/sendings.lang
M htdocs/langs/lv_LV/stocks.lang
M htdocs/langs/lv_LV/suppliers.lang
M htdocs/langs/mk_MK/admin.lang
M htdocs/langs/mk_MK/compta.lang
M htdocs/langs/mk_MK/errors.lang
M htdocs/langs/mk_MK/main.lang
M htdocs/langs/nb_NO/admin.lang
M htdocs/langs/nb_NO/compta.lang
M htdocs/langs/nb_NO/errors.lang
M htdocs/langs/nb_NO/main.lang
M htdocs/langs/nl_NL/admin.lang
M htdocs/langs/nl_NL/compta.lang
M htdocs/langs/nl_NL/errors.lang
M htdocs/langs/nl_NL/main.lang
M htdocs/langs/pl_PL/admin.lang
M htdocs/langs/pl_PL/compta.lang
M htdocs/langs/pl_PL/errors.lang
M htdocs/langs/pl_PL/main.lang
M htdocs/langs/pt_PT/admin.lang
M htdocs/langs/pt_PT/compta.lang
M htdocs/langs/pt_PT/errors.lang
M htdocs/langs/pt_PT/main.lang
M htdocs/langs/ro_RO/admin.lang
M htdocs/langs/ro_RO/compta.lang
M htdocs/langs/ro_RO/errors.lang
M htdocs/langs/ro_RO/main.lang
M htdocs/langs/ru_RU/admin.lang
M htdocs/langs/ru_RU/compta.lang
M htdocs/langs/ru_RU/errors.lang
M htdocs/langs/ru_RU/main.lang
M htdocs/langs/sk_SK/admin.lang
M htdocs/langs/sk_SK/compta.lang
M htdocs/langs/sk_SK/errors.lang
M htdocs/langs/sk_SK/main.lang
M htdocs/langs/sl_SI/admin.lang
M htdocs/langs/sl_SI/agenda.lang
M htdocs/langs/sl_SI/commercial.lang
M htdocs/langs/sl_SI/companies.lang
M htdocs/langs/sl_SI/compta.lang
M htdocs/langs/sl_SI/errors.lang
M htdocs/langs/sl_SI/languages.lang
M htdocs/langs/sl_SI/mailmanspip.lang
M htdocs/langs/sl_SI/main.lang
M htdocs/langs/sl_SI/opensurvey.lang
M htdocs/langs/sl_SI/shop.lang
M htdocs/langs/sl_SI/users.lang
M htdocs/langs/sq_AL/admin.lang
M htdocs/langs/sq_AL/compta.lang
M htdocs/langs/sq_AL/errors.lang
M htdocs/langs/sq_AL/main.lang
M htdocs/langs/sv_SE/admin.lang
M htdocs/langs/sv_SE/compta.lang
M htdocs/langs/sv_SE/errors.lang
M htdocs/langs/sv_SE/main.lang
M htdocs/langs/th_TH/admin.lang
M htdocs/langs/th_TH/compta.lang
M htdocs/langs/th_TH/errors.lang
M htdocs/langs/th_TH/main.lang
M htdocs/langs/tr_TR/admin.lang
M htdocs/langs/tr_TR/agenda.lang
M htdocs/langs/tr_TR/commercial.lang
M htdocs/langs/tr_TR/companies.lang
M htdocs/langs/tr_TR/compta.lang
M htdocs/langs/tr_TR/errors.lang
M htdocs/langs/tr_TR/exports.lang
M htdocs/langs/tr_TR/main.lang
M htdocs/langs/tr_TR/projects.lang
M htdocs/langs/uk_UA/admin.lang
M htdocs/langs/uk_UA/compta.lang
M htdocs/langs/uk_UA/errors.lang
M htdocs/langs/uk_UA/main.lang
M htdocs/langs/uz_UZ/admin.lang
M htdocs/langs/uz_UZ/compta.lang
M htdocs/langs/uz_UZ/errors.lang
M htdocs/langs/uz_UZ/main.lang
M htdocs/langs/vi_VN/admin.lang
M htdocs/langs/vi_VN/compta.lang
M htdocs/langs/vi_VN/errors.lang
M htdocs/langs/vi_VN/main.lang
M htdocs/langs/zh_CN/admin.lang
M htdocs/langs/zh_CN/compta.lang
M htdocs/langs/zh_CN/errors.lang
M htdocs/langs/zh_CN/main.lang
M htdocs/langs/zh_TW/admin.lang
M htdocs/langs/zh_TW/compta.lang
M htdocs/langs/zh_TW/errors.lang
M htdocs/langs/zh_TW/main.lang
M htdocs/product/fiche.php
M htdocs/product/price.php
M htdocs/public/members/new.php
M htdocs/theme/eldy/graph-color.php
M htdocs/user/fiche.php
Log Message:
-----------
Merge branch '3.6' of address@hidden:Dolibarr/dolibarr.git into 3.6
Commit: f33df3419c158cc24541ebb739e7b304a69df539
https://github.com/Dolibarr/dolibarr/commit/f33df3419c158cc24541ebb739e7b304a69df539
Author: Laurent Destailleur <address@hidden>
Date: 2014-08-05 (Tue, 05 Aug 2014)
Changed paths:
M htdocs/core/lib/pdf.lib.php
Log Message:
-----------
Fix: mb_strtolower function does not exists on all PHP versions.
Commit: b182b2ff44e9d5957034ef06067df2f2b978330d
https://github.com/Dolibarr/dolibarr/commit/b182b2ff44e9d5957034ef06067df2f2b978330d
Author: Laurent Destailleur <address@hidden>
Date: 2014-08-06 (Wed, 06 Aug 2014)
Changed paths:
M ChangeLog
Log Message:
-----------
Update changelog
Commit: 131c8398ce38c78483296a7d3466b63a55a2da3d
https://github.com/Dolibarr/dolibarr/commit/131c8398ce38c78483296a7d3466b63a55a2da3d
Author: Laurent Destailleur <address@hidden>
Date: 2014-08-06 (Wed, 06 Aug 2014)
Changed paths:
M ChangeLog
Log Message:
-----------
Merge remote-tracking branch 'origin/3.5' into 3.6
Commit: 273b9029b8b48acdce0cec15ed502bd56a43af8e
https://github.com/Dolibarr/dolibarr/commit/273b9029b8b48acdce0cec15ed502bd56a43af8e
Author: Laurent Destailleur <address@hidden>
Date: 2014-08-06 (Wed, 06 Aug 2014)
Changed paths:
M htdocs/core/lib/pdf.lib.php
Log Message:
-----------
Fix: mb_strtolower function does not exists on all PHP versions.
Conflicts:
htdocs/core/lib/pdf.lib.php
Commit: 168f71ac18466a75d871c0a0e81043c3ae8a0ca3
https://github.com/Dolibarr/dolibarr/commit/168f71ac18466a75d871c0a0e81043c3ae8a0ca3
Author: Laurent Destailleur <address@hidden>
Date: 2014-08-06 (Wed, 06 Aug 2014)
Changed paths:
M htdocs/holiday/class/holiday.class.php
M htdocs/holiday/define_holiday.php
M htdocs/holiday/view_log.php
Log Message:
-----------
Fix: Log of leaves was broken on some mysql versions.
Commit: 277bfc8012e42077061ae79501c6e8183c3aff95
https://github.com/Dolibarr/dolibarr/commit/277bfc8012e42077061ae79501c6e8183c3aff95
Author: Laurent Destailleur <address@hidden>
Date: 2014-08-06 (Wed, 06 Aug 2014)
Changed paths:
M htdocs/holiday/class/holiday.class.php
M htdocs/holiday/define_holiday.php
M htdocs/holiday/view_log.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.5' into 3.6
Commit: 9b9e51d50fb764a7031c0b07c8942c675e79c9a8
https://github.com/Dolibarr/dolibarr/commit/9b9e51d50fb764a7031c0b07c8942c675e79c9a8
Author: Laurent Destailleur <address@hidden>
Date: 2014-08-06 (Wed, 06 Aug 2014)
Changed paths:
M htdocs/holiday/class/holiday.class.php
Log Message:
-----------
Fix: removed debug
Commit: 8f73c7a82a41d4ac8afa7a448336d7929833ec4b
https://github.com/Dolibarr/dolibarr/commit/8f73c7a82a41d4ac8afa7a448336d7929833ec4b
Author: Laurent Destailleur <address@hidden>
Date: 2014-08-06 (Wed, 06 Aug 2014)
Changed paths:
M htdocs/holiday/class/holiday.class.php
Log Message:
-----------
Fix: Remove debug
Commit: 85748711b55cb4e1ba1ad54a2382737bd80d2ffb
https://github.com/Dolibarr/dolibarr/commit/85748711b55cb4e1ba1ad54a2382737bd80d2ffb
Author: Laurent Destailleur <address@hidden>
Date: 2014-08-06 (Wed, 06 Aug 2014)
Changed paths:
M htdocs/holiday/class/holiday.class.php
M htdocs/holiday/define_holiday.php
M htdocs/holiday/fiche.php
Log Message:
-----------
Fix: Table holiday_user was not initialized anymore.
Conflicts:
htdocs/holiday/class/holiday.class.php
htdocs/holiday/fiche.php
Commit: 2d524f2edc0f88c30354c54e5968bff6dbe80f5e
https://github.com/Dolibarr/dolibarr/commit/2d524f2edc0f88c30354c54e5968bff6dbe80f5e
Author: Laurent Destailleur <address@hidden>
Date: 2014-08-06 (Wed, 06 Aug 2014)
Changed paths:
M ChangeLog
Log Message:
-----------
Fix: Holiday module was broken. Initializaion of amount of holidays
failed.
Commit: c781bb4d087ef7e14756d315062e88f93585ff55
https://github.com/Dolibarr/dolibarr/commit/c781bb4d087ef7e14756d315062e88f93585ff55
Author: Laurent Destailleur <address@hidden>
Date: 2014-08-06 (Wed, 06 Aug 2014)
Changed paths:
M ChangeLog
M htdocs/holiday/class/holiday.class.php
M htdocs/holiday/define_holiday.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.5' into 3.6
Conflicts:
htdocs/holiday/fiche.php
Commit: f91e847562c22613de572030a4b7b029c70b45e8
https://github.com/Dolibarr/dolibarr/commit/f91e847562c22613de572030a4b7b029c70b45e8
Author: Laurent Destailleur <address@hidden>
Date: 2014-08-06 (Wed, 06 Aug 2014)
Changed paths:
M build/doxygen/dolibarr-doxygen-build.pl
M build/doxygen/dolibarr-doxygen.doxyfile
M build/doxygen/doxygen_header.html
Log Message:
-----------
Qual: Removed had coded value for version.
Commit: 238bd76eb6a950dba058508a65b59b849171494c
https://github.com/Dolibarr/dolibarr/commit/238bd76eb6a950dba058508a65b59b849171494c
Author: Laurent Destailleur <address@hidden>
Date: 2014-08-06 (Wed, 06 Aug 2014)
Log Message:
-----------
Merge remote-tracking branch 'origin/3.5' into 3.6
Commit: 0e2de546609286237b7c4f50c0da01407fef5bda
https://github.com/Dolibarr/dolibarr/commit/0e2de546609286237b7c4f50c0da01407fef5bda
Author: Laurent Destailleur <address@hidden>
Date: 2014-08-06 (Wed, 06 Aug 2014)
Changed paths:
M dev/initdata/mysqldump_dolibarr_3.4.0.sql
Log Message:
-----------
Fix: Clean data init
Commit: 069cf61d728cb628e48f646dd071539146fe1281
https://github.com/Dolibarr/dolibarr/commit/069cf61d728cb628e48f646dd071539146fe1281
Author: Laurent Destailleur <address@hidden>
Date: 2014-08-06 (Wed, 06 Aug 2014)
Changed paths:
M ChangeLog
M htdocs/compta/resultat/clientfourn.php
Log Message:
-----------
Merge branch '3.4' of address@hidden:Dolibarr/dolibarr.git into 3.4
Commit: 86c6709d02efda868e794107153287fcfc25c7bc
https://github.com/Dolibarr/dolibarr/commit/86c6709d02efda868e794107153287fcfc25c7bc
Author: Laurent Destailleur <address@hidden>
Date: 2014-08-06 (Wed, 06 Aug 2014)
Changed paths:
M ChangeLog
M dev/initdata/mysqldump_dolibarr_3.4.0.sql
Log Message:
-----------
Merge remote-tracking branch 'origin/3.4' into 3.5
Commit: bb201010e5538758a1dfc6b3b26167ef3ead3f8d
https://github.com/Dolibarr/dolibarr/commit/bb201010e5538758a1dfc6b3b26167ef3ead3f8d
Author: Laurent Destailleur <address@hidden>
Date: 2014-08-06 (Wed, 06 Aug 2014)
Changed paths:
M dev/initdata/mysqldump_dolibarr_3.4.0.sql
Log Message:
-----------
Fix: Clean data init
Commit: 7f0baa3d6503431d87efc0b357726b8cf3779d6d
https://github.com/Dolibarr/dolibarr/commit/7f0baa3d6503431d87efc0b357726b8cf3779d6d
Author: Laurent Destailleur <address@hidden>
Date: 2014-08-06 (Wed, 06 Aug 2014)
Changed paths:
M dev/initdata/mysqldump_dolibarr_3.4.0.sql
Log Message:
-----------
Merge remote-tracking branch 'origin/3.4' into 3.5
Commit: 86f4b874ebaccec4010dca31a65dd3ff71ffe17a
https://github.com/Dolibarr/dolibarr/commit/86f4b874ebaccec4010dca31a65dd3ff71ffe17a
Author: Laurent Destailleur <address@hidden>
Date: 2014-08-06 (Wed, 06 Aug 2014)
Changed paths:
M dev/initdata/mysqldump_dolibarr_3.1.0.sql
M dev/initdata/mysqldump_dolibarr_3.2.0.sql
M dev/initdata/mysqldump_dolibarr_3.3.0.sql
M dev/initdata/mysqldump_dolibarr_3.4.0.sql
Log Message:
-----------
Fix: Clean data init
Commit: 8c25fdfd2c3ea9076ff7b74fc4e27639b4061407
https://github.com/Dolibarr/dolibarr/commit/8c25fdfd2c3ea9076ff7b74fc4e27639b4061407
Author: Laurent Destailleur <address@hidden>
Date: 2014-08-06 (Wed, 06 Aug 2014)
Changed paths:
M dev/initdata/mysqldump_dolibarr_3.1.0.sql
M dev/initdata/mysqldump_dolibarr_3.2.0.sql
M dev/initdata/mysqldump_dolibarr_3.3.0.sql
M dev/initdata/mysqldump_dolibarr_3.4.0.sql
Log Message:
-----------
Merge remote-tracking branch 'origin/3.4' into 3.5
Commit: 65b7f3d74429723532c86c2d9ac401eb3bce1d1b
https://github.com/Dolibarr/dolibarr/commit/65b7f3d74429723532c86c2d9ac401eb3bce1d1b
Author: Laurent Destailleur <address@hidden>
Date: 2014-08-06 (Wed, 06 Aug 2014)
Changed paths:
M dev/initdata/mysqldump_dolibarr_3.4.0.sql
Log Message:
-----------
Fix: Clean data init
Commit: a430534768df2f75c870e4a4398f308bb5ac8058
https://github.com/Dolibarr/dolibarr/commit/a430534768df2f75c870e4a4398f308bb5ac8058
Author: Laurent Destailleur <address@hidden>
Date: 2014-08-06 (Wed, 06 Aug 2014)
Changed paths:
A .gitattributes
M .gitignore
M .travis.yml
A .tx/config
M COPYRIGHT
M ChangeLog
M README-FR
M README.md
M build.xml
M build/aps/Limitations of APS Support in the Panel_fichiers/highlight.js
M build/aps/Limitations of APS Support in the Panel_fichiers/prettify.js
M build/debian/README.howto
R build/debian/apache.conf
A build/debian/apache/.htaccess
A build/debian/apache/dolibarr.conf
M build/debian/changelog
M build/debian/control
M build/debian/dolibarr.install
M build/debian/dolibarr.lintian-overrides
M build/debian/dolibarr.postinst
M build/debian/dolibarr.postrm
M build/debian/install.forced.php.install
R build/debian/lighttpd.conf
R build/debian/lighttpd.conf
A build/debian/lighttpd/50-dolibarr.conf
A build/debian/lighttpd/50-dolibarr.conf
R build/debian/patches/00list
R build/debian/patches/install.dpatch
A build/debian/patches/series
A build/debian/patches/use-etc-dolibarr-conf.patch
M build/debian/po/fr.po
M build/debian/rules
M build/debian/source/format
M build/doxygen/dolibarr-doxygen-build.pl
M build/doxygen/dolibarr-doxygen.doxyfile
M build/doxygen/doxygen_header.html
R build/doxygen/jenkins_doxygen.doxyfile
M build/exe/doliwamp/UsedPort.cpp
M build/exe/doliwamp/doliwamp.iss
M build/exe/doliwamp/httpd.conf.install
M build/exe/doliwamp/php.ini.install
M build/makepack-dolibarr.pl
M build/makepack-dolibarrmodule.pl
M build/makepack-howto.txt
M build/obs/README
M build/pad/DoliWamp.pml
M build/pad/Dolibarr developpers.cml
M build/pad/Dolibarr.pml
M build/pad/NLTechno.cml
M build/pad/pad_dolibarr.xml
M build/pad/pad_doliwamp.xml
M build/perl/virtualmin/dolibarr.pl
M build/rpm/README
M build/rpm/dolibarr_fedora.spec
M build/rpm/dolibarr_generic.spec
M build/rpm/dolibarr_mandriva.spec
M build/rpm/dolibarr_opensuse.spec
A build/sitemap/README
A build/sitemap/config-bing.xml
A build/sitemap/urllist-wiki.txt
M build/tgz/tar_exclude.txt
M build/zip/zip_exclude.txt
R dev/codesniffer/jenkins_ruleset.xml
M dev/codesniffer/ruleset.xml
M dev/dolibarr_changes.txt
R dev/findutf8bomincludes.sh
M dev/fixdosfiles.sh
A dev/fixnotabfiles.sh
M dev/initdata/generate-commande.php
M dev/initdata/generate-facture.php
M dev/initdata/generate-propale.php
M dev/initdata/generate-societe.php
A dev/initdata/mysqldump_dolibarr_3.5.0.sql
M dev/initdata/savedemo.sh
M dev/iso-normes/countries_iso-3166_en.txt
M dev/iso-normes/countries_iso-3166_fr.txt
M dev/iso-normes/currencies_iso-4217.txt
M dev/iso-normes/locales.txt
A dev/iso-normes/vat_number_names.txt
M dev/resize_window.sh
M dev/skeletons/modMyModule.class.php
M dev/skeletons/skeleton_page.php
M dev/skeletons/skeleton_script.php
M dev/translation/autotranslator.class.php
A dev/translation/txpull.sh
A dev/translation/txpush.sh
A doc/images/dolibarr_screenshot1_300x188.png
A doc/images/dolibarr_screenshot1_300x188.png
A doc/images/dolibarr_screenshot1_640x400.png
A doc/images/dolibarr_screenshot1_640x400.png
M htdocs/adherents/admin/adherent.php
M htdocs/adherents/admin/adherent_extrafields.php
M htdocs/adherents/admin/adherent_type_extrafields.php
R htdocs/adherents/admin/mailman.php
R htdocs/adherents/admin/spip.php
M htdocs/adherents/canvas/actions_adherentcard_common.class.php
M htdocs/adherents/card_subscriptions.php
M htdocs/adherents/cartes/carte.php
M htdocs/adherents/class/adherent.class.php
M htdocs/adherents/class/cotisation.class.php
M htdocs/adherents/cotisations.php
M htdocs/adherents/document.php
M htdocs/adherents/fiche.php
M htdocs/adherents/fiche_subscription.php
M htdocs/adherents/index.php
M htdocs/adherents/liste.php
M htdocs/adherents/note.php
M htdocs/adherents/stats/index.php
M htdocs/adherents/type.php
M htdocs/admin/accounting.php
M htdocs/admin/agenda.php
M htdocs/admin/agenda_extrafields.php
M htdocs/admin/agenda_extsites.php
M htdocs/admin/agenda_other.php
M htdocs/admin/agenda_xcal.php
M htdocs/admin/bank.php
M htdocs/admin/barcode.php
M htdocs/admin/boxes.php
M htdocs/admin/clicktodial.php
M htdocs/admin/commande.php
M htdocs/admin/company.php
M htdocs/admin/compta.php
M htdocs/admin/confexped.php
M htdocs/admin/const.php
M htdocs/admin/contract.php
M htdocs/admin/delais.php
M htdocs/admin/dict.php
M htdocs/admin/dons.php
M htdocs/admin/events.php
M htdocs/admin/expedition.php
M htdocs/admin/facture.php
M htdocs/admin/fckeditor.php
M htdocs/admin/fichinter.php
M htdocs/admin/geoipmaxmind.php
M htdocs/admin/ihm.php
M htdocs/admin/index.php
M htdocs/admin/ldap.php
M htdocs/admin/ldap_contacts.php
M htdocs/admin/ldap_groups.php
M htdocs/admin/ldap_members.php
M htdocs/admin/ldap_users.php
M htdocs/admin/livraison.php
M htdocs/admin/mailing.php
A htdocs/admin/mailman.php
M htdocs/admin/mails.php
M htdocs/admin/menus/index.php
M htdocs/admin/modules.php
M htdocs/admin/notification.php
M htdocs/admin/order_extrafields.php
A htdocs/admin/orderdet_extrafields.php
M htdocs/admin/osc-languages.php
M htdocs/admin/prelevement.php
M htdocs/admin/propal.php
M htdocs/admin/proxy.php
M htdocs/admin/security.php
M htdocs/admin/security_other.php
M htdocs/admin/sms.php
A htdocs/admin/spip.php
M htdocs/admin/stock.php
M htdocs/admin/supplier_invoice.php
M htdocs/admin/supplier_order.php
M htdocs/admin/supplierinvoice_extrafields.php
M htdocs/admin/supplierorder_extrafields.php
M htdocs/admin/syslog.php
M htdocs/admin/system/about.php
M htdocs/admin/system/constall.php
M htdocs/admin/system/database-tables.php
M htdocs/admin/system/database.php
M htdocs/admin/system/dbtable.php
M htdocs/admin/system/dolibarr.php
M htdocs/admin/system/modules.php
A htdocs/admin/system/perf.php
M htdocs/admin/system/xdebug.php
M htdocs/admin/taxes.php
M htdocs/admin/tools/dolibarr_export.php
M htdocs/admin/tools/export.php
M htdocs/admin/tools/index.php
M htdocs/admin/tools/listevents.php
M htdocs/admin/tools/listsessions.php
M htdocs/admin/tools/update.php
M htdocs/admin/triggers.php
M htdocs/admin/user.php
M htdocs/admin/workflow.php
M htdocs/bookmarks/liste.php
M htdocs/boutique/client/fiche.php
M htdocs/boutique/client/index.php
M htdocs/boutique/commande/ca.php
M htdocs/boutique/commande/class/boutiquecommande.class.php
M htdocs/boutique/commande/fiche.php
M htdocs/boutique/commande/index.php
M htdocs/boutique/critiques/bestproduct.php
M htdocs/boutique/critiques/index.php
M htdocs/boutique/index.php
M htdocs/boutique/notification/index.php
M htdocs/boutique/notification/produits.php
M htdocs/boutique/produits/index.php
M htdocs/boutique/produits/osc-liste.php
M htdocs/boutique/promotion/index.php
A htdocs/cache.manifest
M htdocs/cashdesk/admin/cashdesk.php
M htdocs/cashdesk/css/style.css
M htdocs/cashdesk/index.php
M htdocs/cashdesk/index_verif.php
M htdocs/cashdesk/tpl/liste_articles.tpl.php
M htdocs/cashdesk/tpl/ticket.tpl.php
M htdocs/cashdesk/tpl/validation1.tpl.php
M htdocs/cashdesk/validation_verif.php
A htdocs/categories/admin/categorie.php
M htdocs/categories/categorie.php
M htdocs/categories/class/categorie.class.php
M htdocs/categories/fiche.php
M htdocs/categories/index.php
M htdocs/categories/photos.php
M htdocs/categories/viewcat.php
M htdocs/comm/action/class/actioncomm.class.php
M htdocs/comm/action/class/cactioncomm.class.php
M htdocs/comm/action/class/ical.class.php
M htdocs/comm/action/contact.php
M htdocs/comm/action/document.php
M htdocs/comm/action/fiche.php
M htdocs/comm/action/index.php
M htdocs/comm/action/listactions.php
M htdocs/comm/address.php
M htdocs/comm/admin/propal_extrafields.php
A htdocs/comm/admin/propaldet_extrafields.php
M htdocs/comm/bookmark.php
M htdocs/comm/contact.php
M htdocs/comm/fiche.php
M htdocs/comm/index.php
M htdocs/comm/list.php
M htdocs/comm/mailing/cibles.php
M htdocs/comm/mailing/fiche.php
M htdocs/comm/mailing/index.php
M htdocs/comm/mailing/liste.php
M htdocs/comm/propal.php
M htdocs/comm/propal/apercu.php
M htdocs/comm/propal/class/propal.class.php
M htdocs/comm/propal/class/propalestats.class.php
M htdocs/comm/propal/contact.php
M htdocs/comm/propal/document.php
M htdocs/comm/propal/index.php
M htdocs/comm/propal/list.php
M htdocs/comm/propal/note.php
M htdocs/comm/propal/stats/index.php
M htdocs/comm/prospect/class/prospect.class.php
M htdocs/comm/prospect/index.php
M htdocs/comm/prospect/list.php
M htdocs/comm/remise.php
M htdocs/comm/remx.php
M htdocs/commande/apercu.php
M htdocs/commande/class/commande.class.php
M htdocs/commande/class/commandestats.class.php
M htdocs/commande/contact.php
M htdocs/commande/customer.php
M htdocs/commande/document.php
M htdocs/commande/fiche.php
M htdocs/commande/index.php
M htdocs/commande/liste.php
M htdocs/commande/note.php
M htdocs/commande/orderstoinvoice.php
M htdocs/commande/stats/index.php
M htdocs/compta/bank/account.php
M htdocs/compta/bank/annuel.php
M htdocs/compta/bank/bankid_fr.php
M htdocs/compta/bank/bilan.php
M htdocs/compta/bank/categ.php
M htdocs/compta/bank/class/account.class.php
M htdocs/compta/bank/fiche.php
M htdocs/compta/bank/graph.php
M htdocs/compta/bank/index.php
M htdocs/compta/bank/ligne.php
M htdocs/compta/bank/releve.php
M htdocs/compta/bank/search.php
M htdocs/compta/bank/treso.php
M htdocs/compta/charges/index.php
M htdocs/compta/clients.php
M htdocs/compta/deplacement/class/deplacement.class.php
M htdocs/compta/deplacement/document.php
M htdocs/compta/deplacement/fiche.php
M htdocs/compta/deplacement/index.php
M htdocs/compta/deplacement/list.php
M htdocs/compta/deplacement/stats/index.php
M htdocs/compta/dons/fiche.php
M htdocs/compta/dons/liste.php
M htdocs/compta/dons/stats.php
M htdocs/compta/facture.php
A htdocs/compta/facture/admin/facturedet_cust_extrafields.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.4' into 3.5
Commit: 230b1d4bb8527df852aec02077c3f0ca9f691485
https://github.com/Dolibarr/dolibarr/commit/230b1d4bb8527df852aec02077c3f0ca9f691485
Author: Laurent Destailleur <address@hidden>
Date: 2014-08-06 (Wed, 06 Aug 2014)
Changed paths:
M ChangeLog
M dev/initdata/mysqldump_dolibarr_3.1.0.sql
M dev/initdata/mysqldump_dolibarr_3.2.0.sql
M dev/initdata/mysqldump_dolibarr_3.3.0.sql
M dev/initdata/mysqldump_dolibarr_3.4.0.sql
M dev/initdata/mysqldump_dolibarr_3.5.0.sql
M dev/initdata/mysqldump_dolibarr_3.6.0.sql
M test/phpunit/SqlTest.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.5' into 3.6
Conflicts:
test/phpunit/SqlTest.php
Commit: 85647364300e4eaf29a08de563f94bf11ef47e02
https://github.com/Dolibarr/dolibarr/commit/85647364300e4eaf29a08de563f94bf11ef47e02
Author: Laurent Destailleur <address@hidden>
Date: 2014-08-06 (Wed, 06 Aug 2014)
Changed paths:
M ChangeLog
M build/makepack-dolibarr.pl
M dev/initdata/mysqldump_dolibarr_3.1.0.sql
M dev/initdata/mysqldump_dolibarr_3.2.0.sql
M dev/initdata/mysqldump_dolibarr_3.3.0.sql
M dev/initdata/mysqldump_dolibarr_3.4.0.sql
M dev/initdata/mysqldump_dolibarr_3.5.0.sql
M dev/initdata/mysqldump_dolibarr_3.6.0.sql
M htdocs/admin/agenda_other.php
M htdocs/admin/dict.php
M htdocs/comm/action/fiche.php
M htdocs/compta/facture/impayees.php
M htdocs/core/class/extrafields.class.php
M htdocs/core/class/html.formfile.class.php
M htdocs/core/lib/agenda.lib.php
M htdocs/core/lib/pdf.lib.php
M htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
M htdocs/expedition/index.php
M htdocs/holiday/class/holiday.class.php
M htdocs/holiday/define_holiday.php
M htdocs/holiday/view_log.php
M htdocs/install/mysql/migration/3.5.0-3.6.0.sql
M htdocs/install/mysql/migration/repair.sql
M htdocs/install/mysql/tables/llx_actioncomm.sql
M htdocs/langs/en_US/commercial.lang
M htdocs/societe/soc.php
M htdocs/theme/eldy/graph-color.php
M htdocs/user/fiche.php
M test/phpunit/SqlTest.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.6' into 3.6_backported
Compare:
https://github.com/Dolibarr/dolibarr/compare/d7022af355d1...85647364300e