Commit Graph
2222 Commits
Author SHA1 Message Date
Erwan de Ferrieres f4fc13be2e Adding ISO216 pageMasters, and including all the page formats in start.fo.ftl, so it can be used when printing a document
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@945340 13f79535-47bb-0310-9956-ffa450edef68
2010-05-17 20:17:30 +00:00
Jacques Le Roux 31d2f5094e A patch from Ankit Jain "Link back to login page from Forgot Password page" https://issues.apache.org/jira/browse/OFBIZ-3469 - OFBIZ-3469
This one works! (with a little help from me)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@945061 13f79535-47bb-0310-9956-ffa450edef68
2010-05-17 10:19:18 +00:00
Erwan de Ferrieres a877c6fc4b Adding the capacity to create charts in OFBiz. Examples are based on the example component, and examples must be created to show charts.
Charts are using the flotr library (http://code.google.com/p/flotr/) which is under a MIT license and is based on the Prototype Javascript Framework.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@945044 13f79535-47bb-0310-9956-ffa450edef68
2010-05-17 09:29:38 +00:00
Jacques Le Roux ed6dda1757 Revert r945037, because I found it's not right when going back from logout -> forgot password, I got this error message
org.ofbiz.webapp.control.RequestHandlerException: Unknown request [authview]; this request does not exist or cannot be called directly.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@945042 13f79535-47bb-0310-9956-ffa450edef68
2010-05-17 09:26:48 +00:00
Jacques Le Roux 9bdd97a693 A patch from Ankit Jain "Link back to login page from Forgot Password page" https://issues.apache.org/jira/browse/OFBIZ-3469 - OFBIZ-3469
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@945037 13f79535-47bb-0310-9956-ffa450edef68
2010-05-17 09:13:36 +00:00
Jacques Le Roux ed63676d23 A patch from Ankit Jain "Layered lookup inside the layered lookup not working" https://issues.apache.org/jira/browse/OFBIZ-3768 - OFBIZ-3768
This patch definitely closes this issue

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@944614 13f79535-47bb-0310-9956-ffa450edef68
2010-05-15 11:42:01 +00:00
Erwan de Ferrieres e32f2be361 Better French uiLabels for PRUN statuses
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@943415 13f79535-47bb-0310-9956-ffa450edef68
2010-05-12 09:01:56 +00:00
Jacques Le Roux df9963f0e5 A patch from Nicolas Malin "Pass eCommerce label to Common Label" https://issues.apache.org/jira/browse/OFBIZ-3694 - OFBIZ-3694
Some labels changes, no functional changes



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@942818 13f79535-47bb-0310-9956-ffa450edef68
2010-05-10 16:41:18 +00:00
Erwan de Ferrieres 4661365954 Facilities management for a productStore, made using the new set of portals/portlets.
It can be reached at this address :
https://localhost:8443/catalog/control/ProductStoreFacilities?productStoreId=90100

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@942544 13f79535-47bb-0310-9956-ffa450edef68
2010-05-09 14:59:11 +00:00
Erwan de Ferrieres 4f90299ebd Following a discussion on dev list, moving portal administration to webtools instead of myPortal (http://ofbiz.135035.n4.nabble.com/erwan-contributions-td2122600.html#a2122600)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@942406 13f79535-47bb-0310-9956-ffa450edef68
2010-05-08 15:52:31 +00:00
Scott Gray 0f30714350 Set svn properties on all freemarker files that were missing them
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@942386 13f79535-47bb-0310-9956-ffa450edef68
2010-05-08 13:51:19 +00:00
Jacques Le Roux be5dce281e Fix a non visible NPE
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@940849 13f79535-47bb-0310-9956-ffa450edef68
2010-05-04 13:32:21 +00:00
Ashish Vijaywargiya db765efdd2 Reverting my commit r938446 based on the comments received on mailing list. For now I am keeping old email address in place (i.e ofbiztest@yahoo.com) keeping in mind that email will not go in spam folder. If others think test@example.com will also behave same then please go ahead commit the changes.
Very soon I will revert my changes on release10.04 branch.
Thanks to everybody who has provided their comments!  

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@940814 13f79535-47bb-0310-9956-ffa450edef68
2010-05-04 11:57:35 +00:00
Adrian Crum 043c15ee63 Removed deprecated temporal expression class.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@940559 13f79535-47bb-0310-9956-ffa450edef68
2010-05-03 18:30:02 +00:00
Erwan de Ferrieres 2bf9b537e5 Removing non-seed portal names
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@940059 13f79535-47bb-0310-9956-ffa450edef68
2010-05-01 15:45:22 +00:00
Bruno Busco 1664f3e90e A patch from Blas Rodriguez Somoza
OFBIZ-3732 - XHTML validation errors round 2++ (framework excluding widgets)
https://issues.apache.org/jira/browse/OFBIZ-3732
geolocation.ftl
Script content need to be inside markup comment to avoid character encoding issues.

EntityImport.ftl
attributes without values

EntityImportDir.ftl
attributes without values

EntityImportReaders.ftl
attributes without values

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@939757 13f79535-47bb-0310-9956-ffa450edef68
2010-04-30 17:46:49 +00:00
Scott Gray 52b08f4574 Removed all references to the deprecated GenericDelegator method findAll(String)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@938947 13f79535-47bb-0310-9956-ffa450edef68
2010-04-28 11:30:23 +00:00
Jacques Le Roux 070e1388db Correct previous commit
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@938448 13f79535-47bb-0310-9956-ffa450edef68
2010-04-27 13:27:39 +00:00
Ashish Vijaywargiya 148318f7fd Changing email address ofbiztest@yahoo.com -> ofbiztesting@gmail.com - this was creating too much problem since long in development effort.
Following points were there in my mind before doing this change.

-- AFAIK ofbiztest@yahoo.com email doesn't exists.
-- Bounce email issue if you have enabled Javamail container. This drastically slow down your system performance. 
-- Now anyone can use ofbiztesting@gmail.com account settings for Sendmail, Javamail container etc.
-- Send mail service triggered again and again with failure message on console if any of the email not found bccAddress inside ProductStoreEmailSettings entity. Again slow speed of your development machine.
-- Please let me know where to share the password of this account? Dev list?


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@938446 13f79535-47bb-0310-9956-ffa450edef68
2010-04-27 13:17:45 +00:00
Jacques Le Roux 0b6e54b056 Update Google Map keys, thanks to BJ on user ML
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@938437 13f79535-47bb-0310-9956-ffa450edef68
2010-04-27 12:56:03 +00:00
Jacques Le Roux e714f96c66 Closes "Replace popup lookups by layer lookups" (https://issues.apache.org/jira/browse/OFBIZ-3442) - OFBIZ-3442
Not all cases have been resolved but this patch takes this into account and should not introduce any not known issues. These issues are identified at "Layer popup umbrella main task" (https://issues.apache.org/jira/browse/OFBIZ-3445). They will be resolved later and are actually bugs so will be committed later when fixed. They are
* "Allow to open a layer lookup from a layer lookup" (https://issues.apache.org/jira/browse/OFBIZ-3446) and its specific case "Allow to open a layer lookup from a layer lookup recursively" (https://issues.apache.org/jira/browse/OFBIZ-3693)
* "The minimize/enlarge buttons (+ -) blocks the layer" (https://issues.apache.org/jira/browse/OFBIZ-3692)
* "When you get disconnected (time out) from a layered lookup, you then get afterward ugly screens" (https://issues.apache.org/jira/browse/OFBIZ-3450)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@937852 13f79535-47bb-0310-9956-ffa450edef68
2010-04-25 18:49:01 +00:00
Adrian Crum 90f78694f6 Cleaned up the code in the performFind service in FindServices.java, service now uses the new createConditionList method.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@937755 13f79535-47bb-0310-9956-ffa450edef68
2010-04-25 06:22:54 +00:00
Adrian Crum c25f8887bc Added a method to FindServices.java. The original code parses input parameters into a nested Map structure, then parses the nested Map structure into an EntityCondition. The new method takes a direct approach and parses input parameters directly into an EntityCondition. The method isn't used yet.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@937749 13f79535-47bb-0310-9956-ffa450edef68
2010-04-25 05:56:21 +00:00
Adrian Crum 73ebeb3f80 Small change to FindServices.java - Extracted the parameter parsing code into a separate method so it can be reused.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@937727 13f79535-47bb-0310-9956-ffa450edef68
2010-04-25 00:26:18 +00:00
Adrian Crum 0b9d80f87a Some small code cleanups in FindServices.java. No functional change.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@937686 13f79535-47bb-0310-9956-ffa450edef68
2010-04-24 19:45:17 +00:00
Erwan de Ferrieres 58dbbf00fd new improvement for portals : administrative interface, same as ManagePortalPages but for all pages
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@937230 13f79535-47bb-0310-9956-ffa450edef68
2010-04-23 10:18:41 +00:00
Erwan de Ferrieres f0eb1cf0b0 Enabling localization for portal page names, adding the CommonPortalEntityLabels file
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@936845 13f79535-47bb-0310-9956-ffa450edef68
2010-04-22 13:50:24 +00:00
Erwan de Ferrieres 6b488ede18 Corrections on the new set of portlets, the wrong file was called
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@936818 13f79535-47bb-0310-9956-ffa450edef68
2010-04-22 12:57:50 +00:00
Bilgin Ismet Ibryam 6fe14b4033 A better query for autocompleter descriptions
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@936635 13f79535-47bb-0310-9956-ffa450edef68
2010-04-22 07:42:10 +00:00
Erwan de Ferrieres 264d7b7099 Corrections on rev 935923
* corrected a wrong controller entry
* added a missing decorator (uiLabelDecorator)
* added a collapse button for the GenericScreenlet

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@936385 13f79535-47bb-0310-9956-ffa450edef68
2010-04-21 16:16:40 +00:00
Adam Heath ceb3fad391 Add a releaseDate to a product, mostly informational, intended to mean
when the product was first assembled for purchase, or, for books, when
it was published initially.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@936100 13f79535-47bb-0310-9956-ffa450edef68
2010-04-20 22:46:14 +00:00
Erwan de Ferrieres 6f2642a5dd Adding a whole set of generic portlets. Those are more designed to be customised
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@935923 13f79535-47bb-0310-9956-ffa450edef68
2010-04-20 13:57:26 +00:00
Erwan de Ferrieres a290ba895d misc. corrections on portal :
* when editing a portlet, getting the previous values
* displaying portlets with the right order
* portletId was not retrieved in showPortlet

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@935898 13f79535-47bb-0310-9956-ffa450edef68
2010-04-20 13:04:17 +00:00
Jacques Le Roux 4cd873d37c A slightly modified "only one lookup decorator" patch from Sascha Rodekamp related to "Replace popup lookups by layer lookups" (https://issues.apache.org/jira/browse/OFBIZ-3442) - OFBIZ-3442
Merge the 2 lookup decorators in only one and dynamically adapt the rendered content

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@935578 13f79535-47bb-0310-9956-ffa450edef68
2010-04-19 14:03:41 +00:00
Bruno Busco 38c435ca8d A slightly changed (tabs replaced with spaces) patch from Blas Rodriguez Somoza
OFBIZ-3681 - XHTML validation errors round 2+ (framework excluding widgets)
https://issues.apache.org/jira/browse/OFBIZ-3681
XHTML validation errors

    * Unclosed tags
    * attributes without values (checked, selected, disabled, etc)
    * attribute values without "
    * Uppercase tags or attributes.
    * Unencoded ampersands in urls.

Other errors:

common/webcommon/includes/listVisualThemes.ftl
Line 19: style tag is not allowed here, style must be in the style attribute of the tag.

webtools/webapp/webtools/stats/StatBinsHistory.ftl
Line 29: duplicated id

webtools/webapp/webtools/tempexpr/tempExprMaint.ftl
Lin 32, 104: form must be outside table.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@935311 13f79535-47bb-0310-9956-ffa450edef68
2010-04-18 07:52:08 +00:00
Erwan de Ferrieres 6d4d2a3815 Shortening some French uiLabels
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@934739 13f79535-47bb-0310-9956-ffa450edef68
2010-04-16 10:40:41 +00:00
Erwan de Ferrieres e0033c6c5c Applying OFBIZ-3694 "Pass Accounting label to Common Label". The AccountingNoRecordFound is now CommonNoRecordFound
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@933890 13f79535-47bb-0310-9956-ffa450edef68
2010-04-14 09:19:52 +00:00
Jacques Le Roux b31485affb Fixes some duplicates labels
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@933206 13f79535-47bb-0310-9956-ffa450edef68
2010-04-12 12:06:38 +00:00
Jacques Le Roux 68acd1438f 20 is not a valid argument to position. This was not a big deal as it defaulted to empty, which for the moment defaults to normal. At term we will put "topleft" as default here
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@933151 13f79535-47bb-0310-9956-ffa450edef68
2010-04-12 08:53:52 +00:00
Bilgin Ismet Ibryam 82a5bf6b02 A patch from OFBIZ-3555 "Show lookup value descriptions". This enhancements allows displaying a description for the IDs in lookup fields. To enable this feature set widget.lookup.showDescription to Y in widget.properties
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@933130 13f79535-47bb-0310-9956-ffa450edef68
2010-04-12 07:54:10 +00:00
Bruno Busco 5d5e489598 A patch from Blas Rodriguez Somoza
OFBIZ-3637 - XHTML validation errors (framework excluding widget) round 2
https://issues.apache.org/jira/browse/OFBIZ-3637

XHTML validation errors

    * Unclosed tags INPUT, IMG, BR...
    * attributes without values (checked, selected, disabled, etc)
    * attribute values without "
    * required attributes not included (alt in img, type in style, type in script etc)
    * Uppercase tags or attributes.
    * Unencoded entities (ampersands).

Other changes:

selectall.js
line 333. ajaxAutoCompleter must work with unenconded or encoded ampersands.

EntityRefMain.ftl
line 176. <div> must be </div>


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@932733 13f79535-47bb-0310-9956-ffa450edef68
2010-04-10 14:35:07 +00:00
Hans Bakker 158fd4aec9 Update dutch translation, a contribution by Willem Janssen: OFBIZ-3652
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@931430 13f79535-47bb-0310-9956-ffa450edef68
2010-04-07 04:27:42 +00:00
Scott Gray eee7ea6436 The noConditionFind parameter wasn't being passed from the performFind service to the prepareFind service but it's needed to perform some logic around the filterByDate condition
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@931283 13f79535-47bb-0310-9956-ffa450edef68
2010-04-06 19:29:46 +00:00
Bilgin Ismet Ibryam 4b60bfb7f9 Cleanup autocompleter fields. Removed type fields from the list.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@930707 13f79535-47bb-0310-9956-ffa450edef68
2010-04-04 16:06:24 +00:00
Adrian Crum da42890638 A patch from Blas Rodriguez Somoza - XHTML validation errors (framework excluding widget) (https://issues.apache.org/jira/browse/OFBIZ-3622).
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@930701 13f79535-47bb-0310-9956-ffa450edef68
2010-04-04 15:29:58 +00:00
Bilgin Ismet Ibryam 2a29d19bc0 Committed a patch from OFBIZ-3541 "Using Widgets html form templates in FTL files". This change will make autocompleter available also in ftl lookups.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@930660 13f79535-47bb-0310-9956-ffa450edef68
2010-04-04 10:38:19 +00:00
Bilgin Ismet Ibryam cebc361953 If there is no map center and zoom level provided for google map, get these values from all the markers on the map. If there are no markers, use 0 for latitude and longitude.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@928804 13f79535-47bb-0310-9956-ffa450edef68
2010-03-29 15:16:55 +00:00
Bilgin Ismet Ibryam de0b52bfe6 Removed hardcoded width and height pixels from google map template, which now allows setting them also in percentages.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@928733 13f79535-47bb-0310-9956-ffa450edef68
2010-03-29 11:51:49 +00:00
Hans Bakker e237fe0ba6 if menu and portalpage options are mixed, tomahawk did not display correctly in the example component and other places as reported by Bruno in the mailing list. should work now.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@928131 13f79535-47bb-0310-9956-ffa450edef68
2010-03-27 03:39:08 +00:00
Erwan de Ferrieres 2a9bbcdde8 multi-tenant textbox should not be displayed by default
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@927961 13f79535-47bb-0310-9956-ffa450edef68
2010-03-26 16:41:46 +00:00