[Dolibarr-git] [Dolibarr/dolibarr] 00779d: FIX #1460, #1461

[Laurent Destailleur]

  Branch: refs/heads/3.6
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 00779dd8faead4a7f8017e09708a968f8cc2ffb5
      
https://github.com/Dolibarr/dolibarr/commit/00779dd8faead4a7f8017e09708a968f8cc2ffb5
  Author: Cedric <address@hidden>
  Date:   2014-06-24 (Tue, 24 Jun 2014)

  Changed paths:
    M ChangeLog
    M htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN
    M htdocs/fourn/class/fournisseur.commande.class.php
    M htdocs/fourn/commande/fiche.php

  Log Message:
  -----------
  FIX #1460, #1461


  Commit: 0c382ef97ef116429ac613430ebecc909bc0c1df
      
https://github.com/Dolibarr/dolibarr/commit/0c382ef97ef116429ac613430ebecc909bc0c1df
  Author: Cedric <address@hidden>
  Date:   2014-06-24 (Tue, 24 Jun 2014)

  Changed paths:
    M htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN

  Log Message:
  -----------
  Remove failure test on trigger


  Commit: e21e4dbf1172586c0a96cb764ebe5d6490d46590
      
https://github.com/Dolibarr/dolibarr/commit/e21e4dbf1172586c0a96cb764ebe5d6490d46590
  Author: Cedric <address@hidden>
  Date:   2014-06-24 (Tue, 24 Jun 2014)

  Changed paths:
    M ChangeLog
    M htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN
    M htdocs/fourn/class/fournisseur.facture.class.php
    M htdocs/fourn/facture/fiche.php

  Log Message:
  -----------
  - FIX #1482 #1484 #1486
- Add missing triggers in interface_90


  Commit: f5980a1d203589cdd15c7212cf4d4c07c15f007b
      
https://github.com/Dolibarr/dolibarr/commit/f5980a1d203589cdd15c7212cf4d4c07c15f007b
  Author: Raphaël Doursenaud <address@hidden>
  Date:   2014-06-26 (Thu, 26 Jun 2014)

  Changed paths:
    M htdocs/holiday/month_report.php
    M htdocs/product/stock/lib/replenishment.lib.php

  Log Message:
  -----------
  Fix database prefix usage


  Commit: 72d1a9606e353b0e9935e44562da57d47b7d836e
      
https://github.com/Dolibarr/dolibarr/commit/72d1a9606e353b0e9935e44562da57d47b7d836e
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-06-26 (Thu, 26 Jun 2014)

  Changed paths:
    M htdocs/holiday/month_report.php
    M htdocs/product/stock/lib/replenishment.lib.php

  Log Message:
  -----------
  Merge pull request #1688 from GPCsolutions/3.5-databaseprefix

Fix database prefix usage


  Commit: 092d1b725d9f2b45afd2e43cdf2713cd2e6a84e8
      
https://github.com/Dolibarr/dolibarr/commit/092d1b725d9f2b45afd2e43cdf2713cd2e6a84e8
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-06-26 (Thu, 26 Jun 2014)

  Changed paths:
    M ChangeLog
    M htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN
    M htdocs/fourn/class/fournisseur.commande.class.php
    M htdocs/fourn/class/fournisseur.facture.class.php
    M htdocs/fourn/commande/fiche.php
    M htdocs/fourn/facture/fiche.php

  Log Message:
  -----------
  Merge pull request #1684 from KreizIT/triggers

FIX #1460, #1461


  Commit: 18838ccfa06d206748874e354741396b9b42e3a8
      
https://github.com/Dolibarr/dolibarr/commit/18838ccfa06d206748874e354741396b9b42e3a8
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-06-28 (Sat, 28 Jun 2014)

  Changed paths:
    M htdocs/adherents/card_subscriptions.php

  Log Message:
  -----------
  Fix: Correct name for thirdparty created from member.


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

  Changed paths:
    M ChangeLog
    M htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN
    M htdocs/fourn/class/fournisseur.commande.class.php
    M htdocs/fourn/class/fournisseur.facture.class.php
    M htdocs/fourn/commande/fiche.php
    M htdocs/fourn/facture/fiche.php
    M htdocs/holiday/month_report.php
    M htdocs/product/stock/lib/replenishment.lib.php

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


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

  Changed paths:
    M ChangeLog
    M htdocs/core/class/CMailFile.class.php

  Log Message:
  -----------
  Fix: When using option MAIN_MAIL_ALLOW_SENDMAIL_F, a mail was sent to
sender.


  Commit: 71ee974ddbab5c1156792448be40fdf5e849903c
      
https://github.com/Dolibarr/dolibarr/commit/71ee974ddbab5c1156792448be40fdf5e849903c
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-06-28 (Sat, 28 Jun 2014)

  Changed paths:
    M ChangeLog
    M htdocs/adherents/card_subscriptions.php
    M htdocs/core/class/CMailFile.class.php
    M htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN
    M htdocs/fourn/class/fournisseur.commande.class.php
    M htdocs/fourn/class/fournisseur.facture.class.php
    M htdocs/fourn/commande/fiche.php
    M htdocs/fourn/facture/fiche.php
    M htdocs/holiday/month_report.php
    M htdocs/product/stock/lib/replenishment.lib.php

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

Conflicts:
        htdocs/fourn/class/fournisseur.commande.class.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/fc4493242a7e...71ee974ddbab