[Dolibarr-git] [Dolibarr/dolibarr] 606674: Fix: Bad local taxes if price base type is TTC

[Regis Houssin]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 606674d8c852f29ac4c3acfb79bd6ecac624e0c3
      
https://github.com/Dolibarr/dolibarr/commit/606674d8c852f29ac4c3acfb79bd6ecac624e0c3
  Author: simnandez <address@hidden>
  Date:   2012-07-13 (Fri, 13 Jul 2012)

  Changed paths:
    M htdocs/core/lib/price.lib.php

  Log Message:
  -----------
  Fix: Bad local taxes if price base type is TTC

Conflicts:
        htdocs/core/lib/price.lib.php


  Commit: b8338425f4b65b5720c61d67bb36beca7a384445
      
https://github.com/Dolibarr/dolibarr/commit/b8338425f4b65b5720c61d67bb36beca7a384445
  Author: simnandez <address@hidden>
  Date:   2012-07-13 (Fri, 13 Jul 2012)

  Changed paths:
    M htdocs/langs/ca_ES/admin.lang
    M htdocs/langs/ca_ES/errors.lang
    M htdocs/langs/ca_ES/sendings.lang
    M htdocs/langs/ca_ES/workflow.lang
    M htdocs/langs/es_ES/admin.lang
    M htdocs/langs/es_ES/errors.lang
    M htdocs/langs/es_ES/sendings.lang
    M htdocs/langs/es_ES/workflow.lang

  Log Message:
  -----------
  Trad: Add missing translations


  Commit: 7122b91203bd2f4b9d4b098b8e9823e573439762
      
https://github.com/Dolibarr/dolibarr/commit/7122b91203bd2f4b9d4b098b8e9823e573439762
  Author: Regis Houssin <address@hidden>
  Date:   2012-07-13 (Fri, 13 Jul 2012)

  Changed paths:
    M htdocs/core/lib/price.lib.php
    M htdocs/langs/ca_ES/admin.lang
    M htdocs/langs/ca_ES/errors.lang
    M htdocs/langs/ca_ES/sendings.lang
    M htdocs/langs/ca_ES/workflow.lang
    M htdocs/langs/es_ES/admin.lang
    M htdocs/langs/es_ES/errors.lang
    M htdocs/langs/es_ES/sendings.lang
    M htdocs/langs/es_ES/workflow.lang

  Log Message:
  -----------
  Merge pull request #242 from simnandez/develop

Fix: Bad local taxes if price base type is TTC


Compare: 
https://github.com/Dolibarr/dolibarr/compare/4f458c01f4cb...7122b91203bd