[Dolibarr-git] [Dolibarr/dolibarr] 582d99: Merge branch '3.1' of git://github.com/Dolibarr/do...

[Regis Houssin]

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

  Commit: 582d994e54393674f1da8df28c0e5f5a7b16740a
      
https://github.com/Dolibarr/dolibarr/commit/582d994e54393674f1da8df28c0e5f5a7b16740a
  Author: Juanjo Menent <address@hidden>
  Date:   2011-11-14 (Mon, 14 Nov 2011)

  Changed paths:
    M htdocs/lib/pdf.lib.php

  Log Message:
  -----------
  Merge branch '3.1' of git://github.com/Dolibarr/dolibarr.git into 3.1


  Commit: 5d85ea89ed6976e8293c3c5e49c67fd6b11bb88a
      
https://github.com/Dolibarr/dolibarr/commit/5d85ea89ed6976e8293c3c5e49c67fd6b11bb88a
  Author: Juanjo Menent <address@hidden>
  Date:   2011-11-16 (Wed, 16 Nov 2011)

  Changed paths:
    M htdocs/compta/bank/account.php
  M htdocs/lib/project.lib.php

  Log Message:
  -----------
  Merge branch '3.1' of git://github.com/Dolibarr/dolibarr.git into 3.1


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

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

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


  Commit: 69f4fb81125886510f83889ed17efe9378f1cf54
      
https://github.com/Dolibarr/dolibarr/commit/69f4fb81125886510f83889ed17efe9378f1cf54
  Author: Juanjo Menent <address@hidden>
  Date:   2011-11-17 (Thu, 17 Nov 2011)

  Changed paths:
    M htdocs/core/photos_resize.php

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


  Commit: 39cc8fc0ff3978a482e7c0d2ea9e1735efa940e3
      
https://github.com/Dolibarr/dolibarr/commit/39cc8fc0ff3978a482e7c0d2ea9e1735efa940e3
  Author: Regis Houssin <address@hidden>
  Date:   2011-11-17 (Thu, 17 Nov 2011)

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

  Log Message:
  -----------
  Merge pull request #51 from simnandez/3.1

Fix: [bug 235] Bad local tax control


Compare: https://github.com/Dolibarr/dolibarr/compare/8fd5acc...39cc8fc