[Dolibarr-git] [Dolibarr/dolibarr] 4001bc: NEW : Add workflow to calculated supplier order st...

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 4001bc474e1ae0b803d75fef9ac2601024112a40
      
https://github.com/Dolibarr/dolibarr/commit/4001bc474e1ae0b803d75fef9ac2601024112a40
  Author: florian HENRY <address@hidden>
  Date:   2016-08-04 (Thu, 04 Aug 2016)

  Changed paths:
    M htdocs/admin/stock.php
    M htdocs/admin/workflow.php
    M htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
    M htdocs/fourn/class/fournisseur.commande.dispatch.class.php
    M htdocs/langs/en_US/stocks.lang
    M htdocs/langs/en_US/workflow.lang

  Log Message:
  -----------
  NEW : Add workflow to calculated supplier order status on stock dispatch


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

  Changed paths:
    M htdocs/adherents/fiche_subscription.php
    M htdocs/admin/fckeditor.php
    M htdocs/admin/supplier_order.php
    M htdocs/admin/supplier_payment.php
    M htdocs/admin/workflow.php
    M htdocs/comm/propal/card.php
    M htdocs/commande/card.php
    M htdocs/compta/facture.php
    M htdocs/contrat/card.php
    M htdocs/core/actions_dellink.inc.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/class/html.formfile.class.php
    M htdocs/core/class/html.formprojet.class.php
    M htdocs/core/js/lib_head.js.php
    M htdocs/core/modules/modFournisseur.class.php
    M htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php
    M htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
    M htdocs/expedition/card.php
    M htdocs/expensereport/card.php
    M htdocs/expensereport/info.php
    M htdocs/fichinter/card.php
    M htdocs/fourn/class/fournisseur.commande.class.php
    M htdocs/fourn/commande/card.php
    M htdocs/fourn/facture/card.php
    M htdocs/fourn/facture/list.php
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/en_US/main.lang
    M htdocs/langs/en_US/projects.lang
    M htdocs/langs/en_US/suppliers.lang
    M htdocs/langs/en_US/workflow.lang
    M htdocs/margin/tabs/thirdpartyMargins.php
    M htdocs/product/stock/productlot_card.php
    M htdocs/projet/activity/perweek.php
    M htdocs/projet/admin/project.php
    M htdocs/projet/card.php
    M htdocs/projet/element.php
    M htdocs/societe/note.php
    M htdocs/supplier_proposal/card.php
    M htdocs/theme/eldy/img/puce.png
    M htdocs/theme/eldy/style.css.php
    M htdocs/theme/md/img/puce.png
    M htdocs/theme/md/style.css.php

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

Conflicts:
        htdocs/langs/en_US/workflow.lang


  Commit: 0780188f4e5882795b2bb627ed01344d0835f04b
      
https://github.com/Dolibarr/dolibarr/commit/0780188f4e5882795b2bb627ed01344d0835f04b
  Author: florian HENRY <address@hidden>
  Date:   2016-08-05 (Fri, 05 Aug 2016)

  Changed paths:
    M htdocs/admin/stock.php
    M htdocs/admin/workflow.php
    M htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
    M htdocs/fourn/class/fournisseur.commande.class.php
    M htdocs/fourn/commande/dispatch.php
    M htdocs/langs/en_US/workflow.lang

  Log Message:
  -----------
  taking account @eldy remarks


  Commit: 1e929e647df87dacb6c6abe099587c930ef93412
      
https://github.com/Dolibarr/dolibarr/commit/1e929e647df87dacb6c6abe099587c930ef93412
  Author: florian HENRY <address@hidden>
  Date:   2016-08-05 (Fri, 05 Aug 2016)

  Changed paths:
    M htdocs/fourn/class/fournisseur.commande.class.php
    M htdocs/fourn/commande/dispatch.php

  Log Message:
  -----------
  better management of dispatch status


  Commit: 0176acd08fa98edfe69c3e3836f038233e51bbf3
      
https://github.com/Dolibarr/dolibarr/commit/0176acd08fa98edfe69c3e3836f038233e51bbf3
  Author: florian HENRY <address@hidden>
  Date:   2016-08-05 (Fri, 05 Aug 2016)

  Changed paths:
    M htdocs/fourn/class/fournisseur.commande.class.php

  Log Message:
  -----------
  fix travis


  Commit: 126d9ae6bf8de3a65cac21f1ac260fcb209bcb7f
      
https://github.com/Dolibarr/dolibarr/commit/126d9ae6bf8de3a65cac21f1ac260fcb209bcb7f
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-08-05 (Fri, 05 Aug 2016)

  Changed paths:
    M htdocs/admin/stock.php
    M htdocs/fourn/class/fournisseur.commande.class.php
    M htdocs/fourn/class/fournisseur.commande.dispatch.class.php
    M htdocs/fourn/commande/dispatch.php
    M htdocs/langs/en_US/stocks.lang
    M htdocs/langs/en_US/workflow.lang

  Log Message:
  -----------
  Merge pull request #5586 from 
atm-florian/dev_NEW_ClassOrderDeliverStatusOnStockVentil

NEW : Add workflow to calculated supplier order status on stock dispatch


Compare: 
https://github.com/Dolibarr/dolibarr/compare/bcd055b378f8...126d9ae6bf8d