[Dolibarr-git] [Dolibarr/dolibarr] 8b92e5: fix #5053 and bogus 051c5f4

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 8b92e552a3aa847c85e2c1e40ecc1879ce04ce88
      
https://github.com/Dolibarr/dolibarr/commit/8b92e552a3aa847c85e2c1e40ecc1879ce04ce88
  Author: nka11 <address@hidden>
  Date:   2016-04-24 (Sun, 24 Apr 2016)

  Changed paths:
    M htdocs/api/class/api_access.class.php

  Log Message:
  -----------
  fix #5053 and bogus 051c5f4


  Commit: 56d25a7c2bed25ba3d879aedf17c780d9c4637bd
      
https://github.com/Dolibarr/dolibarr/commit/56d25a7c2bed25ba3d879aedf17c780d9c4637bd
  Author: nka11 <address@hidden>
  Date:   2016-04-26 (Tue, 26 Apr 2016)

  Changed paths:
    M build/exe/doliwamp/doliwamp.bmp
    M doc/images/dolibarr_screenshot1_1280x800.png
    M doc/images/dolibarr_screenshot1_300x188.png
    M doc/images/dolibarr_screenshot1_640x400.png
    M htdocs/compta/facture.php
    M htdocs/compta/facture/class/facture-rec.class.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/compta/facture/fiche-rec.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/tpl/objectline_create.tpl.php
    M htdocs/core/tpl/objectline_view.tpl.php
    M htdocs/langs/en_US/bills.lang

  Log Message:
  -----------
  Merge branch 'develop' of ssh://github.com/Dolibarr/dolibarr into fix_5053


  Commit: 98f757a87a4e9e37ab1efd6b0c23a827f25b8f65
      
https://github.com/Dolibarr/dolibarr/commit/98f757a87a4e9e37ab1efd6b0c23a827f25b8f65
  Author: nka11 <address@hidden>
  Date:   2016-04-27 (Wed, 27 Apr 2016)

  Changed paths:
    M htdocs/commande/class/api_commande.class.php
    M htdocs/product/class/api_product.class.php
    M htdocs/societe/class/api_contact.class.php
    M htdocs/user/class/api_user.class.php

  Log Message:
  -----------
  New API methods

add user to group
get product list by category id


  Commit: 19e223e84ba1dcec89dcfdb233b0a0e87f69d089
      
https://github.com/Dolibarr/dolibarr/commit/19e223e84ba1dcec89dcfdb233b0a0e87f69d089
  Author: nka11 <address@hidden>
  Date:   2016-04-27 (Wed, 27 Apr 2016)

  Changed paths:
    M htdocs/comm/index.php
    M htdocs/compta/facture/class/facture-rec.class.php
    M htdocs/compta/facture/fiche-rec.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/tpl/objectline_view.tpl.php
    M htdocs/expedition/card.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/install/mysql/migration/3.9.0-4.0.0.sql
    M htdocs/install/mysql/tables/llx_expedition.sql
    M htdocs/langs/en_US/supplier_proposal.lang

  Log Message:
  -----------
  Merge branch 'develop' of ssh://github.com/Dolibarr/dolibarr into 
api_improvement


  Commit: ce0436b809e65b423bd8b57862f8da039bd56ff5
      
https://github.com/Dolibarr/dolibarr/commit/ce0436b809e65b423bd8b57862f8da039bd56ff5
  Author: nka11 <address@hidden>
  Date:   2016-04-28 (Thu, 28 Apr 2016)

  Changed paths:
    M htdocs/comm/index.php
    M htdocs/commande/list.php
    M htdocs/compta/facture.php
    M htdocs/compta/facture/class/facture-rec.class.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/compta/facture/fiche-rec.php
    M htdocs/compta/facture/list.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/tpl/objectline_view.tpl.php
    M htdocs/expedition/card.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/install/mysql/migration/3.9.0-4.0.0.sql
    M htdocs/install/mysql/tables/llx_expedition.sql
    M htdocs/langs/en_US/supplier_proposal.lang
    M htdocs/product/class/product.class.php
    M htdocs/product/list.php
    M htdocs/product/reassort.php
    M htdocs/product/stock/replenish.php
    M htdocs/websites/class/websitepage.class.php

  Log Message:
  -----------
  Merge branch 'develop' of ssh://github.com/Dolibarr/dolibarr into fix_5053


  Commit: 932b9837fe6b362e5fa2fa3335b69eeacef9ab96
      
https://github.com/Dolibarr/dolibarr/commit/932b9837fe6b362e5fa2fa3335b69eeacef9ab96
  Author: nka11 <address@hidden>
  Date:   2016-04-28 (Thu, 28 Apr 2016)

  Changed paths:
    M htdocs/commande/list.php
    M htdocs/compta/facture.php
    M htdocs/compta/facture/class/facture-rec.class.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/compta/facture/fiche-rec.php
    M htdocs/compta/facture/list.php
    M htdocs/product/class/product.class.php
    M htdocs/product/list.php
    M htdocs/product/reassort.php
    M htdocs/product/stock/replenish.php
    M htdocs/websites/class/websitepage.class.php

  Log Message:
  -----------
  Merge branch 'fix_5053' into api_improvement


  Commit: 88842ccd8b1d87f87721ce067e36cb52e3ec524d
      
https://github.com/Dolibarr/dolibarr/commit/88842ccd8b1d87f87721ce067e36cb52e3ec524d
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-04-29 (Fri, 29 Apr 2016)

  Changed paths:
    M htdocs/api/class/api_access.class.php
    M htdocs/commande/class/api_commande.class.php
    M htdocs/product/class/api_product.class.php
    M htdocs/societe/class/api_contact.class.php
    M htdocs/user/class/api_user.class.php

  Log Message:
  -----------
  Merge pull request #5111 from nka11/api_improvement

Api improvement


Compare: 
https://github.com/Dolibarr/dolibarr/compare/bec4c58732c3...88842ccd8b1d