dolibarr-git
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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

From: Laurent Destailleur
Subject: [Dolibarr-git] [Dolibarr/dolibarr] 9c7647: Update bills.lang
Date: Thu, 04 Dec 2014 09:03:28 -0800 
  Branch: refs/heads/3.5_backported
  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: 87fc27c7e649566ebb467dc32af7b65ee623f292
      
https://github.com/Dolibarr/dolibarr/commit/87fc27c7e649566ebb467dc32af7b65ee623f292
  Author: jfefe <address@hidden>
  Date:   2014-10-06 (Mon, 06 Oct 2014)

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

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


  Commit: 6a4468d94ea397695033249d40e73095970fd247
      
https://github.com/Dolibarr/dolibarr/commit/6a4468d94ea397695033249d40e73095970fd247
  Author: jfefe <address@hidden>
  Date:   2014-10-06 (Mon, 06 Oct 2014)

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

  Log Message:
  -----------
  Not need to test if class exists with require_once


  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: 7ed496d7d9e64664fa502dfa8bd6072599665702
      
https://github.com/Dolibarr/dolibarr/commit/7ed496d7d9e64664fa502dfa8bd6072599665702
  Author: Christophe Battarel <address@hidden>
  Date:   2014-11-12 (Wed, 12 Nov 2014)

  Changed paths:
    M htdocs/commande/class/commande.class.php
    M htdocs/compta/facture/class/facture.class.php

  Log Message:
  -----------
  FIX: copy extrafields when creating order from propale and creating
invoice from order


  Commit: 2aeb0f4f5bff12f162db84265b03427ef676734f
      
https://github.com/Dolibarr/dolibarr/commit/2aeb0f4f5bff12f162db84265b03427ef676734f
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-11-15 (Sat, 15 Nov 2014)

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

  Log Message:
  -----------
  Merge pull request #1941 from jfefe/patch-3

Avoid missing class error for fetch_thirdparty method


  Commit: d0dc792b3cd829c6ef86fa555f880ed8400d3deb
      
https://github.com/Dolibarr/dolibarr/commit/d0dc792b3cd829c6ef86fa555f880ed8400d3deb
  Author: Christophe Battarel <address@hidden>
  Date:   2014-11-17 (Mon, 17 Nov 2014)

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

  Log Message:
  -----------
  check extrafields before inserting in DB


  Commit: 7d8cf99d58a61603ae52cc4cf429b505ba9e79d8
      
https://github.com/Dolibarr/dolibarr/commit/7d8cf99d58a61603ae52cc4cf429b505ba9e79d8
  Author: Christophe Battarel <address@hidden>
  Date:   2014-11-19 (Wed, 19 Nov 2014)

  Changed paths:
    M htdocs/margin/agentMargins.php
    M htdocs/margin/customerMargins.php
    M htdocs/margin/productMargins.php

  Log Message:
  -----------
  FIX: bad margin and buy_price calculation when total_ht = 0 (discount
100%) on a line


  Commit: 2f4de2ef75b5feda7efe1f3f0bb7328f788b6400
      
https://github.com/Dolibarr/dolibarr/commit/2f4de2ef75b5feda7efe1f3f0bb7328f788b6400
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-11-22 (Sat, 22 Nov 2014)

  Changed paths:
    M htdocs/commande/class/commande.class.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/core/class/commonobject.class.php

  Log Message:
  -----------
  Merge pull request #2016 from altatof/3.5

FIX: copy extrafields when creating order from propale and creating


  Commit: 891f8d9442d5532dba9a3440c8028caf31ff02c4
      
https://github.com/Dolibarr/dolibarr/commit/891f8d9442d5532dba9a3440c8028caf31ff02c4
  Author: Frédéric FRANCE <address@hidden>
  Date:   2014-11-22 (Sat, 22 Nov 2014)

  Changed paths:
    M htdocs/webservices/server_contact.php

  Log Message:
  -----------
  Fix bug 1692 Can't update phone_pro with the contact webservice


  Commit: 989cd87446522513fd7f886a19803c12200d1fe4
      
https://github.com/Dolibarr/dolibarr/commit/989cd87446522513fd7f886a19803c12200d1fe4
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-11-23 (Sun, 23 Nov 2014)

  Changed paths:
    M htdocs/margin/agentMargins.php
    M htdocs/margin/customerMargins.php
    M htdocs/margin/productMargins.php

  Log Message:
  -----------
  Merge pull request #2066 from altatof/fix_margin_recap

FIX: bad margin and buy_price calculation when total_ht = 0 (discount 100%) on 
a line


  Commit: bd8391163a04ce2a193a472ee31c5196ed8689b6
      
https://github.com/Dolibarr/dolibarr/commit/bd8391163a04ce2a193a472ee31c5196ed8689b6
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-11-23 (Sun, 23 Nov 2014)

  Changed paths:
    M htdocs/webservices/server_contact.php

  Log Message:
  -----------
  Merge pull request #2067 from frederic34/patch-2

Fix bug 1692 Can't update phone_pro with the contact webservice


  Commit: 9e1b0d1abceeaebd96cfeac2c623dd16cec10eeb
      
https://github.com/Dolibarr/dolibarr/commit/9e1b0d1abceeaebd96cfeac2c623dd16cec10eeb
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-12-04 (Thu, 04 Dec 2014)

  Changed paths:
    M ChangeLog
    M build/debian/changelog
    M build/exe/doliwamp/doliwamp.iss
    M build/makepack-howto.txt
    M build/rpm/dolibarr_fedora.spec
    M build/rpm/dolibarr_generic.spec
    M build/rpm/dolibarr_mandriva.spec
    M build/rpm/dolibarr_opensuse.spec
    M htdocs/filefunc.inc.php

  Log Message:
  -----------
  Prepare 3.5.6


  Commit: feae1685cf25e015d32d5d166d4c3299940e84fb
      
https://github.com/Dolibarr/dolibarr/commit/feae1685cf25e015d32d5d166d4c3299940e84fb
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-12-04 (Thu, 04 Dec 2014)

  Changed paths:
    M ChangeLog
    M build/debian/changelog
    M build/exe/doliwamp/doliwamp.iss
    M build/makepack-howto.txt
    M build/rpm/dolibarr_fedora.spec
    M build/rpm/dolibarr_generic.spec
    M build/rpm/dolibarr_mandriva.spec
    M build/rpm/dolibarr_opensuse.spec
    M htdocs/commande/class/commande.class.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/modules/action/rapport.pdf.php
    M htdocs/filefunc.inc.php
    M htdocs/langs/fr_FR/bills.lang
    M htdocs/margin/agentMargins.php
    M htdocs/margin/customerMargins.php
    M htdocs/margin/productMargins.php
    M htdocs/webservices/server_contact.php

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

Conflicts:
        ChangeLog


Compare: 
https://github.com/Dolibarr/dolibarr/compare/913bb0e74ee7...feae1685cf25
reply via email to
[Prev in Thread] Current Thread [Next in Thread]