[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: |
Sat, 08 Nov 2014 06:02:11 -0800 |
Branch: refs/heads/3.6_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: 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: 41f0920656a8eb26ee40f48a21cbed9362897d73
https://github.com/Dolibarr/dolibarr/commit/41f0920656a8eb26ee40f48a21cbed9362897d73
Author: Laurent Destailleur <address@hidden>
Date: 2014-10-24 (Fri, 24 Oct 2014)
Changed paths:
M build/debian/control
M build/debian/copyright
Log Message:
-----------
Fix for debian
Commit: 1405c03f7d78dc6b65d8c1880dcfde2900cf0d6d
https://github.com/Dolibarr/dolibarr/commit/1405c03f7d78dc6b65d8c1880dcfde2900cf0d6d
Author: aspangaro <address@hidden>
Date: 2014-10-26 (Sun, 26 Oct 2014)
Changed paths:
M ChangeLog
M htdocs/adherents/class/adherent.class.php
M htdocs/adherents/fiche.php
Log Message:
-----------
Fix: Civility & birthdate wasn't save into adherent module
Commit: badf3794894bc81f3873fd53ec5f42b4e2751b56
https://github.com/Dolibarr/dolibarr/commit/badf3794894bc81f3873fd53ec5f42b4e2751b56
Author: Laurent Destailleur <address@hidden>
Date: 2014-10-27 (Mon, 27 Oct 2014)
Changed paths:
M ChangeLog
M htdocs/product/fiche.php
Log Message:
-----------
Fix: [ bug #1618 ] PHP Error thrown when saving a barcode
Commit: d846dd24316acf8f9fc6fce9680b700a013a7de5
https://github.com/Dolibarr/dolibarr/commit/d846dd24316acf8f9fc6fce9680b700a013a7de5
Author: Florian HENRY <address@hidden>
Date: 2014-10-27 (Mon, 27 Oct 2014)
Changed paths:
M htdocs/core/class/extrafields.class.php
Log Message:
-----------
Fix extrafield from list feature where filter is provided
Commit: 834a6dc2af74a4fc482171a8e3c352acb7a54e10
https://github.com/Dolibarr/dolibarr/commit/834a6dc2af74a4fc482171a8e3c352acb7a54e10
Author: Florian HENRY <address@hidden>
Date: 2014-10-28 (Tue, 28 Oct 2014)
Changed paths:
M ChangeLog
M htdocs/webservices/server_thirdparty.php
Log Message:
-----------
webservice Thirdparty parameter lastname for invidual creation is now
lastname and not ref
Commit: c5045a75d8884fe8ce871c3836137b57793be8d5
https://github.com/Dolibarr/dolibarr/commit/c5045a75d8884fe8ce871c3836137b57793be8d5
Author: jfefe <address@hidden>
Date: 2014-10-30 (Thu, 30 Oct 2014)
Changed paths:
M htdocs/langs/en_US/resource.lang
M htdocs/langs/fr_FR/resource.lang
Log Message:
-----------
Missing trans key into resource module
Commit: e370ffb2d44cdd453fde42e48e9955908f073330
https://github.com/Dolibarr/dolibarr/commit/e370ffb2d44cdd453fde42e48e9955908f073330
Author: jfefe <address@hidden>
Date: 2014-10-30 (Thu, 30 Oct 2014)
Changed paths:
M htdocs/resource/class/resource.class.php
Log Message:
-----------
Bad function call
Commit: 106b4a669f203f2791ff1a607ca691d298e4b43d
https://github.com/Dolibarr/dolibarr/commit/106b4a669f203f2791ff1a607ca691d298e4b43d
Author: Laurent Destailleur <address@hidden>
Date: 2014-10-30 (Thu, 30 Oct 2014)
Changed paths:
M htdocs/user/class/user.class.php
Log Message:
-----------
id_parent and id_children was not set.
So introduce new method to return same with no risk to break current
working code to address this.
Commit: 2517d54196107c228269d177dc0592b56e2eec9b
https://github.com/Dolibarr/dolibarr/commit/2517d54196107c228269d177dc0592b56e2eec9b
Author: Laurent Destailleur <address@hidden>
Date: 2014-10-30 (Thu, 30 Oct 2014)
Changed paths:
M htdocs/langs/en_US/resource.lang
M htdocs/langs/fr_FR/resource.lang
M htdocs/resource/class/resource.class.php
Log Message:
-----------
Merge pull request #1989 from aternatik/fix_resource
Missing translate key into resource module
Commit: bb72932601a81e5c3da0e3ea12698280ac7d3cef
https://github.com/Dolibarr/dolibarr/commit/bb72932601a81e5c3da0e3ea12698280ac7d3cef
Author: Laurent Destailleur <address@hidden>
Date: 2014-10-30 (Thu, 30 Oct 2014)
Changed paths:
M ChangeLog
M htdocs/core/class/extrafields.class.php
M htdocs/webservices/server_thirdparty.php
Log Message:
-----------
Merge pull request #1985 from FHenry/3.6
Fix extrafield from list feature where filter is provided
Commit: 5ec2c1c4b30720f1c6201518afcf17e733262ea2
https://github.com/Dolibarr/dolibarr/commit/5ec2c1c4b30720f1c6201518afcf17e733262ea2
Author: Laurent Destailleur <address@hidden>
Date: 2014-10-30 (Thu, 30 Oct 2014)
Changed paths:
M ChangeLog
M htdocs/adherents/class/adherent.class.php
M htdocs/adherents/fiche.php
Log Message:
-----------
Merge branch '3.6-patch' of github.com:aspangaro/dolibarr into
aspangaro-3.6-patch
Conflicts:
ChangeLog
Commit: aac4609f2dacdeb250a9fc49c11269030d3b4f9f
https://github.com/Dolibarr/dolibarr/commit/aac4609f2dacdeb250a9fc49c11269030d3b4f9f
Author: Laurent Destailleur <address@hidden>
Date: 2014-10-30 (Thu, 30 Oct 2014)
Changed paths:
M ChangeLog
M htdocs/adherents/class/adherent.class.php
M htdocs/adherents/fiche.php
Log Message:
-----------
Merge branch 'aspangaro-3.6-patch' into 3.6
Commit: e607a53ca34f2f1c106ead482c5a88c04c9c38de
https://github.com/Dolibarr/dolibarr/commit/e607a53ca34f2f1c106ead482c5a88c04c9c38de
Author: Laurent Destailleur <address@hidden>
Date: 2014-10-30 (Thu, 30 Oct 2014)
Changed paths:
M ChangeLog
M htdocs/core/class/extrafields.class.php
M htdocs/langs/en_US/resource.lang
M htdocs/langs/fr_FR/resource.lang
M htdocs/resource/class/resource.class.php
M htdocs/webservices/server_thirdparty.php
Log Message:
-----------
Merge branch '3.6' of address@hidden:Dolibarr/dolibarr.git into 3.6
Conflicts:
ChangeLog
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: 57f49ec5d4ddcd4b30c24255eb8ac822aa110aad
https://github.com/Dolibarr/dolibarr/commit/57f49ec5d4ddcd4b30c24255eb8ac822aa110aad
Author: aspangaro <address@hidden>
Date: 2014-10-30 (Thu, 30 Oct 2014)
Changed paths:
M htdocs/adherents/admin/adherent_type_extrafields.php
M htdocs/core/class/html.formcron.class.php
M htdocs/core/lib/invoice2.lib.php
M htdocs/install/mssql/functions/functions.sql
M htdocs/resource/class/html.formresource.class.php
Log Message:
-----------
GPLv3
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: 53dfda1413069c1e8f4979a171be5a72053030fa
https://github.com/Dolibarr/dolibarr/commit/53dfda1413069c1e8f4979a171be5a72053030fa
Author: Laurent Destailleur <address@hidden>
Date: 2014-11-01 (Sat, 01 Nov 2014)
Changed paths:
M ChangeLog
M htdocs/core/class/extrafields.class.php
Log Message:
-----------
Fix: Chars - is no more allowed into value for code for extra fields.
Commit: 627f5694f0a71b0b7fdb6a82188d732c54d029b6
https://github.com/Dolibarr/dolibarr/commit/627f5694f0a71b0b7fdb6a82188d732c54d029b6
Author: Laurent Destailleur <address@hidden>
Date: 2014-11-02 (Sun, 02 Nov 2014)
Changed paths:
M htdocs/core/lib/date.lib.php
Log Message:
-----------
Fix: Infinite loop
Commit: ca69bf9d7eb7b611bc09f8b32faaf69531df4edb
https://github.com/Dolibarr/dolibarr/commit/ca69bf9d7eb7b611bc09f8b32faaf69531df4edb
Author: Laurent Destailleur <address@hidden>
Date: 2014-11-02 (Sun, 02 Nov 2014)
Changed paths:
M ChangeLog
Log Message:
-----------
Fix: Infinite loop
Commit: d177a2fbb4b0eebb2586cc8fd562391a68ff5872
https://github.com/Dolibarr/dolibarr/commit/d177a2fbb4b0eebb2586cc8fd562391a68ff5872
Author: Alexis Algoud <address@hidden>
Date: 2014-11-04 (Tue, 04 Nov 2014)
Changed paths:
M htdocs/projet/class/task.class.php
Log Message:
-----------
fix bug on thm
Commit: fd8d571d67d6de5ba55878d68f53af49d7004825
https://github.com/Dolibarr/dolibarr/commit/fd8d571d67d6de5ba55878d68f53af49d7004825
Author: Laurent Destailleur <address@hidden>
Date: 2014-11-04 (Tue, 04 Nov 2014)
Changed paths:
M htdocs/projet/class/task.class.php
Log Message:
-----------
Merge pull request #2003 from atm-alexis/3.6
fix bug on thm
Commit: 420de76b4b8eaa7eb33bac04945e51edcec05152
https://github.com/Dolibarr/dolibarr/commit/420de76b4b8eaa7eb33bac04945e51edcec05152
Author: Laurent Destailleur <address@hidden>
Date: 2014-11-04 (Tue, 04 Nov 2014)
Changed paths:
M htdocs/adherents/admin/adherent_type_extrafields.php
M htdocs/core/class/html.formcron.class.php
M htdocs/core/lib/invoice2.lib.php
M htdocs/install/mssql/functions/functions.sql
M htdocs/resource/class/html.formresource.class.php
Log Message:
-----------
Merge pull request #1993 from aspangaro/3.6-patch
GPLv3
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
Commit: 24439eb1a31208118f7fb6150876f8d8a6c1149f
https://github.com/Dolibarr/dolibarr/commit/24439eb1a31208118f7fb6150876f8d8a6c1149f
Author: Drosis Nikos <address@hidden>
Date: 2014-11-07 (Fri, 07 Nov 2014)
Changed paths:
M htdocs/compta/facture.php
Log Message:
-----------
Fix : tva not coming from multiprice
Commit: c8b5288782c7f69af3a3eed770dff9cd3ee257fc
https://github.com/Dolibarr/dolibarr/commit/c8b5288782c7f69af3a3eed770dff9cd3ee257fc
Author: Laurent Destailleur <address@hidden>
Date: 2014-11-07 (Fri, 07 Nov 2014)
Changed paths:
M htdocs/compta/facture.php
Log Message:
-----------
Merge pull request #2008 from ndrosis/patch-10
Fix : The tva not coming from multi price for invoice
Commit: 92cdef71e814ef21bd1b31ed3ad06af7e6387dab
https://github.com/Dolibarr/dolibarr/commit/92cdef71e814ef21bd1b31ed3ad06af7e6387dab
Author: Laurent Destailleur <address@hidden>
Date: 2014-11-08 (Sat, 08 Nov 2014)
Changed paths:
M htdocs/product/index.php
M htdocs/societe/index.php
Log Message:
-----------
Fix: Graph report rubbish information. Better to have them as option.
Commit: 8cb1818c4ef1b1817ea7c8471d6ce632d09fc9b9
https://github.com/Dolibarr/dolibarr/commit/8cb1818c4ef1b1817ea7c8471d6ce632d09fc9b9
Author: Laurent Destailleur <address@hidden>
Date: 2014-11-08 (Sat, 08 Nov 2014)
Changed paths:
M htdocs/compta/facture.php
Log Message:
-----------
Merge branch '3.6' of address@hidden:Dolibarr/dolibarr.git into 3.6
Commit: acde5c28bd2e21d20a4e65cc8fa2cef4746b3bc8
https://github.com/Dolibarr/dolibarr/commit/acde5c28bd2e21d20a4e65cc8fa2cef4746b3bc8
Author: Laurent Destailleur <address@hidden>
Date: 2014-11-08 (Sat, 08 Nov 2014)
Changed paths:
M ChangeLog
M build/debian/control
M build/debian/copyright
M htdocs/adherents/admin/adherent_type_extrafields.php
M htdocs/adherents/class/adherent.class.php
M htdocs/adherents/fiche.php
M htdocs/compta/facture.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/extrafields.class.php
M htdocs/core/class/html.formcron.class.php
M htdocs/core/lib/date.lib.php
M htdocs/core/lib/invoice2.lib.php
M htdocs/core/modules/action/rapport.pdf.php
M htdocs/install/mssql/functions/functions.sql
M htdocs/langs/en_US/resource.lang
M htdocs/langs/fr_FR/bills.lang
M htdocs/langs/fr_FR/resource.lang
M htdocs/product/fiche.php
M htdocs/product/index.php
M htdocs/projet/class/task.class.php
M htdocs/resource/class/html.formresource.class.php
M htdocs/resource/class/resource.class.php
M htdocs/societe/index.php
M htdocs/user/class/user.class.php
M htdocs/webservices/server_thirdparty.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.6' into 3.6_backported
Conflicts:
htdocs/core/lib/date.lib.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/a98695ffc892...acde5c28bd2e