Commit Graph
12781 Commits
Author SHA1 Message Date
Anil Patel 2d9f0497bf Bulk print Invoices.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835709 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 02:16:54 +00:00
Scott Gray 41ba6ef88f Another piece of unused code, was originally used to help calculate prorated adjustments
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835708 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 02:13:03 +00:00
Scott Gray 2e093211cf Removed a block of unused code.
I checked back through the revision history and it was originally used to decide whether shipping adjustments had been already been charged.  That determination was refactored quite a while ago and this portion was left behind.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835707 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 02:10:15 +00:00
Scott Gray 0dd673d528 Forgot to remove a now unused local variable
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835702 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 01:46:30 +00:00
Scott Gray d47ade76ed Cleaned up the invoiceServiceItems service, no functional changes just removed unnecessary code and made more use of utility methods
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835701 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 01:44:30 +00:00
Adrian Crum 7a5509a277 Small improvement to the Converters class. A converter is registered only once.
Now client code can create local instances of specific converters without interfering with the operation of the factory method.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835667 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 00:31:39 +00:00
Adam Heath 5f44e7e3de Example showing how the sql parser works.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835650 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 00:04:44 +00:00
Adam Heath 205d63f9fc <NAME> actually swallows all name parts, don't need to loop in NamePart.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835649 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 00:01:23 +00:00
Adam Heath 43948cfff3 Store the DynamicViewEntity into the SQLSelect node.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835648 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 23:59:11 +00:00
Adam Heath b15bba608f Start of new sql parsing code. Not completely tested. It *does* parse
a test SELECT; what is not tested is actually running the built
DynamicViewEntity.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835637 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 23:23:12 +00:00
Adam Heath afee8ad000 Register the comparison operators with their punctuation variants.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835636 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 23:21:29 +00:00
Adam Heath cdae8bcd76 Add jjtree/javacc macro wrappers.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835632 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 23:16:13 +00:00
Adam Heath 5121722dd0 Add <if> support in build.xml.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835630 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 23:12:07 +00:00
Anil Patel 7af265dd3a Screenlets for Quick view into invoices past due and invoices coming due soon.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835622 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 22:55:35 +00:00
Scott Gray aa499be644 Span elements weren't being created for the ajax in place editor, fixes OFBIZ-2494 reported by Jacques Le Roux
Also removed inPlaceEditorId from the code since it is always equal to idName anyway

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835585 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 22:06:34 +00:00
Marco Risaliti 7b55229221 An error message that now can be translated
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835571 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 21:39:10 +00:00
Scott Gray c3d2b880de Delay the completion of the testServiceEcaGlobalEventExec test to allow the global ecas to complete before the next test is run, fixes OFBIZ-3124 reported by Jeremy Wickersheimer
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835548 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 21:13:49 +00:00
Scott Gray c0cfbd2469 Allow the duration of the blocking service test to be specified by the caller
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835546 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 21:11:04 +00:00
Scott Gray f69cbf5456 Don't attempt to cast Service Eca Set Field values to string after formatting, fixes ClassCastException caused by when using certain formats
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835541 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 20:57:36 +00:00
Jacques Le Roux b52e278fe2 Begin to play with Eclipse/Oxygen docbook editor : some listitems replacing para with *
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835490 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 18:36:06 +00:00
Adam Heath 64b4ccc5f7 Oops, didn't do a clean/ant run, and broke this when
AbstractCollectionConverter was removed.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835476 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 17:56:39 +00:00
Adam Heath eb02b4e77d Simplied the object graph, removed AbstractCollectionConverter. All
collection conversions now have proper generification.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835453 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 17:15:01 +00:00
Adam Heath edf7210d88 Remove extraneous blank lines, and trailing whitespace.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835451 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 17:12:02 +00:00
Adrian Crum be36dd70be Changed the String to Timestamp converter code to fix a problem reported by Hans.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835440 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 16:52:23 +00:00
Bilgin Ismet Ibryam 2315fd734c Fixed the location of createCommEventWorkEffort sevices.
Added a link text.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835425 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 16:17:28 +00:00
Jacques Le Roux 1f91884e1e Avoid a bug in a peculiar case :
Create an order from order manager with a GZ-BASKET only
Print the PDF picksheet from the order, use Ctrl+clic (in FF) to return to the order on a new tab : bingo

With this change you don't get an error but an error message, far better for users

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835421 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 15:53:49 +00:00
Jacques Le Roux 7786dd9bfb commons-dbcp-1.3-20091111-r834702.jar built directly from DBCP trunk. An initiative from Philippe Mouawad at "Memory leak due to transaction management" (https://issues.apache.org/jira/browse/OFBIZ-2599) - OFBIZ-2599
We are been using Ofbiz with DBCP based implementation.
Ofbiz uses a Head revision of DBCP (package org.apache.commons.dbcp.managed is the same as current TRUNK) and geronimo-transaction-1.0.

We are having recurrent OutOfMemory which occur on a 2 days basis.

See: https://issues.apache.org/jira/browse/DBCP-294

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835394 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 14:39:43 +00:00
Ashish Vijaywargiya 1fff46444e Applied patch from jira issue - OFBIZ-2999 - Fix layout of profile pages.
Layout of profile pages (new pages) is not displayed properly.

Thanks Deepak for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835375 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 13:13:34 +00:00
Ashish Vijaywargiya 8f887ad408 Applied patch from jira issue OFBIZ-3186 - Layered Navigation of Categories.
Layered navigation in an Ecommerce application allows the user to filter the product listing based on categories, features and price ranges. The user can apply multiple filters to the given product listing. He can narrow or expand his search and try different filter combinations so as to find the desired product.

I have implemented Layered Navigation in OFBiz ecommerce with following filters:

   1. Sub Categories: This filter is shown whenever there are sub-categories present under the top-level category or current selected category. Count of products within the category is shown against each category, works with multilevel deep category hierarchy. Selecting a sub category will show products within that category and filters will be updated accordingly for the new product list.
   2. Features: Feature filters are grouped by Feature Types. Count of products that has the feature associated as standard, selectable or distinguishing is shown against that feature. Current Implementation has feature filters for ProductFeatureType="COLOR".
   3. List Price Range: This filter will always show. When applied filters product based on List Price Range. Current implementation is done by listing static price ranges at code level.

The above implementation is completely based on the OOTB Product Search functionality with few additional methods in ProductSearchSession to derive count against different type of filters.

This is collaborative contribution from Mridul Pathak, Jacopo Cappellato & Scott Gray.
Thanks Guys for such a nice contribution - I am sure community will love seeing the existence of "Layered Navigation" in OFBiz trunk.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835372 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 12:54:22 +00:00
Ashish Vijaywargiya 965f37cbc3 Added new uiLabel for outstanding running total - patch from Awdesh.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835362 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 12:18:25 +00:00
Ashish Vijaywargiya 0685b12452 Applied patch from Parimal Gain - Getting error in create PartyAccounting Preference record.
To reproduce the issue perform following steps -

    * Select Organizations at https://localhost:8443/accounting/control/PartyAcctgPreference (say Testing Team 1)
    * After selection at next page fill form by required fields.
    * Submit form by click on "Add" button.
    * You will get error message here.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835359 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 12:07:25 +00:00
Jacques Le Roux 9ee3bca642 A patch from Deepak Dixit "popup.js is missing on product page for order entry." (https://issues.apache.org/jira/browse/OFBIZ-3188) - OFBIZ-3188
Steps to check:
1) Start placing a sales order from order manager application.
2) Then add WG-9943 in to the cart.User will land on page where he need to select feature of the product as "WG-9943".
3) In this page in cross sell and up sell section product images are displayed twice.

With the patch Popup is display correctly in blue light and flat grey theme but in bizznesstime theme popup is still not displayed properly. (I have opened https://issues.apache.org/jira/browse/OFBIZ-3189 for this)


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835357 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 12:01:09 +00:00
Scott Gray 8d27aa9be2 Replace some divs with labels for radio option descriptions
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835330 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 10:50:47 +00:00
Scott Gray af95db299b Replace spans with labels for radio input descriptions, finally got tired of playing bullseye with the radio buttons
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835327 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 10:44:37 +00:00
Scott Gray 8ec19d56d8 Fixed incorrect package name, reported by Jeremy Wickersheimer in OFBIZ-3163
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835314 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 09:46:34 +00:00
Scott Gray dec48968aa Removed a stack of unnecessary currency formatting
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835313 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 09:25:52 +00:00
Hans Bakker 5b4ecb8b95 created SFA security data
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835311 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 09:21:02 +00:00
Scott Gray 6fa4e52764 Passed in locale was being discarded, fixes OFBIZ-3177 reported by Willem Janssen
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835309 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 09:15:42 +00:00
Ashish Vijaywargiya 9c5caa3f17 Applied patch from jira issue OFBIZ-3184 - Improvement in Ebay Configuration.
Implemented following points:
1) Created decorator for Ebay Configuration screens
2) Modified list and add Ebay configuration Form
3) Created Find Form
4) Crated menu and sub menu
5) Created Edit Ebay Configuration Screen
6) Modified Ebay Configuration screen with name FindEbayConfiguration

Thanks Parimal for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835306 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 09:00:36 +00:00
Jacques Le Roux 0bd14b407c A patch from Bob Morley "When an entityModel has a field marked as a primary key, it should also be set to NotNull" (https://issues.apache.org/jira/browse/OFBIZ-3154) - OFBIZ-3154
We were doing some work with the ModelField and noticed that when a field is marked as a primary key it can still have its "NotNull" property set to "false" (the default). Because we were doing work based on if a field was nullable it was causing a bug on primary keys. The suggestion is to set NotNull = "true" when a field is marked as a primary key. This should have no impact to current code as (in most places) a redundant check was being done (see creation of tables where it will add "NOT NULL" based on both isNotNull and isPk – ideally it should be just based on the former).

This change makes minor modifications to two files ModelField and ModelEntity. ModelField.setIsPk() will call setIsNotNull(true) when the primary key indicator is true. ModelEntity will call field.isNotNull = true when it is reading the primary key elements in the entity definition.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835303 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 08:49:27 +00:00
Hans Bakker 2c170b0a1c missing ebay features help file in last commit
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835294 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 08:15:10 +00:00
Hans Bakker 0b7e0756e2 created place holder for the Ebay help files
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835289 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 07:55:37 +00:00
Hans Bakker a3d1059bbf temporary security data for sfa to make the data files load the first time
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835288 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 07:54:17 +00:00
Anil Patel 606d9facb9 Adding Find Bank Reconciliations screen.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835287 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 07:53:09 +00:00
Hans Bakker 398139f70d add a portal page as the first page in sfa containing calendar and email, but can be changed as required via preferences. add the first screens for events which will appear on the calendar. next step will be to be able to connect events/tasks to opportunities, show them in the party pprofile etc...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835270 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 07:04:41 +00:00
Anil Patel 4ca995c443 Removed sent status for ar payment.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835216 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 03:58:29 +00:00
Hans Bakker da9bc51bf9 allow 'safe' html in invoice description and message
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835204 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 02:57:05 +00:00
Anil Patel 8a99498832 Adding finAccountName and ownerParty to finAcount form.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835202 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 02:38:38 +00:00
Adrian Crum 19f8bf0228 More converter improvements. Better handling of strings supplied to formatting classes.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835197 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 02:31:59 +00:00
Adam Heath 172a135a56 Move getSourceClass and getTargetClass into the base class; removes a
bunch of code.  This also nescessitated the creation of a helper class
for collection containment.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835164 13f79535-47bb-0310-9956-ffa450edef68
2009-11-11 23:47:03 +00:00