Commit Graph
12781 Commits
Author SHA1 Message Date
Hans Bakker 1c7a046dcc corrected calendar problem
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@815655 13f79535-47bb-0310-9956-ffa450edef68
2009-09-16 08:03:15 +00:00
Jacopo Cappellato da1ebe418b Fix for bad variable name
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@815653 13f79535-47bb-0310-9956-ffa450edef68
2009-09-16 07:59:39 +00:00
Jacopo Cappellato a101919fd6 Fix for bug affecting the return total (it was not considering adjustments).
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@815652 13f79535-47bb-0310-9956-ffa450edef68
2009-09-16 07:56:33 +00:00
Hans Bakker d34dbebce8 all upload content screens (hopefully we did not forget any) can now also select an existing contentId which can be selected from a navigation tree. Added also the possibility when a file is uploaded to put it at a particular leave in the tree. Programmed by my employee Berm
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@815651 13f79535-47bb-0310-9956-ffa450edef68
2009-09-16 07:48:51 +00:00
Ashish Vijaywargiya 1c98c491ab AddItemRequest in ebay code was not allowing export of more then one item to ebay.
In the request you can send the single item at a time and if you wanted to exported more then one item then you may need to call the same request multiple times.For more details please refer link shown below.
http://developer.ebay.com/DevZone/XML/docs/Reference/eBay/AddItem.html#Request.Item

-- After this commit you can either export one item or more then one item from OFBiz to eBay (OFBiz --> eBay).
-- Moved while loop in the main method so you will also see formating changes.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@815650 13f79535-47bb-0310-9956-ffa450edef68
2009-09-16 07:48:22 +00:00
Hans Bakker 02d42e1b29 address is optional on create a lead form
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@815619 13f79535-47bb-0310-9956-ffa450edef68
2009-09-16 06:11:09 +00:00
Vikas Mayur 3c2ae84dba Fixed typo in the method, ???Result* -> ???Results*
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@815615 13f79535-47bb-0310-9956-ffa450edef68
2009-09-16 05:50:17 +00:00
Scott Gray 22b5c0ae0b Add a new ProductWorker method that determines the standard features of a variant that would qualify it for selection from its virtual product, a reverse lookup of sorts
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@815592 13f79535-47bb-0310-9956-ffa450edef68
2009-09-16 02:50:26 +00:00
Hans Bakker 0ce42d2bf2 change timesheet form entry from 5 -> 2 characters to accomodate business theme
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@815584 13f79535-47bb-0310-9956-ffa450edef68
2009-09-16 01:31:49 +00:00
Scott Gray 96dd60965e Added date filtering to getProductFeatureByApplTypeId and cleaned up the method a little
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@815581 13f79535-47bb-0310-9956-ffa450edef68
2009-09-16 00:58:07 +00:00
Jacques Le Roux c8d0b69d18 A patch from Erwan de FERRIERES "improvement on the calendar screen" (https://issues.apache.org/jira/browse/OFBIZ-2941) - OFBIZ-2941
This is an improvement on the view calendar screen, to use more screenlets and less containers. The hardcoded labels have also been removed.
The modifications are visible when creating or editing an event listed in the calendar. Boxes are better rendered and have a title bar as the other parts of the screen. 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@815479 13f79535-47bb-0310-9956-ffa450edef68
2009-09-15 20:53:11 +00:00
Ashish Vijaywargiya f52eba705c Improved error and success message in eBay service implemented before few days.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@815365 13f79535-47bb-0310-9956-ffa450edef68
2009-09-15 15:22:55 +00:00
Jacques Le Roux 9850bbd560 A patch from Chirag Manocha "Out Parameter showing under In Parameter head for createAcctgTransAndEntries service reference." (https://issues.apache.org/jira/browse/OFBIZ-2917) - OFBIZ-2917
In service createAcctgTransAndEntries, there is no need to IN acctgTranId. It is required as OUT parameter. So behavior should be overridden instead of defining acctgTransId again. 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@815350 13f79535-47bb-0310-9956-ffa450edef68
2009-09-15 14:51:19 +00:00
Hans Bakker 783d5b1510 make help button red when help screen available in the flatgrey scheme...could not get it to work in the business theme....anybody?
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@815268 13f79535-47bb-0310-9956-ffa450edef68
2009-09-15 10:46:46 +00:00
Vikas Mayur 1a1b365345 Minor cleanup.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@815253 13f79535-47bb-0310-9956-ffa450edef68
2009-09-15 10:20:12 +00:00
Hans Bakker e4ad7cdb5b missed some files in commit 815160
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@815250 13f79535-47bb-0310-9956-ffa450edef68
2009-09-15 10:18:17 +00:00
Ashish Vijaywargiya 5ea1a35422 Now we have GetOrders request working fine so changing old screen to import only single transactions.
This will help to avoid the duplicate order being created in the system with the help of old screen for importing eBay orders.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@815248 13f79535-47bb-0310-9956-ffa450edef68
2009-09-15 10:11:50 +00:00
Vikas Mayur 8f34798fc3 Markup cleanup. Removed extra table which was used to show summary of the cart and its contents are now moved under <tfoot> element of the main cart tables.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@815219 13f79535-47bb-0310-9956-ffa450edef68
2009-09-15 08:41:44 +00:00
Vikas Mayur c1e471adf1 Markup cleanup.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@815207 13f79535-47bb-0310-9956-ffa450edef68
2009-09-15 08:19:27 +00:00
Jacques Le Roux abf1551dc1 Fix a problem reported by Sharan Foga at "Error in Viewing Returned Items" (https://issues.apache.org/jira/browse/OFBIZ-2934) - OFBIZ-2934
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@815165 13f79535-47bb-0310-9956-ffa450edef68
2009-09-15 06:42:50 +00:00
Hans Bakker 9079c52ff1 more payment help screens by Sharan. Thanks
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@815160 13f79535-47bb-0310-9956-ffa450edef68
2009-09-15 06:20:37 +00:00
Jacques Le Roux 8d5ae03052 This file was missing in r814681
Thanks to Arun Patidar for reminder

A patch from Arun Patidar "Inventory search results for "QOH minus Min Stock
less than" & "ATP minus Min Stock less than" filter does not works properly."
(https://issues.apache.org/jira/browse/OFBIZ-2937) - OFBIZ-2937 In Facility-> Inventory screen, Inventory search results for "QOH minus Min
Stock less than" & "ATP minus Min Stock less than" filter does not works
properly. 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@815158 13f79535-47bb-0310-9956-ffa450edef68
2009-09-15 06:16:46 +00:00
Hans Bakker 1ef81db109 show email address if possible on email send form
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@815156 13f79535-47bb-0310-9956-ffa450edef68
2009-09-15 06:04:28 +00:00
Ashish Vijaywargiya d2e8033fd1 On testing I observed that GetOrders request was creating duplicate party records if the party with the same name already exists in OFBiz. Fixed the problem in this patch.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@815155 13f79535-47bb-0310-9956-ffa450edef68
2009-09-15 06:01:56 +00:00
Hans Bakker 8bb82bf809 strange the test worked, but still curly braces missing, thanks scott to see that.....
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@814982 13f79535-47bb-0310-9956-ffa450edef68
2009-09-15 03:30:50 +00:00
Hans Bakker 1b10183506 contactmechIdTo got lost: corrected
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@814977 13f79535-47bb-0310-9956-ffa450edef68
2009-09-15 03:03:25 +00:00
Jacques Le Roux 550078cbf3 I prefer to have greys/black/white only
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@814862 13f79535-47bb-0310-9956-ffa450edef68
2009-09-14 21:23:35 +00:00
Adam Heath 6d02f38a92 Fix AND and OR support when evaluating some conditions in memory;
namely, EntityExpr(Condition, Join, Condition) didn't work.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@814731 13f79535-47bb-0310-9956-ffa450edef68
2009-09-14 17:02:36 +00:00
Jacques Le Roux 6ac5b93a46 A patch from Arun Patidar "Inventory search results for "QOH minus Min Stock less than" & "ATP minus Min Stock less than" filter does not works properly." (https://issues.apache.org/jira/browse/OFBIZ-2937) - OFBIZ-2937
In Facility-> Inventory screen, Inventory search results for "QOH minus Min Stock less than" & "ATP minus Min Stock less than" filter does not works properly.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@814681 13f79535-47bb-0310-9956-ffa450edef68
2009-09-14 15:09:00 +00:00
Ashish Vijaywargiya 03578ad7f8 Minor fix - This was slipped from my mind in previous commit in eBay.
This will help to ignore already imported orders in the system.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@814674 13f79535-47bb-0310-9956-ffa450edef68
2009-09-14 14:58:10 +00:00
Vikas Mayur 3a29dd96d6 Markup improvements.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@814667 13f79535-47bb-0310-9956-ffa450edef68
2009-09-14 14:41:55 +00:00
Jacques Le Roux 8a5dfeafdd A patch from Erwan de FERRIERES "more french tranlations" (https://issues.apache.org/jira/browse/OFBIZ-2939) - OFBIZ-2939
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@814655 13f79535-47bb-0310-9956-ffa450edef68
2009-09-14 14:18:01 +00:00
Vikas Mayur aa60bb7f8b Correction to <li> tag closing.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@814650 13f79535-47bb-0310-9956-ffa450edef68
2009-09-14 14:12:39 +00:00
Jacques Le Roux eb38c62cb7 Forgot to close the <br> (thanks to Scott on dev ML)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@814631 13f79535-47bb-0310-9956-ffa450edef68
2009-09-14 13:22:41 +00:00
Jacques Le Roux a9aea3da1c Make things readable in all cases
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@814615 13f79535-47bb-0310-9956-ffa450edef68
2009-09-14 12:36:04 +00:00
Jacques Le Roux 70aac06ccd Make titles in profile screen (the old one) readable again.
BTW, I really wonder why we should replace it by the poorest new one ? Any opinions ?

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@814603 13f79535-47bb-0310-9956-ffa450edef68
2009-09-14 12:19:10 +00:00
Jacques Le Roux 6419ef6d2d A patch from Sumit Pandit "Setting default address in Ecommerce profile should be secure" (https://issues.apache.org/jira/browse/OFBIZ-2933) - OFBIZ-2933
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@814576 13f79535-47bb-0310-9956-ffa450edef68
2009-09-14 10:57:32 +00:00
Ashish Vijaywargiya 55acacfc14 Another pass on eBay Order Imports using GetOrders request.
Following things are done in this patch:

-- Moved commonly used methods to EbayHelper.java file.
-- Created two main methods "readGetOrdersResponse" & "createShoppingCart" to read xml data coming from Ebay and then create order in OFBiz respectively.
-- Also provided sample response XML data that is being generated from Ebay.
-- Changed the UI in which first it was searching orders and then from the orders list we were importing orders.
Now we have only one screen available in which search criteria for order is provided & on the basis of that search criteria order gets imported in OFBiz.
-- Previous work for importing Orders(Not exactly order - it was transaction) is working fine OOTB. 

Here are few things that I am thinking to do in this area soon:
-- Improve error handling code - code cleanup.
-- Provide scheduled service UI(or prepare demo data for scheduling job) in which the orders will be imported automatically in the system instead of searching and then importing done by end user. - Thinking the best way to handle it.

Thanks Rishi & Sumit for discussing few things/ issues in b/w the development of this pass.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@814560 13f79535-47bb-0310-9956-ffa450edef68
2009-09-14 10:18:43 +00:00
Vikas Mayur 8c4ddd72f0 Changed the new profiles pages added a year back as the default one.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@814553 13f79535-47bb-0310-9956-ffa450edef68
2009-09-14 10:08:27 +00:00
Hans Bakker 7c99297356 moved temporary the party helpfile to the content component until solution is found because the party component is loaded first and need the content component (as reported on the mailing list)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@814546 13f79535-47bb-0310-9956-ffa450edef68
2009-09-14 09:52:24 +00:00
Vikas Mayur a67f6c9939 Applied a combined patch from Eric DE MAULDE and Deepak Dixit where the former is related to fix to the tag and latter is related to markup improvements. For details refer
to jira issue OFBIZ-2935 (https://issues.apache.org/jira/browse/OFBIZ-2935)


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@814542 13f79535-47bb-0310-9956-ffa450edef68
2009-09-14 09:31:43 +00:00
Jacques Le Roux dbe9cbd76d A patch from Bharat Soni "Content of Find Orders page of order component is not coming properly" (https://issues.apache.org/jira/browse/OFBIZ-2912) - OFBIZ-2912
Content of Find Orders page of order component is not coming properly. Not showing content below the "Web Site" select box.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@814531 13f79535-47bb-0310-9956-ffa450edef68
2009-09-14 09:08:15 +00:00
Adam Heath 307f2f956b Remove the compare method from the base class, and make it abstract.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@814512 13f79535-47bb-0310-9956-ffa450edef68
2009-09-14 07:54:41 +00:00
Adam Heath 0fc6bd8408 Bother, that'll teach for me fix this late night, with my glasses off.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@814511 13f79535-47bb-0310-9956-ffa450edef68
2009-09-14 07:49:59 +00:00
Adam Heath d6cf856b07 s/List/Comparable in a few places, to stop a CCE from occuring.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@814508 13f79535-47bb-0310-9956-ffa450edef68
2009-09-14 07:47:38 +00:00
Adam Heath 1e6f7b7857 Start adding generics to the operators, to document what they
operate on(more to come).

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@814492 13f79535-47bb-0310-9956-ffa450edef68
2009-09-14 06:35:44 +00:00
Adam Heath 28474f80ac Remove generics markup on operator variables.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@814491 13f79535-47bb-0310-9956-ffa450edef68
2009-09-14 06:28:21 +00:00
Vikas Mayur 0de222fa41 Markup improvement. Removed extra div.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@814472 13f79535-47bb-0310-9956-ffa450edef68
2009-09-14 04:24:24 +00:00
Jacques Le Roux 1817d35d28 A patch from Deyan Tsvetanov "NamingServiceContainer binds to all network interfaces." (https://issues.apache.org/jira/browse/OFBIZ-2559) - OFBIZ-2559
org.ofbiz.base.container.NamingServiceContainer by default binds a server socket to all available network interfaces. Configuration of this container is done in
framework/base/config/ofbiz-containers.xml

<!-- load the naming (JNDI) server -->
<container name="naming-container" class="org.ofbiz.base.container.NamingServiceContainer">
<property name="port" value="1099"/>
</container>

Only the port can be configured.
Additional configuration property needs to be implemented:

<property name="host" value="0.0.0.0"/>

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@814390 13f79535-47bb-0310-9956-ffa450edef68
2009-09-13 21:49:21 +00:00
Jacques Le Roux f4ba07fe64 For the sake of consistency with showcart.ftl
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@814349 13f79535-47bb-0310-9956-ffa450edef68
2009-09-13 17:21:00 +00:00