(OFBIZ-8099)
Change all form names to upper camel case for consistency.
Thanks: Tanmay Muley for reporting and providing the patch.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1761103 13f79535-47bb-0310-9956-ffa450edef68
(OFBIZ-8231)
When I access url https://localhost:8443/ecommerce/control/viewprofile for my profile, State/Province display in addresses shows the geo-id, which is fine for US entities where the GeoID is the state code, but for non-us entities, the GeoID is often something like CountryCode-StateCode, which isn't very nice.
Thanks: fumiyoshi.to for report and patch
jleroux: I have slightly changed the patch for 2 reasons:
* check for null exceptions
* use not deprecated version of getRelatedOne()
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1760406 13f79535-47bb-0310-9956-ffa450edef68
When I choose Japan in new customer screen, no states/province exists occurred, and I cannot register as a customer through ecommerce.
It is because of no data exist for Japan in CountryAddressFormat[GeoData.xml].
jleroux: I'm not sure it's really a bug, but anyway committing this is a good thing
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1759378 13f79535-47bb-0310-9956-ffa450edef68
* introduced a constant for the "control" mount point
* moved public fields and methods from the ContentUrlFilter to the OfbizContentAltUrlTransforms and made them private (since they are only used by this class)
* no more need for the UrlServletHelper to extend the ContextFilter
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1759368 13f79535-47bb-0310-9956-ffa450edef68
* removed an unused filter (UrlRegexpContextFilter)
* moved a series of methods from ContextFilter to WebAppUtil, where they make more sense; changed one of them to be a static method
* made private some methods of ContextFilter and WebAppUtil because they were not used outside of their classes
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1759332 13f79535-47bb-0310-9956-ffa450edef68
=====================================
Add UI labels for success / error messages in common component
=====================================
Thanks Tanmay for your contribution.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1759061 13f79535-47bb-0310-9956-ffa450edef68
1) Removed 'maincss.css' entry from 'allowedPaths' param of from web.xml
Reason: Since, there is no file like 'maincss.css' exist under any includes directory.
2) Removed the unused references of maincss.css from FTLs, code
<link rel="stylesheet" href="${StringUtil.wrapString(baseUrl!)}/images/maincss.css" type="text/css"/>
has been removed.
Reason: This is an interesting thing, these FTLs were using the maincss.css located under the images directory.
When I look the history of these files, following were my findings,
The 'maincss.css' file under the 'images' directory exist in release4.0
http://svn.apache.org/repos/asf/ofbiz/branches/release4.0/framework/images/webapp/images/
after this release, this files no longer exist there.
3) Also, I have updated one file 'InventoryNoticeEmail.ftl' and used the basic HTML code to style, instead of using style defined in 'maincss.css' which were exist in release-4.0
4) Updated some references from 'maincss.css' to style.css in comments.
5) Also removed the entry of including '/images/maincss.css' and '/images/mainrtl.css' in SimpleDecorator
Since, these files no longer exist after release-4.0.
Thanks Wai for reviewing the work and thanks Swapnil M Mane for the contribution.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1758389 13f79535-47bb-0310-9956-ffa450edef68
The TransactionTotalsPdf.pdf currently doesn't show the name of the company it has been generated for.
jleroux: I asked Pierre to check that "Aree we sure that the changes in Simple.fo.ftl are general enough? I mean did you check that they will not appear in inopportune places?"
Pierre's answer: Checked against most occurrences where the SimpleDecorator is used. A few weren't possible to check due to missing demo data.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1758091 13f79535-47bb-0310-9956-ffa450edef68
Notes:
* Also removes empty framework/base/lib/scripting and useless applications\content\lib\uno\README (miss doc in wiki)
* When jpim-0.1.jar will be (hopefully) replaced we can drop lib ref in framework/base/ofbiz-component.xml
* I wonder if we should let the geronimo component alone with only 2 classes, could we not put that in entity or entityext?
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1755306 13f79535-47bb-0310-9956-ffa450edef68
Most is done already. Test pass but testFopMacroLibrary but I don't see how it could be related to these changes, could be a quirk on Windows, BuilBot will tell us. Anyway, I will later double-check to be sure, also to see if I did not miss anything else.
I have voluntarily left 2 or 3 moot points
I was unable to remove possible POS references in <property key="FieldDescription.ProductStore.isImmediatelyFulfilled"> for certain language I'm unable to read.
I have to check if we should keep or not this code snippet
<!-- if inventory info is not available for all of the products, then don't do the issuance, ie there has to be at least SOME inventory info in the database to facilitate inventory-less POS terminals -->
<entity-count entity-name="InventoryItem" count-field="iiCount">
<condition-expr field-name="facilityId" operator="equals" from-field="orderHeader.originFacilityId"/>
</entity-count>
I simply commented out twice this snippet in InvoiceServices.java, because I wonder if it would not be useful when the webPos will be able to issue money change
// if (null == adj.get("amount")) { // JLR 17/4/7 : fix a bug coming from POS in case of use of a discount (on item(s) or sale, sale here) and a cash amount higher than total (hence issuing change)
// continue;
// }
While at it, since I modified OPTIONAL_LIBRARIES, I also changed these svn:properties: svn:eol-style = native & svn:mime-type = text/plain
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1754402 13f79535-47bb-0310-9956-ffa450edef68
jleroux: I updated the patch. I fixed things by hand: tabs in the groovy files, removed the ftl file because of a tree conflicts due to the recent ftl files move and updated org.ofbiz to org.apache.ofbiz in CertKeystore.groovy
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1753024 13f79535-47bb-0310-9956-ffa450edef68
This is the first of two steps in the above mentioned JIRA. This
first step changes the java source directory for every component
from /src to /src/main/java. The next step will be adding unit
tests to every component in /src/test/java
Thank you to Deepak Dixit for tips on how to use the SVN commands
to make the appropriate file moving.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1752838 13f79535-47bb-0310-9956-ffa450edef68
This is the first patch that takes OFBiz to the point of no return
in terms of switching from Ant to Gradle build system. Specifically
this patch applies the following items:
- Delete all old Ant and Maven build scripts
- Delete 169 Jar libraries and replace them with remote ones in the
gradle build script
- update the gradle build scripts for the dependencies and other minor
changes needed for the script work correctly
All tests pass with the command ./gradlew cleanAll loadDefault testIntegration
Again, thank you for everyone who contributed valueble time and effort in this
process.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1752033 13f79535-47bb-0310-9956-ffa450edef68
* removed the code that implemented the deprecated "call-bsh" operation in Minilang
* removed the BeanShellContainer (it has been disabled a long time ago)
* removed the BeanShell service engine, no more used
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1751947 13f79535-47bb-0310-9956-ffa450edef68
Files for including Province data for Turkey via GeoData_TR.xml and address format for Turkey in GeoData.xml
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1751635 13f79535-47bb-0310-9956-ffa450edef68
This commit represents a pivotal change in the history of the
project in which the build system is being replaced from Apache
Ant to Gradle of which the discussion mail thread link is below.
Thanks to everyone who helped with testing and feedback
This commit delivers the following:
- add the gradle wrapper directory in gradle/* which holds
all items necessary for gradle to run
- add the build.gradle master script
- add the settings.gradle script which declares all the subprojects
- add documentation for how to use everything in a new file called
README.md (written in markdown)
The new script is capable of the functionality that used to exist
in Ant with some additional features including automation of eclipse
files generation and many other functions.
To complete this new feature, we need to apply the following _after_
this commit:
- change the buildbot to utilize gradle instead of ant
- delete all ant & maven scripts
- replace all local jars with remote ones from jcenter
Reference thread: http://ofbiz.markmail.org/message/vstt3wxuubmjgmqj?q=Important+Changes+to+Trunk+and+Use+of+Ant+%26+Gradle
Reference JIRA: https://issues.apache.org/jira/browse/OFBIZ-7534
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1751309 13f79535-47bb-0310-9956-ffa450edef68
To automatically filter on fromDate thruDate attribute with value now, init a condition map like
<set field="conditionDates.default" value="Y"/>
To use specific attribute date with value now
<set field="conditionDates.fromDateName" value="startDate"/>
<set field="conditionDates.thruDateName" value="endDate"/>
To use an other value than now
<set field="conditionDates.filterByDateValue" from-field="invoice.invoiceDate"/>
or
<set field="conditionDates.filterByDateValue" value="2016-01-01 00:00:00" type="Timestamp"/>
You can also set only low border date
<set field="conditionDates.fromDateName" value="fromDate"/>
Or you can also set only high border date
<set field="conditionDates.thruDateName" value="endDate"/>
Thanks to Kongrath Suankaewmanee for the proposition follow on issue OFBIZ-7266
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1750856 13f79535-47bb-0310-9956-ffa450edef68
I have uploaded a patch for the simple methods schema.
In general, the top level attributes are converted to simpleType, and attributeGroups to complexType.
Changed the following attribute name
1. ‘field’ to ‘fieldType’
2. ‘level’ to ‘levelType'
Denormalize the following attributeGroups
1. attlist.compare
2. attlist.compare-field
Left attributeGroup ‘typeDefaultString’ unchanged, cos it doesn’t matter. Not in use, it seem.
jleroux: we also fixed an issue with
<xs:element name="field" type="fieldType"/>
to
<xs:element ref="field"/>
In the patch
And I found a small issue (not minilang related) in ExampleCompoundWidgets.xml
- <sm:log message="CompoundWidgetsFunc runs" sm:level="info"/>
+ <sm:log message="CompoundWidgetsFunc runs" level="info"/>
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1750647 13f79535-47bb-0310-9956-ffa450edef68