[Dolibarr-git] [Dolibarr/dolibarr] 3c54cb: Fix avoid trigger during migr

dolibarr-git
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 3c54cb: Fix avoid trigger during migr

From:	Laurent Destailleur
Subject:	[Dolibarr-git] [Dolibarr/dolibarr] 3c54cb: Fix avoid trigger during migration
Date:	Fri, 03 Mar 2017 05:32:00 -0800
  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 3c54cb5ba9d1ef9378b2f05791d2885e99c159ef
      
https://github.com/Dolibarr/dolibarr/commit/3c54cb5ba9d1ef9378b2f05791d2885e99c159ef
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-02-28 (Tue, 28 Feb 2017)

  Changed paths:
    M htdocs/core/class/interfaces.class.php
    M htdocs/core/modules/DolibarrModules.class.php
    M htdocs/user/class/user.class.php

  Log Message:
  -----------
  Fix avoid trigger during migration


  Commit: 0bc41f50f537dd5a1ad8382cace3d7292904192a
      
https://github.com/Dolibarr/dolibarr/commit/0bc41f50f537dd5a1ad8382cace3d7292904192a
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-02-28 (Tue, 28 Feb 2017)

  Changed paths:
    M htdocs/theme/eldy/style.css.php

  Log Message:
  -----------
  Fix regression. lost overflow on left menu.


  Commit: 9ce50b7bbf4a7cea37b45def4c637fb388258d6e
      
https://github.com/Dolibarr/dolibarr/commit/9ce50b7bbf4a7cea37b45def4c637fb388258d6e
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-02-28 (Tue, 28 Feb 2017)

  Changed paths:
    M htdocs/index.php

  Log Message:
  -----------
  Fix loading of language file


  Commit: 3de288ef4587725bf92d35c9ca1a8858162682bf
      
https://github.com/Dolibarr/dolibarr/commit/3de288ef4587725bf92d35c9ca1a8858162682bf
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-02-28 (Tue, 28 Feb 2017)

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

  Log Message:
  -----------
  Fix badge not compatible with multicompany


  Commit: 8487f0fc963212fb06c77390f78b7a63f13f807d
      
https://github.com/Dolibarr/dolibarr/commit/8487f0fc963212fb06c77390f78b7a63f13f807d
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-03-01 (Wed, 01 Mar 2017)

  Changed paths:
    M htdocs/core/class/conf.class.php
    M htdocs/install/mysql/migration/4.0.0-5.0.0.sql

  Log Message:
  -----------
  Fix missing setup of new option


  Commit: 1562df8f93c2cf25a5d1a81d35d4ed8230190382
      
https://github.com/Dolibarr/dolibarr/commit/1562df8f93c2cf25a5d1a81d35d4ed8230190382
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-03-02 (Thu, 02 Mar 2017)

  Changed paths:
    M htdocs/adherents/agenda.php
    M htdocs/compta/paiement/cheque/card.php
    M htdocs/core/lib/company.lib.php
    M htdocs/expedition/card.php
    M htdocs/projet/graph_opportunities.inc.php

  Log Message:
  -----------
  Fix responsive design


  Commit: d67d83515a603b16d51d63d23c21d92a51766624
      
https://github.com/Dolibarr/dolibarr/commit/d67d83515a603b16d51d63d23c21d92a51766624
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-03-02 (Thu, 02 Mar 2017)

  Changed paths:
    M htdocs/compta/paiement/cheque/card.php
    M htdocs/compta/paiement/cheque/class/remisecheque.class.php

  Log Message:
  -----------
  Fix dol_banner usage


  Commit: 0dd8db90730a2a8e7ac899eab3572c4ba04a7277
      
https://github.com/Dolibarr/dolibarr/commit/0dd8db90730a2a8e7ac899eab3572c4ba04a7277
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-03-02 (Thu, 02 Mar 2017)

  Changed paths:
    M htdocs/compta/paiement/cheque/card.php

  Log Message:
  -----------
  Fix bank account label missing


  Commit: 8ccc57e70fbfccd482a91c82bfb82da0eaac3d64
      
https://github.com/Dolibarr/dolibarr/commit/8ccc57e70fbfccd482a91c82bfb82da0eaac3d64
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-03-02 (Thu, 02 Mar 2017)

  Changed paths:
    M htdocs/core/lib/security.lib.php
    M htdocs/expensereport/document.php
    M htdocs/expensereport/info.php
    M htdocs/expensereport/note.php

  Log Message:
  -----------
  Fix compatibility with multicompany


  Commit: da72bab33dcbb2f04a4d3d9e3bc216025253c900
      
https://github.com/Dolibarr/dolibarr/commit/da72bab33dcbb2f04a4d3d9e3bc216025253c900
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-03-02 (Thu, 02 Mar 2017)

  Changed paths:
    M htdocs/expensereport/index.php

  Log Message:
  -----------
  Fix compatibility with multicompany module


  Commit: f306b21d8039ec7ab77ba4eb1d015c26a4e0639f
      
https://github.com/Dolibarr/dolibarr/commit/f306b21d8039ec7ab77ba4eb1d015c26a4e0639f
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-03-02 (Thu, 02 Mar 2017)

  Changed paths:
    M htdocs/expensereport/index.php

  Log Message:
  -----------
  Fix compatibility with multicompany module


  Commit: 07d121a7a00a4e2b35315efc5b4e0391bf825e9e
      
https://github.com/Dolibarr/dolibarr/commit/07d121a7a00a4e2b35315efc5b4e0391bf825e9e
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-03-02 (Thu, 02 Mar 2017)

  Changed paths:
    M htdocs/expensereport/index.php

  Log Message:
  -----------
  Fix compatibility with multicompany module


  Commit: 29618890f433605b393de3fdbeb5fc5731aa625e
      
https://github.com/Dolibarr/dolibarr/commit/29618890f433605b393de3fdbeb5fc5731aa625e
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-03-02 (Thu, 02 Mar 2017)

  Changed paths:
    M htdocs/expensereport/index.php

  Log Message:
  -----------
  Fix permission on expense report


  Commit: 57b532cdd0f5328f461818522c2190917843be44
      
https://github.com/Dolibarr/dolibarr/commit/57b532cdd0f5328f461818522c2190917843be44
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-03-02 (Thu, 02 Mar 2017)

  Changed paths:
    M htdocs/install/mysql/migration/repair.sql
    M htdocs/projet/card.php

  Log Message:
  -----------
  Fix status of opportunity is required if an amount is defined


  Commit: 5842d1ee416d5b10d4ba9bc9e62ebc747b8f918d
      
https://github.com/Dolibarr/dolibarr/commit/5842d1ee416d5b10d4ba9bc9e62ebc747b8f918d
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-03-02 (Thu, 02 Mar 2017)

  Changed paths:
    M htdocs/contrat/class/contrat.class.php
    M htdocs/contrat/list.php

  Log Message:
  -----------
  Fix link to notes ko for contracts.


  Commit: e6846f5c01320c59ad24ea08fee987fb208338c0
      
https://github.com/Dolibarr/dolibarr/commit/e6846f5c01320c59ad24ea08fee987fb208338c0
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-03-02 (Thu, 02 Mar 2017)

  Changed paths:
    M htdocs/projet/card.php
    M htdocs/projet/class/project.class.php

  Log Message:
  -----------
  Fix error management when renaming a project with existing ref.


  Commit: 4929ba16c475b066b9b00feca7205b9c8d42895d
      
https://github.com/Dolibarr/dolibarr/commit/4929ba16c475b066b9b00feca7205b9c8d42895d
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-03-03 (Fri, 03 Mar 2017)

  Changed paths:
    M htdocs/contrat/card.php
    M htdocs/core/tpl/objectline_create.tpl.php

  Log Message:
  -----------
  Fix on contract card, we must show title in add entry form.


  Commit: 807eb5680781cdf3acafcf9660160c948da85763
      
https://github.com/Dolibarr/dolibarr/commit/807eb5680781cdf3acafcf9660160c948da85763
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-03-03 (Fri, 03 Mar 2017)

  Changed paths:
    M htdocs/install/mysql/data/llx_c_currencies.sql
    M htdocs/langs/ar_SA/admin.lang
    M htdocs/langs/ar_SA/main.lang
    M htdocs/langs/bg_BG/admin.lang
    M htdocs/langs/bg_BG/main.lang
    M htdocs/langs/bn_BD/admin.lang
    M htdocs/langs/bn_BD/main.lang
    M htdocs/langs/bs_BA/admin.lang
    M htdocs/langs/bs_BA/main.lang
    M htdocs/langs/ca_ES/admin.lang
    M htdocs/langs/ca_ES/bills.lang
    M htdocs/langs/ca_ES/boxes.lang
    M htdocs/langs/ca_ES/mails.lang
    M htdocs/langs/ca_ES/main.lang
    M htdocs/langs/ca_ES/members.lang
    M htdocs/langs/ca_ES/orders.lang
    M htdocs/langs/ca_ES/other.lang
    M htdocs/langs/ca_ES/projects.lang
    M htdocs/langs/ca_ES/stocks.lang
    M htdocs/langs/ca_ES/suppliers.lang
    M htdocs/langs/cs_CZ/admin.lang
    M htdocs/langs/cs_CZ/main.lang
    M htdocs/langs/da_DK/admin.lang
    M htdocs/langs/da_DK/main.lang
    M htdocs/langs/de_AT/admin.lang
    M htdocs/langs/de_AT/main.lang
    M htdocs/langs/de_CH/admin.lang
    M htdocs/langs/de_CH/main.lang
    M htdocs/langs/de_DE/admin.lang
    M htdocs/langs/de_DE/banks.lang
    M htdocs/langs/de_DE/bills.lang
    M htdocs/langs/de_DE/cashdesk.lang
    M htdocs/langs/de_DE/companies.lang
    M htdocs/langs/de_DE/compta.lang
    M htdocs/langs/de_DE/main.lang
    M htdocs/langs/el_CY/admin.lang
    M htdocs/langs/el_CY/main.lang
    M htdocs/langs/el_GR/admin.lang
    M htdocs/langs/el_GR/main.lang
    M htdocs/langs/en_AU/admin.lang
    M htdocs/langs/en_AU/main.lang
    M htdocs/langs/en_CA/admin.lang
    M htdocs/langs/en_CA/main.lang
    M htdocs/langs/en_GB/admin.lang
    M htdocs/langs/en_GB/main.lang
    M htdocs/langs/en_IN/admin.lang
    M htdocs/langs/en_IN/main.lang
    M htdocs/langs/es_AR/admin.lang
    M htdocs/langs/es_AR/main.lang
    M htdocs/langs/es_BO/admin.lang
    M htdocs/langs/es_BO/main.lang
    M htdocs/langs/es_CL/admin.lang
    M htdocs/langs/es_CL/main.lang
    M htdocs/langs/es_CO/admin.lang
    M htdocs/langs/es_CO/main.lang
    M htdocs/langs/es_DO/admin.lang
    M htdocs/langs/es_DO/main.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/bills.lang
    M htdocs/langs/es_ES/boxes.lang
    M htdocs/langs/es_ES/companies.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/holiday.lang
    M htdocs/langs/es_ES/ldap.lang
    M htdocs/langs/es_ES/mails.lang
    M htdocs/langs/es_ES/main.lang
    M htdocs/langs/es_ES/members.lang
    M htdocs/langs/es_ES/orders.lang
    M htdocs/langs/es_ES/other.lang
    M htdocs/langs/es_ES/products.lang
    M htdocs/langs/es_ES/projects.lang
    M htdocs/langs/es_ES/propal.lang
    M htdocs/langs/es_ES/stocks.lang
    M htdocs/langs/es_ES/supplier_proposal.lang
    M htdocs/langs/es_ES/suppliers.lang
    M htdocs/langs/es_ES/withdrawals.lang
    M htdocs/langs/es_MX/accountancy.lang
    M htdocs/langs/es_MX/admin.lang
    M htdocs/langs/es_MX/main.lang
    M htdocs/langs/es_PA/admin.lang
    M htdocs/langs/es_PA/main.lang
    M htdocs/langs/es_PE/admin.lang
    M htdocs/langs/es_PE/main.lang
    M htdocs/langs/es_PY/admin.lang
    M htdocs/langs/es_PY/main.lang
    M htdocs/langs/es_VE/admin.lang
    M htdocs/langs/es_VE/main.lang
    M htdocs/langs/et_EE/admin.lang
    M htdocs/langs/et_EE/main.lang
    M htdocs/langs/eu_ES/admin.lang
    M htdocs/langs/eu_ES/main.lang
    M htdocs/langs/fa_IR/admin.lang
    M htdocs/langs/fa_IR/hrm.lang
    M htdocs/langs/fa_IR/main.lang
    M htdocs/langs/fi_FI/admin.lang
    M htdocs/langs/fi_FI/main.lang
    M htdocs/langs/fr_BE/admin.lang
    M htdocs/langs/fr_BE/main.lang
    M htdocs/langs/fr_CA/admin.lang
    M htdocs/langs/fr_CA/main.lang
    M htdocs/langs/fr_CH/admin.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/banks.lang
    M htdocs/langs/fr_FR/bills.lang
    M htdocs/langs/fr_FR/boxes.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/holiday.lang
    M htdocs/langs/fr_FR/ldap.lang
    M htdocs/langs/fr_FR/mails.lang
    M htdocs/langs/fr_FR/main.lang
    M htdocs/langs/fr_FR/members.lang
    M htdocs/langs/fr_FR/orders.lang
    M htdocs/langs/fr_FR/other.lang
    M htdocs/langs/fr_FR/printing.lang
    M htdocs/langs/fr_FR/products.lang
    M htdocs/langs/fr_FR/projects.lang
    M htdocs/langs/fr_FR/propal.lang
    M htdocs/langs/fr_FR/stocks.lang
    M htdocs/langs/fr_FR/supplier_proposal.lang
    M htdocs/langs/fr_FR/suppliers.lang
    M htdocs/langs/fr_FR/trips.lang
    M htdocs/langs/fr_FR/withdrawals.lang
    M htdocs/langs/he_IL/admin.lang
    M htdocs/langs/he_IL/main.lang
    M htdocs/langs/hr_HR/admin.lang
    M htdocs/langs/hr_HR/main.lang
    M htdocs/langs/hu_HU/admin.lang
    M htdocs/langs/hu_HU/main.lang
    M htdocs/langs/id_ID/admin.lang
    M htdocs/langs/id_ID/main.lang
    M htdocs/langs/is_IS/admin.lang
    M htdocs/langs/is_IS/main.lang
    M htdocs/langs/it_IT/admin.lang
    M htdocs/langs/it_IT/main.lang
    M htdocs/langs/ja_JP/admin.lang
    M htdocs/langs/ja_JP/main.lang
    M htdocs/langs/ka_GE/admin.lang
    M htdocs/langs/ka_GE/main.lang
    M htdocs/langs/km_KH/admin.lang
    M htdocs/langs/km_KH/main.lang
    M htdocs/langs/kn_IN/admin.lang
    M htdocs/langs/kn_IN/main.lang
    M htdocs/langs/ko_KR/admin.lang
    M htdocs/langs/ko_KR/main.lang
    M htdocs/langs/lo_LA/admin.lang
    M htdocs/langs/lo_LA/main.lang
    M htdocs/langs/lt_LT/admin.lang
    M htdocs/langs/lt_LT/main.lang
    M htdocs/langs/lv_LV/admin.lang
    M htdocs/langs/lv_LV/main.lang
    M htdocs/langs/mk_MK/admin.lang
    M htdocs/langs/mk_MK/main.lang
    M htdocs/langs/mn_MN/admin.lang
    M htdocs/langs/mn_MN/main.lang
    M htdocs/langs/nb_NO/accountancy.lang
    M htdocs/langs/nb_NO/admin.lang
    M htdocs/langs/nb_NO/bills.lang
    M htdocs/langs/nb_NO/companies.lang
    M htdocs/langs/nb_NO/holiday.lang
    M htdocs/langs/nb_NO/ldap.lang
    M htdocs/langs/nb_NO/main.lang
    M htdocs/langs/nb_NO/members.lang
    M htdocs/langs/nb_NO/projects.lang
    M htdocs/langs/nl_BE/admin.lang
    M htdocs/langs/nl_BE/main.lang
    M htdocs/langs/nl_NL/admin.lang
    M htdocs/langs/nl_NL/main.lang
    M htdocs/langs/pl_PL/admin.lang
    M htdocs/langs/pl_PL/main.lang
    M htdocs/langs/pt_BR/admin.lang
    M htdocs/langs/pt_BR/main.lang
    M htdocs/langs/pt_PT/admin.lang
    M htdocs/langs/pt_PT/main.lang
    M htdocs/langs/ro_RO/admin.lang
    M htdocs/langs/ro_RO/main.lang
    M htdocs/langs/ru_RU/admin.lang
    M htdocs/langs/ru_RU/main.lang
    M htdocs/langs/sk_SK/admin.lang
    M htdocs/langs/sk_SK/main.lang
    M htdocs/langs/sl_SI/admin.lang
    M htdocs/langs/sl_SI/main.lang
    M htdocs/langs/sq_AL/admin.lang
    M htdocs/langs/sq_AL/main.lang
    M htdocs/langs/sr_RS/admin.lang
    M htdocs/langs/sr_RS/main.lang
    M htdocs/langs/sv_SE/admin.lang
    M htdocs/langs/sv_SE/main.lang
    M htdocs/langs/sw_SW/admin.lang
    M htdocs/langs/sw_SW/main.lang
    M htdocs/langs/th_TH/admin.lang
    M htdocs/langs/th_TH/main.lang
    M htdocs/langs/tr_TR/admin.lang
    M htdocs/langs/tr_TR/main.lang
    M htdocs/langs/uk_UA/admin.lang
    M htdocs/langs/uk_UA/main.lang
    M htdocs/langs/uz_UZ/admin.lang
    M htdocs/langs/uz_UZ/main.lang
    M htdocs/langs/vi_VN/admin.lang
    M htdocs/langs/vi_VN/main.lang
    M htdocs/langs/zh_CN/admin.lang
    M htdocs/langs/zh_CN/main.lang
    M htdocs/langs/zh_TW/admin.lang
    M htdocs/langs/zh_TW/main.lang

  Log Message:
  -----------
  Add BHD currency


  Commit: 08eaff729ff90a0beb51a5665d7ed35b5b703912
      
https://github.com/Dolibarr/dolibarr/commit/08eaff729ff90a0beb51a5665d7ed35b5b703912
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-03-03 (Fri, 03 Mar 2017)

  Changed paths:
    M htdocs/contrat/card.php
    M htdocs/contrat/class/contrat.class.php
    M htdocs/theme/eldy/style.css.php
    M htdocs/theme/md/style.css.php

  Log Message:
  -----------
  FIX #6461


  Commit: 85518c6a54080b82c6587bfd889d1ab481eb523f
      
https://github.com/Dolibarr/dolibarr/commit/85518c6a54080b82c6587bfd889d1ab481eb523f
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-03-03 (Fri, 03 Mar 2017)

  Changed paths:
    M htdocs/core/class/vcard.class.php

  Log Message:
  -----------
  FIX #6479


  Commit: ea08c929c097fc958ad83d221bcc423ad49f3894
      
https://github.com/Dolibarr/dolibarr/commit/ea08c929c097fc958ad83d221bcc423ad49f3894
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-03-03 (Fri, 03 Mar 2017)

  Changed paths:
    M htdocs/compta/tva/clients.php

  Log Message:
  -----------
  FIX #6476


  Commit: 34e5e5f7215653b58a22185da2ee11221ca78071
      
https://github.com/Dolibarr/dolibarr/commit/34e5e5f7215653b58a22185da2ee11221ca78071
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-03-03 (Fri, 03 Mar 2017)

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

  Log Message:
  -----------
  FIX #6460


  Commit: be86664e431ca4ae5077aa61bb49deb4fcbee53f
      
https://github.com/Dolibarr/dolibarr/commit/be86664e431ca4ae5077aa61bb49deb4fcbee53f
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-03-03 (Fri, 03 Mar 2017)

  Changed paths:
    M htdocs/compta/bank/annuel.php

  Log Message:
  -----------
  FIX #6449


  Commit: 28ad50e0595666f309fec089583a94368ad69653
      
https://github.com/Dolibarr/dolibarr/commit/28ad50e0595666f309fec089583a94368ad69653
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-03-03 (Fri, 03 Mar 2017)

  Changed paths:
    M htdocs/adherents/agenda.php
    M htdocs/compta/bank/annuel.php
    M htdocs/compta/paiement/cheque/card.php
    M htdocs/compta/paiement/cheque/class/remisecheque.class.php
    M htdocs/compta/tva/clients.php
    M htdocs/contrat/card.php
    M htdocs/contrat/class/contrat.class.php
    M htdocs/contrat/list.php
    M htdocs/core/class/conf.class.php
    M htdocs/core/class/interfaces.class.php
    M htdocs/core/class/vcard.class.php
    M htdocs/core/lib/company.lib.php
    M htdocs/core/lib/pdf.lib.php
    M htdocs/core/lib/security.lib.php
    M htdocs/core/modules/DolibarrModules.class.php
    M htdocs/core/tpl/objectline_create.tpl.php
    M htdocs/expedition/card.php
    M htdocs/expensereport/document.php
    M htdocs/expensereport/index.php
    M htdocs/expensereport/info.php
    M htdocs/expensereport/note.php
    M htdocs/index.php
    M htdocs/install/mysql/data/llx_c_currencies.sql
    M htdocs/install/mysql/migration/4.0.0-5.0.0.sql
    M htdocs/install/mysql/migration/repair.sql
    M htdocs/langs/ar_SA/admin.lang
    M htdocs/langs/ar_SA/main.lang
    M htdocs/langs/bg_BG/admin.lang
    M htdocs/langs/bg_BG/main.lang
    M htdocs/langs/bn_BD/admin.lang
    M htdocs/langs/bn_BD/main.lang
    M htdocs/langs/bs_BA/admin.lang
    M htdocs/langs/bs_BA/main.lang
    M htdocs/langs/ca_ES/admin.lang
    M htdocs/langs/ca_ES/bills.lang
    M htdocs/langs/ca_ES/boxes.lang
    M htdocs/langs/ca_ES/mails.lang
    M htdocs/langs/ca_ES/main.lang
    M htdocs/langs/ca_ES/members.lang
    M htdocs/langs/ca_ES/orders.lang
    M htdocs/langs/ca_ES/other.lang
    M htdocs/langs/ca_ES/projects.lang
    M htdocs/langs/ca_ES/stocks.lang
    M htdocs/langs/ca_ES/suppliers.lang
    M htdocs/langs/cs_CZ/admin.lang
    M htdocs/langs/cs_CZ/main.lang
    M htdocs/langs/da_DK/admin.lang
    M htdocs/langs/da_DK/main.lang
    M htdocs/langs/de_AT/admin.lang
    M htdocs/langs/de_AT/main.lang
    M htdocs/langs/de_CH/admin.lang
    M htdocs/langs/de_CH/main.lang
    M htdocs/langs/de_DE/admin.lang
    M htdocs/langs/de_DE/banks.lang
    M htdocs/langs/de_DE/bills.lang
    M htdocs/langs/de_DE/cashdesk.lang
    M htdocs/langs/de_DE/companies.lang
    M htdocs/langs/de_DE/compta.lang
    M htdocs/langs/de_DE/main.lang
    M htdocs/langs/el_CY/admin.lang
    M htdocs/langs/el_CY/main.lang
    M htdocs/langs/el_GR/admin.lang
    M htdocs/langs/el_GR/main.lang
    M htdocs/langs/en_AU/admin.lang
    M htdocs/langs/en_AU/main.lang
    M htdocs/langs/en_CA/admin.lang
    M htdocs/langs/en_CA/main.lang
    M htdocs/langs/en_GB/admin.lang
    M htdocs/langs/en_GB/main.lang
    M htdocs/langs/en_IN/admin.lang
    M htdocs/langs/en_IN/main.lang
    M htdocs/langs/es_AR/admin.lang
    M htdocs/langs/es_AR/main.lang
    M htdocs/langs/es_BO/admin.lang
    M htdocs/langs/es_BO/main.lang
    M htdocs/langs/es_CL/admin.lang
    M htdocs/langs/es_CL/main.lang
    M htdocs/langs/es_CO/admin.lang
    M htdocs/langs/es_CO/main.lang
    M htdocs/langs/es_DO/admin.lang
    M htdocs/langs/es_DO/main.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/bills.lang
    M htdocs/langs/es_ES/boxes.lang
    M htdocs/langs/es_ES/companies.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/holiday.lang
    M htdocs/langs/es_ES/ldap.lang
    M htdocs/langs/es_ES/mails.lang
    M htdocs/langs/es_ES/main.lang
    M htdocs/langs/es_ES/members.lang
    M htdocs/langs/es_ES/orders.lang
    M htdocs/langs/es_ES/other.lang
    M htdocs/langs/es_ES/products.lang
    M htdocs/langs/es_ES/projects.lang
    M htdocs/langs/es_ES/propal.lang
    M htdocs/langs/es_ES/stocks.lang
    M htdocs/langs/es_ES/supplier_proposal.lang
    M htdocs/langs/es_ES/suppliers.lang
    M htdocs/langs/es_ES/withdrawals.lang
    M htdocs/langs/es_MX/accountancy.lang
    M htdocs/langs/es_MX/admin.lang
    M htdocs/langs/es_MX/main.lang
    M htdocs/langs/es_PA/admin.lang
    M htdocs/langs/es_PA/main.lang
    M htdocs/langs/es_PE/admin.lang
    M htdocs/langs/es_PE/main.lang
    M htdocs/langs/es_PY/admin.lang
    M htdocs/langs/es_PY/main.lang
    M htdocs/langs/es_VE/admin.lang
    M htdocs/langs/es_VE/main.lang
    M htdocs/langs/et_EE/admin.lang
    M htdocs/langs/et_EE/main.lang
    M htdocs/langs/eu_ES/admin.lang
    M htdocs/langs/eu_ES/main.lang
    M htdocs/langs/fa_IR/admin.lang
    M htdocs/langs/fa_IR/hrm.lang
    M htdocs/langs/fa_IR/main.lang
    M htdocs/langs/fi_FI/admin.lang
    M htdocs/langs/fi_FI/main.lang
    M htdocs/langs/fr_BE/admin.lang
    M htdocs/langs/fr_BE/main.lang
    M htdocs/langs/fr_CA/admin.lang
    M htdocs/langs/fr_CA/main.lang
    M htdocs/langs/fr_CH/admin.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/banks.lang
    M htdocs/langs/fr_FR/bills.lang
    M htdocs/langs/fr_FR/boxes.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/holiday.lang
    M htdocs/langs/fr_FR/ldap.lang
    M htdocs/langs/fr_FR/mails.lang
    M htdocs/langs/fr_FR/main.lang
    M htdocs/langs/fr_FR/members.lang
    M htdocs/langs/fr_FR/orders.lang
    M htdocs/langs/fr_FR/other.lang
    M htdocs/langs/fr_FR/printing.lang
    M htdocs/langs/fr_FR/products.lang
    M htdocs/langs/fr_FR/projects.lang
    M htdocs/langs/fr_FR/propal.lang
    M htdocs/langs/fr_FR/stocks.lang
    M htdocs/langs/fr_FR/supplier_proposal.lang
    M htdocs/langs/fr_FR/suppliers.lang
    M htdocs/langs/fr_FR/trips.lang
    M htdocs/langs/fr_FR/withdrawals.lang
    M htdocs/langs/he_IL/admin.lang
    M htdocs/langs/he_IL/main.lang
    M htdocs/langs/hr_HR/admin.lang
    M htdocs/langs/hr_HR/main.lang
    M htdocs/langs/hu_HU/admin.lang
    M htdocs/langs/hu_HU/main.lang
    M htdocs/langs/id_ID/admin.lang
    M htdocs/langs/id_ID/main.lang
    M htdocs/langs/is_IS/admin.lang
    M htdocs/langs/is_IS/main.lang
    M htdocs/langs/it_IT/admin.lang
    M htdocs/langs/it_IT/main.lang
    M htdocs/langs/ja_JP/admin.lang
    M htdocs/langs/ja_JP/main.lang
    M htdocs/langs/ka_GE/admin.lang
    M htdocs/langs/ka_GE/main.lang
    M htdocs/langs/km_KH/admin.lang
    M htdocs/langs/km_KH/main.lang
    M htdocs/langs/kn_IN/admin.lang
    M htdocs/langs/kn_IN/main.lang
    M htdocs/langs/ko_KR/admin.lang
    M htdocs/langs/ko_KR/main.lang
    M htdocs/langs/lo_LA/admin.lang
    M htdocs/langs/lo_LA/main.lang
    M htdocs/langs/lt_LT/admin.lang
    M htdocs/langs/lt_LT/main.lang
    M htdocs/langs/lv_LV/admin.lang
    M htdocs/langs/lv_LV/main.lang
    M htdocs/langs/mk_MK/admin.lang
    M htdocs/langs/mk_MK/main.lang
    M htdocs/langs/mn_MN/admin.lang
    M htdocs/langs/mn_MN/main.lang
    M htdocs/langs/nb_NO/accountancy.lang
    M htdocs/langs/nb_NO/admin.lang
    M htdocs/langs/nb_NO/bills.lang
    M htdocs/langs/nb_NO/companies.lang
    M htdocs/langs/nb_NO/holiday.lang
    M htdocs/langs/nb_NO/ldap.lang
    M htdocs/langs/nb_NO/main.lang
    M htdocs/langs/nb_NO/members.lang
    M htdocs/langs/nb_NO/projects.lang
    M htdocs/langs/nl_BE/admin.lang
    M htdocs/langs/nl_BE/main.lang
    M htdocs/langs/nl_NL/admin.lang
    M htdocs/langs/nl_NL/main.lang
    M htdocs/langs/pl_PL/admin.lang
    M htdocs/langs/pl_PL/main.lang
    M htdocs/langs/pt_BR/admin.lang
    M htdocs/langs/pt_BR/main.lang
    M htdocs/langs/pt_PT/admin.lang
    M htdocs/langs/pt_PT/main.lang
    M htdocs/langs/ro_RO/admin.lang
    M htdocs/langs/ro_RO/main.lang
    M htdocs/langs/ru_RU/admin.lang
    M htdocs/langs/ru_RU/main.lang
    M htdocs/langs/sk_SK/admin.lang
    M htdocs/langs/sk_SK/main.lang
    M htdocs/langs/sl_SI/admin.lang
    M htdocs/langs/sl_SI/main.lang
    M htdocs/langs/sq_AL/admin.lang
    M htdocs/langs/sq_AL/main.lang
    M htdocs/langs/sr_RS/admin.lang
    M htdocs/langs/sr_RS/main.lang
    M htdocs/langs/sv_SE/admin.lang
    M htdocs/langs/sv_SE/main.lang
    M htdocs/langs/sw_SW/admin.lang
    M htdocs/langs/sw_SW/main.lang
    M htdocs/langs/th_TH/admin.lang
    M htdocs/langs/th_TH/main.lang
    M htdocs/langs/tr_TR/admin.lang
    M htdocs/langs/tr_TR/main.lang
    M htdocs/langs/uk_UA/admin.lang
    M htdocs/langs/uk_UA/main.lang
    M htdocs/langs/uz_UZ/admin.lang
    M htdocs/langs/uz_UZ/main.lang
    M htdocs/langs/vi_VN/admin.lang
    M htdocs/langs/vi_VN/main.lang
    M htdocs/langs/zh_CN/admin.lang
    M htdocs/langs/zh_CN/main.lang
    M htdocs/langs/zh_TW/admin.lang
    M htdocs/langs/zh_TW/main.lang
    M htdocs/projet/card.php
    M htdocs/projet/class/project.class.php
    M htdocs/projet/graph_opportunities.inc.php
    M htdocs/theme/eldy/style.css.php
    M htdocs/theme/md/style.css.php
    M htdocs/user/class/user.class.php

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

Conflicts:
        htdocs/core/tpl/objectline_create.tpl.php
        htdocs/langs/de_DE/bills.lang
        htdocs/langs/fr_FR/bills.lang
        htdocs/langs/fr_FR/main.lang
        htdocs/langs/fr_FR/suppliers.lang


Compare: 
https://github.com/Dolibarr/dolibarr/compare/0a0797e7976c...28ad50e05956
[Prev in Thread]
Current Thread
[Next in Thread]
[Dolibarr-git] [Dolibarr/dolibarr] 3c54cb: Fix avoid trigger during migration, Laurent Destailleur <=
Prev by Date: [Dolibarr-git] [Dolibarr/dolibarr] be8666: FIX #6449
Next by Date: [Dolibarr-git] [Dolibarr/dolibarr] bef5f2: FIX #6465
Previous by thread: [Dolibarr-git] [Dolibarr/dolibarr] be8666: FIX #6449
Next by thread: [Dolibarr-git] [Dolibarr/dolibarr] bef5f2: FIX #6465
Index(es):
- Date
- Thread