Commit Graph

30305 Commits

Author SHA1 Message Date
Laurent Destailleur
526a80dd20 Sec: Param not escaped
Fix: Bad return error
2013-05-11 15:04:17 +02:00
fhenry
9427e32e2e Fix security breach (SQL injection) 2013-05-10 15:04:16 +02:00
Regis Houssin
3aa049b661 Fix: regression 2013-05-06 17:57:33 +02:00
fhenry
0bb9ee158a Fix trigger call ficher inter create 2013-05-06 13:47:33 +02:00
fhenry
8bd7c6a763 Fix Trad Fr 2013-05-06 09:53:23 +02:00
fhenry
bdb81803bd Merge branch '3.3' of https://github.com/Dolibarr/dolibarr.git into 3.3 2013-05-04 09:06:32 +02:00
fhenry
95e4474906 Fix bug on PgSQL if user in on another entity than 1 2013-05-03 20:56:58 +02:00
Laurent Destailleur
1c9caeb0d3 Fix: CRLF 2013-05-03 18:33:23 +02:00
Laurent Destailleur
c8ef07a889 Merge branch '3.3' of https://github.com/Dolibarr/dolibarr.git into 3.3 2013-05-03 16:14:27 +02:00
Laurent Destailleur
723bd6f750 Fix: [ bug #872 ] Erreur sur page Accueil Commerciale avec pgsql
(3.4-beta).
Fix: Permission tab was not visible for external users.
2013-05-03 16:10:28 +02:00
fhenry
a35a44b23e Fix margin calculation problem 2013-05-03 15:22:41 +02:00
Marcos García
c65620ab62 Merge branch '3.3' of git://github.com/Dolibarr/dolibarr into bug-866
Conflicts:
	ChangeLog
2013-05-03 08:17:58 +02:00
Marcos García
f8f4fd3a6f Enhanced fix 2013-05-03 08:16:31 +02:00
Laurent Destailleur
4687350337 Merge pull request #910 from marcosgdf/3.3-translations
Translation improvements + fixed statut image of returned prelevement
2013-05-02 10:42:53 -07:00
Laurent Destailleur
3a531f048a Merge pull request #906 from grandoc/3.3
fix: undefined property
2013-05-02 10:42:13 -07:00
fhenry
7e47b37ade Fix [ bug #788 ] Date of linked interventions are not shown 2013-05-02 13:56:14 +02:00
Marcos García
97478ccbf2 Error statut image + not translated strings 2013-05-01 20:54:45 +02:00
Marcos García
95f63a8171 Corrected some es_ES translations and fixed problems with translations not being translated 2013-05-01 20:43:08 +02:00
Marcos García
a9e63610ae Fixed bug #866: Standing order from an invoice suggests invoice total amount instead of remaining to pay 2013-05-01 20:40:29 +02:00
fhenry
f3480bf502 Merge branch '3.3' of https://github.com/Dolibarr/dolibarr.git into 3.3 2013-05-01 14:38:43 +02:00
Grand Philippe
7f27801c3c fix: Undefined property: stdClass::$xxx 2013-05-01 09:41:36 +02:00
philippe
8d844a1094 Merge branch '3.3' of https://github.com/Dolibarr/dolibarr.git into 3.3 2013-05-01 09:08:15 +02:00
Laurent Destailleur
7d71be2227 Fix: Import of contact/address not complete and not working with pgsql
Conflicts:
	htdocs/core/modules/modSociete.class.php
2013-04-30 22:56:52 +02:00
Laurent Destailleur
c84427bd22 Fix: delete of files with [ and glob.
Conflicts:
	test/phpunit/FilesLibTest.php
2013-04-30 22:52:56 +02:00
fhenry
440912a4d3 fix [ bug #827 ] AJAX search does not respect multiprice level 2013-04-30 21:35:27 +02:00
fhenry
ac6e56f058 Fix bug [ bug #861 ] Erreur de droit groupe et utilisateur 2013-04-30 21:10:26 +02:00
fhenry
59f218ab42 [ bug #865 ] Dolibarr navigation array in project/task do not work 2013-04-30 16:00:30 +02:00
Grand Philippe
114ace6499 fix: undefined property 2013-04-30 15:22:39 +02:00
Laurent Destailleur
4a9ed428f0 Fix: isset on scalar value 2013-04-30 09:58:30 +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
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
bc7015a431 fix [ bug #850 ] Dolibarr PGSQL 2013-04-25 12:55:40 +02: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
fb1c306b31 Update nl 2013-04-24 13:59:08 +02: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
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
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
fhenry
4202c8fc91 required once instead of require 2013-04-20 17:56:39 +02:00
fhenry
880659af3a Merge branch '3.3' of https://github.com/Dolibarr/dolibarr.git into 3.3 2013-04-20 02:49:16 +02:00
Laurent Destailleur
fa69f693db Merge pull request #845 from marcosgdf/translations
Translations + minor bug fix
2013-04-19 17:22:32 -07:00
Laurent Destailleur
6a9ebcac7b Merge pull request #844 from grandoc/3.3
fix : undefined variable
2013-04-19 17:10:41 -07:00
Marcos García
95ca8db9eb Improved es_ES translations 2013-04-20 00:34:03 +02:00
Marcos García
d90a0acbec Missing externalsite module translations 2013-04-20 00:18:57 +02:00
Marcos García
40a9ab9772 Added missing translations 2013-04-20 00:08:09 +02:00
Marcos García
458b1cdf60 Improved dictionary translations + minor bug fix 2013-04-19 23:33:54 +02:00
unknown
8030b39536 fix : undefined variable 2013-04-19 19:45:06 +02:00
Marcos García
becd40a825 Fixed bug #828: Error when code_region is not a number in llx_c_regions (with postgres) 2013-04-19 15:38:24 +02:00
fhenry
a3c5bef381 Fix bug FactureLine update for PgSQL
http://www.dolibarr.fr/forum/527-bugs-sur-la-version-stable-courante/41317-impossible-de-modifier-une-ligne-de-facture#41422
2013-04-19 15:12:02 +02:00
Regis Houssin
50ec96d368 Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3 2013-04-19 09:58:00 +02:00
Regis Houssin
17d5ab9774 Fix: no result with a number with a comma
Conflicts:
	htdocs/fourn/facture/index.php

Change-Id: I6c67e3d2936673ea0993adfa1597bd11caf125fe
2013-04-19 09:57:13 +02:00
Laurent Destailleur
df0b0ebf51 Fix: Uniformize pdf code for typhon. This should also solve problem
of overlapped text into delivery receipts.

Conflicts:
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
2013-04-19 09:52:25 +02:00
Regis Houssin
3e9a8677c6 Fix: no result with a number with a comma 2013-04-19 09:48:55 +02:00