Erwan de Ferrieres
e7faeca8f3
Missing entity uiLabels on CUSTREQ_STTS
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@992321 13f79535-47bb-0310-9956-ffa450edef68
2010-09-03 15:05:29 +00:00
Erwan de Ferrieres
ab43dfbf0e
Showing the title when a portal page is displayed on screen
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@991947 13f79535-47bb-0310-9956-ffa450edef68
2010-09-02 14:27:17 +00:00
David E. Jones
5c5149bf11
Small change to short ton description as it seems more people are familiar with the term US ton than short ton
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@991279 13f79535-47bb-0310-9956-ffa450edef68
2010-08-31 18:14:39 +00:00
Ashish Vijaywargiya
e90d83e6af
Applied patch from jira issue OFBIZ-3909 - Bug in showing online estimate rate on UPS services.
...
UPS Online shipping rates are showing wrong values when product weight having different weightUomId. It doesn't support UOM Conversion as it is working in USPS services.
So fixing this bug, following work is done.
1) Calling generic methods "getPackageSplit", "getProductItemInfo" & "calcPackageWeight" methods from ShipmentWorker.java
2) Removed duplicate methods from UpsServices.java
Thanks Amit for the contribution.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@990751 13f79535-47bb-0310-9956-ffa450edef68
2010-08-30 09:55:02 +00:00
Jacques Le Roux
d41c42d069
Fix a bug in setDependentDropdownValuesJs.ftl (used in conjunction with getDependentDropdownValues.js)
...
I just realize that I missed to change from maindId to paramKey in the observe event. It works with country where the values are the same (countryGeoId), but in other cases it does not (notably in the issue reported at https://issues.apache.org/jira/browse/OFBIZ-3247
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@989829 13f79535-47bb-0310-9956-ffa450edef68
2010-08-26 17:11:43 +00:00
Bruno Busco
6cb038332c
Removed settings of hideSearch field. This is not used any more.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@989397 13f79535-47bb-0310-9956-ffa450edef68
2010-08-25 22:54:50 +00:00
Jacques Le Roux
9fd01fcd31
Removes a framework dependency on Marketing component
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@989389 13f79535-47bb-0310-9956-ffa450edef68
2010-08-25 22:20:18 +00:00
Jacques Le Roux
792aa82bee
A solution for "State field is missing - Not in List or N/A" reported by Sam Hamilton at https://issues.apache.org/jira/browse/OFBIZ-3247 - OFBIZ-3247
...
I finally decided to use the new Dependent Dropdowns mechanim.
I have also refined how it's used in Example to avoid confusion, so changed setDependentDropdownValuesJs.ftl to pass paramKey when it's different from mainId
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@988508 13f79535-47bb-0310-9956-ffa450edef68
2010-08-24 12:32:52 +00:00
Erwan de Ferrieres
0c6075f89b
Just a formatting issue, no functional change
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@987755 13f79535-47bb-0310-9956-ffa450edef68
2010-08-21 13:37:37 +00:00
Bruno Busco
ede7fd1009
More appropriate entity description. (A false framework to product dependence ;-)
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@987131 13f79535-47bb-0310-9956-ffa450edef68
2010-08-19 11:27:53 +00:00
Jacques Le Roux
5fdb5272c5
Forgot to put the license headers into new files in r986370
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@986407 13f79535-47bb-0310-9956-ffa450edef68
2010-08-17 17:40:28 +00:00
Jacques Le Roux
7a285eed10
Miscellaneous improvement in Form Widgets examples. Notably introduces an, as much as possible generalized (so far), dependent drop-downs example. I have introduced 2 couples of dependent drop-downs.
...
The 1st one, country/states, is a common one and does not need (ie it's better to not) to be generalized. It can be used as is. It needs some pieces which are all included, see comments and follow...
The 2d, category/products, have been taken as example but is not a good candidate. What if you get much categ or/and products? Anyway it's a good OOTB example and I had it at hand, so I used it. I have tried to generalize (abstract the couple of dropdowns) and it's almost there. The only issue I crossed, is when you want to use a couple of dependent drop-downs in the same form. As it's not a common case, the setDependentDropdownValuesJs.ftl template-script can be used in most cases...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@986370 13f79535-47bb-0310-9956-ffa450edef68
2010-08-17 16:18:24 +00:00
Jacques Le Roux
3e925d6a06
Moves getCountryList and getAssociatedStateList from Party component to Framework to avoid dependencies on Party component (countries and states are not parties, but Geo, ie should be in the framework)
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@986325 13f79535-47bb-0310-9956-ffa450edef68
2010-08-17 14:31:25 +00:00
Jacques Le Roux
04d4634019
Removes deprecated and useless framework/common/webcommon/WEB-INF/geolocation.ftl, it has been replaced by framework/common/webcommon/includes/geolocation.ftl
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@986266 13f79535-47bb-0310-9956-ffa450edef68
2010-08-17 11:25:24 +00:00
Erwan de Ferrieres
0ae7083542
Adding geolocation using openstreetmap, examples are taken from the google existing ones
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@986095 13f79535-47bb-0310-9956-ffa450edef68
2010-08-16 18:56:25 +00:00
Jacques Le Roux
40f66b1ac0
Better French label
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@985434 13f79535-47bb-0310-9956-ffa450edef68
2010-08-14 06:14:00 +00:00
Jacques Le Roux
4ced84dd08
A patch from Karl Pitrich "When editing Portal Pages, Drag & Drop for Portlets does not work" ( https://issues.apache.org/jira/browse/OFBIZ-3889 ) - OFBIZ-3889
...
When editing Portlet Pages, either in MyPortal or PortalAdm, Drag & Drop of Portlets does not work.
Where are several Issues in the MyPortal, some have fixes, none is commited to trunk.
Problems:
* in myportal.js, function getDestinationInformationPortlets(): DOM ID's are not handled correctly
* in framework/webtools/widget/PortalAdmScreens.xml: required javascript + css files are not included
JLR:
While working on this I have found other issues: the login.ftl files used in hhfacility and myportal were not tenant enabled. They are different but by chance in myportal very close to common so I was finally able to do both at along with Karl's changes. Actually I wanted to do 2 commits but forget to uncheck the files while doing a second attempt to commit.
MyPortal
* The login process in MyPortal was not tenant enabled, it's done in this commit.
* I kept its specificity : newRegisterLogin and wonder why it has not been extended to common?
hhfacility
The login process in hhfacility was not tenant enabled, it's done in this commit. Doing so, I saw there i18n is not done, not an issue for me...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@985163 13f79535-47bb-0310-9956-ffa450edef68
2010-08-13 11:43:38 +00:00
Adam Heath
b273b52dad
Finally created a script to find and fix tons of missing final newlines.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@982870 13f79535-47bb-0310-9956-ffa450edef68
2010-08-06 04:46:48 +00:00
Adam Heath
2da92e401f
Some more trailing newline changes.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@981698 13f79535-47bb-0310-9956-ffa450edef68
2010-08-02 22:32:54 +00:00
Scott Gray
10a56ea013
Copied CommonWorkers.hasParentType(...) over to EntityTypeUtil and deprecated the method.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@981446 13f79535-47bb-0310-9956-ffa450edef68
2010-08-02 10:47:26 +00:00
Scott Gray
4448c4a866
No functional changes, just removing a whole bunch of unused imports and reorganizing them along the way.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@981019 13f79535-47bb-0310-9956-ffa450edef68
2010-07-31 08:28:34 +00:00
David E. Jones
800a85a38e
Fixed two bugs with autocomplete functionality: init script in selectall.js was not doing the search/replace properly for ampersands, in the FindAutocompleteOptions.groovy script the andExprs were not really anded together so split into the or and main and lists and assembled the conditions properly, which will fix the conditionFields and the andCondition fields
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@980348 13f79535-47bb-0310-9956-ffa450edef68
2010-07-29 07:53:06 +00:00
Jacques Le Roux
1c0d7111b1
Makes fadeBackground="true" as it's by default in xsd and allow to pass disabled(true or false)
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@979104 13f79535-47bb-0310-9956-ffa450edef68
2010-07-25 19:57:16 +00:00
David E. Jones
339da2c8f1
Added support for passing extra server-side parameters in a Map from the screen definition, ie screen actions
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@965154 13f79535-47bb-0310-9956-ffa450edef68
2010-07-18 02:24:21 +00:00
Ashish Vijaywargiya
2c06dd8e5e
Added gram into pound support.
...
Thanks Vivek for the patch.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@960495 13f79535-47bb-0310-9956-ffa450edef68
2010-07-05 09:21:59 +00:00
Jacques Le Roux
f2fbad78d5
Improvement on r960336. Fix a problem reported by Scott on dev ML.
...
I tested locally, and I think I have done it right this time
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@960491 13f79535-47bb-0310-9956-ffa450edef68
2010-07-05 09:10:19 +00:00
Jacques Le Roux
82aba53fa5
Improvement on r960336 (should fix a problem reported by Scott on dev ML.)
...
I tested locally, but I'm not quite sure it's sufficient
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@960401 13f79535-47bb-0310-9956-ffa450edef68
2010-07-04 21:23:47 +00:00
Jacques Le Roux
060a0ad59b
Internationalize the category/products and country/state dependent dropdown "worker" services (when the list is empty we need to show something to explain)
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@959984 13f79535-47bb-0310-9956-ffa450edef68
2010-07-02 13:45:55 +00:00
Erwan de Ferrieres
417be33da1
When an error message is displayed, clicking on it will make it disappear
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@959960 13f79535-47bb-0310-9956-ffa450edef68
2010-07-02 12:10:58 +00:00
Jacques Le Roux
c16497a20c
Revert r959673 on Scott's advice. There is already a getCategoryMembers. A bit different but it's ok, as it does not make much sense to sort categoryMembers with another field than sequenceNum
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@959943 13f79535-47bb-0310-9956-ffa450edef68
2010-07-02 10:32:58 +00:00
Jacques Le Roux
b89ca0e0ff
Adds a getAssociatedProductsList method. I will certainly add the companions service and request later in the Product application.
...
I have also the vague desire to generalize this more, as I have been able to quickly use it in a widget form following the Freemarker way already used.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@959673 13f79535-47bb-0310-9956-ffa450edef68
2010-07-01 14:05:21 +00:00
Erwan de Ferrieres
a98fde6e54
simplifying French label
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@959671 13f79535-47bb-0310-9956-ffa450edef68
2010-07-01 14:02:36 +00:00
Erwan de Ferrieres
da8510e3f1
Adding new geoAssocTypes, one for a town in a county, the other one for a postal code for a geoType
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@958569 13f79535-47bb-0310-9956-ffa450edef68
2010-06-28 13:16:14 +00:00
Erwan de Ferrieres
143b01827a
Adding missing French departments (counties)
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@958567 13f79535-47bb-0310-9956-ffa450edef68
2010-06-28 13:15:00 +00:00
Erwan de Ferrieres
baffc03933
Better handling of text when displayed in a chart
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@957494 13f79535-47bb-0310-9956-ffa450edef68
2010-06-24 10:27:50 +00:00
Jacques Le Roux
c274921c68
Added TOMAHAWK description to be consistent, but anyway this is not used anywhere for the moment...
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@956343 13f79535-47bb-0310-9956-ffa450edef68
2010-06-20 10:47:33 +00:00
Jacques Le Roux
0f7d2f9462
New updateNote service
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@956129 13f79535-47bb-0310-9956-ffa450edef68
2010-06-18 21:08:24 +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
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
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
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
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
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
ce4c794fb6
Revert wrongly committed 950261
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@950274 13f79535-47bb-0310-9956-ffa450edef68
2010-06-01 21:59:21 +00:00
Adam Heath
caa519f006
Revert wrongly committed 950262
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@950273 13f79535-47bb-0310-9956-ffa450edef68
2010-06-01 21:59:02 +00:00
Adam Heath
9cc1b3e521
Revert wrongly committed 950265
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@950269 13f79535-47bb-0310-9956-ffa450edef68
2010-06-01 21:55:59 +00:00
Adam Heath
0a84a9166c
Minor fixes to make webtools work underneath webslinger(not ready to go
...
public).
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@950265 13f79535-47bb-0310-9956-ffa450edef68
2010-06-01 21:47:24 +00:00
Adam Heath
b1da3a854c
Make use of new HashCrypt cryptPassword functionality.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@950262 13f79535-47bb-0310-9956-ffa450edef68
2010-06-01 21:47:06 +00:00