Commit Graph
12781 Commits
Author SHA1 Message Date
Jacopo Cappellato 8676b33fc1 Fix for bad jpublish def pages: the errors have been introduced by my commit about license change.
Thanks to Eriks Dobelis and Scott Gray for reporting and fixit it (Apache OFBIZ-110).

git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@425650 13f79535-47bb-0310-9956-ffa450edef68
2006-07-26 07:25:25 +00:00
Hans Bakker 854f0a536b fixed: if taxrate missing invoice did not display
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@425616 13f79535-47bb-0310-9956-ffa450edef68
2006-07-26 04:38:18 +00:00
Si Chen ff585d8bb8 OFBIZ-104: Re-factor PaymentGatewayServices processCaptureResult. For payment partyIdFrom, if payTo was not specified, check first if there is an invoice.partyIdFrom and then default to Company. Also get the partyIdTo of the pyament from the invoice.partyId if exists, otherwise default to OrderRole.
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@425544 13f79535-47bb-0310-9956-ffa450edef68
2006-07-25 22:41:01 +00:00
Si Chen 7a0279f6be Added party name to list of returns.
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@425542 13f79535-47bb-0310-9956-ffa450edef68
2006-07-25 22:29:01 +00:00
Si Chen e1635c85a4 OFBIZ-106: Fix bug where controller for create/delete TaxAuthorityGlAccount was calling the wrong service. Fix the delete link to include a required parameter. Thanks to Scott Gray.
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@425527 13f79535-47bb-0310-9956-ffa450edef68
2006-07-25 21:19:13 +00:00
Si Chen 93a6556bb0 Add a map of productId to standard cost for the receive inventory forms. If receiving a single product, use the standard cost instead of 0.0.
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@425520 13f79535-47bb-0310-9956-ffa450edef68
2006-07-25 20:44:53 +00:00
Si Chen 13b2c50baf Show currency for catalog manager product inventory page's list of products
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@425461 13f79535-47bb-0310-9956-ffa450edef68
2006-07-25 17:09:02 +00:00
Hans Bakker e324cd5eb0 OFBIZ-109, reported by Chris Howe. Thanks for the contribution
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@425325 13f79535-47bb-0310-9956-ffa450edef68
2006-07-25 08:11:13 +00:00
Jacopo Cappellato 32606aa777 Implemented new screen, forms and services to manage order terms for existing orders.
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@424684 13f79535-47bb-0310-9956-ffa450edef68
2006-07-23 06:37:15 +00:00
Jacopo Cappellato 0467bb70df License change to ASL2.0.
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@424624 13f79535-47bb-0310-9956-ffa450edef68
2006-07-22 19:17:07 +00:00
Jacopo Cappellato 8d568a1886 New Italian labels from Marco Risaliti (Apache OFBIZ-63).
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@424595 13f79535-47bb-0310-9956-ffa450edef68
2006-07-22 15:20:11 +00:00
Jacopo Cappellato ac8673506d The form is now rendered by the "renderFormString(context)" method to internationalize it.
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@424589 13f79535-47bb-0310-9956-ffa450edef68
2006-07-22 15:02:28 +00:00
Jacopo Cappellato 0374ceeeae New entity labels from Marco Risaliti (Apache OFBIZ-78).
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@424588 13f79535-47bb-0310-9956-ffa450edef68
2006-07-22 14:54:49 +00:00
David E. Jones 2fcebbefe9 Removed remaining reference to GZ-KIT, was causing data load failure
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@424556 13f79535-47bb-0310-9956-ffa450edef68
2006-07-22 11:42:28 +00:00
Jacques Le Roux 9b9a632468 Suppression of $id in ASL2 headers files of POS application
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@424543 13f79535-47bb-0310-9956-ffa450edef68
2006-07-22 10:31:53 +00:00
Jacopo Cappellato ca8ed04c60 Added check to prevent a NPE as suggested by Chris Howe in Apache OFBIZ-67.
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@424532 13f79535-47bb-0310-9956-ffa450edef68
2006-07-22 07:23:37 +00:00
Jacopo Cappellato 2f99934ec1 Added check to prevent a NPE as suggested by Chris Howe in Apache OFBIZ-69.
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@424531 13f79535-47bb-0310-9956-ffa450edef68
2006-07-22 07:20:20 +00:00
Jacopo Cappellato e416461983 Fixed bug reported by Raphael Winckler de Bettio in Apache OFBIZ-101: product's payment type list was not filtered by productId.
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@424529 13f79535-47bb-0310-9956-ffa450edef68
2006-07-22 06:58:48 +00:00
Jacopo Cappellato f10514554b Fixed typo in package name reported by Chris Howe in Apache OFBIZ-105.
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@424528 13f79535-47bb-0310-9956-ffa450edef68
2006-07-22 06:51:08 +00:00
David E. Jones e8f2e75bcf Cleaned up imports
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@424513 13f79535-47bb-0310-9956-ffa450edef68
2006-07-22 03:03:23 +00:00
Si Chen af515860fe Made organizationPartyId, fromDate, thruDate required for createCustomTimePeriod service
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@424501 13f79535-47bb-0310-9956-ffa450edef68
2006-07-22 00:06:48 +00:00
Si Chen 4dcb3615b6 Couple of warning messages when payment processing services use a default value of Company on Payments
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@424499 13f79535-47bb-0310-9956-ffa450edef68
2006-07-21 23:53:37 +00:00
Si Chen f2996a0fbc Main biling account screen shows available and net balance
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@424494 13f79535-47bb-0310-9956-ffa450edef68
2006-07-21 23:46:22 +00:00
Si Chen 584c11f77a Simplification of CheckOutHelper.availableAccountBalance to take advantage of BillingAccountWorker.getBillingAccountAvailableBalance(). This moves the concern of computing the available balance to the accounting component, where it should reside.
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@424489 13f79535-47bb-0310-9956-ffa450edef68
2006-07-21 23:15:19 +00:00
Si Chen ab89361f3d Refactoring of the way billing accounts work, using PaymentApplication to track the amount of a billing account used up in each invoice. Also changed captureOrderPayments to use up billing accounts first before other payment methods. Finally, new methods to get net vs. available balances of a billing account
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@424484 13f79535-47bb-0310-9956-ffa450edef68
2006-07-21 22:39:30 +00:00
Si Chen 2d3476ea42 Refactoring of the way billing accounts work, using PaymentApplication to track the amount of a billing account used up in each invoice. Also changed captureOrderPayments to use up billing accounts first before other payment methods. Finally, new methods to get net vs. available balances of a billing account
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@424483 13f79535-47bb-0310-9956-ffa450edef68
2006-07-21 22:39:22 +00:00
Si Chen 5f1ab2bd85 New remove Regex from string methods in StringUtil, with reimplementation of the removeNonNumeric and removeNumeric. From Andrew Sykes. OFBIZ-73
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@424482 13f79535-47bb-0310-9956-ffa450edef68
2006-07-21 22:33:45 +00:00
Si Chen 1d52997bb1 Patch from Peter Goron to fix problem with available locales not parsing correctly when locale is of format fr_FR. OFBIZ-45
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@424477 13f79535-47bb-0310-9956-ffa450edef68
2006-07-21 22:25:25 +00:00
Si Chen 82562b62e1 OFBIZ-99: Fixed bug where EntityUtil.filterByDate() uses the wrong boundary condition. Thanks to Peter Goron.
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@424430 13f79535-47bb-0310-9956-ffa450edef68
2006-07-21 19:35:02 +00:00
Jacopo Cappellato e2695cd95d Added ASL2.0 to start scripts.
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@424208 13f79535-47bb-0310-9956-ffa450edef68
2006-07-21 07:02:43 +00:00
David E. Jones 8f692c6f9c Fixed bug reported by Daniel Kunkel based on his good comments on what caused the problem; Apache Jira #OFBIZ-97
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@424207 13f79535-47bb-0310-9956-ffa450edef68
2006-07-21 07:02:12 +00:00
David E. Jones b60163e1a0 Added ofbiz-workflow engine for service engine to refer to the old OFBiz workflow engine
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@424205 13f79535-47bb-0310-9956-ffa450edef68
2006-07-21 07:00:54 +00:00
David E. Jones 30d676aa67 Removed read-data elements from localderbyodbc datasource as they don't really apply to it
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@424170 13f79535-47bb-0310-9956-ffa450edef68
2006-07-21 04:31:18 +00:00
Hans Bakker a11fffe61c date search field in form widget had 'same_day' and 'equals' checked both. This gave problems in the Konqueror browser under kde linux which did not select anything
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@424145 13f79535-47bb-0310-9956-ffa450edef68
2006-07-21 00:14:24 +00:00
Si Chen eb8c4149c8 Removed old marketing package auto-explode code which has now been replaced by BOM-based code for new the Marketing Package product type
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@424117 13f79535-47bb-0310-9956-ffa450edef68
2006-07-20 23:39:46 +00:00
Jacopo Cappellato 001d200b93 Added support for order item cancellation for marketing packages.
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@424068 13f79535-47bb-0310-9956-ffa450edef68
2006-07-20 21:11:16 +00:00
Jacopo Cappellato 5068ef2aa2 Fixed wrong form definition..
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@424024 13f79535-47bb-0310-9956-ffa450edef68
2006-07-20 19:13:16 +00:00
Jacopo Cappellato a2889384b7 Fixed bad xml header: it was caused by the license change patch I've committed earlier today.
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@424023 13f79535-47bb-0310-9956-ffa450edef68
2006-07-20 19:07:23 +00:00
Jacopo Cappellato bba10be98e License change from MIT to ASL2.0 for misc files of framework components.
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@423916 13f79535-47bb-0310-9956-ffa450edef68
2006-07-20 12:44:14 +00:00
Jacopo Cappellato dc64ffe8ea License change from MIT to ASL2.0 for misc files of framework components.
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@423902 13f79535-47bb-0310-9956-ffa450edef68
2006-07-20 11:36:57 +00:00
Jacopo Cappellato 1f5d4c4c45 License change from MIT to ASL2.0 for misc files of framework components.
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@423899 13f79535-47bb-0310-9956-ffa450edef68
2006-07-20 11:30:47 +00:00
Jacopo Cappellato f686cbba98 License change from MIT to ASL2.0 for misc files of applications components.
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@423896 13f79535-47bb-0310-9956-ffa450edef68
2006-07-20 11:25:08 +00:00
Jacopo Cappellato c2eb35ac38 License change from MIT to ASL2.0 for the files of entity and entityext components not modified by Adam Heath.
Thanks to Ashish Vijaywargiya for the patch (Apache OFBIZ-87).


git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@423883 13f79535-47bb-0310-9956-ffa450edef68
2006-07-20 10:57:51 +00:00
Jacopo Cappellato 956dc6ad4b License change from MIT to ASL2.0 for the files of misc framework components.
Thanks to Scott Gray for the patch (Apache OFBIZ-87).


git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@423879 13f79535-47bb-0310-9956-ffa450edef68
2006-07-20 10:45:49 +00:00
Jacopo Cappellato 73ab047302 Committed patch from Christian Geisert (Apache OFBIZ-98) to allow for no condition searches for quotes and requests.
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@423874 13f79535-47bb-0310-9956-ffa450edef68
2006-07-20 10:32:04 +00:00
Jacopo Cappellato 87b52b4c6a License change from MIT to ASL2.0 for the files of the catalina component.
Thanks to Scott Gray for the patch (Apache OFBIZ-87).


git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@423871 13f79535-47bb-0310-9956-ffa450edef68
2006-07-20 10:27:31 +00:00
Jacopo Cappellato a29541dcc4 License change from MIT to ASL2.0 for the files of the shark component.
Thanks to Scott Gray for the patch (Apache OFBIZ-87).


git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@423868 13f79535-47bb-0310-9956-ffa450edef68
2006-07-20 10:24:29 +00:00
Jacopo Cappellato 071a8b6c0b License change from MIT to ASL2.0 for the files of the shark component.
Thanks to Scott Gray for the patch (Apache OFBIZ-87).


git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@423867 13f79535-47bb-0310-9956-ffa450edef68
2006-07-20 10:23:24 +00:00
Jacopo Cappellato de1b33bba9 License change from MIT to ASL2.0 for the files of the service component.
Thanks to Scott Gray for the patch (Apache OFBIZ-87).

git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@423866 13f79535-47bb-0310-9956-ffa450edef68
2006-07-20 10:19:51 +00:00
Jacopo Cappellato d653b2c862 License change from MIT to ASL2.0 for the files of the datafile component.
Thanks to Scott Gray for the patch (Apache OFBIZ-87).

git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@423846 13f79535-47bb-0310-9956-ffa450edef68
2006-07-20 09:11:54 +00:00