Commit Graph
3650 Commits
Author SHA1 Message Date
Adrian Crum d2297309f7 Fixed forum create.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@569871 13f79535-47bb-0310-9956-ffa450edef68
2007-08-26 19:34:55 +00:00
Anil Patel d8241af7ab Make fromDate optional in createFixedAssetRegistration service. If fromDate is null then set it to now timestamp.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@569861 13f79535-47bb-0310-9956-ffa450edef68
2007-08-26 19:16:10 +00:00
Anil Patel ab7792aed6 Added few fields to WorkEffortAssocView. This makes possible to display and edit contents of workEffortTo entity from a list of children workEfforts. Fixed AssetMaint-->Maintenance -->Tasks Task Breakdown List Edit form. Now it works much better.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@569804 13f79535-47bb-0310-9956-ffa450edef68
2007-08-26 11:05:04 +00:00
Anil Patel c566ae5f45 Added few fields to WorkEffortAssocView. This makes possible to display and edit contents of workEffortTo entity from a list of children workEfforts. Fixed AssetMaint-->Maintenance -->Tasks Task Breakdown List Edit form. Now it works much better.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@569803 13f79535-47bb-0310-9956-ffa450edef68
2007-08-26 11:03:20 +00:00
Anil Patel cb797951d7 modified to use workeffort lookup that has limited fields applicable to the context.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@569783 13f79535-47bb-0310-9956-ffa450edef68
2007-08-26 09:16:54 +00:00
David E. Jones 6d2fabc5b6 A fair change to handle a wider variety of circumstances, including handling multiple ShipmentItems with the same productId using a couple of techniques; not foolproof and the remaining exception is noted in a TODO; there is a little bit left to do as there is some complication with the OrderItemShpGrpInvRes handling, committing before moving on to that to localize changes as more will have to move around
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@569764 13f79535-47bb-0310-9956-ffa450edef68
2007-08-26 04:39:02 +00:00
David E. Jones 20916970e7 Small improvement for the messages when an ECA rule evals to true or false
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@569763 13f79535-47bb-0310-9956-ffa450edef68
2007-08-26 04:32:02 +00:00
David E. Jones b4aa134db7 Added a service to split a ShipmentItem for a given quantity; also splits OrderShipment record(s)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@569751 13f79535-47bb-0310-9956-ffa450edef68
2007-08-26 01:07:36 +00:00
David E. Jones 742ef5cab3 Added an update method for OrderShipment, used when splitting ShipmentItems
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@569750 13f79535-47bb-0310-9956-ffa450edef68
2007-08-26 01:03:26 +00:00
David E. Jones c7bfe4beb7 Added little method like the addToDoubleInMap to do addToListInMap
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@569749 13f79535-47bb-0310-9956-ffa450edef68
2007-08-26 01:01:58 +00:00
Adrian Crum b93aea10af Fixed forum list display on eCommerce main page.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@569748 13f79535-47bb-0310-9956-ffa450edef68
2007-08-26 00:17:13 +00:00
Andrew Zeneski 3cd7c25f6f implemented a simple date based ECA condition
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@569693 13f79535-47bb-0310-9956-ffa450edef68
2007-08-25 16:02:35 +00:00
Andrew Zeneski 09bc5c770b fixed default-value which was using the string instead of the converted object
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@569692 13f79535-47bb-0310-9956-ffa450edef68
2007-08-25 16:02:19 +00:00
Andrew Zeneski e0124b8d7e added missing reason enum to service credit service def
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@569683 13f79535-47bb-0310-9956-ffa450edef68
2007-08-25 14:55:52 +00:00
Adrian Crum 6b0bf1a8ba Added a help.gif file to framework/images. It will be used in future commits.
It would be cool to make the background transparent - if anyone has that ability.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@569680 13f79535-47bb-0310-9956-ffa450edef68
2007-08-25 14:40:25 +00:00
Adrian Crum 0c60962acf Fixed entitydef comments per David's suggestion.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@569574 13f79535-47bb-0310-9956-ffa450edef68
2007-08-24 23:36:41 +00:00
Adrian Crum d6c7cdcd41 More fixes in the forum feature in the content component. I also added a few comments to indicate what different fields are used for.
The eCommerce component organized forum data one way, and the content component organized it another way. After discussion on the dev ml, I determined that the content component was storing data incorrectly.

This commit is not backwards compatible with existing forum messages. Existing forum messages will have to have the contents of ContentAssoc.contentId and ContentAssoc.contentIdTo swapped before updating to this revision.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@569568 13f79535-47bb-0310-9956-ffa450edef68
2007-08-24 23:16:18 +00:00
Si Chen 1f40d9e3d5 comment out workefforts related to shpiment schedule/arrival ofbiz-1207
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@569467 13f79535-47bb-0310-9956-ffa450edef68
2007-08-24 17:59:04 +00:00
David E. Jones 738958fa67 Changed to only request a returnlabel if it is a cross-ship replacement
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@569456 13f79535-47bb-0310-9956-ffa450edef68
2007-08-24 17:01:15 +00:00
Si Chen 4847d30ca7 Not a political statement, but mail will not get there
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@569454 13f79535-47bb-0310-9956-ffa450edef68
2007-08-24 16:47:14 +00:00
David E. Jones a119e17705 A bit of refactoring, but mostly implemented feature only previously implied to save the replacementOrderId on ReturnItemResponse, and attach to relevant ReturnItems
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@569386 13f79535-47bb-0310-9956-ffa450edef68
2007-08-24 13:49:21 +00:00
David E. Jones 75383942db Small fix for certain funny orders with minimal item information
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@569385 13f79535-47bb-0310-9956-ffa450edef68
2007-08-24 13:46:21 +00:00
Andrew Zeneski 30219231ae now copies subscription resource data to the subscription entity when created
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@569120 13f79535-47bb-0310-9956-ffa450edef68
2007-08-23 19:10:11 +00:00
David E. Jones bafc3f01b9 Finished round trip test for fulfillment, return and notice of refurbishment complete for serialized inventory; this included a number of bug fixes, and fleshing out functionality in receiveInventoryProduct to handle InventoryItem updates, and of course changes to use that instead of just updating the InventoryItem and leaving out the ShipmentReceipt, ReturnItem, etc changes necessary; note that to see if return is totally received now looks at ShipmentReceipt records instead of InventoryItemDetail so it will work with serialized and non-serialized inventory
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@568817 13f79535-47bb-0310-9956-ffa450edef68
2007-08-23 04:07:59 +00:00
David E. Jones 1423f85e17 A number of improvements to receiveInventoryProduct to handle receipt of serialized inventory better, in general and in the case where an item that was sold is returned and put back into inventory, either on hold or ready to go again; also a few little cleanups done while reviewing
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@568816 13f79535-47bb-0310-9956-ffa450edef68
2007-08-23 03:59:15 +00:00
Andrew Zeneski a51ae26fa9 added reason code to service credit service
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@568747 13f79535-47bb-0310-9956-ffa450edef68
2007-08-22 20:40:16 +00:00
Andrew Zeneski ed151c22a6 added reason code to financial account transactions
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@568746 13f79535-47bb-0310-9956-ffa450edef68
2007-08-22 20:39:27 +00:00
Andrew Zeneski b2da04b31e added reason code to communication event UI
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@568743 13f79535-47bb-0310-9956-ffa450edef68
2007-08-22 20:24:23 +00:00
Adrian Crum c49fd8b584 Some bug fixes for content manager. Add forum/thread/message now works. Update message still doesn't work.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@568733 13f79535-47bb-0310-9956-ffa450edef68
2007-08-22 19:20:41 +00:00
Adrian Crum 9024bed533 The forum.properties file was corrupted during the recent commit/revert/commit cycle. My original intention was to move forum.properties from the ecommerce component to the content component to facilitate making the forum feature standalone.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@568697 13f79535-47bb-0310-9956-ffa450edef68
2007-08-22 16:51:45 +00:00
David E. Jones 9b406af52b A few fixes and cleanups for the AckDel RMA and Status services
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@568395 13f79535-47bb-0310-9956-ffa450edef68
2007-08-22 03:28:46 +00:00
Andrew Zeneski 76ceafe0ce added reason code to communication event
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@568379 13f79535-47bb-0310-9956-ffa450edef68
2007-08-22 02:24:45 +00:00
David E. Jones ae205e9f92 Added initial pass on Ack Del for status change service; note that this is a quick initial implementation and not yet tested for this new functionality in this service
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@568281 13f79535-47bb-0310-9956-ffa450edef68
2007-08-21 21:04:05 +00:00
David E. Jones c3e37fe7ec Added comments about ReturnItem update stuff
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@568216 13f79535-47bb-0310-9956-ffa450edef68
2007-08-21 17:53:08 +00:00
David E. Jones 8eaf97a5b6 Changed ShipmentReceipt processing code to properly update ReturnItem status and receivedQuantity values
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@568213 13f79535-47bb-0310-9956-ffa450edef68
2007-08-21 17:49:26 +00:00
Anil Patel 91a6d92df9 Compute and return shipping estimate even if there is not shippingContactMechId. Left some commented code with comments to help others review the modifications.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@568175 13f79535-47bb-0310-9956-ffa450edef68
2007-08-21 15:56:07 +00:00
David E. Jones dd40404bae Reformatting only, no functional changes
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@568167 13f79535-47bb-0310-9956-ffa450edef68
2007-08-21 15:29:27 +00:00
David E. Jones 5732a610cf A few cleanups, no functionality changes
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@568166 13f79535-47bb-0310-9956-ffa450edef68
2007-08-21 15:29:07 +00:00
Si Chen e051142315 Improve service to changing production run task statuses: It should pass the original statusId before change so that SECAS can check whether there was an actual change in status.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@567872 13f79535-47bb-0310-9956-ffa450edef68
2007-08-20 23:10:44 +00:00
David E. Jones 1b398fe1fc Changed message handler to return Confirm BOD if the message has already been received; implemented stuff to only complete returns if all have been received, though there is a problem in receiveInventoryProduct service because it sets ReturnItems as received even for partial quantities (naughty, naughty); also a few other minor cleanups
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@567789 13f79535-47bb-0310-9956-ffa450edef68
2007-08-20 19:15:06 +00:00
David E. Jones 7d555183a1 Added InventoryItemAndDetail entity with full fields from both
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@567788 13f79535-47bb-0310-9956-ffa450edef68
2007-08-20 19:11:12 +00:00
David E. Jones 321219f207 Added descriptions for the isFrozen and inGoodStanding indicators
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@567743 13f79535-47bb-0310-9956-ffa450edef68
2007-08-20 16:32:52 +00:00
David E. Jones 036508cb72 Refactoring to improve service names to clarify their purpose and avoid future conflicts; also separately commening out the reserveProductInventoryByFacility SECA because it caused a double call to oagisSendProcessShipment, and somehow in a way that resulted in multiple shipments too
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@567672 13f79535-47bb-0310-9956-ffa450edef68
2007-08-20 12:40:30 +00:00
David E. Jones 02ec5b3a51 Small fix to break when an address is found rather than just at the end of the first iteration, making the loop meaningless
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@567662 13f79535-47bb-0310-9956-ffa450edef68
2007-08-20 12:04:37 +00:00
David E. Jones f9d6efd656 A bit of refactoring to isolate shipping address setting in the cart, plus some general debug statements now mostly commented out to track down how it's used
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@567660 13f79535-47bb-0310-9956-ffa450edef68
2007-08-20 11:55:22 +00:00
Hans Bakker 7084c7a2d1 reverted r567553 on davids advice
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@567634 13f79535-47bb-0310-9956-ffa450edef68
2007-08-20 10:09:19 +00:00
David E. Jones 430d114b6f A number of improvements to FinAccount processing and error messages; most significant one is fixing the updating of the FinAccount balances after a replenishment that was a result of some lazily written code that updated the database using a stale object in memory instead of calling a service to update it, or at least doing a refresh before update, now does the right thing and calls the service
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@567568 13f79535-47bb-0310-9956-ffa450edef68
2007-08-20 07:09:47 +00:00
David E. Jones c2ff9a10ad Corrected comment
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@567565 13f79535-47bb-0310-9956-ffa450edef68
2007-08-20 07:07:58 +00:00
Jacopo Cappellato b1aa7686f3 No functional changes, just a lot of cleanups for rev. 566781 by Al Byers:
1) added missing license headers
2) removed tabs
3) fixed some weird/random formatting

I'm still not sure that it is correct to keep the two *.ftl files in the script folder... but I don't have time to further review this revision.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@567558 13f79535-47bb-0310-9956-ffa450edef68
2007-08-20 06:48:53 +00:00
Hans Bakker bdff426be6 small change to optionally allow other roleTypes in the customer registration process
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@567553 13f79535-47bb-0310-9956-ffa450edef68
2007-08-20 06:25:02 +00:00