I noticed that Thailand province geo data is missing OOTB while importing legacy data which should be added.
jleroux: as fort Malaysian geo data I have added the mean to load those seed data in the common/ofbiz-component.xml file
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1583551 13f79535-47bb-0310-9956-ffa450edef68
I determined that Malaysia GeoData does not exist OOTB while importing customer records from a legacy system so OFBiz should be improved to include it.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1583427 13f79535-47bb-0310-9956-ffa450edef68
In the file ./framework/common/data/CurrencyData.xml there are two records for israeli currency ILS (israeli sheckel) and NIS (new israeli Shekel).
ILS record need to be removed, its was replaced by NIS 30 years a go.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1579309 13f79535-47bb-0310-9956-ffa450edef68
A good example is in order creation page, open the customer lookup and then try to close it.
I think we should not fiddle with the theme, there is a faster and easier solution: center all lookups in the screen by default. It will not fix but hide the issue for now. Anyway the awful dropdown menu behaviour must be fixed and i will open another Jira for that.
You may ask why I'm concerned with a theme which is no longer bundled in future releases? It's because some custom projects still use it...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1563238 13f79535-47bb-0310-9956-ffa450edef68
jquery-1.8.2 to jquery-1.10.2 which implies using jquery-migrate-1.2.1 for plugins compatiblities
jquery-ui-timepicker-addon-1.0.5 to jquery-ui-timepicker-addon-1.4.3 (using min now, better i18n)
jquery-ui-1.9.0 to jquery-ui-1.10.3
removes jquery.ui.datepicker.js now integrated in jquery.ui
jquery.hotkeys-0.7.9 to jquery.hotkeys-0.8
jquery.maskedinput-1.2.2 to jquery.maskedinput-1.3.1
jquery.validate 1.10.0 to 1.11.1
I never realised how much efforts have been put in this plugin!
I fixed an issue in JsLanguageFilesMapping generation
I removed the messages_ptbr.js and messages_ptpt.js files and the related conundrum in JsLanguageFileMappingCreator.java
untested, found not use cases OOTB
jquery.jcarousel ?(2006) to 0.3.0 (2013)
untested, found not use cases OOTB
jquery.flot 0.7 to 0.8.2 (lot of changes, still works)
removes useless flotpie.ftl
removes empty flotr folder
jquery.mobile-1.1.0-rc.1 to jquery.mobile-1.4.0
untested, found not use cases OOTB
jquery.cookie to jquery.cookie-1.4.0
Removes all useless/redundant js files (not only jQuery unused old versions)
notably removes all under images/jquery/ui/development-bundle/ui
removes now useless GooglemapMarkers.js and GooglemapSimple.js
Flat Grey application.js
moves jQuery(document).ready(function() at bottom (spotted in Chrome console)
css
I did not find much issues, I spotted the title bar of the lookups, but got it fixed after some efforts.
Issues:
Imagemanagement: I got issues while testing, actually I'm not quite qure how it works, even in stable demo. It should be validated again. I commit nevertheless my changes:
moves js part from product to images component
removes useless calls to js files (mostly in imagemanagement, but not only)
renames jquery.min.js to sizzle.min.js.
Inside sizzle.min.js, updates the Dojo part to v1.10.17-pre and removes the jQuery part
changes to use ofbizContentUrl macro for generating js calls
jquery.rotate.js NOT! It's jQueryRotateCompressed.js http://markmail.org/message/dit3dlh3ph4jnenp
Got ERROR 22001: A truncation error was encountered trying to shrink VARCHAR 'D:\projectsASF\ofbizClean\framework\images\webapp\images\pro&' to length 100. I opened OFBIZ-5501 for that
I tried to update jstree to jstree 3 but gave up. I let the jquery.jstree-3.0.0-beta3 files in place in case someone would give it a chance...
Not related but while a it:
removes <!--flot example requests--> from birt controller (moved recently to example component)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1559769 13f79535-47bb-0310-9956-ffa450edef68
This is rather a defensive patch which secure json response on services calls.
It might need some changes in custom code if (not recommended) an Ajax GET response is used... The util.js scrpt is introduced for that, though normally should not be needed...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1557462 13f79535-47bb-0310-9956-ffa450edef68
It actually does more than that. It follows Adrian's proposition of improving the GeoPoint data model.
I did not applies all of Adrian's proposition (see our conversation in the Jira issue). Feel free to apply it completely if you are inclined so.
I will also add an entry in wiki page "Revisions Requiring Data Migration (upgrade ofbiz)" at https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=7045166
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1557447 13f79535-47bb-0310-9956-ffa450edef68
What I did:
Upgraded from Google Maps API 2 to 3, which also means removing the keys in general.properties. They are no longer needed in API-3 (at least for our demo and local test uses), one worry less!
Refactored Google Maps code in geolocation.ftl: put more things in common, simplified code (the API-3 is better from this POV).
For OpenLayers, due to most browsers now rejecting mixed content (HTTP vs HTTPS), I had to follow their advice and put OpenLayers-2.13.1.js + images and theme(finally not used) in the framework. Not a big deal in term of size but again one more lib to worry about. Anyway geolocation is not vital for OFBiz. I have also added a zoom and navigation widget in maps. Note that IE warns about mixed content, but you can bypass it.
While working on editGeoLocation (in Party) I noticed it does not update the elevation. I found it was possible http://www.daftlogic.com/sandbox-google-maps-find-altitude.htm but I did not implement it, lack of time...
Also I got once a NPE in CallSimpleMapProcessor (when using editGeoLocation) but was unable to reproduce (w/o changes before and after)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1554536 13f79535-47bb-0310-9956-ffa450edef68
Removes all empty ones
Removes some redundant/duplicates ones (please committers don't commit those again, I know it's not easy to catch, hopefully now we should have less of them)
Automatically replaces some tabs
Few French labels improvements
Removes 2 orphan entries ("ja" & "cs")
Fixes the schema header of WebtoolsUiLabels.xml
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1551594 13f79535-47bb-0310-9956-ffa450edef68
So better be safe than sorry, even if in the loops we loose a bit of performance (here only "short" loops anyway)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1541641 13f79535-47bb-0310-9956-ffa450edef68
Without wrapping error messages in StringUtil.wrapString() the <br/> element appears part of the error message.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1537179 13f79535-47bb-0310-9956-ffa450edef68
The prepareNotification method in NotificationServices.java does not allow urls that start with component:// because its using UtilURL rather than FlexibleLocation. Here is a patch that adds FlexibleLocation. I am not sure if its best to remove UtilURL or not - that can be up to you.
jleroux: since FlexibleLocation.resolveLocation() supersedes UtilURL.fromResource() I used it instead
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1536905 13f79535-47bb-0310-9956-ffa450edef68
After r751990, <<allow-html="any">> and <<allow-html="safe">> are the same: they do nothing! The only difference is the warning message from the OWASP Antisamy IntrusionDetector, which is both, as Christoph noted "giving you a false sense of security" or as I wrote "disturbing, wrong and useless". So there are no longer any reasons for differencing "safe" and "any".
This
* Deprecates "safe" (making it clear in the XSD documentation), keeping only "none" and "any". This is for backward compatibility, else we could completely remove the misleading "safe". Note that "none" is the default.
* Replaces in services definition all allow-html="safe" by allow-html="any"
* Remove from ModelService.java (near line 587) the code which throws the OWASP Antisamy IntrusionDetector message in log
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1536324 13f79535-47bb-0310-9956-ffa450edef68
Also loosened things up a bit in the OfbizUrlBuilder class: allow object construction with partial information - required by some services. I don't like this approach because it makes it possible to create nonsensical URLs, but it is a necessary evil to keep the existing code working.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1535444 13f79535-47bb-0310-9956-ffa450edef68
*What's for?*
Finally, OOTB the port offset is interesting in 2 cases:
# To eventually run Sonar on OFBiz sources https://issues.apache.org/jira/browse/INFRA-3590
# To simultaneously run the demos without having to change much things, just one parameter (this will need to have the same commited in R13.07... to be discussed...)
Of course, It can be used for other purposes outside of the ASF context...
*How it's done?*
Basically, I just added a portoffset integer parameter to 3 ant targets (of course this JVM param can also be used in a Java call from command line): start, start-pos, start-both,
The portoffset parameter is set to zero by default in ClassLoaderContainer.java.
If a value is passed, it's then grabed by Config.java and passed to ClassLoaderContainer.java, where it's set to this value.
The portoffset is then used to change in one shoot all the default ports values defined (in config or hardcoded), and the admin port value
This is done in following classes:
CatalinaContainer
NamingServiceContainer
ServiceEngine through ServiceLocation
RmiServiceContainer
XMLRPCClientEngine
XmlRpcTests
To avoid hardcoding locations in services definitions, I also created 2 service-locations: main-http and main-soap
*To summarize:* these changes will be used to run "ant start" with a portoffset value which will take care of all ports values, including admin port. For running R12.04 demo as stable we will still need to create a patch for the last time. R13.07 could have a similar patch applied since it's not yet released...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1533839 13f79535-47bb-0310-9956-ffa450edef68
Actually it does paginate but the value is not dependent on widget property widget.form.defaultViewSize which default value is 20. It uses a default value of 50 which is defined by
<set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="3"/>
You can easily test it using https://localhost:8443/manufacturing/control/FindRouting?VIEW_SIZE=3
This is legacy from pre Apache era. I found 143 cases where a default-value is defined in screens for VIEW_SIZE.
I did not look into details for the 143 cases but I believe most are also legacy.
There are few default values: 10, 20, 30, 50, 500 and even an extreme case of 10000 for InventoryItemTotalsExport!
There is only one comment for LookupBulkAddProducts which is also legacy: <!-- 10 rows seems more appropriate given screen size, etc. -->
I suggest to OOTB replace all those by the widget.form.defaultViewSize value.
Things will then be consistent and easily changeable on a global scale using the widget property.
Or if really needed forcing the default-value as it's done now.
So this would be applied on the 143 cases (I checked, viewSizeDefaultValue does not exist in any screen)
<property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/>
<set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/>
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1526387 13f79535-47bb-0310-9956-ffa450edef68
*What's for?*
OOTB the port offset is interesting in at least 3 cases:
# To simultaneously run tests on the same Buildbot machine. This is related to http://mail-archives.apache.org/mod_mbox/www-builds/201209.mbox/%3C002101cd991b$0a16de50$1e449af0$@16degrees.com.au%3E
# To simultaneously run the demos without having to change much things, just one parameter
# To eventually run Sonar on OFBiz sources https://issues.apache.org/jira/browse/INFRA-3590
*How it's done?*
Basically, I just added a portoffset integer parameter to some ant targets (of course this JVM param can also be used in a Java call from command line):
* in trunk and R13.07: start, start-batch, start-debug, start-pos, start-both, run-tests and run-test
* in R12.04 and R11.04: run-tests, run-test. I did not set start targets because anyway it would miss the admin port offset, withouh much changes. So can't be used to demonstrate. We will continue to use the current paches for those.
The portoffset parameter is set to zero by default in ClassLoaderContainer.java.
If a value is passed, it's then grabed by Config.java and passed to ClassLoaderContainer.java, where it's set to this value.
The portoffset is then used to change in one shoot all the default ports values defined (in config or hardcoded), and the admin port value in R13.07 and trunk.
This is done in following classes:
CatalinaContainer
NamingServiceContainer
ServiceEngine through ServiceLocation
RmiServiceContainer
XMLRPCClientEngine
XmlRpcTests
To avoid hardcoding locations in services definitions, I also had to create some service-locations: main-local-soap and main-remote-soap
*What are the constraints?*
* For demos: the offset should not be applied to trunk because <service-location name="main-remote-soap" location="http://demo-trunk.ofbiz.apache.org:8080/webtools/control/SOAPService"/> is used for tests by trunk *and all releases*. It's useless to apply to trunk anyway, offsetting port in releases is enough.
* I did not take into account the Ideal payment harcoded port values in IdealPaymentServiceTest.java. Weirdly I did not cross error during tests, though it seems there are tests using an harcoded port in url.
*What is the status?*
Locally (on Win XP) I ran many tests combinations with <<ant load-demo run-tests>>.
Applying the portoffset on a sole running test instance has no effects. I have still some fails (no errors) but those are not related to my changes, they appear also without.
But when I run a combination of any releases/trunk but with R11.04, I get a time out error with testSOAPSimpleService, that I can't explain so far.
If I run the trunk alone with the portoffset no errors occur. Same if I run a release with portoffset and only testSOAPSimpleService in trunk (w/ or w/o portoffset)
*To summarize:* these changes will be used to run Buildot tests instances simultaneously . And, for coming releases, to run demos without having to create patches. Simply running ant start with a portoffset value which will take care of all ports values, including admin port. For running R12.04 demo as stable we will still need to create a patch for the last time.
*What I will to do for now:* commit the patches and test if I cross the same issue on Buildbot. If it's the same (99% chances it will) I will revert and will continue to locally try to find the reason . I believe this issue is unrelated to the changes I implemened. And it's just because it's now possible to simultaneously run tests that it appears.
BTW I just noticed that when you run R11.04 with R12.04, R12.04 takes almost all the CPU (XP is not very, while when running any combinations w/o R11.04 the CPU load is shared.
Also there are far less tests in R11.04, which coul be the reason when I run it with another test run instance there are no issues. Because R11.04 tests finish before the other instance gets to run testSOAPSimpleService.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1525909 13f79535-47bb-0310-9956-ffa450edef68
The quickInitDataWarehouse BI button used these dates (set in BI main screen)
<set field="fromDate" value="2008-01-01 00:00:00.0" type="Timestamp"/>
<set field="thruDate" value="2010-01-01 00:00:00.0" type="Timestamp"/>
This generated 1000+ records. I set 10 years ahead (from sept. 2013) in a new bi.properties file used by the BI main screen. So it generates only 3000+ records (and others related in BI DB) which is still reasonable. A message, placed at the top of the Order Reports page, informs users that for 4 Birt reports s/he needs 1st to run the data warehouse init using the BI button. Also this message clarifies the range, to be certain that in 10 years people will still easily know what to change...
I have also replaced a lot of labels and added English and French translations (by-product: some labels cleaning in CommonUiLabels.xml)
I did not do the same for the accounting paymentReport and ViewFacilityInventoryHistoryReport facility Birt reports which only need translation.
I noticed that there are no ways to get to ViewFacilityInventoryHistoryReport from UI though!
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1521589 13f79535-47bb-0310-9956-ffa450edef68
I wonder about the codes of the other parts of GBR. They don't exist in 3166. But they were already in GeoData.xml before the Apache era. Anyway they can't hurt and are not a problem, so far...
This also adds 3166 links to CountryCodeData.xml
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1517947 13f79535-47bb-0310-9956-ffa450edef68