[Dolibarr-git] [Dolibarr/dolibarr] 9c7647: Update bills.lang

[Laurent Destailleur]

  Branch: refs/heads/3.6
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 9c7647a7aeb8778faa5361dbd97cc765476b03c8
      
https://github.com/Dolibarr/dolibarr/commit/9c7647a7aeb8778faa5361dbd97cc765476b03c8
  Author: astebert <address@hidden>
  Date:   2014-08-12 (Tue, 12 Aug 2014)

  Changed paths:
    M htdocs/langs/fr_FR/bills.lang

  Log Message:
  -----------
  Update bills.lang

Ligne 252 : Changement grammatical
- de "Paiements issue de l'acompte"
- en "Paiement issu de l'acompte"


  Commit: 0b2a81f4b82f30c32c1225749ed8954b8e16ff60
      
https://github.com/Dolibarr/dolibarr/commit/0b2a81f4b82f30c32c1225749ed8954b8e16ff60
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-08-14 (Thu, 14 Aug 2014)

  Changed paths:
    M htdocs/langs/fr_FR/bills.lang

  Log Message:
  -----------
  Merge pull request #1821 from astebert/patch-1

Update bills.lang


  Commit: 104592b349bfe241907266a51361d48413b62f72
      
https://github.com/Dolibarr/dolibarr/commit/104592b349bfe241907266a51361d48413b62f72
  Author: Regis Houssin <address@hidden>
  Date:   2014-10-12 (Sun, 12 Oct 2014)

  Changed paths:
    M htdocs/core/class/translate.class.php

  Log Message:
  -----------
  Fix: wrong function name


  Commit: 756b1d31ad24a7908a875e180ebc7a759ef31311
      
https://github.com/Dolibarr/dolibarr/commit/756b1d31ad24a7908a875e180ebc7a759ef31311
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-10-16 (Thu, 16 Oct 2014)

  Changed paths:
    M htdocs/core/lib/functions.lib.php

  Log Message:
  -----------
  Add function dolEscapeXML


  Commit: efa171819a80a2e5d576a6b84cc9c2fd1ae4646b
      
https://github.com/Dolibarr/dolibarr/commit/efa171819a80a2e5d576a6b84cc9c2fd1ae4646b
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-10-16 (Thu, 16 Oct 2014)

  Changed paths:
    M htdocs/core/class/translate.class.php
    M htdocs/cron/card.php
    M htdocs/cron/list.php

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


  Commit: a94f7dc3ad0ca782941c5c9129828e2c32f9524d
      
https://github.com/Dolibarr/dolibarr/commit/a94f7dc3ad0ca782941c5c9129828e2c32f9524d
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-10-16 (Thu, 16 Oct 2014)

  Changed paths:
    M htdocs/core/lib/functions.lib.php

  Log Message:
  -----------
  Revert "Add function dolEscapeXML"

This reverts commit 756b1d31ad24a7908a875e180ebc7a759ef31311.


  Commit: 29db45c76330900046cb456de645357f17f6a107
      
https://github.com/Dolibarr/dolibarr/commit/29db45c76330900046cb456de645357f17f6a107
  Author: jfefe <address@hidden>
  Date:   2014-10-23 (Thu, 23 Oct 2014)

  Changed paths:
    M htdocs/core/class/commonobject.class.php

  Log Message:
  -----------
   Avoid missing class error for fetch_thirdparty method


  Commit: aac24c887f992fdd8c9a9db5ec9354b52a58290e
      
https://github.com/Dolibarr/dolibarr/commit/aac24c887f992fdd8c9a9db5ec9354b52a58290e
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-10-30 (Thu, 30 Oct 2014)

  Changed paths:
    M htdocs/core/class/commonobject.class.php

  Log Message:
  -----------
  Merge pull request #1973 from jfefe/patch-6

 Avoid missing class error for fetch_thirdparty method


  Commit: e3041f45ee9f61dccfdfed370acbd97ce9364656
      
https://github.com/Dolibarr/dolibarr/commit/e3041f45ee9f61dccfdfed370acbd97ce9364656
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-10-30 (Thu, 30 Oct 2014)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Update changelog


  Commit: ccddf0d1bee301e91b65128ff757dfbe997683ae
      
https://github.com/Dolibarr/dolibarr/commit/ccddf0d1bee301e91b65128ff757dfbe997683ae
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2014-10-31 (Fri, 31 Oct 2014)

  Changed paths:
    M htdocs/core/modules/action/rapport.pdf.php

  Log Message:
  -----------
  Fix : actioncomme report was not filtering by entity...


  Commit: 45d57b049205f25bf99b110248927b8e1ab8a989
      
https://github.com/Dolibarr/dolibarr/commit/45d57b049205f25bf99b110248927b8e1ab8a989
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-11-04 (Tue, 04 Nov 2014)

  Changed paths:
    M htdocs/core/modules/action/rapport.pdf.php

  Log Message:
  -----------
  Merge pull request #1995 from atm-maxime/3.4

Fix : actioncomme report was not filtering by entity...


  Commit: 606a3f9917ba2d4ae52054a1704fdab0f39ded9b
      
https://github.com/Dolibarr/dolibarr/commit/606a3f9917ba2d4ae52054a1704fdab0f39ded9b
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-11-04 (Tue, 04 Nov 2014)

  Changed paths:
    M htdocs/core/modules/action/rapport.pdf.php
    M htdocs/langs/fr_FR/bills.lang

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


  Commit: 31c38cedbc4119965d02bb2d9b844791e6f90f30
      
https://github.com/Dolibarr/dolibarr/commit/31c38cedbc4119965d02bb2d9b844791e6f90f30
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-11-05 (Wed, 05 Nov 2014)

  Changed paths:
    M htdocs/core/lib/date.lib.php

  Log Message:
  -----------
  Fix: checkstyle


  Commit: 4f084080653a31d43a40da11640485769df97e3d
      
https://github.com/Dolibarr/dolibarr/commit/4f084080653a31d43a40da11640485769df97e3d
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-11-05 (Wed, 05 Nov 2014)

  Changed paths:
    M ChangeLog
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/modules/action/rapport.pdf.php
    M htdocs/langs/fr_FR/bills.lang

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

Conflicts:
        ChangeLog
        htdocs/core/class/commonobject.class.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/420de76b4b8e...4f084080653a