Commit Graph
2039 Commits
Author SHA1 Message Date
Jacques Le Roux 57ee595bc2 Fix a bug reported by Arun Patidar at https://issues.apache.org/jira/browse/OFBIZ-3272 "Delete links for on Catalog-> Promos->Rules is not working." OFBIZ-3272
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@885122 13f79535-47bb-0310-9956-ffa450edef68
2009-11-28 17:57:17 +00:00
Jacques Le Roux e07ab48fb4 Some cleaning related to is(Not)Empty
* remove duplicate ()
* remove casts no longer needed

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@885103 13f79535-47bb-0310-9956-ffa450edef68
2009-11-28 15:46:52 +00:00
Jacques Le Roux 569a4afeea Some cleaning related to isEmpty
* remove duplicate ()
* remove casts no longer needed

I'm doing these last tasks around isEmpty and isNotEmpty mostly to be sure that nothing has slipped in. Despite I have been very careful, I prefer double check.

+ one typo in ofbizSelenium help (not sure this file is used yet though, seems to be missing some parts which are commented out, for now I guess)



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@885093 13f79535-47bb-0310-9956-ffa450edef68
2009-11-28 14:08:16 +00:00
Vikas Mayur 69b4609a70 Replaced the permission required to update/delete a contact mech for Facility with correct permission. Also added permission check to create a facility contact mech.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@885087 13f79535-47bb-0310-9956-ffa450edef68
2009-11-28 12:12:56 +00:00
Jacques Le Roux fffdd4175d A patch from Arpit Singh Pandya "Error is not Handle for Inventory, if wrong productId is passed, it is breaking the ftl." (https://issues.apache.org/jira/browse/OFBIZ-3265) - OFBIZ-3265
Steps to generate the problem
– Go to https://demo.ofbiz.org/catalog/control/main
– In Right bar at Search Products section Leave Product Id.
– Select "Inventory" in "Product Jump" DropDown.

It is breaking the ProductInventorySummary.ftl and EditProductInventoryItems.ftl code. 


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@884758 13f79535-47bb-0310-9956-ffa450edef68
2009-11-27 07:25:06 +00:00
Jacopo Cappellato 099cd47379 Hidden marketing package specific information for non marketing package products in the inventory page.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@884653 13f79535-47bb-0310-9956-ffa450edef68
2009-11-26 17:27:22 +00:00
Ashish Vijaywargiya 2b787a499d Shown product lookup instead of text. Patch from Akash Jain.
Lookup added at:
(1) Go to Facility > Shipments, depress  Find Shipment(s) link.
(2) Depress any shipment Id (hyperlink) which have Input status.
(3) Depress Items tab, there should be product lookup for Product Id.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@884556 13f79535-47bb-0310-9956-ffa450edef68
2009-11-26 13:57:39 +00:00
Ashish Vijaywargiya 7a2bd27321 Layout fixes so that screen looks consistent and similar to the other existing screens present OOTB https://localhost:28443/facility/control/FindFacilityLocation?facilityId=WebStoreWarehouse.
Thanks Chandan for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@884467 13f79535-47bb-0310-9956-ffa450edef68
2009-11-26 08:51:38 +00:00
Bruno Busco 0cf076fb20 Moved the "CatalogTabBar" Menus from the "body" decorator-section to the "pre-body" decorator section in the CommonCatalogDecorator.
This makes better the rendering of themes such as Dropping Crumbs.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@884034 13f79535-47bb-0310-9956-ffa450edef68
2009-11-25 11:04:41 +00:00
Adam Heath 8846568006 In the Product/Parties screen, the link to the related party was broken.
Instead of showing the related party, it would show the user who was
logged into the partymgr backend.  The patch that fixed this was
provided by Ean Schuessler in
(https://issues.apache.org/jira/browse/OFBIZ-3258) OFBIZ-3258

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883933 13f79535-47bb-0310-9956-ffa450edef68
2009-11-25 00:31:25 +00:00
Bruno Busco a35ef9c0cd Product component
Moved TabBar Menus from the "body" decorator-section to the "pre-body" decorator section.
This makes better the rendering of themes such as Dropping Crumbs.

Removed several redundant <section><widget> tags also

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883671 13f79535-47bb-0310-9956-ffa450edef68
2009-11-24 12:42:37 +00:00
Ashish Vijaywargiya ec7c9da36d Applied patch from jira issue OFBIZ-3252 - Add Supplier for Product, it is showing warning on the console.
-- When we are going to associate supplier for any product from catalog, it is showing warning on console.

Thanks Arpit for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883646 13f79535-47bb-0310-9956-ffa450edef68
2009-11-24 10:23:42 +00:00
Jacques Le Roux c72b29cb1f Use UtilValidate.isNotEmpty methods instead of (obj != null) || (obj.length > 0) and (obj != null) || (obj.size > 0)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883549 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 23:41:34 +00:00
Jacques Le Roux 5518e9baf8 Use UtilValidate.isEmpty methods instead of (obj == null) || (obj.size == 0)
Complete r883492

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883516 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 22:02:05 +00:00
Jacques Le Roux e839974fe7 Use UtilValidate.isEmpty methods instead of (obj == null) || (obj.length == 0)
Complete r883507


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883508 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 21:48:18 +00:00
Jacques Le Roux 8ae9319710 Use UtilValidate.isEmpty methods instead of (obj == null) || (obj.size == 0)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883492 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 20:34:27 +00:00
Ashish Vijaywargiya 9f43893c28 Applied patch from jira issue OFBIZ-2619 - Issues with Receive PO functionality.
-- updated patch with use of variable name modifiers in UEL arithmetic, as suggested by Adrian. 

Thanks Mridul for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883348 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 14:07:40 +00:00
Jacques Le Roux 23f65dfef7 Oops, I put a wrong tag in r883280 while doing some tests
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883292 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 09:35:26 +00:00
Jacques Le Roux f64c440775 A patch from Surya Kusumakar "New feature to upload multiple Additional View Images at Product Content." (https://issues.apache.org/jira/browse/OFBIZ-3244) - OFBIZ-3244
Add a new feature in Product Content to add all four images at a time and one can preview those images in larger view on mouse over of particular image. 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883280 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 08:48:43 +00:00
Adam Heath 820d11eb97 Deprecate UtilCache constructors, and add a create helper function.
This is the first step to making utilCacheTable concurrent, and
non-blocking.  To do so, the constructor has to have no side-effects.
This means it can't modify utilCacheTable itself; this will be moved to
the helper function created above.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883217 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 02:56:28 +00:00
Bruno Busco 360898c331 Removed specific menu style that is no longer needed
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883021 13f79535-47bb-0310-9956-ffa450edef68
2009-11-22 00:41:00 +00:00
Bruno Busco e4c40b9a3c Moved several TabBar Menus from the "body" decorator-section to the "pre-body" decorator section.
Having the TabBar menu in the "pre-body" seems to be the right pattern (already present in several screens) that should always be followed.
This change allows a much better rendering of the Dropping Crumbs while having a very little TabBar menu shift in other themes.
All other screens will be changed accordingly.
This commit also fixes OFBIZ-3240

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883020 13f79535-47bb-0310-9956-ffa450edef68
2009-11-22 00:39:41 +00:00
Bruno Busco aee9b7b437 Moved some application labels out of the framework
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@882731 13f79535-47bb-0310-9956-ffa450edef68
2009-11-20 21:50:31 +00:00
Bruno Busco 7a275e9488 Fixed TabBars layout problems for Dropping Crumbs theme.
The offending TabBars include-menu tags have been wrapped with a <container style="no-clear">.
I preferred this method instead of what suggested by Adrian in rev.881027 (that consists in changing the menu style) because in principle the menu could be used in other screens where there is no need of this (no multi-column) and also because in this way there is no needs to change the menu every time we change the screen layout.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@882725 13f79535-47bb-0310-9956-ffa450edef68
2009-11-20 21:43:15 +00:00
Ashish Vijaywargiya 70548f0b98 Applied patch from jira issue OFBIZ-3077 - Error for productStoreId when click on productId link from showcart of purchase order.
Steps regenerate error:
1) Hit url: https://localhost:8443/ordermgr/control/orderentry
2) Select purchase order with supplier
3) Add product for order
4) Click on the productId from showcart page

it will generate error as following
org.ofbiz.widget.screen.ScreenRenderException: Error rendering screen component://order/widget/ordermgr/OrderEntryCatalogScreens.xml#productdetail: java.lang.NullPointerException: Cannot get property 'productStoreId' on null object (Cannot get property 'productStoreId' on null object)

Notes from Mridul:
As Joe has already stated that we need to do few adjustments in the code based on presence of productStoreId. I would vote for:

   1. Showing all reviews.
   2. Skipping surveys.

The third section, which is the most important one and needs productStoreId is getProductVariantTree service invoked in ProductDetail.groovy (line 232). getProductVariantTree service needs productStoreId to get available inventory. In case of PO's we don't need to check for available inventory at all. Now for being able to use the same code to display product detail page in case of a PO, we will need to make modifications to getProductVariantTree service too, which can be done in two ways:

   1. Add a boolean IN attribute checkInventory to service definition, if its true check the available inventory and if false do not.
   2. A check on productStoreId in the implementation can serve our purpose too.

I like #1 more as it won't eliminate importance of productStoreId in case of a sales order. Looking forward to suggestions from community to handle this situation.

Thanks Amit for the contribution. Mridul Thanks a lot for providing useful notes for the implementation.
Guys, I appreciate your coordination on this!

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@882618 13f79535-47bb-0310-9956-ffa450edef68
2009-11-20 15:54:39 +00:00
Vikas Mayur 2f1dd4a7db Added user friendly error messages following scenarios:
Case 1
(a) Go to Facility -> Shipment, click on New Shipment link.
(b) Select "Status Id = Input", "Origin Facility = Web Store Warehouse" & "Shipment type Id = Sales Shipment" then depress Update button.
(c) Now depress Items tab, enter product Id & quantity then depress create button.
(d) Select "New" for Add to Package dropdown and depress Add button.
(e) Now depress Delete button for Item then it will show error message that can be understood by a warehouse manager.

Case 2

(a) Follow #a to #d process in Case 1
(b) Depress Packages tab.
(c) Depress Delete button for Package then it will show error message that can be understood by a warehouse manager.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@882555 13f79535-47bb-0310-9956-ffa450edef68
2009-11-20 13:58:42 +00:00
Jacques Le Roux 8a6de29205 Format few lines
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@882536 13f79535-47bb-0310-9956-ffa450edef68
2009-11-20 12:29:13 +00:00
Hans Bakker c5732ca682 header-link-style and header-link not working and only used in 2 forms in the system, removed. Assumed sortfield took over this fucntionality?
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@882423 13f79535-47bb-0310-9956-ffa450edef68
2009-11-20 06:02:12 +00:00
Ashish Vijaywargiya 6cd34053b4 Applied patch from jira issue OFBIZ-3218 - By entering OrderId in Pack Order Screen from Facility manager, and clicking on "Weigh Package only" is not rendering text boxes to enter weights and dimension of packages.
Steps to produce the bug:

1) Place a sales Order,
2) Go through Verify Pick process
3) Go to Packing Screen
4) Enter OrderId and then click on "Weigh Package Only button ."
5) Text boxes to enter weights and dimension of packages should render.

Thanks Divesh for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@882068 13f79535-47bb-0310-9956-ffa450edef68
2009-11-19 08:09:59 +00:00
Jacques Le Roux 189e7ad383 A patch from Erwan de FERRIERES "Misc. French translations" (https://issues.apache.org/jira/browse/OFBIZ-3222) - OFBIZ-3222
Some translations for the accounting component, and for the CommonUiLabels file 

I have also changed some other labels in ProductEntityLabels.xml and ProductUiLabels.xml while I was at it 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@881987 13f79535-47bb-0310-9956-ffa450edef68
2009-11-18 23:03:48 +00:00
Scott Gray ce66eb6c06 Added fixedAssetId and relationship to CostComponent to so that it is easier to determine the source of the cost (in most cases the source is CostComponentCalc but for fixed asset usage it is FixedAssetStdCost)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@881732 13f79535-47bb-0310-9956-ffa450edef68
2009-11-18 11:43:11 +00:00
Jacques Le Roux c039216676 A patch from Chandan Khandelwal "Bug on Party ViewProfile Page" (https://issues.apache.org/jira/browse/OFBIZ-3217) - OFBIZ-3217
Steps for reproduce error
1) Go to partymgr find screen
2) Select customer which have geoPointId [partyId : DemoCustomer ]
3) Update postal address which have geolocation
4) Remove all Contact Purposes and Go Back to profile screen
5) It generate an error due to contactMechPurposeType is undefined

I have extended the use of this patch to 2 other templates

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@881713 13f79535-47bb-0310-9956-ffa450edef68
2009-11-18 10:35:08 +00:00
Scott Gray d210f34150 Updated test pack to reflect DEMO10090's new order item quantity
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@881083 13f79535-47bb-0310-9956-ffa450edef68
2009-11-17 01:24:20 +00:00
Adrian Crum 5d76d9460d An example of the correct way to fix layout problems in a multi-column screen.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@881027 13f79535-47bb-0310-9956-ffa450edef68
2009-11-16 22:59:56 +00:00
Ashish Vijaywargiya 012baa5c6c Patch from Anurag Singh Sengar (Thanks!) - Don't show expired record. https://localhost:28443/facility/control/EditFacilityParties?facilityId=WebStoreWarehouse
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@880682 13f79535-47bb-0310-9956-ffa450edef68
2009-11-16 09:14:21 +00:00
Jacques Le Roux 39d105f92f Reverted changes 836044 following Adrian's issue report in https://issues.apache.org/jira/browse/OFBIZ-3206 "Recent Markup Changes Break Layout"
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@880658 13f79535-47bb-0310-9956-ffa450edef68
2009-11-16 08:27:36 +00:00
Scott Gray 075b037e72 Make use of request-redirect when creating a shipment, helps prevent blank shipments being accidentally created
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@836285 13f79535-47bb-0310-9956-ffa450edef68
2009-11-14 23:04:17 +00:00
Scott Gray 367f410883 Fixed indentation
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@836282 13f79535-47bb-0310-9956-ffa450edef68
2009-11-14 22:48:09 +00:00
Scott Gray b4370f0fc4 Specifying a shipment id in Find Shipments had no effect
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@836281 13f79535-47bb-0310-9956-ffa450edef68
2009-11-14 22:46:51 +00:00
Scott Gray 962ce441b6 Fixed defaults for missing values when displaying Find Shipment results
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@836280 13f79535-47bb-0310-9956-ffa450edef68
2009-11-14 22:42:49 +00:00
Scott Gray 0c4efac2d7 Find Shipment search wasn't performing no condition finds
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@836279 13f79535-47bb-0310-9956-ffa450edef68
2009-11-14 22:41:55 +00:00
Jacques Le Roux 5fc931c191 A patch from Bruno Busco "A new droppingcrumbs theme" (https://issues.apache.org/jira/browse/OFBIZ-3156) - OFBIZ-3156
An updated patch to be used to show correctly the tabbars with this theme.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@836044 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 22:47:44 +00:00
Ashish Vijaywargiya 8f887ad408 Applied patch from jira issue OFBIZ-3186 - Layered Navigation of Categories.
Layered navigation in an Ecommerce application allows the user to filter the product listing based on categories, features and price ranges. The user can apply multiple filters to the given product listing. He can narrow or expand his search and try different filter combinations so as to find the desired product.

I have implemented Layered Navigation in OFBiz ecommerce with following filters:

   1. Sub Categories: This filter is shown whenever there are sub-categories present under the top-level category or current selected category. Count of products within the category is shown against each category, works with multilevel deep category hierarchy. Selecting a sub category will show products within that category and filters will be updated accordingly for the new product list.
   2. Features: Feature filters are grouped by Feature Types. Count of products that has the feature associated as standard, selectable or distinguishing is shown against that feature. Current Implementation has feature filters for ProductFeatureType="COLOR".
   3. List Price Range: This filter will always show. When applied filters product based on List Price Range. Current implementation is done by listing static price ranges at code level.

The above implementation is completely based on the OOTB Product Search functionality with few additional methods in ProductSearchSession to derive count against different type of filters.

This is collaborative contribution from Mridul Pathak, Jacopo Cappellato & Scott Gray.
Thanks Guys for such a nice contribution - I am sure community will love seeing the existence of "Layered Navigation" in OFBiz trunk.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835372 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 12:54:22 +00:00
Ashish Vijaywargiya d48eee6986 Applied patch from jira issue OFBIZ-3173 - Better supportability for products of type MARKETING_PKG_AUTO in order processing and fulfillment process.
Following points are covered in this patch:
1) Show associated products for product of type "MARKETING_PKG_AUTO" on order items section of show cart page in order manager application.

2) Marketing packages should only shown backordered when ATP of product which compose Marketing packages product are less than quantity added in cart.

3) Pick sheets should show Products of type Marketing Packages along with the products which compose Marketing Packages.

4) Show link of production run created on order items section of Order detail page while placing order for product of type MARKETING_PKG_AUTO.

5) Product of type Marketing Packages should be shown on Verify Pick Screen along with Products they are composed of.

Thanks Divesh for the contribution - this is very nice addition to the trunk.
I would be more then happy to see comments / concern from - Jacopo? Scott? Anil? or others?

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834479 13f79535-47bb-0310-9956-ffa450edef68
2009-11-10 14:32:53 +00:00
Hans Bakker 96d54615ca removed default-option='contains' because now set from widget.properties which is the current default
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834379 13f79535-47bb-0310-9956-ffa450edef68
2009-11-10 08:12:45 +00:00
Hans Bakker 14c0c8dcda help general index cleanedup, started first features list but need 'orderedlist' docbook tag for that
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834369 13f79535-47bb-0310-9956-ffa450edef68
2009-11-10 07:17:17 +00:00
Jacopo Cappellato cfb56f52bf Fixed a series of issues (mostly rounding ones) in the services that compute the standard cost of a product. Thanks to Giorgio Tomaselli for the bug report.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834126 13f79535-47bb-0310-9956-ffa450edef68
2009-11-09 16:06:26 +00:00
Ashish Vijaywargiya 0664a96244 Applied improved patch from jira issue OFBIZ-3165 - Add additional screen for gift card certificate buying functionality by CSR in Order manager application in add item page.
Following points are covered in this patch:

1) Removed hard-coded product ids for Gift certificates products from GiftCertificates.ftl and added new category type called "GIFT_CARD_CATEGORY" and related demo data, also added groovy script for fetching logic to address this issue.

2) Also handled hard-coded surveyId in AddGiftCertificates.groovy

3) Added user friendly messages if required data is not available .

4) Added missing license header in GiftCertificates.ftl

Thanks Divesh for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834042 13f79535-47bb-0310-9956-ffa450edef68
2009-11-09 12:53:03 +00:00
Scott Gray 95c192d65d Removed use of a deprecated Delegator method, patch provided by Sumit Pandit
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833933 13f79535-47bb-0310-9956-ffa450edef68
2009-11-08 21:41:19 +00:00
Scott Gray 649c1b45ea Added missing svn properties
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833931 13f79535-47bb-0310-9956-ffa450edef68
2009-11-08 21:39:04 +00:00