Commit Graph
12781 Commits
Author SHA1 Message Date
Anil Patel d84e045585 Improve Invoice Terms rendering. Using UiLables and Currency formatting.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834251 13f79535-47bb-0310-9956-ffa450edef68
2009-11-09 21:55:45 +00:00
Bruno Busco cfd42291e1 Reverted change 826379 to OrderEntryCommonScreen.xml because this introduced a bug reported by matthieu bollot in https://issues.apache.org/jira/browse/OFBIZ-3179
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834221 13f79535-47bb-0310-9956-ffa450edef68
2009-11-09 20:44:18 +00:00
Jacques Le Roux 7d1aba95f3 Oops, forgot the else block in r834173
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834214 13f79535-47bb-0310-9956-ffa450edef68
2009-11-09 20:21:57 +00:00
Jacques Le Roux f72098d435 Sometimes product description is not available, and internal name is not localisable (AFAIK), product name helps then...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834173 13f79535-47bb-0310-9956-ffa450edef68
2009-11-09 18:45:34 +00:00
Jacques Le Roux 3b13817da8 This is needed in POS at least for promotions which have a party in condition (or a promo code related). Anyway it's needed...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834140 13f79535-47bb-0310-9956-ffa450edef68
2009-11-09 16:44:23 +00:00
Jacques Le Roux 831a999513 Better French label
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834138 13f79535-47bb-0310-9956-ffa450edef68
2009-11-09 16:41:11 +00:00
Jacopo Cappellato cfb56f52bf Fixed a series of issues (mostly rounding ones) in the services that compute the standard cost of a product. Thanks to Giorgio Tomaselli for the bug report.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834126 13f79535-47bb-0310-9956-ffa450edef68
2009-11-09 16:06:26 +00:00
Ashish Vijaywargiya 7f81facb85 Minor fix for variable name.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834045 13f79535-47bb-0310-9956-ffa450edef68
2009-11-09 12:57:46 +00:00
Ashish Vijaywargiya 0664a96244 Applied improved patch from jira issue OFBIZ-3165 - Add additional screen for gift card certificate buying functionality by CSR in Order manager application in add item page.
Following points are covered in this patch:

1) Removed hard-coded product ids for Gift certificates products from GiftCertificates.ftl and added new category type called "GIFT_CARD_CATEGORY" and related demo data, also added groovy script for fetching logic to address this issue.

2) Also handled hard-coded surveyId in AddGiftCertificates.groovy

3) Added user friendly messages if required data is not available .

4) Added missing license header in GiftCertificates.ftl

Thanks Divesh for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834042 13f79535-47bb-0310-9956-ffa450edef68
2009-11-09 12:53:03 +00:00
Jacques Le Roux d45dff2ac0 Safer : set partyId only if all is OK
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834033 13f79535-47bb-0310-9956-ffa450edef68
2009-11-09 12:34:23 +00:00
Anil Patel 7abd273780 Fixed package name.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834012 13f79535-47bb-0310-9956-ffa450edef68
2009-11-09 10:42:14 +00:00
Hans Bakker 861eb020ab 1. combine opportunity's id and name to single field.
2. add 'headerItem' as communicationevent list item link's parameter for height light menu bar
3. fix 'assign to me' buttom shifts to the left.
4. add related company button and form for create new related company in lead and contact.
5. add email buttons in sfa's communication event
6. add lookup screen and form for account lead.
7. fix telecomNumber display format. look ListWorkEffortContactMechs as example
8. rename button 'assign existing account lead' in leads to 'add related company
9. remove assigning existing account in contact
10. on all screens add a 'find' button to go back to the find screen
11. When click on comvert lead, show the message: 'Please first add related company' when company is empty


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834010 13f79535-47bb-0310-9956-ffa450edef68
2009-11-09 10:37:52 +00:00
Anil Patel 7edd7e8170 Split AcctgTrans form fields into two column.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834009 13f79535-47bb-0310-9956-ffa450edef68
2009-11-09 10:36:47 +00:00
Bruno Busco a57dee984a Fixed rendering of the new "field-lookup" class in bizznesstime.
Thank you Deepak Dixit for reporting and providing the solution in the ML.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834001 13f79535-47bb-0310-9956-ffa450edef68
2009-11-09 09:07:20 +00:00
Anil Patel 5719289bde Update paymentgroupmember list. Now its consistent with pdf version.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834000 13f79535-47bb-0310-9956-ffa450edef68
2009-11-09 09:04:25 +00:00
Anil Patel fb3242a2c5 Extend InvoiceAndType view, added StatusItem relation and InvoiceType desc alias.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833995 13f79535-47bb-0310-9956-ffa450edef68
2009-11-09 08:42:46 +00:00
Anil Patel 5c87c50f28 Adding PaymentAndTypeAndCreditCard. Allows to filter payments by credit card type.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833980 13f79535-47bb-0310-9956-ffa450edef68
2009-11-09 06:49:18 +00:00
Adrian Crum ee835d014a Added Java type converters for the entity engine.
This commit demonstrates how the object type converter framework can be extended by other components.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833964 13f79535-47bb-0310-9956-ffa450edef68
2009-11-09 01:48:23 +00:00
Scott Gray 22cc07a403 When creating a payment, if no paymentMethodTypeId or paymentMethodId has been provided but a paymentPreferenceId has been then use the values from the OrderPaymentPreference record
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833962 13f79535-47bb-0310-9956-ffa450edef68
2009-11-09 01:38:27 +00:00
Adrian Crum 95c4b912d9 Small bug fix for my previous TimeDuration commit.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833958 13f79535-47bb-0310-9956-ffa450edef68
2009-11-09 01:15:28 +00:00
Jacques Le Roux dc05c50d69 A patch from Bruno Busco "The icon used for accessing the lookups should be defined by the theme" (https://issues.apache.org/jira/browse/OFBIZ-3176) - OFBIZ-3176
In this patch the lookup field renderer has the link image not as a static img field but specified by the theme through a style class.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833937 13f79535-47bb-0310-9956-ffa450edef68
2009-11-08 22:35:51 +00:00
Scott Gray 95c192d65d Removed use of a deprecated Delegator method, patch provided by Sumit Pandit
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833933 13f79535-47bb-0310-9956-ffa450edef68
2009-11-08 21:41:19 +00:00
Scott Gray 649c1b45ea Added missing svn properties
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833931 13f79535-47bb-0310-9956-ffa450edef68
2009-11-08 21:39:04 +00:00
Jacopo Cappellato f54e9985d1 Hidden the "Description" label if the invoice description is empty; also fixed a NPE check.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833918 13f79535-47bb-0310-9956-ffa450edef68
2009-11-08 19:37:05 +00:00
Jacopo Cappellato d3d84f0d2f Removed tax id field from postal address; the same field is already printed under the customer id in the top part of the invoice.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833917 13f79535-47bb-0310-9956-ffa450edef68
2009-11-08 19:35:31 +00:00
Jacopo Cappellato 7b8ab6c265 Fixed bug that was preventing the recursive algorithm to work properly.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833916 13f79535-47bb-0310-9956-ffa450edef68
2009-11-08 19:31:49 +00:00
Jacques Le Roux c1ccfd9975 A patch from Bruno Busco "Collapsible Field Groups with clickable title" (https://issues.apache.org/jira/browse/OFBIZ-3176) - OFBIZ-3176
in the attached patch there is a new rendering for the Group Field Title bar.
I removed the table and used simple divs.
Moreover the field group title is now all clickable in order to collapse expand the group.

The necessary changes to all themes are also included in the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833910 13f79535-47bb-0310-9956-ffa450edef68
2009-11-08 18:36:30 +00:00
Bruno Busco 765c98327a Added an example of non collapsible groupfield in the Widget Example Form
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833884 13f79535-47bb-0310-9956-ffa450edef68
2009-11-08 15:23:52 +00:00
Bruno Busco 2094b09838 Bluelight theme improved:
Replaced icons for screenlet and header collapse/expand

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833847 13f79535-47bb-0310-9956-ffa450edef68
2009-11-08 08:23:51 +00:00
Bruno Busco 4ec686c195 Bluelight theme improved:
Added new icons (not yet used)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833844 13f79535-47bb-0310-9956-ffa450edef68
2009-11-08 07:50:38 +00:00
Adrian Crum 5babe48c44 File missing in last commit.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833828 13f79535-47bb-0310-9956-ffa450edef68
2009-11-08 05:12:20 +00:00
Adrian Crum 6d4917f304 Added Collection Converters.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833827 13f79535-47bb-0310-9956-ffa450edef68
2009-11-08 05:08:26 +00:00
Adrian Crum 2070f32b2e Modified ObjectType.java to use the new Java object type conversion framework.
Since the new converters aren't finished, I set it up so conversions fall back on the old ObjectType.java conversion code when needed.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833786 13f79535-47bb-0310-9956-ffa450edef68
2009-11-08 00:48:19 +00:00
Adrian Crum 99d3b54cb8 The new Java object type conversion framework. It isn't complete, but there is enough there to grasp the general idea.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833784 13f79535-47bb-0310-9956-ffa450edef68
2009-11-08 00:43:17 +00:00
Adrian Crum fba568b7bc Fixed incorrect framework/base test class binary name.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833781 13f79535-47bb-0310-9956-ffa450edef68
2009-11-08 00:01:06 +00:00
Jacques Le Roux a77eddd077 A (slightly modified) patch from Marc Morin "Resolve java warnings exposed in Eclipse : framework - widget" (https://issues.apache.org/jira/browse/OFBIZ-3123) - OFBIZ-3123
I have only replaced a while loop by an enhanced for loop



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833770 13f79535-47bb-0310-9956-ffa450edef68
2009-11-07 21:35:50 +00:00
Anil Patel 4d1a2e1a59 Re-fit find options form into two column layout.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833741 13f79535-47bb-0310-9956-ffa450edef68
2009-11-07 20:00:43 +00:00
Jacques Le Roux f01a7c8505 A (slightly modified) patch from Marc Morin "Resolve java warnings exposed in Eclipse : framework - webtools" (https://issues.apache.org/jira/browse/OFBIZ-3122) - OFBIZ-3122
I have replaced some while loops by enhanced for loops



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833731 13f79535-47bb-0310-9956-ffa450edef68
2009-11-07 18:49:09 +00:00
Jacques Le Roux cbc51c2532 A patch from Marc Morin "Resolve java warnings exposed in Eclipse : framework - webslinger" (https://issues.apache.org/jira/browse/OFBIZ-3121) - OFBIZ-3121
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833727 13f79535-47bb-0310-9956-ffa450edef68
2009-11-07 18:18:33 +00:00
Jacques Le Roux ac889d7a13 A modified patch from Marc Morin "Resolve java warnings exposed in Eclipse : framework - entityext" (https://issues.apache.org/jira/browse/OFBIZ-3108) - OFBIZ-3108
I replaced 4 while loops by for loops. Doing that I removed the empty checks. So I also used a FastList in StrungUtile.split() which I also refactored a bit.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833725 13f79535-47bb-0310-9956-ffa450edef68
2009-11-07 18:14:22 +00:00
Jacques Le Roux 437de8786a A (slightly modified) patch from Bob Morley "Resolve java warnings exposed in Eclipse : framework - entityext" (https://issues.apache.org/jira/browse/OFBIZ-3108) - OFBIZ-3108
I replaced 3 while loops by for loops

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833715 13f79535-47bb-0310-9956-ffa450edef68
2009-11-07 17:10:43 +00:00
Jacopo Cappellato b9411f17d1 Removed demo data for PartyIdentification related to VAT tax id because it was not the right way to model this information.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833710 13f79535-47bb-0310-9956-ffa450edef68
2009-11-07 16:41:07 +00:00
Jacques Le Roux 89c24075c7 Fix an FTL security bug "delete website from product store" reported by Mario Harnisch at https://issues.apache.org/jira/browse/OFBIZ-2387 - OFBIZ-2387
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833703 13f79535-47bb-0310-9956-ffa450edef68
2009-11-07 16:01:37 +00:00
Jacques Le Roux 87db5397ee Better French label
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833700 13f79535-47bb-0310-9956-ffa450edef68
2009-11-07 15:47:34 +00:00
Jacques Le Roux 415aa0e064 A (slightly modified) patch from Bob Morley "Resolve java warnings exposed in Eclipse : framework - appserver" (https://issues.apache.org/jira/browse/OFBIZ-3101) - OFBIZ-3101
I just prefered to replace the @SuppressWarnings("unchecked") for GenerateContainer.getClasspath() by <?> (generics are not covariant), but it's actually a matter of taste.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833698 13f79535-47bb-0310-9956-ffa450edef68
2009-11-07 15:18:20 +00:00
Jacques Le Roux be13e3cfe5 Fix an FTL security bug "Remove productstore role from store" reported by Willem Janssen at https://issues.apache.org/jira/browse/OFBIZ-3174 - OFBIZ-3174
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833686 13f79535-47bb-0310-9956-ffa450edef68
2009-11-07 14:34:07 +00:00
Bruno Busco 00dedb610a Bluelight theme improved:
A better screenlet collapsed/expanded icon

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833667 13f79535-47bb-0310-9956-ffa450edef68
2009-11-07 09:57:14 +00:00
Bruno Busco 7fa5fd87f8 Bluelight theme improved:
Added exclamation and information icons when events are shown
A better header collapsed/expanded icon (to be used for screenlets also soon)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833657 13f79535-47bb-0310-9956-ffa450edef68
2009-11-07 09:33:12 +00:00
Bruno Busco e501b450c6 Changed nav-pager using the styles as defined in the widget renderNextPrev macro.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833652 13f79535-47bb-0310-9956-ffa450edef68
2009-11-07 08:32:28 +00:00
Anil Patel 5b91053be6 Show PaymentMethod description and PaymentMethodId. in Payment Header.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833642 13f79535-47bb-0310-9956-ffa450edef68
2009-11-07 07:33:11 +00:00