Commit Graph

35021 Commits

Author SHA1 Message Date
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
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
Laurent Destailleur
de2a5a8872 Merge pull request #843 from marcosgdf/bug-828
Fixed bug #828: Error when code_region is not a number in llx_c_regions ...
2013-04-19 12:16:37 -07: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
Laurent Destailleur
52a0df3424 Fix: Bad translation 2013-04-17 20:13:42 +02:00
Laurent Destailleur
21a1441a80 Merge pull request #839 from FHenry/3.3
Fix [ bug #824 ] MAIN_DB_PREFIX not use into dictionnary
2013-04-17 02:58:32 -07:00
Regis Houssin
5c50b1db57 Fix: use empty instead isset 2013-04-17 10:42:44 +02:00
fhenry
03e57c229a Update changelog 2013-04-17 10:00:12 +02:00
fhenry
e7cec6d410 update change log 2013-04-17 09:32:35 +02:00
fhenry
e2156b5df7 Fix bug
http://www.dolibarr.org/forum/527-bugs-on-a-stable-version/22542-table-prefix-bug
2013-04-16 16:00:23 +02:00
Laurent Destailleur
3a474a22ca Qual: Include is_erasable() into test
Conflicts:
	test/phpunit/NumberingModulesTest.php
2013-04-16 15:56:08 +02:00
Laurent Destailleur
a5deb8e9d7 Fix: bug into is_erasable function.
Conflicts:
	test/phpunit/NumberingModulesTest.php
2013-04-16 15:54:36 +02:00
simnandez
90a2a86dbb Update ChangeLog 2013-04-16 08:59:01 +02:00
Juanjo Menent
1602fcf7bc Merge pull request #837 from FHenry/3.3
Fix [ bug #789 ] VAT not being calculated in POS
2013-04-15 23:54:03 -07:00
fhenry
7d6c89169c Fix [ bug #789 ] VAT not being calculated in POS 2013-04-15 23:06:03 +02:00
Regis Houssin
7177e59ea4 Fix: missing quote 2013-04-15 21:41:34 +02:00
Regis Houssin
21056d2b78 Fix: missing current entity record 2013-04-15 21:27:01 +02:00
simnandez
76132206bf Fix: Bad link to all proposals into Third party card if customer is
prospect
2013-04-15 17:12:31 +02:00
Juanjo Menent
67b803243f Merge pull request #834 from marcosgdf/translations-3.3
Improved es_ES holidays translations
2013-04-15 00:22:02 -07:00
Marcos García
6d896a8558 Improved holidays module translations 2013-04-15 00:53:06 +02:00