This repository has been archived by the owner on May 9, 2020. It is now read-only.
Merge remote-tracking branch 'refs/remotes/apache/trunk' into trunk #12
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
… the shopping list. Thanks Ankit Joshi for contribution. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1752894 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1752895 13f79535-47bb-0310-9956-ffa450edef68
… contribution. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1752896 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1752898 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1752900 13f79535-47bb-0310-9956-ffa450edef68
…arty Attribute record. Thanks Ankit Joshi for contribution. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1752901 13f79535-47bb-0310-9956-ffa450edef68
…nks Ankit Joshi for contribution. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1752905 13f79535-47bb-0310-9956-ffa450edef68
…ed groovy script path. Thanks Vishal Chhabria for contribution. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1752906 13f79535-47bb-0310-9956-ffa450edef68
…fbiz.*.Thanks to Taher for working on it. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1752920 13f79535-47bb-0310-9956-ffa450edef68
…n. Thanks Ankit Joshi for contribution. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1752921 13f79535-47bb-0310-9956-ffa450edef68
… this code on local box for testing, It was taking too much time to load system font. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1752925 13f79535-47bb-0310-9956-ffa450edef68
… to the customer. Updated the reference of 'showPortletDecorator'(which doesn't exist) to 'showPortletMainDecorator'. Thanks Swapnil M Mane for the contribution. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1752928 13f79535-47bb-0310-9956-ffa450edef68
…rms' and 'AP/AR-InvoiceForms'. Thanks Amardeep Singh Jhajj for reporting the issue and Chandan Khandelwal for providing the patch. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1752933 13f79535-47bb-0310-9956-ffa450edef68
…ode in Java source for Accounting. Thanks Harsh for the contribution. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1752940 13f79535-47bb-0310-9956-ffa450edef68
…cation Event form. Modified the position of the Parent Comm Event Id field so that it does not look distorted. Thanks Aditya Patwa for the contribution. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1752941 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1752946 13f79535-47bb-0310-9956-ffa450edef68
…r for sfa component to fix label issue in SFA Communication Event Content sub menu. Thanks Aditya Patwa for the contribution. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1752947 13f79535-47bb-0310-9956-ffa450edef68
…omponent is not getting updated. Thanks Ravi for the contribution. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1752952 13f79535-47bb-0310-9956-ffa450edef68
…ode in Free Marker Template for Accounting. Thanks so much Aman for the contribution. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1752953 13f79535-47bb-0310-9956-ffa450edef68
…ded on quick add form. As the 'roleTypeId' 'ACCOUNT_LEAD' used on invocation of service 'createPartyGroupRoleAndContactMechs', hence placed it inside the condition to set it only when it is invoked, so that correct 'roleTypeId' is returned. Thanks Aditi Patidar for your contribution. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1752954 13f79535-47bb-0310-9956-ffa450edef68
…ry to merge two contacts. Thanks Ravi and Deepak for the contribution. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1752955 13f79535-47bb-0310-9956-ffa450edef68
…screen of scrum component. Thanks Aditi Patidar for the contribution. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1752956 13f79535-47bb-0310-9956-ffa450edef68
…lated to frequent build failures. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1752960 13f79535-47bb-0310-9956-ffa450edef68
…mponent ftl files for improved readability. Thanks Vaibhav Jain for your contribution. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1752964 13f79535-47bb-0310-9956-ffa450edef68
…ode in Java source for Content. Thanks so much Harsh for the contribution. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1752965 13f79535-47bb-0310-9956-ffa450edef68
…t by sending it's value. Thanks Chandan Khandelwal for your contribution. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1752966 13f79535-47bb-0310-9956-ffa450edef68
…screen for creating new payment methods. Thanks Chandan Khandelwal for the contribution. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1752972 13f79535-47bb-0310-9956-ffa450edef68
…derList screen. Thanks Akshay for the contribution. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1752977 13f79535-47bb-0310-9956-ffa450edef68
…rtificate to use widgets instead of ftl" https://issues.apache.org/jira/browse/OFBIZ-6302 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
… <<Rename OFBiz artifacts from 'org.ofbiz.*' to org.apache.ofbiz.*'>> - https://issues.apache.org/jira/browse/OFBIZ-6274 We had already the org.apache logger. IIRW, it's because we use Apache libs (eg Tomcat) and we want to be warned when issues appear at this level. By adding the org.apache.ofbiz info logger we should keep warnings a the org.apache level and get info at the org.apache.ofbiz level I'm though unsure why we needed <logger name="org.apache.ofbiz.base.converter.Converters" level="warn"/> which seems contradictory. I Googled for an explanation but I'm still short of it. I'll check with http://logging.apache.org/log4j/2.x/manual/configuration.html. For now it works, so I apply the patch because it's already a relief and will help to resolve the harder problem of instable tests results. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1753029 13f79535-47bb-0310-9956-ffa450edef68
… and storage logic. Thanks Sumit for creating the issue and providing initial patch. Thanks Ravi for providing the latest patch. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1758041 13f79535-47bb-0310-9956-ffa450edef68
…nt" https://issues.apache.org/jira/browse/OFBIZ-8021 jleroux: I let Hans double-check for the vocabulary git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1758062 13f79535-47bb-0310-9956-ffa450edef68
…mponent" https://issues.apache.org/jira/browse/OFBIZ-8010 jleroux: I let Hans double-check for the vocabulary git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1758063 13f79535-47bb-0310-9956-ffa450edef68
… files git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1758088 13f79535-47bb-0310-9956-ffa450edef68
…he inventory" https://issues.apache.org/jira/browse/OFBIZ-7943 When user cancel shipment receipt on PO it calls the service cancelReceivedItems that should revert inventory received. It doubles it instead because expression ${-1 * inventoryItem.quantityOnHandTotal} does not work really and does not return negative value. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1758089 13f79535-47bb-0310-9956-ffa450edef68
… internal company show it has been generated for." https://issues.apache.org/jira/browse/OFBIZ-7920 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
…task with non-numerical ID" https://issues.apache.org/jira/browse/OFBIZ-7971 The Gantt diagram is not generated when at least one of the taks composing it has a non-numerical workEffortId (e.g. A10001). When importing data or using duplication of workEffort, you can use such id. How to reproduce : - Check the Gantt diagram, it should be working fine : https://localhost:8443/projectmgr/control/ganttChart?projectId=9100 - Create a task with a non-numerical id for the project 9100 or iImport this entry : <entity-engine-xml> <WorkEffort workEffortId="A1000" sequenceNum="1" workEffortTypeId="TASK" currentStatusId="PTS_CREATED" lastStatusUpdate="2007-12-14 16:45:21.831" workEffortParentId="9101" scopeEnumId="WES_PRIVATE" workEffortName="ProblemTask" estimatedStartDate="2007-12-03 00:00:00.0" estimatedCompletionDate="2007-12-05 00:00:00.0" revisionNumber="1"/> </entity-engine-xml> - Check the Gantt diagram again and now it's failing : https://localhost:8443/projectmgr/control/ganttChart?projectId=9100 (there is an error in the javascript console) git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1758101 13f79535-47bb-0310-9956-ffa450edef68
…- OFBIZ-7534 For some reason we completely forgot to add the themes as gradle sub projects. The current implementation of gradle treats every component as a sub project and all themes are ofbiz components, and as such should be sub projects as well. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1758102 13f79535-47bb-0310-9956-ffa450edef68
…issues.apache.org/jira/browse/OFBIZ-8055 The label CommonCode is used in various places, however the label doesn't exist. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1758143 13f79535-47bb-0310-9956-ffa450edef68
…to set the the GFM viewer eclipse plugin to use an user temp folder (this should be the default :/) git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1758178 13f79535-47bb-0310-9956-ffa450edef68
… component" https://issues.apache.org/jira/browse/OFBIZ-7507 jleroux: I have removed the useless ASL2 header and Capitalised the Product word git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1758179 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1758274 13f79535-47bb-0310-9956-ffa450edef68
================================ Create a Customer fails because password is missing ================================ Thanks Montalbano Florian and Supatthra Nawicha for your contribution. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1758280 13f79535-47bb-0310-9956-ffa450edef68
…anks Deepak Dixit for reminder. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1758364 13f79535-47bb-0310-9956-ffa450edef68
… references of the maincss.css from source code, following is done-
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
…ut all default ports git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1758461 13f79535-47bb-0310-9956-ffa450edef68
…ut all default ports Better English from Scott (I wrote it write in the comment but not in the class) git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1758522 13f79535-47bb-0310-9956-ffa450edef68
…AgreementItemType entity . Thanks Amit Gadaley for your contribution. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1758614 13f79535-47bb-0310-9956-ffa450edef68
…AgreementItemType entity . Thanks Amit Gadaley and Rishi Solanki for your contribution. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1758618 13f79535-47bb-0310-9956-ffa450edef68
…BudgetItemAttribute entity . Thanks Amit Gadaley and Rishi Solanki for your contribution. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1758621 13f79535-47bb-0310-9956-ffa450edef68
…BudgetItemType entity . Thanks Amit Gadaley and Rishi Solanki for your contribution. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1758624 13f79535-47bb-0310-9956-ffa450edef68
…BudgetItemTypeAttr entity . Thanks Amit Gadaley and Rishi Solanki for your contribution. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1758626 13f79535-47bb-0310-9956-ffa450edef68
…BudgetItemTypeAttr entity . Thanks Amit Gadaley and Rishi Solanki for your contribution. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1758627 13f79535-47bb-0310-9956-ffa450edef68
This is a bug in which createTenant crashes due to groovy gstring evaluation where a string is needed. The fix is simple by removing gstring and passing variables directly. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1758662 13f79535-47bb-0310-9956-ffa450edef68
…ttps://issues.apache.org/jira/browse/OFBIZ-8055 Legal statements are not required in readme files, as per consensus in dev mail thread with title 'Shorter ASL2 header in short files'. The mail thread started here: http://ofbiz.markmail.org/message/pc5bzrsiupef7xjt jleroux: I modified the accounting/lib/README file the example/lib/README file Formatted the Birt README file git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1758700 13f79535-47bb-0310-9956-ffa450edef68
… component" https://issues.apache.org/jira/browse/OFBIZ-7507 After commit, please rename readme files of components manufacturing assetmaint birt ecommerce lucene myportal passport projectmgr scrum solr jleroux: Due to content I guess Pierre meant to add the .md suffix I have also removed the useless ASL2 header of example/lib/README file git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1758702 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1758738 13f79535-47bb-0310-9956-ffa450edef68
…CommonStatus in various ecommerce forms" https://issues.apache.org/jira/browse/OFBIZ-8102 There are forms in the ecommerce component referencing the status. This issue is about applying the CommonLabel label where it is possible in these forms. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1758774 13f79535-47bb-0310-9956-ffa450edef68
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.