[Dolibarr-git] [Dolibarr/dolibarr] 130691: FIX #10299

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 1306918eb0f96ecc61fef82991b38ac25a098b5a
      
https://github.com/Dolibarr/dolibarr/commit/1306918eb0f96ecc61fef82991b38ac25a098b5a
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-01-07 (Mon, 07 Jan 2019)

  Changed paths:
    M htdocs/core/lib/functions.lib.php
    M htdocs/product/card.php

  Log Message:
  -----------
  FIX #10299


  Commit: 527ef8bdc88ced7d13516b0674a827aa88548717
      
https://github.com/Dolibarr/dolibarr/commit/527ef8bdc88ced7d13516b0674a827aa88548717
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-01-07 (Mon, 07 Jan 2019)

  Changed paths:
    M htdocs/compta/cashcontrol/cashcontrol_card.php
    M htdocs/langs/en_US/cashdesk.lang

  Log Message:
  -----------
  Add nb of invoice to help cash fence


  Commit: 8b1455f29ef10bb8d9b3dde25dfba77a51a8bd9a
      
https://github.com/Dolibarr/dolibarr/commit/8b1455f29ef10bb8d9b3dde25dfba77a51a8bd9a
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-01-07 (Mon, 07 Jan 2019)

  Changed paths:
    M htdocs/compta/cashcontrol/cashcontrol_list.php
    M htdocs/compta/cashcontrol/class/cashcontrol.class.php
    M htdocs/compta/cashcontrol/report.php

  Log Message:
  -----------
  FIX Cash fence


  Commit: 1188540b41a14808688c25dbe3106ad73fd21236
      
https://github.com/Dolibarr/dolibarr/commit/1188540b41a14808688c25dbe3106ad73fd21236
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-01-07 (Mon, 07 Jan 2019)

  Changed paths:
    M htdocs/langs/de_AT/agenda.lang
    M htdocs/langs/de_AT/banks.lang
    M htdocs/langs/de_AT/categories.lang
    M htdocs/langs/de_AT/products.lang
    M htdocs/langs/de_CH/agenda.lang
    M htdocs/langs/es_CL/admin.lang
    M htdocs/langs/es_CL/agenda.lang
    M htdocs/langs/es_CL/banks.lang
    M htdocs/langs/es_CL/bills.lang
    M htdocs/langs/es_CL/companies.lang
    M htdocs/langs/es_CL/orders.lang
    M htdocs/langs/es_CL/projects.lang
    M htdocs/langs/es_CL/stocks.lang
    M htdocs/langs/es_CO/admin.lang
    M htdocs/langs/es_MX/admin.lang
    M htdocs/langs/es_MX/banks.lang
    M htdocs/langs/es_MX/bills.lang
    M htdocs/langs/es_MX/products.lang
    M htdocs/langs/es_MX/stocks.lang
    M htdocs/langs/fr_BE/bills.lang
    M htdocs/langs/fr_CA/admin.lang
    M htdocs/langs/fr_CA/agenda.lang
    M htdocs/langs/fr_CA/exports.lang
    M htdocs/langs/fr_CA/products.lang
    M htdocs/langs/fr_FR/cashdesk.lang
    M htdocs/langs/nl_BE/categories.lang
    M htdocs/langs/nl_BE/stocks.lang
    M htdocs/langs/pt_BR/admin.lang
    M htdocs/langs/pt_BR/agenda.lang
    M htdocs/langs/pt_BR/bills.lang
    M htdocs/langs/pt_BR/categories.lang
    M htdocs/langs/pt_BR/companies.lang
    M htdocs/langs/pt_BR/exports.lang
    M htdocs/langs/pt_BR/orders.lang
    M htdocs/langs/pt_BR/paybox.lang
    M htdocs/langs/pt_BR/products.lang
    M htdocs/langs/pt_BR/projects.lang
    M htdocs/langs/pt_BR/stocks.lang
    M htdocs/langs/pt_BR/users.lang

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


  Commit: 126e02798a0601c4234d1aa283a90db87932c707
      
https://github.com/Dolibarr/dolibarr/commit/126e02798a0601c4234d1aa283a90db87932c707
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-01-07 (Mon, 07 Jan 2019)

  Changed paths:
    M htdocs/compta/cashcontrol/cashcontrol_card.php
    M htdocs/compta/cashcontrol/cashcontrol_list.php
    M htdocs/compta/cashcontrol/class/cashcontrol.class.php
    M htdocs/compta/cashcontrol/report.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/langs/de_AT/agenda.lang
    M htdocs/langs/de_AT/banks.lang
    M htdocs/langs/de_AT/categories.lang
    M htdocs/langs/de_AT/products.lang
    M htdocs/langs/de_CH/agenda.lang
    M htdocs/langs/en_US/cashdesk.lang
    M htdocs/langs/es_CL/admin.lang
    M htdocs/langs/es_CL/agenda.lang
    M htdocs/langs/es_CL/banks.lang
    M htdocs/langs/es_CL/bills.lang
    M htdocs/langs/es_CL/companies.lang
    M htdocs/langs/es_CL/orders.lang
    M htdocs/langs/es_CL/projects.lang
    M htdocs/langs/es_CL/stocks.lang
    M htdocs/langs/es_CO/admin.lang
    M htdocs/langs/es_MX/admin.lang
    M htdocs/langs/es_MX/banks.lang
    M htdocs/langs/es_MX/bills.lang
    M htdocs/langs/es_MX/products.lang
    M htdocs/langs/es_MX/stocks.lang
    M htdocs/langs/fr_BE/bills.lang
    M htdocs/langs/fr_CA/admin.lang
    M htdocs/langs/fr_CA/agenda.lang
    M htdocs/langs/fr_CA/exports.lang
    M htdocs/langs/fr_CA/products.lang
    M htdocs/langs/fr_FR/cashdesk.lang
    M htdocs/langs/nl_BE/categories.lang
    M htdocs/langs/nl_BE/stocks.lang
    M htdocs/langs/pt_BR/admin.lang
    M htdocs/langs/pt_BR/agenda.lang
    M htdocs/langs/pt_BR/bills.lang
    M htdocs/langs/pt_BR/categories.lang
    M htdocs/langs/pt_BR/companies.lang
    M htdocs/langs/pt_BR/exports.lang
    M htdocs/langs/pt_BR/orders.lang
    M htdocs/langs/pt_BR/paybox.lang
    M htdocs/langs/pt_BR/products.lang
    M htdocs/langs/pt_BR/projects.lang
    M htdocs/langs/pt_BR/stocks.lang
    M htdocs/langs/pt_BR/users.lang
    M htdocs/product/card.php

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

Conflicts:
        htdocs/langs/en_US/cashdesk.lang
        htdocs/langs/fr_FR/cashdesk.lang


Compare: 
https://github.com/Dolibarr/dolibarr/compare/b7c73d94600e...126e02798a06
      **NOTE:** This service has been marked for deprecation: 
https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.