Commit Graph
62 Commits
Author SHA1 Message Date
Erwan de Ferrieres 82a83fd8f5 missing fk-name for CountryAddressFormat entity, causing error messages when starting OFBiz
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1425146 13f79535-47bb-0310-9956-ffa450edef68
2012-12-21 21:07:01 +00:00
Hans Bakker 9de0762a42 make it possible that the applicable system settings in general properties can be overridded by settings in the database.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1240016 13f79535-47bb-0310-9956-ffa450edef68
2012-02-03 07:17:00 +00:00
Hans Bakker cc8c924b89 make <property-to-field/> in minilanguage first look in the newly created SystemProperty entity to be able to override the system properties defined in the properties files
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1238993 13f79535-47bb-0310-9956-ffa450edef68
2012-02-01 08:14:53 +00:00
Hans Bakker f484f7b9d0 revert r1238954 some local changes were added
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1238991 13f79535-47bb-0310-9956-ffa450edef68
2012-02-01 08:13:21 +00:00
Hans Bakker 204b9eb01a Wrong commit reverted in r1238991
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1238954 13f79535-47bb-0310-9956-ffa450edef68
2012-02-01 07:22:12 +00:00
Sascha Rodekamp 841c09a114 FIX: A bug reported by Kiran Gawde: The dependent drop down list for countries and states didn't work. I fixed an error in the entitymodel definition for the GeoAssocAndGeoToWithState View-Entity (https://issues.apache.org/jira/browse/OFBIZ-4437)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1173996 13f79535-47bb-0310-9956-ffa450edef68
2011-09-22 08:52:34 +00:00
Jacques Le Roux 60dc2a519a An effort has been made in r1163575. But it needed a bit more love. I simplified by renaming to geoAssocTypeId instead of uselessly complicated stateProvncGeoAssocTypeId
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1165124 13f79535-47bb-0310-9956-ffa450edef68
2011-09-04 22:33:17 +00:00
Sascha Rodekamp 074a2498f3 Fix the CountryAddressFormat relation to make the StateDropDown fields work again. The field-name and rel-field name were twisted.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1163575 13f79535-47bb-0310-9956-ffa450edef68
2011-08-31 11:20:16 +00:00
Adrian Crum 14cc4128e2 XML formatting and some documentation for geo-related entities. No functional change.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1162940 13f79535-47bb-0310-9956-ffa450edef68
2011-08-29 18:38:57 +00:00
Adrian Crum 22273d5391 Fixed some problems with geo data, patch contributed by Deepak Dixit (https://issues.apache.org/jira/browse/OFBIZ-4371).
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1162693 13f79535-47bb-0310-9956-ffa450edef68
2011-08-29 09:26:52 +00:00
Hans Bakker 426d814c0c allow the listing of all preference groups in the partymanager user preferences
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1162312 13f79535-47bb-0310-9956-ffa450edef68
2011-08-27 08:21:01 +00:00
Sascha Rodekamp 8ea4b86713 Improvement: OFBIZ-4270 - State dropdown only finds states and does not include county information
Reorganized and extend the Data structure, now it is possible to store additional country postal code regex data 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1153402 13f79535-47bb-0310-9956-ffa450edef68
2011-08-03 09:12:31 +00:00
Sascha Rodekamp bb87a9eb87 State dropdown only finds states and does not include county information (https://issues.apache.org/jira/browse/OFBIZ-4270) - I added a separte Entity which defines all countries which should show their states in the drop down list. It also checks states recursivly, to list all states (i.e.) for GB.
Orig Msg: If you are on this page https://demo-trunk.ofbiz.apache.org:8443/ecommerce/control/newcustomer select USA from the country drop down and it will display all the USA states, similarly it works just fine for Spain but if you try once again with either United Kingdom or France it will show "No States/Provinces exist".

Both UK and France have Counties saved in the datamodel but the form does not lookup in the correct location as they are not defined as State.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1140103 13f79535-47bb-0310-9956-ffa450edef68
2011-06-27 11:01:06 +00:00
Erwan de Ferrieres fba839327f Adding a new field to portalPage helpContentId so we can associate a help screen to a portalPage
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1077932 13f79535-47bb-0310-9956-ffa450edef68
2011-03-04 13:26:46 +00:00
David E. Jones 1ff809476c Added a handy view-entity to complement the existing GeoAssocAndGeoTo
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1025909 13f79535-47bb-0310-9956-ffa450edef68
2010-10-21 09:37:23 +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
Jacques Le Roux 6193dd4e53 <author>None</author> is totally useless and we don't need an author OOTB
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@949101 13f79535-47bb-0310-9956-ffa450edef68
2010-05-28 05:41:23 +00:00
Jacques Le Roux 63fd94e778 Not sure why, but my regexp S/R in the commit r948846 boke some formatting. I also removed some useless other stuff in this commit
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@948852 13f79535-47bb-0310-9956-ffa450edef68
2010-05-27 14:45:59 +00:00
Jacques Le Roux 2a1a5aee14 We don't need
<copyright>Copyright 2001-.* The Apache Software Foundation</copyright>
<copyright><year>.*</year><holder>Apache Foundation</holder></copyright>
<copyright><year>.*</year><holder>Apache Foundation.</holder></copyright>
<owner>Copyright 2001-.* The Apache Software Foundation</owner>

Less to update every year!

Thanks to BJ 1st effort at "update files from 2009 to 2010" (https://issues.apache.org/jira/browse/OFBIZ-3783) - OFBIZ-3783

Note: there are been a lot of efforts in 2009: there are plenty of data dated from this year!

I hope I did not broke anything (should not, but of course I did not try all changes...) Anyway, this can be easily reverted...

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@948846 13f79535-47bb-0310-9956-ffa450edef68
2010-05-27 14:23:22 +00:00
Erwan de Ferrieres f0eb1cf0b0 Enabling localization for portal page names, adding the CommonPortalEntityLabels file
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@936845 13f79535-47bb-0310-9956-ffa450edef68
2010-04-22 13:50:24 +00:00
Andrew Zeneski 40f3732d82 added UomGroup entity; fixed bad relationship ID on workeffort purpose type
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@899365 13f79535-47bb-0310-9956-ffa450edef68
2010-01-14 19:24:32 +00:00
Bruno Busco d0d9384a6e Added a new feature that allows to save the screenlet collapsed/expanded status as a userPreference. (OFBIZ-3271)
By default screenlets status are saved. A new "save-collapsed" screenlet attribute (default=true) can be used to disable this feature for selected screenlets.
An userPreference with key = screenlet.id+"_collapsed" is used to save the status.
Screenlets that share the same ID, share the same saved status also (i.e. all searchOptions screenlets used in the FindScreenDecorator use the same status). In order to have them separated a different ID should be specified.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@888030 13f79535-47bb-0310-9956-ffa450edef68
2009-12-07 17:24:21 +00:00
Jacques Le Roux 49bce4301f A patch from Erwan de FERRIERES " adding localization on visual themes" (https://issues.apache.org/jira/browse/OFBIZ-3295) - OFBIZ-3295
just adding the needed lines in commonEntityLabels and adding the property ressource name for the entity VisualTheme

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@886745 13f79535-47bb-0310-9956-ffa450edef68
2009-12-03 11:48:48 +00:00
Scott Gray 8b86a4953c Fix startup warning caused by duplicate field alias names
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@798516 13f79535-47bb-0310-9956-ffa450edef68
2009-07-28 13:29:59 +00:00
David E. Jones 783b1fd9dc Added order-by entity-condition to the StatusValidChangeTo view-entity, a test case for this new view-entity functionality that will simplify queries on it
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@792391 13f79535-47bb-0310-9956-ffa450edef68
2009-07-09 04:25:11 +00:00
Hans Bakker 6a1fd9d1b5 added a portlet edit form to configure which system notes should be sent
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@788048 13f79535-47bb-0310-9956-ffa450edef68
2009-06-24 15:07:27 +00:00
Jacques Le Roux 058d6aed57 A patch from Ashish Vijaywargiya "Change Copyright Year" (https://issues.apache.org/jira/browse/OFBIZ-2346) - OFBIZ-2346
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@772936 13f79535-47bb-0310-9956-ffa450edef68
2009-05-08 10:56:14 +00:00
Jacques Le Roux b9c3ddef08 2d part and end of an effort to remove trailing spaces
[ \t]+$ => "" (empty)
Should be easier to review when committing changes with trailing spaces removed automatically by anyedit or such tool (please refer to http://docs.ofbiz.org/x/mg)

Of course this effort to remove trailing spaces has no functional implications.

Actually, I was doing a 1st commit and as it's long to upload, I got conflicts with r763135
In the meantime I did some refactoring also in *.java and *.groovy files :
){ => ) {
if( => if (
while( => while (
}else => } else
else{ => else {
switch( => switch (
try{ => try {
}catch => } catch
catch( => catch (
}finally{ => } finally {

So these changes are also in this commit, should not be a problem anyway.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@763175 13f79535-47bb-0310-9956-ffa450edef68
2009-04-08 10:54:51 +00:00
Hans Bakker 4efc321fad move timesheet back into project manager, corrected field format error in portletCategory entity (needs drop and reload from seed data) and general corrections
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@759853 13f79535-47bb-0310-9956-ffa450edef68
2009-03-30 06:49:26 +00:00
Hans Bakker cc860ba38b rather big change which contains the following:
1. created a new function in the partyManager called 'myCommunications'
This function enables the sending and receiving of email and internal communications to/from the current userlogin. It looks like an email client for internal and external email.
2. merged the party/webapp/partymgr/communication/CommMenus.xml and party/widget/partymgr/PartyMenus.xml
3. moved all forms/screens from my portal back into the party component
4. fixed some more problems with myportal
5. added 'save-home' and save 'current' in the same pattern as 'save-last' function in the controler.xml
6. added 'view-home' in the same pattern as 'view-last'
7. moved all related uilabels from myportal to party
8. This update needs a re-creation of the portlet/portal entities.




git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@758522 13f79535-47bb-0310-9956-ffa450edef68
2009-03-26 06:06:12 +00:00
David E. Jones baba2459d3 Moved NoteData.noteParty field to an extend-entity in the party component
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@757658 13f79535-47bb-0310-9956-ffa450edef68
2009-03-24 04:25:45 +00:00
Hans Bakker d4137b9f46 add the possibility to list portlets by portlet category
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@746646 13f79535-47bb-0310-9956-ffa450edef68
2009-02-22 08:16:32 +00:00
David E. Jones e71fe34443 Added quick first pass for the sendMailFromTemplateSetting service that uses the new EmailTemplateSetting entity; note that this is still beta as I haven't tested it much, but it shows that concept and can be a basis for further work, possibly including refactor of ProductStoreEmailSetting to use this entity and service but that isn't necessary for other things to use it, etc
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@744736 13f79535-47bb-0310-9956-ffa450edef68
2009-02-15 19:57:43 +00:00
David E. Jones f27b4eeaaa No functional changes, just reorganizing code: moved email services from content to the framework/common component except the CommunicationEvent related ones which are now in the party component along with other CommunicationEvent resources; changed framework components so that webapp no longer depends on common and common is higher level than the various tool components which was an odd dependency before; one new thing is in here and that is an entity called EmailTemplateSetting which is meant to be a generic version of the ProductStoreEmailSetting entity so we can have configurable email templates without depending on ProductStore, still need to write the service to send email from this (sendMailFromTemplateSetting)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@744727 13f79535-47bb-0310-9956-ffa450edef68
2009-02-15 19:34:49 +00:00
David E. Jones b8707a26f8 Applied patch from Bruno Busco in Jira #OFBIZ-2172 with basics for VisualThemeSet; still not possible to change themes in ecommerce (should probably be supported on the back end instead of the front end, ie in the catalog manager and not by a customer in ecommerce, or perhaps only allowed in ecommerce if a flag on the ProductStore says its okay; also does not yet filter selectable themes in the back-end/manager applications
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@743202 13f79535-47bb-0310-9956-ffa450edef68
2009-02-11 03:19:19 +00:00
Hans Bakker 2638cce966 relation name too long
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@741428 13f79535-47bb-0310-9956-ffa450edef68
2009-02-06 06:17:30 +00:00
Hans Bakker 077bd4641a the myportal component is functionally complete now having also different page sets for different securitygroups.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@741129 13f79535-47bb-0310-9956-ffa450edef68
2009-02-05 15:18:47 +00:00
Jacques Le Roux 572b7683e0 All tabs to 4 spaces in *.groovy, *.java, *.xml : less problems in future with that aspect...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@737003 13f79535-47bb-0310-9956-ffa450edef68
2009-01-23 11:08:47 +00:00
David E. Jones a61d2b7438 Moved GeoPoint to be in alpha order, changed from 2 to 4 spaces, added title attribute to Uom relationship for consistency with the field name
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@736588 13f79535-47bb-0310-9956-ffa450edef68
2009-01-22 08:33:17 +00:00
Jacques Le Roux 48d097338e GeoPoint.elevationUomId instead of GeoPoint.uomId as sugested by David on dev ML
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@736580 13f79535-47bb-0310-9956-ffa450edef68
2009-01-22 07:12:12 +00:00
Jacques Le Roux 0500d6baef A 1st commit for "Add geolocation to data model" (https://issues.apache.org/jira/browse/OFBIZ-1923) OFBIZ-1923
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@735404 13f79535-47bb-0310-9956-ffa450edef68
2009-01-18 09:09:32 +00:00
Hans Bakker f303be6deb removed unused, recently introduced, view
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@731516 13f79535-47bb-0310-9956-ffa450edef68
2009-01-05 10:17:28 +00:00
Hans Bakker af2fa0115a major cleanup of of the portalpages, files split between display and configure, user can now create/update a copy of the system pages and revert back, example component working now....next week we will do the portal component.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@730665 13f79535-47bb-0310-9956-ffa450edef68
2009-01-02 03:35:41 +00:00
Hans Bakker 5f280a3bea add security checking to portlet list
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@729424 13f79535-47bb-0310-9956-ffa450edef68
2008-12-25 14:38:57 +00:00
Hans Bakker 63c50ecec4 First version of the myportal component as a replacement of the MyPage component as announced in issue OFBIZ-2052 now using the new portal functions. Introduced with this version is that the system pages (userLogin=_NA_) are never changed, but automatically a new page is created for the logged in user when he modifies the system page. The deletion function now returns to the system page design
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@728389 13f79535-47bb-0310-9956-ffa450edef68
2008-12-21 04:40:27 +00:00
Bilgin Ismet Ibryam b685dbd482 Added purposeEnumId field to UomConversionDated entity. This will allow having different currency exchange rates for different on purposea.
Also extended convertUom service to search rates by purpose. If a rate with specified purposeEnumId is not found, then the conversion is done based on rates w/o purpose.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@721431 13f79535-47bb-0310-9956-ffa450edef68
2008-11-28 11:16:07 +00:00
David E. Jones 86d28d765b Added field for portlet security service, still needs to be implemented
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@718847 13f79535-47bb-0310-9956-ffa450edef68
2008-11-19 02:47:49 +00:00
David E. Jones e7f1dde5f5 Commit reworked initial patch from Bruno Busco in Jira #1999; this follows Brunos work but adds the PortalPageColumn entity to configure columns, just optional pixel width for now, and also cleaned up entities and added foreign keys; rewrote a few things in screen actions and simple methods and removed a bunch of unused stuff that was commented out, so hopefully there isnt any more stray code in here; moved various things to files that were less generic, ie that mention portal specifically instead of just common or something; changed controller and menu setup so that this isn't in all apps by default, in fact just the example webapp for now with the include of portal-controller.xml and adding a dashboard menu item; note that this does not include the few changes in the specialpurpose directory, just the framework stuff for now; also moved data from seed to demo as it really isn't seed data in common and example
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@718185 13f79535-47bb-0310-9956-ffa450edef68
2008-11-17 07:56:27 +00:00
Jacques Le Roux 31d56e8064 A patch from Ravindra Mandre "The userPrefGroupId field on UserPrefGroupType should be userPrefGroupTypeId, as per conventions" (https://issues.apache.org/jira/browse/OFBIZ-1996) - OFBIZ-1996
With some help by Vikas Mayur for the "Upgrading OFBiz from earlier revisions" Wiki page update


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@712366 13f79535-47bb-0310-9956-ffa450edef68
2008-11-08 08:59:31 +00:00
Adrian Crum 32682b431a Visual Themes framework - for more information see https://issues.apache.org/jira/browse/OFBIZ-1885.
This commit provides a means to swap out the current UI theme for another one. Alternate style sheets, templates, JavScript files, etc can be used to give OFBiz a completely different look.

Right now the plan is to have "theme libraries" that can be dropped in the hot-deploy folder. Work still needs to be done to connect web stores and product catalogs to the visual theme framework.

Users can select their preferred theme in the back-office applications.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@698346 13f79535-47bb-0310-9956-ffa450edef68
2008-09-23 20:58:23 +00:00