Commit Graph
110 Commits
Author SHA1 Message Date
Jacques Le Roux ec2b84341e Reverted: "Improved: Hyperlink target-type attribute is deprecated and should be replaced by url-mode (OFBIZ-12091)"
This reverts commit 17eb2e4cf7.

It does not work when using <<target="javascript:........>>
I could change those cases but it's easier and safer to simply revert back to
target-type!

Thanks: James for report
2020-12-18 11:08:32 +01:00
Jacques Le Roux 17eb2e4cf7 Improved: Hyperlink target-type attribute is deprecated and should be replaced by url-mode (OFBIZ-12091)
Same for sub-hyperlink
2020-12-11 16:52:04 +01:00
holivier 2d0be47cdf Documented: Help link using asciidoc files via generated html
(OFBIZ-11693)

Migrate CommonExtHelData.xml to added some <set field="helpAnchor" to
the correct screens

Now in commonext component only asciidoc documents are used, help link
area now link to userDocUri
(ci.apache.org/projects/ofbiz/site/trunk/ofbizdoc as default value in
general.property)
2020-06-06 14:26:33 +02:00
Mathieu Lirzin daa1e6160e Reverted: JSON entity data import and export utility
(OFBIZ-10966)

Implementation was not matching OFBiz code quality requirements.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1867342 13f79535-47bb-0310-9956-ffa450edef68
2019-09-22 12:29:54 +00:00
Jacques Le Roux b16285dd64 Implemented: JSON entity data import and export utility
(OFBIZ-10966)

Currently, we support import/export entity data in XML format.
  Nowadays JSON is widely used in industry, we can have support for JSON format 
  which looks quite similar to XML support.

Here is example of XML data and it's JSON version
<Party partyId="123456" partyTypeId="PERSON" statusId="PARTY_ENABLED"/>
{“Party”: {"partyId":"123456","partyTypeId":"PERSON","statusId":"PARTY_ENABLED”}}

Design Proposal

We can write entityImportJson and entityImportDirJson services for importing 
JSON from screen and directory respectively.
And the entityExportAllJson service for exporting entity data in JSON.

Import Design
 The import service will perform following operations:
 1.) Validate the input JSON data
 2.) On successful validation, convert JSON to OFBiz's entity model 
     (GenericValue)
 3.) The GenericValue will be inserted in database by some handler class for e.g 
     we can write JsonDataHandler, it will convert given JSON to 
     List<GenericValue>, and finally write it to database 
     (Similar pattern is used in XML import).

Export Design
 Based on existing XML pattern the writeXmlText method of GenericEntity class 
 write the exported data in XML format. 
 In the similar way, we can implement writeJsonText to export data in JSON format.

jleroux: I fixed 2 trivials things and at my request in last patch Jayansh added 
"JSON Data Export All" and "JSON Data Import Dir

Thanks: Jayansh Shinde 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1862206 13f79535-47bb-0310-9956-ffa450edef68
2019-06-27 11:49:22 +00:00
Jacques Le Roux 33b1223681 Fixed: Stores can't be modified at ofbizsetup/control/updateProductStore
(OFBIZ-10930)

Same than parent issue (OFBIZ-10567) but in ofbizsetup component (which should 
have been names setup BTW, I created a setup component for that in Jira)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1857692 13f79535-47bb-0310-9956-ffa450edef68
2019-04-17 16:19:00 +00:00
Suraj Khurana 9ca5823a8a Improved: Consistency and Readability improvements for include-menu tag.
(OFBIZ-8972)
Thanks Ankush Upadhyay for reporting and Devanshu Vyas for providing the updated patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1845088 13f79535-47bb-0310-9956-ffa450edef68
2018-10-29 08:29:43 +00:00
Jacques Le Roux 5d4f865cd2 Fixed: ofbizsetup cannot create first customer. problem with state/province
dropdown
(OFBIZ-6054)

Load only seed and seed-initial
Go to url. https://localhost:8443/ofbizsetup/control/firstcustomer

When entering the postal address, the state/province dropdown is empty and 
remains empty regardless of selection of the country dropdown.

Thanks: Wai for report and Oleg Andreyev for patch

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1813833 13f79535-47bb-0310-9956-ffa450edef68
2017-10-30 22:06:33 +00:00
Deepak Dixit 29461cdc47 Fixed: Found some more vlaue=dollor pattern in set element.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1806329 13f79535-47bb-0310-9956-ffa450edef68
2017-08-26 20:33:37 +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
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
Deepak Dixit d09255c0b7 Reverted: Minilang code readability and consistency improvements done at r#1768222, this commit reversed key and description of drop-down in the code.
(OFBIZ-9114)

Thanks  Wei Zhang for reporting the issue.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1772880 13f79535-47bb-0310-9956-ffa450edef68
2016-12-06 12:37:42 +00:00
Divesh Dutta 70eb7ff508 Improvement: Minilang code readability and consistency improvements.
(OFBIZ-8929) (OFBIZ-8930) (OFBIZ-8953) (OFBIZ-8965) (OFBIZ-8972) (OFBIZ-8986) (OFBIZ-8991) 

Thanks: Ankush Upadhyay, Anuj Jain, Abhijeet for your patches. 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1768222 13f79535-47bb-0310-9956-ffa450edef68
2016-11-05 14:34:00 +00:00
Divesh Dutta 738a12bec1 Improvement: Miniland code readability and consistency improvements
(OFBIZ-8744) (OFBIZ-8745) (OFBIZ-8746) (OFBIZ-8748) (OFBIZ-8829) (OFBIZ-8830) (OFBIZ-8907) (OFBIZ-8908) (OFBIZ-8924) (OFBIZ-8925) 

Thanks: Ankush Upadhyay , Sega patidar , Abhijeet Ashapure for your patches.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1768219 13f79535-47bb-0310-9956-ffa450edef68
2016-11-05 14:14:04 +00:00
Divesh Dutta 85ce444748 Improvement: Minilang code readibility and conistency improvements
(OFBIZ-8445) (OFBIZ-8447) (OFBIZ-8448) (OFBIZ-8450) ( OFBIZ-8451) (OFBIZ-8653) (OFBIZ-8740) (OFBIZ-8741) (OFBIZ-8742) (OFBIZ-8743)

Thanks: Devanshu Vyas, Anuj Jain, Sega Patidar, Abhijeet Ashapure for your patches

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1768209 13f79535-47bb-0310-9956-ffa450edef68
2016-11-05 12:41:35 +00:00
Michael Brohl 84759f56c6 Reverted: Maximise the utilisation of common labels in various commonext forms.
(OFBIZ-8121)

The changes were not necessary because the button titles are automatically pulled from FormFieldTitle_updateButton.

Thanks: Nicolas Malin for spotting and reporting.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1761335 13f79535-47bb-0310-9956-ffa450edef68
2016-09-18 15:44:09 +00:00
Michael Brohl 343cb032d5 Improved: Maximise the utilisation of common labels in various commonext forms.
(OFBIZ-8121)

I've slightly modified the patch to only change the button titles.

Thanks: Pierre Smits for reporting and providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1761332 13f79535-47bb-0310-9956-ffa450edef68
2016-09-18 15:00:55 +00:00
Michael Brohl 37d3c8bb32 Improved: Consistent menu names
(OFBIZ-8118)(OFBIZ-8122)(OFBIZ-8123)(OFBIZ-8124)(OFBIZ-8125)(OFBIZ-8126)(OFBIZ-8127)(OFBIZ-8128)(OFBIZ-8129)

Menu names should be in camel case to maintain consistency. I've slightly modified the provided patch to eliminate names with "-" or all lower case also.

Thanks: Tanmay Muley for reporting and providing the patches.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1760059 13f79535-47bb-0310-9956-ffa450edef68
2016-09-09 16:11:55 +00:00
Ashish Vijaywargiya 4a63aaba7d Applied patch from jira issue - OFBIZ-8091 - Clean up commented out code in XML for Common component. Thanks Aman for the contribution.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1759152 13f79535-47bb-0310-9956-ffa450edef68
2016-09-04 07:37:15 +00:00
Jacques Le Roux c8ba932772 Fixes a "typo" in last commit for "Autocompletion for Compound Widget" - https://issues.apache.org/jira/browse/OFBIZ-7061
We used targetNamespace (should only be used in schema) instead of xsi:schemaLocation



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1749634 13f79535-47bb-0310-9956-ffa450edef68
2016-06-22 05:58:26 +00:00
Jacques Le Roux 89212904bd Completes and finish "Autocompletion for Compound Widget" - https://issues.apache.org/jira/browse/OFBIZ-7061
This is the 2nd step: puts back the original names, so it will be transparent for remaining references in xml catalogs, Java code, etc.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1749489 13f79535-47bb-0310-9956-ffa450edef68
2016-06-21 11:37:47 +00:00
Jacques Le Roux 4931db1ed9 Completes and finish "Autocompletion for Compound Widget" - https://issues.apache.org/jira/browse/OFBIZ-7061 by replacing xsd files references in xml files by -ns.xsd files and removing the concerned xsd files
This is a 1st step, in a 2nd I will put back the original names, so it will be transparent for remaining reference in xml catalogs, Java code, etc.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1749488 13f79535-47bb-0310-9956-ffa450edef68
2016-06-21 11:14:16 +00:00
Divesh Dutta abbe6db3a7 [OFBIZ-7449] When fetching logo image of a party, system is not respecting from date or through date. Fixed this issue by filtering records by date.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1749092 13f79535-47bb-0310-9956-ffa450edef68
2016-06-18 20:38:16 +00:00
Deepak Dixit d9a8278ae6 (OFBIZ-7245) Renamed groovy file in upper camel case as per best practices
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1747850 13f79535-47bb-0310-9956-ffa450edef68
2016-06-11 06:12:27 +00:00
Deepak Dixit bee009fec5 (OFBIZ-7222) Relocate .groovy files in the commonext component
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1747751 13f79535-47bb-0310-9956-ffa450edef68
2016-06-10 17:09:26 +00:00
Deepak Dixit 83696e3203 (OFBIZ-7021) Renamed framework common component ftl file name from lower camel case to upper camel case pattern.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1744783 13f79535-47bb-0310-9956-ffa450edef68
2016-05-20 18:52:54 +00:00
Deepak Dixit 209b95cbbf (OFBIZ-6823) relocate .ftl files in the framework/common component
Thanks Pierre for your contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1740497 13f79535-47bb-0310-9956-ffa450edef68
2016-04-22 12:28:46 +00:00
Deepak Dixit d1f0ef3831 (OFBIZ-6814) Moved changeOrgPartyId.groovy to WEB-INF/actions, also removed unused ofbizsetup/viewcontact.ftl file.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1740481 13f79535-47bb-0310-9956-ffa450edef68
2016-04-22 11:11:23 +00:00
Deepak Dixit 5063287ddf (OFBIZ-6824) Apply slightly modified patch from jira issue, updated path for ping.ftl and showDateTime.ftl in controller.xml
============================================================
relocate .ftl files in the framework/webtools component
============================================================
Thanks  Pierre Smits for your contribution. 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1738581 13f79535-47bb-0310-9956-ffa450edef68
2016-04-11 12:57:45 +00:00
Jacques Le Roux a11036b215 A patch from Forrest Rae for "ApplicationDecorator Entity-One Screen Action Incomplete Primary Key" https://issues.apache.org/jira/browse/OFBIZ-6918
ApplicationDecorator entity-one screen action supplies an incomplete primary key.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1732721 13f79535-47bb-0310-9956-ffa450edef68
2016-02-28 11:58:10 +00:00
Hans Bakker 9d39583bcf be able to set accounting company in the header, so other companent can change it too. https://issues.apache.org/jira/browse/OFBIZ-6802
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1728584 13f79535-47bb-0310-9956-ffa450edef68
2016-02-05 01:45:50 +00:00
Deepak Dixit c523a77d08 (OFBIZ-6708) Applied patch from jira issue.
============================================================
Fixed Missing userLogin error on party profile screen when 1st content is non public. 

Thanks Jacques for reporting the issue :) and Thanks Vishal for providing the patch for the issue.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1715501 13f79535-47bb-0310-9956-ffa450edef68
2015-11-21 12:02:00 +00:00
Jacques Le Roux 901b1a4a06 Removes tooltip="${uiLabelMap.CommonRequired}" from fields, https://issues.apache.org/jira/browse/OFBIZ-6691
Instead of a quiet S/R action, this was an unexpected pain in the ass. A considerable number of forms:
    EmployeeForms.xml
    EmploymentForms.xml
    EmplPositionForms.xml
    GlobalHRSettingForms.xml
    RecruitmentForms.xml
    QuoteForms.xml
    PartyForms.xml
    StoreForms.xml
    ContactForms.xml
    FixedAssetForms.xml
    TaskForms.xml
    scrumForms.xml
    TaskForms.xml
contained a large number of fields with 
  tooltip="${uiLabelMap.CommonRequired}"
but no 
  required-field="true"


Of course display and display-entity should not be concerned, I spotted a number of them in the lot.

I also removed a bunch of harcoded * at end of labels (those followed by required-field="true"* and spotted a number of others }*"  who still need to be carefully reviewed to see if required=true is not missing there :/

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1709882 13f79535-47bb-0310-9956-ffa450edef68
2015-10-21 16:57:25 +00:00
Jacques Le Roux 7dc24b6902 A slightly modified patch from Taher Alkhateeb for <<replace widget-style="required" with required-field="true">> https://issues.apache.org/jira/browse/OFBIZ-6690
jleroux: after a cursory review, I simply did the chunk related to exampleName by hand, it needed more work. I also removed some trailing blanks.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1709872 13f79535-47bb-0310-9956-ffa450edef68
2015-10-21 16:00:02 +00:00
Jacques Le Roux 3b423ca8fe Misc. non functional changes which were pending in my working copy
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1709213 13f79535-47bb-0310-9956-ffa450edef68
2015-10-17 22:00:40 +00:00
Nicolas Malin 895c9856b3 Cleaning forms code is needed after setting default-value in list-options and entity-options, patch related to OFBIZ-6524 and follows the resolution of OFBIZ-6490 and OFBIZ-6489. Thanks Gil Portenseigne for this effort
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1686674 13f79535-47bb-0310-9956-ffa450edef68
2015-06-20 21:58:05 +00:00
Hans Bakker 834c6ac2d8 revert of unwanted commit, sorry!
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1535287 13f79535-47bb-0310-9956-ffa450edef68
2013-10-24 06:42:34 +00:00
Hans Bakker 45011c0ed1 reorganizing of files
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1535286 13f79535-47bb-0310-9956-ffa450edef68
2013-10-24 06:39:36 +00:00
Jacopo Cappellato f77307f71e Removed commented out lines created for test purposes.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1523739 13f79535-47bb-0310-9956-ffa450edef68
2013-09-16 18:13:51 +00:00
Jacques Le Roux c70c41921d "Fix online help issues" https://issues.apache.org/jira/browse/OFBIZ-5320
This fixes most of the issues but some are remaining, I report them in OFBIZ-5320

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1523423 13f79535-47bb-0310-9956-ffa450edef68
2013-09-15 09:41:28 +00:00
Jacques Le Roux b591e84b2a A slightly modified patch from Gil Portenseigne for "Missing PartyCountryCode uiLabel" https://issues.apache.org/jira/browse/OFBIZ-5138
The label ${uiLabelMap.PartyCountryCode} is used several times in the project but i could not find the definition of PartyCountryCode in label definition files.
I looked further and found CommonCountryCode in label file which is not used and fill the need for PartyCountryCode. To solve this I propose to rename all PartyCountryCode to CommonCountryCode.

jleroux: I also moved CommonCountryCode, CommonCountryCodeMissing and CommonCountryMissing from PartyUiLabels.xml to CommonUiLabels.xml





git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1447664 13f79535-47bb-0310-9956-ffa450edef68
2013-02-19 10:55:10 +00:00
Jacques Le Roux 4395b7967d A patch from Daniel Riquelme "sessionAttributes doesn't work from screen widget" https://issues.apache.org/jira/browse/OFBIZ-4669
Reported by Kiran:
In the screen widget, add a set action that refers to sessionAttributes, it doesn't work.

e.g: Following doesn't work:
<set field="titleProperty" value="${sessionAttributes.autoName}"/>

Following works:
<set field="titleProperty" from-field="autoName" from-scope="user"/>



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1340821 13f79535-47bb-0310-9956-ffa450edef68
2012-05-20 20:21:06 +00:00
Jacques Le Roux 028b8497d8 Replaces title="${uiLabelMap.CommonEmptyHeader}" by title=" " where it's known to not be a problem. Here with links styled by widget-style="smallSubmit"
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1340374 13f79535-47bb-0310-9956-ffa450edef68
2012-05-19 08:48:24 +00:00
Jacques Le Roux 3369dca046 Replaces title="${uiLabelMap.CommonEmptyHeader}" by title=" " where it's known to not be a problem. Here with links styled by widget-style="buttontext"
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1340373 13f79535-47bb-0310-9956-ffa450edef68
2012-05-19 08:45:18 +00:00
Jacques Le Roux a60bc0b5d9 Moves the line
<set field="layoutSettings.suppressTab" value="ofbizsetup"/><!-- diseable ofbiz setup by default -->
from ApplicationDecorator to GlobalDecorator screen.

This in order to prevent showing the Setup application in all framework components (example, examplext, webtools) when demo data are loaded. 
No side effects when loading only extseed data, Setup always shows (logical and tested)



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1337644 13f79535-47bb-0310-9956-ffa450edef68
2012-05-12 20:52:30 +00:00
Jacques Le Roux 27822125e1 setCountryStatesEventJs.ftl was a specialisation of setDependentDropdownValuesJs.ftl introduced 2 years ago with it. It has never been used and finally whan I thnk about it I don't see any needs to keep (slim down spirit)
So this to remove it and clean duplicated references/comments about setDependentDropdownValuesJs.ftl

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1310954 13f79535-47bb-0310-9956-ffa450edef68
2012-04-08 05:19:48 +00:00
Hans Bakker a2c5814eca fix the setup component, move some paypal gateway code back to seed again
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1300496 13f79535-47bb-0310-9956-ffa450edef68
2012-03-14 10:24:05 +00:00
Hans Bakker 573ffea86c remove all component dependent stamements out of commonext and make the systeminfo service more generic and not only serving portlets. Comment by Adrian in the userlist. No conversion program provided because this data is only temporary can can be deleted from a menu
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1292180 13f79535-47bb-0310-9956-ffa450edef68
2012-02-22 08:35:59 +00:00
Erwan de Ferrieres 8c0a41e885 tabs to spaces, no functional changes - xml files
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1230481 13f79535-47bb-0310-9956-ffa450edef68
2012-01-12 10:51:58 +00:00
Hans Bakker a56c0b3f7b update the system info messages: remove dependency on my portal and provide links directly into workeffort, projectmanager and scrum
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1213562 13f79535-47bb-0310-9956-ffa450edef68
2011-12-13 04:23:50 +00:00