[Dolibarr-git] [Dolibarr/dolibarr] d52a93: Merge remote-tracking branch 'upstream/3.8' into 3...

[Juanjo Menent]

  Branch: refs/heads/3.9
  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: 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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/32b6766a7d56...43d475aa4263