[Dolibarr-git] [Dolibarr/dolibarr] f190e5: Merge branch 'develop' of git://github.com/Dolibar...

[Juanjo Menent]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: f190e5f9310e6f90c4b35da6155d1c8d6ee9abaf
      
https://github.com/Dolibarr/dolibarr/commit/f190e5f9310e6f90c4b35da6155d1c8d6ee9abaf
  Author: philippe grand <address@hidden>
  Date:   2015-11-16 (Mon, 16 Nov 2015)

  Changed paths:
    M .tx/config
    R htdocs/admin/askpricesupplier.php
    M htdocs/admin/boxes.php
    M htdocs/admin/company.php
    M htdocs/admin/dict.php
    M htdocs/admin/ihm.php
    A htdocs/admin/supplier_proposal.php
    M htdocs/admin/user.php
    R htdocs/comm/admin/askpricesupplier_extrafields.php
    R htdocs/comm/admin/askpricesupplierdet_extrafields.php
    R htdocs/comm/askpricesupplier/card.php
    R htdocs/comm/askpricesupplier/class/askpricesupplier.class.php
    R htdocs/comm/askpricesupplier/class/index.html
    R htdocs/comm/askpricesupplier/document.php
    R htdocs/comm/askpricesupplier/index.php
    R htdocs/comm/askpricesupplier/info.php
    R htdocs/comm/askpricesupplier/list.php
    R htdocs/comm/askpricesupplier/note.php
    R htdocs/comm/askpricesupplier/tpl/index.html
    R htdocs/comm/askpricesupplier/tpl/linkedobjectblock.tpl.php
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/comm/propal/list.php
    M htdocs/commande/class/commande.class.php
    M htdocs/compta/bank/search.php
    M htdocs/compta/charges/index.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/compta/index.php
    M htdocs/compta/tva/class/tva.class.php
    M htdocs/core/ajax/selectsearchbox.php
    M htdocs/core/boxes/box_factures_fourn_imp.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/conf.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/class/html.formactions.class.php
    R htdocs/core/class/html.formaskpricesupplier.class.php
    M htdocs/core/class/html.formfile.class.php
    M htdocs/core/class/html.formmail.class.php
    A htdocs/core/class/html.formsupplier_proposal.class.php
    R htdocs/core/lib/askpricesupplier.lib.php
    M htdocs/core/lib/functions2.lib.php
    A htdocs/core/lib/supplier_proposal.lib.php
    M htdocs/core/lib/usergroups.lib.php
    M htdocs/core/menus/standard/eldy.lib.php
    R 
htdocs/core/modules/askpricesupplier/doc/doc_generic_askpricesupplier_odt.modules.php
    R htdocs/core/modules/askpricesupplier/doc/index.html
    R htdocs/core/modules/askpricesupplier/doc/pdf_aurore.modules.php
    R htdocs/core/modules/askpricesupplier/index.html
    R htdocs/core/modules/askpricesupplier/mod_askpricesupplier_marbre.php
    R htdocs/core/modules/askpricesupplier/mod_askpricesupplier_saphir.php
    R htdocs/core/modules/askpricesupplier/modules_askpricesupplier.php
    R htdocs/core/modules/modAskPriceSupplier.class.php
    A htdocs/core/modules/modSupplierProposal.class.php
    A 
htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php
    A htdocs/core/modules/supplier_proposal/doc/index.html
    A htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
    A htdocs/core/modules/supplier_proposal/index.html
    A htdocs/core/modules/supplier_proposal/mod_supplier_proposal_marbre.php
    A htdocs/core/modules/supplier_proposal/mod_supplier_proposal_saphir.php
    A htdocs/core/modules/supplier_proposal/modules_supplier_proposal.php
    M htdocs/core/tpl/document_actions_post_headers.tpl.php
    M htdocs/core/tpl/notes.tpl.php
    M htdocs/core/tpl/objectline_create.tpl.php
    M htdocs/core/tpl/objectline_edit.tpl.php
    M htdocs/core/tpl/objectline_view.tpl.php
    M htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN
    M htdocs/fourn/card.php
    M htdocs/fourn/class/fournisseur.commande.class.php
    M htdocs/fourn/class/fournisseur.facture.class.php
    M htdocs/fourn/commande/card.php
    M htdocs/index.php
    R htdocs/install/doctemplates/askpricesupplier/index.html
    R htdocs/install/doctemplates/askpricesupplier/template_askpricesupplier.odt
    A htdocs/install/doctemplates/supplier_proposal/index.html
    A 
htdocs/install/doctemplates/supplier_proposal/template_supplier_proposal.odt
    M htdocs/install/mysql/migration/3.8.0-3.9.0.sql
    R htdocs/install/mysql/tables/llx_askpricesupplier.sql
    R htdocs/install/mysql/tables/llx_askpricesupplier_extrafields.sql
    R htdocs/install/mysql/tables/llx_askpricesupplierdet.sql
    R htdocs/install/mysql/tables/llx_askpricesupplierdet_extrafields.sql
    A htdocs/install/mysql/tables/llx_supplier_proposal.sql
    A htdocs/install/mysql/tables/llx_supplier_proposal_extrafields.sql
    A htdocs/install/mysql/tables/llx_supplier_proposaldet.sql
    A htdocs/install/mysql/tables/llx_supplier_proposaldet_extrafields.sql
    M htdocs/langs/ar_SA/admin.lang
    M htdocs/langs/ar_SA/main.lang
    M htdocs/langs/ar_SA/other.lang
    R htdocs/langs/ar_SA/printipp.lang
    M htdocs/langs/bg_BG/admin.lang
    M htdocs/langs/bg_BG/main.lang
    M htdocs/langs/bg_BG/other.lang
    R htdocs/langs/bg_BG/printipp.lang
    M htdocs/langs/bn_BD/admin.lang
    M htdocs/langs/bn_BD/main.lang
    M htdocs/langs/bn_BD/other.lang
    M htdocs/langs/bs_BA/admin.lang
    M htdocs/langs/bs_BA/main.lang
    M htdocs/langs/bs_BA/other.lang
    R htdocs/langs/bs_BA/printipp.lang
    M htdocs/langs/ca_ES/admin.lang
    M htdocs/langs/ca_ES/main.lang
    M htdocs/langs/ca_ES/other.lang
    R htdocs/langs/ca_ES/printipp.lang
    M htdocs/langs/cs_CZ/admin.lang
    M htdocs/langs/cs_CZ/main.lang
    M htdocs/langs/cs_CZ/other.lang
    R htdocs/langs/cs_CZ/printipp.lang
    M htdocs/langs/da_DK/admin.lang
    M htdocs/langs/da_DK/main.lang
    M htdocs/langs/da_DK/other.lang
    R htdocs/langs/da_DK/printipp.lang
    M htdocs/langs/de_DE/admin.lang
    M htdocs/langs/de_DE/main.lang
    M htdocs/langs/de_DE/other.lang
    R htdocs/langs/de_DE/printipp.lang
    M htdocs/langs/el_GR/admin.lang
    M htdocs/langs/el_GR/main.lang
    M htdocs/langs/el_GR/other.lang
    R htdocs/langs/el_GR/printipp.lang
    M htdocs/langs/en_US/admin.lang
    R htdocs/langs/en_US/askpricesupplier.lang
    M htdocs/langs/en_US/companies.lang
    M htdocs/langs/en_US/compta.lang
    M htdocs/langs/en_US/main.lang
    M htdocs/langs/en_US/other.lang
    A htdocs/langs/en_US/supplier_proposal.lang
    M htdocs/langs/es_ES/admin.lang
    M htdocs/langs/es_ES/main.lang
    M htdocs/langs/es_ES/other.lang
    R htdocs/langs/es_ES/printipp.lang
    M htdocs/langs/et_EE/admin.lang
    M htdocs/langs/et_EE/main.lang
    M htdocs/langs/et_EE/other.lang
    R htdocs/langs/et_EE/printipp.lang
    M htdocs/langs/eu_ES/admin.lang
    M htdocs/langs/eu_ES/main.lang
    M htdocs/langs/eu_ES/other.lang
    R htdocs/langs/eu_ES/printipp.lang
    M htdocs/langs/fa_IR/admin.lang
    M htdocs/langs/fa_IR/main.lang
    M htdocs/langs/fa_IR/other.lang
    R htdocs/langs/fa_IR/printipp.lang
    M htdocs/langs/fi_FI/admin.lang
    M htdocs/langs/fi_FI/main.lang
    M htdocs/langs/fi_FI/other.lang
    R htdocs/langs/fi_FI/printipp.lang
    M htdocs/langs/fr_CA/main.lang
    M htdocs/langs/fr_FR/admin.lang
    R htdocs/langs/fr_FR/askpricesupplier.lang
    M htdocs/langs/fr_FR/main.lang
    M htdocs/langs/fr_FR/other.lang
    R htdocs/langs/fr_FR/printipp.lang
    A htdocs/langs/fr_FR/supplier_proposal.lang
    M htdocs/langs/he_IL/admin.lang
    M htdocs/langs/he_IL/main.lang
    M htdocs/langs/he_IL/other.lang
    R htdocs/langs/he_IL/printipp.lang
    M htdocs/langs/hr_HR/admin.lang
    M htdocs/langs/hr_HR/main.lang
    M htdocs/langs/hr_HR/other.lang
    R htdocs/langs/hr_HR/printipp.lang
    M htdocs/langs/hu_HU/admin.lang
    M htdocs/langs/hu_HU/main.lang
    M htdocs/langs/hu_HU/other.lang
    R htdocs/langs/hu_HU/printipp.lang
    M htdocs/langs/id_ID/admin.lang
    M htdocs/langs/id_ID/main.lang
    M htdocs/langs/id_ID/other.lang
    R htdocs/langs/id_ID/printipp.lang
    M htdocs/langs/is_IS/admin.lang
    M htdocs/langs/is_IS/main.lang
    M htdocs/langs/is_IS/other.lang
    R htdocs/langs/is_IS/printipp.lang
    M htdocs/langs/it_IT/admin.lang
    M htdocs/langs/it_IT/main.lang
    M htdocs/langs/it_IT/other.lang
    R htdocs/langs/it_IT/printipp.lang
    M htdocs/langs/ja_JP/admin.lang
    M htdocs/langs/ja_JP/main.lang
    M htdocs/langs/ja_JP/other.lang
    R htdocs/langs/ja_JP/printipp.lang
    M htdocs/langs/ka_GE/admin.lang
    M htdocs/langs/ka_GE/main.lang
    M htdocs/langs/ka_GE/other.lang
    R htdocs/langs/ka_GE/printipp.lang
    M htdocs/langs/kn_IN/admin.lang
    M htdocs/langs/kn_IN/main.lang
    M htdocs/langs/kn_IN/other.lang
    R htdocs/langs/kn_IN/printipp.lang
    M htdocs/langs/ko_KR/admin.lang
    M htdocs/langs/ko_KR/main.lang
    M htdocs/langs/ko_KR/other.lang
    R htdocs/langs/ko_KR/printipp.lang
    M htdocs/langs/lo_LA/admin.lang
    M htdocs/langs/lo_LA/main.lang
    M htdocs/langs/lo_LA/other.lang
    R htdocs/langs/lo_LA/printipp.lang
    M htdocs/langs/lt_LT/admin.lang
    M htdocs/langs/lt_LT/main.lang
    M htdocs/langs/lt_LT/other.lang
    R htdocs/langs/lt_LT/printipp.lang
    M htdocs/langs/lv_LV/admin.lang
    M htdocs/langs/lv_LV/main.lang
    M htdocs/langs/lv_LV/other.lang
    R htdocs/langs/lv_LV/printipp.lang
    M htdocs/langs/mk_MK/admin.lang
    M htdocs/langs/mk_MK/main.lang
    M htdocs/langs/mk_MK/other.lang
    R htdocs/langs/mk_MK/printipp.lang
    M htdocs/langs/nb_NO/admin.lang
    M htdocs/langs/nb_NO/main.lang
    M htdocs/langs/nb_NO/other.lang
    R htdocs/langs/nb_NO/printipp.lang
    M htdocs/langs/nl_NL/admin.lang
    M htdocs/langs/nl_NL/main.lang
    M htdocs/langs/nl_NL/other.lang
    R htdocs/langs/nl_NL/printipp.lang
    M htdocs/langs/pl_PL/admin.lang
    M htdocs/langs/pl_PL/main.lang
    M htdocs/langs/pl_PL/other.lang
    R htdocs/langs/pl_PL/printipp.lang
    M htdocs/langs/pt_BR/admin.lang
    M htdocs/langs/pt_BR/main.lang
    M htdocs/langs/pt_BR/other.lang
    R htdocs/langs/pt_BR/printipp.lang
    M htdocs/langs/pt_PT/admin.lang
    M htdocs/langs/pt_PT/main.lang
    M htdocs/langs/pt_PT/other.lang
    R htdocs/langs/pt_PT/printipp.lang
    M htdocs/langs/ro_RO/admin.lang
    M htdocs/langs/ro_RO/main.lang
    M htdocs/langs/ro_RO/other.lang
    R htdocs/langs/ro_RO/printipp.lang
    M htdocs/langs/ru_RU/admin.lang
    M htdocs/langs/ru_RU/main.lang
    M htdocs/langs/ru_RU/other.lang
    R htdocs/langs/ru_RU/printipp.lang
    M htdocs/langs/sk_SK/admin.lang
    M htdocs/langs/sk_SK/main.lang
    M htdocs/langs/sk_SK/other.lang
    R htdocs/langs/sk_SK/printipp.lang
    M htdocs/langs/sl_SI/admin.lang
    M htdocs/langs/sl_SI/main.lang
    M htdocs/langs/sl_SI/other.lang
    R htdocs/langs/sl_SI/printipp.lang
    M htdocs/langs/sq_AL/admin.lang
    M htdocs/langs/sq_AL/main.lang
    M htdocs/langs/sq_AL/other.lang
    R htdocs/langs/sq_AL/printipp.lang
    M htdocs/langs/sr_RS/admin.lang
    M htdocs/langs/sr_RS/main.lang
    M htdocs/langs/sr_RS/other.lang
    M htdocs/langs/sv_SE/admin.lang
    M htdocs/langs/sv_SE/main.lang
    M htdocs/langs/sv_SE/other.lang
    R htdocs/langs/sv_SE/printipp.lang
    M htdocs/langs/sw_SW/admin.lang
    M htdocs/langs/sw_SW/main.lang
    M htdocs/langs/sw_SW/other.lang
    R htdocs/langs/sw_SW/printipp.lang
    M htdocs/langs/th_TH/admin.lang
    M htdocs/langs/th_TH/main.lang
    M htdocs/langs/th_TH/other.lang
    R htdocs/langs/th_TH/printipp.lang
    M htdocs/langs/tr_TR/admin.lang
    M htdocs/langs/tr_TR/main.lang
    M htdocs/langs/tr_TR/other.lang
    R htdocs/langs/tr_TR/printipp.lang
    M htdocs/langs/uk_UA/admin.lang
    M htdocs/langs/uk_UA/main.lang
    M htdocs/langs/uk_UA/other.lang
    R htdocs/langs/uk_UA/printipp.lang
    M htdocs/langs/uz_UZ/admin.lang
    M htdocs/langs/uz_UZ/main.lang
    M htdocs/langs/uz_UZ/other.lang
    R htdocs/langs/uz_UZ/printipp.lang
    M htdocs/langs/vi_VN/admin.lang
    M htdocs/langs/vi_VN/main.lang
    M htdocs/langs/vi_VN/other.lang
    R htdocs/langs/vi_VN/printipp.lang
    M htdocs/langs/zh_CN/admin.lang
    M htdocs/langs/zh_CN/main.lang
    M htdocs/langs/zh_CN/other.lang
    R htdocs/langs/zh_CN/printipp.lang
    M htdocs/langs/zh_TW/admin.lang
    M htdocs/langs/zh_TW/main.lang
    M htdocs/langs/zh_TW/other.lang
    R htdocs/langs/zh_TW/printipp.lang
    M htdocs/product/class/product.class.php
    M htdocs/societe/class/societe.class.php
    M htdocs/societe/list.php
    A htdocs/supplier_proposal/admin/supplier_proposal_extrafields.php
    A htdocs/supplier_proposal/admin/supplier_proposaldet_extrafields.php
    A htdocs/supplier_proposal/card.php
    A htdocs/supplier_proposal/class/index.html
    A htdocs/supplier_proposal/class/supplier_proposal.class.php
    A htdocs/supplier_proposal/document.php
    A htdocs/supplier_proposal/index.php
    A htdocs/supplier_proposal/info.php
    A htdocs/supplier_proposal/list.php
    A htdocs/supplier_proposal/note.php
    A htdocs/supplier_proposal/tpl/index.html
    A htdocs/supplier_proposal/tpl/linkedobjectblock.tpl.php
    R htdocs/theme/eldy/img/object_askpricesupplier.png
    A htdocs/theme/eldy/img/object_supplier_proposal.png
    M htdocs/theme/eldy/style.css.php
    R htdocs/theme/md/img/object_askpricesupplier.png
    A htdocs/theme/md/img/object_printer.png
    A htdocs/theme/md/img/object_supplier_proposal.png
    M htdocs/theme/md/style.css.php
    M htdocs/user/admin/group_extrafields.php
    M htdocs/user/admin/user_extrafields.php

  Log Message:
  -----------
  Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop


  Commit: ce54d37956279e9314b43182b244fbde5abcd0c0
      
https://github.com/Dolibarr/dolibarr/commit/ce54d37956279e9314b43182b244fbde5abcd0c0
  Author: philippe grand <address@hidden>
  Date:   2015-11-17 (Tue, 17 Nov 2015)

  Changed paths:
    M dev/skeletons/modMyModule.class.php
    M htdocs/admin/modules.php
    M htdocs/categories/class/categorie.class.php
    M htdocs/categories/traduction.php
    M htdocs/commande/card.php
    M htdocs/core/modules/DolibarrModules.class.php
    M htdocs/core/modules/modAccounting.class.php
    M htdocs/core/modules/modAdherent.class.php
    M htdocs/core/modules/modAgenda.class.php
    M htdocs/core/modules/modBanque.class.php
    M htdocs/core/modules/modCashDesk.class.php
    M htdocs/core/modules/modCommande.class.php
    M htdocs/core/modules/modComptabilite.class.php
    M htdocs/core/modules/modDocumentGeneration.class.php
    M htdocs/core/modules/modECM.class.php
    M htdocs/core/modules/modExpedition.class.php
    M htdocs/core/modules/modExpenseReport.class.php
    M htdocs/core/modules/modFacture.class.php
    M htdocs/core/modules/modFournisseur.class.php
    M htdocs/core/modules/modHoliday.class.php
    M htdocs/core/modules/modMargin.class.php
    M htdocs/core/modules/modOauth.class.php
    M htdocs/core/modules/modOpenSurvey.class.php
    M htdocs/core/modules/modPrelevement.class.php
    M htdocs/core/modules/modPrinting.class.php
    M htdocs/core/modules/modProduct.class.php
    M htdocs/core/modules/modProductBatch.class.php
    M htdocs/core/modules/modProjet.class.php
    M htdocs/core/modules/modPropale.class.php
    M htdocs/core/modules/modReceiptPrinter.class.php
    M htdocs/core/modules/modResource.class.php
    M htdocs/core/modules/modService.class.php
    M htdocs/core/modules/modSociete.class.php
    M htdocs/core/modules/modStock.class.php
    M htdocs/core/modules/modUser.class.php
    M htdocs/core/modules/modWebsite.class.php
    M htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN
    M htdocs/install/mysql/data/llx_10_c_regions.sql
    M htdocs/install/mysql/data/llx_20_c_departements.sql
    M htdocs/install/mysql/migration/3.8.0-3.9.0.sql
    M htdocs/product/class/product.class.php
    M htdocs/product/traduction.php
    M htdocs/theme/eldy/img/statut1.png
    A htdocs/theme/eldy/img/statut2.png
    M htdocs/theme/eldy/img/statut4.png
    M htdocs/theme/eldy/img/statut6.png
    M htdocs/theme/eldy/img/statut9.png

  Log Message:
  -----------
  Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop


  Commit: 209ec62bfe70d0c581368e2db9d2ae5ba5676388
      
https://github.com/Dolibarr/dolibarr/commit/209ec62bfe70d0c581368e2db9d2ae5ba5676388
  Author: philippe grand <address@hidden>
  Date:   2015-11-18 (Wed, 18 Nov 2015)

  Changed paths:
    M htdocs/core/class/html.form.class.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/install/mysql/migration/3.8.0-3.9.0.sql
    M htdocs/install/mysql/tables/llx_cronjob.sql
    M htdocs/langs/en_US/sendings.lang
    M htdocs/product/class/product.class.php
    M htdocs/theme/eldy/style.css.php
    M htdocs/theme/md/style.css.php

  Log Message:
  -----------
  Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop


  Commit: 42ed3d2bb73a3dd313f2a1e85d7e5594d9f8a89d
      
https://github.com/Dolibarr/dolibarr/commit/42ed3d2bb73a3dd313f2a1e85d7e5594d9f8a89d
  Author: philippe grand <address@hidden>
  Date:   2015-11-18 (Wed, 18 Nov 2015)

  Changed paths:
    M htdocs/admin/dict.php
    M htdocs/admin/tools/listevents.php
    M htdocs/admin/tools/purge.php
    M htdocs/categories/admin/categorie.php
    M htdocs/compta/facture.php
    M htdocs/contact/card.php
    M htdocs/contact/ldap.php

  Log Message:
  -----------
  [Qual] Uniformize code


  Commit: 3094f9ed3221d5cd9ffeba2f29084b7582ea0b69
      
https://github.com/Dolibarr/dolibarr/commit/3094f9ed3221d5cd9ffeba2f29084b7582ea0b69
  Author: Juanjo Menent <address@hidden>
  Date:   2015-11-18 (Wed, 18 Nov 2015)

  Changed paths:
    M htdocs/admin/dict.php
    M htdocs/admin/tools/listevents.php
    M htdocs/admin/tools/purge.php
    M htdocs/categories/admin/categorie.php
    M htdocs/compta/facture.php
    M htdocs/contact/card.php
    M htdocs/contact/ldap.php

  Log Message:
  -----------
  Merge pull request #4032 from grandoc/develop

[Qual] Uniformize code


Compare: 
https://github.com/Dolibarr/dolibarr/compare/5218501c042e...3094f9ed3221