[Dolibarr-git] [Dolibarr/dolibarr] f8a68b: Fix: Missing translation

[Laurent Destailleur]

  Branch: refs/heads/3.5
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: f8a68b04498de8d42c6a620ae833d0d36ed4fc4c
      
https://github.com/Dolibarr/dolibarr/commit/f8a68b04498de8d42c6a620ae833d0d36ed4fc4c
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-02-04 (Tue, 04 Feb 2014)

  Changed paths:
    M htdocs/compta/sociales/index.php
    M htdocs/compta/tva/index.php

  Log Message:
  -----------
  Fix: Missing translation


  Commit: 7d74d0d3bd7f3888632006984279bee5a57006b3
      
https://github.com/Dolibarr/dolibarr/commit/7d74d0d3bd7f3888632006984279bee5a57006b3
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-02-12 (Wed, 12 Feb 2014)

  Changed paths:
    M htdocs/admin/dict.php

  Log Message:
  -----------
  CFix: The order field for prospect level was not visible making
dictionnary useless.


  Commit: b499efeccfaaebe116dcd0ae968cb9a4af10b2c1
      
https://github.com/Dolibarr/dolibarr/commit/b499efeccfaaebe116dcd0ae968cb9a4af10b2c1
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-02-12 (Wed, 12 Feb 2014)

  Changed paths:
    M htdocs/admin/dict.php
    M htdocs/compta/sociales/index.php
    M htdocs/compta/tva/index.php

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

Conflicts:
        htdocs/compta/sociales/index.php
        htdocs/compta/tva/index.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/ccab2b7af4a8...b499efeccfaa