[Dolibarr-git] [Dolibarr/dolibarr] 9fa37f: Fix: Edit propal line was losing product supplier ...

[Laurent Destailleur]

  Branch: refs/heads/3.4
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 9fa37fc5f156d0e0c8713ca7aed6f26261b89bdb
      
https://github.com/Dolibarr/dolibarr/commit/9fa37fc5f156d0e0c8713ca7aed6f26261b89bdb
  Author: Christophe Battarel <address@hidden>
  Date:   2013-09-08 (Sun, 08 Sep 2013)

  Changed paths:
    M ChangeLog
    M htdocs/comm/propal/class/propal.class.php

  Log Message:
  -----------
  Fix: Edit propal line was losing product supplier price id

Conflicts:
        ChangeLog


  Commit: afe58abdcd73b83416ca9432dc0fca9830740956
      
https://github.com/Dolibarr/dolibarr/commit/afe58abdcd73b83416ca9432dc0fca9830740956
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-09-08 (Sun, 08 Sep 2013)

  Changed paths:
    M ChangeLog
    M htdocs/expedition/class/expedition.class.php
    M htdocs/expedition/fiche.php
    M htdocs/fourn/class/fournisseur.facture.class.php
    M htdocs/fourn/facture/index.php

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

Conflicts:
        ChangeLog


Compare: 
https://github.com/Dolibarr/dolibarr/compare/2d354de549c5...afe58abdcd73