Commit Graph
10472 Commits
Author SHA1 Message Date
David E. Jones 8a6d9c7515 Small change to make the date/time format more consistent with added padding
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@956123 13f79535-47bb-0310-9956-ffa450edef68
2010-06-18 20:36:23 +00:00
Scott Gray 20eef28ba9 Removed an unused import and an unnecessary call to getControllerConfig(...)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@955886 13f79535-47bb-0310-9956-ffa450edef68
2010-06-18 08:40:07 +00:00
Scott Gray 27719ce38a Controller events (post/preprocessor, first-visit, after-login etc.) without 'name' attributes were not being loaded into the controller properly since the switch to storing them in <String, Event> maps, fixed by deriving a name from the other element attributes when an explicit one isn't provided
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@955882 13f79535-47bb-0310-9956-ffa450edef68
2010-06-18 08:23:28 +00:00
Jacques Le Roux dd816e0539 A patch from Sascha Rodekamp "Set webside Id in context filter" (https://issues.apache.org/jira/browse/OFBIZ-3801) - OFBIZ-3801
Very minor: a better way to write the webSiteId in the Session (2d try ;o)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@955631 13f79535-47bb-0310-9956-ffa450edef68
2010-06-17 15:18:48 +00:00
Jacques Le Roux 595c88d634 A patch from Shubham Dubey "Using number value with calcop operator does not work as thought" (https://issues.apache.org/jira/browse/OFBIZ-3821) - OFBIZ-3821
For instance if you use

<calcop operator="multiply" field="parameters.numberSpecified">
    <number value="${uomConversion.conversionFactor}"/>

and have a value > 1000 in conversionFactor you will get 1,000 for number value. It works well if you replace by

<calcop operator="multiply">
    <calcop operator="get" field="parameters.numberSpecified"/>
    <calcop operator="get" field="uomConversion.conversionFactor"/>

The problem exists in trunk and certainly R10.04 (not tested) maybe in previous release though I don't think so, it looks like something introduced with UEL



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@955568 13f79535-47bb-0310-9956-ffa450edef68
2010-06-17 12:26:16 +00:00
Hans Bakker 5eb1ace0a3 typo in last commit (955133)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@955137 13f79535-47bb-0310-9956-ffa450edef68
2010-06-16 06:35:54 +00:00
Hans Bakker b58eececc7 when emails are sent out related to a custrequest, create also the link between email and custrequest (same pattern as for order)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@955133 13f79535-47bb-0310-9956-ffa450edef68
2010-06-16 05:48:00 +00:00
Erwan de Ferrieres 35fed9293a Replacing groovy with the lastest stable release (we had a rc since december 2009)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@955036 13f79535-47bb-0310-9956-ffa450edef68
2010-06-15 20:17:17 +00:00
Adam Heath 6eb1758421 Fix pure toString handling of values that contains "'" in them; this was
hacked to work for functions back in 2007, but it was actually broke in
all cases.  Undid the hack, and made it work correctly.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@954956 13f79535-47bb-0310-9956-ffa450edef68
2010-06-15 16:40:13 +00:00
Erwan de Ferrieres 1701c87c03 As spotted by Adrian on the dev mailing-list, this is a better writing
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@954534 13f79535-47bb-0310-9956-ffa450edef68
2010-06-14 16:07:16 +00:00
Erwan de Ferrieres 16e8f57957 Allows to parameterize a form id
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@954437 13f79535-47bb-0310-9956-ffa450edef68
2010-06-14 13:12:06 +00:00
Jacques Le Roux 9ef845d0ad A patch from BJ Freeman "complete web.xml for error reporting" (https://issues.apache.org/jira/browse/OFBIZ-3820) - OFBIZ-3820
BJ: when there is an error, the control servlet looks for an error path in <param-name>allowedPaths</param-name>
it does not find one throwing an exception which buries the orginal error.
instead of changing the code it is just easier to add the /error: path.
then the real error gets reported correctly.

JLR: This will maybe help to better understand some errors on demo servers, and can't hurt

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@954135 13f79535-47bb-0310-9956-ffa450edef68
2010-06-12 20:47:08 +00:00
Scott Gray c023d5a7c7 Check if errorCode is present before attempting to convert to an integer
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@953917 13f79535-47bb-0310-9956-ffa450edef68
2010-06-12 01:06:53 +00:00
Jacques Le Roux 4dbc07a799 A patch from Ankit Jain "Missing "not-in" operator in condtion-expr tag." (https://issues.apache.org/jira/browse/OFBIZ-3819) - OFBIZ-3819
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@953671 13f79535-47bb-0310-9956-ffa450edef68
2010-06-11 11:44:34 +00:00
Erwan de Ferrieres bace1fe029 Adding a generic uilabel for an entry's deactivation
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@953625 13f79535-47bb-0310-9956-ffa450edef68
2010-06-11 09:41:35 +00:00
Erwan de Ferrieres 928f68c016 Unexistant uilabel was used
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@953326 13f79535-47bb-0310-9956-ffa450edef68
2010-06-10 14:06:37 +00:00
Jacopo Cappellato c287fa6126 Reverted change based on feedback from Adam Heath and Adrian Crum; the issue with Oracle will be resolved with a different approach.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@953220 13f79535-47bb-0310-9956-ffa450edef68
2010-06-10 05:20:31 +00:00
Jacopo Cappellato 7cf599d103 Implemented sql date to time converter to avoid errors with Oracle.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@952997 13f79535-47bb-0310-9956-ffa450edef68
2010-06-09 13:20:21 +00:00
Jacques Le Roux 00de634751 Generalize to set_values and _multivalues. BTW I found some issues related to OFBIZ-3746, I will reopen
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@952270 13f79535-47bb-0310-9956-ffa450edef68
2010-06-07 15:28:33 +00:00
Jacques Le Roux a6d8955001 Fixes "Lookup LookupCustRequestItem goes wrong when layered" (https://issues.apache.org/jira/browse/OFBIZ-3813) - OFBIZ-3813
The line bypassed was specifically added for "Lookup Layer Search of a Variant Product" (https://issues.apache.org/jira/browse/OFBIZ-3746) - OFBIZ-3746
But it did not was generalized enough, this should handle all the other cases where a link is in a cell of the result list that is not the 1st one cell



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@952249 13f79535-47bb-0310-9956-ffa450edef68
2010-06-07 14:36:33 +00:00
Scott Gray ab7580e1d9 Add an additional google bot user agent
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@952145 13f79535-47bb-0310-9956-ffa450edef68
2010-06-07 08:52:23 +00:00
Jacques Le Roux f2297ffa9e Improves target-parameter documentation
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@951672 13f79535-47bb-0310-9956-ffa450edef68
2010-06-05 08:21:14 +00:00
Adam Heath fbd798ed61 Fix incorrect order by output in sql generation, which fixes OFBIZ-3789;
namely, there was incorrect sql generated when doing a product keyword
search.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@951553 13f79535-47bb-0310-9956-ffa450edef68
2010-06-04 20:18:37 +00:00
Jacques Le Roux eddce15982 A patch from Willem Janssen "Dutch labels patch" (https://issues.apache.org/jira/browse/OFBIZ-3800) - OFBIZ-3800
Adds Dutch translations in various UiLabel files, thanks to Vikas Raikwar for reviewing and checking

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@951124 13f79535-47bb-0310-9956-ffa450edef68
2010-06-03 19:24:26 +00:00
Jacques Le Roux 48de59e25c CommonNotAssigned was duplicated
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@951123 13f79535-47bb-0310-9956-ffa450edef68
2010-06-03 19:18:18 +00:00
Jacques Le Roux 98171d02e5 A patch from Sascha Rodekamp "Set webside Id in context filter" (https://issues.apache.org/jira/browse/OFBIZ-3801) - OFBIZ-3801
Very minor: a better way to write the webSiteId in the Session. 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@951119 13f79535-47bb-0310-9956-ffa450edef68
2010-06-03 19:10:52 +00:00
Adam Heath cfef088acf Associate to the correct geo; DE=Delaware, in the United States. A full
clean detected this error, as GeoData_US.xml wasn't imported yet, so I
got an exception when DE didn't exist.  The patch in OFBIZ-3800 was
*not* correct, and was not verified.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@951062 13f79535-47bb-0310-9956-ffa450edef68
2010-06-03 16:42:01 +00:00
Jacques Le Roux f65c6e12bf A patch from Bob Morley "Support for order by nulls first/last " (https://issues.apache.org/jira/browse/OFBIZ-3740) - OFBIZ-3740
This patch provides the fundamentals to resolve an issue where the sorting of null values were inconsistent (sometimes sorting first and other times sorting last). Specifically, this patch allows one to create an order-by clause via any of the order-by elements of "-myField NULLS LAST" where this text parses out the - (as descending) and the "nulls last".

Since not all databases support the "nulls" argument on an order by clause (it was introduced as part of the OLAP support specification) , our entity-engine.xml file allows each data source to indicate if it has this support. If the support does not exist and nulls first/last is specified, the sql that is generated uses native sql to simulate the nulls first/last intent. At this time, the derby, postgres, and oracle databases are marked to use the nulls first grammar.

Right now, if you do not specify "NULLS XXX" in the field-name for the order-by it makes no change whatsever (naturally this assumption could be changed to have a default).

It should be noted, that my intent here was ultimately to "properly" model the order by into something whose xml representation could look something like ...
<entity-order-by field-name="fieldName" ascending="true" nulls-first="true" />

Divesh Dutta added a comment - 07/May/10 01:44 AM HI Bob, This patch works as expected for derby, postgres, and oracle databases as you have already mentioned. Cant we have some generic solution which supports all the databases. Or we can have some conditional code, where we can check which datasource is being used, and then generate the sql accordingly. Please let me know your views on this.

Bob Morley added a comment - 07/May/10 08:07 AM
Hi Divesh,
I added a more detailed description in the forum thread; but in brief this is a generic solution which supports all databases which generates the sql accordingly. What this patch does not do is apply a standard default order for all databases; it just adds support for one to dictate how they want the nulls sorted.
For example, when one sets the order-by they can set it to "lastName DESC NULLS FIRST" which should apply to all databases.


The thread Bob was referring above ends at http://markmail.org/message/47z7fwtawehuem6b


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@950901 13f79535-47bb-0310-9956-ffa450edef68
2010-06-03 07:39:19 +00:00
Jacques Le Roux bdd925bcc7 A patch from Atul Vani for an issue reported by R.S."States of th country Germany shows zero results from both webtools and using services." (https://issues.apache.org/jira/browse/OFBIZ-3799) - OFBIZ-3799
Data to associate the country with states isn't present. This issue is with reference to discussion started by R.S. on user-mailing list subjected as "StateList"
R.S., thanks for reporting the issue.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@950893 13f79535-47bb-0310-9956-ffa450edef68
2010-06-03 07:12:39 +00:00
Jacques Le Roux e57c2599a9 A patch from Sumit Pandit "Issue in rendering Freemarker Template from String." (https://issues.apache.org/jira/browse/OFBIZ-3782) - OFBIZ-3782
With the help of Bob Morley (it was more a cache issue than what Sumit thought)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@950866 13f79535-47bb-0310-9956-ffa450edef68
2010-06-03 04:11:32 +00:00
Jacques Le Roux acbf699a1c Fix a bug introduced at r950481
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@950860 13f79535-47bb-0310-9956-ffa450edef68
2010-06-03 03:26:17 +00:00
Adam Heath 9bf10fa9b4 Use the new isEmpty support in conditions to skip
EntityConditionListBase entries that have no children.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@950767 13f79535-47bb-0310-9956-ffa450edef68
2010-06-02 21:24:19 +00:00
Adam Heath fd213c9a3c EntityCondition.isEmpty() support.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@950766 13f79535-47bb-0310-9956-ffa450edef68
2010-06-02 21:24:14 +00:00
Adam Heath e8d8b4f777 Refactor the 2 arg version of the addSqlValue method, to use the List
version.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@950765 13f79535-47bb-0310-9956-ffa450edef68
2010-06-02 21:24:07 +00:00
Adam Heath b2e13f2a28 Add a new marker interface, IsEmpty.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@950764 13f79535-47bb-0310-9956-ffa450edef68
2010-06-02 21:24:00 +00:00
Jacques Le Roux 36e3342cd7 Accurate documentation
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@950683 13f79535-47bb-0310-9956-ffa450edef68
2010-06-02 17:37:36 +00:00
Marco Risaliti 1498a44fd4 Some missing security permissions for HHFacility, Setup and BI components
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@950483 13f79535-47bb-0310-9956-ffa450edef68
2010-06-02 10:45:44 +00:00
Jacques Le Roux d75fbce90a Allows to initially collapse the search screenlet of a layered lookup, default to false.
It was harder than I though because of the async nature of Ajax. So I had to use a setTimeout with a 400 ms timeout. Hopefully it will work in any environments. I chose 400 because I found it worked well on my machine, 300 also but to be sure I picked 400, 200 was too low it seems.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@950481 13f79535-47bb-0310-9956-ffa450edef68
2010-06-02 10:44:16 +00:00
Jacopo Cappellato 3b42619762 Formatting fixes: no functional changes.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@950454 13f79535-47bb-0310-9956-ffa450edef68
2010-06-02 09:36:15 +00:00
Jacopo Cappellato f22bdccd59 Enhanced Birt view handler to automatically set report parameters in the request.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@950452 13f79535-47bb-0310-9956-ffa450edef68
2010-06-02 09:34:19 +00:00
Adam Heath 0f6803cde9 Re-apply 949617, add new variants of makeConditionWhereString that take
a StringBuilder, and deprecate the old versions that don't.

This works now because of the previous commit.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@950339 13f79535-47bb-0310-9956-ffa450edef68
2010-06-02 02:18:19 +00:00
Adam Heath 8e173bf9c5 Refactor makeConditionWhereString to use the entity condition system to
build the where string.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@950338 13f79535-47bb-0310-9956-ffa450edef68
2010-06-02 02:18:14 +00:00
Adam Heath e8ad94f1f2 Revert wrongly committed 950253
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@950283 13f79535-47bb-0310-9956-ffa450edef68
2010-06-01 22:02:06 +00:00
Adam Heath ca13adff80 Revert wrongly committed 950254
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@950281 13f79535-47bb-0310-9956-ffa450edef68
2010-06-01 22:01:42 +00:00
Adam Heath 7c326c1d61 Revert wrongly committed 950255
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@950280 13f79535-47bb-0310-9956-ffa450edef68
2010-06-01 22:01:23 +00:00
Adam Heath 6c2124c44f Revert wrongly committed 950256
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@950279 13f79535-47bb-0310-9956-ffa450edef68
2010-06-01 22:01:05 +00:00
Adam Heath cd9d308c3d Revert wrongly committed 950257
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@950278 13f79535-47bb-0310-9956-ffa450edef68
2010-06-01 22:00:45 +00:00
Adam Heath cbd11cf3b0 Revert wrongly committed 950258
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@950277 13f79535-47bb-0310-9956-ffa450edef68
2010-06-01 22:00:26 +00:00
Adam Heath 67912df510 Revert wrongly committed 950259
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@950276 13f79535-47bb-0310-9956-ffa450edef68
2010-06-01 22:00:05 +00:00
Adam Heath 73e0f908c6 Revert wrongly committed 950260
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@950275 13f79535-47bb-0310-9956-ffa450edef68
2010-06-01 21:59:45 +00:00