[Dolibarr-git] [Dolibarr/dolibarr] f8b5ba: Fix: Import ProfId1 to siren and ProfId2 to siret

[Juanjo Menent]

  Branch: refs/heads/3.6
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: f8b5bac05c4e632e7e37be2e75c551cd93155c8b
      
https://github.com/Dolibarr/dolibarr/commit/f8b5bac05c4e632e7e37be2e75c551cd93155c8b
  Author: Juanjo Menent <address@hidden>
  Date:   2014-07-14 (Mon, 14 Jul 2014)

  Changed paths:
    M htdocs/core/modules/modSociete.class.php

  Log Message:
  -----------
  Fix: Import ProfId1 to siren and ProfId2 to siret


  Commit: 3a8835892e9bf212d7bacbe939f47e26842b0019
      
https://github.com/Dolibarr/dolibarr/commit/3a8835892e9bf212d7bacbe939f47e26842b0019
  Author: Juanjo Menent <address@hidden>
  Date:   2014-07-14 (Mon, 14 Jul 2014)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Fix: Import ProfId1 to siren and ProfId2 to siret

Conflicts:
        ChangeLog


Compare: 
https://github.com/Dolibarr/dolibarr/compare/c1bfe0f6c5f3...3a8835892e9b