Commit Graph

32893 Commits

Author SHA1 Message Date
Laurent Destailleur
8bcb90fcd0 Fix: syntax error 2012-08-26 00:28:04 +02:00
Regis Houssin
becda06fd6 Fix: security 2012-08-25 19:40:08 +02:00
Regis Houssin
40be4287cf Fix: remove old code 2012-08-25 19:29:26 +02:00
Regis Houssin
e402c9cd28 Fix: use propal instead propale 2012-08-25 19:25:06 +02:00
Regis Houssin
dcfc34e64e Fix: more better of better 2012-08-25 19:20:17 +02:00
Regis Houssin
4dd8119a9e Fix: use better method for avoid warnings 2012-08-25 19:08:06 +02:00
Regis Houssin
f322ec50ed New: [ task #498 ] - final part 2012-08-25 15:21:34 +02:00
Regis Houssin
d88abe8df0 Fix: use label instead libelle 2012-08-25 12:07:18 +02:00
Regis Houssin
6fe631378b Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into task498_objectline 2012-08-25 11:28:08 +02:00
Regis Houssin
e00b74619a Fix: regression 2012-08-25 11:09:58 +02:00
Regis Houssin
954f2afbc5 Fix: remove obsolete code 2012-08-25 10:49:59 +02:00
Regis Houssin
fbe28e75c9 Merge pull request #346 from marcosgdf/bug-499
Forgot to apply the patch to the rest of the files
2012-08-25 01:32:55 -07:00
Regis Houssin
c9113458d9 New: [ task #498 ] part 3 2012-08-25 03:28:30 +02:00
Marcos García
082753d115 Refactored code 2012-08-24 19:55:31 +02:00
Marcos García
977571e032 Forgot to apply the patch to the rest of the files 2012-08-24 18:32:19 +02:00
Regis Houssin
1a1fb2a88c Merge pull request #344 from grandoc/develop
fix some issue within typhon pdf
2012-08-24 07:41:48 -07:00
Grand Philippe
2d34e7bf8b fix some issue within typhon pdf 2012-08-24 16:34:05 +02:00
Regis Houssin
a0b3ea0dd4 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git
into task498_objectline

Conflicts:
	htdocs/install/mysql/migration/3.2.0-3.3.0.sql
2012-08-23 18:52:55 +02:00
Regis Houssin
ead2a81baf Fix: merge problem 2012-08-23 18:45:41 +02:00
Regis Houssin
56a22d2b59 Fix: rename for security raison 2012-08-23 18:15:54 +02:00
Regis Houssin
eca37eb123 Fix: [ bug #497 ] Module Order Supplier inaccessible altogether because
of a missing SQL field
2012-08-23 17:24:29 +02:00
Regis Houssin
6a60551fdd Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git
into task498_objectline

Conflicts:
	htdocs/install/mysql/migration/3.2.0-3.3.0.sql
2012-08-23 17:19:05 +02:00
Regis Houssin
45971ce6f0 Merge pull request #343 from marcosgdf/minor
Translations + Little refactor
2012-08-23 08:10:54 -07:00
Regis Houssin
86763bc20f Merge pull request #342 from grandoc/develop
fix some language issues
2012-08-23 08:08:20 -07:00
Regis Houssin
484f8ec218 Merge pull request #341 from marcosgdf/bug-499
Fixed bug #499
2012-08-23 08:07:26 -07:00
Regis Houssin
995c7f13d3 New: [ task #498 ] part3 2012-08-23 13:45:51 +02:00
Marcos García
752c867882 I like more this variable name :D 2012-08-23 09:45:52 +02:00
Marcos García
cb29cfed7b Translations + Little refactor 2012-08-23 09:43:13 +02:00
Grand Philippe
b015c7799a fix some language issues 2012-08-23 09:27:01 +02:00
Marcos García
0ecfe0465e Fixed bug #499
The input method of supplier orders wasn't being translated
2012-08-23 09:20:30 +02:00
Regis Houssin
51d3d33947 Merge pull request #339 from marcosgdf/bug-511
Fixed bug #511
2012-08-23 00:02:23 -07:00
Regis Houssin
4d1555f4ca Merge pull request #338 from atm-maxime/mko515
Mko515
2012-08-23 00:01:05 -07:00
Marcos García
fcb4f5ce67 Renamed MySQL alias that could cause conflicts 2012-08-23 09:00:31 +02:00
Regis Houssin
ff6b010c3e Merge pull request #340 from marcosgdf/translations
Improvements to translations
2012-08-22 23:59:04 -07:00
Marcos García
44cc4ae949 Some strings weren't being translated
Thanks to @grandoc and I.D & L (idl-mp.com) for the french translations
2012-08-23 08:46:22 +02:00
Maxime Kohlhaas
332ee652c3 Clear action was called with a rowid instead of id (rowid is for a target of the emailing, id is for the emailing) 2012-08-23 08:45:45 +02:00
Maxime Kohlhaas
39de1cb010 Task 515 : Correction on SQL request 2012-08-23 08:43:29 +02:00
Marcos García
66eabbe4a9 Improved es_ES translations 2012-08-23 08:33:18 +02:00
Marcos García
19bf4ab8df Improvements to translations
Some available translations weren't being translated
Also corrected wrong translation key
Improved es_ES translation string
2012-08-23 08:29:38 +02:00
Marcos García
43e4f139d5 Fixed bug #511
A pagination problem was causing duplicated records
https://doliforge.org/tracker/?func=detail&aid=511&group_id=144
2012-08-23 08:21:32 +02:00
Regis Houssin
f4d75e87d3 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git
into task498_objectline

Conflicts:
	htdocs/core/class/commonobject.class.php
2012-08-23 07:53:48 +02:00
Regis Houssin
c8e1aca7d8 New: [ task #498] part2 2012-08-23 07:50:20 +02:00
Regis Houssin
3cdb2ba8e1 Merge pull request #337 from marcosgdf/coding-style
Improved coding style
2012-08-22 22:43:03 -07:00
Regis Houssin
99e7b82b69 Merge pull request #336 from marcosgdf/minor
Fixed string not being translated
2012-08-22 22:40:02 -07:00
Regis Houssin
08ea9c4351 Merge pull request #334 from grandoc/develop
Develop
2012-08-22 22:39:39 -07:00
Regis Houssin
4bdb2047a9 Merge pull request #335 from marcosgdf/translations
Added missing en_US translations
2012-08-22 22:38:46 -07:00
Marcos García
5769c0facc Changed incorrect includes 2012-08-23 02:46:16 +02:00
Marcos García
9b3c89ac47 Removed parenthesis from all include and include_once and replaced with single quotes 2012-08-23 02:40:41 +02:00
Marcos García
37c4898720 Removed "./" in require statements
It does not make any sense to do that
2012-08-23 01:43:44 +02:00
Maxime Kohlhaas
5fd10d14be Task 515 : Corrections + target modules modifications 2012-08-23 00:00:01 +02:00