dolibarr-git
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Dolibarr-git] [Dolibarr/dolibarr] fb4e64: Update consumption.php


From: Laurent Destailleur
Subject: [Dolibarr-git] [Dolibarr/dolibarr] fb4e64: Update consumption.php
Date: Thu, 31 Jul 2014 17:05:51 -0700

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: fb4e64fdabd8b775578c7bfce3396ed82325e7ff
      
https://github.com/Dolibarr/dolibarr/commit/fb4e64fdabd8b775578c7bfce3396ed82325e7ff
  Author: BENKE Charles <address@hidden>
  Date:   2014-07-29 (Tue, 29 Jul 2014)

  Changed paths:
    M htdocs/societe/consumption.php

  Log Message:
  -----------
  Update consumption.php

security access fix : we don't have right to access of invoice and order if we 
are not agreed


  Commit: 1b16f87569b423c9723e88ea3dce3e63b8972ee3
      
https://github.com/Dolibarr/dolibarr/commit/1b16f87569b423c9723e88ea3dce3e63b8972ee3
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-07-30 (Wed, 30 Jul 2014)

  Changed paths:
    M htdocs/societe/consumption.php

  Log Message:
  -----------
  Merge pull request #1783 from defrance69/patch-4

Update consumption.php


  Commit: 977300c653ac8684bdcf283cfe97b8e8819bb3f7
      
https://github.com/Dolibarr/dolibarr/commit/977300c653ac8684bdcf283cfe97b8e8819bb3f7
  Author: Regis Houssin <address@hidden>
  Date:   2014-07-31 (Thu, 31 Jul 2014)

  Changed paths:
    A htdocs/includes/ckeditor/skins/moono/skin.js

  Log Message:
  -----------
  Fix: missing skin.js


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

  Changed paths:
    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

  Log Message:
  -----------
  Sync from transifex


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

  Changed paths:
    A htdocs/includes/ckeditor/skins/moono/skin.js
    M htdocs/societe/consumption.php

  Log Message:
  -----------
  Merge branch '3.6' of address@hidden:Dolibarr/dolibarr.git into 3.6


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

  Changed paths:
    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/societe/consumption.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3.6' into develop

Conflicts:
        htdocs/langs/fr_FR/main.lang


Compare: 
https://github.com/Dolibarr/dolibarr/compare/96a4aa2d26bf...f58da0fa73a2

reply via email to

[Prev in Thread] Current Thread [Next in Thread]