[Dolibarr-git] [Dolibarr/dolibarr] bba034: ER: traduce code

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: bba0349ab6feeed8a246d762ec4c11a67919c391
      
https://github.com/Dolibarr/dolibarr/commit/bba0349ab6feeed8a246d762ec4c11a67919c391
  Author: aspangaro <address@hidden>
  Date:   2015-05-14 (Thu, 14 May 2015)

  Changed paths:
    M htdocs/core/modules/expensereport/doc/pdf_standard.modules.php

  Log Message:
  -----------
  ER: traduce code


  Commit: 766c58724a450c8eb3c20ee10e68e2bc67c79224
      
https://github.com/Dolibarr/dolibarr/commit/766c58724a450c8eb3c20ee10e68e2bc67c79224
  Author: aspangaro <address@hidden>
  Date:   2015-05-14 (Thu, 14 May 2015)

  Changed paths:
    M htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
    M htdocs/expensereport/card.php
    M htdocs/expensereport/class/expensereport.class.php

  Log Message:
  -----------
  ER: Review & add a totalVAT in pdf


  Commit: 3f5215169a3510c314d193a897a1e36356486491
      
https://github.com/Dolibarr/dolibarr/commit/3f5215169a3510c314d193a897a1e36356486491
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-05-15 (Fri, 15 May 2015)

  Changed paths:
    M htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
    M htdocs/expensereport/card.php
    M htdocs/expensereport/class/expensereport.class.php

  Log Message:
  -----------
  Merge branch 'develop-ER_badge' of https://github.com/aspangaro/dolibarr
into aspangaro-develop-ER_badge

Conflicts:
        htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
        htdocs/expensereport/card.php
        htdocs/expensereport/class/expensereport.class.php


  Commit: 17b736c8ce5c5d07038b948797182ad094cde61b
      
https://github.com/Dolibarr/dolibarr/commit/17b736c8ce5c5d07038b948797182ad094cde61b
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-05-15 (Fri, 15 May 2015)

  Changed paths:
    M htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
    M htdocs/expensereport/card.php
    M htdocs/expensereport/class/expensereport.class.php

  Log Message:
  -----------
  Merge branch 'aspangaro-develop-ER_badge' into develop


  Commit: 49a13f5e728bc8ad6d399d655dc58154fa22fcfa
      
https://github.com/Dolibarr/dolibarr/commit/49a13f5e728bc8ad6d399d655dc58154fa22fcfa
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-05-15 (Fri, 15 May 2015)

  Changed paths:
    M htdocs/expensereport/card.php
    M htdocs/expensereport/class/expensereport.class.php
    M htdocs/install/mysql/migration/3.7.0-3.8.0.sql
    M htdocs/theme/eldy/style.css.php

  Log Message:
  -----------
  Debug of module expense report


Compare: 
https://github.com/Dolibarr/dolibarr/compare/bf883e1576a4...49a13f5e728b