[Dolibarr-git] [Dolibarr/dolibarr] a15348: Fix : [ bug #1487 ] PAYMENT_DELETE trigger does no...

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: a153480bc659ab8f332aa2b6b6cfe37b30927a19
      
https://github.com/Dolibarr/dolibarr/commit/a153480bc659ab8f332aa2b6b6cfe37b30927a19
  Author: KreizIT <address@hidden>
  Date:   2014-06-27 (Fri, 27 Jun 2014)

  Changed paths:
    M ChangeLog
    M htdocs/compta/paiement/class/paiement.class.php

  Log Message:
  -----------
  Fix : [ bug #1487 ] PAYMENT_DELETE trigger does not intercept trigger action
Change trigger call to new function call_trigger


  Commit: e2472351c38f5778f11872eb4e51b2f5b8814d75
      
https://github.com/Dolibarr/dolibarr/commit/e2472351c38f5778f11872eb4e51b2f5b8814d75
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-06-29 (Sun, 29 Jun 2014)

  Changed paths:
    M ChangeLog
    M htdocs/compta/paiement/class/paiement.class.php
    M htdocs/install/mysql/migration/3.6.0-3.7.0.sql
    M htdocs/install/mysql/tables/llx_accountingaccount.sql

  Log Message:
  -----------
  Merge branch 'fix1487' of github.com:KreizIT/dolibarr into
KreizIT-fix1487

Conflicts:
        ChangeLog


  Commit: 39e4cc1dda7aa9b3f1213323436cd6eff26d896e
      
https://github.com/Dolibarr/dolibarr/commit/39e4cc1dda7aa9b3f1213323436cd6eff26d896e
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-06-29 (Sun, 29 Jun 2014)

  Changed paths:
    M ChangeLog
    M htdocs/compta/paiement/class/paiement.class.php
    M htdocs/install/mysql/migration/3.6.0-3.7.0.sql
    M htdocs/install/mysql/tables/llx_accountingaccount.sql

  Log Message:
  -----------
  Merge branch 'KreizIT-fix1487' into develop


Compare: 
https://github.com/Dolibarr/dolibarr/compare/31c27b8f7c71...39e4cc1dda7a