Jacques Le Roux
aaa94de2cd
last component:// in controllers missing
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@767125 13f79535-47bb-0310-9956-ffa450edef68
2009-04-21 12:30:36 +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
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
af5b099668
Cleaning my "clean instance" I (finally) found (only) this (a trailing space)
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@764188 13f79535-47bb-0310-9956-ffa450edef68
2009-04-11 09:41:11 +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
Jacques Le Roux
39c91eefe3
Reverted all changes done in r762149 since these were not for services calls
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@764066 13f79535-47bb-0310-9956-ffa450edef68
2009-04-10 21:36:41 +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
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
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
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
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
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
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
Jacques Le Roux
85de0c1d3a
Securing URLs, link element in screens and menus : 3rd set
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@760586 13f79535-47bb-0310-9956-ffa450edef68
2009-03-31 20:20:29 +00:00
Jacques Le Roux
6868719669
Useless as explained by David on dev ML (intra-app). Moreover there were full of typos :/
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@760409 13f79535-47bb-0310-9956-ffa450edef68
2009-03-31 11:52:21 +00:00
Jacques Le Roux
77a2ff1d9f
21th set of changes explained in https://issues.apache.org/jira/browse/OFBIZ-2243
...
In hyperlink and sub-hyperlink elements, replacement of target parameters by parameter sub-elements
We are near the end...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@759684 13f79535-47bb-0310-9956-ffa450edef68
2009-03-29 14:02:55 +00:00
Jacques Le Roux
40f5281303
20th set of changes explained in https://issues.apache.org/jira/browse/OFBIZ-2243
...
In hyperlink and sub-hyperlink elements, replacement of target parameters by parameter sub-elements
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@759680 13f79535-47bb-0310-9956-ffa450edef68
2009-03-29 13:33:53 +00:00
Jacques Le Roux
8c6d89fe75
18th set of changes explained in https://issues.apache.org/jira/browse/OFBIZ-2243
...
In hyperlink and sub-hyperlink elements, replacement of target parameters by parameter sub-elements
This one is huge, with some changes by hand, conversion from tabs to 4 spaces and some trailing spaces (I have activated it AnyEdit plugin following the changes I made in http://docs.ofbiz.org/display/OFBADMIN/Coding+Conventions but I wonder if I should not reverse all that - I mean my plugin setting and in wiki -, it's a nightmare!)
I did my best on this one, but I'm not sure some typos did not slip in. Anyway, alea jacta est
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@759666 13f79535-47bb-0310-9956-ffa450edef68
2009-03-29 11:00:00 +00:00
Jacques Le Roux
c97ffabfa5
17th set of changes explained in https://issues.apache.org/jira/browse/OFBIZ-2243
...
In hyperlink and sub-hyperlink elements, replacement of target parameters by parameter sub-elements
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@759654 13f79535-47bb-0310-9956-ffa450edef68
2009-03-29 09:04:49 +00:00
Jacques Le Roux
3fe66ef254
tabs to 4 spaces
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@759574 13f79535-47bb-0310-9956-ffa450edef68
2009-03-28 20:13:03 +00:00
Jacques Le Roux
0a55248195
14th set of changes explained in https://issues.apache.org/jira/browse/OFBIZ-2243
...
In hyperlink and sub-hyperlink elements, replacement of target parameters by parameter sub-elements
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@759565 13f79535-47bb-0310-9956-ffa450edef68
2009-03-28 20:01:04 +00:00
Jacques Le Roux
2f9c37bd22
13th set of changes explained in https://issues.apache.org/jira/browse/OFBIZ-2243
...
In hyperlink and sub-hyperlink elements, replacement of target parameters by parameter sub-elements
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@759564 13f79535-47bb-0310-9956-ffa450edef68
2009-03-28 19:56:49 +00:00
Jacques Le Roux
e3f730799b
12th set of changes explained in https://issues.apache.org/jira/browse/OFBIZ-2243
...
In hyperlink and sub-hyperlink elements, replacement of target parameters by parameter sub-elements
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@759562 13f79535-47bb-0310-9956-ffa450edef68
2009-03-28 19:45:05 +00:00
Jacques Le Roux
efd4862041
10th set of changes explained in https://issues.apache.org/jira/browse/OFBIZ-2243
...
In hyperlink and sub-hyperlink elements, replacement of target parameters by parameter sub-elements
Some hyperlink tag are still not well indented (3 spaces instead of 4), I gave up :/
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@759515 13f79535-47bb-0310-9956-ffa450edef68
2009-03-28 17:36:08 +00:00
Jacques Le Roux
10a5ee651a
Replace tabs by 4 spaces in previous commit. I used 4 spaces instead of 2 because this was already used in this files
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@759496 13f79535-47bb-0310-9956-ffa450edef68
2009-03-28 16:16:29 +00:00
Jacques Le Roux
a30c0c9f3e
8th set of changes explained in https://issues.apache.org/jira/browse/OFBIZ-2243
...
In hyperlink and sub-hyperlink elements, replacement of target parameters by parameter sub-elements
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@759495 13f79535-47bb-0310-9956-ffa450edef68
2009-03-28 16:14:58 +00:00
Jacques Le Roux
6936c24e22
6th set of changes explained in https://issues.apache.org/jira/browse/OFBIZ-2243
...
In hyperlink and sub-hyperlink elements, replacement of target parameters by parameter sub-elements
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@759481 13f79535-47bb-0310-9956-ffa450edef68
2009-03-28 15:12:54 +00:00
Jacques Le Roux
4106babe54
Forgot to replace tabs by 4 spaces in previous commit. I used 4 spaces instead of 2 because this was already used in this files
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@759468 13f79535-47bb-0310-9956-ffa450edef68
2009-03-28 14:25:39 +00:00
Jacques Le Roux
e157e9aba6
Fix an issue when modifying an order item (related to recent secure changes)
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@758780 13f79535-47bb-0310-9956-ffa450edef68
2009-03-26 18:09:38 +00:00
Jacques Le Roux
a54a1f2c3c
I18n and L10n of promotions details in eCommerce
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@758562 13f79535-47bb-0310-9956-ffa450edef68
2009-03-26 08:55:05 +00:00
David E. Jones
1619b646ff
A number of other links coverted to forms, also fixed various request-redirect responses to have redirect-parameter sub-elements, and changed the error responses to use view instead of request-redirect, which is important because if request-redirect is used on an error the error message and other request attributes will be lost
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@758521 13f79535-47bb-0310-9956-ffa450edef68
2009-03-26 05:36:45 +00:00
David E. Jones
4ec771b07c
More link to form changes; also changed the request-redirect on the updateOrderPaymentPreference request to specify a redirect-parameter; as a general note: ALL uses of request-redirect should use the redirect-parameter sub-element
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@758512 13f79535-47bb-0310-9956-ffa450edef68
2009-03-26 03:58:49 +00:00
David E. Jones
cbc7022dee
Added quotes and self-terminating tags to previous commit; should have looked more closely at the HTML syntax from the patch
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@758506 13f79535-47bb-0310-9956-ffa450edef68
2009-03-26 02:48:53 +00:00
David E. Jones
a47da2606d
A modified version of the patch from Deepesh Kapoort in OFBIZ-2252, see issue comments for changes from original; resolves issue with insecure information passed to the server for status change links, which now must be encrypted in the form body in order to protect from spoofed requests and the like
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@758502 13f79535-47bb-0310-9956-ffa450edef68
2009-03-26 02:23:20 +00:00
Vikas Mayur
43b1af6e73
Changing the labels that were added in r756001 to CommonHigh, CommonLow and CommonNormal, thanks Jacques!
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@756134 13f79535-47bb-0310-9956-ffa450edef68
2009-03-19 18:58:16 +00:00
Vikas Mayur
a131758b9e
Another new feature from Pranay and Co.
...
Now Order reservation can be changed manually by setting priority (new field priority on OrderHeader and OrderItemShipGrpInvRes) for the order. This way few orders can be
fulfilled while waiting for sufficient inventory to fulfill large orders.
Applied patch from OFBIZ-2224 (https://issues.apache.org/jira/browse/OFBIZ-2224 ).
Thanks Pratik Khera and Pranay Pandey.
i18n Note: This commit has three new labels (IMO, they can be moved to common component with names something like CommonHigh, CommonLow etc.)
Pratik, I have done minor changes in the service and they are
1) Used <if-empty field=""> instead of <if> <condition> <if-empty> as this makes the logic more clearer.
2) Removed <condition-list> because their is only one expression in the <entity-condition>
3) Added <clear-field> in the iteration, to make sure that always a new value will be set in the map that is passed to a service and <store-value>
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@756001 13f79535-47bb-0310-9956-ffa450edef68
2009-03-19 13:58:08 +00:00
Vikas Mayur
9e7732ea1a
Functionality to add bulk products to purchase order through order detail page.
...
Patch applied from OFBIZ-2221 (https://issues.apache.org/jira/browse/OFBIZ-2221 ) with slight modification to
1) Label
2) Used view-size in form instead of screen definition.
Thanks to Akash Jain, Pranay Pandey (review and test).
i18n note: This commit has new label.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@755627 13f79535-47bb-0310-9956-ffa450edef68
2009-03-18 16:10:44 +00:00
Vikas Mayur
7bc9f320d3
Cancel back orders from supplier if the cancelBackOrderDate (new field on OrderItem) has passed. This is achieved using a schedule job.
...
Patch applied from OFBIZ-2220 (https://issues.apache.org/jira/browse/OFBIZ-2220 ).
Thanks Deepesh Kapoor and Pranay Pandey for testing.
On a side note, I have changed the field description on the entity to use <description> element instead of <!-- -->. Also changed this for adjacent field.
Changed the description of the service a bit.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@755596 13f79535-47bb-0310-9956-ffa450edef68
2009-03-18 13:54:53 +00:00
Ashish Vijaywargiya
4769650733
Changed "toDayDate" to "todayDate".
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@755148 13f79535-47bb-0310-9956-ffa450edef68
2009-03-17 08:30:17 +00:00
Jacques Le Roux
0fa4b73da1
A 2d patch from Divesh Dutta " Functionality for putting in estimatedShipDate and estimatedDeliveryDate for order items." ( https://issues.apache.org/jira/browse/OFBIZ-2239 ) - OFBIZ-2239
...
Only for PO
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@755144 13f79535-47bb-0310-9956-ffa450edef68
2009-03-17 08:12:07 +00:00
Jacques Le Roux
219f600813
A patch from Divesh Dutta " Functionality for putting in estimatedShipDate and estimatedDeliveryDate for order items." ( https://issues.apache.org/jira/browse/OFBIZ-2239 ) - OFBIZ-2239
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@755011 13f79535-47bb-0310-9956-ffa450edef68
2009-03-16 21:34:50 +00:00
Marco Risaliti
80f390b7c3
A lot of hardcoded labels cleaning and changes some wrong references
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@755005 13f79535-47bb-0310-9956-ffa450edef68
2009-03-16 21:08:21 +00:00
Jacques Le Roux
357213101c
A patch from Bharat Soni "When recording PO, Company automatically sets price as "last price" on Supplier record." ( https://issues.apache.org/jira/browse/OFBIZ-2234 ) - OFBIZ-2234
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@754834 13f79535-47bb-0310-9956-ffa450edef68
2009-03-16 07:30:35 +00:00
David E. Jones
477216faff
A few changes to fix issues with the catalog search engine friendly urls when ecommerce is mounted on the root of the server, as reported in Jira #OFBIZ-2238; there was an issue with 2 forwarded slashes at the beginning instead of one, and the servlet mount of catalog conflicted with the catalog webapp, so changed that to products
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@753118 13f79535-47bb-0310-9956-ffa450edef68
2009-03-13 05:15:10 +00:00
Marco Risaliti
2d8f185142
A lot of hardcoded labels cleaning and changes some wrong references
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@753028 13f79535-47bb-0310-9956-ffa450edef68
2009-03-12 21:50:12 +00:00
Jacques Le Roux
73e2cca8cf
A patch from Bharat Soni "Buyer should be able to specify PO# otherwise it should be generated automatically while placing a purchase order." ( https://issues.apache.org/jira/browse/OFBIZ-2218 ) - OFBIZ-2218
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@752866 13f79535-47bb-0310-9956-ffa450edef68
2009-03-12 13:51:35 +00:00
Jacques Le Roux
fe916a2394
Fix a bug found while trying to close https://issues.apache.org/jira/browse/OFBIZ-1533
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@751691 13f79535-47bb-0310-9956-ffa450edef68
2009-03-09 14:31:15 +00:00
Bruno Busco
a36cb4dd3e
Changed WebSiteId parameter description to be more general
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@751214 13f79535-47bb-0310-9956-ffa450edef68
2009-03-07 07:19:07 +00:00
Jacques Le Roux
b1c10a25a0
i18n TODO
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@750644 13f79535-47bb-0310-9956-ffa450edef68
2009-03-05 22:41:17 +00:00
David E. Jones
8bfdcca42e
Small changes to have the additem request in ecommerce use the new view-last response type; this simplifies the templates quite a bit and will support staying on the same page anywhere without additional effort when adding to the cart; note that the view cart setting still works as it was a different response in ecommerce, and this doesn't effect the order manager which is made to always go back to the cart screen anyway and doesn't try to stay on the same page
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@750587 13f79535-47bb-0310-9956-ffa450edef68
2009-03-05 21:07:30 +00:00