Commit Graph

32563 Commits

Author SHA1 Message Date
Laurent Destailleur
d4a19f0674 Fix: Removed warning 2012-08-03 10:56:50 +02:00
Laurent Destailleur
18944a3d9b Merge branch 'develop' of https://eldy:ld101010-gb@github.com/Dolibarr/dolibarr.git into develop 2012-08-03 10:29:00 +02:00
Laurent Destailleur
ff0d24a0dc Fix: Remove warning 2012-08-03 10:26:39 +02:00
Laurent Destailleur
1e13a7cf13 Merge pull request #285 from simnandez/develop
Develop
2012-08-02 07:46:58 -07:00
Laurent Destailleur
233c47ef08 Merge pull request #286 from FHenry/develop
update select_contact method to add possibility to display contact
2012-08-02 07:45:50 -07:00
FHenry
799b1727f8 update select_contact method to add possibility to display contact
compagny also
2012-08-02 10:12:32 +02:00
Regis Houssin
e0385cf06f Fix: strict mode palace 2012-08-02 10:07:55 +02:00
Regis Houssin
fe4fc7f8dc Fix: increase speed 2012-08-02 08:02:49 +02:00
Regis Houssin
e717f491c1 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-08-01 19:41:09 +02:00
Regis Houssin
5ad211a1ca Fix: bad document path with multicompany 2012-08-01 19:34:42 +02:00
Laurent Destailleur
07a09cad1d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-08-01 19:29:58 +02:00
Laurent Destailleur
b35240c899 Fix: Bad url 2012-08-01 19:29:36 +02:00
Regis Houssin
9451edafd8 Fix: bad link and uniformize code 2012-08-01 18:40:47 +02:00
Regis Houssin
2e73cd7ddf Fix: missing fields and compatibility with milestone 2012-08-01 17:38:10 +02:00
Regis Houssin
d6a4d5ef41 Fix: avoid errors if install directory is deleted before module
activation
2012-08-01 14:42:24 +02:00
Regis Houssin
2dcb158915 Fix: strict mode again 2012-08-01 13:32:50 +02:00
Regis Houssin
c558f2206c Fix: strict mode pleasure 2012-08-01 13:30:38 +02:00
Regis Houssin
29fea7bbf4 Fix: regression (multicompany) 2012-08-01 13:03:41 +02:00
Regis Houssin
da44fa7186 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-08-01 08:23:54 +02:00
Regis Houssin
902f1c7e71 Fix: typo 2012-08-01 08:23:37 +02:00
Laurent Destailleur
4b3aba919f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-07-31 23:06:12 +02:00
Laurent Destailleur
8d031900f9 [ bug #464 ] Payment form should allow to add transmitter for bank transfers 2012-07-31 13:40:38 +02:00
simnandez
47335f0613 Trad: Improve translations 2012-07-31 09:29:19 +02:00
simnandez
40a57f63cb Trad: Improve translations 2012-07-31 09:26:35 +02:00
Regis Houssin
2eb38ac8c8 Fix: uniformize test 2012-07-31 08:43:45 +02:00
Regis Houssin
fcae6f8811 Merge pull request #284 from marcosgdf/php-error
Fixed an error that I introduced in a previous commit...
2012-07-30 23:36:08 -07:00
Regis Houssin
24585dbf71 Merge pull request #283 from marcosgdf/translations
es_ES translation
2012-07-30 23:35:11 -07:00
Marcos García
dbe2fa55df es_ES translation typo 2012-07-31 01:18:32 +02:00
Marcos García
c62ac71e03 Typo in es_ES translation 2012-07-31 01:05:03 +02:00
Marcos García
3520513c6b Fixed an error that I introduced in a previous commit... 2012-07-31 00:53:05 +02:00
Marcos García
fc012a394c Duplicated space 2012-07-31 00:44:55 +02:00
Marcos García
e0325f3df1 Missing es_ES translations 2012-07-31 00:36:42 +02:00
Laurent Destailleur
2f19fd9612 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-07-31 00:07:19 +02:00
Laurent Destailleur
acad2191d5 Fix: Style 2012-07-31 00:06:39 +02:00
Regis Houssin
97027c7d76 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-07-30 22:38:46 +02:00
Regis Houssin
66ba264ca3 Fix: strict mode and event message 2012-07-30 22:38:21 +02:00
Laurent Destailleur
5772e46c9a We start new modules with level "experimental". 2012-07-30 22:18:54 +02:00
Laurent Destailleur
a996e8f98a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-07-30 21:44:21 +02:00
Laurent Destailleur
190f005b68 New: ECM module is full Ajax 2012-07-30 21:44:00 +02:00
Laurent Destailleur
2191a4dc73 Fix: use ENGINE=innodb instead of type=innodb 2012-07-30 21:43:40 +02:00
Regis Houssin
4f1814d486 Merge pull request #280 from marcosgdf/translations
Translations
2012-07-30 11:47:10 -07:00
Marcos García
237d7b744c Including other.lang in files using FeaturesSupported string, also removed duplicated code 2012-07-30 20:39:47 +02:00
Regis Houssin
1533eef852 Merge pull request #281 from FHenry/develop
Develop
2012-07-30 11:36:42 -07:00
Marcos García
a71840bbd9 Revert "Moved FeaturesSupported string from other.lang to admin.lang as it is only used in admin pages"
This reverts commit 0e952521e1.
2012-07-30 20:29:54 +02:00
Marcos García
fb95a0ed16 Made corrections that @hregis told me 2012-07-30 20:29:39 +02:00
FHenry
bf2d0ea82a correct checkstyle 2012-07-30 20:15:18 +02:00
FHenry
af91a7185a Checkstyle (from hudson) 2012-07-30 20:11:55 +02:00
Marcos García
7bbfe9c29b Fixed es_ES typo 2012-07-30 20:09:35 +02:00
Marcos García
0e952521e1 Moved FeaturesSupported string from other.lang to admin.lang as it is only used in admin pages 2012-07-30 19:45:51 +02:00
Marcos García
e81a8b1d2c Merge branch 'develop' into translations 2012-07-30 19:04:53 +02:00