Commit Graph
12781 Commits
Author SHA1 Message Date
Anil Patel 61b6711a00 Renamed CommonAdminDecorator to CommonGlSetupDecorator, new name is close to the purpose. Added commonGlSetupDecoratorLocation context parameter. Allows easy way to override decorator in derived applications.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833638 13f79535-47bb-0310-9956-ffa450edef68
2009-11-07 07:11:31 +00:00
Anil Patel 74d9d9bf56 Adding mass payment status change to find screen. Also added few more details in payments list.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833636 13f79535-47bb-0310-9956-ffa450edef68
2009-11-07 06:27:52 +00:00
Anil Patel aba9346bd2 [OFBIZ-3172] Patch to fix description in PaymentMethod field. Thanks Sumit for help.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833632 13f79535-47bb-0310-9956-ffa450edef68
2009-11-07 05:31:05 +00:00
Anil Patel e059f19611 [OFBIZ-3171] Patch. Minor looks enhancements to deposit slip screen. Removed Add payment group member screen for deposit slip because right way to do so is from Diposit screen in FinancialAccount.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833631 13f79535-47bb-0310-9956-ffa450edef68
2009-11-07 05:27:31 +00:00
Anil Patel 435045b761 Adding parentPaymentTypeId from PaymentType entity.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833630 13f79535-47bb-0310-9956-ffa450edef68
2009-11-07 05:05:05 +00:00
Jacques Le Roux e4df776a22 A patch from Bruno Busco "Adding pagination icons to Bluelight theme" (https://issues.apache.org/jira/browse/OFBIZ-3168) - OFBIZ-3168
A change that allows a theme to replace the "Prev" "Next" labels with icons. Now only on Blue Light theme/


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833378 13f79535-47bb-0310-9956-ffa450edef68
2009-11-06 12:43:22 +00:00
Jacopo Cappellato 6b75731168 Cleaned up the production run PDF report: small label fixes and now it decorates the simple report template.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833355 13f79535-47bb-0310-9956-ffa450edef68
2009-11-06 11:43:26 +00:00
Hans Bakker 407b0f8f0e as result of investigation of previous commit made the selection of tax and non-tax records consistent, better formatting and replaced get( with getString( on genericValues. No functional changes
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833326 13f79535-47bb-0310-9956-ffa450edef68
2009-11-06 09:19:02 +00:00
Hans Bakker 3464adb949 to be applied value on payment application was without tax: OFBIZ-3057
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833324 13f79535-47bb-0310-9956-ffa450edef68
2009-11-06 09:03:59 +00:00
Ashish Vijaywargiya c0d45d8521 Applied 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.
1) Add additional screen for gift card certificate buying functionality by CSR in Order manager application in add item page

2) Also add feature to fill survey on same page.

3) Also if CSR selects "Create as new order" from Actions block for Gift card products then survey responses will be created automatically for the new order, which will be same as last order. 

Thanks Arun / Divesh for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833323 13f79535-47bb-0310-9956-ffa450edef68
2009-11-06 09:00:16 +00:00
Hans Bakker 937aaf0e4f fix for revision 832581 as reported in the mailing list and waiting for adirans attention
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833307 13f79535-47bb-0310-9956-ffa450edef68
2009-11-06 07:54:57 +00:00
Scott Gray f4c8abb56c Reverted changes to the trunk from r833294 that appear to have been intended for the birt branch
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833303 13f79535-47bb-0310-9956-ffa450edef68
2009-11-06 05:22:58 +00:00
Hans Bakker 99f2b600db 1. fix framework for using jsp tag in freemarker.
2. change order building birt component to after common component in framework/build.xml file
3. specific birt container before beanshell container in framework/base/config/ofbiz-containers.xml file
4. specific loading birt component after bi component in framework/component-load.xml
5. list all birt's jar files that have Eclipse Public License - v 1.0 in LICENSE file
6. change example report's path in mail form's tooltip.
7. delete four duplicated jar files.
  - framework/birt/lib/axis.jar
  - framework/birt/lib/commons-discovery-0.2.jar
  - framework/birt/lib/axis-ant.jar
  - framework/birt/lib/commons-cli-1.0.jar

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833294 13f79535-47bb-0310-9956-ffa450edef68
2009-11-06 03:55:56 +00:00
Jacques Le Roux 5ccbd28e3b Revert r833113 & r833116 and remove title="Geo Point" as initially suggested by Erwan at https://issues.apache.org/jira/browse/OFBIZ-3153
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833264 13f79535-47bb-0310-9956-ffa450edef68
2009-11-06 00:44:33 +00:00
Anil Patel 9b82b0d624 Show more information like, parties, dates, description on all listed invoices.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833226 13f79535-47bb-0310-9956-ffa450edef68
2009-11-05 22:55:12 +00:00
Bruno Busco 1b5c158c64 Added icons to be used in the pagination bar
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833221 13f79535-47bb-0310-9956-ffa450edef68
2009-11-05 22:35:55 +00:00
Jacques Le Roux 70a8c703ac Change the type of relation for Facilty to GeoPoint from one to many. Because of the elevation field in GeoPoint.
From Adrian's remarks at https://issues.apache.org/jira/browse/OFBIZ-3153 - OFBIZ-3153

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833136 13f79535-47bb-0310-9956-ffa450edef68
2009-11-05 19:22:16 +00:00
Jacques Le Roux 72331c96ad Change "Geo Point" title to "Point"
Change the type of relation for Postal Address to GeoPoint from one to many. Because of the elevation field in GeoPoint. A bit scifi for now, but maybe useful one day...)
Thanks to a discussion with Erwan "Relation title not needed on Facility entity" at https://issues.apache.org/jira/browse/OFBIZ-3153 - OFBIZ-3153

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833113 13f79535-47bb-0310-9956-ffa450edef68
2009-11-05 18:26:27 +00:00
Jacques Le Roux bf71e5ec52 A slightly modified patch from Patrick Antivackis "A way to generate no cache header for the views" (https://issues.apache.org/jira/browse/OFBIZ-3091) - OFBIZ-3091
Patrick : The goal of this improvement is to allow at the view level, through setup in the controller.xml file, to generate no-cache http headers. Example is included for the showcart view of the ecommerce application.
JLR : I have commented out Patrick's example in controller and put a comment about its usage

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833096 13f79535-47bb-0310-9956-ffa450edef68
2009-11-05 17:38:42 +00:00
Jacopo Cappellato 0a94eb4edc Added missing macro renderer parameters. Thanks to Mridul Pathak for the (slightly modified) patch. OFBIZ-3147
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833094 13f79535-47bb-0310-9956-ffa450edef68
2009-11-05 17:32:49 +00:00
Jacques Le Roux 61abace124 A patch from Marc Morin "Resolve java warnings exposed in Eclipse : framework - security" (https://issues.apache.org/jira/browse/OFBIZ-3116) - OFBIZ-3116
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833093 13f79535-47bb-0310-9956-ffa450edef68
2009-11-05 17:31:17 +00:00
Jacques Le Roux c6f42723e5 A patch from Marc Morin "Resolve java warnings exposed in Eclipse : framework - minilang" (https://issues.apache.org/jira/browse/OFBIZ-3115) - OFBIZ-3115
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833092 13f79535-47bb-0310-9956-ffa450edef68
2009-11-05 17:30:46 +00:00
Jacques Le Roux d5b1af9fc3 A patch from Marc Morin "Resolve java warnings exposed in Eclipse : framework - example" (https://issues.apache.org/jira/browse/OFBIZ-3109) - OFBIZ-3109
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833091 13f79535-47bb-0310-9956-ffa450edef68
2009-11-05 17:29:56 +00:00
Jacques Le Roux b767a4bf3f A patch from Marc Morin "Resolve java warnings exposed in Eclipse : framework - geronimo" (https://issues.apache.org/jira/browse/OFBIZ-3111) - OFBIZ-3111
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833089 13f79535-47bb-0310-9956-ffa450edef68
2009-11-05 17:28:59 +00:00
Jacopo Cappellato 6afe2f634d Removed xml encoder for xsl-fo that was causing the wrong rendering of special characters (like Chinese fonts).
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833080 13f79535-47bb-0310-9956-ffa450edef68
2009-11-05 16:54:52 +00:00
Jacopo Cappellato 051ac16a59 Fixed widget rendering code that was just working if the hyperlink fields were rendered in html.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833078 13f79535-47bb-0310-9956-ffa450edef68
2009-11-05 16:49:56 +00:00
Jacopo Cappellato b46bc41636 Added missing input parameters for widget renderer macros.
Fixed the xsl-fo code to display the text of an hyperlink field.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833077 13f79535-47bb-0310-9956-ffa450edef68
2009-11-05 16:44:46 +00:00
Jacopo Cappellato c8546fe174 Removed some unused import statements.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833076 13f79535-47bb-0310-9956-ffa450edef68
2009-11-05 16:37:12 +00:00
Bruno Busco 70c05ecd5f A patch from Erwan de FERRIERES "Error in bluelight theme CSS" (https://issues.apache.org/jira/browse/OFBIZ-3166) - OFBIZ-3166
As spotted on the dev mailing list, there is an error with the help icon which is replacing the word "help". The word help is now placed very far on the right end of the screen, with this instruction :
text-indent:2000px;

I've suppressed the line, and changed the link in the hearder.ftl file, to make the word "help" showing as a tooltip when the mouse cursor is placed over the icon.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833060 13f79535-47bb-0310-9956-ffa450edef68
2009-11-05 15:42:22 +00:00
Ashish Vijaywargiya 5892ec89e9 Applied patch from jira issue OFBIZ-3167 - Add Constraint with respect to eBay root category for product search and change demo data according to the concept.
As we have different productCatalogCategoryType for eBay so add a constraint on searching that if catalog not associated with any PCCT_BROWSE_ROOT type category then also search for PCCT_EBAY_ROOT type category for CatalogConstrain. This will help to manage separate catalog and catalog category association for ebay.

Thanks Parimal for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833054 13f79535-47bb-0310-9956-ffa450edef68
2009-11-05 14:55:15 +00:00
Ashish Vijaywargiya fa60ccd7b4 Applied patch from jira issue OFBIZ-3159 - Move geoAutoCompleter.js from ecommerce to ordermgr.
geoAutoCompleter.js currently resides in specialpurpose/ecommerce component. But now it is also used in OrderViewScreen.xml#OrderHeaderView screen. First of all we can't have dependency of ordermgr on ecommerce component. Secondly, if I am developing a custom ecommerce application with mount point /ecommerce, thus overriding specialpurpose/ecommerce webapp, and copying the geoAutoCompleter.js to my custom application (to customize) in a directory structure other than that of specialpurpose/ecommerce, then the JS file is not loaded in OrderHeaderView screen due to change of location. The only reason is the dependency stated above. Hence this change is vital.

While doing this change, all the references to geoAutoCompleter.js will need to be updated too.

Thanks Arpit for the contribution.
Special thanks to Mridul for providing notes for the implementation.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833026 13f79535-47bb-0310-9956-ffa450edef68
2009-11-05 10:08:35 +00:00
Jacques Le Roux 4b127f23a9 A patch from Bob Morley "Resolve java warnings exposed in Eclipse : framework - catalina" (https://issues.apache.org/jira/browse/OFBIZ-3104) - OFBIZ-3104
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833025 13f79535-47bb-0310-9956-ffa450edef68
2009-11-05 09:29:51 +00:00
Jacques Le Roux fdd931774d Close https://issues.apache.org/jira/browse/OFBIZ-3112 - OFBIZ-3112 : Resolve java warnings exposed in Eclipse - framework - guiapp
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833024 13f79535-47bb-0310-9956-ffa450edef68
2009-11-05 09:21:00 +00:00
Bilgin Ismet Ibryam 8d98177970 Added missing permission check to an ajax screen.
Removed a wrong parameter name.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@832919 13f79535-47bb-0310-9956-ffa450edef68
2009-11-04 23:54:36 +00:00
Jacques Le Roux 63b509222b A patch from Marc Morin "Resolve java warnings exposed in Eclipse : framework - testtools" (https://issues.apache.org/jira/browse/OFBIZ-3119) - OFBIZ-3119
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@832912 13f79535-47bb-0310-9956-ffa450edef68
2009-11-04 23:44:18 +00:00
Jacques Le Roux 2d14996c3a A patch from Bob Morley " Resolve widget action entity caching with filter-by-date" (https://issues.apache.org/jira/browse/OFBIZ-3090) - OFBIZ-3090
When you attempt to get a cached result in an action block with "filter-by-date" turned on, caching never occurs because the date/time changes with each request. Recommended solution is when use-cache and filter-by-date are both true, we will create a condition w/o the date restriction, execute the (cachable) query, and then use the EntityUtil to filter by date.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@832908 13f79535-47bb-0310-9956-ffa450edef68
2009-11-04 23:35:48 +00:00
Jacques Le Roux 1ebe4305fd Forget to save this change before committing r832887
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@832888 13f79535-47bb-0310-9956-ffa450edef68
2009-11-04 22:34:18 +00:00
Jacques Le Roux d97c5da0e5 A patch from Luís Alfredo Harriss Maranesi "Second Part of Party Brazilian Portuguese Translation " (https://issues.apache.org/jira/browse/OFBIZ-3152) - OFBIZ-3152
Second Part of Party Brazilian Portuguese Translation 


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@832887 13f79535-47bb-0310-9956-ffa450edef68
2009-11-04 22:31:29 +00:00
Bruno Busco 53dbd32914 tabButtonItem variable was not always set in WebTools application resulting in the TabMenu items not highlighting as required.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@832881 13f79535-47bb-0310-9956-ffa450edef68
2009-11-04 21:59:19 +00:00
Jacques Le Roux 33f843c771 A patch from Matarazzo Angelo "Remove an useless EntitySubSelect warning message." (https://issues.apache.org/jira/browse/OFBIZ-3145) - OFBIZ-3145
With the same security kept


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@832880 13f79535-47bb-0310-9956-ffa450edef68
2009-11-04 21:56:34 +00:00
Jacques Le Roux 509922b859 In ConfigureItem.java a work in progress should not have been committed
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@832879 13f79535-47bb-0310-9956-ffa450edef68
2009-11-04 21:50:31 +00:00
Jacques Le Roux ff2ea72c93 Small changes, no real impacts
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@832848 13f79535-47bb-0310-9956-ffa450edef68
2009-11-04 19:25:37 +00:00
Jacques Le Roux fe3544d265 Revert r832775 for now...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@832784 13f79535-47bb-0310-9956-ffa450edef68
2009-11-04 16:06:54 +00:00
Jacques Le Roux 380198a8da A patch from Amit Sharma "Error rendering screen [component://webtools/widget/CommonScreens.xml#CommonImportExportDecorator]" (https://issues.apache.org/jira/browse/OFBIZ-3150) - OFBIZ-3150
Steps for generating error:
1) Hit URL https://localhost:8443/webtools/control/xmldsdump
2) Depress "Check All" button on Export section.
3) Fill following fields.
Output Directory : <Eport path>
Records Updated Before : <Current time> 


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@832776 13f79535-47bb-0310-9956-ffa450edef68
2009-11-04 15:51:31 +00:00
Jacques Le Roux 80d3f88885 A patch from Luís Alfredo Harriss Maranesi "Second Part of Party Brazilian Portuguese Translation " (https://issues.apache.org/jira/browse/OFBIZ-3152) - OFBIZ-3152
Second Part of Party Brazilian Portuguese Translation 


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@832775 13f79535-47bb-0310-9956-ffa450edef68
2009-11-04 15:45:50 +00:00
Jacques Le Roux a273bc1b58 Better French labels
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@832771 13f79535-47bb-0310-9956-ffa450edef68
2009-11-04 15:41:55 +00:00
Ashish Vijaywargiya fc45518ad6 Applied patch from jira issue OFBIZ-3149 - Improve Category association in eBay.
Recently multi store support for Ebay has been implemented. For the multi store support we need ProductStore > ProdCatalog > ProductCategory association. For EBay we define specific categories of type EBAY_CATEGORY, only those products that are associated to an EBay category are eligible for eBay export. In the current implementation there is no proper prodCatalogCategoryTypeId which can be used to associate eBay category to ProdCatalog, one way to associate an eBay category to ProdCatalog is as a PCCT_BROWSE_ROOT category, thus we have two categories associated to the catalog as BROWSE_ROOT, the other one is for online store. Technically, this is wrong, a catalog should be associated with only one browse root category. Due to this wrong association the eBay category doesn't show up on the advance search page of EBAY webapp, instead online store's browse root category is shown which may also contain those products which are not meant to be exported to eBay. So this category associations need to be fixed, and following is how this can be resolved:

   1. Create a new ProdCatalogCatagoryType PCCT_EBAY_ROOT
   2. Define a worker method in CatalogWorker to derive the top level (root) ebay category
   3. Now in the advance search form, first look for top level ebay category associated to the selected catalog
          * If found, derive sub category list of the top level ebay category and display, else display the top level ebay category itself
          * If not found, derive the top level browse root category (PCCT_BROWSE_ROOT) and display the sub category list for it

Thanks Parimal Gain for the contribution.
Special thanks to Mridul Pathak (Zone of Sharp Mind :-)) for discussing implementation plans & providing wonderful notes.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@832713 13f79535-47bb-0310-9956-ffa450edef68
2009-11-04 12:05:09 +00:00
Jacques Le Roux 6f154ecc10 A patch from Matthieu Bollot "Missing party StatusValidChange in SFA lead" (https://issues.apache.org/jira/browse/OFBIZ-3148) - OFBIZ-3148
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@832698 13f79535-47bb-0310-9956-ffa450edef68
2009-11-04 10:25:24 +00:00
Hans Bakker 68e0b97b45 1. ignore parties which have the party's status = disabled, change FindServices.createCondition method
2. add 'email address', 'telephone number', 'city', 'country', 'company' field to list.
3. Accounts and Leads, the opportunity box have a link to the actual opportunity in sfa
4. viewing a communication event in SFA should have a reply/replyall/new email button which links to an new email request in 'mycommunciations' in party
5. remove party's status field from list (always active)
6. Account Lookup screen  replaced ftl by forms.
7. change name of party's statusId field in PartyRelationshipAndContactMechDetail view called 'partyStatusId' because It be orverrided by relationship's statusId.
8. delete unuse ftl file,screens, forms, request and view map.
9. combined partyname and id in one field
10. changed the performfind service with a notequal operation that a null value is also not selected.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@832694 13f79535-47bb-0310-9956-ffa450edef68
2009-11-04 10:10:14 +00:00
Jacques Le Roux 6d0edfd4ea A patch from Erwan de FERRIERES "help link in example is not working" (https://issues.apache.org/jira/browse/OFBIZ-3097) - OFBIZ-3097
Some entries in the controller.xml were missing, since the remove of the commonext include. 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@832688 13f79535-47bb-0310-9956-ffa450edef68
2009-11-04 09:32:09 +00:00