[Dolibarr-git] [Dolibarr/dolibarr] 913a5d: Fix: if module is not activated, functionality of ...

[Laurent Destailleur]

  Branch: refs/heads/6.0
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 913a5d1df2104a18e2c9d45fe034c49a49687cfe
      
https://github.com/Dolibarr/dolibarr/commit/913a5d1df2104a18e2c9d45fe034c49a49687cfe
  Author: Regis Houssin <address@hidden>
  Date:   2017-10-11 (Wed, 11 Oct 2017)

  Changed paths:
    M htdocs/adherents/subscription.php

  Log Message:
  -----------
  Fix: if module is not activated, functionality of module is deactivated!


  Commit: 6d5c2bf7b2fe29383d76107d0d19f3c32f7df818
      
https://github.com/Dolibarr/dolibarr/commit/6d5c2bf7b2fe29383d76107d0d19f3c32f7df818
  Author: Regis Houssin <address@hidden>
  Date:   2017-10-11 (Wed, 11 Oct 2017)

  Changed paths:
    M htdocs/adherents/class/subscription.class.php
    M htdocs/adherents/subscription.php
    M htdocs/adherents/subscription/card.php
    M htdocs/adherents/subscription/list.php

  Log Message:
  -----------
  Fix: check if module bank activated

Conflicts:
        htdocs/adherents/subscription.php


  Commit: f2ad2055382105d653fa5ecdb0baecc50d8dd716
      
https://github.com/Dolibarr/dolibarr/commit/f2ad2055382105d653fa5ecdb0baecc50d8dd716
  Author: Regis Houssin <address@hidden>
  Date:   2017-10-11 (Wed, 11 Oct 2017)

  Changed paths:
    M htdocs/adherents/subscription.php

  Log Message:
  -----------
  Fix: wrong copy/paste !


  Commit: 1b04c4beb7cab1e2529cc003f93da447498fa90e
      
https://github.com/Dolibarr/dolibarr/commit/1b04c4beb7cab1e2529cc003f93da447498fa90e
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-10-11 (Wed, 11 Oct 2017)

  Changed paths:
    M htdocs/adherents/subscription.php

  Log Message:
  -----------
  Merge branch '6.0' into 6.0_bug2


  Commit: f8771c22149e95e0762128f9364a9d805ac77b8e
      
https://github.com/Dolibarr/dolibarr/commit/f8771c22149e95e0762128f9364a9d805ac77b8e
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-10-11 (Wed, 11 Oct 2017)

  Changed paths:
    M htdocs/adherents/subscription/list.php

  Log Message:
  -----------
  Update list.php


  Commit: 7e999603fc2b48e504b478a93867282a4fb56bd7
      
https://github.com/Dolibarr/dolibarr/commit/7e999603fc2b48e504b478a93867282a4fb56bd7
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-10-11 (Wed, 11 Oct 2017)

  Changed paths:
    M htdocs/adherents/subscription/list.php

  Log Message:
  -----------
  Update list.php


  Commit: d59d7887bb9db0c7d05190342bd94ef2c70e8c65
      
https://github.com/Dolibarr/dolibarr/commit/d59d7887bb9db0c7d05190342bd94ef2c70e8c65
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-10-11 (Wed, 11 Oct 2017)

  Changed paths:
    M htdocs/adherents/subscription.php

  Log Message:
  -----------
  Update subscription.php


  Commit: cfce9f7171fb14a3b22eacb5b0e8acb7584ece8b
      
https://github.com/Dolibarr/dolibarr/commit/cfce9f7171fb14a3b22eacb5b0e8acb7584ece8b
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-10-11 (Wed, 11 Oct 2017)

  Changed paths:
    M htdocs/adherents/class/subscription.class.php
    M htdocs/adherents/subscription.php
    M htdocs/adherents/subscription/card.php
    M htdocs/adherents/subscription/list.php

  Log Message:
  -----------
  Merge pull request #7611 from hregis/6.0_bug2

 Fix: if module is not activated, functionality of module is deactivated!


Compare: 
https://github.com/Dolibarr/dolibarr/compare/fa7a277d648f...cfce9f7171fb