[Dolibarr-git] [Dolibarr/dolibarr] b3a035: [ bug #817 ] Purchases journal does not reflect lo...

[Laurent Destailleur]

  Branch: refs/heads/3.3
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: b3a035951fa85f1903d93d5ed36e5fd217b0793a
      
https://github.com/Dolibarr/dolibarr/commit/b3a035951fa85f1903d93d5ed36e5fd217b0793a
  Author: Marcos García <address@hidden>
  Date:   2013-04-13 (Sat, 13 Apr 2013)

  Changed paths:
    M ChangeLog
    M htdocs/compta/journal/purchasesjournal.php

  Log Message:
  -----------
  [ bug #817 ] Purchases journal does not reflect localtaxes


  Commit: 486425d2584c29b6fac115e8c4b050bd2b89942d
      
https://github.com/Dolibarr/dolibarr/commit/486425d2584c29b6fac115e8c4b050bd2b89942d
  Author: Marcos García <address@hidden>
  Date:   2013-04-13 (Sat, 13 Apr 2013)

  Changed paths:
    M ChangeLog
    M htdocs/compta/facture.php
    M htdocs/compta/journal/sellsjournal.php
    M htdocs/langs/en_US/bills.lang
    M htdocs/langs/es_ES/bills.lang
    M htdocs/langs/es_ES/compta.lang
    M htdocs/langs/fr_FR/bills.lang

  Log Message:
  -----------
  Merge branch '3.3' into bug-817

Conflicts:
        ChangeLog


  Commit: 6ebeb53a2ca9d2cb740489d6504eb9b72c85f7eb
      
https://github.com/Dolibarr/dolibarr/commit/6ebeb53a2ca9d2cb740489d6504eb9b72c85f7eb
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-04-13 (Sat, 13 Apr 2013)

  Changed paths:
    M ChangeLog
    M htdocs/compta/journal/purchasesjournal.php

  Log Message:
  -----------
  Merge pull request #828 from marcosgdf/bug-817

[ bug #817 ] Purchases journal does not reflect localtaxes


Compare: 
https://github.com/Dolibarr/dolibarr/compare/7e48e341adf9...6ebeb53a2ca9