[Dolibarr/dolibarr] 71c9b9: NEW add const CASHDESK_FORCE_DECREASE_STOCK to for...

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 71c9b94b223a5ee8b3418313d90b78cd6829fe71
      
https://github.com/Dolibarr/dolibarr/commit/71c9b94b223a5ee8b3418313d90b78cd6829fe71
  Author: VESSILLER <address@hidden>
  Date:   2020-02-21 (Fri, 21 Feb 2020)

  Changed paths:
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/en_US/errors.lang
    M htdocs/langs/fr_FR/admin.lang
    M htdocs/langs/fr_FR/errors.lang
    M htdocs/product/class/productbatch.class.php
    M htdocs/takepos/admin/terminal.php
    M htdocs/takepos/invoice.php

  Log Message:
  -----------
  NEW add const CASHDESK_FORCE_DECREASE_STOCK to force batch decrementation


  Commit: ec19b2feefbf405a634af735178f2cd743c6612f
      
https://github.com/Dolibarr/dolibarr/commit/ec19b2feefbf405a634af735178f2cd743c6612f
  Author: VESSILLER <address@hidden>
  Date:   2020-02-21 (Fri, 21 Feb 2020)

  Changed paths:
    M htdocs/compta/facture/class/facture.class.php

  Log Message:
  -----------
  FIX phpcs nestling too high level


  Commit: f931b92d36c5cf1b22cb05dc44acbd8f9cd88c22
      
https://github.com/Dolibarr/dolibarr/commit/f931b92d36c5cf1b22cb05dc44acbd8f9cd88c22
  Author: Laurent Destailleur <address@hidden>
  Date:   2020-02-23 (Sun, 23 Feb 2020)

  Changed paths:
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/en_US/errors.lang
    M htdocs/langs/fr_FR/admin.lang
    M htdocs/langs/fr_FR/errors.lang
    M htdocs/product/class/productbatch.class.php
    M htdocs/takepos/admin/terminal.php
    M htdocs/takepos/invoice.php

  Log Message:
  -----------
  Merge branch 'new-takepos-batch-decrement' of
https://github.com/OPEN-DSI/dolibarr into develop

# Conflicts:
#       htdocs/langs/en_US/errors.lang


Compare: 
https://github.com/Dolibarr/dolibarr/compare/d1de56267497...f931b92d36c5