Commit Graph
10924 Commits
Author SHA1 Message Date
David E. Jones d4aa04aee8 Added some documentation about the service definition transaction related attributes
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@797962 13f79535-47bb-0310-9956-ffa450edef68
2009-07-26 17:45:24 +00:00
Anil Patel 18eb07ab01 Fixed unknown parameter found exception. Was resulting in multiple order confirmation emails.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@797924 13f79535-47bb-0310-9956-ffa450edef68
2009-07-26 13:08:18 +00:00
Vikas Mayur ef5607073f Minor formatting fix.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@797919 13f79535-47bb-0310-9956-ffa450edef68
2009-07-26 12:13:53 +00:00
Jacopo Cappellato 87c4b67ab7 Fixes to avoid duplicated category id for top level categories.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@797877 13f79535-47bb-0310-9956-ffa450edef68
2009-07-26 08:19:09 +00:00
Anil Patel 426f09f8de If no payment or invoice is selected from list then don't let user submit the form.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@797762 13f79535-47bb-0310-9956-ffa450edef68
2009-07-25 12:24:06 +00:00
Vikas Mayur 87f742e5bf No functional change. Only formatting changes.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@797760 13f79535-47bb-0310-9956-ffa450edef68
2009-07-25 12:11:50 +00:00
Vikas Mayur b7b54450b1 Fixed an issue introduced by me, the system throw error while attempting to create a new return from Return screen.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@797759 13f79535-47bb-0310-9956-ffa450edef68
2009-07-25 12:07:40 +00:00
Anil Patel 507755b9a2 Show status desciption and not Id.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@797758 13f79535-47bb-0310-9956-ffa450edef68
2009-07-25 12:06:50 +00:00
Anil Patel 2cb1635ecb Now have ability to filter batch payments by finAccountId.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@797756 13f79535-47bb-0310-9956-ffa450edef68
2009-07-25 12:02:28 +00:00
Anil Patel c077f371e7 Set Payment batch name to default value if not passed. Deposit slip is better formatted, Showing Payment information in list of PaymentGroupMember list.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@797755 13f79535-47bb-0310-9956-ffa450edef68
2009-07-25 11:47:24 +00:00
Anil Patel fa23e4390e On canceling the FinAccountTrans record It remove finAccountTransId from Associated Payment records.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@797734 13f79535-47bb-0310-9956-ffa450edef68
2009-07-25 10:20:53 +00:00
Anil Patel 62e2dfc109 Show currency with running total.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@797731 13f79535-47bb-0310-9956-ffa450edef68
2009-07-25 09:37:39 +00:00
Anil Patel 229c4d1d66 Return message if all payments are not ready for check run.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@797730 13f79535-47bb-0310-9956-ffa450edef68
2009-07-25 09:34:56 +00:00
Alfred Maxwell Byers c0ac870199 The content length was being calculated on the wrong string.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@797681 13f79535-47bb-0310-9956-ffa450edef68
2009-07-24 22:41:34 +00:00
Anil Patel cd99e5a087 Added tooltip to help user make right choice.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@797565 13f79535-47bb-0310-9956-ffa450edef68
2009-07-24 17:23:42 +00:00
Anil Patel 7c046a7805 Initialize variable so avoid NPE.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@797552 13f79535-47bb-0310-9956-ffa450edef68
2009-07-24 16:30:03 +00:00
Joseph Eckard 05b4cb624c missed the checkoutsetupform in the orderterm changes
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@797544 13f79535-47bb-0310-9956-ffa450edef68
2009-07-24 15:54:45 +00:00
Joseph Eckard be33a5d47d refactor of addOrderTerm / removeOrderTerm events and associated web artifacts to work as intended; now sets termValue and termDays parameters
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@797535 13f79535-47bb-0310-9956-ffa450edef68
2009-07-24 15:34:02 +00:00
Vikas Mayur a5e5e80ff6 Implemented new screens to show and manage CommunicationEventProduct & CommunicationEventOrder records.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@797478 13f79535-47bb-0310-9956-ffa450edef68
2009-07-24 14:23:03 +00:00
Anil Patel 774194738c First pass of Financial account main screen. Slowly we'll build quick view Portlets to help user.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@797412 13f79535-47bb-0310-9956-ffa450edef68
2009-07-24 10:35:03 +00:00
Anil Patel 50f715b2a6 alert class in business time theme.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@797390 13f79535-47bb-0310-9956-ffa450edef68
2009-07-24 09:40:02 +00:00
Vikas Mayur 7794138ba6 Minor Improvements: Using Order Entry process when user add an item to cart and if the quantity added is greater then ATP then the item is highlighted as Backordered in red
along with the quantities that will go on backorder in the cart. Patch from Arun Patidar. 


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@797360 13f79535-47bb-0310-9956-ffa450edef68
2009-07-24 08:38:27 +00:00
Anil Patel 6cd39fd9ae Clened up, no functional change.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@797349 13f79535-47bb-0310-9956-ffa450edef68
2009-07-24 07:28:24 +00:00
Vikas Mayur 97fa98a596 Removing order email contact mech from Order Demo data because it does not belongs to DemoCustomer.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@797346 13f79535-47bb-0310-9956-ffa450edef68
2009-07-24 07:04:51 +00:00
Vikas Mayur 6e6d641e7f Added various contact mechs to cart for One Page Checkout events so that they can be associated to an order.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@797336 13f79535-47bb-0310-9956-ffa450edef68
2009-07-24 06:42:39 +00:00
Vikas Mayur e960fd75ce Minor improvement over last commit.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@797331 13f79535-47bb-0310-9956-ffa450edef68
2009-07-24 05:52:11 +00:00
Vikas Mayur a25cc81951 Added credit card masking on Order Detail Page.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@797327 13f79535-47bb-0310-9956-ffa450edef68
2009-07-24 05:30:00 +00:00
Scott Gray 68f180a494 OFBIZ-2625 Ability to perform product comparisons in ecommerce and during order entry in ordermgr.
Compares things like name, price, description, long description, brand name and standard, distinguishing and optional features.

Could do with some styling and would be nice to add customer ratings in there as well.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@797259 13f79535-47bb-0310-9956-ffa450edef68
2009-07-23 23:28:32 +00:00
Adrian Crum ca1861d05f Removed unused method from TimeDuration.java.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@797229 13f79535-47bb-0310-9956-ffa450edef68
2009-07-23 21:27:33 +00:00
Vikas Mayur 625f05db82 Misc. cleanup.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@797165 13f79535-47bb-0310-9956-ffa450edef68
2009-07-23 17:42:36 +00:00
Vikas Mayur b31acbf1da Fixed NumberFormatException
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@797161 13f79535-47bb-0310-9956-ffa450edef68
2009-07-23 17:39:42 +00:00
Adrian Crum 6c2aabc93b Work effort calendar fix.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@797145 13f79535-47bb-0310-9956-ffa450edef68
2009-07-23 16:55:23 +00:00
Jacopo Cappellato ba18ab3728 Fixed bug that was preventing the red-when attribute to work properly.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@797126 13f79535-47bb-0310-9956-ffa450edef68
2009-07-23 16:05:36 +00:00
Joseph Eckard fdd5d0b43b supplier product lookup screen searches were not being constrained by supplier
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@797109 13f79535-47bb-0310-9956-ffa450edef68
2009-07-23 15:42:43 +00:00
Vikas Mayur 6cea020f90 Added the ability to change the order to a gift if the user does not selected Gift option during checkout. User have to click on Add link and this will open a text area to
enter the gift message, on saving this text the order will become a gift order.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@797069 13f79535-47bb-0310-9956-ffa450edef68
2009-07-23 13:36:47 +00:00
Anil Patel 92144d5718 Making postal address fields options. Map processor in service checks required fields and returns error if appropriate. In case shipping contact mach should be used for billing then we don't need postal address fields data.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@797067 13f79535-47bb-0310-9956-ffa450edef68
2009-07-23 13:34:27 +00:00
Vikas Mayur 5bf326078f Added Communications tab on Product page. This will show a list of communication associated to a product. Patch from Akash Jain.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@797045 13f79535-47bb-0310-9956-ffa450edef68
2009-07-23 12:38:13 +00:00
Ashish Vijaywargiya 2c6af08086 As per Vikas's suggestion changing this code.
auto create mode in service definition handles passing fromDate as empty, the implementation provides nowTimeStamp to fromDate.
Thanks Awdesh for your contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@797009 13f79535-47bb-0310-9956-ffa450edef68
2009-07-23 10:37:02 +00:00
Vikas Mayur 8c48ee3f23 Fix: Shipping method and sales tax are removed from cart when the cart is modified.
Applied patch from Arun Patidar (thanks Joe), part of OFBIZ-2471 (https://issues.apache.org/jira/browse/OFBIZ-2741)



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@796992 13f79535-47bb-0310-9956-ffa450edef68
2009-07-23 09:53:00 +00:00
Ashish Vijaywargiya 0057e67ff0 Crud opperation on InventoryItemAssoc entity.
Patch from Amit Sharma part of OFBIZ-2713 - Invoice generation from Commission Run

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@796972 13f79535-47bb-0310-9956-ffa450edef68
2009-07-23 07:47:17 +00:00
Anil Patel 139f99473b Fix edit invoice screen for COMMISSION invoices. Patch from JIRA-2752
Thanks Sumit.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@796948 13f79535-47bb-0310-9956-ffa450edef68
2009-07-23 05:13:11 +00:00
Scott Gray 297d704fdf Added two new javascript functions that allow a link or form post to take place in the parent window rather than the pop up itself
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@796932 13f79535-47bb-0310-9956-ffa450edef68
2009-07-23 02:49:29 +00:00
Scott Gray 99ec7450cf For view-last responses if no previous view can be found then allow the value attribute to be used as the default view.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@796918 13f79535-47bb-0310-9956-ffa450edef68
2009-07-23 01:00:58 +00:00
Adrian Crum 1f76c2f5ec Moved user preferences code from Global Decorator to ScreenRenderer.java. Now user preferences can be queried before the Global Decorator is run.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@796896 13f79535-47bb-0310-9956-ffa450edef68
2009-07-22 22:27:27 +00:00
Adrian Crum 392410f12d Fixed broken fixed asset calendars.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@796878 13f79535-47bb-0310-9956-ffa450edef68
2009-07-22 21:02:08 +00:00
Marco Risaliti 5a85c095a6 New Shipment Gateway Config entities (OFBIZ-2589)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@796874 13f79535-47bb-0310-9956-ffa450edef68
2009-07-22 20:39:35 +00:00
Adrian Crum f8fa9e3106 Put the fixed asset decorator screen back where it belongs.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@796873 13f79535-47bb-0310-9956-ffa450edef68
2009-07-22 20:35:18 +00:00
Joseph Eckard 9742655291 reformat of addToCart method; no functional changes
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@796825 13f79535-47bb-0310-9956-ffa450edef68
2009-07-22 18:33:11 +00:00
Joseph Eckard 0536ff3a74 productStore NPE fix when adding an item to the cart during PO entry (not using bulk add form)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@796823 13f79535-47bb-0310-9956-ffa450edef68
2009-07-22 18:29:31 +00:00
Ashish Vijaywargiya 3a3bbb8919 Applied patch from jira issue OFBIZ-2750 - Secure Url in ordershippinginfo.ftl.
Thanks Pranay for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@796810 13f79535-47bb-0310-9956-ffa450edef68
2009-07-22 17:46:47 +00:00