Commit Graph
1959 Commits
Author SHA1 Message Date
Jacopo Cappellato 40757f357b Pretty big enhancements for the accounting processes and demo data:
1) completely refactored the trial balance report: now it is based on GLAccountHistory and no more on GlAccountOrganization records; the main advantage is that now it it possible to run the report per different financial time periods
2) big enhancements to the demo data: data was incomplete or wrong and this was affecting reports and the financial time period closing process
3) several fixes for the financial time period process
More fixes and enhancements will come, but now the closing process works fine and the financial reports make sense.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@885256 13f79535-47bb-0310-9956-ffa450edef68
2009-11-29 18:32:31 +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
Vikas Mayur 515cc6339e Correction to response type, should have been none else it causes issues in processing Ajax request. Contribution from Pranay Pandey.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@885069 13f79535-47bb-0310-9956-ffa450edef68
2009-11-28 07:41:41 +00:00
Ashish Vijaywargiya 0b0b66cd30 Order confirmation email gives following content when any party doesn't have userlogin associated with it.
Order Confirmation Notice

NOTE: This is a DEMO store-front. Orders placed here will NOT be billed, and will NOT be fulfilled.
Order not found with ID [WSCO10040], or not allowed to view.

Thanks Akash for the contribution - Good find.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@884903 13f79535-47bb-0310-9956-ffa450edef68
2009-11-27 16:21:26 +00:00
Ashish Vijaywargiya 94cc212e92 Billing Address form not able to retain its value when we provide the same username on profile page and we select check box "Billing Address Same as shipping address". Thanks Arun for the patch.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@884875 13f79535-47bb-0310-9956-ffa450edef68
2009-11-27 13:45:59 +00:00
Ashish Vijaywargiya ae79de070e Patch from Parimal Gain (Thanks!). Couple of enhancements are done in it.
-- Error or Success message was not displaying for buziness time theme. Fixed this issue.
-- In case low ATP proper error message was not coming for any product while importing order to the system. It was redirecting the blank page with one line message, that was not verbose enough. Improved error message for this.
-- The leaf category id will be provided in category data so that ebay export works fine.(See the numeric value provided in ProductCategory record).

OFBiz jira is not responding at my end since last 2 hours so committing this patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@884869 13f79535-47bb-0310-9956-ffa450edef68
2009-11-27 13:32:01 +00:00
Ashish Vijaywargiya f93a26c26b Applied patch from jira issue OFBIZ-3264 - OFBiz Change cart item price according to the price role.
Working Area: OnePageCheckout >> ShoppingCart.

Change minicart item price according to the price rule that will change according to the item quantity.
A product have different price as following:
A product feature contain different price rule with different condition for action like
1 product ---> Price $10.00
50 product ----> Price $8.00 (productPriceAction.amount = "-20.0" with productPriceActionTypeId="PRICE_POL").
If we change the quantity on shoppincart in OnePageCheckout the item price is not reflecting in the cart.

For this we need to add an out item price from getShoppingCartData service so that we can update value in the OnePageCheckout shoppingcart.

Thanks Brajesh & Rishi for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@884780 13f79535-47bb-0310-9956-ffa450edef68
2009-11-27 08:24:16 +00:00
Jacques Le Roux 8ed1a3c906 A patch from Aswath Satrasala "DemoRepStore PartyId data not correct" (https://issues.apache.org/jira/browse/OFBIZ-3261) - OFBIZ-3261
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@884546 13f79535-47bb-0310-9956-ffa450edef68
2009-11-26 13:12:35 +00:00
Jacques Le Roux 44c2c39d1d To allow to void a sale in POS
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@884529 13f79535-47bb-0310-9956-ffa450edef68
2009-11-26 11:35:50 +00:00
Hans Bakker 441dbff981 dutch translation files from pierre OFBIZ-3212
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@884511 13f79535-47bb-0310-9956-ffa450edef68
2009-11-26 11:08:58 +00:00
Jacques Le Roux 0dc3e839ba A patch from Deepak Dixit "checkoutpayment XHTML validation & default payment" (https://issues.apache.org/jira/browse/OFBIZ-2932) - OFBIZ-2932
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@884483 13f79535-47bb-0310-9956-ffa450edef68
2009-11-26 10:05:09 +00:00
Adam Heath bf7ff532f4 Shark compiles now. Except that you have to add the libraries uploaded
to https://issues.apache.org/jira/browse/OFBIZ-552.  Which you probably
can't, as latest shark(2.0 or 2.5, couldn't really tell) is LGPL.  So we
should probably remove this anyways.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@884347 13f79535-47bb-0310-9956-ffa450edef68
2009-11-26 00:40:44 +00:00
Jacques Le Roux e53baa39a9 Allow to build since move from framework. Waiting for community opinion about JavaDoc inside this build file...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@884335 13f79535-47bb-0310-9956-ffa450edef68
2009-11-25 23:22:30 +00:00
Jacques Le Roux 26b5b57c9f Oops fix r884308 (missed the >0 part when replacing xpdls != null && xpdls.size() > 0 by UtilValidate.isNotEmpty(xpdls)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@884325 13f79535-47bb-0310-9956-ffa450edef68
2009-11-25 22:55:29 +00:00
Jacques Le Roux 1ec28cc058 Complete Scott's fix in r884292 (using initial code in r821643
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@884308 13f79535-47bb-0310-9956-ffa450edef68
2009-11-25 22:29:21 +00:00
Scott Gray ba4f02caef Fix invalid code that causing the docs-all target to fail
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@884292 13f79535-47bb-0310-9956-ffa450edef68
2009-11-25 22:03:53 +00:00
Ashish Vijaywargiya 9086c57523 Improved code to avoid NPE.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@884003 13f79535-47bb-0310-9956-ffa450edef68
2009-11-25 08:02:23 +00:00
Scott Gray 0087117b47 Added missing import statements, wasn't affecting the build because workflow isn't included but was showing up in Eclipse
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883620 13f79535-47bb-0310-9956-ffa450edef68
2009-11-24 08:18:09 +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 4e0d303e06 Use UtilValidate.isEmpty methods instead of (obj == null) || (obj.length == 0)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883507 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 21:42: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
Jacopo Cappellato 7c34d8694c Demo data for a sales invoice that is still not paid; the figures in the balance sheet now are more interesting.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883457 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 18:42:56 +00:00
Jacopo Cappellato 287200a9ca A bunch of enhancements to demo data related to general ledger:
1) the value of inventory in gl now matches the value of inventory items
2) the purchase cost of fixed assets also matches the value in gl
3) fixed several demo accouting transactions with better accounts

Now the Balance Sheet looks in much better shape (but there is still a lot to do).



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883445 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 18:18:01 +00:00
Jacques Le Roux 49b2961e9c Fix few things in help files
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883329 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 13:02:53 +00:00
Hans Bakker 8142ef2fdc show communication even screens within in the communication portlet avoiding having required decorators.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883323 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 12:45:36 +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
Jacques Le Roux 70f488eca6 A patch from Pierre Smits "Improvement of Dutch language file for projectmgr." (https://issues.apache.org/jira/browse/OFBIZ-3212) - OFBIZ-3212
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@882883 13f79535-47bb-0310-9956-ffa450edef68
2009-11-21 11:22:47 +00:00
Christian Geisert 63207fa6c9 German translation of ProjectMgrUiLabels, see OFBIZ-3223
Submitted by Sascha Rodekamp


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@882093 13f79535-47bb-0310-9956-ffa450edef68
2009-11-19 10:08:52 +00:00
Jacques Le Roux c5d92b38a9 A patch from Erwan de FERRIERES "showHelp missing in oagis and googlecheckout components" (https://issues.apache.org/jira/browse/OFBIZ-3221) - OFBIZ-3221
Last showHelps calls missing, I think that are the lasts ones.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@881975 13f79535-47bb-0310-9956-ffa450edef68
2009-11-18 22:43:32 +00:00
Jacques Le Roux bda8112975 A patch from Luís Alfredo Harriss Maranesi " Brazilian Portuguese Translation for Ecommerce" (https://issues.apache.org/jira/browse/OFBIZ-3219) - OFBIZ-3219
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@881855 13f79535-47bb-0310-9956-ffa450edef68
2009-11-18 18:05:48 +00:00
Scott Gray 115101cc2c Added missing PaymentGatewayResponse record for the authorization on DEMO10090
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@881226 13f79535-47bb-0310-9956-ffa450edef68
2009-11-17 10:23:20 +00:00
Scott Gray 85b3cdc2ee Increased the demo order DEMO10090 item quantity for GZ-2644 to 2, a little bit more useful for testing because a promotion gives the first one away leaving the invoice a little bland
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@881081 13f79535-47bb-0310-9956-ffa450edef68
2009-11-17 01:22:52 +00:00
Scott Gray b548075ca6 Tidy up the modifyAmount field, I guess this data was created when we were using doubles
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@880984 13f79535-47bb-0310-9956-ffa450edef68
2009-11-16 21:56:59 +00:00
Jacques Le Roux 94fe299ddf Close "Replace all "0.00" in java code, notably to allow passing different decimals lenghtes" (https://issues.apache.org/jira/browse/OFBIZ-3200) - OFBIZ-3200
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@836153 13f79535-47bb-0310-9956-ffa450edef68
2009-11-14 11:01:08 +00:00
Ashish Vijaywargiya 76c426670d Applied patch from jira issue OFBIZ-2984 - HTML cleanup for Product Detail page.
In this patch table are removed for non tabular data and used div, and add CSS code for layout issue that created due to this cleanup.

Thanks Rohit for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835861 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 14:38:35 +00:00
Marco Risaliti 7b55229221 An error message that now can be translated
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835571 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 21:39:10 +00:00
Ashish Vijaywargiya 1fff46444e Applied patch from jira issue - OFBIZ-2999 - Fix layout of profile pages.
Layout of profile pages (new pages) is not displayed properly.

Thanks Deepak for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835375 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 13:13:34 +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 9c5caa3f17 Applied patch from jira issue OFBIZ-3184 - Improvement in Ebay Configuration.
Implemented following points:
1) Created decorator for Ebay Configuration screens
2) Modified list and add Ebay configuration Form
3) Created Find Form
4) Crated menu and sub menu
5) Created Edit Ebay Configuration Screen
6) Modified Ebay Configuration screen with name FindEbayConfiguration

Thanks Parimal for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835306 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 09:00:36 +00:00
Hans Bakker 2c170b0a1c missing ebay features help file in last commit
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835294 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 08:15:10 +00:00
Hans Bakker 0b7e0756e2 created place holder for the Ebay help files
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835289 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 07:55:37 +00:00
Jacques Le Roux c288cd7627 Correct French label
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834935 13f79535-47bb-0310-9956-ffa450edef68
2009-11-11 16:09:43 +00:00
Jacques Le Roux 4a019210e3 Some better log info. Related to OFBIZ-487 which was actually already in.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834793 13f79535-47bb-0310-9956-ffa450edef68
2009-11-11 07:50:56 +00:00
Ashish Vijaywargiya 9752748bf4 Applied patch from jira issue: OFBIZ-3098 - Improvement in input validation of 1st step (shopping cart) on onePageCheckout page.
On onePageCheckout page in Shopping Cart(step1), if we enter any character(not numeric value) in quantity text box, then this text box become empty and show 'required' validation message, It should show "Please enter a valid number in this field."

Step to reproduce:-
1) Add item in cart.
2) Move on onePageCheckout page.
3) Enter any character in item quantity text box.
4) Then it show validation message "required".

Thanks Amit and Rohit for the contribution.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834493 13f79535-47bb-0310-9956-ffa450edef68
2009-11-10 15:14:14 +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
Ashish Vijaywargiya c8b6576edd Applied fix from jira issue OFBIZ-3158 - Send item shipped request from OFBiz to Google in a collection instead of sending multiple request for each item shipped.
The last implementation was blocking Quick Ship Entire order processing.
Thanks Ratnesh for reporting the bug and Arun for quick fix.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834473 13f79535-47bb-0310-9956-ffa450edef68
2009-11-10 14:14:52 +00:00
Ashish Vijaywargiya 28f12bc714 Applied patch from jira issue OFBIZ-3158 - Send item shipped request from OFBiz to Google in a collection instead of sending multiple request for each item shipped.
Following points are covered in this implementation:

1) Send item shipped request from OFBiz to Google in a collection instead of sending multiple request for each item shipped.
2) Also show limitation messages for Google orders, while updating manual adjustments from order detail page.

Thanks Pranay / Arun  for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834385 13f79535-47bb-0310-9956-ffa450edef68
2009-11-10 08:37:40 +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