Commit Graph
12781 Commits
Author SHA1 Message Date
Adrian Crum f046004995 Remove Eclipse compiler warnings from framework/base component. Patch contributed by Marc Morin with additional work by me - https://issues.apache.org/jira/browse/OFBIZ-3102.
This commit requires an ant clean + build.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@831550 13f79535-47bb-0310-9956-ffa450edef68
2009-10-31 15:22:05 +00:00
Jacques Le Roux 04715e0f5a A sligtly modified patch from Eric De Maulde "checkoutpayment XHTML validation" (https://issues.apache.org/jira/browse/OFBIZ-2932) - OFBIZ-2932
I removed the default payment and re-added a line removed

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@831547 13f79535-47bb-0310-9956-ffa450edef68
2009-10-31 14:23:51 +00:00
Ashish Vijaywargiya 7c2d11d05a Applied patch from jira issue OFBIZ-3132 - Multiple productStore support to googleBase and eBay.
Changes includes following:
1) Created new search form for eBay and GoogleBase - It was not good to update *advancesearch*.ftl file present inside catalog component. Now it will be easy to maintain separate file for future deployments.
2) Restricted productStoreId and prodCatalogId field to search.
3) Added webSite drop-down on "Export to eBay" and "Export to GoogleBase" page.
4) Select webSite to get the webSiteUrl. 

Thanks Parimal for your contribution - this will surely help the community.
Special thanks to Mridul, Rishi, Chirag, Deepak & Me :-) for discussing requirement and also special thanks to Jacopo for the notes and discussion on requirements.
 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@831534 13f79535-47bb-0310-9956-ffa450edef68
2009-10-31 12:01:52 +00:00
Jacques Le Roux b0dd5b99ec POS Chinese labels from Terence NG "Simplified Chinese localization of PosUiLabels.xml" (https://issues.apache.org/jira/browse/OFBIZ-3131) - OFBIZ-3131
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@831526 13f79535-47bb-0310-9956-ffa450edef68
2009-10-31 09:53:45 +00:00
Jacques Le Roux 5c5b076fa0 Replace client by customer in English in POS labels (in French it's only Client). I feel it's more a customer than a client.
+ new button label in MGR panel : "Void a sale", it's not the same than "Void the sale"

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@831522 13f79535-47bb-0310-9956-ffa450edef68
2009-10-31 08:54:14 +00:00
Jacques Le Roux b2402645d9 Some generics
+ fix a bug reported by Akash Jain on dev ML (in r831262)
+ improvements in PosTransaction.editClientProfile

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@831314 13f79535-47bb-0310-9956-ffa450edef68
2009-10-30 14:35:20 +00:00
Ashish Vijaywargiya d5349e8991 Applied patch from jira issue OFBIZ-3130 - improvement in createShoppingListItem service.
1) One product are added only once in shopping list.
2) If we added Same Product again, then only quantity will update for that product.
Which is good feature rather than making saprate record for every added product.

Thanks Chandan for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@831300 13f79535-47bb-0310-9956-ffa450edef68
2009-10-30 13:54:26 +00:00
Jacques Le Roux 8eb8054542 Revert r831259 (done in haste wrong file) and add all generics needed
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@831262 13f79535-47bb-0310-9956-ffa450edef68
2009-10-30 11:08:41 +00:00
Jacques Le Roux e798f978d4 Following Scott's fix in r831246. Weird because this was compiling in Eclipse, so I did not notice my bad.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@831259 13f79535-47bb-0310-9956-ffa450edef68
2009-10-30 10:55:22 +00:00
Jacques Le Roux ef2c935618 A patch from Pradeep Ruhil "HR Leave Enhancement ." (https://issues.apache.org/jira/browse/OFBIZ-2938) - OFBIZ-2938
In this patch we are doing enhancement in HumanResource Leave Module. 
Initially we can only create new leave application for a partyId. 
But there was not functionality available for approval of leave. 
So in this patch we have given functionality for Leave approval as well as leave creation. 
+ A better French label


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@831249 13f79535-47bb-0310-9956-ffa450edef68
2009-10-30 10:07:09 +00:00
Jacques Le Roux 0b06ca9615 A replacement patch from Bilgin Ibryam "You don't to distinguish between normal text and URL links in screens." (https://issues.apache.org/jira/browse/OFBIZ-3061) - OFBIZ-3061
This pactch colors the links in tables instead of underlining them which was a problem when FTL was used (as in parties search results)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@831238 13f79535-47bb-0310-9956-ffa450edef68
2009-10-30 09:37:09 +00:00
Hans Bakker 7bfe133163 dutch translation for party labels
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@831198 13f79535-47bb-0310-9956-ffa450edef68
2009-10-30 04:26:50 +00:00
Jacques Le Roux 2fa5bbedb3 Add an azerty virtual keyboard to the POS
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@831192 13f79535-47bb-0310-9956-ffa450edef68
2009-10-30 04:07:53 +00:00
Jacques Le Roux 94f20782fe Hans noticed this line and on dev ML said "If the webpos component is not loaded the party profile screen will not
display anymore"
I wonder why this line has slipped in, I guess another collateral effect of C/P
Removed!

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@831190 13f79535-47bb-0310-9956-ffa450edef68
2009-10-30 03:56:04 +00:00
Bilgin Ismet Ibryam a94070f2c6 Replaced & with & from my previous commit.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@831180 13f79535-47bb-0310-9956-ffa450edef68
2009-10-30 01:25:56 +00:00
Jacopo Cappellato 816a5c1e67 Added the ability to set the exportAll flag in the RemoteDispatcher from a configuration file.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@831176 13f79535-47bb-0310-9956-ffa450edef68
2009-10-30 01:10:25 +00:00
Bilgin Ismet Ibryam 2e511b353d Add request parameters to the links created by tree widgets.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@831166 13f79535-47bb-0310-9956-ffa450edef68
2009-10-30 00:10:59 +00:00
Bilgin Ismet Ibryam 6196cf974b Underlined some of the links, so they are noticeable. Related to https://issues.apache.org/jira/browse/OFBIZ-3061
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@831159 13f79535-47bb-0310-9956-ffa450edef68
2009-10-29 23:55:18 +00:00
Jacopo Cappellato 1032ba881d Added the ability to define cost component formulae to a product: new ProductCostComponentCalc entity and crud services, and ui to manage the information. Modified standard costing calculation service to use the new entity. Also implemented a custom method (cost formula) that adds a percentage based adjustment
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@831099 13f79535-47bb-0310-9956-ffa450edef68
2009-10-29 21:38:18 +00:00
Bilgin Ismet Ibryam ddb2d1148a Prevent overriding of service results in a service-multi type events.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@831098 13f79535-47bb-0310-9956-ffa450edef68
2009-10-29 21:35:49 +00:00
Jacques Le Roux e0e5451140 Fix an twice encoded issue, visible for the 9017 promotion
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@831010 13f79535-47bb-0310-9956-ffa450edef68
2009-10-29 16:14:39 +00:00
Jacques Le Roux 389a8a2818 More in phase with other buttons labels (while rewriting the Till manual)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@831001 13f79535-47bb-0310-9956-ffa450edef68
2009-10-29 15:39:12 +00:00
Ashish Vijaywargiya 6d2fb137cb Adding permission GOOGLEBASE_ADMIN & EBAY_ADMIN and associating it with the group FULLADMIN.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@830889 13f79535-47bb-0310-9956-ffa450edef68
2009-10-29 10:58:01 +00:00
Jacques Le Roux 11b49ef962 Forgot this in r830874
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@830880 13f79535-47bb-0310-9956-ffa450edef68
2009-10-29 10:20:16 +00:00
Jacques Le Roux bab4d17071 This allows to print localized descriptions in the POS.
Also some unrelated generics changes in PosTransaction.java

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@830874 13f79535-47bb-0310-9956-ffa450edef68
2009-10-29 09:39:04 +00:00
Hans Bakker ea76601e6c added example product demo attributes and adapted the form
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@830846 13f79535-47bb-0310-9956-ffa450edef68
2009-10-29 05:15:10 +00:00
Bilgin Ismet Ibryam 8ff608e51d Removed the extra invoiceTypeId parameter from createInvoiceForOrderAllItems service result.
Reported by Cimballi in https://issues.apache.org/jira/browse/OFBIZ-3010

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@830814 13f79535-47bb-0310-9956-ffa450edef68
2009-10-29 00:57:31 +00:00
Bruno Busco 79ed05a18e Implemented OFBIZ-3086 in Bluelight theme
Add a CSS class to allow styling help links. Then each theme can style the help link.

Thank you Scott for providing the link to http://www.fatcow.com/free-icons/index.bml

I hope we will have soon several of them into OFBiz

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@830789 13f79535-47bb-0310-9956-ffa450edef68
2009-10-28 23:17:03 +00:00
Jacques Le Roux 3d247fbaca A patch from Deepak Dixit "Html cleanup of keyword search boxes." (https://issues.apache.org/jira/browse/OFBIZ-2986) - OFBIZ-2986
For the order component.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@830679 13f79535-47bb-0310-9956-ffa450edef68
2009-10-28 17:20:11 +00:00
Jacques Le Roux f8f53904d8 Fix French labels (related to r830676)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@830677 13f79535-47bb-0310-9956-ffa450edef68
2009-10-28 17:15:38 +00:00
Jacques Le Roux da516e7413 A patch from Deepak Dixit "Html cleanup of keyword search boxes." (https://issues.apache.org/jira/browse/OFBIZ-2986) - OFBIZ-2986
For the product component.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@830676 13f79535-47bb-0310-9956-ffa450edef68
2009-10-28 17:14:06 +00:00
Jacques Le Roux a3b51e146f A patch from Patrick Antivackis "PriceServices.calculateProductPrice should not process or return obsolete PriceRules" (https://issues.apache.org/jira/browse/OFBIZ-3096) - OFBIZ-3096
This patch is a 1st step and add only a filterByDate to the PriceRules obtained after the call to the makeProducePriceRuleList function 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@830528 13f79535-47bb-0310-9956-ffa450edef68
2009-10-28 13:28:58 +00:00
Ashish Vijaywargiya 9fb4be63a5 The generated label was not showing the complete image on the pdf. So increasing the height of page.
Thanks Awdesh for your contribution on this.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@830521 13f79535-47bb-0310-9956-ffa450edef68
2009-10-28 13:11:36 +00:00
Jacques Le Roux 21488d7924 We don't need Telnet for the POS alone
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@830490 13f79535-47bb-0310-9956-ffa450edef68
2009-10-28 10:25:56 +00:00
Jacques Le Roux a686aa38a0 Secure r830458 (avoid NPE)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@830477 13f79535-47bb-0310-9956-ffa450edef68
2009-10-28 09:22:29 +00:00
Hans Bakker 7c8b20c6ee customer request name should not be displayed encoded, when created by the service it already is set to 'safe'
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@830462 13f79535-47bb-0310-9956-ffa450edef68
2009-10-28 08:33:19 +00:00
Jacques Le Roux 5a6ad6a20d Using MSR to swip card number in Client Profile dialog box is better done with this version
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@830458 13f79535-47bb-0310-9956-ffa450edef68
2009-10-28 08:23:14 +00:00
Jacques Le Roux 048506f318 A patch from Patrick Antivackis "NPE when calling a page like http://localhost:8080/cmssite/cms" (https://issues.apache.org/jira/browse/OFBIZ-3096) - OFBIZ-3096
A Null Pointer Exception is generated by RequestHandler.trackVIsit and trackStat if a page is called without view and without trailing slash after the controller.
This may be not a problem for non cms site, but it is for cms site. Calling http://localhost:8080/cmssite/cms will generate a NPE; WIth the included pacth, calling the same page will display the default page.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@830366 13f79535-47bb-0310-9956-ffa450edef68
2009-10-27 22:13:53 +00:00
Ashish Vijaywargiya d4d72a0ca8 Applied patch from jira issue OFBIZ-3095 - Getting error "Number Format Exception" on OnePageCheckout.
Thanks Surya & Rishi for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@830199 13f79535-47bb-0310-9956-ffa450edef68
2009-10-27 14:24:47 +00:00
Ashish Vijaywargiya c98b687cfb Filtering the PartyContactMechPurpose records - Patch from Awdesh (Thanks!).
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@830195 13f79535-47bb-0310-9956-ffa450edef68
2009-10-27 14:17:27 +00:00
Jacques Le Roux afafc89b57 A patch from Bilgin Ibryam "BizznessTime Theme : error and event messages should not dissapear by default" (https://issues.apache.org/jira/browse/OFBIZ-2442) - OFBIZ-2442
Currently I see two timers for hiding the message:

    * One that is automatically started and removes the message in 7 seconds.
    * The other one is activated on mousemove, click or keypress events and removes the message in 2-3 seconds.

My patch comments out both timer and removes the message with 0.5s delay if the user clicks on the message box.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@830112 13f79535-47bb-0310-9956-ffa450edef68
2009-10-27 10:02:19 +00:00
Jacques Le Roux 26b85909d3 Better French translation even if not really good (should need to split and create a new label, I give up...)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@830108 13f79535-47bb-0310-9956-ffa450edef68
2009-10-27 09:52:03 +00:00
Jacques Le Roux 237401e8a9 Better behavior in case of error (nothing to export from product search list)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@830091 13f79535-47bb-0310-9956-ffa450edef68
2009-10-27 08:29:12 +00:00
Anil Patel 788723c431 Add relationship from PaymentMethod to FinAccount entity. A finAccount can have zero or more related PaymentMethods.
When making Disbursements using PaymentMethods owned by InternalOrganization, we can create FinAccountTransaction. In reconciliation process user can then add FinAccountTransactions to reconciliation.
In next step we need to improve service creating disbursements to fetch finAccountId from PaymentMethod and put in context to enable finAccountTransaction eca services to create finaccounttransactions.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@830048 13f79535-47bb-0310-9956-ffa450edef68
2009-10-27 03:36:47 +00:00
Adam Heath e566ce1960 Add sequenceNum to ProductCategoryRollupAndChild view.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@830009 13f79535-47bb-0310-9956-ffa450edef68
2009-10-26 22:38:07 +00:00
Jacques Le Roux b611189ab0 Better French translation
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@829994 13f79535-47bb-0310-9956-ffa450edef68
2009-10-26 22:06:36 +00:00
Jacques Le Roux 67099fa608 Better French translation
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@829992 13f79535-47bb-0310-9956-ffa450edef68
2009-10-26 22:04:44 +00:00
Jacques Le Roux 8cb86ea147 Add a button to create an agreement from a product.
I have also modified the content of PageTitleEditAgreement label in French (only) because translation of the sole Edit was not enough to give some sense.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@829895 13f79535-47bb-0310-9956-ffa450edef68
2009-10-26 18:39:43 +00:00
Jacques Le Roux b4d171111c StringUtil.wrapString around searchParams. Fix an issue introduced with security
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@829884 13f79535-47bb-0310-9956-ffa450edef68
2009-10-26 18:05:58 +00:00
Jacques Le Roux 061b06acf1 Please gents, no words sentences, thanks
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@829875 13f79535-47bb-0310-9956-ffa450edef68
2009-10-26 17:41:41 +00:00