[Dolibarr-git] [Dolibarr/dolibarr] c3e8ae: fix translation for showemailing

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: c3e8aec07c6be4e0c315409c34ef65de83b8ee12
      
https://github.com/Dolibarr/dolibarr/commit/c3e8aec07c6be4e0c315409c34ef65de83b8ee12
  Author: Frédéric FRANCE <address@hidden>
  Date:   2019-10-11 (Fri, 11 Oct 2019)

  Changed paths:
    M htdocs/comm/mailing/class/mailing.class.php

  Log Message:
  -----------
  fix translation for showemailing

in lang files, it's ShowEMailing not ShowEmailing


  Commit: a35173973ccd9eee3e44afdb849f1471d121bca8
      
https://github.com/Dolibarr/dolibarr/commit/a35173973ccd9eee3e44afdb849f1471d121bca8
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-10-12 (Sat, 12 Oct 2019)

  Changed paths:
    M htdocs/comm/mailing/class/mailing.class.php

  Log Message:
  -----------
  Merge pull request #12102 from frederic34/patch-13

fix translation for showemailing


  Commit: 45b3d623bbe90e57252377a6f6efc4404bf33a8d
      
https://github.com/Dolibarr/dolibarr/commit/45b3d623bbe90e57252377a6f6efc4404bf33a8d
  Author: Frédéric FRANCE <address@hidden>
  Date:   2019-10-14 (Mon, 14 Oct 2019)

  Changed paths:
    M htdocs/fourn/facture/list.php

  Log Message:
  -----------
  Update list.php


  Commit: 94aa98beed00337c76a0bdd8cacf160a19fd7b27
      
https://github.com/Dolibarr/dolibarr/commit/94aa98beed00337c76a0bdd8cacf160a19fd7b27
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-10-14 (Mon, 14 Oct 2019)

  Changed paths:
    M htdocs/fourn/facture/list.php

  Log Message:
  -----------
  Merge pull request #12131 from frederic34/patch-21

FIX Sort on total without tax on supplier invoices list


  Commit: 65b6bc26ba3d8bced4afaa78ffc8f3b62a049ea1
      
https://github.com/Dolibarr/dolibarr/commit/65b6bc26ba3d8bced4afaa78ffc8f3b62a049ea1
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-10-14 (Mon, 14 Oct 2019)

  Changed paths:
    M htdocs/comm/mailing/class/mailing.class.php
    M htdocs/fourn/facture/list.php

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

Conflicts:
        htdocs/fourn/facture/list.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/540f20c18f7c...65b6bc26ba3d