[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] fb0a99:
From: |
Laurent Destailleur |
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] fb0a99: |
Date: |
Tue, 25 Jun 2013 14:22:09 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: fb0a99cb55f75eae9efa6b9679222649c9e16864
https://github.com/Dolibarr/dolibarr/commit/fb0a99cb55f75eae9efa6b9679222649c9e16864
Author: Florian Henry <address@hidden>
Date: 2013-06-13 (Thu, 13 Jun 2013)
Changed paths:
M ChangeLog
M htdocs/compta/facture/class/facture-rec.class.php
Log Message:
-----------
Fix [ bug #934 ] Impossible de créer une facture prédéfinie (pgsql)
Commit: c92471d40b8c3681ab17ce83ff9b1ae7ee9ca9c9
https://github.com/Dolibarr/dolibarr/commit/c92471d40b8c3681ab17ce83ff9b1ae7ee9ca9c9
Author: Laurent Destailleur <address@hidden>
Date: 2013-06-13 (Thu, 13 Jun 2013)
Changed paths:
M ChangeLog
M htdocs/compta/facture/class/facture-rec.class.php
Log Message:
-----------
Merge pull request #1043 from FHenry/3.3
Fix [ bug #934 ] Impossible de créer une facture prédéfinie (pgsql)
Commit: 676191c1f9a54c4cee32d6f0ce1ce07448403420
https://github.com/Dolibarr/dolibarr/commit/676191c1f9a54c4cee32d6f0ce1ce07448403420
Author: Marcos García <address@hidden>
Date: 2013-06-19 (Wed, 19 Jun 2013)
Changed paths:
M ChangeLog
M htdocs/comm/propal.php
Log Message:
-----------
Fix: [ bug #947 ] Can't create proposal lines with unit price = 0
Commit: 76d9ba6a431281029dcf37ab98092ebef04cf4a0
https://github.com/Dolibarr/dolibarr/commit/76d9ba6a431281029dcf37ab98092ebef04cf4a0
Author: Marcos García <address@hidden>
Date: 2013-06-19 (Wed, 19 Jun 2013)
Changed paths:
M htdocs/langs/es_ES/categories.lang
Log Message:
-----------
Fixed es_ES translation typo
Commit: ee1e266774e6ae54fbca61e9efe6121226762374
https://github.com/Dolibarr/dolibarr/commit/ee1e266774e6ae54fbca61e9efe6121226762374
Author: Florian Henry <address@hidden>
Date: 2013-06-19 (Wed, 19 Jun 2013)
Changed paths:
M htdocs/langs/fr_FR/holiday.lang
Log Message:
-----------
Fix trad holidays module
Commit: 9518cb7836fbddbe25f465875475086ebe0aa923
https://github.com/Dolibarr/dolibarr/commit/9518cb7836fbddbe25f465875475086ebe0aa923
Author: Laurent Destailleur <address@hidden>
Date: 2013-06-19 (Wed, 19 Jun 2013)
Changed paths:
M ChangeLog
M htdocs/comm/propal.php
Log Message:
-----------
Merge pull request #1058 from marcosgdf/bug-947
Fix: [ bug #947 ] Can't create proposal lines with unit price = 0
Commit: d6d7665e65f8e997b507c0a4f0d01d7b3f0bb3d5
https://github.com/Dolibarr/dolibarr/commit/d6d7665e65f8e997b507c0a4f0d01d7b3f0bb3d5
Author: Laurent Destailleur <address@hidden>
Date: 2013-06-19 (Wed, 19 Jun 2013)
Changed paths:
M htdocs/langs/es_ES/categories.lang
Log Message:
-----------
Merge pull request #1059 from marcosgdf/translations
Fixed es_ES translation typo
Commit: ad49f965d5089c04c1e14532cfb511cbdad1ff4d
https://github.com/Dolibarr/dolibarr/commit/ad49f965d5089c04c1e14532cfb511cbdad1ff4d
Author: Laurent Destailleur <address@hidden>
Date: 2013-06-19 (Wed, 19 Jun 2013)
Changed paths:
M htdocs/langs/fr_FR/holiday.lang
Log Message:
-----------
Merge pull request #1060 from FHenry/3.3
Fix trad holidays module
Commit: 7f3a06127a34eb95121e9e5c026c4e64f324bbf2
https://github.com/Dolibarr/dolibarr/commit/7f3a06127a34eb95121e9e5c026c4e64f324bbf2
Author: Laurent Destailleur <address@hidden>
Date: 2013-06-24 (Mon, 24 Jun 2013)
Changed paths:
M htdocs/public/paybox/paymentko.php
M htdocs/public/paybox/paymentok.php
M htdocs/public/paypal/paymentko.php
M htdocs/public/paypal/paymentok.php
Log Message:
-----------
Fix: Bad regex
Commit: 065b30f0d0a9b6d8c8da078f288a148677240ae5
https://github.com/Dolibarr/dolibarr/commit/065b30f0d0a9b6d8c8da078f288a148677240ae5
Author: simnandez <address@hidden>
Date: 2013-06-25 (Tue, 25 Jun 2013)
Changed paths:
M ChangeLog
M htdocs/core/lib/functions.lib.php
Log Message:
-----------
[Bug #958] LocalTax2 for Spain fails on Suppliers
Commit: c2654fa7e25ffbc75f8b81afbd6f8d52501f7509
https://github.com/Dolibarr/dolibarr/commit/c2654fa7e25ffbc75f8b81afbd6f8d52501f7509
Author: Laurent Destailleur <address@hidden>
Date: 2013-06-25 (Tue, 25 Jun 2013)
Changed paths:
M htdocs/core/lib/project.lib.php
M htdocs/langs/en_US/projects.lang
M htdocs/langs/fr_FR/projects.lang
Log Message:
-----------
Fix: Bad translation. Must use a different string than products
Commit: 54bf3fd51614d04fec9dccc3b329c7ec320c87ff
https://github.com/Dolibarr/dolibarr/commit/54bf3fd51614d04fec9dccc3b329c7ec320c87ff
Author: jfefe <address@hidden>
Date: 2013-06-25 (Tue, 25 Jun 2013)
Changed paths:
M htdocs/core/lib/files.lib.php
M htdocs/webservices/server_other.php
Log Message:
-----------
Add parameter to force user in dol_check_access_document function
This required by webservice where global $user is not available
Commit: 285ea8da3f0eadd3c562b3d00583c5e8a4e6de5a
https://github.com/Dolibarr/dolibarr/commit/285ea8da3f0eadd3c562b3d00583c5e8a4e6de5a
Author: Laurent Destailleur <address@hidden>
Date: 2013-06-25 (Tue, 25 Jun 2013)
Changed paths:
M htdocs/core/db/pgsql.class.php
M htdocs/core/modules/DolibarrModules.class.php
Log Message:
-----------
More info into log
Commit: f89860e0c4039475dfb08ad8d0bdf67310c43651
https://github.com/Dolibarr/dolibarr/commit/f89860e0c4039475dfb08ad8d0bdf67310c43651
Author: Laurent Destailleur <address@hidden>
Date: 2013-06-25 (Tue, 25 Jun 2013)
Changed paths:
M htdocs/core/lib/files.lib.php
M htdocs/webservices/server_other.php
Log Message:
-----------
Merge pull request #1067 from jfefe/3.4-fixfuser
Add parameter to force user in dol_check_access_document function
Commit: 0ec4b3bcdbd7f167b3c1d9053b5f53b63d5742be
https://github.com/Dolibarr/dolibarr/commit/0ec4b3bcdbd7f167b3c1d9053b5f53b63d5742be
Author: Laurent Destailleur <address@hidden>
Date: 2013-06-25 (Tue, 25 Jun 2013)
Changed paths:
M htdocs/core/lib/files.lib.php
M htdocs/webservices/server_other.php
Log Message:
-----------
Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4
Commit: 187feff7d5eb21e24e60000fae6136b74658fb10
https://github.com/Dolibarr/dolibarr/commit/187feff7d5eb21e24e60000fae6136b74658fb10
Author: Laurent Destailleur <address@hidden>
Date: 2013-06-25 (Tue, 25 Jun 2013)
Changed paths:
M build/debian/changelog
M build/exe/doliwamp/doliwamp.iss
M build/makepack-dolibarr.pl
M build/perl/virtualmin/dolibarr.pl
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.3.3
Commit: 2af8f295b12f525cc37fafdc2a472d8e2abbdb50
https://github.com/Dolibarr/dolibarr/commit/2af8f295b12f525cc37fafdc2a472d8e2abbdb50
Author: Laurent Destailleur <address@hidden>
Date: 2013-06-25 (Tue, 25 Jun 2013)
Changed paths:
M htdocs/admin/index.php
M htdocs/core/menus/standard/eldy.lib.php
Log Message:
-----------
Fix: warning not always visible. Depends if addon modules were
installed. Var should provide a quick fix.
Commit: 8359a34545fd8cbec9879868a34523141be09cbe
https://github.com/Dolibarr/dolibarr/commit/8359a34545fd8cbec9879868a34523141be09cbe
Author: Laurent Destailleur <address@hidden>
Date: 2013-06-25 (Tue, 25 Jun 2013)
Changed paths:
M ChangeLog
M build/perl/virtualmin/dolibarr.pl
M htdocs/admin/index.php
M htdocs/comm/propal.php
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/langs/es_ES/categories.lang
Log Message:
-----------
Merge remote-tracking branch 'origin/3.3' into 3.4
Conflicts:
ChangeLog
build/debian/changelog
build/exe/doliwamp/doliwamp.iss
build/makepack-dolibarr.pl
build/perl/virtualmin/dolibarr.pl
build/rpm/dolibarr_fedora.spec
build/rpm/dolibarr_generic.spec
build/rpm/dolibarr_mandriva.spec
build/rpm/dolibarr_opensuse.spec
htdocs/compta/facture/class/facture-rec.class.php
htdocs/core/menus/standard/eldy.lib.php
htdocs/filefunc.inc.php
Commit: af4651f1a27af5f8ec2e9179b9516a79fbacf493
https://github.com/Dolibarr/dolibarr/commit/af4651f1a27af5f8ec2e9179b9516a79fbacf493
Author: Laurent Destailleur <address@hidden>
Date: 2013-06-25 (Tue, 25 Jun 2013)
Changed paths:
M ChangeLog
M build/perl/virtualmin/dolibarr.pl
M htdocs/admin/index.php
M htdocs/comm/propal.php
M htdocs/core/db/pgsql.class.php
M htdocs/core/lib/files.lib.php
M htdocs/core/lib/project.lib.php
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/core/modules/DolibarrModules.class.php
M htdocs/langs/en_US/projects.lang
M htdocs/langs/es_ES/categories.lang
M htdocs/langs/fr_FR/projects.lang
M htdocs/webservices/server_other.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.4' into develop
Conflicts:
build/perl/virtualmin/dolibarr.pl
htdocs/core/lib/files.lib.php
htdocs/langs/en_US/projects.lang
htdocs/langs/fr_FR/projects.lang
htdocs/public/paybox/paymentko.php
htdocs/public/paybox/paymentok.php
htdocs/public/paypal/paymentko.php
htdocs/public/paypal/paymentok.php
htdocs/webservices/server_other.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/92306ca24294...af4651f1a27a