[Dolibarr-git] [Dolibarr/dolibarr] 85b118: Fix: [ bug #1788 ] Duplicated doActions hook in p...

[Laurent Destailleur]

  Branch: refs/heads/3.6
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 85b1188593201dcfe6c6ca6ecc6e1ee31478c442
      
https://github.com/Dolibarr/dolibarr/commit/85b1188593201dcfe6c6ca6ecc6e1ee31478c442
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-01-13 (Tue, 13 Jan 2015)

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

  Log Message:
  -----------
   Fix: [ bug #1788 ] Duplicated doActions hook in product/fournisseurs.php


  Commit: 056c0b0ca15a9364a1a84dae4de3cc5e93e2798d
      
https://github.com/Dolibarr/dolibarr/commit/056c0b0ca15a9364a1a84dae4de3cc5e93e2798d
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-01-18 (Sun, 18 Jan 2015)

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

  Log Message:
  -----------
  Merge branch 'marcosgdf-bug-1788' into 3.6


  Commit: 0513ce25e50c7f496934cec0381cc4232fa2917e
      
https://github.com/Dolibarr/dolibarr/commit/0513ce25e50c7f496934cec0381cc4232fa2917e
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-01-18 (Sun, 18 Jan 2015)

  Changed paths:
    M ChangeLog
    M htdocs/compta/prelevement/class/bonprelevement.class.php
    M htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php
    M htdocs/cron/card.php
    M htdocs/fourn/commande/fiche.php
    M htdocs/fourn/facture/fiche.php
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/en_US/main.lang
    M htdocs/projet/class/task.class.php
    M htdocs/projet/element.php

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

Conflicts:
        ChangeLog


Compare: 
https://github.com/Dolibarr/dolibarr/compare/b1f889e1d1aa...0513ce25e50c