Commit Graph
12781 Commits
Author SHA1 Message Date
Adam Heath 1a1cc17e5f Add isEmpty implementation.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@885269 13f79535-47bb-0310-9956-ffa450edef68
2009-11-29 21:22:50 +00:00
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
Jacopo Cappellato 5b104d9938 Updated signature for renderSubmitField macro for text, xml, fo, csv
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@885252 13f79535-47bb-0310-9956-ffa450edef68
2009-11-29 18:15:18 +00:00
Adam Heath 2dec3e0f54 Change return type of size() to int; CacheLineTable.size() already had
an int return, and this change moves this closer to the Map interface.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@885188 13f79535-47bb-0310-9956-ffa450edef68
2009-11-29 03:35:07 +00:00
Jacques Le Roux a941c13879 Better French translation
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@885140 13f79535-47bb-0310-9956-ffa450edef68
2009-11-28 19:42:43 +00:00
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 035361f4b6 Oops, this file should not have been changed in r885103
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@885117 13f79535-47bb-0310-9956-ffa450edef68
2009-11-28 17:34:22 +00:00
Jacques Le Roux 9b5c289ab0 More uses of is(Not)Empty (certainly last)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@885116 13f79535-47bb-0310-9956-ffa450edef68
2009-11-28 17:19:33 +00:00
Jacques Le Roux 15b7cd6582 Fix an issue in r885112
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@885115 13f79535-47bb-0310-9956-ffa450edef68
2009-11-28 17:17:48 +00:00
Jacques Le Roux 47b0eff762 More uses of is(Not)Empty
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@885112 13f79535-47bb-0310-9956-ffa450edef68
2009-11-28 16:27:42 +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 aeda03e7c9 Its better to show description instead of ID.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@885094 13f79535-47bb-0310-9956-ffa450edef68
2009-11-28 14:17:50 +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
Jacques Le Roux 2777b83223 Fix r885091 where isNotEmpty has been used by error instead of isEmpty
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@885092 13f79535-47bb-0310-9956-ffa450edef68
2009-11-28 13:59:45 +00:00
Jacques Le Roux 5d4b9b5982 More uses of isEmpty(expr) instead of (expr == null) || (expr.size() == 0
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@885091 13f79535-47bb-0310-9956-ffa450edef68
2009-11-28 13:31:52 +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
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
Adam Heath d68d9fb287 None of the stats values were protected with any kind of locking. The
The jvm doesn't guarantee anything about ++ operations; they are *not*
single commands.  This is even more of a problem with 64 bit longs on a
32 bit jvm, where even a read or a write to/from a long may be multiple
commands.  It is entirely possible that a write to a long might be
partially read by another thread.

The fix is either to protected all the stats with a synchronized block,
either a single one, or one per stat, or to use the new java 1.5 atomic
variables.  The latter is much better, because most of the time no one
is reading the stats, so there is hardly ever any contention.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@884984 13f79535-47bb-0310-9956-ffa450edef68
2009-11-27 20:26:06 +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
Bruno Busco 884d5c0397 An additional patch from Sascha Rodekamp "Drag'n'Drop update - add directly in the my portal application"
(https://issues.apache.org/jira/browse/OFBIZ-3227) - OFBIZ-3227

I found a bug while using the IE


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@884891 13f79535-47bb-0310-9956-ffa450edef68
2009-11-27 15:04:45 +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
Jacques Le Roux e43c404c34 Fix some typos in HELP
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@884874 13f79535-47bb-0310-9956-ffa450edef68
2009-11-27 13:41:48 +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
Bruno Busco 683f95cee3 A patch from Sascha Rodekamp "Drag'n'Drop update - add directly in the my portal application"
(https://issues.apache.org/jira/browse/OFBIZ-3227) - OFBIZ-3227


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@884864 13f79535-47bb-0310-9956-ffa450edef68
2009-11-27 12:52:11 +00:00
Jacques Le Roux fbae8a234f A patch from Patrick Antivackis "In owasp-esapi-java, htmlCodec.decode is broken for all entities where entity.substr(0, x) exists ." (https://issues.apache.org/jira/browse/OFBIZ-3135) - OFBIZ-3135
I checked the diff Patrick provided against http://code.google.com/p/owasp-esapi-java/source/detail?r=755 and found no differences (except test classes no present of course)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@884781 13f79535-47bb-0310-9956-ffa450edef68
2009-11-27 08:26:54 +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 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
Scott Gray 59a9af11e2 Changed the run-tests target to delay failure until the junitreport task has completed
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@884698 13f79535-47bb-0310-9956-ffa450edef68
2009-11-26 21:08:20 +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
Jacopo Cappellato 00db5e864c Completed production runs should not be considered by the getProductManufacturingSummaryByFacility service.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@884615 13f79535-47bb-0310-9956-ffa450edef68
2009-11-26 16:05:12 +00:00
Jacques Le Roux e26e66c8c3 Oops, I forgot to commit this file in r884545
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@884598 13f79535-47bb-0310-9956-ffa450edef68
2009-11-26 15:42:46 +00:00
Jacopo Cappellato eee2746ed7 Misc enhancements to the "shipment plan" screen.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@884592 13f79535-47bb-0310-9956-ffa450edef68
2009-11-26 15:38:37 +00:00
Jacques Le Roux c0ccc25289 No duplicates, alphabetical order (at least in English, hopefully more to come regardind this aspect)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@884573 13f79535-47bb-0310-9956-ffa450edef68
2009-11-26 14:59:11 +00:00
Ashish Vijaywargiya 30f2038726 Applied patch from jira issue OFBIZ-3263 - Add bulk status change action on AR find invoice screen, also add ability to print bulk invoices.
Provide following features on screen : https://demo.ofbiz.org/ar/control/FindArInvoices (AR > Find Invoice)
1). Ability to change bulk invoice status.
2). Display invoice running total same as purchase invoice list form of AP.
3). Ability to print sales invoices in bulk.

This patch covers following thing : -
1) Implementation of mentioned functionality.
2) Data for entity UomConversionDated.
3) Improvement in service createAcctgTransForSalesInvoice . 

Thanks Awdesh, Sumit for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@884572 13f79535-47bb-0310-9956-ffa450edef68
2009-11-26 14:58:17 +00:00
Jacopo Cappellato b1dfdbbf6a production runs are now sorted by start date.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@884569 13f79535-47bb-0310-9956-ffa450edef68
2009-11-26 14:37:36 +00:00
Jacopo Cappellato 08289da32f Cleaned up the "work with shipment plan" screen. Fixed a few bugs.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@884564 13f79535-47bb-0310-9956-ffa450edef68
2009-11-26 14:26:14 +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
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 2c51efbc09 Better version of isEmpty() with comments from Scott and Adam on dev ML.
I used one line, please feel free to comment if needed

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@884545 13f79535-47bb-0310-9956-ffa450edef68
2009-11-26 13:09:40 +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
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
Ashish Vijaywargiya e6e3877833 This patch contain following improvement : -
1) Added Lookup for "Gl Reconciliation Id"
2) Added Lookup for "Organization Party Id"
3) Added check to show ReconciledBalance only when GlReconciliation balance is "GLREC_RECONCILED"
4) Added field glAccountId in search criteria .
5) On screen "ViewGlReconciliationWithTransaction" Reconciliation Menu bar should come selected .

Thanks Awdesh for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@884402 13f79535-47bb-0310-9956-ffa450edef68
2009-11-26 05:30:53 +00:00
Adam Heath e650de55f1 Fix build error, caused by bad merge from an old branch.
GenericDelegator was used instead of Delegator.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@884373 13f79535-47bb-0310-9956-ffa450edef68
2009-11-26 02:30:10 +00:00
Adam Heath eb2fe10c1a Ignore test results.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@884364 13f79535-47bb-0310-9956-ffa450edef68
2009-11-26 01:34:52 +00:00
Adam Heath 1d148ce235 Helper method to fetch all rows/values from a query.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@884363 13f79535-47bb-0310-9956-ffa450edef68
2009-11-26 01:33:38 +00:00
Adam Heath 586bedfa70 for all doTransaction helpers, change Throwable to
GenericEntityException.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@884362 13f79535-47bb-0310-9956-ffa450edef68
2009-11-26 01:33:03 +00:00
Adam Heath 3a6becca71 For unimplemented values, show the class name as well.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@884361 13f79535-47bb-0310-9956-ffa450edef68
2009-11-26 01:32:25 +00:00
Adam Heath 1599de6d2c Handle null values during planning of conditions.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@884360 13f79535-47bb-0310-9956-ffa450edef68
2009-11-26 01:31:38 +00:00