Commit Graph
2222 Commits
Author SHA1 Message Date
Michael Brohl 31a2e43496 Improved: Fixing defects reported by FindBugs, package
org.apache.ofbiz.common.login.
(OFBIZ-9630)

Thanks Dennis Balkir for reporting and providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1811424 13f79535-47bb-0310-9956-ffa450edef68
2017-10-07 14:06:21 +00:00
Michael Brohl 36492861ee Improved: Fixing defects reported by FindBugs, package
org.apache.ofbiz.common.image.
(OFBIZ-9629)

Thanks Dennis Balkir for reporting and providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1811423 13f79535-47bb-0310-9956-ffa450edef68
2017-10-07 14:00:27 +00:00
Michael Brohl 17db653e57 Improved: Fixing defects reported by FindBugs, package
org.apache.ofbiz.common.email.
(OFBIZ-9628)

Applied modified patch due to intermediate changes and removed an
obsolete import.

Thanks Dennis Balkir for reporting and providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1811422 13f79535-47bb-0310-9956-ffa450edef68
2017-10-07 13:56:48 +00:00
Michael Brohl 2921eff056 Improved: Fixing defects reported by FindBugs, package
org.apache.ofbiz.common.authentication.
(OFBIZ-9627)

Thanks Dennis Balkir for reporting and providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1811421 13f79535-47bb-0310-9956-ffa450edef68
2017-10-07 13:49:20 +00:00
Nicolas Malin 8f447bdbc2 Fixed: InitTheme.groovy can't work without request (OFBIZ-9798)
When a sendOrderConfirmation runs it calls InitTheme.groovy. But then there is no request and InitTheme fails
The script was improved to escape if the request is empty and try before to resolve the visualThemeId from the context
Tanks Jacques for the catch

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1811042 13f79535-47bb-0310-9956-ffa450edef68
2017-10-04 07:13:21 +00:00
Michael Brohl 2c2078768d Fixed: EmailServices.sendMailFromScreen improved to take multiple
attachments with appropriate type along with several email fixes.
(OFBIZ-9395).

This adds the missing service attributes for attachmentType and
attachmentTypeList which did not come with the initial patch. 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1810260 13f79535-47bb-0310-9956-ffa450edef68
2017-10-01 10:39:18 +00:00
Deepak Dixit 259a585512 Fixed: Manually changed the date locale js for cs locale
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1809413 13f79535-47bb-0310-9956-ffa450edef68
2017-09-23 12:39:52 +00:00
Deepak Dixit 344e97909a Fixed: JsLanguageFilesMapping.java location in createJsLanguageFileMapping service, and commiting the auto generated java file for language mapping js.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1809410 13f79535-47bb-0310-9956-ffa450edef68
2017-09-23 12:11:31 +00:00
Deepak Dixit 88493836bc Improved: Moved jquery related js/plugins from images to common-theme webapp and made changes accordinlgy. (OFBIZ-5776)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1809389 13f79535-47bb-0310-9956-ffa450edef68
2017-09-23 10:41:28 +00:00
Rishi Solanki 3d29d37572 Improved: Extend SecurityGroup entity and add name/groupName field. Added groupName field to entity SecurityGroup and related changes done in the data, services and UI. (OFBIZ-9620)
Thanks Suraj Khurana for your patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1809386 13f79535-47bb-0310-9956-ffa450edef68
2017-09-23 10:16:17 +00:00
Jacques Le Roux a360a3ffc7 Improved: Missing foreign key constraint for fields userLoginId &
userPrefGroupTypeId in UserPreference entity
(OFBIZ-9678)

UserPreference.userLoginId is related to UserLogin.userLoginId.
UserPreference.userPrefGroupTypeId is related to 
UserPrefGroupType.userPrefGroupTypeId.

Fixes tests by using one-nofk for UserLogin relation
Uses uppercase for fk-name as remarked by Deepak


Thanks: Aditya and Deepak

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1809383 13f79535-47bb-0310-9956-ffa450edef68
2017-09-23 09:59:24 +00:00
Jacques Le Roux c8e8e740e3 Improved: Missing foreign key constraint for fields userLoginId &
userPrefGroupTypeId in UserPreference entity

UserPreference.userLoginId is related to UserLogin.userLoginId.
UserPreference.userPrefGroupTypeId is related to 
UserPrefGroupType.userPrefGroupTypeId.

(OFBIZ-9678)


Thanks: Aditya

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1809375 13f79535-47bb-0310-9956-ffa450edef68
2017-09-23 08:24:08 +00:00
Jacques Le Roux 15cc03f9c0 Improved: CommonEvents improvements
(OFBIZ-9673)

Reverts r1807045. There is no justification to remove private for "no modifier"

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1807142 13f79535-47bb-0310-9956-ffa450edef68
2017-09-03 12:43:15 +00:00
Jacques Le Roux db7448fdfb Improved: CommonEvents improvements
(OFBIZ-9673)

Replaces private to protected so that CommonEvents.java is more usable to 
derived classes.

Thanks: Wai

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1807045 13f79535-47bb-0310-9956-ffa450edef68
2017-09-02 12:25:13 +00:00
Nicolas Malin db7872484c Fixed: Missing to use the modelTheme for the attached screen on email (OFBIZ-9138 Create a common theme)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1806815 13f79535-47bb-0310-9956-ffa450edef68
2017-08-31 15:39:29 +00:00
Nicolas Malin b15e57df9b Fixed: correct JsLanguageFilesMapping template path from framework/common to common-theme (OFBIZ-9138 Create a common theme)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1806812 13f79535-47bb-0310-9956-ffa450edef68
2017-08-31 15:15:25 +00:00
Deepak Dixit 1a7aee6685 Improved:Use from-field pattern instead of value=dollor pattern in 'set' element
Apply slightly modified patch from jira issue, fixed some typo (OFBIZ-9607)
Thanks Suraj Khurana and Rohit Rai for your contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1806326 13f79535-47bb-0310-9956-ffa450edef68
2017-08-26 20:23:40 +00:00
Deepak Dixit 90181172a1 Fixed: Updated images component reference path, as we removed images component and now these files are part of common-theme componnet.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1806273 13f79535-47bb-0310-9956-ffa450edef68
2017-08-26 08:30:02 +00:00
Rishi Solanki 8d9b566605 Reverted: Local changes mistakenly committed in revision 1806258
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1806259 13f79535-47bb-0310-9956-ffa450edef68
2017-08-26 06:05:15 +00:00
Rishi Solanki b0651cbe4d Improvement: Move all data in applications to the datamodel component. (OFBIZ-9501)
Moved the data which belongs to content with seed reader.
Thanks Saurabh Dixit for your contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1806258 13f79535-47bb-0310-9956-ffa450edef68
2017-08-26 05:54:15 +00:00
Nicolas Malin 0b33186d6f Fixed: Correct library ftl call to render the email body (OFBIZ-9138 Create a common theme)
add possibility to call the ThemeFactory.resolveTheme() with empty request if the visualTheme normaly present on the service context isn't found, so we return the default theme define in general.properties
Thanks to Jacques for raise this problem

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1806237 13f79535-47bb-0310-9956-ffa450edef68
2017-08-25 21:25:26 +00:00
Nicolas Malin 40fdd2ca73 Implemented: Continue the common-theme upload (OFBIZ-9138 Create a common theme)
Five step 
#9 Change all set screen and script that call widget.properties values replaced by call to modelTheme

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1806150 13f79535-47bb-0310-9956-ffa450edef68
2017-08-25 10:02:34 +00:00
Nicolas Malin dad46a5d6b Implemented: Continue the common-theme upload (OFBIZ-9138 Create a common theme)
Five step these step break all the UI
#8 Migrate the ListVisualThemes screen to use theme definition instead information from the VisualTheme entity

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1806148 13f79535-47bb-0310-9956-ffa450edef68
2017-08-25 09:53:56 +00:00
Nicolas Malin 871ed108a6 Implemented: Continue the common-theme upload (OFBIZ-9138 Create a common theme)
Five step WARNING these step is separate on many commit break all the UI
#1 Prepare the common screens to retrieve widget.properties, VisualThemeRessources and common screen location from the modelTheme

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1806137 13f79535-47bb-0310-9956-ffa450edef68
2017-08-25 09:31:58 +00:00
Nicolas Malin 10fa4452b7 Implemented: Continue the common-theme upload (OFBIZ-9138 Create a common theme)
Four step load the visualTheme in user session, freemarker, screen, groovy and service context
Add util to resolve easily a visualTheme

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1806134 13f79535-47bb-0310-9956-ffa450edef68
2017-08-25 08:18:35 +00:00
Nicolas Malin 37ac02106b Implemented: Continue the common-theme upload (OFBIZ-9138 Create a common theme)
Third step bis restore CommonScreens.xml with all screens redirect to common-theme

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1806093 13f79535-47bb-0310-9956-ffa450edef68
2017-08-24 21:56:35 +00:00
Nicolas Malin aec57b51c5 Implemented: Continue the common-theme upload (OFBIZ-9138 Create a common theme)
Third step, move macro ftl libraries and ftl template present on framework common to common theme
At this step, the common-theme is forced like the common component previously.

Main common screens present on CommonScreens.xml, LookupScreens.xml and HelpScreens.xml are moved to common screen with a forced rewrite to common-theme 
Warning this commit is going to follow with a other commit for CommonScreens.xml because LookupScreens.xml and HelpScreens.xml are recreated on common-theme, but to keep the history of CommonScreens.xml it was moved entirely, the second commit restore it with redirect call.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1806091 13f79535-47bb-0310-9956-ffa450edef68
2017-08-24 21:55:06 +00:00
Nicolas Malin deebac1bb1 Fixed: Consistency and Readability improvements for make-value tag (OFBIZ-8986)
Consistency on the attribute order for make-value element as : entity-name, value-field
Thanks to Ankush Upadhyay and Devanshu Vyas for the issue and the corrective patch

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1805956 13f79535-47bb-0310-9956-ffa450edef68
2017-08-23 20:44:44 +00:00
Michael Brohl 076a2f62d8 Improved: EmailServices.sendMailFromScreen improved to take multiple
attachments with appropriate type along with several email fixes.
(OFBIZ-9395)

This patch fixes a number of issues combined in a patch because of the 
code dependencies.

1. it enables to add BCC adress(es) to service 
OrderServices.sendOrderNotificationScreens to oversteer 
ProductStoreEmailSetting of BCC the same was as for CC.

2. a method UtilValidate.isEmailList(String) is added to check a 
comma separated list of email addresses, used for example to check the 
String passed to the new BCC field for an Order-Notification.

3. there are improvements in EmailServices.sendMailFromScreen. The 
attachment type of MailAttachments is now not only .pdf but depends on 
the specific file. This has not been the case before - the mime type was
always hard coded as .pdf. The same goes for the bodyPart content-type 
which is now set to the passed content type or the default text/html 
type. Before this was also always set to text/html. 
Additionally, an attachment that has the mime-type text/plain is not 
rendered with the fop-renderer anymore but with a simple text-renderer. 
Therefore it is possible to send an CSV file as attachment now.

The patch also refactors some catch-Blocks in the 
EmailServices.sendMailFromScreen by using multi-catch since the e
xception handling is always the same.

Thanks Martin Becker for reporting and providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1805459 13f79535-47bb-0310-9956-ffa450edef68
2017-08-18 19:10:41 +00:00
Jacques Le Roux bfd533ccc3 Improved: [DEPRECATION] Replace BigDecimal.ROUND_* by RoundingMode.*
(OFBIZ-9571)

No functional change.

We read at http://docs.oracle.com/javase/7/docs/api/java/math/BigDecimal.html : 
<<Using the integer fields in this class (such as ROUND_HALF_UP) to represent 
rounding mode is largely obsolete; the enumeration values of the RoundingMode 
enum, (such as RoundingMode.HALF_UP) should be used instead.>>

That's an easy global replacement. But it also needs to import the RoundingMode 
class. It was 26 files so I decided to rather clean all the imports in all files
 with the help of Eclipse.

This is a 1st step. I will need to closely look at 2 special class: UtilNumber
and Calculate.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1804953 13f79535-47bb-0310-9956-ffa450edef68
2017-08-14 08:32:21 +00:00
Deepak Dixit a0d99ed40f Improved: Replace fields with id-ne, id-long-ne and id-vlong-ne by id, id-long and id-vlong respectively which are not primary keys (OFBIZ-9355)
Thanks Aditya Sharma for your contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1804026 13f79535-47bb-0310-9956-ffa450edef68
2017-08-03 17:51:07 +00:00
Deepak Dixit fcb3ea53ae Improved: Removing Assignment between UserLogin and SecurtyGroup does not work, (OFBIZ-9543)
Updated label from remove to expire while removing security group from user login, also added new entity-auto service to expire user login security group record. 

Thanks S. Yazied for reporting the issue. 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1803561 13f79535-47bb-0310-9956-ffa450edef68
2017-07-31 18:34:18 +00:00
Taher A. Alkhateeb 609c7d37e3 Improved: minor refactoring to remove miscellanous warnings
Minor code cleanup to remove:
- unused private variables
- unused imports
- improper object castings



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1802172 13f79535-47bb-0310-9956-ffa450edef68
2017-07-17 16:59:18 +00:00
Arun Patidar 44c0caa799 Improved: Set autocomplete to off for all the password fields.(OFBIZ-9471)
Thanks Ritesh Kumar for your contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1801324 13f79535-47bb-0310-9956-ffa450edef68
2017-07-08 21:07:51 +00:00
Deepak Dixit 70ea1b55c2 Fixed sequencing for ILS locale description.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1801314 13f79535-47bb-0310-9956-ffa450edef68
2017-07-08 18:44:48 +00:00
Deepak Dixit 7bb7ac13ea Added mistakenly removed valued for ILS entity uiLabel.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1801312 13f79535-47bb-0310-9956-ffa450edef68
2017-07-08 18:42:29 +00:00
Deepak Dixit 0d6bc54720 Fixed: Removed duplicate uiLable for ILS currency, also fix translation for French locale. (OFBIZ-9413)
Thanks Jacques for reporting

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1801311 13f79535-47bb-0310-9956-ffa450edef68
2017-07-08 18:39:30 +00:00
Deepak Dixit 14f9c7331d Improved: Following uiLabels should move from ProductUiLabels.xml to CommonEntityLabels.xml. (OFBIZ-9408)
ProductShipmentUomAbbreviation_LEN_in
    ProductShipmentUomAbbreviation_WT_g
    ProductShipmentUomAbbreviation_WT_kg
    ProductShipmentUomAbbreviation_WT_lb
    These labels should be written in similer pattern as other labels of "Uom" entity are written in CommonEntityLabels.xml, for example :
    ProductShipmentUomAbbreviation_LEN_in will be written as
    Uom.abbreviation.LEN_in
    <entityName>.<fieldName>.<PrimaryKey>

Thanks Renuka for your contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1801281 13f79535-47bb-0310-9956-ffa450edef68
2017-07-08 11:36:50 +00:00
Deepak Dixit 982356f563 Improved: Remove hard-coded instances of "IN" with ModelService.IN_PARAM (OFBIZ-9434)
Thanks Devanshu and Pawan for your contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1801266 13f79535-47bb-0310-9956-ffa450edef68
2017-07-08 08:35:32 +00:00
Jacques Le Roux db272d8ff4 No functional change,
While checking there were no other cases like in OFBIZ-9432 
(missing path to class), to be consistent I removed the trailing semicolons in 
groovy scripts and made few formatting

I did not changes tests code

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1799867 13f79535-47bb-0310-9956-ffa450edef68
2017-06-26 09:55:10 +00:00
Deepak Dixit 8aecef8445 Improved: Removed unused entity uiLabels for removed currency UOM (OFBIZ-9413)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1799209 13f79535-47bb-0310-9956-ffa450edef68
2017-06-19 13:50:34 +00:00
Deepak Dixit 6f39c2d18d Improved: Update Currency Uom data (OFBIZ-9413)
While adding numericCode to currency UOM, I found that we need to update some old currency UOM, as uomId has been updated.
https://www.currency-iso.org/en/home/tables/table-a1.html
https://www.currency-iso.org/en/home/amendments.html

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1799183 13f79535-47bb-0310-9956-ffa450edef68
2017-06-19 11:47:58 +00:00
Deepak Dixit 29bea444f5 Improved: Added numeric code for Currency UOM. (OFBIZ-9409)
The three-digit numeric code is useful when currency codes need to be understood in countries that do not use Latin scripts and for computerised systems. Where possible the 3 digit numeric code is the same as the numeric country code.

https://www.iso.org/iso-4217-currency-codes.html
https://www.currency-iso.org/en/home/tables/table-a1.html

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1798907 13f79535-47bb-0310-9956-ffa450edef68
2017-06-16 10:26:03 +00:00
Deepak Dixit d78bd1d62b Improved: Only formatting changes.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1798817 13f79535-47bb-0310-9956-ffa450edef68
2017-06-15 10:29:53 +00:00
Deepak Dixit f149a0d95c Improved: Updated Geo data for India (OFBIZ-9406)
India has 29 states and 7 Union Territory. Need to update data as in data Union Territory also added as STATE,
used TERRITORY as GeoTypeId for Union Territories.

Applied patch from jira issue 
- Updated geoTypeId for 7 union territory from STATE to TERRITORY
- Update geoName for Andaman And Nicobar it should be Andaman and Nicobar Islands
- Corrected geoName and gooId and other detail for Delhi union territory
- Corrected to the name for Jammu and Kashmir (And should be in lower camel case)
- Corrected name for Odisha (Orissa>> Odisha)
- Corrected geoName for Puducherry, also added wellKnownText = "Pondicherry"
- Corrected geoName for Tamil Nadu (Tamilnadu >> Tamil Nadu)
- Added data for new state Telangana
- Corrected geoName for Uttarakhand (Uttaranchal >> Uttarakhand)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1798796 13f79535-47bb-0310-9956-ffa450edef68
2017-06-15 08:16:45 +00:00
Deepak Dixit 300f0b2701 Improved: No functional change, only convert the Geo_IN.xml data geoName from upper case to upper camel case (OFBIZ-9406)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1798668 13f79535-47bb-0310-9956-ffa450edef68
2017-06-14 11:28:45 +00:00
Jacques Le Roux c7bda90601 Fixes a bug due to r1797222. I missed in some cases the EntityListIterator
might not exist in the context (this seems still weird to me, but obviously 
there are cases...)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1798060 13f79535-47bb-0310-9956-ffa450edef68
2017-06-08 13:49:23 +00:00
Jacques Le Roux 2388ed61f7 No functional changes.
Replaces Writer.close() in finally by try-with-ressource

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1797743 13f79535-47bb-0310-9956-ffa450edef68
2017-06-06 07:40:51 +00:00
Jacques Le Roux e76e9c04de No functional changes.
Replaces entityListIterator.close() in finally by try-with-ressource

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1797222 13f79535-47bb-0310-9956-ffa450edef68
2017-06-01 13:23:40 +00:00
Jacques Le Roux 21401486e0 Improved: EntityListIterator closed but not in case of exception
(OFBIZ-9385)

This is an improvement only because no cases were reported. But obviously in 
case of unlucky exception after the EntityListIterator creation and before it's 
closed the EntityListIterator remains in memory. 
It should be closed in EntityListIterator.finalize() but the less happens there 
the better.

The solution is to use try-with-ressources

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1797159 13f79535-47bb-0310-9956-ffa450edef68
2017-06-01 08:12:12 +00:00