Commit Graph

34445 Commits

Author SHA1 Message Date
Laurent Destailleur
e2e86e16d0 Merge pull request #537 from grandoc/develop
Develop
2012-12-12 07:01:54 -08:00
Laurent Destailleur
13d5a2e12c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-12-12 14:46:33 +01:00
Laurent Destailleur
bdb112c820 Fix: Using bad root url. 2012-12-12 14:46:13 +01:00
Laurent Destailleur
411bdfda5f Merge pull request #538 from simnandez/develop
Fix: Use transcountry instead trans for localtaxes label
2012-12-12 05:41:56 -08:00
Laurent Destailleur
2c2465ffad Comment to make test 2012-12-12 13:14:28 +01:00
simnandez
614a8e48a2 Fix: Use transcountry instead trans for localtaxes label 2012-12-12 12:40:30 +01:00
Grand Philippe
993e484bdd prepare multi-user event 2012-12-12 12:17:56 +01:00
Laurent Destailleur
4413c0a5a7 Fix: upload user file 2012-12-12 11:57:56 +01:00
Laurent Destailleur
5d370c7e96 Fix: force redirect to https could not work for some environments 2012-12-12 02:37:15 +01:00
Laurent Destailleur
0128cc36c8 Fix: url example 2012-12-12 01:57:52 +01:00
Laurent Destailleur
caf897cfa7 Clean code to help debug pb with payment methods. 2012-12-12 01:49:23 +01:00
Laurent Destailleur
a972199296 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-12-12 00:51:15 +01:00
Laurent Destailleur
38b1c540ef Fix: Bad url forging 2012-12-12 00:49:32 +01:00
Grand Philippe
dc0558989b Merge remote-tracking branch 'origin/develop' into develop 2012-12-11 19:04:54 +01:00
Laurent Destailleur
7c19fc97b8 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-12-11 18:05:39 +01:00
Regis Houssin
15fd12e0b7 Merge pull request #536 from cbattarel/develop
fix missing $conf global var in llxHeader() function
2012-12-11 06:20:20 -08:00
Christophe Battarel
27670d62ba fix missing $conf global var in llxHeader() function 2012-12-11 15:14:43 +01:00
Laurent Destailleur
cee805f473 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-12-11 11:00:37 +01:00
Laurent Destailleur
080276a504 Fix: bad escape function. email missing 2012-12-11 10:59:03 +01:00
Laurent Destailleur
1c02dc4f9d Fix: better translation 2012-12-11 10:50:35 +01:00
Laurent Destailleur
f4459ee1f1 Fix: Regression detected by PHPUnit 2012-12-10 19:06:59 +01:00
Laurent Destailleur
43fe5766a1 New: Holiday need to support half day to be usefull. 2012-12-10 16:10:08 +01:00
Grand Philippe
8b5262cd82 fix 2012-12-10 11:28:39 +01:00
Grand Philippe
a91a96e72e merge 2012-12-10 10:02:13 +01:00
Laurent Destailleur
88ffda4bfb Qual: Enhance quality controls for 3.3 2012-12-10 02:00:21 +01:00
Laurent Destailleur
8e764e88e6 Update TCPF
Added japanese font files.
2012-12-10 01:47:39 +01:00
Laurent Destailleur
ab5998d32f Fix: japanese language 2012-12-10 01:42:25 +01:00
Laurent Destailleur
21bd9bf749 Merge pull request #533 from FHenry/develop
comment
2012-12-09 11:56:54 -08:00
Laurent Destailleur
5931df82c6 Qual: Clean code to make choice of default value easier. 2012-12-09 20:54:45 +01:00
Laurent Destailleur
70be706347 New: Add greece regions and provinces 2012-12-09 20:01:16 +01:00
fhenry
adcb70eafa Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-12-09 19:13:47 +01:00
Laurent Destailleur
773e3decf6 Fix: typo 2012-12-09 18:50:10 +01:00
Laurent Destailleur
c44481fb91 Normalize key name 2012-12-09 18:47:23 +01:00
Laurent Destailleur
f4def0cd89 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-12-09 18:45:03 +01:00
Laurent Destailleur
03cacbcd1d Ignore external modules 2012-12-09 18:44:31 +01:00
Laurent Destailleur
f47422f551 Fix: Errors into turnover reports 2012-12-09 18:40:01 +01:00
Laurent Destailleur
77ca4241a5 New: Can input a payment back onto an credit note. 2012-12-09 18:39:42 +01:00
fhenry
ec09f79a2f comment 2012-12-08 19:23:13 +01:00
Regis Houssin
158f581f03 Merge pull request #532 from FHenry/develop
prepare module for "Single login at one time"
2012-12-08 10:09:29 -08:00
fhenry
0e76875e9c prepare single login at one time 2012-12-08 18:41:32 +01:00
Laurent Destailleur
8a5485c9b6 New: Skin can be personalized according to environment. 2012-12-08 18:38:14 +01:00
Laurent Destailleur
cd676b323d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-12-08 18:32:18 +01:00
fhenry
4570c57bfd Change-Id: I003fa45e6e932350b9d21b00ed4817b943470223 2012-12-08 18:28:19 +01:00
fhenry
131dc88139 prepare module for "Single login at one time" 2012-12-08 18:14:13 +01:00
Laurent Destailleur
c3e3595d9c Look: Uniformize style 2012-12-08 17:42:08 +01:00
Regis Houssin
88b3e53891 Merge pull request #531 from FHenry/develop
Fix bug PGSQL
2012-12-08 08:21:36 -08:00
Laurent Destailleur
3ec2ea0b25 Fix: More complete system info 2012-12-08 17:14:51 +01:00
fhenry
b3d21a4320 Fix [ bug #634 ] Install faild on PostGreSQL
Fix  [ bug #631 ] Index Creation failed on fresh install with PostgreSQL
2012-12-08 17:01:07 +01:00
Regis Houssin
48438e1176 Merge pull request #530 from FHenry/develop
Better bahaviour for pgSQL autoupdate trigger
2012-12-08 07:47:56 -08:00
fhenry
dbe00e9fbd Better bahaviour for pgSQL autoupdate trigger 2012-12-08 16:01:05 +01:00