[Dolibarr-git] [Dolibarr/dolibarr] 41f092: Fix for debian

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 41f0920656a8eb26ee40f48a21cbed9362897d73
      
https://github.com/Dolibarr/dolibarr/commit/41f0920656a8eb26ee40f48a21cbed9362897d73
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-10-24 (Fri, 24 Oct 2014)

  Changed paths:
    M build/debian/control
    M build/debian/copyright

  Log Message:
  -----------
  Fix for debian


  Commit: badf3794894bc81f3873fd53ec5f42b4e2751b56
      
https://github.com/Dolibarr/dolibarr/commit/badf3794894bc81f3873fd53ec5f42b4e2751b56
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-10-27 (Mon, 27 Oct 2014)

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

  Log Message:
  -----------
  Fix: [ bug #1618 ] PHP Error thrown when saving a barcode


  Commit: 106b4a669f203f2791ff1a607ca691d298e4b43d
      
https://github.com/Dolibarr/dolibarr/commit/106b4a669f203f2791ff1a607ca691d298e4b43d
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-10-30 (Thu, 30 Oct 2014)

  Changed paths:
    M htdocs/user/class/user.class.php

  Log Message:
  -----------
  id_parent and id_children was not set.
So introduce new method to return same with no risk to break current
working code to address this.


  Commit: 8821fbac763837953a62a6752a43b55ab29919ef
      
https://github.com/Dolibarr/dolibarr/commit/8821fbac763837953a62a6752a43b55ab29919ef
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-10-30 (Thu, 30 Oct 2014)

  Changed paths:
    M ChangeLog
    M build/debian/control
    M build/debian/copyright
    M htdocs/user/class/user.class.php

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

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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/8248ab4f9a49...8821fbac7638