[Dolibarr-git] [Dolibarr/dolibarr] 1a3b3f: Fix: Missing socid

[Regis Houssin]

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

  Commit: 1a3b3f557bc978c1983d50be5fc8a27cc9664058
      
https://github.com/Dolibarr/dolibarr/commit/1a3b3f557bc978c1983d50be5fc8a27cc9664058
  Author: Laurent Destailleur <address@hidden>
  Date:   2011-11-09 (Wed, 09 Nov 2011)

  Changed paths:
    M htdocs/core/class/html.form.class.php

  Log Message:
  -----------
  Fix: Missing socid


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

  Changed paths:
    M htdocs/langs/ca_ES/stocks.lang
  M htdocs/langs/es_ES/stocks.lang

  Log Message:
  -----------
  Trad: Fix missing translation


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

  Changed paths:
    M htdocs/admin/tools/purge.php

  Log Message:
  -----------
  Fix: exclude install.lock files during purge

Conflicts:

        htdocs/admin/tools/purge.php


Compare: https://github.com/Dolibarr/dolibarr/compare/d08d28c...a1a225e