[Dolibarr-git] [Dolibarr/dolibarr] 5e2261: handle customer orders from supplier orders with i...

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 5e2261c9bd53d45e8746fc2215533d3f26a422b1
      
https://github.com/Dolibarr/dolibarr/commit/5e2261c9bd53d45e8746fc2215533d3f26a422b1
  Author: abb <address@hidden>
  Date:   2016-02-26 (Fri, 26 Feb 2016)

  Changed paths:
    M htdocs/fourn/commande/card.php

  Log Message:
  -----------
  handle customer orders from supplier orders with id variable name correction

Conflicts:
        htdocs/fourn/commande/card.php


  Commit: 4cbc1539b99dcfb3460fc1e816d508bbffd44360
      
https://github.com/Dolibarr/dolibarr/commit/4cbc1539b99dcfb3460fc1e816d508bbffd44360
  Author: Bahfir Abbes <address@hidden>
  Date:   2016-02-26 (Fri, 26 Feb 2016)

  Changed paths:
    M htdocs/fourn/commande/card.php

  Log Message:
  -----------
  Fix: displays error when the supplier price does not exist.


  Commit: 8a8e7cdf5e72eae8cd1bc0492279db8195c741bb
      
https://github.com/Dolibarr/dolibarr/commit/8a8e7cdf5e72eae8cd1bc0492279db8195c741bb
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-05-05 (Thu, 05 May 2016)

  Changed paths:
    M htdocs/fourn/commande/card.php

  Log Message:
  -----------
  Merge pull request #4686 from bafbes/abb-10

New + Fix : handle supplier orders from customer orders with id variable name 
correction


Compare: 
https://github.com/Dolibarr/dolibarr/compare/461f62c200f9...8a8e7cdf5e72