[Dolibarr-git] [Dolibarr/dolibarr] 6e9b8d: Fix: Missing special code

[Laurent Destailleur]

  Branch: refs/heads/3.5
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 6e9b8dc77a5a6b43230fa817581c4366f928d347
      
https://github.com/Dolibarr/dolibarr/commit/6e9b8dc77a5a6b43230fa817581c4366f928d347
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-12-15 (Sun, 15 Dec 2013)

  Changed paths:
    M htdocs/commande/class/commande.class.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/core/tpl/objectline_edit.tpl.php

  Log Message:
  -----------
  Fix: Missing special code


  Commit: 7864fe3cfdf50e2ebf45948329291ae489007959
      
https://github.com/Dolibarr/dolibarr/commit/7864fe3cfdf50e2ebf45948329291ae489007959
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-12-15 (Sun, 15 Dec 2013)

  Changed paths:
    M htdocs/commande/class/commande.class.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/core/tpl/objectline_edit.tpl.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3.4' into 3.5

Conflicts:
        htdocs/core/tpl/objectline_edit.tpl.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/3c87e1e20d5f...7864fe3cfdf5