[Dolibarr-git] [Dolibarr/dolibarr] 5a5c85: [ bug #1399 ] [pgsql] Silent warning when setting...

[Laurent Destailleur]

  Branch: refs/heads/3.5
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 5a5c8585782afb485671e04aed94f164192012ed
      
https://github.com/Dolibarr/dolibarr/commit/5a5c8585782afb485671e04aed94f164192012ed
  Author: Florian HENRY <address@hidden>
  Date:   2014-05-19 (Mon, 19 May 2014)

  Changed paths:
    M ChangeLog
    M htdocs/comm/propal/class/propal.class.php

  Log Message:
  -----------
   [ bug #1399 ] [pgsql] Silent warning when setting a propal as
"facturée" in propal.php


  Commit: ff1eb983c8b51b318eb104ec9093626fbc32c96b
      
https://github.com/Dolibarr/dolibarr/commit/ff1eb983c8b51b318eb104ec9093626fbc32c96b
  Author: Florian HENRY <address@hidden>
  Date:   2014-05-19 (Mon, 19 May 2014)

  Changed paths:
    M htdocs/admin/boxes.php
    M test/phpunit/CategorieTest.php
    M test/phpunit/CompanyBankAccountTest.php
    M test/phpunit/CoreTest.php
    M test/phpunit/DateLibTzFranceTest.php
    M test/phpunit/ExportTest.php
    M test/phpunit/FactureTest.php
    M test/phpunit/FactureTestRounding.php
    M test/phpunit/ImportTest.php
    M test/phpunit/JsonLibTest.php
    M test/phpunit/ModulesTest.php
    M test/phpunit/PropalTest.php
    M test/phpunit/WebservicesInvoicesTest.php
    M test/phpunit/WebservicesOrdersTest.php
    M test/phpunit/WebservicesOtherTest.php
    M test/phpunit/WebservicesThirdpartyTest.php

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


  Commit: c82ff0a146a8cfe7187a6758db0a52789e7e4ee7
      
https://github.com/Dolibarr/dolibarr/commit/c82ff0a146a8cfe7187a6758db0a52789e7e4ee7
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-05-21 (Wed, 21 May 2014)

  Changed paths:
    M ChangeLog
    M htdocs/admin/dict.php
    M htdocs/core/db/pgsql.class.php
    M htdocs/core/lib/functions2.lib.php
    M htdocs/core/modules/commande/mod_commande_marbre.php
    M htdocs/core/modules/contract/mod_contract_serpis.php
    M htdocs/core/modules/expedition/mod_expedition_safor.php
    M htdocs/core/modules/facture/mod_facture_mars.php
    M htdocs/core/modules/facture/mod_facture_terre.php
    M htdocs/core/modules/fichinter/mod_pacific.php
    M htdocs/core/modules/livraison/mod_livraison_jade.php
    M htdocs/core/modules/project/mod_project_simple.php
    M htdocs/core/modules/project/task/mod_task_simple.php
    M htdocs/core/modules/propale/mod_propale_marbre.php
    M htdocs/core/modules/societe/mod_codeclient_monkey.php
    M htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_cactus.php
    M htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php

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

Conflicts:
        ChangeLog


Compare: 
https://github.com/Dolibarr/dolibarr/compare/4a89446162fa...c82ff0a146a8