[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] d52a93: Merge remote-tracking branch
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] d52a93: Merge remote-tracking branch 'upstream/3.8' into 3... |
|
Date: |
Sat, 04 Jun 2016 17:21:21 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: d52a93ce4d73e9c97bbc7f738f22e0bf1c45b5b8
https://github.com/Dolibarr/dolibarr/commit/d52a93ce4d73e9c97bbc7f738f22e0bf1c45b5b8
Author: Juanjo Menent <address@hidden>
Date: 2016-04-15 (Fri, 15 Apr 2016)
Changed paths:
M htdocs/compta/localtax/quadri_detail.php
M htdocs/core/lib/tax.lib.php
Log Message:
-----------
Merge remote-tracking branch 'upstream/3.8' into 3.9
Conflicts:
htdocs/compta/localtax/quadri_detail.php
Commit: 2d645c74dc94795ac26eb7f5373b4fcfebcf1a5c
https://github.com/Dolibarr/dolibarr/commit/2d645c74dc94795ac26eb7f5373b4fcfebcf1a5c
Author: Juanjo Menent <address@hidden>
Date: 2016-04-15 (Fri, 15 Apr 2016)
Changed paths:
M htdocs/core/tpl/objectline_create.tpl.php
Log Message:
-----------
Merge remote-tracking branch 'upstream/3.9' into 3.9
Commit: 44746c1899ceddd876f6a775a7e80455ca723691
https://github.com/Dolibarr/dolibarr/commit/44746c1899ceddd876f6a775a7e80455ca723691
Author: Juanjo Menent <address@hidden>
Date: 2016-04-15 (Fri, 15 Apr 2016)
Changed paths:
M htdocs/compta/localtax/quadri_detail.php
Log Message:
-----------
Merge remote-tracking branch 'upstream/3.8' into 3.9
Conflicts:
htdocs/compta/localtax/quadri_detail.php
Commit: 071a2300001c10685c4fcd3eec7bcf696576c90e
https://github.com/Dolibarr/dolibarr/commit/071a2300001c10685c4fcd3eec7bcf696576c90e
Author: Juanjo Menent <address@hidden>
Date: 2016-05-26 (Thu, 26 May 2016)
Changed paths:
M ChangeLog
M build/makepack-dolibarr.pl
M htdocs/accountancy/admin/index.php
M htdocs/adherents/card.php
M htdocs/adherents/card_subscriptions.php
M htdocs/admin/modules.php
M htdocs/barcode/printsheet.php
M htdocs/comm/action/card.php
M htdocs/comm/propal.php
M htdocs/commande/class/commande.class.php
M htdocs/commande/list.php
M htdocs/compta/bank/class/account.class.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/compta/localtax/quadri_detail.php
M htdocs/compta/prelevement/card.php
M htdocs/compta/stats/cabyprodserv.php
M htdocs/contrat/card.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/html.form.class.php
M htdocs/core/class/html.formother.class.php
M htdocs/core/lib/tax.lib.php
M htdocs/core/menus/init_menu_auguria.sql
M htdocs/core/menus/standard/auguria_menu.php
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/core/modules/printing/printgcp.modules.php
M htdocs/expedition/class/expedition.class.php
M htdocs/expensereport/card.php
M htdocs/expensereport/class/expensereport.class.php
M htdocs/filefunc.inc.php
M htdocs/fourn/class/fournisseur.facture.class.php
M htdocs/fourn/commande/dispatch.php
M htdocs/fourn/facture/card.php
M htdocs/fourn/facture/list.php
M htdocs/holiday/class/holiday.class.php
M htdocs/install/mysql/migration/3.8.0-3.9.0.sql
M htdocs/install/mysql/migration/repair.sql
M htdocs/langs/ar_SA/projects.lang
M htdocs/langs/bn_BD/projects.lang
M htdocs/langs/bs_BA/projects.lang
M htdocs/langs/ca_ES/projects.lang
M htdocs/langs/cs_CZ/projects.lang
M htdocs/langs/da_DK/projects.lang
M htdocs/langs/de_DE/projects.lang
M htdocs/langs/en_US/bills.lang
M htdocs/langs/en_US/members.lang
M htdocs/langs/en_US/other.lang
M htdocs/langs/en_US/products.lang
M htdocs/langs/en_US/projects.lang
M htdocs/langs/es_ES/projects.lang
M htdocs/langs/et_EE/projects.lang
M htdocs/langs/eu_ES/projects.lang
M htdocs/langs/fi_FI/projects.lang
M htdocs/langs/fr_FR/projects.lang
M htdocs/langs/he_IL/projects.lang
M htdocs/langs/hr_HR/projects.lang
M htdocs/langs/hu_HU/projects.lang
M htdocs/langs/id_ID/projects.lang
M htdocs/langs/is_IS/projects.lang
M htdocs/langs/it_IT/projects.lang
M htdocs/langs/ka_GE/projects.lang
M htdocs/langs/kn_IN/projects.lang
M htdocs/langs/ko_KR/projects.lang
M htdocs/langs/lo_LA/projects.lang
M htdocs/langs/lt_LT/projects.lang
M htdocs/langs/lv_LV/projects.lang
M htdocs/langs/mk_MK/projects.lang
M htdocs/langs/nb_NO/projects.lang
M htdocs/langs/nl_NL/projects.lang
M htdocs/langs/pl_PL/projects.lang
M htdocs/langs/pt_BR/projects.lang
M htdocs/langs/pt_PT/projects.lang
M htdocs/langs/ro_RO/projects.lang
M htdocs/langs/ru_RU/projects.lang
M htdocs/langs/sk_SK/projects.lang
M htdocs/langs/sl_SI/projects.lang
M htdocs/langs/sq_AL/projects.lang
M htdocs/langs/sr_RS/projects.lang
M htdocs/langs/sv_SE/projects.lang
M htdocs/langs/sw_SW/projects.lang
M htdocs/langs/tr_TR/projects.lang
M htdocs/langs/uk_UA/projects.lang
M htdocs/langs/uz_UZ/projects.lang
M htdocs/langs/vi_VN/projects.lang
M htdocs/langs/zh_CN/projects.lang
M htdocs/langs/zh_TW/projects.lang
M htdocs/main.inc.php
M htdocs/opensurvey/wizard/choix_date.php
M htdocs/product/ajax/products.php
M htdocs/product/class/product.class.php
M htdocs/product/composition/card.php
M htdocs/product/document.php
M htdocs/product/stats/card.php
M htdocs/product/stock/product.php
M htdocs/resource/class/html.formresource.class.php
M htdocs/societe/class/societe.class.php
M htdocs/theme/eldy/style.css.php
M htdocs/user/class/user.class.php
M htdocs/user/group/card.php
M htdocs/webservices/server_productorservice.php
Log Message:
-----------
Merge remote-tracking branch 'upstream/3.9' into 3.9
Conflicts:
htdocs/compta/localtax/quadri_detail.php
Commit: 7773afcbbe82a4a44d698c8d37f77e288b2fe882
https://github.com/Dolibarr/dolibarr/commit/7773afcbbe82a4a44d698c8d37f77e288b2fe882
Author: Juanjo Menent <address@hidden>
Date: 2016-06-01 (Wed, 01 Jun 2016)
Changed paths:
M htdocs/comm/action/index.php
M htdocs/comm/remx.php
M htdocs/commande/card.php
M htdocs/compta/facture.php
M htdocs/contrat/card.php
M htdocs/core/class/html.form.class.php
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/core/modules/modAgenda.class.php
M htdocs/fourn/facture/card.php
M htdocs/langs/en_US/products.lang
M htdocs/societe/agenda.php
M htdocs/societe/list.php
Log Message:
-----------
Merge remote-tracking branch 'upstream/3.9' into 3.9
Commit: 9e85ae3d47dadde1dcfdfe35b45157eb99999902
https://github.com/Dolibarr/dolibarr/commit/9e85ae3d47dadde1dcfdfe35b45157eb99999902
Author: Juanjo Menent <address@hidden>
Date: 2016-06-03 (Fri, 03 Jun 2016)
Log Message:
-----------
Merge remote-tracking branch 'origin/3.9' into 3.9
Commit: 66c73015b2aa8de2f43e494fafe9a1bb84e2f7c8
https://github.com/Dolibarr/dolibarr/commit/66c73015b2aa8de2f43e494fafe9a1bb84e2f7c8
Author: Juanjo Menent <address@hidden>
Date: 2016-06-03 (Fri, 03 Jun 2016)
Changed paths:
M htdocs/compta/index.php
Log Message:
-----------
Fix issues with strict mode
Commit: ff6daebee68dd457544e7833854bb0be15355abb
https://github.com/Dolibarr/dolibarr/commit/ff6daebee68dd457544e7833854bb0be15355abb
Author: Laurent Destailleur <address@hidden>
Date: 2016-06-04 (Sat, 04 Jun 2016)
Changed paths:
M htdocs/fourn/class/fournisseur.product.class.php
Log Message:
-----------
FIX #5203
Commit: a1c7632a501502efbe248f9c8d092404257af7f9
https://github.com/Dolibarr/dolibarr/commit/a1c7632a501502efbe248f9c8d092404257af7f9
Author: Maxime Kohlhaas <address@hidden>
Date: 2016-06-04 (Sat, 04 Jun 2016)
Changed paths:
M htdocs/imports/import.php
Log Message:
-----------
Fix import mapping #5229
Commit: 32b6766a7d560d7c47a042f363709588b8124ae7
https://github.com/Dolibarr/dolibarr/commit/32b6766a7d560d7c47a042f363709588b8124ae7
Author: Laurent Destailleur <address@hidden>
Date: 2016-06-04 (Sat, 04 Jun 2016)
Changed paths:
M htdocs/fourn/commande/card.php
Log Message:
-----------
FIX #5195
Commit: c9834117c9999c6b2c825caea83e70d8d77e4d39
https://github.com/Dolibarr/dolibarr/commit/c9834117c9999c6b2c825caea83e70d8d77e4d39
Author: Laurent Destailleur <address@hidden>
Date: 2016-06-04 (Sat, 04 Jun 2016)
Changed paths:
M htdocs/langs/en_US/main.lang
Log Message:
-----------
Fix #5156
Commit: 43d475aa426313b05f8906676c53fa085489edb7
https://github.com/Dolibarr/dolibarr/commit/43d475aa426313b05f8906676c53fa085489edb7
Author: Juanjo Menent <address@hidden>
Date: 2016-06-04 (Sat, 04 Jun 2016)
Changed paths:
M htdocs/compta/index.php
Log Message:
-----------
Merge pull request #5272 from simnandez/3.9
Fix issues with strict mode
Commit: 5a105b75ecbaff248fd25ed0507897f48276608a
https://github.com/Dolibarr/dolibarr/commit/5a105b75ecbaff248fd25ed0507897f48276608a
Author: Laurent Destailleur <address@hidden>
Date: 2016-06-04 (Sat, 04 Jun 2016)
Changed paths:
M htdocs/imports/import.php
Log Message:
-----------
Merge pull request #5276 from atm-maxime/fix_import_mapping
FIX #5229
Commit: 01b881a0a692cb3d708c1471155b3539a40c4c96
https://github.com/Dolibarr/dolibarr/commit/01b881a0a692cb3d708c1471155b3539a40c4c96
Author: phf <address@hidden>
Date: 2016-06-04 (Sat, 04 Jun 2016)
Changed paths:
M htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
Log Message:
-----------
Fix builddoc with odt lost value of extrafields as "sellist" on view card
Commit: c7aa486d93cf521adc495b1d9735ea196fe7b2bd
https://github.com/Dolibarr/dolibarr/commit/c7aa486d93cf521adc495b1d9735ea196fe7b2bd
Author: Laurent Destailleur <address@hidden>
Date: 2016-06-04 (Sat, 04 Jun 2016)
Changed paths:
M htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
Log Message:
-----------
Merge pull request #5282 from atm-ph/fix_3.9_miss_value_extrafield_on_builddoc
Fix builddoc with odt lost value of extrafields as "sellist" on view …
Commit: bd2fe75d08dde06f130a1e8408f0992458747b4a
https://github.com/Dolibarr/dolibarr/commit/bd2fe75d08dde06f130a1e8408f0992458747b4a
Author: Maxime Kohlhaas <address@hidden>
Date: 2016-06-04 (Sat, 04 Jun 2016)
Changed paths:
M htdocs/comm/propal/class/propal.class.php
M htdocs/commande/class/commande.class.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/fourn/class/fournisseur.facture.class.php
Log Message:
-----------
Fix menus in dashboard links
Commit: 8ccda16ef370e86ee801d3e3790c43ead1625f29
https://github.com/Dolibarr/dolibarr/commit/8ccda16ef370e86ee801d3e3790c43ead1625f29
Author: phf <address@hidden>
Date: 2016-06-04 (Sat, 04 Jun 2016)
Changed paths:
M htdocs/core/class/ldap.class.php
Log Message:
-----------
Fix call function ldap_connect but not exists
Commit: 1552e7f41f41fabca47c0337e8e0b524a492d440
https://github.com/Dolibarr/dolibarr/commit/1552e7f41f41fabca47c0337e8e0b524a492d440
Author: Laurent Destailleur <address@hidden>
Date: 2016-06-04 (Sat, 04 Jun 2016)
Changed paths:
M htdocs/core/class/ldap.class.php
Log Message:
-----------
Merge pull request #5286 from atm-ph/fix_3.7_call_function_not_exists
Fix call function ldap_connect but not exists
Commit: a62f5bd5b4d5729910368cc84e3f60a71d21fd44
https://github.com/Dolibarr/dolibarr/commit/a62f5bd5b4d5729910368cc84e3f60a71d21fd44
Author: phf <address@hidden>
Date: 2016-06-04 (Sat, 04 Jun 2016)
Changed paths:
M htdocs/core/lib/admin.lib.php
M htdocs/langs/en_US/admin.lang
Log Message:
-----------
Fix #2777
Commit: aebc7b12334cb5aefb07bb7baa4160f9521c6cf2
https://github.com/Dolibarr/dolibarr/commit/aebc7b12334cb5aefb07bb7baa4160f9521c6cf2
Author: Laurent Destailleur <address@hidden>
Date: 2016-06-04 (Sat, 04 Jun 2016)
Changed paths:
M htdocs/comm/propal/class/propal.class.php
M htdocs/commande/class/commande.class.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/fourn/class/fournisseur.facture.class.php
Log Message:
-----------
Merge pull request #5285 from atm-maxime/fix_menus_dashboard_links
FIX #3243
Commit: acc8cca84a94d4063c9d5ca1f3577cbdd928b888
https://github.com/Dolibarr/dolibarr/commit/acc8cca84a94d4063c9d5ca1f3577cbdd928b888
Author: Laurent Destailleur <address@hidden>
Date: 2016-06-04 (Sat, 04 Jun 2016)
Changed paths:
M htdocs/core/lib/admin.lib.php
M htdocs/langs/en_US/admin.lang
Log Message:
-----------
Merge pull request #5290 from atm-ph/fix_3.7_issue_2777
Fix #2777
Commit: 3ef9fe2c40fed0bf33a43f96456b2d056ac24ae8
https://github.com/Dolibarr/dolibarr/commit/3ef9fe2c40fed0bf33a43f96456b2d056ac24ae8
Author: Maxime Kohlhaas <address@hidden>
Date: 2016-06-04 (Sat, 04 Jun 2016)
Changed paths:
M htdocs/core/class/html.form.class.php
M htdocs/fourn/class/fournisseur.product.class.php
M htdocs/product/class/product.class.php
M htdocs/product/fournisseurs.php
Log Message:
-----------
Fix product supplier price modification with multicompany
Commit: abe84ef991a0ddb1e84dee192360897aa1229ace
https://github.com/Dolibarr/dolibarr/commit/abe84ef991a0ddb1e84dee192360897aa1229ace
Author: Maxime Kohlhaas <address@hidden>
Date: 2016-06-04 (Sat, 04 Jun 2016)
Changed paths:
M htdocs/expensereport/card.php
Log Message:
-----------
Fix rights check on expense reports
Commit: a4411c7fe7f0f3ba81df4adca5356818c6f1519d
https://github.com/Dolibarr/dolibarr/commit/a4411c7fe7f0f3ba81df4adca5356818c6f1519d
Author: Laurent Destailleur <address@hidden>
Date: 2016-06-04 (Sat, 04 Jun 2016)
Changed paths:
M htdocs/expensereport/card.php
Log Message:
-----------
Merge pull request #5299 from atm-maxime/fix_expensereport_rights
Fix rights check on expense reports
Commit: 454d054fdf47083bf677e2ea6ef251afc928d7d1
https://github.com/Dolibarr/dolibarr/commit/454d054fdf47083bf677e2ea6ef251afc928d7d1
Author: Laurent Destailleur <address@hidden>
Date: 2016-06-04 (Sat, 04 Jun 2016)
Changed paths:
M htdocs/core/class/html.form.class.php
M htdocs/fourn/class/fournisseur.product.class.php
M htdocs/product/class/product.class.php
M htdocs/product/fournisseurs.php
Log Message:
-----------
Merge pull request #5294 from atm-maxime/fix_productprice_multicompany
FIX #4762 Fix product supplier price modification with multicompany
Commit: 7866fb9dae68ddf0218b8f20005bb4c1fd1a01a0
https://github.com/Dolibarr/dolibarr/commit/7866fb9dae68ddf0218b8f20005bb4c1fd1a01a0
Author: Maxime Kohlhaas <address@hidden>
Date: 2016-06-04 (Sat, 04 Jun 2016)
Changed paths:
M htdocs/core/lib/functions.lib.php
Log Message:
-----------
Fix #5153
Commit: d9553212ac776521519aaf95cd218695576ca545
https://github.com/Dolibarr/dolibarr/commit/d9553212ac776521519aaf95cd218695576ca545
Author: Laurent Destailleur <address@hidden>
Date: 2016-06-05 (Sun, 05 Jun 2016)
Changed paths:
M htdocs/core/lib/functions.lib.php
Log Message:
-----------
Merge pull request #5302 from atm-maxime/fix_sanitizefilename
FIX #5153
Commit: db2269b9dd68b2a55c0d02b1a8c92c13ad1a4b3e
https://github.com/Dolibarr/dolibarr/commit/db2269b9dd68b2a55c0d02b1a8c92c13ad1a4b3e
Author: Laurent Destailleur <address@hidden>
Date: 2016-06-05 (Sun, 05 Jun 2016)
Changed paths:
M htdocs/core/class/ldap.class.php
M htdocs/core/lib/admin.lib.php
M htdocs/langs/en_US/admin.lang
Log Message:
-----------
Merge remote-tracking branch 'origin/3.7' into 3.8
Conflicts:
htdocs/core/class/ldap.class.php
htdocs/langs/en_US/admin.lang
Commit: a5472b58d1584caeae067e2bee7dc9bd6367606b
https://github.com/Dolibarr/dolibarr/commit/a5472b58d1584caeae067e2bee7dc9bd6367606b
Author: Maxime Kohlhaas <address@hidden>
Date: 2016-06-05 (Sun, 05 Jun 2016)
Changed paths:
M htdocs/core/ajax/ajaxdirpreview.php
M htdocs/ecm/index.php
Log Message:
-----------
FIX #5108
Commit: c09dbe05b3a5c793b1206014fc22245eb5b70676
https://github.com/Dolibarr/dolibarr/commit/c09dbe05b3a5c793b1206014fc22245eb5b70676
Author: Laurent Destailleur <address@hidden>
Date: 2016-06-05 (Sun, 05 Jun 2016)
Changed paths:
M htdocs/comm/propal/class/propal.class.php
M htdocs/commande/class/commande.class.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/core/class/ldap.class.php
M htdocs/core/lib/admin.lib.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/expensereport/card.php
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/fourn/class/fournisseur.facture.class.php
M htdocs/langs/en_US/admin.lang
M htdocs/langs/en_US/main.lang
Log Message:
-----------
Merge remote-tracking branch 'origin/3.8' into 3.9
Conflicts:
htdocs/core/class/ldap.class.php
htdocs/expensereport/card.php
htdocs/langs/en_US/admin.lang
Commit: 0d08231cd8bc34c7c1ac7a8b19344e87501bde26
https://github.com/Dolibarr/dolibarr/commit/0d08231cd8bc34c7c1ac7a8b19344e87501bde26
Author: Laurent Destailleur <address@hidden>
Date: 2016-06-05 (Sun, 05 Jun 2016)
Changed paths:
M htdocs/core/ajax/ajaxdirpreview.php
M htdocs/ecm/index.php
Log Message:
-----------
Merge pull request #5305 from atm-maxime/fix_ecm_removefile
FIX #5108
Commit: c07933729acfb18dfc774b1b6a609ce4193919a5
https://github.com/Dolibarr/dolibarr/commit/c07933729acfb18dfc774b1b6a609ce4193919a5
Author: Laurent Destailleur <address@hidden>
Date: 2016-06-05 (Sun, 05 Jun 2016)
Changed paths:
M htdocs/core/ajax/ajaxdirpreview.php
M htdocs/ecm/index.php
Log Message:
-----------
Merge branch '3.9' of address@hidden:Dolibarr/dolibarr.git into 3.9
Commit: 293c8e145aa0717e30cce2065d788d1029341def
https://github.com/Dolibarr/dolibarr/commit/293c8e145aa0717e30cce2065d788d1029341def
Author: Laurent Destailleur <address@hidden>
Date: 2016-06-05 (Sun, 05 Jun 2016)
Changed paths:
M htdocs/comm/propal/class/propal.class.php
M htdocs/commande/class/commande.class.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/compta/index.php
M htdocs/core/ajax/ajaxdirpreview.php
M htdocs/core/class/html.form.class.php
M htdocs/core/class/ldap.class.php
M htdocs/core/lib/admin.lib.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
M htdocs/ecm/index.php
M htdocs/expensereport/card.php
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/fourn/class/fournisseur.facture.class.php
M htdocs/fourn/class/fournisseur.product.class.php
M htdocs/fourn/commande/card.php
M htdocs/imports/import.php
M htdocs/langs/en_US/admin.lang
M htdocs/langs/en_US/main.lang
M htdocs/product/class/product.class.php
M htdocs/product/fournisseurs.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
htdocs/fourn/commande/card.php
htdocs/imports/import.php
htdocs/langs/en_US/admin.lang
Compare:
https://github.com/Dolibarr/dolibarr/compare/bbe5e398a588...293c8e145aa0