[Dolibarr-git] [Dolibarr/dolibarr] 50184b: FIX [ bug #2893 ] Dolibarr error when viewing an i...

[Laurent Destailleur]

  Branch: refs/heads/3.6
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 50184babb95a19ff01efb76696b3e3b60441af8f
      
https://github.com/Dolibarr/dolibarr/commit/50184babb95a19ff01efb76696b3e3b60441af8f
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-09-03 (Thu, 03 Sep 2015)

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

  Log Message:
  -----------
  FIX [ bug #2893 ] Dolibarr error when viewing an invoice after changing 
invoice mask

Close #2893


  Commit: 08565d46fec7daded48d1ac888f2d7cd5b134062
      
https://github.com/Dolibarr/dolibarr/commit/08565d46fec7daded48d1ac888f2d7cd5b134062
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-09-03 (Thu, 03 Sep 2015)

  Changed paths:
    M build/makepack-dolibarr.pl
    M htdocs/compta/index.php
    M htdocs/core/boxes/box_prospect.php
    M htdocs/margin/customerMargins.php
    M htdocs/margin/productMargins.php

  Log Message:
  -----------
  Merge branch '3.6' into bug-2893


  Commit: bd21cf5d68c764f989e1fbea8a5125d0ca6c8290
      
https://github.com/Dolibarr/dolibarr/commit/bd21cf5d68c764f989e1fbea8a5125d0ca6c8290
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-09-03 (Thu, 03 Sep 2015)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Updated changelog


  Commit: 7a115c9366ea56e2239738e4cc023d17d96d6876
      
https://github.com/Dolibarr/dolibarr/commit/7a115c9366ea56e2239738e4cc023d17d96d6876
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-09-03 (Thu, 03 Sep 2015)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Typo


  Commit: 51a01921ba30f6219d6d9250ece8265dc3e4315e
      
https://github.com/Dolibarr/dolibarr/commit/51a01921ba30f6219d6d9250ece8265dc3e4315e
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-09-03 (Thu, 03 Sep 2015)

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

  Log Message:
  -----------
  Merge pull request #3456 from marcosgdf/bug-2893

Fix [ bug #2893 ] Dolibarr error when viewing an invoice after changing invoice 
mask


Compare: 
https://github.com/Dolibarr/dolibarr/compare/001f1b4c3139...51a01921ba30