Commit Graph

35052 Commits

Author SHA1 Message Date
Marcos García
8e7b72d09e Fixed incorrect translations in holidays module 2013-04-27 14:42:37 +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
Laurent Destailleur
57637d3a07 Merge pull request #871 from FHenry/3.3
Fix [ bug #843 ] Erreur SQL box_stock
2013-04-23 08:32:10 -07:00
fhenry
23a7aae084 [ bug #841 ] Erreur compta/index 2013-04-23 14:48:34 +02:00
fhenry
52a1e81147 [ bug #842 ] Erreur SQL Propal 2013-04-23 14:43:32 +02:00
fhenry
ba0e9c0c19 Fix [ bug #843 ] Erreur SQL box_stock
fix [ bug #842 ] Erreur SQL Propal
2013-04-23 14:02:29 +02:00
Laurent Destailleur
365a5e18e8 Prepare 3.3.2 2013-04-23 13:56:59 +02:00
Laurent Destailleur
57ab4fb798 Fix doc 2013-04-23 13:38:00 +02:00
Laurent Destailleur
624a039eaf Update debian doc 2013-04-23 12:58:58 +02:00
Laurent Destailleur
8f502b8cfc Prepare 3.3.2 2013-04-23 12:39:55 +02:00
Laurent Destailleur
dbc2eddcba Prepare for 3.3.2 2013-04-23 12:09:21 +02:00
Laurent Destailleur
3f1f065d4e Fix: log must use the mask defined into setup
Conflicts:
	htdocs/core/modules/syslog/mod_syslog_file.php
2013-04-23 12:02:56 +02:00
Laurent Destailleur
ff3b2933a8 Fix: Removed bad test 2013-04-23 10:42:10 +02:00
Laurent Destailleur
c8b2ce3d8e Removed warning 2013-04-22 20:46:53 +02:00
Laurent Destailleur
83e873dd24 Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3 2013-04-22 20:37:28 +02:00
Regis Houssin
f8ddd69ccb FIXME regresion if code with not in numeric base 2013-04-22 16:42:44 +02:00
Regis Houssin
7217d91f13 Fix: missing commit 2013-04-22 15:26:45 +02:00
Regis Houssin
ccf809b14a Fix: broken features 2013-04-22 15:10:15 +02:00
Regis Houssin
5ccb4108d4 Fix: merge problem 2013-04-22 14:47:37 +02:00
Regis Houssin
7883e4f0eb Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3 2013-04-22 14:38:38 +02:00
Regis Houssin
63a5aee80e Fix: broken features for fileupload 2013-04-22 14:37:18 +02:00
Laurent Destailleur
88fe3e86f2 Missing translation 2013-04-22 14:01:47 +02:00
Laurent Destailleur
b9dab6d059 Fix: Korting 2013-04-22 13:57:24 +02:00
Laurent Destailleur
6adaf2fa8f Fix: Pb when using virtual products inside virtual products 2013-04-22 13:02:10 +02:00
Laurent Destailleur
6b8c4fc3f2 Merge pull request #853 from FHenry/3.3
3.3
2013-04-21 15:14:11 -07:00
fhenry
4202c8fc91 required once instead of require 2013-04-20 17:56:39 +02:00