Commit Graph
9020 Commits
Author SHA1 Message Date
Jacques Le Roux 84fb49d051 A patch from Wai "missing request-maps for search related buttons" (https://issues.apache.org/jira/browse/OFBIZ-3929) - OFBIZ-3929
Missing request-maps in ordermgr controller.xml:
clearSearchOptionsHistoryList
setCurrentSearchFromHistory
setCurrentSearchFromHistoryAndSearch

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@995686 13f79535-47bb-0310-9956-ffa450edef68
2010-09-10 07:13:41 +00:00
Jacques Le Roux 8796a24839 A patch from Gil Portenseigne "Error while creating a facilityContactMech if no purpose is given" (https://issues.apache.org/jira/browse/OFBIZ-3928) - OFBIZ-3928
Gil: When creating a new facility contactMech, a facilityContactMechPurpose is automatically created, even if there is no contactMechPurposeTypeId is given in parameters.
The problem is that it's impossible to create a FacilityContactMechPurpose without purpose, and contactMechPurposeTypeId is optional in service parameters. 

JLR: so it makes sense if we don't want to change the service definition (ie make contactMechPurposeTypeId mandatory).

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@995453 13f79535-47bb-0310-9956-ffa450edef68
2010-09-09 15:04:14 +00:00
Jacopo Cappellato b1141209c3 Refactored and improved the way the information about inventory items created by a production run is retrieved in the form; also added the status of the inventory: this fixes a functional bug where defective inventory items were shown together with valid ones and it was not possible for the user to figure out if the planned quantity for the production run was fulfilled or not.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@995330 13f79535-47bb-0310-9956-ffa450edef68
2010-09-09 06:41:44 +00:00
Jacopo Cappellato e9245919a4 Fix for a rather important functional bug: dependent production runs were always created when a production run is created manually (and not from requirements etc.); in my opinion this should never happen, but I understand that it can be useful in some rare occasions, so I have added the option to select if mandatory production runs have to be created or not.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@995325 13f79535-47bb-0310-9956-ffa450edef68
2010-09-09 06:35:24 +00:00
Adam Heath f8f89ac3c8 Add ReturnHeader.supplierRmaId, an informational header, to provide a
field to support tracking of rmas by suppliers.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@995201 13f79535-47bb-0310-9956-ffa450edef68
2010-09-08 19:03:12 +00:00
Adam Heath 556d795264 On view enitity ProductFeatureAndAppl, and relations to the 2 member
entities, ProductFeature and ProductFeatureAppl.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@995200 13f79535-47bb-0310-9956-ffa450edef68
2010-09-08 19:03:07 +00:00
Adam Heath a372e64111 Add a missing attribute, recurringAmount, for service
updateFeatureToProductApplication.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@995199 13f79535-47bb-0310-9956-ffa450edef68
2010-09-08 19:03:02 +00:00
Erwan de Ferrieres 0b8998e9e1 Missing French uiLabel for FormFieldTitle_decoratorContentId
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@993401 13f79535-47bb-0310-9956-ffa450edef68
2010-09-07 15:51:54 +00:00
Erwan de Ferrieres cd78a16fba OFBIZ-3647 Create dataResource from content -- A patch from Nicolas Malin -- https://issues.apache.org/jira/browse/OFBIZ-3647
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@993395 13f79535-47bb-0310-9956-ffa450edef68
2010-09-07 15:30:21 +00:00
Ashish Vijaywargiya 9adc1e0669 Applied patch from jira issue - OFBIZ-3924 - Bug on creating Communication event for order return emails(return accept, return complete and return cancel).
Bug on creating Communication event for order return emails(return accept, return complete and return cancel). Attached return pdf along with return emails.

Thanks Anurag for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@993387 13f79535-47bb-0310-9956-ffa450edef68
2010-09-07 15:03:20 +00:00
Erwan de Ferrieres f0c96bacc8 OFBIZ-3854 Separate AddPartyRole form to main and second role -- a patch from Nicolas Malin
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@993381 13f79535-47bb-0310-9956-ffa450edef68
2010-09-07 14:34:00 +00:00
Ashish Vijaywargiya 4607fdd36e Applied patch from jira issue - OFBIZ-3923 - Bug in updating local file content.
attachUploadToDataResource (member service of updateContentAndUploadedFile service group) service calls saveLocalFileDateResource simple method to save the local file and attach it to data resource. The case where updating a local file content but not uploading a new file is being handled but doesn't work since on finding DataResource object "isUpdate" flag is not set to "Y".

Here is the patch for the fix. Also fixed typo in simple method name, saveLocalFileDateResource => saveLocalFileDataResource.

Thanks Mridul for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@993344 13f79535-47bb-0310-9956-ffa450edef68
2010-09-07 13:19:02 +00:00
Erwan de Ferrieres cdf2a35342 Better French roles description for calendar participants
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@993309 13f79535-47bb-0310-9956-ffa450edef68
2010-09-07 10:06:14 +00:00
Scott Gray c2dd8319ba Fixed startup warnings regarding some view entity definitions.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@992688 13f79535-47bb-0310-9956-ffa450edef68
2010-09-04 21:43:50 +00:00
Scott Gray 446c2e0f83 Remove commented view definition because the same definition is present elsewhere in the file anyway.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@992687 13f79535-47bb-0310-9956-ffa450edef68
2010-09-04 21:43:23 +00:00
Ashish Vijaywargiya e0480153e0 Showing OrderId adjacent to Bin #.
Thanks Anurag for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@992297 13f79535-47bb-0310-9956-ffa450edef68
2010-09-03 13:50:23 +00:00
Erwan de Ferrieres 772a10ec45 Since 990004, facilityContactMechPurposeType is now mandatory, adding a drop-down so the user can select one
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@992247 13f79535-47bb-0310-9956-ffa450edef68
2010-09-03 09:54:12 +00:00
Ashish Vijaywargiya 4474b06d4f Applied patch from jira issue OFBIZ-3921 - Return PDF should contain reason of return.
Thanks Anurag for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@992244 13f79535-47bb-0310-9956-ffa450edef68
2010-09-03 09:48:07 +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
Jacopo Cappellato d972ee8dda Fixed a fop runtime error happening when no materials or no tasks were defined.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@990726 13f79535-47bb-0310-9956-ffa450edef68
2010-08-30 08:24:10 +00:00
Jacques Le Roux 2cc0283da6 <?xml version="1.0" encoding="iso-8859-1"?> allows to read accentuated characters in Docbook
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@990539 13f79535-47bb-0310-9956-ffa450edef68
2010-08-29 10:53:28 +00:00
Scott Gray 1a86d7d4b6 Replace null check with a null safe expression (even though productTypeId should never be null anyway)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@990334 13f79535-47bb-0310-9956-ffa450edef68
2010-08-28 09:47:07 +00:00
Scott Gray 7956d456d6 Continue with the next iteration on exception, prevents potential NPE
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@990333 13f79535-47bb-0310-9956-ffa450edef68
2010-08-28 09:46:58 +00:00
Scott Gray fcfa1386e5 Replace date condition with in-memory date filtering
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@990332 13f79535-47bb-0310-9956-ffa450edef68
2010-08-28 09:46:48 +00:00
Ashish Vijaywargiya aaec638d26 Applied patch from jira issue OFBIZ-3904 - Bug in calling methods defined in Usps Services.
Calling "getPackageSplit" & "calcPackageWeight" methods from outside of the class causes compilation error, as their access modifiers are private. 
So fixing this bug, following points are covered in this commit.
1) Moving "getPackageSplit" and "calcPackageWeight" from UspsServices.java to ShipmentWorker.java. They are not Usps third party related methods.
2) Changing access modifiers of these methods to public.

Thanks Vivek for the contribution. 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@990127 13f79535-47bb-0310-9956-ffa450edef68
2010-08-27 12:35:29 +00:00
Jacopo Cappellato 0f4c0e143e Fixed an issue (NPE) that was preventing the cost and qoh calculation in the scalar explosion; slightly improved layout of scalar explosion; added weight information.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@990097 13f79535-47bb-0310-9956-ffa450edef68
2010-08-27 11:01:44 +00:00
Jacopo Cappellato e7c2988ede Fixed a series of layout issues that were preventing the production run pdf to be really useful (overlapping contents, messed up fields etc...)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@990086 13f79535-47bb-0310-9956-ffa450edef68
2010-08-27 10:24:13 +00:00
David E. Jones 5c10ed8b2d Related to 990006 the tax calc address code is made more consistent and supported at a lower level by passing in a facilityId when available; this is the order component part and the other commit was the lower level accounting component part
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@990007 13f79535-47bb-0310-9956-ffa450edef68
2010-08-27 03:20:10 +00:00
David E. Jones 8a2dd45310 A few changes to make the code more consistent that determines the address to use for tax calc, especially when there is no shipping address, ie when it is a face-to-face sale
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@990006 13f79535-47bb-0310-9956-ffa450edef68
2010-08-27 03:13:27 +00:00
David E. Jones ee0e437a3c Fixed issue with createFacilityContactMech where purpose was not being created, it is created now
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@990004 13f79535-47bb-0310-9956-ffa450edef68
2010-08-27 03:06:24 +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
Erwan de Ferrieres 353f609b52 Adding missing French uiLabel
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@989031 13f79535-47bb-0310-9956-ffa450edef68
2010-08-25 11:55:55 +00:00
Jacopo Cappellato 8999de4c0c Fixed bug that was preventing the product name from appearing in the production run pdf; also added the production run name, when available; slightly improved the pdf layout for these two fields.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@988923 13f79535-47bb-0310-9956-ffa450edef68
2010-08-25 09:27:17 +00:00
Hans Bakker 552ab71a62 make the access of productData and content use the cache. This wil result in a 20% speed increase of the ecommerce homepage
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@988893 13f79535-47bb-0310-9956-ffa450edef68
2010-08-25 08:45:08 +00:00
Jacques Le Roux d166ab0737 Oops, a unwanted log had slipped in in r988728
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@988828 13f79535-47bb-0310-9956-ffa450edef68
2010-08-25 07:06:33 +00:00
Jacques Le Roux 5fd0165b7a No functional changes only better description of getAssociatedProductsList service
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@988728 13f79535-47bb-0310-9956-ffa450edef68
2010-08-24 21:03:53 +00:00
Jacques Le Roux a8aab34859 Better French label
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@988541 13f79535-47bb-0310-9956-ffa450edef68
2010-08-24 13:55:33 +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
Jacques Le Roux c486b5d0de Adds a new ShoppingCart.CartPaymentInfo public method which uses and set an authCode. This is like PosTransaction.java.setPaymentRefNum method in POS but allows to add an authcode without having already a payment info in place, ie when creating an order at the same time.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@988411 13f79535-47bb-0310-9956-ffa450edef68
2010-08-24 07:24:46 +00:00
Ashish Vijaywargiya 67a7985925 Changing the sorting order(storeName -> productStoreId, storeName) of Product Store. In general for testing purpose we create sales order for an Ecommerce store from the back office ordermgr application, so each time we select the Ecommerce ProductStore first to have all the upcoming steps work without any issues. Now after this change the "OFBiz E-Commerce Store" should come first on OrderEntry screen.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@987996 13f79535-47bb-0310-9956-ffa450edef68
2010-08-23 05:04:53 +00:00
Bruno Busco 0fe784196c Replaced PartyClassificationTabBar FTL file with a standard TabBar menu
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@987870 13f79535-47bb-0310-9956-ffa450edef68
2010-08-22 11:41:25 +00:00
Jacques Le Roux cb4beec116 A patch from Rene Scheibe "Facility Manager: "Default Weight Unit" is not shown correctly" https://issues.apache.org/jira/browse/OFBIZ-3893) - OFBIZ-3893
page: Looking at https://127.0.0.1:8443/facility/control/UpdateFacility

The "Default Weight Unit" is not shown correctly. It is always showing "none".

This was not fixed correctly in rev 931700. Just added selected="selected". 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@987841 13f79535-47bb-0310-9956-ffa450edef68
2010-08-22 00:27:09 +00:00
Jacopo Cappellato 657ccb35c3 Simlified service definitions for CRUD operations on the TechDataCalendarWeek entity: this fixes an error happening when the exception week was edited.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@987698 13f79535-47bb-0310-9956-ffa450edef68
2010-08-21 05:39:59 +00:00
Bruno Busco 598f535807 Replaced party visits list screen with a more standard findVisits one.
Included Search options form for visit filtering and paginations.
Some ftl files have not yet been deleted because used in the projectmgr application.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@987162 13f79535-47bb-0310-9956-ffa450edef68
2010-08-19 14:39:01 +00:00
Hans Bakker 2d9b75a30f this is a revert of r731487 to downgrade freemarker from 2.3.15 to 2.3.10 because of speed problems. In order to make the older version work we changed the following:
- create new OfbizCatalogUrlTransform class
- delete CatalogUrlDirective.java class
- set ofbizCatalogUrl transform to OfbizCatalogUrlTransform class
- In htmlFormMacroLibrary.ftl file, change floor directive to floor method of Math class
- change freemarker version in .classpath and LICENSE files
We are in discussion with the freemarker developers to solve this problem there.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@986577 13f79535-47bb-0310-9956-ffa450edef68
2010-08-18 06:33:12 +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 89dec0b0bf Completes r985856 "Cost calculation is still broken and no shipping costs are returned"
I forgot to commit the change in ShipmentCostEstimate: add productStoreShipMethId to ShipmentCostEstimate when created by createShipmentEstimate. Else new created ShipmentCostEstimate would be inconsistent, see http://markmail.org/message/2f6ryfm6fvvrvx74  

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@985902 13f79535-47bb-0310-9956-ffa450edef68
2010-08-16 12:41:00 +00:00
Jacques Le Roux 4cf1de3119 Fix a bug reported in this thread http://markmail.org/message/2f6ryfm6fvvrvx74
"Cost calculation is still broken and no shipping costs are returned."

Note that nothing still is calculated for Fedex. I'm not quite sure if it's related, but Fedex has changed/is changing how things work. The API is deprecated, replaced by web services and will be totally unusable in May 2012

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@985856 13f79535-47bb-0310-9956-ffa450edef68
2010-08-16 10:14:45 +00:00
Jacques Le Roux 8b9e3c3f66 Uses a better syntax w/out any fixed naming conventions. Thanks to Andrew. More to come soon in Example component.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@985745 13f79535-47bb-0310-9956-ffa450edef68
2010-08-15 20:25:01 +00:00