[Dolibarr-git] [Dolibarr/dolibarr] ed9881: Fix template for situation

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: ed98817f0da6a5401eb8c37d5f922812bc6311eb
      
https://github.com/Dolibarr/dolibarr/commit/ed98817f0da6a5401eb8c37d5f922812bc6311eb
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-05-09 (Thu, 09 May 2019)

  Changed paths:
    M htdocs/core/modules/facture/doc/pdf_crabe.modules.php

  Log Message:
  -----------
  Fix template for situation


  Commit: 725de78d29649603ad96c91f8abcc582a2c8fa4c
      
https://github.com/Dolibarr/dolibarr/commit/725de78d29649603ad96c91f8abcc582a2c8fa4c
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-05-09 (Thu, 09 May 2019)

  Changed paths:
    A htdocs/core/lib/takepos.lib.php
    M htdocs/langs/en_US/cashdesk.lang
    M htdocs/takepos/admin/setup.php
    A htdocs/takepos/admin/terminal.php
    M htdocs/takepos/invoice.php
    M htdocs/takepos/pay.php
    M htdocs/takepos/receipt.php
    M htdocs/takepos/takepos.php

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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/e5b613562afc...725de78d2964