[Dolibarr-git] [Dolibarr/dolibarr] 2dce07: Fix: If only service module is activated, it's imp...

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 2dce07590c1a9164ec805f57d3bba425f6b1cd58
      
https://github.com/Dolibarr/dolibarr/commit/2dce07590c1a9164ec805f57d3bba425f6b1cd58
  Author: Florian Henry <address@hidden>
  Date:   2013-08-26 (Mon, 26 Aug 2013)

  Changed paths:
    M ChangeLog
    M htdocs/product/class/product.class.php
    M htdocs/product/fiche.php

  Log Message:
  -----------
  Fix: If only service module is activated, it's impossible to delete
service


  Commit: dcc87263d0c0374d802b1702a7b27af9eecebf08
      
https://github.com/Dolibarr/dolibarr/commit/dcc87263d0c0374d802b1702a7b27af9eecebf08
  Author: Raphaël Doursenaud <address@hidden>
  Date:   2013-08-26 (Mon, 26 Aug 2013)

  Changed paths:
    M htdocs/fourn/class/fournisseur.product.class.php

  Log Message:
  -----------
  Update parameter as expected by the function name


  Commit: 570fee7e0783bb3060a57abc05a91be5c6261008
      
https://github.com/Dolibarr/dolibarr/commit/570fee7e0783bb3060a57abc05a91be5c6261008
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-08-26 (Mon, 26 Aug 2013)

  Changed paths:
    M ChangeLog
    M htdocs/product/class/product.class.php
    M htdocs/product/fiche.php

  Log Message:
  -----------
  Merge pull request #1198 from FHenry/3.4

Fix: If only service module is activated, it's impossible to delete


  Commit: 9cf2d8c556fcb4c30a3c493e88567bf7188f4e29
      
https://github.com/Dolibarr/dolibarr/commit/9cf2d8c556fcb4c30a3c493e88567bf7188f4e29
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-08-26 (Mon, 26 Aug 2013)

  Changed paths:
    M htdocs/fourn/class/fournisseur.product.class.php

  Log Message:
  -----------
  Merge pull request #1199 from GPCsolutions/3.4-fixmissingparameter

Update parameter as expected by the function name


  Commit: 1f6d0ab3efdbeab27b8898a3fd5778c7496759eb
      
https://github.com/Dolibarr/dolibarr/commit/1f6d0ab3efdbeab27b8898a3fd5778c7496759eb
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-08-27 (Tue, 27 Aug 2013)

  Changed paths:
    M ChangeLog
    M htdocs/fourn/class/fournisseur.product.class.php
    M htdocs/product/class/product.class.php
    M htdocs/product/fiche.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3.4' into develop

Conflicts:
        htdocs/product/class/product.class.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/83c3bde1bd18...1f6d0ab3efdb