Commit Graph
5125 Commits
Author SHA1 Message Date
Jacques Le Roux 9fd01fcd31 Removes a framework dependency on Marketing component
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@989389 13f79535-47bb-0310-9956-ffa450edef68
2010-08-25 22:20:18 +00:00
Erwan de Ferrieres 24c97a5b0c Changing functioning for display-size, now displaying dots inside the text instead at the end, so it is more readable
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@989313 13f79535-47bb-0310-9956-ffa450edef68
2010-08-25 19:25:56 +00:00
Jacques Le Roux dc96c0990c Fix a bug when there are no comments at all.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@989166 13f79535-47bb-0310-9956-ffa450edef68
2010-08-25 15:19:05 +00:00
Erwan de Ferrieres 0c34a47300 no functionnal changes, just reorganizing data order
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@989041 13f79535-47bb-0310-9956-ffa450edef68
2010-08-25 12:06:37 +00:00
Erwan de Ferrieres 99eace2c07 Examples on creating charts with Birt -- HTML generation is OK, still some work to do on PDF
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@988846 13f79535-47bb-0310-9956-ffa450edef68
2010-08-25 07:53:56 +00:00
Jacques Le Roux 792aa82bee A solution for "State field is missing - Not in List or N/A" reported by Sam Hamilton at https://issues.apache.org/jira/browse/OFBIZ-3247 - OFBIZ-3247
I finally decided to use the new Dependent Dropdowns mechanim.
I have also refined how it's used in Example to avoid confusion, so changed setDependentDropdownValuesJs.ftl to pass paramKey when it's different from mainId

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@988508 13f79535-47bb-0310-9956-ffa450edef68
2010-08-24 12:32:52 +00:00
Bruno Busco b7ea12ceba Enabled column sorting feature to temporal expression screen
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@988443 13f79535-47bb-0310-9956-ffa450edef68
2010-08-24 09:03:37 +00:00
Bruno Busco 4300a7aae9 Fixed TabBar menus highlights in WebTools configuration screens
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@988434 13f79535-47bb-0310-9956-ffa450edef68
2010-08-24 08:47:40 +00:00
Erwan de Ferrieres 25e75576bd OFBIZ-3896 BIRT charts are not rendered - this file wasn't updated when moving from birt 2.5.1 to 2.6.0
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@988024 13f79535-47bb-0310-9956-ffa450edef68
2010-08-23 08:14:53 +00:00
Erwan de Ferrieres 2b854ca29b groovy 1.7.4 bugfix release (notes : http://jira.codehaus.org/secure/ReleaseNote.jspa?projectId=10242&version=16563)\n this time it's ok
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@987905 13f79535-47bb-0310-9956-ffa450edef68
2010-08-22 13:57:31 +00:00
Erwan de Ferrieres ef9dbea9f9 reverting previous commit, sorry, I was a bit too speed on this one
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@987767 13f79535-47bb-0310-9956-ffa450edef68
2010-08-21 14:46:07 +00:00
Erwan de Ferrieres 5c4d25735d groovy 1.7.4 bugfix release (notes : http://jira.codehaus.org/secure/ReleaseNote.jspa?projectId=10242&version=16563)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@987766 13f79535-47bb-0310-9956-ffa450edef68
2010-08-21 14:27:49 +00:00
Erwan de Ferrieres 0c6075f89b Just a formatting issue, no functional change
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@987755 13f79535-47bb-0310-9956-ffa450edef68
2010-08-21 13:37:37 +00:00
Erwan de Ferrieres 75b0af3628 Refactoring on Example controller to include the Birt's one
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@987555 13f79535-47bb-0310-9956-ffa450edef68
2010-08-20 15:49:46 +00:00
Jacques Le Roux 72e99f8d44 revert r987277, the comment was right, sorry :/
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@987348 13f79535-47bb-0310-9956-ffa450edef68
2010-08-19 23:20:50 +00:00
Jacques Le Roux 0a06065137 This comment
<!-- here mainId and its key are same -->
was false in this case (true for category/products)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@987277 13f79535-47bb-0310-9956-ffa450edef68
2010-08-19 19:34:16 +00:00
Jacques Le Roux c7f7506a48 Not a big deal: Forgot to replace selectedStateProvinceGeoId by selectedDependentOption
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@987276 13f79535-47bb-0310-9956-ffa450edef68
2010-08-19 19:28:58 +00:00
Erwan de Ferrieres becc213433 removing trailing spaces
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@987271 13f79535-47bb-0310-9956-ffa450edef68
2010-08-19 19:07:34 +00:00
Jacques Le Roux be40037bef Forgot to comment out now useless setCountryStatesEventJs.ftl call in r987266
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@987267 13f79535-47bb-0310-9956-ffa450edef68
2010-08-19 18:54:43 +00:00
Jacques Le Roux e3ee5b8035 From Scott's remark, removes dependency from Product component in dependent dropdowns example
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@987266 13f79535-47bb-0310-9956-ffa450edef68
2010-08-19 18:49:32 +00:00
Erwan de Ferrieres 6e2431837e removing dependency to product and using new example demo data for reporting
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@987265 13f79535-47bb-0310-9956-ffa450edef68
2010-08-19 18:46:27 +00:00
Erwan de Ferrieres 7c2cd523bf Adding example demo data
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@987264 13f79535-47bb-0310-9956-ffa450edef68
2010-08-19 18:45:02 +00:00
Bruno Busco ede7fd1009 More appropriate entity description. (A false framework to product dependence ;-)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@987131 13f79535-47bb-0310-9956-ffa450edef68
2010-08-19 11:27:53 +00:00
Erwan de Ferrieres 063d57711c new option for fields : display-size. If a field size is longer than the specified value, then length will be cut and ... will be added. The full text will be displayed as a hint. This way, a form will not be deformed by too long fields.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@987127 13f79535-47bb-0310-9956-ffa450edef68
2010-08-19 11:12:55 +00:00
Hans Bakker 2d9b75a30f this is a revert of r731487 to downgrade freemarker from 2.3.15 to 2.3.10 because of speed problems. In order to make the older version work we changed the following:
- create new OfbizCatalogUrlTransform class
- delete CatalogUrlDirective.java class
- set ofbizCatalogUrl transform to OfbizCatalogUrlTransform class
- In htmlFormMacroLibrary.ftl file, change floor directive to floor method of Math class
- change freemarker version in .classpath and LICENSE files
We are in discussion with the freemarker developers to solve this problem there.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@986577 13f79535-47bb-0310-9956-ffa450edef68
2010-08-18 06:33:12 +00:00
Jacques Le Roux 5fdb5272c5 Forgot to put the license headers into new files in r986370
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@986407 13f79535-47bb-0310-9956-ffa450edef68
2010-08-17 17:40:28 +00:00
Jacques Le Roux 7a285eed10 Miscellaneous improvement in Form Widgets examples. Notably introduces an, as much as possible generalized (so far), dependent drop-downs example. I have introduced 2 couples of dependent drop-downs.
The 1st one, country/states, is a common one and does not need (ie it's better to not) to be generalized. It can be used as is. It needs some pieces which are all included, see comments and follow... 

The 2d, category/products, have been taken as example but is not a good candidate. What if you get much categ or/and products? Anyway it's a good OOTB example and I had it at hand, so I used it. I have tried to generalize (abstract the couple of dropdowns) and it's almost there. The only issue I crossed, is when you want to use a couple of dependent drop-downs in the same form. As it's not a common case, the setDependentDropdownValuesJs.ftl template-script can be used in most cases...

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@986370 13f79535-47bb-0310-9956-ffa450edef68
2010-08-17 16:18:24 +00:00
Jacques Le Roux 3e925d6a06 Moves getCountryList and getAssociatedStateList from Party component to Framework to avoid dependencies on Party component (countries and states are not parties, but Geo, ie should be in the framework)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@986325 13f79535-47bb-0310-9956-ffa450edef68
2010-08-17 14:31:25 +00:00
Jacques Le Roux 04d4634019 Removes deprecated and useless framework/common/webcommon/WEB-INF/geolocation.ftl, it has been replaced by framework/common/webcommon/includes/geolocation.ftl
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@986266 13f79535-47bb-0310-9956-ffa450edef68
2010-08-17 11:25:24 +00:00
Erwan de Ferrieres 70767d45b9 removing trailing spaces
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@986096 13f79535-47bb-0310-9956-ffa450edef68
2010-08-16 18:58:02 +00:00
Erwan de Ferrieres 0ae7083542 Adding geolocation using openstreetmap, examples are taken from the google existing ones
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@986095 13f79535-47bb-0310-9956-ffa450edef68
2010-08-16 18:56:25 +00:00
Erwan de Ferrieres 926d4ea1dd Upgrading to Commons FileUpload 1.2.2, bug fix release from August 2010
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@985714 13f79535-47bb-0310-9956-ffa450edef68
2010-08-15 17:09:49 +00:00
Jacques Le Roux c04f9410df Resolve issues from r985624 (only ReadCommitted for HSQL should have been changed)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@985639 13f79535-47bb-0310-9956-ffa450edef68
2010-08-15 09:30:38 +00:00
Jacques Le Roux 9315590611 Checking entityengine.xml I found that, by default, only HSQL uses isolation-level="ReadUncommitted" while all others use
isolation-level="ReadCommitted". Since its version 2.0, HSQL now supports ReadCommitted. 

http://en.wikipedia.org/wiki/HSQLDB


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@985624 13f79535-47bb-0310-9956-ffa450edef68
2010-08-15 07:59:16 +00:00
Jacques Le Roux 40f66b1ac0 Better French label
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@985434 13f79535-47bb-0310-9956-ffa450edef68
2010-08-14 06:14:00 +00:00
Adam Heath 8a23b9998c Missed some files in the tomcat 6.0.29 upgrade, and also updated LICENSE
and .classpath.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@985309 13f79535-47bb-0310-9956-ffa450edef68
2010-08-13 18:00:36 +00:00
Adam Heath 3a11099f63 Upgrade tomcat; this is a security upgrade.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@985299 13f79535-47bb-0310-9956-ffa450edef68
2010-08-13 17:43:06 +00:00
Adam Heath a633201428 Different entity groups can point to the same helper. However, since
the entities defined in the group are what is passed to the helper for
checking, it makes no sense to have protection against a helper from
being checked multiple times.

Ideally, the proper fix would be to find all groups by helper, combine
all the entities together, then pass them to the helper in one shot.
However, with the new tenant system, this grouping needs to be done by
target database uri(and other parameters), not by helper name.  This
might get done later.

Before this commit, any ofbiz installation that put multiple entity
groups into the same helper would only have the entities from the first
group get created.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@985298 13f79535-47bb-0310-9956-ffa450edef68
2010-08-13 17:42:51 +00:00
Jacques Le Roux 4ced84dd08 A patch from Karl Pitrich "When editing Portal Pages, Drag & Drop for Portlets does not work" (https://issues.apache.org/jira/browse/OFBIZ-3889) - OFBIZ-3889
When editing Portlet Pages, either in MyPortal or PortalAdm, Drag & Drop of Portlets does not work.
Where are several Issues in the MyPortal, some have fixes, none is commited to trunk.

Problems:

    * in myportal.js, function getDestinationInformationPortlets(): DOM ID's are not handled correctly
    * in framework/webtools/widget/PortalAdmScreens.xml: required javascript + css files are not included


JLR: 
While working on this I have found other issues: the login.ftl files used in hhfacility and myportal were not tenant enabled. They are different  but by chance in myportal very close to common so I was finally able  to do both at along with  Karl's changes. Actually I wanted to do 2 commits but forget to uncheck the files while doing a second attempt to commit.

MyPortal
 * The login process in MyPortal was not tenant enabled, it's done in this commit.
 * I kept its specificity : newRegisterLogin and wonder why it has not been extended to common?

hhfacility
The login process in hhfacility was not tenant enabled, it's done in this commit. Doing so, I saw there i18n is not done, not an issue for me...







git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@985163 13f79535-47bb-0310-9956-ffa450edef68
2010-08-13 11:43:38 +00:00
Jacques Le Roux b7642843fd Fixes 2 typos in Javadoc found by chance
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@983946 13f79535-47bb-0310-9956-ffa450edef68
2010-08-10 11:55:44 +00:00
Jacques Le Roux b552004b9b A patch from René Scheibe ""setShippingOption" service called from one page checkout throws Exception" (https://issues.apache.org/jira/browse/OFBIZ-3886) - OFBIZ-3886
The shippingTotal has to be a BigDecimal for the methods called...

    * org.ofbiz.base.util.UtilFormatOut.formatCurrency(...)
    * org.ofbiz.order.shoppingcart.ShoppingCart.setItemShipGroupEstimate(...)

...so in case it's null, initialize it with BigDecimal.ZERO instead of 0.00

Fixes also some JavaDoc in UtilFormatOut.java

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@983920 13f79535-47bb-0310-9956-ffa450edef68
2010-08-10 10:43:01 +00:00
Adam Heath da0da53f2a Fix importing of data in webtools xml file import.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@982871 13f79535-47bb-0310-9956-ffa450edef68
2010-08-06 04:47:01 +00:00
Adam Heath b273b52dad Finally created a script to find and fix tons of missing final newlines.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@982870 13f79535-47bb-0310-9956-ffa450edef68
2010-08-06 04:46:48 +00:00
Adam Heath 2da92e401f Some more trailing newline changes.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@981698 13f79535-47bb-0310-9956-ffa450edef68
2010-08-02 22:32:54 +00:00
Adam Heath d06f72f7f9 FEATURE: Start of union support; parsing isn't tested yet.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@981640 13f79535-47bb-0310-9956-ffa450edef68
2010-08-02 17:44:20 +00:00
Adam Heath 872db5befd FEATURE: Start of aggregate function support.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@981639 13f79535-47bb-0310-9956-ffa450edef68
2010-08-02 17:44:12 +00:00
Adam Heath 550d275781 FEATURE: Add count-all variant that doesn't require a table name.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@981638 13f79535-47bb-0310-9956-ffa450edef68
2010-08-02 17:44:05 +00:00
Adam Heath ca01d94d2a FEATURE: Add support for CREATE INDEX.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@981637 13f79535-47bb-0310-9956-ffa450edef68
2010-08-02 17:44:00 +00:00
Adam Heath 56c7c3391a FEATURE: ORDER BY now supports any ConstantValue, which includes any
function, and also math operations.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@981636 13f79535-47bb-0310-9956-ffa450edef68
2010-08-02 17:43:53 +00:00
Adam Heath 066b0716d8 Expose a helper method for parsing order by items.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@981635 13f79535-47bb-0310-9956-ffa450edef68
2010-08-02 17:43:47 +00:00