[Dolibarr-git] [Dolibarr/dolibarr] d20166: Merge branch 'develop' of git

dolibarr-git
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] d20166: Merge branch 'develop' of git

From:	Laurent Destailleur
Subject:	[Dolibarr-git] [Dolibarr/dolibarr] d20166: Merge branch 'develop' of github.com:Dolibarr/doli...
Date:	Thu, 07 Aug 2014 16:56:35 -0700
  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: d2016632e67f99ba716079b5ff4d45635e0136fe
      
https://github.com/Dolibarr/dolibarr/commit/d2016632e67f99ba716079b5ff4d45635e0136fe
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2014-08-01 (Fri, 01 Aug 2014)

  Changed paths:
    M dev/dolibarr_changes.txt
    M htdocs/admin/boxes.php
    M htdocs/admin/system/database.php
    M htdocs/admin/system/index.php
    M htdocs/admin/tools/dolibarr_export.php
    M htdocs/admin/tools/dolibarr_import.php
    M htdocs/admin/tools/export.php
    M htdocs/comm/propal.php
    M htdocs/compta/ajaxpayment.php
    M htdocs/core/boxes/box_graph_invoices_permonth.php
    M htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
    M htdocs/core/boxes/box_graph_orders_permonth.php
    M htdocs/core/boxes/box_graph_orders_supplier_permonth.php
    M htdocs/core/boxes/box_graph_product_distribution.php
    M htdocs/core/boxes/box_graph_propales_permonth.php
    M htdocs/core/class/infobox.class.php
    M htdocs/core/class/stats.class.php
    M htdocs/core/db/DoliDB.class.php
    M htdocs/core/db/mssql.class.php
    M htdocs/core/db/mysql.class.php
    M htdocs/core/db/mysqli.class.php
    M htdocs/core/db/pgsql.class.php
    M htdocs/core/db/sqlite.class.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/lib/functions2.lib.php
    M htdocs/core/modules/DolibarrModules.class.php
    M htdocs/core/modules/import/import_csv.modules.php
    M htdocs/fourn/class/fournisseur.commande.class.php
    A htdocs/includes/ckeditor/skins/moono/skin.js
    M htdocs/install/etape1.php
    M htdocs/install/fileconf.php
    M htdocs/install/mysql/data/llx_accounting.sql
    M htdocs/install/mysql/tables/llx_accountingaccount.key.sql
    M htdocs/install/upgrade.php
    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/main.inc.php
    M htdocs/product/stock/massstockmove.php
    M htdocs/societe/consumption.php
    M scripts/bank/export-bank-receipts.php
    M scripts/company/export-contacts-xls-example.php
    M scripts/company/sync_contacts_dolibarr2ldap.php
    M scripts/contracts/email_expire_services_to_customers.php
    M scripts/contracts/email_expire_services_to_representatives.php
    M scripts/cron/cron_run_jobs.php
    M scripts/emailings/mailing-send.php
    M scripts/invoices/email_unpaid_invoices_to_customers.php
    M scripts/invoices/email_unpaid_invoices_to_representatives.php
    M scripts/invoices/rebuild_merge_pdf.php
    M scripts/members/sync_members_dolibarr2ldap.php
    M scripts/members/sync_members_ldap2dolibarr.php
    M scripts/user/sync_groups_dolibarr2ldap.php
    M scripts/user/sync_groups_ldap2dolibarr.php
    M scripts/user/sync_users_dolibarr2ldap.php
    M scripts/user/sync_users_ldap2dolibarr.php
    M scripts/withdrawals/build_withdrawal_file.php
    M test/phpunit/Functions2LibTest.php
    M test/phpunit/FunctionsLibTest.php
    M test/phpunit/JsonLibTest.php

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


  Commit: fe2f96ab202f59b7c4263ca21d9a29169643168b
      
https://github.com/Dolibarr/dolibarr/commit/fe2f96ab202f59b7c4263ca21d9a29169643168b
  Author: Maxime Kohlhaas <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 dev/initdata/generate-facture.php
    M dev/initdata/generate-propale.php
    M htdocs/adherents/class/adherent.class.php
    M htdocs/admin/dict.php
    M htdocs/cache.manifest
    M htdocs/comm/action/fiche.php
    M htdocs/comm/propal.php
    M htdocs/commande/class/commande.class.php
    M htdocs/commande/fiche.php
    M htdocs/compta/bank/bankid_fr.php
    M htdocs/compta/bank/fiche.php
    M htdocs/compta/facture.php
    M htdocs/compta/facture/impayees.php
    M htdocs/compta/localtax/class/localtax.class.php
    M htdocs/compta/tva/class/tva.class.php
    M htdocs/contrat/fiche.php
    M htdocs/core/boxes/box_graph_propales_permonth.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/extrafields.class.php
    M htdocs/core/class/html.formfile.class.php
    M htdocs/core/class/html.formmail.class.php
    M htdocs/core/class/translate.class.php
    M htdocs/core/lib/agenda.lib.php
    M htdocs/core/lib/functions2.lib.php
    M htdocs/core/lib/pdf.lib.php
    M htdocs/core/modules/modFacture.class.php
    M htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
    M htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
    M htdocs/expedition/index.php
    M htdocs/fourn/product/categorie.php
    M htdocs/fourn/product/liste.php
    M htdocs/holiday/fiche.php
    R htdocs/install/background.png
    M htdocs/install/check.php
    M htdocs/install/default.css
    R htdocs/install/headbg.jpg
    M htdocs/install/mysql/data/llx_10_c_regions.sql
    M htdocs/install/mysql/data/llx_accounting.sql
    M htdocs/install/mysql/migration/3.5.0-3.6.0.sql
    M htdocs/install/mysql/migration/3.6.0-3.7.0.sql
    M htdocs/install/mysql/migration/repair.sql
    M htdocs/install/mysql/tables/llx_actioncomm.sql
    M htdocs/install/mysql/tables/llx_c_departements.key.sql
    M htdocs/install/mysql/tables/llx_c_email_template.sql
    R htdocs/install/mysql/tables/llx_texts.sql
    M htdocs/install/mysql/tables/llx_user.sql
    M htdocs/install/upgrade2.php
    M htdocs/langs/en_US/commercial.lang
    M htdocs/langs/en_US/other.lang
    M htdocs/langs/en_US/users.lang
    M htdocs/main.inc.php
    M htdocs/margin/customerMargins.php
    M htdocs/margin/tabs/thirdpartyMargins.php
    M htdocs/product/fiche.php
    M htdocs/product/price.php
    M htdocs/product/stock/product.php
    M htdocs/public/members/new.php
    M htdocs/support/default.css
    M htdocs/theme/eldy/graph-color.php
    M htdocs/theme/eldy/style.css.php
    M htdocs/user/fiche.php
    M htdocs/user/index.php
    M htdocs/user/logout.php
    M htdocs/user/perms.php

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


  Commit: 90c397d1a43ecc96bb6df7fee542c5df5f6dfd9d
      
https://github.com/Dolibarr/dolibarr/commit/90c397d1a43ecc96bb6df7fee542c5df5f6dfd9d
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2014-08-05 (Tue, 05 Aug 2014)

  Changed paths:
    M ChangeLog
    M htdocs/core/ajax/ajaxdirpreview.php
    M htdocs/core/class/html.formfile.class.php
    M htdocs/ecm/index_auto.php

  Log Message:
  -----------
  New: Intervention documents are now available in ECM module


  Commit: 4f47bddd0ae58e78a72312fe54759e512a6bc407
      
https://github.com/Dolibarr/dolibarr/commit/4f47bddd0ae58e78a72312fe54759e512a6bc407
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2014-08-05 (Tue, 05 Aug 2014)

  Changed paths:
    M htdocs/core/lib/files.lib.php

  Log Message:
  -----------
  New : Intervention documents are now available in ECM module (files 
downloadable)


  Commit: 1b3efbb9a35b33987bec5315acb72fb232795b01
      
https://github.com/Dolibarr/dolibarr/commit/1b3efbb9a35b33987bec5315acb72fb232795b01
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2014-08-05 (Tue, 05 Aug 2014)

  Changed paths:
    M htdocs/core/ajax/ajaxdirpreview.php
    M htdocs/core/class/html.formfile.class.php
    M htdocs/core/lib/usergroups.lib.php
    M htdocs/ecm/index_auto.php
    A htdocs/user/document.php

  Log Message:
  -----------
  New : add attachments on user cards


  Commit: 3622b472dd5f520948b4fb2b9b8b2a8743eaf0ca
      
https://github.com/Dolibarr/dolibarr/commit/3622b472dd5f520948b4fb2b9b8b2a8743eaf0ca
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2014-08-06 (Wed, 06 Aug 2014)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Changelog


  Commit: 5e63f16d32da58c525378ec9652702789cfabffb
      
https://github.com/Dolibarr/dolibarr/commit/5e63f16d32da58c525378ec9652702789cfabffb
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2014-08-06 (Wed, 06 Aug 2014)

  Changed paths:
    M ChangeLog
    M htdocs/comm/propal.php
    M htdocs/commande/fiche.php
    M htdocs/compta/facture.php
    M htdocs/compta/facture/impayees.php
    M htdocs/conf/conf.php.example
    M htdocs/core/actions_sendmails.inc.php
    M htdocs/core/class/CMailFile.class.php
    M htdocs/core/class/html.formmail.class.php
    M htdocs/core/lib/pdf.lib.php
    M htdocs/filefunc.inc.php
    A htdocs/holiday/admin/tomergewithholiday.php
    M htdocs/holiday/class/holiday.class.php
    M htdocs/holiday/define_holiday.php
    M htdocs/holiday/fiche.php
    A htdocs/holiday/img/add.png
    A htdocs/holiday/img/delete.png
    A htdocs/holiday/img/edit.png
    A htdocs/holiday/tomergewithdefine_holiday.php
    M htdocs/holiday/view_log.php
    M htdocs/install/mysql/migration/3.6.0-3.7.0.sql
    M htdocs/install/mysql/tables/llx_c_email_template.sql
    A htdocs/install/mysql/tables/llx_holiday_types.sql
    M htdocs/langs/en_US/admin.lang
    M htdocs/societe/soc.php
    M htdocs/theme/eldy/style.css.php

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

Conflicts:
        ChangeLog


  Commit: 3b14fa2b35209434cae86a4ef1192615c13e660f
      
https://github.com/Dolibarr/dolibarr/commit/3b14fa2b35209434cae86a4ef1192615c13e660f
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2014-08-07 (Thu, 07 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 htdocs/core/class/html.form.class.php
    M htdocs/core/lib/project.lib.php
    M htdocs/projet/activity/list.php
    M htdocs/projet/tasks/time.php
    M test/phpunit/SqlTest.php

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


  Commit: 3819529d866a2cb9946678d4c52c3abc9e81dc76
      
https://github.com/Dolibarr/dolibarr/commit/3819529d866a2cb9946678d4c52c3abc9e81dc76
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2014-08-07 (Thu, 07 Aug 2014)

  Changed paths:
    M htdocs/admin/system/dolibarr.php

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


  Commit: 111d215ef1798b87af7bf493ceb5abe054b5e899
      
https://github.com/Dolibarr/dolibarr/commit/111d215ef1798b87af7bf493ceb5abe054b5e899
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-08-08 (Fri, 08 Aug 2014)

  Changed paths:
    M ChangeLog
    M htdocs/core/ajax/ajaxdirpreview.php
    M htdocs/core/class/html.formfile.class.php
    M htdocs/core/lib/files.lib.php
    M htdocs/core/lib/usergroups.lib.php
    M htdocs/ecm/index_auto.php
    A htdocs/user/document.php

  Log Message:
  -----------
  Merge pull request #1807 from atm-maxime/develop

New: Intervention documents are now available in ECM module


Compare: 
https://github.com/Dolibarr/dolibarr/compare/2eea7cdc7fcd...111d215ef179
[Prev in Thread]
Current Thread
[Next in Thread]
[Dolibarr-git] [Dolibarr/dolibarr] d20166: Merge branch 'develop' of github.com:Dolibarr/doli..., Laurent Destailleur <=
Prev by Date: [Dolibarr-git] [Dolibarr/dolibarr] 2eea7c: New: Intervention documents are now available in E...
Next by Date: [Dolibarr-git] [Dolibarr/dolibarr] 4eeb92: Fix: Bad help text
Previous by thread: [Dolibarr-git] [Dolibarr/dolibarr] 2eea7c: New: Intervention documents are now available in E...
Next by thread: [Dolibarr-git] [Dolibarr/dolibarr] 4eeb92: Fix: Bad help text
Index(es):
- Date
- Thread