[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 6adaf2: Fix: Pb when using virtual pr
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 6adaf2: Fix: Pb when using virtual products inside virtual... |
|
Date: |
Tue, 23 Apr 2013 05:05:15 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 6adaf2fa8fde1788ff9392605e795b5732234364
https://github.com/Dolibarr/dolibarr/commit/6adaf2fa8fde1788ff9392605e795b5732234364
Author: Laurent Destailleur <address@hidden>
Date: 2013-04-22 (Mon, 22 Apr 2013)
Changed paths:
M htdocs/product/class/product.class.php
Log Message:
-----------
Fix: Pb when using virtual products inside virtual products
Commit: b9dab6d059d6f3abcd8557ef313171a92b0b964b
https://github.com/Dolibarr/dolibarr/commit/b9dab6d059d6f3abcd8557ef313171a92b0b964b
Author: Laurent Destailleur <address@hidden>
Date: 2013-04-22 (Mon, 22 Apr 2013)
Changed paths:
M htdocs/langs/nl_NL/bills.lang
Log Message:
-----------
Fix: Korting
Commit: 88fe3e86f241a5694329f3395d54121a71135ebf
https://github.com/Dolibarr/dolibarr/commit/88fe3e86f241a5694329f3395d54121a71135ebf
Author: Laurent Destailleur <address@hidden>
Date: 2013-04-22 (Mon, 22 Apr 2013)
Changed paths:
M htdocs/langs/fr_FR/admin.lang
M htdocs/langs/fr_FR/externalsite.lang
Log Message:
-----------
Missing translation
Commit: 63a5aee80e06d7fde214e8af7b8958192fd52779
https://github.com/Dolibarr/dolibarr/commit/63a5aee80e06d7fde214e8af7b8958192fd52779
Author: Regis Houssin <address@hidden>
Date: 2013-04-22 (Mon, 22 Apr 2013)
Changed paths:
M htdocs/comm/action/document.php
M htdocs/core/class/fileupload.class.php
M htdocs/projet/class/task.class.php
M htdocs/projet/tasks/document.php
Log Message:
-----------
Fix: broken features for fileupload
Commit: 7883e4f0ebd8e2f3900f273b1d8440e5521495ac
https://github.com/Dolibarr/dolibarr/commit/7883e4f0ebd8e2f3900f273b1d8440e5521495ac
Author: Regis Houssin <address@hidden>
Date: 2013-04-22 (Mon, 22 Apr 2013)
Changed paths:
M htdocs/product/class/product.class.php
Log Message:
-----------
Merge branch '3.3' of address@hidden:Dolibarr/dolibarr.git into 3.3
Commit: 5ccb4108d4d8bdbd9645d47406a6496be73a8deb
https://github.com/Dolibarr/dolibarr/commit/5ccb4108d4d8bdbd9645d47406a6496be73a8deb
Author: Regis Houssin <address@hidden>
Date: 2013-04-22 (Mon, 22 Apr 2013)
Changed paths:
M htdocs/comm/action/document.php
Log Message:
-----------
Fix: merge problem
Commit: ccf809b14aca83272451863534d767dc80291df1
https://github.com/Dolibarr/dolibarr/commit/ccf809b14aca83272451863534d767dc80291df1
Author: Regis Houssin <address@hidden>
Date: 2013-04-22 (Mon, 22 Apr 2013)
Changed paths:
M htdocs/compta/sociales/class/chargesociales.class.php
M htdocs/compta/sociales/document.php
M htdocs/core/class/fileupload.class.php
Log Message:
-----------
Fix: broken features
Commit: 7217d91f132b76b14ccaf5541e07e23755fd13ee
https://github.com/Dolibarr/dolibarr/commit/7217d91f132b76b14ccaf5541e07e23755fd13ee
Author: Regis Houssin <address@hidden>
Date: 2013-04-22 (Mon, 22 Apr 2013)
Changed paths:
M htdocs/core/class/fileupload.class.php
Log Message:
-----------
Fix: missing commit
Commit: f8ddd69ccbb84db596f31b7a08b46fd2bd6f3d17
https://github.com/Dolibarr/dolibarr/commit/f8ddd69ccbb84db596f31b7a08b46fd2bd6f3d17
Author: Regis Houssin <address@hidden>
Date: 2013-04-22 (Mon, 22 Apr 2013)
Changed paths:
M htdocs/admin/dict.php
Log Message:
-----------
FIXME regresion if code with not in numeric base
Commit: 83e873dd240a1cfa9fdb6448dd7bd3f3b918e57f
https://github.com/Dolibarr/dolibarr/commit/83e873dd240a1cfa9fdb6448dd7bd3f3b918e57f
Author: Laurent Destailleur <address@hidden>
Date: 2013-04-22 (Mon, 22 Apr 2013)
Changed paths:
M htdocs/admin/dict.php
M htdocs/comm/action/document.php
M htdocs/compta/sociales/class/chargesociales.class.php
M htdocs/compta/sociales/document.php
M htdocs/core/class/fileupload.class.php
M htdocs/projet/class/task.class.php
M htdocs/projet/tasks/document.php
Log Message:
-----------
Merge branch '3.3' of address@hidden:Dolibarr/dolibarr.git into 3.3
Commit: c8b2ce3d8ec9f4271e380257bd1728c4ddac4d93
https://github.com/Dolibarr/dolibarr/commit/c8b2ce3d8ec9f4271e380257bd1728c4ddac4d93
Author: Laurent Destailleur <address@hidden>
Date: 2013-04-22 (Mon, 22 Apr 2013)
Changed paths:
M htdocs/core/modules/modBanque.class.php
Log Message:
-----------
Removed warning
Commit: ff3b2933a817df4255b3448cbe8ed84ad46871cd
https://github.com/Dolibarr/dolibarr/commit/ff3b2933a817df4255b3448cbe8ed84ad46871cd
Author: Laurent Destailleur <address@hidden>
Date: 2013-04-23 (Tue, 23 Apr 2013)
Changed paths:
M test/phpunit/DateLibTest.php
Log Message:
-----------
Fix: Removed bad test
Commit: 3f1f065d4ecb212bc5b4825dc059ffdbac474aee
https://github.com/Dolibarr/dolibarr/commit/3f1f065d4ecb212bc5b4825dc059ffdbac474aee
Author: Laurent Destailleur <address@hidden>
Date: 2013-04-23 (Tue, 23 Apr 2013)
Changed paths:
M htdocs/core/modules/syslog/mod_syslog_file.php
Log Message:
-----------
Fix: log must use the mask defined into setup
Conflicts:
htdocs/core/modules/syslog/mod_syslog_file.php
Commit: dbc2eddcbacbb4721ff61d0fba3160dac3da8c4d
https://github.com/Dolibarr/dolibarr/commit/dbc2eddcbacbb4721ff61d0fba3160dac3da8c4d
Author: Laurent Destailleur <address@hidden>
Date: 2013-04-23 (Tue, 23 Apr 2013)
Changed paths:
M build/debian/changelog
M build/doxygen/dolibarr-doxygen.doxyfile
M build/exe/doliwamp/doliwamp.iss
M build/makepack-dolibarr.pl
M build/makepack-howto.txt
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 for 3.3.2
Commit: 8f502b8cfc2dec020ce7d33c0e01398bc9512b66
https://github.com/Dolibarr/dolibarr/commit/8f502b8cfc2dec020ce7d33c0e01398bc9512b66
Author: Laurent Destailleur <address@hidden>
Date: 2013-04-23 (Tue, 23 Apr 2013)
Changed paths:
M build/debian/README.howto
M build/debian/po/fr.po
M build/debian/po/templates.pot
M build/debian/rules
M build/makepack-dolibarr.pl
Log Message:
-----------
Prepare 3.3.2
Commit: 624a039eaf08f23b6292995b58497d36ecacbad1
https://github.com/Dolibarr/dolibarr/commit/624a039eaf08f23b6292995b58497d36ecacbad1
Author: Laurent Destailleur <address@hidden>
Date: 2013-04-23 (Tue, 23 Apr 2013)
Changed paths:
M build/debian/README.howto
Log Message:
-----------
Update debian doc
Commit: 57ab4fb7983ea517d551bb899781cb1185fe42df
https://github.com/Dolibarr/dolibarr/commit/57ab4fb7983ea517d551bb899781cb1185fe42df
Author: Laurent Destailleur <address@hidden>
Date: 2013-04-23 (Tue, 23 Apr 2013)
Changed paths:
M build/launchpad/README
Log Message:
-----------
Fix doc
Commit: 365a5e18e859148e532b57c21ab503628b7637de
https://github.com/Dolibarr/dolibarr/commit/365a5e18e859148e532b57c21ab503628b7637de
Author: Laurent Destailleur <address@hidden>
Date: 2013-04-23 (Tue, 23 Apr 2013)
Changed paths:
M build/launchpad/README
Log Message:
-----------
Prepare 3.3.2
Commit: 7dce8d230625aa17aa437c2d2615678a8bfda6ed
https://github.com/Dolibarr/dolibarr/commit/7dce8d230625aa17aa437c2d2615678a8bfda6ed
Author: Laurent Destailleur <address@hidden>
Date: 2013-04-23 (Tue, 23 Apr 2013)
Changed paths:
M build/debian/README.howto
M build/debian/changelog
M build/debian/po/fr.po
M build/debian/po/templates.pot
M build/debian/rules
M build/launchpad/README
M build/makepack-dolibarr.pl
M build/makepack-howto.txt
M build/perl/virtualmin/dolibarr.pl
M htdocs/core/modules/modBanque.class.php
M htdocs/core/modules/syslog/mod_syslog_file.php
M htdocs/filefunc.inc.php
M htdocs/langs/fr_FR/admin.lang
M htdocs/langs/fr_FR/externalsite.lang
M htdocs/langs/nl_NL/bills.lang
M test/phpunit/DateLibTest.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.3' into develop
Conflicts:
build/debian/changelog
build/doxygen/dolibarr-doxygen.doxyfile
build/exe/doliwamp/doliwamp.iss
build/launchpad/README
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/core/modules/syslog/mod_syslog_file.php
htdocs/filefunc.inc.php
htdocs/product/class/product.class.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/39d3d1a34e7c...7dce8d230625