Commit Graph
12781 Commits
Author SHA1 Message Date
Adam Heath be7b27b4cf Fix StackOverflowError in EntitySelectPlan.toString.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883136 13f79535-47bb-0310-9956-ffa450edef68
2009-11-22 20:05:01 +00:00
Jacopo Cappellato c3ee42f73a New improved version of an enhancement to the service framework after I reverted my first one because it was causing some issues with service validations.
Added two new IN parameter, internally (and automatically) set for service definitions:
login.username
login.password
They are already used by the authorization service ("userLogin") to authorize the user to the service call and to retrieve the userLogin object (if the user is authorized).
They can be passed to the service in the input context in place of the userLogin object: this is useful when the service is invoked from a remote system (thru SOAP etc...).



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883056 13f79535-47bb-0310-9956-ffa450edef68
2009-11-22 10:23:09 +00:00
Hans Bakker f8e9df50f0 A first proposal open for comments of the order OLAP entities. secas and initial load are on the way and implemeted following the same pattern as Jacopo's accounting entities
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883034 13f79535-47bb-0310-9956-ffa450edef68
2009-11-22 04:37:27 +00:00
Bruno Busco 360898c331 Removed specific menu style that is no longer needed
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883021 13f79535-47bb-0310-9956-ffa450edef68
2009-11-22 00:41:00 +00:00
Bruno Busco e4c40b9a3c Moved several TabBar Menus from the "body" decorator-section to the "pre-body" decorator section.
Having the TabBar menu in the "pre-body" seems to be the right pattern (already present in several screens) that should always be followed.
This change allows a much better rendering of the Dropping Crumbs while having a very little TabBar menu shift in other themes.
All other screens will be changed accordingly.
This commit also fixes OFBIZ-3240

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883020 13f79535-47bb-0310-9956-ffa450edef68
2009-11-22 00:39:41 +00:00
Jacques Le Roux d251bbf486 Not really forgotten in previsou commit (r883017) but was on ignore-on-commit Toirtoise changelist and anything in this list is not committed even if checked (lesson learned)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883019 13f79535-47bb-0310-9956-ffa450edef68
2009-11-22 00:24:59 +00:00
Jacques Le Roux fcb48aa971 A modified patch from Marco Risailit " Add the possibility to filter the list of available countries from the drop down." (https://issues.apache.org/jira/browse/OFBIZ-3192) - OFBIZ-3192
I have used StringUtil.split() and enhanced for loops instead

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883017 13f79535-47bb-0310-9956-ffa450edef68
2009-11-22 00:20:12 +00:00
Scott Gray 24b64728fe Throw a ContainerException if any tests are unsuccessful during a test run and have the run-tests target fail if that is the case
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@882995 13f79535-47bb-0310-9956-ffa450edef68
2009-11-21 21:20:50 +00:00
Bilgin Ismet Ibryam 338f778a57 Fixed form header links.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@882959 13f79535-47bb-0310-9956-ffa450edef68
2009-11-21 18:29:45 +00:00
Bilgin Ismet Ibryam 9053ef47d1 Used raw string literal to escape ${} chars in example labels. This fixes the error reported in user list.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@882948 13f79535-47bb-0310-9956-ffa450edef68
2009-11-21 18:01:50 +00:00
Bruno Busco 6a4aafa0ad Added license header
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@882935 13f79535-47bb-0310-9956-ffa450edef68
2009-11-21 15:57:34 +00:00
Jacques Le Roux ff15fe93e5 A patch from Carsten Schinzer "Seed data (GEO) for Gemany contains bugs." (https://issues.apache.org/jira/browse/OFBIZ-2759) - OFBIZ-2759
Commited in CTR mode...

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@882918 13f79535-47bb-0310-9956-ffa450edef68
2009-11-21 14:45:40 +00:00
Jacques Le Roux a5eae6afcc Add an EncryptedString format possibilities in datafile (use in Record.java, needed some changes to build in framework/build.xml and datafile/build.xml)
+ datafile/dtd/datafiles.xsd enhanced with some documentations, and an enumeration for the type: I used all occurrences found in Record.setString() method)
+ datafile/dtd/datafiles-catalog.xml added
+ Few generics cleaning in login/LoginServices.java

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@882892 13f79535-47bb-0310-9956-ffa450edef68
2009-11-21 13:10:07 +00:00
Jacques Le Roux 70f488eca6 A patch from Pierre Smits "Improvement of Dutch language file for projectmgr." (https://issues.apache.org/jira/browse/OFBIZ-3212) - OFBIZ-3212
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@882883 13f79535-47bb-0310-9956-ffa450edef68
2009-11-21 11:22:47 +00:00
Jacopo Cappellato c55722b2e3 Reverted change I did in 882187 because Bilgin Ibryam has reported an issue with it (it is causing an error in services which require auth).
I will investigate more and provide a better fix.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@882836 13f79535-47bb-0310-9956-ffa450edef68
2009-11-21 07:28:20 +00:00
Bilgin Ismet Ibryam 8527fba151 Added missing lookup requests
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@882796 13f79535-47bb-0310-9956-ffa450edef68
2009-11-21 00:01:44 +00:00
Bilgin Ismet Ibryam 6e05f75909 Made forms inside list forms with unique IDs
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@882794 13f79535-47bb-0310-9956-ffa450edef68
2009-11-20 23:52:31 +00:00
Bruno Busco aee9b7b437 Moved some application labels out of the framework
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@882731 13f79535-47bb-0310-9956-ffa450edef68
2009-11-20 21:50:31 +00:00
Bruno Busco 8d979f0566 Better rendering of Tab Bars in Dropping Crumbs theme and better theme description
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@882726 13f79535-47bb-0310-9956-ffa450edef68
2009-11-20 21:45:11 +00:00
Bruno Busco 7a275e9488 Fixed TabBars layout problems for Dropping Crumbs theme.
The offending TabBars include-menu tags have been wrapped with a <container style="no-clear">.
I preferred this method instead of what suggested by Adrian in rev.881027 (that consists in changing the menu style) because in principle the menu could be used in other screens where there is no need of this (no multi-column) and also because in this way there is no needs to change the menu every time we change the screen layout.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@882725 13f79535-47bb-0310-9956-ffa450edef68
2009-11-20 21:43:15 +00:00
Ashish Vijaywargiya 3b245ade90 In case of variant product it returns NPE while calculating purchase price and base price is not been set or we can say data is not prepared for it.
Thanks Amit for your help.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@882644 13f79535-47bb-0310-9956-ffa450edef68
2009-11-20 17:16:20 +00:00
Ashish Vijaywargiya 9ae56f1ef1 Minor correction for service name - Thanks Amit for reporting the issue.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@882641 13f79535-47bb-0310-9956-ffa450edef68
2009-11-20 17:01:37 +00:00
Jacques Le Roux d41f62b0a0 A patch from Carsten Schinzer " Extend ContentOperationData for LEGAL_INFO." (https://issues.apache.org/jira/browse/OFBIZ-3234) - OFBIZ-3234
The ContentOperationsData.xml file lists ContentPurposeTypes.
I found that among the typical company / ecommerce content, there is also legal information such as: Terms and Conditions, Imprint / Legal Notices, Data Protection Policies, other policies.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@882631 13f79535-47bb-0310-9956-ffa450edef68
2009-11-20 16:25:07 +00:00
Ashish Vijaywargiya 70548f0b98 Applied patch from jira issue OFBIZ-3077 - Error for productStoreId when click on productId link from showcart of purchase order.
Steps regenerate error:
1) Hit url: https://localhost:8443/ordermgr/control/orderentry
2) Select purchase order with supplier
3) Add product for order
4) Click on the productId from showcart page

it will generate error as following
org.ofbiz.widget.screen.ScreenRenderException: Error rendering screen component://order/widget/ordermgr/OrderEntryCatalogScreens.xml#productdetail: java.lang.NullPointerException: Cannot get property 'productStoreId' on null object (Cannot get property 'productStoreId' on null object)

Notes from Mridul:
As Joe has already stated that we need to do few adjustments in the code based on presence of productStoreId. I would vote for:

   1. Showing all reviews.
   2. Skipping surveys.

The third section, which is the most important one and needs productStoreId is getProductVariantTree service invoked in ProductDetail.groovy (line 232). getProductVariantTree service needs productStoreId to get available inventory. In case of PO's we don't need to check for available inventory at all. Now for being able to use the same code to display product detail page in case of a PO, we will need to make modifications to getProductVariantTree service too, which can be done in two ways:

   1. Add a boolean IN attribute checkInventory to service definition, if its true check the available inventory and if false do not.
   2. A check on productStoreId in the implementation can serve our purpose too.

I like #1 more as it won't eliminate importance of productStoreId in case of a sales order. Looking forward to suggestions from community to handle this situation.

Thanks Amit for the contribution. Mridul Thanks a lot for providing useful notes for the implementation.
Guys, I appreciate your coordination on this!

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@882618 13f79535-47bb-0310-9956-ffa450edef68
2009-11-20 15:54:39 +00:00
Jacopo Cappellato 6a845bf5a4 Added empty menu widget macro renderers for csv, xml, xsl-fo, text: they are require to properly render screens containing menu.
However they are empty and so the menu will not be rendered with this output (which should be fine).
OFBIZ-3207


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@882601 13f79535-47bb-0310-9956-ffa450edef68
2009-11-20 15:26:45 +00:00
Vikas Mayur 2f1dd4a7db Added user friendly error messages following scenarios:
Case 1
(a) Go to Facility -> Shipment, click on New Shipment link.
(b) Select "Status Id = Input", "Origin Facility = Web Store Warehouse" & "Shipment type Id = Sales Shipment" then depress Update button.
(c) Now depress Items tab, enter product Id & quantity then depress create button.
(d) Select "New" for Add to Package dropdown and depress Add button.
(e) Now depress Delete button for Item then it will show error message that can be understood by a warehouse manager.

Case 2

(a) Follow #a to #d process in Case 1
(b) Depress Packages tab.
(c) Depress Delete button for Package then it will show error message that can be understood by a warehouse manager.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@882555 13f79535-47bb-0310-9956-ffa450edef68
2009-11-20 13:58:42 +00:00
Jacques Le Roux 8a6de29205 Format few lines
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@882536 13f79535-47bb-0310-9956-ffa450edef68
2009-11-20 12:29:13 +00:00
Ashish Vijaywargiya 0ff0adf348 Applied patch from Mukesh Marathe to remove the error message from costcenter page after short duration.
Steps to reproduce:
Go to - https://localhost:8443/accounting/control/CostCenters

-- Enter the values for cost center 1, 2 and 3 so that the total is not equals to 100.
-- The error appears on click submit, now correct the values in respective fields so total is equals to 100.
-- On click on submit the values save in the DB, but error still shows on the page - remove error message after short duration.

Thanks Mukesh for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@882535 13f79535-47bb-0310-9956-ffa450edef68
2009-11-20 12:28:10 +00:00
Jacques Le Roux 1f23dcaae0 A patch from Erwan de FERRIERES "Add an ant task to download the postgreSQL JDBC driver" (https://issues.apache.org/jira/browse/OFBIZ-3232) - OFBIZ-3232
This add a simple ant to download the postgreSQL JDBC driver, to simplify the installation of a database based on this engine
Currently it works only for the last drivers available : postgresql-8.4-701.jdbc4.jar. But this may be easily adapted.

I have also added an svn ignore for postgresql-8.4-701.jdbc4.jar

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@882502 13f79535-47bb-0310-9956-ffa450edef68
2009-11-20 11:06:44 +00:00
Jacques Le Roux 6e32e64af0 Format few lines (playing with my new tool as explained on dev ML)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@882493 13f79535-47bb-0310-9956-ffa450edef68
2009-11-20 10:49:10 +00:00
Hans Bakker 4f65ccd201 commnication is meant for all communication events not only for the logged on person, now showing properly again
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@882463 13f79535-47bb-0310-9956-ffa450edef68
2009-11-20 09:30:03 +00:00
Ashish Vijaywargiya e474a6eca2 Applied patch from jira issue OFBIZ-3208 - On order view page when clicking on "Create As New Order", the adjustments Shipping and Handling and Sales Tax are duplicated.
Patch will resolve the following Issues

1) Shipping and Handling Charges are added twice in new order amount.
2) Sales Tax are added twice in new order amount.
3) Add extra tax on shipping and handling charges for new order.
4) When click on "Create as New Order" Link, it is Giving NPE on some Promotion (Happy Hour
Promotion 9020).
5) Click on "Edit Items" Link and then "Update" Link it is it is Giving NPE on some Promotion (Happy
Hour Promotion 9020).

Thanks Arpit for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@882454 13f79535-47bb-0310-9956-ffa450edef68
2009-11-20 08:59:05 +00:00
Jacques Le Roux 96ca14f622 A patch from Sharan Foga "Special feature to allow submitting patches for online help update" (https://issues.apache.org/jira/browse/OFBIZ-2219) - OFBIZ-2219
Frmatting and tidy up using the itemized and orderedlist docbook commands for Tax Authorities. I've also included some documentation on the Bank Reconciliation process.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@882452 13f79535-47bb-0310-9956-ffa450edef68
2009-11-20 08:52:53 +00:00
Hans Bakker c5732ca682 header-link-style and header-link not working and only used in 2 forms in the system, removed. Assumed sortfield took over this fucntionality?
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@882423 13f79535-47bb-0310-9956-ffa450edef68
2009-11-20 06:02:12 +00:00
Jacques Le Roux 5f3dd64e70 Revert r882217 and by consequence r882217 from Adam's advice on dev ML
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@882342 13f79535-47bb-0310-9956-ffa450edef68
2009-11-19 22:45:56 +00:00
Jacques Le Roux 4094fe09ad Fix a possible conflict (MODE is a SQL reserved word). Thanks to Adrian on dev ML
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@882337 13f79535-47bb-0310-9956-ffa450edef68
2009-11-19 22:28:56 +00:00
Jacques Le Roux eb2fdcdac9 Fix https://issues.apache.org/jira/browse/OFBIZ-3229 in a slightly different way
a) FixedAssetGeoLocation had its error response going to the wrong view "EditFacility" (which did not exist in this controller).
b) taxAuthorityVATReport was pointing to a view-map entry that was commented out; these are not used yet: WIP...

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@882326 13f79535-47bb-0310-9956-ffa450edef68
2009-11-19 22:10:06 +00:00
Adrian Crum f342a9804b Small fixup for last commit - intern() the field type name.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@882243 13f79535-47bb-0310-9956-ffa450edef68
2009-11-19 18:48:30 +00:00
Adrian Crum fdf56b40b0 Major code cleanup in ModelFieldTypeReader.java. Eliminated unused fields, made public fields protected, simplified code.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@882236 13f79535-47bb-0310-9956-ffa450edef68
2009-11-19 18:16:35 +00:00
Jacques Le Roux d28f95ad2b Complete 882210, contains InvoiceWorker.java (got a conflict) and some other changes, mostly enhanced for loops instead of iterators with while loops
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@882217 13f79535-47bb-0310-9956-ffa450edef68
2009-11-19 17:44:00 +00:00
Jacques Le Roux bff67dc987 A patch from Marc Morin "Resolve java warnings exposed in Eclipse : application - accounting" (https://issues.apache.org/jira/browse/OFBIZ-3157) - OFBIZ-3157¨
Patch for generic's warnings for accounting application 

I will soon commit InvoiceWorker.java (got a conflict) and some other changes I want to do, mostly enhanced for loops


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@882210 13f79535-47bb-0310-9956-ffa450edef68
2009-11-19 17:26:03 +00:00
Jacopo Cappellato 23a095ab67 Added two new IN parameter, internally (and automatically) set for service definitions:
login.username
login.password
They are already used by the authorization service ("userLogin") to authorize the user to the service call and to retrieve the userLogin object (if the user is authorized).
They can be passed to the service in the input context in place of the userLogin object: this is useful when the service is invoked from a remote system (thru SOAP etc...).

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@882187 13f79535-47bb-0310-9956-ffa450edef68
2009-11-19 16:06:43 +00:00
Ashish Vijaywargiya b261859529 Applied patch from jira issue OFBIZ-3226 - "Quick lookup" screen for purchase order is broken when adding item from order detail page in edit mode.
Steps to produce the bug:

1) Place a purchase order
2) Once your order is placed then click on "Edit items" button of "Actions block"
3) After this down at the bottom click on "Quick lookup" button
4) You will land on screen which is broken 

Thanks Divesh for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@882132 13f79535-47bb-0310-9956-ffa450edef68
2009-11-19 12:49:07 +00:00
Ashish Vijaywargiya c4706b7adc Applied patch from jira issue OFBIZ-3225 - cancelAllBackOrders scheduled service should not attempt to cancel "Completed" Orders.
-- cancelAllBackOrders scheduled service should not attempt to cancel "Completed" Orders. When this service runs for Completed Purchase Orders, it throws error as Completed cannot be cancelled.

Thanks Divesh for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@882131 13f79535-47bb-0310-9956-ffa450edef68
2009-11-19 12:46:54 +00:00
Ashish Vijaywargiya d1c4fc90ae Conditional check for billingAccount amount. If no account limit is set with party's billing account then 0.00 will be shown on checkout page. Thanks Akash for the patch.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@882127 13f79535-47bb-0310-9956-ffa450edef68
2009-11-19 12:30:58 +00:00
Jacques Le Roux 65601eeccd A patch from Abdullah Shaikh "SagePay payment gateway integrated" (https://issues.apache.org/jira/browse/OFBIZ-3180) - OFBIZ-3180
SagePay payment gateway integrated. All the gateway parameters are configurable using the Payment gateway configuration, also the transaction types that are available in sagepay are configurable.

I moved the httpclient httpcore jars to base/lib (also new jcip-annotations-1.0.jar)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@882103 13f79535-47bb-0310-9956-ffa450edef68
2009-11-19 11:01:29 +00:00
Christian Geisert 63207fa6c9 German translation of ProjectMgrUiLabels, see OFBIZ-3223
Submitted by Sascha Rodekamp


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@882093 13f79535-47bb-0310-9956-ffa450edef68
2009-11-19 10:08:52 +00:00
Jacques Le Roux c28207e323 A patch from Philippe Mouawad "OutOfMemory provoked by Cache overflow" (https://issues.apache.org/jira/browse/OFBIZ-2186) - OFBIZ-2186
CacheLineTable and LRUMap do not synchronize on the same lock

    * CacheLineTable synchronization use the CacheLineTable instance monitor
    * LRUMap synchronization use the LRUMap instance monitor

the LRUMap (memoryTable) can be updated concurrently by 2 differents threads

    * one in the CacheLineTable #put or CacheLineTable#remove
    * another in the CacheLineTable#get

this leads to the corruption of the LRUMap which is not thread-safe

the CacheLineTable#get should be synchronized or the LRUMap should be replaced by a thead safe collection

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@882072 13f79535-47bb-0310-9956-ffa450edef68
2009-11-19 08:25:48 +00:00
Ashish Vijaywargiya 6cd34053b4 Applied patch from jira issue OFBIZ-3218 - By entering OrderId in Pack Order Screen from Facility manager, and clicking on "Weigh Package only" is not rendering text boxes to enter weights and dimension of packages.
Steps to produce the bug:

1) Place a sales Order,
2) Go through Verify Pick process
3) Go to Packing Screen
4) Enter OrderId and then click on "Weigh Package Only button ."
5) Text boxes to enter weights and dimension of packages should render.

Thanks Divesh for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@882068 13f79535-47bb-0310-9956-ffa450edef68
2009-11-19 08:09:59 +00:00
Jacques Le Roux b53c6ab6d0 Some itemizedlists and orderedlists in Accounting Help
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@882067 13f79535-47bb-0310-9956-ffa450edef68
2009-11-19 08:03:56 +00:00