[Dolibarr-git] [Dolibarr/dolibarr] fe9e8a: Fix: Label missing

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: fe9e8aab5e5a11a389fe0a3fed2a65d394ee8230
      
https://github.com/Dolibarr/dolibarr/commit/fe9e8aab5e5a11a389fe0a3fed2a65d394ee8230
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-05-14 (Tue, 14 May 2013)

  Changed paths:
    M htdocs/compta/tva/fiche.php

  Log Message:
  -----------
  Fix: Label missing
Fix: Cancel not working


  Commit: da4f13f387f93b913e20b126bebaa69cf0278f1f
      
https://github.com/Dolibarr/dolibarr/commit/da4f13f387f93b913e20b126bebaa69cf0278f1f
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-05-14 (Tue, 14 May 2013)

  Changed paths:
    M htdocs/core/tpl/ajax/fileupload_main.tpl.php

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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/179fc0a4cb45...da4f13f387f9