Commit Graph

26001 Commits

Author SHA1 Message Date
Laurent Destailleur
9701a5a461 Prepare 3.1.1 dev 2012-01-04 13:34:04 +01:00
Laurent Destailleur
51829302ab Fix: Removed warning 2012-01-04 13:26:41 +01:00
Laurent Destailleur
db12c049f8 Fix: Removed warning 2012-01-04 13:23:06 +01:00
Regis Houssin
9df5d4408d Fix: sql query error 2011-12-31 16:58:18 +01:00
Regis Houssin
6bf31882b2 Update htdocs/langs/en_US/main.lang 2011-12-23 19:57:31 +01:00
Regis Houssin
8698e8767f Merge pull request #75 from simnandez/3.1
Trad: Fix missing translation of FACTURE_CHANGE_THIRDPARTY option
2011-12-23 10:52:56 -08:00
Regis Houssin
863b8b2a62 Fix: add vat rate 7 for France 2011-12-23 19:43:19 +01:00
Laurent Destailleur
ece91711c0 Trans: Update sl_SI language 2011-12-22 00:32:40 +01:00
Laurent Destailleur
b93aa1e892 Fix: code is not set during update if not needed 2011-12-21 21:52:02 +01:00
Laurent Destailleur
c4ef463b11 Fix: Lang loaded 2011-12-21 20:33:57 +01:00
Laurent Destailleur
ae7e5837bc Fix: Bad url 2011-12-21 20:31:24 +01:00
Laurent Destailleur
4222f67acb Fix: Avoid warning messages with some modules 2011-12-21 18:31:27 +01:00
Laurent Destailleur
28002e5104 Merge branch '3.1' of ssh://git@github.com/Dolibarr/dolibarr.git into 3.1 2011-12-21 17:35:06 +01:00
Laurent Destailleur
28b1249ff0 Fix: [ bug #248 ] Send by mail doesn't find the files in provider's
invoices
2011-12-21 17:33:57 +01:00
Laurent Destailleur
4fd76605e4 Fix: [ bug #256 ] Delivery order SQL error 2011-12-21 16:38:43 +01:00
Laurent Destailleur
7a106a3fb9 Fix: Bad style 2011-12-21 16:28:54 +01:00
Laurent Destailleur
ba5adb29d8 Fix: [ bug #253 ] Non UTF-8 characters in CSV exports 2011-12-21 16:15:21 +01:00
Laurent Destailleur
cae7b6c39c Fix: statut into ficheinter 2011-12-21 15:38:00 +01:00
simnandez
aa377ac240 Trad: Fix missing translation 2011-12-21 12:08:59 +01:00
simnandez
700c3368f2 Trad: Fix missing translation of FACTURE_CHANGE_THIRDPARTY option 2011-12-21 12:01:18 +01:00
Regis Houssin
0fc197fced Fix: missing llx_user field !!! 2011-12-20 12:49:57 +01:00
Laurent Destailleur
d0f11c0450 Fix: Accept hungarian special codes 2011-12-19 10:09:07 +01:00
Laurent Destailleur
e1d40b9467 Fix: comment 2011-12-10 13:39:17 +01:00
Laurent Destailleur
aedca03c1f Fix: Removed useless line with TCPDF 2011-12-08 20:15:56 +01:00
Laurent Destailleur
a97a1e9245 Fix: GETPOST on int accept negative values 2011-12-07 20:00:16 +01:00
Laurent Destailleur
c66672a750 Fix: alt text 2011-12-07 19:45:50 +01:00
Laurent Destailleur
17119f0d51 Fix: Miscellaneous fix 2011-12-05 23:07:18 +01:00
Laurent Destailleur
70f670d870 Fix: order of firstname/name 2011-12-03 16:14:24 +01:00
Laurent Destailleur
c50c4da39c Fix: Missing deposits 2011-12-03 15:31:11 +01:00
Laurent Destailleur
3de10b9d00 Fix: Warning always visible 2011-12-03 15:22:56 +01:00
Laurent Destailleur
56583281eb Fix: Generation of PDF must include changes 2011-12-02 20:10:20 +01:00
Laurent Destailleur
79cd918d94 Merge branch '3.1' of ssh://git@github.com/Dolibarr/dolibarr.git into 3.1 2011-12-02 00:02:58 +01:00
Laurent Destailleur
fe483567b3 Fix: Use filesystem encoding 2011-12-01 23:37:41 +01:00
Laurent Destailleur
9279964d75 Fix: [ bug #247 ] Statistiques: Montant HT ou TTC 2011-12-01 23:10:48 +01:00
Laurent Destailleur
e35ff42eda Fix: [ bug #240 ] No description while adding a line in an Supplier
invoice
2011-12-01 22:25:11 +01:00
ph35
eb11fbf0ff Update htdocs/langs/fr_FR/contracts.lang 2011-12-01 11:53:40 +01:00
Laurent Destailleur
497ebdfdf2 Fix: Security audit purged 2011-11-30 20:20:16 +01:00
Laurent Destailleur
da2c033269 Fix: Can use paypal payment twice on same member. 2011-11-30 15:18:51 +01:00
Laurent Destailleur
dbb70fdd4e Fix: Navigation on shipment cards 2011-11-30 12:26:49 +01:00
Laurent Destailleur
f7ae87da3d Merge branch '3.1' of ssh://git@github.com/Dolibarr/dolibarr.git into 3.1 2011-11-30 11:56:22 +01:00
Laurent Destailleur
8ef3a40800 Fix: Select of target on supplier category 2011-11-30 11:55:13 +01:00
Juanjo Menent
8b2172b583 Fix: [ bug #245 ] Content of note disappears 2011-11-29 16:53:22 +01:00
Laurent Destailleur
92a79b8cd5 Fix: No default value on var by pointer 2011-11-26 18:32:14 +01:00
Laurent Destailleur
1a84a0ccea Fix: Install not locked if PHP version too low 2011-11-26 15:35:53 +01:00
Laurent Destailleur
f5c2992ec6 Merge branch '3.1' of ssh://git@github.com/Dolibarr/dolibarr.git into 3.1 2011-11-25 23:37:37 +01:00
Laurent Destailleur
6e5ba3d12d Fix: discount lost when creating invoice from order 2011-11-25 23:37:07 +01:00
Laurent Destailleur
03a6bdde76 Fix: Bad parameters 2011-11-25 18:49:59 +01:00
Laurent Destailleur
ffb2dfcd4d Fix: filter by categ 2011-11-25 02:02:21 +01:00
Juanjo Menent
3c8a25e99f Trad: Fix missing translations 2011-11-24 17:16:29 +01:00
Laurent Destailleur
322135c09d Fix: Missing list of details of lines 2011-11-23 20:18:31 +01:00
Carlos Nogueira
3a175aab60 Update htdocs/langs/pt_PT/projects.lang 2011-11-23 09:12:36 +01:00
Laurent Destailleur
e4cb045b53 Fix: pgsql compatibility 2011-11-22 02:16:39 +01:00
Laurent Destailleur
27e6f9a277 Fix: duplicate assignement 2011-11-22 00:40:57 +01:00
Laurent Destailleur
7108fbda6f Add test to avoid bad input 2011-11-22 00:20:33 +01:00
Laurent Destailleur
7d3a2e4ad8 Fix: [ bug #236 ] Can't attach a file to e-mailings
(cherry picked from commit 311f013289)

Conflicts:

	htdocs/comm/mailing/fiche.php
	htdocs/lib/files.lib.php
2011-11-22 00:07:35 +01:00
Laurent Destailleur
be2e150026 Merge branch '3.1' of https://eldy@github.com/Dolibarr/dolibarr.git into 3.1 2011-11-21 13:20:10 +01:00
Laurent Destailleur
26e66fa5fe Fix: duplication result problem 2011-11-20 18:54:54 +01:00
Laurent Destailleur
e08e07c493 Fix: [ bug #233 ] Delete invoice problem with a discount 2011-11-19 19:04:55 +01:00
Laurent Destailleur
a4570c578e Merge branch '3.1' of ssh://git@github.com/Dolibarr/dolibarr.git into 3.1 2011-11-18 23:45:12 +01:00
Laurent Destailleur
6d78f7e641 Merge branch '3.1' of https://eldy@github.com/Dolibarr/dolibarr.git into 3.1 2011-11-18 13:11:24 +01:00
Laurent Destailleur
5699127b66 Fix: Correct sign 2011-11-18 13:08:20 +01:00
Laurent Destailleur
5492f4ff75 Fix: correct sign 2011-11-18 12:35:16 +01:00
Juanjo Menent
69f4fb8112 Fix: load file other.lang solve missing translations 2011-11-17 17:45:23 +01:00
Juanjo Menent
a35dcfeb07 Fix: [bug 235] Bad local tax control 2011-11-17 09:21:30 +01:00
Laurent Destailleur
eaba1c94f3 Merge branch '3.1' of ssh://git@github.com/Dolibarr/dolibarr.git into 3.1 2011-11-16 20:23:01 +01:00
Laurent Destailleur
2fe35d41a1 Fix: Deposits was not included into lines but into into remain to
pay(cherry picked from commit bf9c482f8a)

Conflicts:

	htdocs/compta/facture.php
	htdocs/compta/stats/cabyuser.php
	htdocs/compta/stats/casoc.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/pdf.lib.php
	htdocs/langs/fr_FR/bills.lang
2011-11-16 20:21:28 +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
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
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
762f98ab41 Fix: [Bug #232] Multiple Cross-Site-Scripting vulnerabilities 2011-11-08 17:17:21 +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