[Dolibarr-git] [Dolibarr/dolibarr] 63c542: another fix for Ressource module in PgSQL

[Juanjo Menent]

  Branch: refs/heads/4.0
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 63c54259918be35ceb16d74d3c0c835f9eaba8b6
      
https://github.com/Dolibarr/dolibarr/commit/63c54259918be35ceb16d74d3c0c835f9eaba8b6
  Author: florian HENRY <address@hidden>
  Date:   2016-08-17 (Wed, 17 Aug 2016)

  Changed paths:
    M htdocs/resource/class/dolresource.class.php

  Log Message:
  -----------
  another fix for Ressource module in PgSQL


  Commit: 90c918bec6ec59459ef3d40e00fc0866620c6920
      
https://github.com/Dolibarr/dolibarr/commit/90c918bec6ec59459ef3d40e00fc0866620c6920
  Author: florian HENRY <address@hidden>
  Date:   2016-08-17 (Wed, 17 Aug 2016)

  Changed paths:
    M htdocs/compta/charges/index.php
    M htdocs/compta/paiement/list.php
    M htdocs/compta/payment_sc/card.php
    M htdocs/compta/salaries/index.php
    M htdocs/compta/tva/card.php
    M htdocs/compta/tva/reglement.php
    M htdocs/contrat/list.php
    M htdocs/core/boxes/modules_boxes.php
    M htdocs/core/class/html.formother.class.php
    M htdocs/core/modules/modHRM.class.php
    M htdocs/core/modules/printing/printgcp.modules.php
    M htdocs/langs/en_US/boxes.lang
    M htdocs/langs/en_US/multicurrency.lang
    M htdocs/public/demo/index.php
    M htdocs/theme/eldy/style.css.php
    M htdocs/theme/md/style.css.php

  Log Message:
  -----------
  Merge branch '4.0' of https://github.com/Dolibarr/dolibarr.git into 4.0


  Commit: f7bb2483d8436adac643de02595ed7ccbae2da5b
      
https://github.com/Dolibarr/dolibarr/commit/f7bb2483d8436adac643de02595ed7ccbae2da5b
  Author: florian HENRY <address@hidden>
  Date:   2016-08-17 (Wed, 17 Aug 2016)

  Changed paths:
    M htdocs/resource/class/dolresource.class.php

  Log Message:
  -----------
  fix ressource for PGSQL


  Commit: 137f1c4e4fe1109fb3a626fde1c36812d850d326
      
https://github.com/Dolibarr/dolibarr/commit/137f1c4e4fe1109fb3a626fde1c36812d850d326
  Author: florian HENRY <address@hidden>
  Date:   2016-08-18 (Thu, 18 Aug 2016)

  Changed paths:
    M htdocs/categories/card.php
    M htdocs/categories/viewcat.php
    M htdocs/compta/bank/card.php
    M htdocs/compta/sociales/charges.php
    M htdocs/contact/card.php
    M htdocs/contact/perso.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/extrafields.class.php
    M htdocs/core/db/pgsql.class.php
    M htdocs/core/modules/modCategorie.class.php
    M htdocs/core/modules/modFacture.class.php
    M htdocs/core/modules/modSalaries.class.php
    M htdocs/core/modules/modUser.class.php
    M htdocs/fourn/card.php
    M htdocs/fourn/class/fournisseur.commande.class.php
    M htdocs/langs/en_US/bills.lang
    M htdocs/langs/en_US/companies.lang
    M htdocs/margin/tabs/productMargins.php
    M htdocs/opensurvey/card.php
    M htdocs/opensurvey/results.php
    M htdocs/opensurvey/wizard/create_survey.php
    M htdocs/product/card.php
    M htdocs/product/composition/card.php
    M htdocs/product/document.php
    M htdocs/product/fournisseurs.php
    M htdocs/product/info.php
    M htdocs/product/price.php
    M htdocs/product/stats/card.php
    M htdocs/product/stats/facture.php
    M htdocs/product/stock/card.php
    M htdocs/product/stock/class/mouvementstock.class.php
    M htdocs/product/stock/product.php
    M htdocs/product/traduction.php
    M htdocs/resource/add.php
    M htdocs/resource/class/dolresource.class.php
    M htdocs/societe/soc.php

  Log Message:
  -----------
  Merge branch '4.0' of https://github.com/Dolibarr/dolibarr.git into 4.0

Conflicts:
        htdocs/resource/class/dolresource.class.php


  Commit: ab4997d26f7d70634e28ce05f611b3e2b217ddda
      
https://github.com/Dolibarr/dolibarr/commit/ab4997d26f7d70634e28ce05f611b3e2b217ddda
  Author: florian HENRY <address@hidden>
  Date:   2016-08-22 (Mon, 22 Aug 2016)

  Changed paths:
    M htdocs/compta/facture/fiche-rec.php
    M htdocs/contrat/class/contrat.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/lib/geturl.lib.php
    M htdocs/core/modules/contract/doc/pdf_strato.modules.php

  Log Message:
  -----------
  Merge branch '4.0' of https://github.com/Dolibarr/dolibarr.git into 4.0


  Commit: 848d046b46691d51ecf118e5c7c59d578d838a07
      
https://github.com/Dolibarr/dolibarr/commit/848d046b46691d51ecf118e5c7c59d578d838a07
  Author: florian HENRY <address@hidden>
  Date:   2016-08-25 (Thu, 25 Aug 2016)

  Changed paths:
    M htdocs/compta/payment_sc/card.php
    M htdocs/public/test/test_arrays.php
    M htdocs/theme/eldy/style.css.php
    M htdocs/theme/md/style.css.php

  Log Message:
  -----------
  Merge branch '4.0' of https://github.com/Dolibarr/dolibarr.git into 4.0


  Commit: 9c4d60fd5d01728d5109437e79c19ae2aabe3c6a
      
https://github.com/Dolibarr/dolibarr/commit/9c4d60fd5d01728d5109437e79c19ae2aabe3c6a
  Author: Juanjo Menent <address@hidden>
  Date:   2016-08-25 (Thu, 25 Aug 2016)

  Changed paths:
    M htdocs/resource/class/dolresource.class.php

  Log Message:
  -----------
  Merge pull request #5639 from atm-florian/4.0

fix ressource module  for PGSQL and coding style


Compare: 
https://github.com/Dolibarr/dolibarr/compare/ed25c0fda5ec...9c4d60fd5d01