[Dolibarr-git] [Dolibarr/dolibarr] d7fce4: Fix: [bug 235] Bad local tax control

[Regis Houssin]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr

  Commit: d7fce41b8a4ecf42a6b807782c8a713e450cb0d5
      
https://github.com/Dolibarr/dolibarr/commit/d7fce41b8a4ecf42a6b807782c8a713e450cb0d5
  Author: Juanjo Menent <address@hidden>
  Date:   2011-11-20 (Sun, 20 Nov 2011)

  Changed paths:
    M htdocs/fourn/commande/fiche.php

  Log Message:
  -----------
  Fix: [bug 235] Bad local tax control

Conflicts:
        htdocs/fourn/commande/fiche.php


  Commit: 75fa989e7916f2d0599e0c4f030286da98c18155
      
https://github.com/Dolibarr/dolibarr/commit/75fa989e7916f2d0599e0c4f030286da98c18155
  Author: Juanjo Menent <address@hidden>
  Date:   2011-11-20 (Sun, 20 Nov 2011)

  Changed paths:
    M htdocs/core/photos_resize.php

  Log Message:
  -----------
  Fix: load file other.lang solve missing translations


  Commit: 2f100d0d72926c570024d4b2a9fa440f85c1df59
      
https://github.com/Dolibarr/dolibarr/commit/2f100d0d72926c570024d4b2a9fa440f85c1df59
  Author: Regis Houssin <address@hidden>
  Date:   2011-11-20 (Sun, 20 Nov 2011)

  Changed paths:
    M htdocs/core/photos_resize.php
  M htdocs/fourn/commande/fiche.php

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

Cherry Pick 3.1 to develop


Compare: https://github.com/Dolibarr/dolibarr/compare/afaae39...2f100d0