Commit Graph

35076 Commits

Author SHA1 Message Date
Laurent Destailleur
c84427bd22 Fix: delete of files with [ and glob.
Conflicts:
	test/phpunit/FilesLibTest.php
2013-04-30 22:52:56 +02:00
Regis Houssin
f8b133dad4 Merge pull request #907 from FHenry/3.3
[ bug #865 ] Dolibarr navigation array in project/task do not work
2013-04-30 09:12:20 -07:00
fhenry
59f218ab42 [ bug #865 ] Dolibarr navigation array in project/task do not work 2013-04-30 16:00:30 +02:00
Juanjo Menent
74abde0233 Merge pull request #902 from marcosgdf/3.3
Removed duplicated changelog entries and ordered fixes by bug ID
2013-04-30 03:02:34 -07:00
Laurent Destailleur
4a9ed428f0 Fix: isset on scalar value 2013-04-30 09:58:30 +02:00
Marcos García
947bda1af8 Removed duplicated entries and ordered fixes by bug ID 2013-04-29 21:37:25 +02:00
Laurent Destailleur
4274a1aa21 Merge pull request #897 from grandoc/3.3
fix some indefined index
2013-04-29 10:27:25 -07:00
simnandez
fd85755461 Fix: [ bug #855 ] Holiday approval email in French 2013-04-29 12:55:14 +02:00
simnandez
00adb1b9ab Fix: [ bug #855 ] Holiday approval email in French 2013-04-29 12:46:07 +02:00
Grand Philippe
63c474e2cc fix: Undefined index 2013-04-28 22:29:50 +02:00
Grand Philippe
c4a064d104 fix: Undefined property: mod_codeclient_monkey::$prefixIsRequired 2013-04-28 19:35:10 +02:00
Grand Philippe
1d52d50ac1 fix: issue from last commit 2013-04-28 12:17:04 +02:00
Grand Philippe
0661f9f1f8 fix: Assigning the return value of new by reference is deprecated 2013-04-28 10:40:25 +02:00
Grand Philippe
647956576d fix some indefined index 2013-04-28 08:21:46 +02:00
Laurent Destailleur
89eec9bfbd Merge pull request #896 from marcosgdf/bug-856
Fix: [bug #856] Mail error if destination user doesn't have an email
2013-04-27 17:59:37 -07:00
Marcos García
54fc731df7 Fix: [bug #856] Mail error if destination user doesn't have an email 2013-04-28 01:58:57 +02:00
Laurent Destailleur
de1f53db45 Merge pull request #894 from marcosgdf/holidays-translations
Holidays translations
2013-04-27 12:54:16 -07:00
Laurent Destailleur
f8e0f40ffa Merge pull request #891 from marcosgdf/bug-857
Fix: [ bug #857 ] Invoice created from shipment does not have the order ...
2013-04-27 12:53:55 -07:00
Laurent Destailleur
ab668f0f07 Merge pull request #892 from marcosgdf/expedition-translations
Corrected incorrect lang trans key
2013-04-27 12:51:52 -07:00
Marcos García
0672d10a3f Fixed typos 2013-04-27 14:54:03 +02:00
Marcos García
bd2b363e40 Modified traslation keys to reflect expected translation 2013-04-27 14:50:14 +02:00
Marcos García
8e7b72d09e Fixed incorrect translations in holidays module 2013-04-27 14:42:37 +02:00
Marcos García
7a115a9216 Expedition class name was not being translated when creating invoice from it 2013-04-27 13:55:20 +02:00
Marcos García
ecaea4c575 Corrected incorrect lang trans key 2013-04-27 13:51:05 +02:00
Marcos García
1065645fb6 Fix: [ bug #857 ] Invoice created from shipment does not have the order discount 2013-04-27 13:45:25 +02:00
Laurent Destailleur
24309a7f17 Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3 2013-04-27 12:25:22 +02:00
Laurent Destailleur
3203283fe9 Fix: remove warning 2013-04-27 12:24:48 +02:00
Laurent Destailleur
b1cf0b9a76 Merge pull request #889 from marcosgdf/translations
Corrected translation key
2013-04-26 13:04:27 -07:00
Laurent Destailleur
44a1120c06 Merge pull request #888 from FHenry/3.3
Fix bug Pgsql
2013-04-26 13:04:17 -07:00
Marcos García
652e0c1b5f Corrected translation key 2013-04-26 17:19:14 +02:00
Regis Houssin
c0a3271d76 Fix: bypass the second test if the first is ok 2013-04-26 16:28:54 +02:00
Regis Houssin
c969d17e48 Fix: avoid error 2013-04-26 16:22:14 +02:00
Regis Houssin
36e6269b24 Fix: big security problem with multicompany 2013-04-26 16:08:02 +02:00
fhenry
b67faf1eb1 Fix PgSQL 2013-04-26 13:01:42 +02:00
fhenry
4ff5922a55 Fix pgSQL bug 2013-04-26 12:53:13 +02:00
fhenry
9e1487fc61 Fix bug Pgsql 2013-04-26 12:44:21 +02:00
Regis Houssin
016b4a2baa Fix: security problem with multicompany 2013-04-26 12:35:31 +02:00
Laurent Destailleur
ed5a00a79d Merge pull request #880 from FHenry/3.3
fix [ bug #850 ] Dolibarr PGSQL
2013-04-25 13:40:14 -07:00
Regis Houssin
d162a61d41 Fix: use $conf->entity if defined 2013-04-25 15:52:33 +02:00
Regis Houssin
2f72bbca5a Fix: broken features with multicompany 2013-04-25 15:47:41 +02:00
fhenry
733ff62ec8 Merge branch '3.3' of https://github.com/Dolibarr/dolibarr.git into 3.3 2013-04-25 12:56:12 +02:00
fhenry
bc7015a431 fix [ bug #850 ] Dolibarr PGSQL 2013-04-25 12:55:40 +02:00
Laurent Destailleur
521929b740 Merge pull request #878 from FHenry/3.3
[ bug #849 ] BUG PGSQL
2013-04-25 01:24:55 -07:00
fhenry
4badcf5a75 Merge branch '3.3' of https://github.com/Dolibarr/dolibarr.git into 3.3 2013-04-24 23:19:22 +02:00
fhenry
cd7f94d515 [ bug #849 ] BUG PGSQL 2013-04-24 23:19:01 +02:00
Laurent Destailleur
b2129a519d Merge pull request #875 from grandoc/3.3
fix undefined offset
2013-04-24 09:03:04 -07:00
simnandez
436b6259c0 Fix: finish merge 2013-04-24 16:57:46 +02:00
Grand Philippe
026195689b fix undefined offset 2013-04-24 15:22:37 +02:00
Laurent Destailleur
08808c58cd Prepare 3.3.2 2013-04-24 14:46:50 +02:00
Laurent Destailleur
fb1c306b31 Update nl 2013-04-24 13:59:08 +02:00