Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
40,390 Commits 36 Branches 189 Tags
f34aadef3df57794de74006bc2c2c9fc4da6be12
Commit Graph

34721 Commits

Author SHA1 Message Date
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
Marcos García
56264f0bf5 Fixed incorrect change 2012-08-22 23:44:17 +02:00
Marcos García
ea119c45a2 Lower-cased all <?PHP 2012-08-22 23:27:53 +02:00
Marcos García
f3674317ec Removed parenthesis from all require and replaced with single quotes 2012-08-22 23:24:21 +02:00
Marcos García
706d79986c Removed parenthesis from all require_once and replaced with single quotes 2012-08-22 23:11:24 +02:00
Maxime Kohlhaas
06ab1f6f94 Task 515 : New field added on contact : no_email 2012-08-22 22:59:10 +02:00
Marcos García
bed4e7bc72 Fixed string being not translated 2012-08-22 22:36:08 +02:00
Regis Houssin
85c0dd95ca 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-22 17:50:07 +02:00
Regis Houssin
4a5d89e6cc Fix: move barcode type entries in module descriptor for best 
compatibility with multicompany
 2012-08-22 17:44:52 +02:00
Regis Houssin
2ae1d3d3b5 New: [ task #498 ] 2012-08-22 17:42:40 +02:00
Philippe Grand
f6e31ee6bc Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop 2012-08-22 09:04:41 +02:00
Marcos García
25042c1ef9 Added missing en_US translations 
Made by tanayhan
http://www.dolibarr.org/forum/fbprofile/userid-7996
 2012-08-22 07:13:02 +02:00
Regis Houssin
545cb023ff Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into task498_objectline 2012-08-21 13:48:52 +02:00
Regis Houssin
75bfddd7a6 Fix: wrong ereg 2012-08-21 11:47:56 +02:00
Philippe Grand
6cfe58f083 fix some english translation 2012-08-21 09:39:07 +02:00
Philippe Grand
33ea1e1622 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop 2012-08-20 14:44:20 +02:00
Laurent Destailleur
2ab1a018df Fix: GETPOST can not always be used to replace isset. 2012-08-20 14:30:16 +02:00
Laurent Destailleur
880276f047 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-08-20 14:14:26 +02:00
Laurent Destailleur
fb074daaf1 Fix: The backto use bad url. 2012-08-20 14:14:01 +02:00
Regis Houssin
3c13395d21 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into task498_objectline 2012-08-20 12:10:20 +02:00
Philippe Grand
158019f161 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop 2012-08-20 11:07:28 +02:00
Regis Houssin
7c623a9a2e Fix: strict mode bounty 2012-08-20 11:04:56 +02:00
Regis Houssin
5dc10cfcae Fix: possibility to defined another value instead 50% 2012-08-20 10:38:48 +02:00
Regis Houssin
c6d008fb1b Fix: broken feature and add FIXME 2012-08-20 09:40:59 +02:00
Regis Houssin
1aa26d0cd7 Fix: missing show field if "in progress" is chosen first 2012-08-20 08:45:39 +02:00
Philippe Grand
b2771660d3 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop 2012-08-20 08:43:10 +02:00
Regis Houssin
8719f87781 Fix: avoid warning "is not a legal ECMA-262 octal constant" 2012-08-20 08:30:55 +02:00
Regis Houssin
257dcb8928 Merge pull request #332 from marcosgdf/minor 
Fixed incorrect HTML
 2012-08-19 22:47:48 -07:00
Marcos García
63c4cfb609 Fixed incorrect HTML 2012-08-20 02:45:38 +02:00
Marcos García
344f379683 jQuerified events' javascript 2012-08-20 02:42:56 +02:00
Laurent Destailleur
9c31e6b2db Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-08-20 02:15:50 +02:00
Laurent Destailleur
218b97f2d0 Fix: [ bug #506 ] Can't set percentage of a started event 2012-08-20 02:15:07 +02:00
Regis Houssin
00781031d8 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-08-20 01:30:28 +02:00
Regis Houssin
3991e0b13d Fix: add accountancy code error message 2012-08-20 01:29:13 +02:00
Laurent Destailleur
f0d0539766 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-08-20 00:40:07 +02:00
Laurent Destailleur
a0796423e9 Move warning to info 2012-08-20 00:39:35 +02:00
Regis Houssin
24cc07815d Fix: remove old accountancy code, can cause blank screen 2012-08-20 00:36:51 +02:00
Laurent Destailleur
c664ac3cfa Fix: Default value was not defined 2012-08-20 00:27:38 +02:00
Regis Houssin
a856ad0afa Fix: strict mode sunshine 2012-08-19 09:05:50 +02:00
Regis Houssin
6729cd9b4b Merge pull request #330 from marcosgdf/fix-bug-504 
Fixed bug #504
 2012-08-18 22:48:24 -07:00
Marcos García
8639f1a414 Fixed bug #504 
https://doliforge.org/tracker/?func=detail&aid=504&atid=246&group_id=144
 2012-08-19 03:37:37 +02:00
Marcos García
bced5f3bca Added missing es_ES translation 2012-08-19 03:36:04 +02:00
Philippe Grand
72895fa4b7 for module ultimatepdf 2012-08-18 21:31:12 +02:00