[Dolibarr-git] [Dolibarr/dolibarr] f3cd9d: Resource fixes

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: f3cd9da73d74ad10c8631dab575dcd5a45d08c38
      
https://github.com/Dolibarr/dolibarr/commit/f3cd9da73d74ad10c8631dab575dcd5a45d08c38
  Author: Ion Agorria <address@hidden>
  Date:   2015-08-12 (Wed, 12 Aug 2015)

  Changed paths:
    M htdocs/resource/card.php
    M htdocs/resource/class/resource.class.php
    M htdocs/resource/element_resource.php

  Log Message:
  -----------
  Resource fixes


  Commit: 2e1e9017c6961ef23b7183e00c255a04091e6717
      
https://github.com/Dolibarr/dolibarr/commit/2e1e9017c6961ef23b7183e00c255a04091e6717
  Author: Ion Agorria <address@hidden>
  Date:   2015-08-12 (Wed, 12 Aug 2015)

  Changed paths:
    M htdocs/core/tpl/resource_add.tpl.php

  Log Message:
  -----------
  Missed the file


  Commit: 6c01403ef3fb5cab93068a704fb16f33e1be1004
      
https://github.com/Dolibarr/dolibarr/commit/6c01403ef3fb5cab93068a704fb16f33e1be1004
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-08-14 (Fri, 14 Aug 2015)

  Changed paths:
    M htdocs/core/tpl/resource_add.tpl.php
    M htdocs/resource/card.php
    M htdocs/resource/class/resource.class.php
    M htdocs/resource/element_resource.php

  Log Message:
  -----------
  Merge branch 'resources-fixes' of https://github.com/IonAgorria/dolibarr
into IonAgorria-resources-fixes

Conflicts:
        htdocs/core/tpl/resource_add.tpl.php
        htdocs/resource/element_resource.php


  Commit: 4ad05890c1ddef44ef3dcd8ff99e75b214712394
      
https://github.com/Dolibarr/dolibarr/commit/4ad05890c1ddef44ef3dcd8ff99e75b214712394
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-08-14 (Fri, 14 Aug 2015)

  Changed paths:
    M htdocs/core/tpl/resource_add.tpl.php
    M htdocs/resource/card.php
    M htdocs/resource/class/resource.class.php
    M htdocs/resource/element_resource.php

  Log Message:
  -----------
  Merge branch 'IonAgorria-resources-fixes' into develop


Compare: 
https://github.com/Dolibarr/dolibarr/compare/2abb90713e1b...4ad05890c1dd