dolibarr-git
[Top][All Lists]
Advanced

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

[Dolibarr-git] [Dolibarr/dolibarr] c381c2: Fix : Accountancy


From: Laurent Destailleur
Subject: [Dolibarr-git] [Dolibarr/dolibarr] c381c2: Fix : Accountancy
Date: Sat, 24 Jun 2017 07:34:30 -0700

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: c381c213a50af78bcf7f6b877e81493bdee2adfd
      
https://github.com/Dolibarr/dolibarr/commit/c381c213a50af78bcf7f6b877e81493bdee2adfd
  Author: Alexandre SPANGARO <address@hidden>
  Date:   2017-06-20 (Tue, 20 Jun 2017)

  Changed paths:
    M htdocs/accountancy/admin/accountmodel.php
    M htdocs/accountancy/admin/defaultaccounts.php
    M htdocs/accountancy/bookkeeping/card.php
    M htdocs/accountancy/bookkeeping/list.php
    M htdocs/accountancy/customer/index.php
    M htdocs/accountancy/expensereport/index.php
    M htdocs/langs/en_US/salaries.lang

  Log Message:
  -----------
  Fix : Accountancy


  Commit: 459fac4753e5aee8fe4dc4299fcbece0a43aacd6
      
https://github.com/Dolibarr/dolibarr/commit/459fac4753e5aee8fe4dc4299fcbece0a43aacd6
  Author: Alexandre SPANGARO <address@hidden>
  Date:   2017-06-22 (Thu, 22 Jun 2017)

  Changed paths:
    M .travis.yml
    M htdocs/accountancy/customer/index.php
    M htdocs/accountancy/journal/expensereportsjournal.php
    M htdocs/accountancy/journal/purchasesjournal.php
    M htdocs/accountancy/journal/sellsjournal.php
    M htdocs/accountancy/supplier/index.php
    M htdocs/admin/mails_templates.php
    M htdocs/admin/multicurrency.php
    M htdocs/admin/syslog.php
    M htdocs/admin/tools/listevents.php
    M htdocs/admin/tools/purge.php
    M htdocs/categories/card.php
    M htdocs/comm/propal/card.php
    M htdocs/commande/card.php
    M htdocs/commande/stats/index.php
    M htdocs/compta/resultat/index.php
    M htdocs/core/class/fiscalyear.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/db/pgsql.class.php
    M htdocs/core/lib/ajax.lib.php
    M htdocs/core/lib/files.lib.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/lib/json.lib.php
    M htdocs/core/modules/modReceiptPrinter.class.php
    M htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php
    M htdocs/document.php
    M htdocs/fichinter/card.php
    M htdocs/fourn/commande/card.php
    M htdocs/fourn/commande/list.php
    M htdocs/fourn/facture/card.php
    M htdocs/install/mysql/data/llx_accounting.sql
    M htdocs/install/mysql/data/llx_accounting_category.sql
    M htdocs/install/mysql/data/llx_const.sql
    M htdocs/install/mysql/migration/3.2.0-3.3.0.sql
    M htdocs/install/mysql/migration/3.5.0-3.6.0.sql
    M htdocs/install/mysql/migration/3.7.0-3.8.0.sql
    M htdocs/install/mysql/migration/3.9.0-4.0.0.sql
    M htdocs/install/mysql/migration/4.0.0-5.0.0.sql
    M htdocs/install/mysql/migration/5.0.0-6.0.0.sql
    M htdocs/install/mysql/migration/repair.sql
    M htdocs/install/mysql/tables/llx_accounting_account.sql
    M htdocs/install/mysql/tables/llx_actioncomm.sql
    M htdocs/install/mysql/tables/llx_advtargetemailing.sql
    M htdocs/install/mysql/tables/llx_blockedlog_authority.sql
    M htdocs/install/mysql/tables/llx_budget_lines.sql
    M htdocs/install/mysql/tables/llx_chargesociales.sql
    M htdocs/install/pgsql/functions/functions.sql
    M htdocs/install/upgrade.php
    M htdocs/langs/ar_SA/accountancy.lang
    M htdocs/langs/ar_SA/admin.lang
    M htdocs/langs/ar_SA/compta.lang
    M htdocs/langs/ar_SA/cron.lang
    M htdocs/langs/ar_SA/errors.lang
    M htdocs/langs/ar_SA/main.lang
    M htdocs/langs/ar_SA/other.lang
    M htdocs/langs/ar_SA/projects.lang
    M htdocs/langs/bg_BG/accountancy.lang
    M htdocs/langs/bg_BG/admin.lang
    M htdocs/langs/bg_BG/compta.lang
    M htdocs/langs/bg_BG/cron.lang
    M htdocs/langs/bg_BG/errors.lang
    M htdocs/langs/bg_BG/main.lang
    M htdocs/langs/bg_BG/other.lang
    M htdocs/langs/bg_BG/projects.lang
    M htdocs/langs/bn_BD/accountancy.lang
    M htdocs/langs/bn_BD/admin.lang
    M htdocs/langs/bn_BD/compta.lang
    M htdocs/langs/bn_BD/cron.lang
    M htdocs/langs/bn_BD/errors.lang
    M htdocs/langs/bn_BD/main.lang
    M htdocs/langs/bn_BD/other.lang
    M htdocs/langs/bn_BD/projects.lang
    M htdocs/langs/bs_BA/accountancy.lang
    M htdocs/langs/bs_BA/admin.lang
    M htdocs/langs/bs_BA/banks.lang
    M htdocs/langs/bs_BA/bills.lang
    M htdocs/langs/bs_BA/boxes.lang
    M htdocs/langs/bs_BA/companies.lang
    M htdocs/langs/bs_BA/compta.lang
    M htdocs/langs/bs_BA/contracts.lang
    M htdocs/langs/bs_BA/cron.lang
    M htdocs/langs/bs_BA/ecm.lang
    M htdocs/langs/bs_BA/errors.lang
    M htdocs/langs/bs_BA/holiday.lang
    M htdocs/langs/bs_BA/install.lang
    M htdocs/langs/bs_BA/main.lang
    M htdocs/langs/bs_BA/members.lang
    M htdocs/langs/bs_BA/orders.lang
    M htdocs/langs/bs_BA/other.lang
    M htdocs/langs/bs_BA/printing.lang
    M htdocs/langs/bs_BA/products.lang
    M htdocs/langs/bs_BA/projects.lang
    M htdocs/langs/bs_BA/propal.lang
    M htdocs/langs/bs_BA/resource.lang
    M htdocs/langs/bs_BA/stocks.lang
    M htdocs/langs/bs_BA/supplier_proposal.lang
    M htdocs/langs/bs_BA/suppliers.lang
    M htdocs/langs/bs_BA/trips.lang
    M htdocs/langs/bs_BA/users.lang
    M htdocs/langs/bs_BA/withdrawals.lang
    M htdocs/langs/ca_ES/accountancy.lang
    M htdocs/langs/ca_ES/admin.lang
    M htdocs/langs/ca_ES/agenda.lang
    M htdocs/langs/ca_ES/compta.lang
    M htdocs/langs/ca_ES/contracts.lang
    M htdocs/langs/ca_ES/cron.lang
    M htdocs/langs/ca_ES/errors.lang
    M htdocs/langs/ca_ES/main.lang
    M htdocs/langs/ca_ES/members.lang
    M htdocs/langs/ca_ES/other.lang
    M htdocs/langs/ca_ES/projects.lang
    M htdocs/langs/ca_ES/resource.lang
    M htdocs/langs/ca_ES/stocks.lang
    M htdocs/langs/cs_CZ/accountancy.lang
    M htdocs/langs/cs_CZ/admin.lang
    M htdocs/langs/cs_CZ/compta.lang
    M htdocs/langs/cs_CZ/cron.lang
    M htdocs/langs/cs_CZ/errors.lang
    M htdocs/langs/cs_CZ/main.lang
    M htdocs/langs/cs_CZ/other.lang
    M htdocs/langs/cs_CZ/projects.lang
    M htdocs/langs/da_DK/accountancy.lang
    M htdocs/langs/da_DK/admin.lang
    M htdocs/langs/da_DK/compta.lang
    M htdocs/langs/da_DK/cron.lang
    M htdocs/langs/da_DK/errors.lang
    M htdocs/langs/da_DK/main.lang
    M htdocs/langs/da_DK/other.lang
    M htdocs/langs/da_DK/projects.lang
    R htdocs/langs/de_AT/accountancy.lang
    M htdocs/langs/de_AT/admin.lang
    M htdocs/langs/de_AT/banks.lang
    M htdocs/langs/de_AT/compta.lang
    M htdocs/langs/de_AT/main.lang
    M htdocs/langs/de_AT/paypal.lang
    M htdocs/langs/de_CH/accountancy.lang
    M htdocs/langs/de_CH/admin.lang
    M htdocs/langs/de_CH/bills.lang
    M htdocs/langs/de_CH/companies.lang
    M htdocs/langs/de_CH/cron.lang
    M htdocs/langs/de_CH/main.lang
    M htdocs/langs/de_CH/projects.lang
    M htdocs/langs/de_DE/accountancy.lang
    M htdocs/langs/de_DE/admin.lang
    M htdocs/langs/de_DE/agenda.lang
    M htdocs/langs/de_DE/banks.lang
    M htdocs/langs/de_DE/bills.lang
    M htdocs/langs/de_DE/bookmarks.lang
    M htdocs/langs/de_DE/boxes.lang
    M htdocs/langs/de_DE/categories.lang
    M htdocs/langs/de_DE/commercial.lang
    M htdocs/langs/de_DE/companies.lang
    M htdocs/langs/de_DE/compta.lang
    M htdocs/langs/de_DE/contracts.lang
    M htdocs/langs/de_DE/cron.lang
    M htdocs/langs/de_DE/errors.lang
    M htdocs/langs/de_DE/exports.lang
    M htdocs/langs/de_DE/holiday.lang
    M htdocs/langs/de_DE/install.lang
    M htdocs/langs/de_DE/mails.lang
    M htdocs/langs/de_DE/main.lang
    M htdocs/langs/de_DE/members.lang
    M htdocs/langs/de_DE/other.lang
    M htdocs/langs/de_DE/paypal.lang
    M htdocs/langs/de_DE/products.lang
    M htdocs/langs/de_DE/projects.lang
    M htdocs/langs/de_DE/sendings.lang
    M htdocs/langs/de_DE/stocks.lang
    M htdocs/langs/de_DE/users.lang
    M htdocs/langs/de_DE/workflow.lang
    R htdocs/langs/el_CY/accountancy.lang
    M htdocs/langs/el_CY/admin.lang
    M htdocs/langs/el_CY/main.lang
    M htdocs/langs/el_GR/accountancy.lang
    M htdocs/langs/el_GR/admin.lang
    M htdocs/langs/el_GR/compta.lang
    M htdocs/langs/el_GR/cron.lang
    M htdocs/langs/el_GR/errors.lang
    M htdocs/langs/el_GR/main.lang
    M htdocs/langs/el_GR/other.lang
    M htdocs/langs/el_GR/projects.lang
    R htdocs/langs/en_AU/accountancy.lang
    M htdocs/langs/en_AU/admin.lang
    M htdocs/langs/en_AU/bills.lang
    M htdocs/langs/en_AU/cashdesk.lang
    M htdocs/langs/en_AU/main.lang
    R htdocs/langs/en_AU/trips.lang
    R htdocs/langs/en_CA/accountancy.lang
    M htdocs/langs/en_CA/admin.lang
    R htdocs/langs/en_CA/cashdesk.lang
    M htdocs/langs/en_CA/main.lang
    R htdocs/langs/en_CA/trips.lang
    R htdocs/langs/en_GB/accountancy.lang
    M htdocs/langs/en_GB/admin.lang
    M htdocs/langs/en_GB/bills.lang
    R htdocs/langs/en_GB/cashdesk.lang
    M htdocs/langs/en_GB/main.lang
    M htdocs/langs/en_GB/stocks.lang
    M htdocs/langs/en_GB/trips.lang
    R htdocs/langs/en_IN/accountancy.lang
    M htdocs/langs/en_IN/admin.lang
    R htdocs/langs/en_IN/cashdesk.lang
    M htdocs/langs/en_IN/main.lang
    R htdocs/langs/en_IN/trips.lang
    M htdocs/langs/en_US/admin.lang
    R htdocs/langs/es_AR/accountancy.lang
    M htdocs/langs/es_AR/admin.lang
    M htdocs/langs/es_AR/main.lang
    R htdocs/langs/es_BO/accountancy.lang
    M htdocs/langs/es_BO/admin.lang
    M htdocs/langs/es_BO/main.lang
    M htdocs/langs/es_CL/accountancy.lang
    M htdocs/langs/es_CL/admin.lang
    M htdocs/langs/es_CL/main.lang
    M htdocs/langs/es_CL/other.lang
    R htdocs/langs/es_CO/accountancy.lang
    M htdocs/langs/es_CO/admin.lang
    M htdocs/langs/es_CO/compta.lang
    M htdocs/langs/es_CO/main.lang
    R htdocs/langs/es_DO/accountancy.lang
    M htdocs/langs/es_DO/admin.lang
    M htdocs/langs/es_DO/main.lang
    R htdocs/langs/es_EC/accountancy.lang
    M htdocs/langs/es_EC/admin.lang
    M htdocs/langs/es_EC/main.lang
    M htdocs/langs/es_ES/accountancy.lang
    M htdocs/langs/es_ES/admin.lang
    M htdocs/langs/es_ES/compta.lang
    M htdocs/langs/es_ES/cron.lang
    M htdocs/langs/es_ES/errors.lang
    M htdocs/langs/es_ES/main.lang
    M htdocs/langs/es_ES/other.lang
    M htdocs/langs/es_ES/projects.lang
    M htdocs/langs/es_MX/accountancy.lang
    M htdocs/langs/es_MX/admin.lang
    M htdocs/langs/es_MX/companies.lang
    M htdocs/langs/es_MX/compta.lang
    M htdocs/langs/es_MX/main.lang
    M htdocs/langs/es_MX/other.lang
    R htdocs/langs/es_PA/accountancy.lang
    M htdocs/langs/es_PA/admin.lang
    M htdocs/langs/es_PA/main.lang
    M htdocs/langs/es_PE/accountancy.lang
    M htdocs/langs/es_PE/admin.lang
    M htdocs/langs/es_PE/main.lang
    R htdocs/langs/es_PY/accountancy.lang
    M htdocs/langs/es_PY/admin.lang
    M htdocs/langs/es_PY/main.lang
    R htdocs/langs/es_VE/accountancy.lang
    M htdocs/langs/es_VE/admin.lang
    M htdocs/langs/es_VE/main.lang
    M htdocs/langs/es_VE/other.lang
    M htdocs/langs/es_VE/supplier_proposal.lang
    M htdocs/langs/et_EE/accountancy.lang
    M htdocs/langs/et_EE/admin.lang
    M htdocs/langs/et_EE/compta.lang
    M htdocs/langs/et_EE/cron.lang
    M htdocs/langs/et_EE/errors.lang
    M htdocs/langs/et_EE/main.lang
    M htdocs/langs/et_EE/other.lang
    M htdocs/langs/et_EE/projects.lang
    M htdocs/langs/eu_ES/accountancy.lang
    M htdocs/langs/eu_ES/admin.lang
    M htdocs/langs/eu_ES/compta.lang
    M htdocs/langs/eu_ES/cron.lang
    M htdocs/langs/eu_ES/errors.lang
    M htdocs/langs/eu_ES/main.lang
    M htdocs/langs/eu_ES/other.lang
    M htdocs/langs/eu_ES/projects.lang
    M htdocs/langs/fa_IR/accountancy.lang
    M htdocs/langs/fa_IR/admin.lang
    M htdocs/langs/fa_IR/compta.lang
    M htdocs/langs/fa_IR/cron.lang
    M htdocs/langs/fa_IR/errors.lang
    M htdocs/langs/fa_IR/main.lang
    M htdocs/langs/fa_IR/other.lang
    M htdocs/langs/fa_IR/projects.lang
    M htdocs/langs/fi_FI/accountancy.lang
    M htdocs/langs/fi_FI/admin.lang
    M htdocs/langs/fi_FI/compta.lang
    M htdocs/langs/fi_FI/cron.lang
    M htdocs/langs/fi_FI/errors.lang
    M htdocs/langs/fi_FI/main.lang
    M htdocs/langs/fi_FI/other.lang
    M htdocs/langs/fi_FI/projects.lang
    M htdocs/langs/fr_BE/accountancy.lang
    M htdocs/langs/fr_BE/admin.lang
    R htdocs/langs/fr_BE/cashdesk.lang
    M htdocs/langs/fr_BE/main.lang
    M htdocs/langs/fr_CA/accountancy.lang
    M htdocs/langs/fr_CA/admin.lang
    M htdocs/langs/fr_CA/agenda.lang
    M htdocs/langs/fr_CA/banks.lang
    M htdocs/langs/fr_CA/bills.lang
    M htdocs/langs/fr_CA/boxes.lang
    M htdocs/langs/fr_CA/cashdesk.lang
    M htdocs/langs/fr_CA/categories.lang
    M htdocs/langs/fr_CA/commercial.lang
    M htdocs/langs/fr_CA/companies.lang
    M htdocs/langs/fr_CA/compta.lang
    M htdocs/langs/fr_CA/contracts.lang
    M htdocs/langs/fr_CA/cron.lang
    M htdocs/langs/fr_CA/deliveries.lang
    M htdocs/langs/fr_CA/donations.lang
    M htdocs/langs/fr_CA/ecm.lang
    M htdocs/langs/fr_CA/errors.lang
    M htdocs/langs/fr_CA/exports.lang
    M htdocs/langs/fr_CA/holiday.lang
    M htdocs/langs/fr_CA/install.lang
    M htdocs/langs/fr_CA/interventions.lang
    M htdocs/langs/fr_CA/ldap.lang
    M htdocs/langs/fr_CA/mails.lang
    M htdocs/langs/fr_CA/main.lang
    M htdocs/langs/fr_CA/margins.lang
    M htdocs/langs/fr_CA/members.lang
    M htdocs/langs/fr_CA/oauth.lang
    M htdocs/langs/fr_CA/opensurvey.lang
    M htdocs/langs/fr_CA/orders.lang
    M htdocs/langs/fr_CA/other.lang
    M htdocs/langs/fr_CA/paybox.lang
    M htdocs/langs/fr_CA/printing.lang
    M htdocs/langs/fr_CA/products.lang
    M htdocs/langs/fr_CA/projects.lang
    M htdocs/langs/fr_CA/propal.lang
    M htdocs/langs/fr_CA/salaries.lang
    M htdocs/langs/fr_CA/sendings.lang
    M htdocs/langs/fr_CA/sms.lang
    M htdocs/langs/fr_CA/stocks.lang
    M htdocs/langs/fr_CA/supplier_proposal.lang
    M htdocs/langs/fr_CA/suppliers.lang
    M htdocs/langs/fr_CA/trips.lang
    M htdocs/langs/fr_CA/users.lang
    M htdocs/langs/fr_CA/website.lang
    M htdocs/langs/fr_CA/withdrawals.lang
    M htdocs/langs/fr_CA/workflow.lang
    R htdocs/langs/fr_CH/accountancy.lang
    M htdocs/langs/fr_CH/admin.lang
    R htdocs/langs/fr_CH/cashdesk.lang
    M htdocs/langs/fr_CH/main.lang
    M htdocs/langs/fr_FR/accountancy.lang
    M htdocs/langs/fr_FR/admin.lang
    M htdocs/langs/fr_FR/bills.lang
    M htdocs/langs/fr_FR/companies.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/exports.lang
    M htdocs/langs/fr_FR/main.lang
    M htdocs/langs/fr_FR/other.lang
    M htdocs/langs/fr_FR/projects.lang
    M htdocs/langs/fr_NC/projects.lang
    R htdocs/langs/fr_NC/sendings.lang
    M htdocs/langs/he_IL/accountancy.lang
    M htdocs/langs/he_IL/admin.lang
    M htdocs/langs/he_IL/compta.lang
    M htdocs/langs/he_IL/cron.lang
    M htdocs/langs/he_IL/errors.lang
    M htdocs/langs/he_IL/main.lang
    M htdocs/langs/he_IL/other.lang
    M htdocs/langs/he_IL/projects.lang
    M htdocs/langs/hr_HR/accountancy.lang
    M htdocs/langs/hr_HR/admin.lang
    M htdocs/langs/hr_HR/compta.lang
    M htdocs/langs/hr_HR/cron.lang
    M htdocs/langs/hr_HR/errors.lang
    M htdocs/langs/hr_HR/main.lang
    M htdocs/langs/hr_HR/other.lang
    M htdocs/langs/hr_HR/projects.lang
    M htdocs/langs/hu_HU/accountancy.lang
    M htdocs/langs/hu_HU/admin.lang
    M htdocs/langs/hu_HU/compta.lang
    M htdocs/langs/hu_HU/cron.lang
    M htdocs/langs/hu_HU/errors.lang
    M htdocs/langs/hu_HU/main.lang
    M htdocs/langs/hu_HU/other.lang
    M htdocs/langs/hu_HU/projects.lang
    M htdocs/langs/id_ID/accountancy.lang
    M htdocs/langs/id_ID/admin.lang
    M htdocs/langs/id_ID/compta.lang
    M htdocs/langs/id_ID/cron.lang
    M htdocs/langs/id_ID/errors.lang
    M htdocs/langs/id_ID/main.lang
    M htdocs/langs/id_ID/other.lang
    M htdocs/langs/id_ID/projects.lang
    M htdocs/langs/is_IS/accountancy.lang
    M htdocs/langs/is_IS/admin.lang
    M htdocs/langs/is_IS/compta.lang
    M htdocs/langs/is_IS/cron.lang
    M htdocs/langs/is_IS/errors.lang
    M htdocs/langs/is_IS/main.lang
    M htdocs/langs/is_IS/other.lang
    M htdocs/langs/is_IS/projects.lang
    M htdocs/langs/it_IT/accountancy.lang
    M htdocs/langs/it_IT/admin.lang
    M htdocs/langs/it_IT/banks.lang
    M htdocs/langs/it_IT/compta.lang
    M htdocs/langs/it_IT/cron.lang
    M htdocs/langs/it_IT/errors.lang
    M htdocs/langs/it_IT/main.lang
    M htdocs/langs/it_IT/other.lang
    M htdocs/langs/it_IT/projects.lang
    M htdocs/langs/ja_JP/accountancy.lang
    M htdocs/langs/ja_JP/admin.lang
    M htdocs/langs/ja_JP/compta.lang
    M htdocs/langs/ja_JP/cron.lang
    M htdocs/langs/ja_JP/errors.lang
    M htdocs/langs/ja_JP/main.lang
    M htdocs/langs/ja_JP/other.lang
    M htdocs/langs/ja_JP/projects.lang
    M htdocs/langs/ka_GE/accountancy.lang
    M htdocs/langs/ka_GE/admin.lang
    M htdocs/langs/ka_GE/compta.lang
    M htdocs/langs/ka_GE/cron.lang
    M htdocs/langs/ka_GE/errors.lang
    M htdocs/langs/ka_GE/main.lang
    M htdocs/langs/ka_GE/other.lang
    M htdocs/langs/ka_GE/projects.lang
    M htdocs/langs/km_KH/accountancy.lang
    M htdocs/langs/km_KH/admin.lang
    M htdocs/langs/km_KH/compta.lang
    M htdocs/langs/km_KH/cron.lang
    M htdocs/langs/km_KH/errors.lang
    M htdocs/langs/km_KH/main.lang
    M htdocs/langs/km_KH/other.lang
    M htdocs/langs/km_KH/projects.lang
    M htdocs/langs/kn_IN/accountancy.lang
    M htdocs/langs/kn_IN/admin.lang
    M htdocs/langs/kn_IN/compta.lang
    M htdocs/langs/kn_IN/cron.lang
    M htdocs/langs/kn_IN/errors.lang
    M htdocs/langs/kn_IN/main.lang
    M htdocs/langs/kn_IN/other.lang
    M htdocs/langs/kn_IN/projects.lang
    M htdocs/langs/ko_KR/accountancy.lang
    M htdocs/langs/ko_KR/admin.lang
    M htdocs/langs/ko_KR/compta.lang
    M htdocs/langs/ko_KR/cron.lang
    M htdocs/langs/ko_KR/errors.lang
    M htdocs/langs/ko_KR/main.lang
    M htdocs/langs/ko_KR/other.lang
    M htdocs/langs/ko_KR/projects.lang
    M htdocs/langs/lo_LA/accountancy.lang
    M htdocs/langs/lo_LA/admin.lang
    M htdocs/langs/lo_LA/compta.lang
    M htdocs/langs/lo_LA/cron.lang
    M htdocs/langs/lo_LA/errors.lang
    M htdocs/langs/lo_LA/main.lang
    M htdocs/langs/lo_LA/other.lang
    M htdocs/langs/lo_LA/projects.lang
    M htdocs/langs/lt_LT/accountancy.lang
    M htdocs/langs/lt_LT/admin.lang
    M htdocs/langs/lt_LT/compta.lang
    M htdocs/langs/lt_LT/cron.lang
    M htdocs/langs/lt_LT/errors.lang
    M htdocs/langs/lt_LT/main.lang
    M htdocs/langs/lt_LT/other.lang
    M htdocs/langs/lt_LT/projects.lang
    M htdocs/langs/lv_LV/accountancy.lang
    M htdocs/langs/lv_LV/admin.lang
    M htdocs/langs/lv_LV/compta.lang
    M htdocs/langs/lv_LV/cron.lang
    M htdocs/langs/lv_LV/errors.lang
    M htdocs/langs/lv_LV/main.lang
    M htdocs/langs/lv_LV/other.lang
    M htdocs/langs/lv_LV/projects.lang
    M htdocs/langs/mk_MK/accountancy.lang
    M htdocs/langs/mk_MK/admin.lang
    M htdocs/langs/mk_MK/compta.lang
    M htdocs/langs/mk_MK/cron.lang
    M htdocs/langs/mk_MK/errors.lang
    M htdocs/langs/mk_MK/main.lang
    M htdocs/langs/mk_MK/other.lang
    M htdocs/langs/mk_MK/projects.lang
    M htdocs/langs/mn_MN/accountancy.lang
    M htdocs/langs/mn_MN/admin.lang
    M htdocs/langs/mn_MN/compta.lang
    M htdocs/langs/mn_MN/cron.lang
    M htdocs/langs/mn_MN/errors.lang
    M htdocs/langs/mn_MN/main.lang
    M htdocs/langs/mn_MN/other.lang
    M htdocs/langs/mn_MN/projects.lang
    M htdocs/langs/nb_NO/accountancy.lang
    M htdocs/langs/nb_NO/admin.lang
    M htdocs/langs/nb_NO/agenda.lang
    M htdocs/langs/nb_NO/banks.lang
    M htdocs/langs/nb_NO/bills.lang
    M htdocs/langs/nb_NO/bookmarks.lang
    M htdocs/langs/nb_NO/boxes.lang
    M htdocs/langs/nb_NO/commercial.lang
    M htdocs/langs/nb_NO/compta.lang
    M htdocs/langs/nb_NO/contracts.lang
    M htdocs/langs/nb_NO/cron.lang
    M htdocs/langs/nb_NO/errors.lang
    M htdocs/langs/nb_NO/exports.lang
    M htdocs/langs/nb_NO/loan.lang
    M htdocs/langs/nb_NO/mails.lang
    M htdocs/langs/nb_NO/main.lang
    M htdocs/langs/nb_NO/margins.lang
    A htdocs/langs/nb_NO/modulebuilder.lang
    A htdocs/langs/nb_NO/multicurrency.lang
    M htdocs/langs/nb_NO/other.lang
    M htdocs/langs/nb_NO/paypal.lang
    M htdocs/langs/nb_NO/products.lang
    M htdocs/langs/nb_NO/projects.lang
    M htdocs/langs/nb_NO/resource.lang
    M htdocs/langs/nb_NO/sendings.lang
    M htdocs/langs/nb_NO/stocks.lang
    A htdocs/langs/nb_NO/stripe.lang
    M htdocs/langs/nb_NO/trips.lang
    M htdocs/langs/nb_NO/users.lang
    M htdocs/langs/nb_NO/website.lang
    M htdocs/langs/nl_BE/accountancy.lang
    M htdocs/langs/nl_BE/admin.lang
    M htdocs/langs/nl_BE/compta.lang
    M htdocs/langs/nl_BE/main.lang
    M htdocs/langs/nl_BE/other.lang
    M htdocs/langs/nl_BE/products.lang
    M htdocs/langs/nl_NL/accountancy.lang
    M htdocs/langs/nl_NL/admin.lang
    M htdocs/langs/nl_NL/agenda.lang
    M htdocs/langs/nl_NL/compta.lang
    M htdocs/langs/nl_NL/cron.lang
    M htdocs/langs/nl_NL/errors.lang
    M htdocs/langs/nl_NL/main.lang
    M htdocs/langs/nl_NL/other.lang
    M htdocs/langs/nl_NL/projects.lang
    M htdocs/langs/pl_PL/accountancy.lang
    M htdocs/langs/pl_PL/admin.lang
    M htdocs/langs/pl_PL/compta.lang
    M htdocs/langs/pl_PL/cron.lang
    M htdocs/langs/pl_PL/errors.lang
    M htdocs/langs/pl_PL/main.lang
    M htdocs/langs/pl_PL/other.lang
    M htdocs/langs/pl_PL/projects.lang
    M htdocs/langs/pt_BR/accountancy.lang
    M htdocs/langs/pt_BR/admin.lang
    M htdocs/langs/pt_BR/banks.lang
    M htdocs/langs/pt_BR/bookmarks.lang
    M htdocs/langs/pt_BR/boxes.lang
    M htdocs/langs/pt_BR/companies.lang
    M htdocs/langs/pt_BR/compta.lang
    M htdocs/langs/pt_BR/cron.lang
    M htdocs/langs/pt_BR/errors.lang
    M htdocs/langs/pt_BR/main.lang
    M htdocs/langs/pt_BR/other.lang
    M htdocs/langs/pt_BR/paypal.lang
    M htdocs/langs/pt_BR/products.lang
    M htdocs/langs/pt_BR/projects.lang
    M htdocs/langs/pt_BR/supplier_proposal.lang
    M htdocs/langs/pt_PT/accountancy.lang
    M htdocs/langs/pt_PT/admin.lang
    M htdocs/langs/pt_PT/bills.lang
    M htdocs/langs/pt_PT/bookmarks.lang
    M htdocs/langs/pt_PT/boxes.lang
    M htdocs/langs/pt_PT/companies.lang
    M htdocs/langs/pt_PT/compta.lang
    M htdocs/langs/pt_PT/cron.lang
    M htdocs/langs/pt_PT/errors.lang
    M htdocs/langs/pt_PT/main.lang
    M htdocs/langs/pt_PT/other.lang
    M htdocs/langs/pt_PT/projects.lang
    M htdocs/langs/ro_RO/accountancy.lang
    M htdocs/langs/ro_RO/admin.lang
    M htdocs/langs/ro_RO/compta.lang
    M htdocs/langs/ro_RO/cron.lang
    M htdocs/langs/ro_RO/errors.lang
    M htdocs/langs/ro_RO/main.lang
    M htdocs/langs/ro_RO/other.lang
    M htdocs/langs/ro_RO/paybox.lang
    M htdocs/langs/ro_RO/projects.lang
    M htdocs/langs/ru_RU/accountancy.lang
    M htdocs/langs/ru_RU/admin.lang
    M htdocs/langs/ru_RU/compta.lang
    M htdocs/langs/ru_RU/cron.lang
    M htdocs/langs/ru_RU/errors.lang
    M htdocs/langs/ru_RU/main.lang
    A htdocs/langs/ru_RU/modulebuilder.lang
    A htdocs/langs/ru_RU/multicurrency.lang
    M htdocs/langs/ru_RU/other.lang
    M htdocs/langs/ru_RU/projects.lang
    A htdocs/langs/ru_RU/stripe.lang
    M htdocs/langs/sk_SK/accountancy.lang
    M htdocs/langs/sk_SK/admin.lang
    M htdocs/langs/sk_SK/compta.lang
    M htdocs/langs/sk_SK/cron.lang
    M htdocs/langs/sk_SK/errors.lang
    M htdocs/langs/sk_SK/main.lang
    M htdocs/langs/sk_SK/other.lang
    M htdocs/langs/sk_SK/projects.lang
    M htdocs/langs/sl_SI/accountancy.lang
    M htdocs/langs/sl_SI/admin.lang
    M htdocs/langs/sl_SI/compta.lang
    M htdocs/langs/sl_SI/cron.lang
    M htdocs/langs/sl_SI/dict.lang
    M htdocs/langs/sl_SI/errors.lang
    M htdocs/langs/sl_SI/main.lang
    M htdocs/langs/sl_SI/other.lang
    M htdocs/langs/sl_SI/projects.lang
    M htdocs/langs/sq_AL/accountancy.lang
    M htdocs/langs/sq_AL/admin.lang
    M htdocs/langs/sq_AL/compta.lang
    M htdocs/langs/sq_AL/cron.lang
    M htdocs/langs/sq_AL/errors.lang
    M htdocs/langs/sq_AL/main.lang
    M htdocs/langs/sq_AL/other.lang
    M htdocs/langs/sq_AL/projects.lang
    M htdocs/langs/sr_RS/accountancy.lang
    M htdocs/langs/sr_RS/admin.lang
    M htdocs/langs/sr_RS/compta.lang
    M htdocs/langs/sr_RS/cron.lang
    M htdocs/langs/sr_RS/errors.lang
    M htdocs/langs/sr_RS/main.lang
    M htdocs/langs/sr_RS/other.lang
    M htdocs/langs/sr_RS/projects.lang
    M htdocs/langs/sv_SE/accountancy.lang
    M htdocs/langs/sv_SE/admin.lang
    M htdocs/langs/sv_SE/compta.lang
    M htdocs/langs/sv_SE/cron.lang
    M htdocs/langs/sv_SE/errors.lang
    M htdocs/langs/sv_SE/main.lang
    M htdocs/langs/sv_SE/other.lang
    M htdocs/langs/sv_SE/projects.lang
    M htdocs/langs/sw_SW/accountancy.lang
    M htdocs/langs/sw_SW/admin.lang
    M htdocs/langs/sw_SW/compta.lang
    M htdocs/langs/sw_SW/cron.lang
    M htdocs/langs/sw_SW/errors.lang
    M htdocs/langs/sw_SW/main.lang
    M htdocs/langs/sw_SW/other.lang
    M htdocs/langs/sw_SW/projects.lang
    M htdocs/langs/th_TH/accountancy.lang
    M htdocs/langs/th_TH/admin.lang
    M htdocs/langs/th_TH/compta.lang
    M htdocs/langs/th_TH/cron.lang
    M htdocs/langs/th_TH/errors.lang
    M htdocs/langs/th_TH/main.lang
    M htdocs/langs/th_TH/other.lang
    M htdocs/langs/th_TH/projects.lang
    M htdocs/langs/tr_TR/accountancy.lang
    M htdocs/langs/tr_TR/admin.lang
    M htdocs/langs/tr_TR/compta.lang
    M htdocs/langs/tr_TR/cron.lang
    M htdocs/langs/tr_TR/errors.lang
    M htdocs/langs/tr_TR/main.lang
    M htdocs/langs/tr_TR/other.lang
    M htdocs/langs/tr_TR/projects.lang
    M htdocs/langs/uk_UA/accountancy.lang
    M htdocs/langs/uk_UA/admin.lang
    M htdocs/langs/uk_UA/compta.lang
    M htdocs/langs/uk_UA/cron.lang
    M htdocs/langs/uk_UA/errors.lang
    M htdocs/langs/uk_UA/main.lang
    M htdocs/langs/uk_UA/other.lang
    M htdocs/langs/uk_UA/projects.lang
    M htdocs/langs/uz_UZ/accountancy.lang
    M htdocs/langs/uz_UZ/admin.lang
    M htdocs/langs/uz_UZ/compta.lang
    M htdocs/langs/uz_UZ/cron.lang
    M htdocs/langs/uz_UZ/errors.lang
    M htdocs/langs/uz_UZ/main.lang
    M htdocs/langs/uz_UZ/other.lang
    M htdocs/langs/uz_UZ/projects.lang
    M htdocs/langs/vi_VN/accountancy.lang
    M htdocs/langs/vi_VN/admin.lang
    M htdocs/langs/vi_VN/compta.lang
    M htdocs/langs/vi_VN/cron.lang
    M htdocs/langs/vi_VN/errors.lang
    M htdocs/langs/vi_VN/main.lang
    M htdocs/langs/vi_VN/other.lang
    M htdocs/langs/vi_VN/projects.lang
    M htdocs/langs/zh_CN/accountancy.lang
    M htdocs/langs/zh_CN/admin.lang
    M htdocs/langs/zh_CN/compta.lang
    M htdocs/langs/zh_CN/cron.lang
    M htdocs/langs/zh_CN/errors.lang
    M htdocs/langs/zh_CN/main.lang
    M htdocs/langs/zh_CN/other.lang
    M htdocs/langs/zh_CN/projects.lang
    M htdocs/langs/zh_TW/accountancy.lang
    M htdocs/langs/zh_TW/admin.lang
    M htdocs/langs/zh_TW/compta.lang
    M htdocs/langs/zh_TW/cron.lang
    M htdocs/langs/zh_TW/errors.lang
    M htdocs/langs/zh_TW/main.lang
    M htdocs/langs/zh_TW/other.lang
    M htdocs/langs/zh_TW/projects.lang
    M htdocs/margin/agentMargins.php
    M htdocs/margin/checkMargins.php
    M htdocs/margin/customerMargins.php
    M htdocs/margin/productMargins.php
    M htdocs/modulebuilder/template/sql/llx_myobject.key.sql
    M htdocs/product/card.php
    M htdocs/product/stock/card.php
    M htdocs/societe/ajax/company.php
    M htdocs/supplier_proposal/card.php
    M htdocs/supplier_proposal/class/supplier_proposal.class.php
    M htdocs/theme/eldy/style.css.php
    M htdocs/theme/md/style.css.php
    M test/phpunit/AdminLibTest.php
    M test/phpunit/CodingSqlTest.php
    M test/phpunit/JsonLibTest.php
    M test/phpunit/LangTest.php
    M test/phpunit/RestAPIUserTest.php

  Log Message:
  -----------
  Merge remote-tracking branch 'uptream/develop' into 6.0-fec3

# Conflicts:
#       htdocs/accountancy/customer/index.php


  Commit: 30e881b03a6c98ea3642bfe16bd32fec9dc93767
      
https://github.com/Dolibarr/dolibarr/commit/30e881b03a6c98ea3642bfe16bd32fec9dc93767
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-06-24 (Sat, 24 Jun 2017)

  Changed paths:
    M htdocs/accountancy/admin/accountmodel.php
    M htdocs/accountancy/admin/defaultaccounts.php
    M htdocs/accountancy/bookkeeping/card.php
    M htdocs/accountancy/bookkeeping/list.php
    M htdocs/accountancy/customer/index.php
    M htdocs/accountancy/expensereport/index.php
    M htdocs/langs/en_US/salaries.lang

  Log Message:
  -----------
  Merge pull request #7051 from aspangaro/6.0-fec3

Fix : Accountancy v6


Compare: 
https://github.com/Dolibarr/dolibarr/compare/534ec0d44ac5...30e881b03a6c

reply via email to

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