Jacques Le Roux
db15bad878
From an error found in error.log on demo server
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@766800 13f79535-47bb-0310-9956-ffa450edef68
2009-04-20 19:05:14 +00:00
Hans Bakker
312c4e1b4b
reverted some unwanted changes
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@766623 13f79535-47bb-0310-9956-ffa450edef68
2009-04-20 08:46:13 +00:00
Hans Bakker
bd2d2fcc86
start forward and reply with status pending
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@766618 13f79535-47bb-0310-9956-ffa450edef68
2009-04-20 08:38:35 +00:00
David E. Jones
70f8da92bb
Moved logo and icon images back to images component and removed from everywhere else; all references to these should be to there only now; fixes issue with logo in ecommerce and other little things
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@766426 13f79535-47bb-0310-9956-ffa450edef68
2009-04-19 06:12:55 +00:00
Ashish Vijaywargiya
82780cedae
Applied patch from Jira issue OFBIZ-1901 (Class cast exception on doing survey [ take survey ] on Customer Profile).
...
Framework part has been committed by Jacopo and here is the code snippet changes in applications & special purpose.
Thanks to Vikas Mayur for working on framework part.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@766293 13f79535-47bb-0310-9956-ffa450edef68
2009-04-18 10:40:40 +00:00
Hans Bakker
cde952f0db
improve form, remove debug messages and show with demo data how to render an xml datResourceId using an ftl dataResourceId as template
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@766217 13f79535-47bb-0310-9956-ffa450edef68
2009-04-18 05:33:50 +00:00
Jacopo Cappellato
3397dc68a1
Added missing license header; added {SHA} prefix to demo passwords; small formatting fixes.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@766011 13f79535-47bb-0310-9956-ffa450edef68
2009-04-17 13:57:02 +00:00
Jacques Le Roux
08134723d2
In Controller.xml
...
path="org/ofbiz/(\w*)/(.*)" (.*) => path="component://$1/script/org/ofbiz/$1/$2" $3
path="org/ofbiz/(\w*)/(.*)" => path="component://$1/script/org/ofbiz/$1/$2"
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@765798 13f79535-47bb-0310-9956-ffa450edef68
2009-04-16 23:07:52 +00:00
Hans Bakker
1043ebd3c6
corrected error in email setting for new user
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@765060 13f79535-47bb-0310-9956-ffa450edef68
2009-04-15 06:10:12 +00:00
Adrian Crum
21443df330
Eliminated an unnecessary nested expression.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@764920 13f79535-47bb-0310-9956-ffa450edef68
2009-04-14 18:50:05 +00:00
Vikas Mayur
c317415793
Changed the alt attribute of <img> tag to use label instead of free form string to support i18n stuff for all the lookup screens.
...
Patch from Divesh, Part of OFBIZ-2276 (https://issues.apache.org/jira/browse/OFBIZ-2276 ).
I have also changed alt="Lookup" with the label.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@764753 13f79535-47bb-0310-9956-ffa450edef68
2009-04-14 12:08:55 +00:00
Marco Risaliti
157b52c1d2
PayPal IPN use the new Payment Gateway Config features (OFBIZ-2286)
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@764327 13f79535-47bb-0310-9956-ffa450edef68
2009-04-12 21:11:42 +00:00
Jacques Le Roux
999bd7c577
Fix following Chris Howe's message in dev ML
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@764195 13f79535-47bb-0310-9956-ffa450edef68
2009-04-11 13:00:24 +00:00
Jacques Le Roux
3c94bec42b
I finally reverted almost all Ashish Nagar's patch from https://issues.apache.org/jira/browse/OFBIZ-2260 - OFBIZ-2260 that I commited after a review but no tests in r762149.
...
This because these URLs in FTL file were not calling services, hence, as explained David, did not need any changes
I kept only changes I found by chances (because I got conflicts in them) in
specialpurpose\ecommerce\webapp\ecommerce\order\orderitems.ftl
specialpurpose\ecommerce\webapp\ecommerce\order\orderheader.ftl
applications/order/webapp/ordermgr/order/ordershippinginfo.ftl
I also added one secured URLs - createShipment2 - in this last file and there are more to do just below : quickDropShipOrder, createShipment. I think we need more than good will and chance here. We need to define a strategy to spot the URLs calling services in ftl files. This does not sound like impossible to automatize and I firmly think we should do that before freezing R9.04
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@764077 13f79535-47bb-0310-9956-ffa450edef68
2009-04-10 22:09:23 +00:00
David E. Jones
298fbb94ef
Fixed issue with data loading I caused when moving this record from the ecommerce component to the order component; reported on the ml by gil portenseigne
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@764074 13f79535-47bb-0310-9956-ffa450edef68
2009-04-10 22:03:14 +00:00
Hans Bakker
0e46245430
correct file name error
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@763884 13f79535-47bb-0310-9956-ffa450edef68
2009-04-10 07:02:49 +00:00
David E. Jones
bc073306e7
Added/moved some missing WebSite data needed for selecting themes, etc
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@763828 13f79535-47bb-0310-9956-ffa450edef68
2009-04-09 22:12:11 +00:00
Marco Risaliti
a657adadf8
Move payment.properties to PaymentGatewayConfig entities (OFBIZ-2269)
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@763782 13f79535-47bb-0310-9956-ffa450edef68
2009-04-09 19:45:31 +00:00
Hans Bakker
691fb008f5
buttons were missing
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@763667 13f79535-47bb-0310-9956-ffa450edef68
2009-04-09 14:45:09 +00:00
Jacques Le Roux
b9c3ddef08
2d part and end of an effort to remove trailing spaces
...
[ \t]+$ => "" (empty)
Should be easier to review when committing changes with trailing spaces removed automatically by anyedit or such tool (please refer to http://docs.ofbiz.org/x/mg )
Of course this effort to remove trailing spaces has no functional implications.
Actually, I was doing a 1st commit and as it's long to upload, I got conflicts with r763135
In the meantime I did some refactoring also in *.java and *.groovy files :
){ => ) {
if( => if (
while( => while (
}else => } else
else{ => else {
switch( => switch (
try{ => try {
}catch => } catch
catch( => catch (
}finally{ => } finally {
So these changes are also in this commit, should not be a problem anyway.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@763175 13f79535-47bb-0310-9956-ffa450edef68
2009-04-08 10:54:51 +00:00
Hans Bakker
af6b6e5187
corrected header and typo
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@763173 13f79535-47bb-0310-9956-ffa450edef68
2009-04-08 10:40:15 +00:00
Hans Bakker
c1491066f0
moved custrequest notification from myportal to order,moved other programs around, reorganized customer request status handling, replaced cust request roles from ftl to form, removed other used programs from myportal. Now only the party registration is left in myportal.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@763135 13f79535-47bb-0310-9956-ffa450edef68
2009-04-08 07:58:00 +00:00
Hans Bakker
f02eccc0bd
fix error on notelist for a project
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@762661 13f79535-47bb-0310-9956-ffa450edef68
2009-04-07 09:28:25 +00:00
Jacques Le Roux
a5042291f7
1st part of an effort to remove trailing spaces
...
" +/> => "/>
Should be easier when dealing with Eclipse S/R regexp
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@762648 13f79535-47bb-0310-9956-ffa450edef68
2009-04-07 08:27:15 +00:00
Bilgin Ismet Ibryam
9c955458a0
Copied aggregated product ajax request from order manager to ecommerce, as it needs to be called using http (but not https).
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@762642 13f79535-47bb-0310-9956-ffa450edef68
2009-04-07 07:36:20 +00:00
Hans Bakker
4766564e4c
move company events from myportal to workeffort
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@762631 13f79535-47bb-0310-9956-ffa450edef68
2009-04-07 06:07:32 +00:00
Jacques Le Roux
d1c6f07aa3
Secure URLs fix
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@762278 13f79535-47bb-0310-9956-ffa450edef68
2009-04-06 11:15:51 +00:00
Hans Bakker
897e5b96f1
delete mypage component,moved some labels, myportal is a good replacement
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@762245 13f79535-47bb-0310-9956-ffa450edef68
2009-04-06 07:53:25 +00:00
Hans Bakker
3569bcaad5
move project info from myportal to projectmgr, added some demo data to test these screens
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@762232 13f79535-47bb-0310-9956-ffa450edef68
2009-04-06 07:17:19 +00:00
Jacques Le Roux
32ea4ee263
A patch from Ashish Nagar "Secure URLs in Freemarker templates files" https://issues.apache.org/jira/browse/OFBIZ-2260
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@762224 13f79535-47bb-0310-9956-ffa450edef68
2009-04-06 06:55:07 +00:00
Jacques Le Roux
76f5ca6638
Secure URLs, we don't need to duplicate in from-field when param-name is the same
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@762215 13f79535-47bb-0310-9956-ffa450edef68
2009-04-06 06:25:24 +00:00
Ashish Vijaywargiya
a5cd8350bc
Very small change.
...
to --> do :-)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@762212 13f79535-47bb-0310-9956-ffa450edef68
2009-04-06 05:35:04 +00:00
Jacques Le Roux
61a5c1dcf4
A modified patch from Ashish Nagar "Secure URLs in Freemarker templates files" https://issues.apache.org/jira/browse/OFBIZ-2260
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@762149 13f79535-47bb-0310-9956-ffa450edef68
2009-04-05 20:16:46 +00:00
Jacques Le Roux
d2e3fa2819
Was missing in previous commit (Eclipse edit trap)
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@762146 13f79535-47bb-0310-9956-ffa450edef68
2009-04-05 20:09:08 +00:00
Jacques Le Roux
5c924de13c
Secured URLs : random fixes (but not done randomly but using <<param-name=(.*)&>>, so are the last of this kind)
...
Fix some French labels
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@762067 13f79535-47bb-0310-9956-ffa450edef68
2009-04-05 11:08:43 +00:00
Hans Bakker
ed8503aa61
move list customer invoices from myportal into accounting
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@762061 13f79535-47bb-0310-9956-ffa450edef68
2009-04-05 10:02:32 +00:00
Jacques Le Roux
634aaf75e0
Last tabs to spaces
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@762025 13f79535-47bb-0310-9956-ffa450edef68
2009-04-04 22:23:19 +00:00
Jacques Le Roux
c262e7e0c9
Securing URLs, link element in screens and menus : 34th and last set + tabs to 4 spaces
...
End of non regular formattings and other cases.
This is the end of the process, we just have to wait for typos and such now... Hopefully not too much, at least I tried my best.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@762022 13f79535-47bb-0310-9956-ffa450edef68
2009-04-04 22:12:23 +00:00
Jacques Le Roux
69357dd078
Securing URLs, link element in screens and menus : 33th set + tabs to 4 spaces
...
Continue to end with non regular formattings
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@762018 13f79535-47bb-0310-9956-ffa450edef68
2009-04-04 21:46:04 +00:00
Jacques Le Roux
fafb422e12
Securing URLs, link element in screens and menus : 32th set + tabs to 4 spaces
...
Continue to end with non regular formattings
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@762015 13f79535-47bb-0310-9956-ffa450edef68
2009-04-04 21:35:08 +00:00
Jacques Le Roux
9fe85c7878
Securing URLs, link element in screens and menus : 32th set + tabs to 4 spaces
...
Begin to end with non regular formattings
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@762010 13f79535-47bb-0310-9956-ffa450edef68
2009-04-04 21:06:20 +00:00
Jacques Le Roux
3efbbc81cd
Securing URLs, link element in screens and menus : 29th set + tabs to 4 spaces
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@761976 13f79535-47bb-0310-9956-ffa450edef68
2009-04-04 17:46:49 +00:00
Jacques Le Roux
607649bac8
Securing URLs, link element in screens and menus : 27th set + tabs to 4 spaces
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@761270 13f79535-47bb-0310-9956-ffa450edef68
2009-04-02 12:45:50 +00:00
Jacques Le Roux
ef0137f95b
Securing URLs, link element in screens and menus : 26th set + tabs to 4 spaces
...
We continue to approach the end... But for some exceptions, more than the 2 I found before. I will write a compilation on dev ML at end
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@761261 13f79535-47bb-0310-9956-ffa450edef68
2009-04-02 12:14:18 +00:00
Jacques Le Roux
bc1afdfb39
Securing URLs, link element in screens and menus : 25th set + tabs to 4 spaces
...
We are near the end...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@761240 13f79535-47bb-0310-9956-ffa450edef68
2009-04-02 10:31:49 +00:00
Jacques Le Roux
76352e305a
Securing URLs, link element in screens and menus : 24th set + tabs to 4 spaces
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@761238 13f79535-47bb-0310-9956-ffa450edef68
2009-04-02 10:27:18 +00:00
Jacques Le Roux
c414afde0f
Securing URLs, link element in screens and menus : 23th set + tabs to 4 spaces
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@761223 13f79535-47bb-0310-9956-ffa450edef68
2009-04-02 10:02:34 +00:00
Bilgin Ismet Ibryam
7e7c1f375a
Added an optional "name" attribute to event element in controller.xml This attribute is used only (also required) in events inside
...
firstvisit, after-login, before-logout, preprocessor and postprocessor elements. Events with same name will be overridden and only the last one will be executed. Overriding works also in cases when a controller.xml includes other controller files.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@761220 13f79535-47bb-0310-9956-ffa450edef68
2009-04-02 09:47:48 +00:00
Jacques Le Roux
e8426631e8
Securing URLs, link element in screens and menus : 22th set + tabs to 4 spaces
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@761214 13f79535-47bb-0310-9956-ffa450edef68
2009-04-02 09:14:40 +00:00
Hans Bakker
cbbe02a1d8
many cleanups, moved customer requests back into order, fixed the edit contactmech in portal as reported in the mailing list
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@761186 13f79535-47bb-0310-9956-ffa450edef68
2009-04-02 06:57:09 +00:00