[Dolibarr-git] [Dolibarr/dolibarr] 20704d: New: classify billed order if invoice billed (work...

[Laurent Destailleur]

  Branch: refs/heads/3.2
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 20704d6a5cfccab551215123fc19a2a47686f4a3
      
https://github.com/Dolibarr/dolibarr/commit/20704d6a5cfccab551215123fc19a2a47686f4a3
  Author: Regis Houssin <address@hidden>
  Date:   2012-07-13 (Fri, 13 Jul 2012)

  Changed paths:
    M htdocs/admin/workflow.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
    M htdocs/langs/en_US/workflow.lang
    M htdocs/langs/fr_FR/workflow.lang

  Log Message:
  -----------
  New: classify billed order if invoice billed (workflow
manager)

Conflicts:
        htdocs/core/class/commonobject.class.php
        htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
        htdocs/langs/en_US/workflow.lang
        htdocs/langs/fr_FR/workflow.lang


  Commit: b801a391a430b0bf0ff773a96a275e39d3a77e20
      
https://github.com/Dolibarr/dolibarr/commit/b801a391a430b0bf0ff773a96a275e39d3a77e20
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-07-13 (Fri, 13 Jul 2012)

  Changed paths:
    M htdocs/webservices/server_thirdparty.php

  Log Message:
  -----------
  Fix: Phone not saved when using web service


  Commit: 9327858bee465fc2ff55f4235f912ad0be2aa93f
      
https://github.com/Dolibarr/dolibarr/commit/9327858bee465fc2ff55f4235f912ad0be2aa93f
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-07-13 (Fri, 13 Jul 2012)

  Changed paths:
    M htdocs/core/class/commonobject.class.php

  Log Message:
  -----------
  Fix: Bad merge


Compare: 
https://github.com/Dolibarr/dolibarr/compare/1af4834f1016...9327858bee46