[Dolibarr-git] [Dolibarr/dolibarr] 559e62: Fix conflict with trigger to delete payment custom...

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 559e621fd281e322bb896ca425b777f34fe87913
      
https://github.com/Dolibarr/dolibarr/commit/559e621fd281e322bb896ca425b777f34fe87913
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-12-23 (Wed, 23 Dec 2015)

  Changed paths:
    M htdocs/compta/paiement/class/paiement.class.php
    M htdocs/fourn/class/paiementfourn.class.php

  Log Message:
  -----------
  Fix conflict with trigger to delete payment customer and supplier.


  Commit: a9db42ddc13937f0e4c8ab038a4d756c7478b03e
      
https://github.com/Dolibarr/dolibarr/commit/a9db42ddc13937f0e4c8ab038a4d756c7478b03e
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-12-23 (Wed, 23 Dec 2015)

  Changed paths:
    M htdocs/projet/card.php
    M htdocs/public/opensurvey/studs.php
    M htdocs/resource/add.php
    M htdocs/resource/card.php
    M htdocs/resource/element_resource.php
    M htdocs/societe/admin/societe.php
    M htdocs/societe/list.php
    M htdocs/societe/price.php
    M htdocs/societe/rib.php
    M htdocs/societe/soc.php
    M htdocs/user/agenda_extsites.php
    M htdocs/user/bank.php
    M htdocs/user/card.php
    M htdocs/user/clicktodial.php
    M htdocs/user/group/card.php
    M htdocs/user/group/ldap.php
    M htdocs/user/ldap.php

  Log Message:
  -----------
  Merge branch 'develop' of address@hidden:Dolibarr/dolibarr.git into develop


Compare: 
https://github.com/Dolibarr/dolibarr/compare/442006dba58b...a9db42ddc139