[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 13e434: Merge branch '3.5' of address
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 13e434: Merge branch '3.5' of address@hidden:Dolibarr/doli... |
|
Date: |
Mon, 04 Aug 2014 13:20:08 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
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: 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: c2be3364e0e2f12d65006e9470c191371c92c111
https://github.com/Dolibarr/dolibarr/commit/c2be3364e0e2f12d65006e9470c191371c92c111
Author: Laurent Destailleur <address@hidden>
Date: 2014-08-04 (Mon, 04 Aug 2014)
Changed paths:
M ChangeLog
M build/makepack-dolibarr.pl
M htdocs/compta/facture/impayees.php
M htdocs/core/class/extrafields.class.php
M htdocs/core/class/html.formfile.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/theme/eldy/graph-color.php
M htdocs/user/fiche.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.6' into develop
Compare:
https://github.com/Dolibarr/dolibarr/compare/b8a0f6aec9d1...c2be3364e0e2