Commit Graph

30912 Commits

Author SHA1 Message Date
Juanjo Menent
a35dcfeb07 Fix: [bug 235] Bad local tax control 2011-11-17 09:21:30 +01:00
Juanjo Menent
5d85ea89ed Merge branch '3.1' of git://github.com/Dolibarr/dolibarr.git into 3.1 2011-11-16 17:13:35 +01:00
Juanjo Menent
582d994e54 Merge branch '3.1' of git://github.com/Dolibarr/dolibarr.git into 3.1 2011-11-14 18:14:17 +01:00
Laurent Destailleur
8fd5acc557 Merge branch '3.1' of https://eldy@github.com/Dolibarr/dolibarr.git into 3.1 2011-11-14 01:48:21 +01:00
Regis Houssin
42a687fe75 Merge branch '3.1' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.1 2011-11-12 13:00:01 +01:00
Regis Houssin
a2e2c12e66 Fix: carriage return problem 2011-11-12 12:59:21 +01:00
Juanjo Menent
27ad7acc68 Merge branch '3.1' of git://github.com/Dolibarr/dolibarr.git into 3.1 2011-11-11 09:45:53 +01:00
Laurent Destailleur
5fa04fd6ec Merge branch '3.1' of ssh://git@github.com/Dolibarr/dolibarr.git into 3.1 2011-11-11 01:32:55 +01:00
Laurent Destailleur
04989ff4a0 Fix: double screen when creating product with no ref 2011-11-11 01:30:00 +01:00
Regis Houssin
a1a225e52d Fix: exclude install.lock files during purge
Conflicts:

	htdocs/admin/tools/purge.php
2011-11-10 16:51:43 +01:00
Juanjo Menent
659bf039c9 Trad: Fix missing translation 2011-11-10 23:08:39 +08:00
Juanjo Menent
d1940be71b Trad: Fix missing translation 2011-11-10 15:51:36 +01:00
Laurent Destailleur
1a3b3f557b Fix: Missing socid 2011-11-09 21:46:52 +01:00
Laurent Destailleur
d08d28c0cd Fix: Sanitize PHP_SELF 2011-11-09 13:40:29 +01:00
Laurent Destailleur
5027152194 Fix: We must not filter on html content but only on javascript content
to avoid errors when using fckeditor
2011-11-09 12:04:08 +01:00
Laurent Destailleur
966c82f96c Merge branch '3.1' of ssh://git@github.com/Dolibarr/dolibarr.git into 3.1 2011-11-09 11:54:27 +01:00
Laurent Destailleur
24db4d0b0f Fix: Can edit accountancy code 2011-11-09 11:52:43 +01:00
Regis Houssin
0398956f63 Merge branch '3.1' of git+ssh://github.com/Dolibarr/dolibarr into 3.1 2011-11-08 17:20:46 +01:00
Regis Houssin
762f98ab41 Fix: [Bug #232] Multiple Cross-Site-Scripting vulnerabilities 2011-11-08 17:17:21 +01:00
Regis Houssin
1ce6bd7c79 Fix: bug #232 2011-11-08 14:59:01 +01:00
Laurent Destailleur
5a2b697c2e Fix: [ bug #228 ] Facture depuis commande remisée 2011-11-08 00:50:33 +01:00
Regis Houssin
9ff0690912 Fix: entity filter 2011-11-07 09:43:03 +01:00
Laurent Destailleur
5fd87f1290 Fix: Bad sql request 2011-11-06 14:22:52 +01:00
Laurent Destailleur
20bfe38a40 Merge branch '3.1' of ssh://git@github.com/Dolibarr/dolibarr.git into 3.1 2011-11-06 01:16:20 +01:00
Regis Houssin
79effca5fe Fix: old bad merge 2011-11-06 01:01:07 +01:00
Laurent Destailleur
0b20940d20 Fix: Localisation of prices 2011-11-06 00:40:30 +01:00
Laurent Destailleur
d376ba6e15 Merge branch '3.1' of ssh://git@github.com/Dolibarr/dolibarr.git into 3.1 2011-11-05 13:29:29 +01:00
Laurent Destailleur
29fd15405d Fix: new lines not correctly outputed 2011-11-05 13:21:49 +01:00
Regis Houssin
a1a1dc9045 Fix: add json_decode function for old PHP 2011-11-05 12:47:17 +01:00
Regis Houssin
42f61de5c6 Fix: best json_encode function for old PHP
Fix: remove unused function php2js
2011-11-05 11:52:10 +01:00
Laurent Destailleur
c2cbd88d9e Fix: Implement json_encode function for old PHP 2011-11-05 00:47:22 +01:00
Laurent Destailleur
05d113133a Merge branch '3.1' of ssh://git@github.com/Dolibarr/dolibarr.git into 3.1 2011-11-04 00:47:21 +01:00
Regis Houssin
dab87cc4a8 Fix: chmod 644 2011-11-03 18:04:49 +01:00
Regis Houssin
76d8c27dd3 Fix: uniform code
Fix: entity filter
2011-11-03 17:48:28 +01:00
Laurent Destailleur
c89823bae6 Merge branch '3.1' of ssh://git@github.com/Dolibarr/dolibarr.git into 3.1 2011-11-03 02:04:50 +01:00
Laurent Destailleur
c539155d6a Security: More security holes fixed 2011-11-02 21:20:00 +01:00
Regis Houssin
9845761850 Merge pull request #43 from simnandez/3.1
Fix: [bug 227] LocalTaxes: Suppliers calculate problem
2011-11-02 12:34:16 -07:00
Laurent Destailleur
63820ab375 Security: A lot of security fixes 2011-11-02 20:17:23 +01:00
Laurent Destailleur
295745f62a Fix: Add missing entries 2011-11-02 19:15:08 +01:00
Laurent Destailleur
2c4618d2f6 Fix: Try a fix to allow trigger for changing password 2011-11-02 18:05:01 +01:00
Juanjo Menent
21e579ed22 Fix: [bug 227] LocalTaxes: Suppliers calculate problem 2011-11-02 16:59:24 +01:00
Laurent Destailleur
ab3abaa7a3 Merge branch '3.1' of https://eldy@github.com/Dolibarr/dolibarr.git into 3.1 2011-11-01 22:47:14 +01:00
Laurent Destailleur
98ce8210ee Merge branch '3.1' of ssh://git@github.com/Dolibarr/dolibarr.git into 3.1 2011-11-01 16:11:13 +01:00
Laurent Destailleur
96385247a3 Fix: translation 2011-11-01 16:03:59 +01:00
Regis Houssin
77bd38f90c Fix: translation 2011-11-01 15:27:29 +01:00
Laurent Destailleur
72ae4e1f5b Fix: LOG_ERR and not LOG_ERROR 2011-11-01 12:22:19 +01:00
Laurent Destailleur
c3d8341034 Merge branch '3.1' of ssh://git@github.com/Dolibarr/dolibarr.git into 3.1 2011-10-31 09:50:52 +01:00
Laurent Destailleur
58398cdba1 Fix: Bad URL 2011-10-31 09:48:17 +01:00
Laurent Destailleur
9e6aaf7021 Fix: Filter on third party 2011-10-29 00:00:35 +02:00
Laurent Destailleur
6fb587cc22 Fix: Order by title 2011-10-28 23:27:40 +02:00