Commit Graph

27236 Commits

Author SHA1 Message Date
Regis Houssin
a1ac69f614 New: add Amarok theme (experimental) 2012-04-17 11:50:25 +02:00
Laurent Destailleur
dc547cfa7d Look: Uniformize look 2012-04-17 11:40:08 +02:00
Laurent Destailleur
4be802597d Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-04-17 10:28:11 +02:00
Laurent Destailleur
220d7a2c33 Fix: eldy theme still works without css3 2012-04-17 10:27:42 +02:00
Regis Houssin
65b9d6281d Merge pull request #168 from grandoc/develop
update approve function
2012-04-16 03:20:00 -07:00
Laurent Destailleur
66531ea539 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git
into develop

Conflicts:
	htdocs/fourn/commande/index.php
2012-04-16 12:03:33 +02:00
Laurent Destailleur
9114fec4ed Doxygen 2012-04-16 12:01:32 +02:00
Regis Houssin
6c3e88e43a Fix: missing field change name 2012-04-16 11:52:27 +02:00
Laurent Destailleur
9e0cd530bc New: Add date approve into log view. 2012-04-16 11:43:19 +02:00
Regis Houssin
a03b216c63 Fix: remove unnecessary function 2012-04-16 11:39:51 +02:00
Laurent Destailleur
48542b8625 Fix: Must use tms date 2012-04-16 11:39:26 +02:00
Regis Houssin
258a06a281 Fix: increase size of "body" field 2012-04-16 11:20:56 +02:00
Laurent Destailleur
f7acd0f5c3 Fix: Bad path for instal.lock 2012-04-16 11:07:09 +02:00
Grand Philippe
30c5160007 update approve function 2012-04-16 09:50:02 +02:00
Laurent Destailleur
b315bf3e3a Fix: Generate donation document 2012-04-16 01:23:53 +02:00
Laurent Destailleur
f9e2fe0440 Fix: date must be quoted 2012-04-15 19:22:43 +02:00
Laurent Destailleur
b23bbc2432 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git
into develop

Conflicts:
	htdocs/projet/class/task.class.php
2012-04-15 18:49:09 +02:00
Laurent Destailleur
9a70541084 Fix: Missing migration field
Fix: Date must be quoted
2012-04-15 18:41:38 +02:00
Regis Houssin
48543a0d2f Fix: sorry it's ok 2012-04-15 18:33:14 +02:00
Laurent Destailleur
58f9cc2f7b Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-04-15 18:19:21 +02:00
Regis Houssin
de20b6b70e Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-04-15 18:19:04 +02:00
Laurent Destailleur
ef79c1ba21 Fix: commit at wrong place 2012-04-15 18:18:46 +02:00
Regis Houssin
057103902b Fix: you can not delete project document folder in delete task method 2012-04-15 18:17:55 +02:00
Regis Houssin
f85eced62d Merge pull request #167 from grandoc/develop
fix : trad
2012-04-15 08:58:38 -07:00
Laurent Destailleur
0f8156ebcf Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-04-15 17:56:30 +02:00
Laurent Destailleur
4f1f25b89c Fix: numbering when reset is on was wrong for past dates 2012-04-15 17:55:45 +02:00
FHenry
bf8389144a correct bug 364 2012-04-15 17:51:05 +02:00
FHenry
d66eb5bb23 Corect bug #364 2012-04-15 17:50:50 +02:00
FHenry
cac4d0da6b Correct bug 363 2012-04-15 17:50:40 +02:00
FHenry
d7ae9db463 Correct bug #363 2012-04-15 17:50:26 +02:00
Grand Philippe
d79c8a3fa1 change from cloture to approve and complete function approve 2012-04-15 16:49:49 +02:00
Grand Philippe
548bbe78e6 Merge remote-tracking branch 'dolibarr/develop' into develop 2012-04-15 16:32:45 +02:00
Laurent Destailleur
8562cb677d Fix: Restore lost fix into tcpdf 2012-04-15 15:46:50 +02:00
Laurent Destailleur
269a4a8ba8 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-04-15 15:25:14 +02:00
Grand Philippe
f218aa0ec6 fix : trad 2012-04-15 12:27:10 +02:00
Regis Houssin
161e39794e Fix: security update for multicompany 2012-04-15 11:30:06 +02:00
Regis Houssin
a2f363c24b Fix: right access error 2012-04-15 10:09:32 +02:00
Regis Houssin
f0f74a7d92 Fix: disable php display errors with $dolibarr_main_prod 2012-04-15 09:30:40 +02:00
Regis Houssin
6a3587adb5 Merge pull request #165 from grandoc/develop
try to fix create issue...but not enought
2012-04-14 23:27:36 -07:00
Laurent Destailleur
c4c2b4ee7f Fix: PHP 5.4 2012-04-14 20:21:06 +02:00
Laurent Destailleur
df13921ed4 Germany data not complete. 2012-04-14 19:31:10 +02:00
Grand Philippe
5858ef3bf1 try to fix create issue...but not enought 2012-04-14 19:10:15 +02:00
Laurent Destailleur
ebc9cc2ad7 Fix: Some bug into rpm and debian packaging. 2012-04-14 15:41:34 +02:00
Laurent Destailleur
0d42b96b98 Fix: licence pb with fedora 2012-04-14 15:41:03 +02:00
Regis Houssin
e49df57667 Fix: compatibility with php 5.4 and E_STRICT mode 2012-04-14 15:04:46 +02:00
Laurent Destailleur
c876b6f2be Fix: debian epiphany and iceweasel browsers. 2012-04-14 03:20:10 +02:00
Laurent Destailleur
45e61b1a10 Fix: logo size was too large. 2012-04-14 02:54:07 +02:00
Regis Houssin
ad5770ac21 Fix: not set delivery date during create 2012-04-13 19:13:48 +02:00
Regis Houssin
f2c5e1f984 Merge pull request #163 from grandoc/develop
uniformise code and fix rights
2012-04-13 06:36:14 -07:00
Grand Philippe
980fa86857 uniformise code and fix rights 2012-04-13 14:02:53 +02:00
Regis Houssin
026ee8ddb7 New: add possibility to define a page break, its very important for
internal and external modules (milestone)
2012-04-12 20:52:41 +02:00
Regis Houssin
a2fc719a22 Merge pull request #162 from FHenry/develop
correct bug #360
2012-04-12 02:17:54 -07:00
FHenry
adce88c4d1 correct bug #360 2012-04-12 11:02:11 +02:00
Regis Houssin
578e13cfc6 Fix: missing date fields 2012-04-12 10:52:53 +02:00
Regis Houssin
4077ed9817 Fix: missing fields fk_user_valid and fk_user_cloture 2012-04-12 10:03:55 +02:00
Laurent Destailleur
dd4d684490 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-04-12 00:02:17 +02:00
Laurent Destailleur
14ad919109 Fix: Avoid fall of funtion if not defined 2012-04-11 17:30:51 +02:00
Regis Houssin
025a38cb60 Merge pull request #161 from grandoc/develop
trad missing
2012-04-11 08:19:39 -07:00
Regis Houssin
c2d162d4c6 Fix: add Monaco VAT rates 2012-04-11 16:52:55 +02:00
Grand Philippe
cf9d1b10b5 trad missing 2012-04-11 16:33:04 +02:00
Regis Houssin
6964a0a0c2 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-04-11 16:28:20 +02:00
Regis Houssin
68e5229e9b Fix: missing langs object 2012-04-11 16:26:45 +02:00
Laurent Destailleur
11c174e209 New: Can export supplier ref
New: Add profid6
2012-04-11 15:27:03 +02:00
Laurent Destailleur
0faa5d9196 Fix: this must not be used inside static classes 2012-04-11 14:44:54 +02:00
Laurent Destailleur
7daea97ebb Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-04-11 14:38:13 +02:00
Laurent Destailleur
0cb1e4fe7c New: Add supplier ref on supplier orders 2012-04-11 14:37:36 +02:00
Laurent Destailleur
f4cd202a29 Use correct function 2012-04-11 13:29:45 +02:00
Laurent Destailleur
f1d1b0972f Bad comment 2012-04-11 13:29:23 +02:00
FHenry
4e759b15fe Correction Bug #358 2012-04-11 10:03:57 +02:00
FHenry
ba499c0b40 Merge remote-tracking branch 'origin/develop' into develop 2012-04-11 08:42:10 +02:00
Regis Houssin
97f4a74ad0 Merge pull request #157 from FHenry/develop
Add __MAILTOEMAIL__ and configutation gobal varialbe of Check Read and
2012-04-10 23:23:42 -07:00
Regis Houssin
83135225c3 Merge pull request #159 from grandoc/develop
Develop
2012-04-10 23:18:07 -07:00
Grand Philippe
c78723a3e8 to add delivery date 2012-04-10 19:43:44 +02:00
Grand Philippe
c8dd3b4801 to add delivery date 2012-04-10 17:21:28 +02:00
Grand Philippe
06761d9753 uniformise code 2012-04-10 15:41:27 +02:00
FHenry
c59f01a70d trad FR 2012-04-10 14:39:12 +02:00
FHenry
cec2a5e7f9 Translation ES 2012-04-10 14:38:32 +02:00
FHenry
2749117aba Add __MAILTOEMAIL__ and configutation gobal varialbe of Check Read and
unsubscribe in Admin part
2012-04-10 14:32:54 +02:00
Laurent Destailleur
e3b9a3a023 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2012-04-10 12:40:24 +02:00
Laurent Destailleur
bc8d9d9d87 Fix: Removed warning 2012-04-10 12:38:10 +02:00
Regis Houssin
02d2872ac5 Fix: invert emetteur and problem with long phone number 2012-04-10 12:35:14 +02:00
Regis Houssin
42c3c6a02d Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-04-10 12:04:58 +02:00
Regis Houssin
f5097dd605 Fix: missing company logo and invert from to ! 2012-04-10 12:04:14 +02:00
Laurent Destailleur
caf2ad85ed Fix: bad link 2012-04-10 11:18:01 +02:00
Laurent Destailleur
6618c4e658 Fix: W3C 2012-04-10 11:00:42 +02:00
Laurent Destailleur
0b808b42f9 Fix: translation 2012-04-10 10:55:20 +02:00
Regis Houssin
98f7186d03 Fix: best practice 2012-04-10 08:46:23 +02:00
Laurent Destailleur
37ce5d9fca Revert code because it does not fix security hole completely. Also it
does work on origin but at a transition level.
Sanitizing for command line data must not appears inside a function used
for http data. I prefer fixing this at the source and also using a rule
that clean all attacks completely instead of a rule that clean "most
problem but not all".
2012-04-10 01:25:52 +02:00
Laurent Destailleur
1571134f7d Revert "Fix: security"
This reverts commit 380a8109e8.
2012-04-10 01:04:18 +02:00
Laurent Destailleur
4cb6ec76ee Revert "Fix: sql injection"
This reverts commit 8c3158cf28.
2012-04-10 01:03:54 +02:00
Laurent Destailleur
212b3bd60e Revert "Fix: add special test"
This reverts commit ef0e6956b3.
2012-04-10 01:03:43 +02:00
Regis Houssin
ef0e6956b3 Fix: add special test 2012-04-09 22:52:13 +02:00
Regis Houssin
8c3158cf28 Fix: sql injection 2012-04-09 22:51:13 +02:00
Regis Houssin
380a8109e8 Fix: security 2012-04-09 22:32:20 +02:00
Laurent Destailleur
1ec9125ff9 Move to 3.3 alpha 2012-04-09 16:51:17 +02:00
Laurent Destailleur
60e9bc9e8e Fix: Rounding 2012-04-09 01:20:33 +02:00
Laurent Destailleur
2d9ed89a8d Fix: Back page to list of contacts 2012-04-09 01:02:36 +02:00
Laurent Destailleur
d9b12f4802 Fix: rounding 2012-04-08 23:31:54 +02:00
Laurent Destailleur
70202f2c0c New logo 2012-04-08 23:30:56 +02:00
Laurent Destailleur
6da82e03be Uniformize code 2012-04-08 23:18:36 +02:00