[Dolibarr-git] [Dolibarr/dolibarr] 02d59c: NEW : Product stock and subproduct stock are indep...

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 02d59cce5a25ba2ced2d01924088b111734c57ce
      
https://github.com/Dolibarr/dolibarr/commit/02d59cce5a25ba2ced2d01924088b111734c57ce
  Author: Gauthier <address@hidden>
  Date:   2015-02-16 (Mon, 16 Feb 2015)

  Changed paths:
    M htdocs/admin/stock.php
    M htdocs/langs/en_US/stocks.lang
    M htdocs/product/stock/class/mouvementstock.class.php

  Log Message:
  -----------
  NEW : Product stock and subproduct stock are independant


  Commit: 72908c1fd39805320e12420da2caca9badf2ab2a
      
https://github.com/Dolibarr/dolibarr/commit/72908c1fd39805320e12420da2caca9badf2ab2a
  Author: Alexis Algoud <address@hidden>
  Date:   2015-02-23 (Mon, 23 Feb 2015)

  Changed paths:
    M htdocs/admin/stock.php
    M htdocs/langs/en_US/stocks.lang
    M htdocs/product/stock/class/mouvementstock.class.php

  Log Message:
  -----------
  Merge branch 'develop' of https://github.com/atm-gauthier/dolibarr into 
feature_Product_stock_subproduct_stock_independent


  Commit: 0c531215531b7b262034fbd30419021b2a758983
      
https://github.com/Dolibarr/dolibarr/commit/0c531215531b7b262034fbd30419021b2a758983
  Author: Alexis Algoud <address@hidden>
  Date:   2015-02-23 (Mon, 23 Feb 2015)

  Changed paths:
    M htdocs/langs/en_US/products.lang
    M htdocs/product/class/product.class.php
    M htdocs/product/composition/card.php
    M htdocs/product/stock/class/mouvementstock.class.php

  Log Message:
  -----------
  - use incdec into virtual product definition.
- improve screen of virtual product


  Commit: 29e5b89352ee42dd2844175fd9032ac2c8604be1
      
https://github.com/Dolibarr/dolibarr/commit/29e5b89352ee42dd2844175fd9032ac2c8604be1
  Author: Alexis Algoud <address@hidden>
  Date:   2015-02-23 (Mon, 23 Feb 2015)

  Changed paths:
    M htdocs/product/composition/card.php

  Log Message:
  -----------
  erase some comments


  Commit: 1c04af2e553a4c83c080c3997421003016120853
      
https://github.com/Dolibarr/dolibarr/commit/1c04af2e553a4c83c080c3997421003016120853
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-02-24 (Tue, 24 Feb 2015)

  Changed paths:
    M htdocs/admin/stock.php
    M htdocs/langs/en_US/products.lang
    M htdocs/langs/en_US/stocks.lang
    M htdocs/product/class/product.class.php
    M htdocs/product/composition/card.php
    M htdocs/product/stock/class/mouvementstock.class.php

  Log Message:
  -----------
  Merge branch 'feature_Product_stock_subproduct_stock_independent' of
https://github.com/atm-alexis/dolibarr into
atm-alexis-feature_Product_stock_subproduct_stock_independent

Conflicts:
        htdocs/langs/en_US/products.lang


  Commit: d688db3b78379ce2ba58ad75868d3a8f8d89b07e
      
https://github.com/Dolibarr/dolibarr/commit/d688db3b78379ce2ba58ad75868d3a8f8d89b07e
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-02-24 (Tue, 24 Feb 2015)

  Changed paths:
    M htdocs/admin/stock.php
    M htdocs/langs/en_US/products.lang
    M htdocs/langs/en_US/stocks.lang
    M htdocs/product/class/product.class.php
    M htdocs/product/composition/card.php
    M htdocs/product/stock/class/mouvementstock.class.php

  Log Message:
  -----------
  Merge branch 'atm-alexis-feature_Product_stock_subproduct_stock_independent' 
into develop


Compare: 
https://github.com/Dolibarr/dolibarr/compare/fec9e222b1a5...d688db3b7837