[Dolibarr-git] [Dolibarr/dolibarr] 43702c: New: Enhance stock management: Introduce tag to de...

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 43702cf662c3178a0a6c85fd7cdf868ee48953e1
      
https://github.com/Dolibarr/dolibarr/commit/43702cf662c3178a0a6c85fd7cdf868ee48953e1
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-01-30 (Fri, 30 Jan 2015)

  Changed paths:
    M htdocs/fourn/class/fournisseur.product.class.php
    M htdocs/install/mysql/migration/3.7.0-3.8.0.sql
    M htdocs/install/mysql/tables/llx_product_association.sql
    M htdocs/install/mysql/tables/llx_stock_mouvement.sql
    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
    M htdocs/product/stock/mouvement.php
    M htdocs/product/stock/product.php

  Log Message:
  -----------
  New: Enhance stock management: Introduce tag to define if a subproduct
must have stock decreased and add inventory code on stock movements.


  Commit: 556c27f8344f007888e9e3a85ec9bc5d054e40ef
      
https://github.com/Dolibarr/dolibarr/commit/556c27f8344f007888e9e3a85ec9bc5d054e40ef
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-02-04 (Wed, 04 Feb 2015)

  Changed paths:
    M .gitignore
    M CONTRIBUTING.md
    M ChangeLog
    M README.md
    M build/debian/README.howto
    M build/exe/doliwamp/config.inc.php.install
    M dev/initdata/mysqldump_dolibarr_3.7.0.sql
    M htdocs/accountancy/admin/export.php
    M htdocs/accountancy/bookkeeping/balancebymonth.php
    M htdocs/accountancy/bookkeeping/list.php
    M htdocs/accountancy/bookkeeping/listbyyear.php
    M htdocs/accountancy/class/accountingaccount.class.php
    M htdocs/accountancy/class/html.formventilation.class.php
    M htdocs/accountancy/customer/card.php
    M htdocs/accountancy/customer/index.php
    M htdocs/accountancy/customer/lines.php
    M htdocs/accountancy/customer/list.php
    M htdocs/accountancy/journal/bankjournal.php
    M htdocs/accountancy/journal/cashjournal.php
    M htdocs/accountancy/journal/purchasesjournal.php
    M htdocs/accountancy/journal/sellsjournal.php
    M htdocs/accountancy/supplier/card.php
    M htdocs/accountancy/supplier/index.php
    M htdocs/accountancy/supplier/lines.php
    M htdocs/accountancy/supplier/list.php
    M htdocs/adherents/class/adherent.class.php
    M htdocs/admin/ihm.php
    M htdocs/admin/menus.php
    M htdocs/cache.manifest
    M htdocs/categories/categorie.php
    M htdocs/comm/action/card.php
    M htdocs/comm/action/class/actioncomm.class.php
    M htdocs/comm/action/index.php
    M htdocs/comm/action/peruser.php
    M htdocs/comm/card.php
    M htdocs/comm/index.php
    M htdocs/comm/propal.php
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
    M htdocs/commande/card.php
    M htdocs/commande/class/commande.class.php
    M htdocs/commande/list.php
    M htdocs/commande/tpl/linkedobjectblock.tpl.php
    M htdocs/compta/bank/class/account.class.php
    M htdocs/compta/bank/releve.php
    M htdocs/compta/deplacement/card.php
    M htdocs/compta/facture.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
    M htdocs/compta/index.php
    M htdocs/contact/class/contact.class.php
    A htdocs/contrat/admin/contractdet_extrafields.php
    M htdocs/contrat/card.php
    M htdocs/contrat/class/contrat.class.php
    R htdocs/contrat/class/index.html
    M htdocs/contrat/tpl/linkedobjectblock.tpl.php
    M htdocs/core/ajax/ajaxdirtree.php
    M htdocs/core/boxes/box_actions.php
    M htdocs/core/boxes/box_activity.php
    M htdocs/core/boxes/box_bookmarks.php
    M htdocs/core/boxes/box_clients.php
    M htdocs/core/boxes/box_commandes.php
    M htdocs/core/boxes/box_comptes.php
    M htdocs/core/boxes/box_contacts.php
    M htdocs/core/boxes/box_contracts.php
    M htdocs/core/boxes/box_external_rss.php
    M htdocs/core/boxes/box_factures.php
    M htdocs/core/boxes/box_factures_fourn.php
    M htdocs/core/boxes/box_factures_fourn_imp.php
    M htdocs/core/boxes/box_factures_imp.php
    M htdocs/core/boxes/box_ficheinter.php
    M htdocs/core/boxes/box_fournisseurs.php
    M htdocs/core/boxes/box_members.php
    M htdocs/core/boxes/box_produits.php
    M htdocs/core/boxes/box_produits_alerte_stock.php
    M htdocs/core/boxes/box_project.php
    M htdocs/core/boxes/box_propales.php
    M htdocs/core/boxes/box_prospect.php
    M htdocs/core/boxes/box_supplier_orders.php
    M htdocs/core/boxes/box_task.php
    M htdocs/core/boxes/modules_boxes.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/class/html.formother.class.php
    M htdocs/core/class/html.formprojet.class.php
    M htdocs/core/datepicker.php
    M htdocs/core/lib/agenda.lib.php
    M htdocs/core/lib/ajax.lib.php
    M htdocs/core/lib/company.lib.php
    M htdocs/core/lib/contract.lib.php
    M htdocs/core/lib/date.lib.php
    M htdocs/core/lib/files.lib.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/lib/functions2.lib.php
    A htdocs/core/lib/functionsnumtoword.lib.php
    M htdocs/core/lib/pdf.lib.php
    M htdocs/core/lib/project.lib.php
    M htdocs/core/lib/sendings.lib.php
    M htdocs/core/menus/init_menu_auguria.sql
    M htdocs/core/menus/standard/auguria.lib.php
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/core/modules/expedition/doc/pdf_merou.modules.php
    M htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
    M htdocs/core/modules/modAccounting.class.php
    M htdocs/core/modules/modAdherent.class.php
    M htdocs/core/modules/modDynamicPrices.class.php
    M htdocs/core/modules/modMargin.class.php
    M htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
    M htdocs/core/modules/supplier_order/mod_commande_fournisseur_orchidee.php
    M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
    M htdocs/core/tpl/objectline_create.tpl.php
    M htdocs/ecm/index.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/expedition/list.php
    M htdocs/expedition/note.php
    M htdocs/expedition/shipment.php
    M htdocs/expedition/tpl/linkedobjectblock.tpl.php
    M htdocs/fichinter/card.php
    M htdocs/fichinter/class/fichinter.class.php
    M htdocs/fichinter/tpl/linkedobjectblock.tpl.php
    M htdocs/fourn/ajax/getSupplierPrices.php
    M htdocs/fourn/card.php
    M htdocs/fourn/class/fournisseur.commande.class.php
    M htdocs/fourn/class/fournisseur.facture.class.php
    M htdocs/fourn/class/fournisseur.product.class.php
    M htdocs/fourn/commande/card.php
    M htdocs/fourn/commande/list.php
    M htdocs/fourn/facture/card.php
    M htdocs/includes/evalmath/evalmath.class.php
    M htdocs/install/check.php
    M htdocs/install/mysql/data/llx_c_currencies.sql
    M htdocs/install/mysql/data/llx_c_tva.sql
    M htdocs/install/mysql/migration/3.6.0-3.7.0.sql
    M htdocs/install/mysql/migration/3.7.0-3.8.0.sql
    M htdocs/install/mysql/tables/llx_c_tva.sql
    A htdocs/install/mysql/tables/llx_contratdet_extrafields.key.sql
    A htdocs/install/mysql/tables/llx_contratdet_extrafields.sql
    M htdocs/install/mysql/tables/llx_product.sql
    M htdocs/install/mysql/tables/llx_product_fournisseur_price.sql
    M htdocs/install/mysql/tables/llx_product_price.sql
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/en_US/agenda.lang
    M htdocs/langs/en_US/bills.lang
    M htdocs/langs/en_US/ecm.lang
    M htdocs/langs/en_US/install.lang
    M htdocs/langs/en_US/margins.lang
    M htdocs/langs/en_US/orders.lang
    M htdocs/langs/en_US/products.lang
    M htdocs/langs/en_US/sendings.lang
    M htdocs/langs/en_US/stocks.lang
    M htdocs/main.inc.php
    M htdocs/margin/agentMargins.php
    M htdocs/margin/lib/margins.lib.php
    M htdocs/product/class/priceexpression.class.php
    M htdocs/product/class/priceparser.class.php
    M htdocs/product/class/product.class.php
    M htdocs/product/expression.php
    M htdocs/product/fournisseurs.php
    M htdocs/product/index.php
    M htdocs/product/list.php
    M htdocs/product/price.php
    M htdocs/product/reassort.php
    M htdocs/product/stock/card.php
    M htdocs/product/stock/class/entrepot.class.php
    M htdocs/product/stock/list.php
    M htdocs/product/stock/mouvement.php
    M htdocs/product/stock/product.php
    M htdocs/projet/card.php
    M htdocs/projet/class/project.class.php
    M htdocs/projet/element.php
    M htdocs/projet/index.php
    M htdocs/projet/list.php
    M htdocs/public/test/test_arrays.php
    M htdocs/public/test/test_forms.php
    M htdocs/societe/admin/societe.php
    M htdocs/societe/agenda.php
    M htdocs/societe/class/societe.class.php
    M htdocs/societe/index.php
    M htdocs/societe/soc.php
    M htdocs/theme/eldy/style.css.php
    M htdocs/user/class/user.class.php
    M htdocs/user/group/card.php
    M htdocs/user/home.php
    M htdocs/webservices/server_productorservice.php
    M test/phpunit/DateLibTest.php
    M test/phpunit/FunctionsLibTest.php

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

Conflicts:
        htdocs/install/mysql/migration/3.7.0-3.8.0.sql
        htdocs/product/stock/mouvement.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/6d751ad63b36...556c27f8344f