Commit Graph
12781 Commits
Author SHA1 Message Date
David E. Jones edeedd289d Some minor XSD changes, mostly moving documentation over from the MiniLang Guide to annotations for the simple-map-processor; a lot to do for the simple-method...
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@421508 13f79535-47bb-0310-9956-ffa450edef68
2006-07-13 06:08:18 +00:00
David E. Jones e06cdb4af6 Some cleanups, mostly moves to use the set operation
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@421506 13f79535-47bb-0310-9956-ffa450edef68
2006-07-13 06:06:58 +00:00
Hans Bakker 9628d2a325 small text change quoteWorkeffort
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@421505 13f79535-47bb-0310-9956-ffa450edef68
2006-07-13 05:55:51 +00:00
Hans Bakker 0762d68626 more dutch language updates
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@421502 13f79535-47bb-0310-9956-ffa450edef68
2006-07-13 05:24:39 +00:00
Hans Bakker 99e924a2b3 use of the web.xml maindecorator in the quotescreens + fix quoteworkefforts screenproblems + dutch language file update
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@421501 13f79535-47bb-0310-9956-ffa450edef68
2006-07-13 05:23:20 +00:00
Si Chen b53ae991ae Reverted 421453: DataFile output can be other than XML, so this needs to be more generic.
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@421464 13f79535-47bb-0310-9956-ffa450edef68
2006-07-12 23:43:44 +00:00
Si Chen fac611800f XML escape the DataFile String input, otherwise the entity-engine-xml output will have " characters that are not XML escaped ("), breaking the system
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@421453 13f79535-47bb-0310-9956-ffa450edef68
2006-07-12 23:02:52 +00:00
Si Chen 8e58687118 Added ProductStore.storeCreditValidDays to allow per-store BillingAccount.thruDate to be set. The thruDate is set when BillingAccount is created in processCreditReturn. Modified the BillingAccountWorker service that generates list of billing accounts to obey this thruDate. Resolves OFBIZ-86.
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@421420 13f79535-47bb-0310-9956-ffa450edef68
2006-07-12 21:36:16 +00:00
Hans Bakker 9390a1db2a small dutch update
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@421258 13f79535-47bb-0310-9956-ffa450edef68
2006-07-12 12:37:51 +00:00
Hans Bakker 9de18e701e dutch labels
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@421247 13f79535-47bb-0310-9956-ffa450edef68
2006-07-12 11:40:03 +00:00
Hans Bakker 8267049273 ducth labels
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@421245 13f79535-47bb-0310-9956-ffa450edef68
2006-07-12 11:39:13 +00:00
Hans Bakker da716156de revert previous change
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@421244 13f79535-47bb-0310-9956-ffa450edef68
2006-07-12 11:38:17 +00:00
Hans Bakker e618057aa6 dutch label update
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@421243 13f79535-47bb-0310-9956-ffa450edef68
2006-07-12 11:34:12 +00:00
Hans Bakker dadbc88c9f dutch label update
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@421241 13f79535-47bb-0310-9956-ffa450edef68
2006-07-12 11:33:37 +00:00
Hans Bakker 70235e6766 dutch label update
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@421240 13f79535-47bb-0310-9956-ffa450edef68
2006-07-12 11:32:19 +00:00
Jacopo Cappellato eafde21fe1 Fixed bug in the EditDataResource form definition.
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@421239 13f79535-47bb-0310-9956-ffa450edef68
2006-07-12 11:32:13 +00:00
Jacopo Cappellato 8980295790 Misc temp fixes for the mkt pkg stuff; this should fix the bug reported by Leon Torres and Si Chen (error receiving inventory); I still have to complete the mkt pkg processes related to cancelling an order item.
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@421114 13f79535-47bb-0310-9956-ffa450edef68
2006-07-12 04:26:53 +00:00
Jacopo Cappellato 685bfbda3b Fixed a few bugs in the new mkt package stuff.
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@421113 13f79535-47bb-0310-9956-ffa450edef68
2006-07-12 04:17:57 +00:00
Jacopo Cappellato 637693f42d Fixed bug I introduced yesterday while reimplementing the PostalAddressBoundary services.
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@421107 13f79535-47bb-0310-9956-ffa450edef68
2006-07-12 04:00:38 +00:00
Si Chen ce12a343d6 Added contentType to sendMailInterface as an OUT parameter to prevent sendOrderDeliveryScheduleNotification from crashing, following pattern from earlier of fixing other email notification related bugs
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@421023 13f79535-47bb-0310-9956-ffa450edef68
2006-07-11 23:18:05 +00:00
Si Chen 6602f5b51e Fixed bug where BillingAccount created from return with refund of store credit would not show up in payment methods when creating order for that customer.
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@421016 13f79535-47bb-0310-9956-ffa450edef68
2006-07-11 22:32:59 +00:00
Si Chen 995223ed56 Added two relationships to ProductStoreShipmentMethView so getRelatedOne can be used.
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@420989 13f79535-47bb-0310-9956-ffa450edef68
2006-07-11 20:47:55 +00:00
David E. Jones 5d8fa159c0 Small change to keep track of credit card authorization failure counts and last date/time
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@420966 13f79535-47bb-0310-9956-ffa450edef68
2006-07-11 20:03:06 +00:00
Si Chen 04a6d0e9b8 Cosmetic improvements to add adjustment to completed order. OFBIZ-55. Thanks to Ashish Vijaywargiya.
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@420944 13f79535-47bb-0310-9956-ffa450edef68
2006-07-11 18:33:03 +00:00
David E. Jones 4659e252e1 Removed some old files that are no longer used; Jacopo identified these and I've verified that they are not used; need to remove them for the CLA effort because we haven't been able to get CLAs yet for these guys
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@420901 13f79535-47bb-0310-9956-ffa450edef68
2006-07-11 15:37:04 +00:00
David E. Jones 6051aca293 Removed DBCP connection factory to get around CLA issue as we haven't received one from Mike yet; this isn't used and isn't all that useful anyway because DBCP never supported an XA-aware connection pool
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@420890 13f79535-47bb-0310-9956-ffa450edef68
2006-07-11 15:13:22 +00:00
Jacopo Cappellato d82c65ef54 Re-implemented the party services initially implemented by Soto and Ondarza; now the party application doesn't contain any contribution from them anymore.
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@420827 13f79535-47bb-0310-9956-ffa450edef68
2006-07-11 12:53:48 +00:00
David E. Jones ceba1a5648 Added a new OrderHeader field: autoOrderShoppingListId, used to track the shoppingListId for orders auto-created from a ShoppingList; also added some fields to the ProductStore to configure certain payment retry settings for these automatic orders from shopping lists; the new OrderHeader field is now also being saved through the storeOrder service, ie all changes in place there
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@420753 13f79535-47bb-0310-9956-ffa450edef68
2006-07-11 07:47:06 +00:00
Si Chen 910192c703 Add/delete adjustments to created orders. OFBIZ-55. Thanks go to Ashish Vijaywargiya
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@420664 13f79535-47bb-0310-9956-ffa450edef68
2006-07-11 00:01:22 +00:00
Si Chen 6f2bc38bb7 More detailed comments about how prepareInventoryTransfer and createInventoryTransfer services work
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@420637 13f79535-47bb-0310-9956-ffa450edef68
2006-07-10 21:50:12 +00:00
David E. Jones cafb0a4c37 A few more cleanups on the payment processing services
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@420366 13f79535-47bb-0310-9956-ffa450edef68
2006-07-09 23:00:13 +00:00
David E. Jones 609b06b7c9 Fixed reference to httpServer instead of httpsServer, bug reported by Scott Gray; also did some changes to be more robust with isEmpty instead of == null
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@420365 13f79535-47bb-0310-9956-ffa450edef68
2006-07-09 22:58:22 +00:00
David E. Jones 62a152b0da A few cleanups and error handling improvements done while reviewing the code, research for details on some new features to go in this area
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@420209 13f79535-47bb-0310-9956-ffa450edef68
2006-07-08 22:43:28 +00:00
Si Chen 6f4ee276f9 Another fix for adding item to created order: removed duplicate prodCatalogId in service definition appendOrderItem. Also added prodCatalogId to makeItem() so that the issue is actually resolved. See OFBIZ-53 for reference.
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@419743 13f79535-47bb-0310-9956-ffa450edef68
2006-07-06 23:37:59 +00:00
Si Chen cea853cfd4 Fixed bug where adding an item to a created order would crash due to inability to compute price.
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@419736 13f79535-47bb-0310-9956-ffa450edef68
2006-07-06 23:15:27 +00:00
Hans Bakker 3d1af3ec6b contribution from Anil Patel to show children of a fixed asset OFBIZ-79
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@419735 13f79535-47bb-0310-9956-ffa450edef68
2006-07-06 22:59:25 +00:00
Si Chen f556fefe60 Added documentaiton about how CatalogWorker.getCurrentCatalogId works.
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@419734 13f79535-47bb-0310-9956-ffa450edef68
2006-07-06 22:50:49 +00:00
Si Chen 9d7428c665 Fixed bug in batch print shipping labels when no labels are selected.
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@419684 13f79535-47bb-0310-9956-ffa450edef68
2006-07-06 19:52:38 +00:00
Si Chen 4c5efd073b Fixed bug where complete inventory transfer service was not marking the inventory transfer record as COMPLETE, so they were still left as REQUESTED
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@419681 13f79535-47bb-0310-9956-ffa450edef68
2006-07-06 19:43:06 +00:00
Si Chen 59d1e1f523 Changing all rounding modes to round half up because round half even violates the principle of least surprise for casual users and customers, even though it is more precise
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@419626 13f79535-47bb-0310-9956-ffa450edef68
2006-07-06 17:43:23 +00:00
Si Chen b2e54d2af4 Changed success request map to request-redirect instead of view after the dhl shipment request, so a back button doesn't try to schedule another shipment
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@419615 13f79535-47bb-0310-9956-ffa450edef68
2006-07-06 16:45:26 +00:00
Si Chen 9a86fb5b66 Changed UI label on the return page from No Billing Account to New Billing Account which is what it really means
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@419610 13f79535-47bb-0310-9956-ffa450edef68
2006-07-06 16:31:13 +00:00
Si Chen 37f1d29dce Better error messages when the DHL schedule shipping service fails
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@419608 13f79535-47bb-0310-9956-ffa450edef68
2006-07-06 16:28:42 +00:00
Hans Bakker 990e3d060f ecommerce dutch label update
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@419482 13f79535-47bb-0310-9956-ffa450edef68
2006-07-06 08:12:53 +00:00
Jacopo Cappellato 0466d34828 The website component in no more loaded at startup.
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@419468 13f79535-47bb-0310-9956-ffa450edef68
2006-07-06 06:52:09 +00:00
Hans Bakker b2a2f46cf3 update of dutch security labels
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@419455 13f79535-47bb-0310-9956-ffa450edef68
2006-07-06 06:04:41 +00:00
Hans Bakker a089a81be6 fixes OFBIZ-61 apache svn
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@419441 13f79535-47bb-0310-9956-ffa450edef68
2006-07-06 05:28:31 +00:00
David E. Jones ca8de0e45d Fixed some stuff in the Product->Subscription Resource forms; had passed these over in the last round of testing
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@419440 13f79535-47bb-0310-9956-ffa450edef68
2006-07-06 05:22:07 +00:00
Hans Bakker 466433c840 changed clearcommerce test parameter
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@419437 13f79535-47bb-0310-9956-ffa450edef68
2006-07-06 05:10:05 +00:00
David E. Jones 7c214b8082 Added subscription processing services, which are now enabled by default with an ECA; includes a demo product for a Gizmo Newsletter; also some cleanups of and improvements to the subscription admin UI
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@419428 13f79535-47bb-0310-9956-ffa450edef68
2006-07-06 03:42:45 +00:00