This repository has been archived by the owner on May 9, 2020. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 552
Release13.07 #4
Open
huaian
wants to merge
848
commits into
trunk
Choose a base branch
from
release13.07
base: trunk
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Release13.07 #4
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
------------------------------------------------------------------------ r1710348 | jleroux | 2015-10-24 16:57:13 +0200 (sam. 24 oct. 2015) | 4 lignes A patch from Christian Carlow for "FindService.performFindList listSize = null causes errors when list is empty because the rendering system expects 0" https://issues.apache.org/jira/browse/OFBIZ-6425 I was testing at catalog/control/FindProduct. I just changed ProductForms.xml#ListProducts service-name from performFind to performFindList. Then upon initially visiting the page the error is displayed. ------------------------------------------------------------------------ � git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release13.07@1710351 13f79535-47bb-0310-9956-ffa450edef68
this fixes the lead creation bug in the createLead service identified in above JIRA git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release13.07@1711038 13f79535-47bb-0310-9956-ffa450edef68
------------------------------------------------------------------------ r1711513 | jleroux | 2015-10-30 18:20:18 +0100 (ven. 30 oct. 2015) | 1 ligne Fixes a French label ------------------------------------------------------------------------ � git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release13.07@1711515 13f79535-47bb-0310-9956-ffa450edef68
------------------------------------------------------------------------ r1711519 | jleroux | 2015-10-30 18:26:25 +0100 (ven. 30 oct. 2015) | 1 ligne Fixes a typo after "clearchris"'s report on user ML. ------------------------------------------------------------------------ � git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release13.07@1711525 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release13.07@1711528 13f79535-47bb-0310-9956-ffa450edef68
------------------------------------------------------------------------ r1686002 | jleroux | 2015-06-17 14:37:06 +0200 (mer. 17 juin 2015) | 6 lignes OFBIZ-6513 - countyGeoId and geoPointId fields are missing in PartyAndPostalAddress entity view Rather than adding both fields, I rather adds an allias-all. Then if ever we add new fields to PostalAddress they will not miss there. Being only an addition, this does not need any data migration explanations ------------------------------------------------------------------------ � git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release13.07@1711739 13f79535-47bb-0310-9956-ffa450edef68
…hings git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release13.07@1711766 13f79535-47bb-0310-9956-ffa450edef68
…WebtoolsUiLabels.xml present before the '<xml' element git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release13.07@1711915 13f79535-47bb-0310-9956-ffa450edef68
� git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release13.07@1714302 13f79535-47bb-0310-9956-ffa450edef68
r1711038 in R13.07 r1711040 in R12.04 From Hans's comment at OFBIZ-6703 "Cannot create more than one lead in the SFA component by same user" Revert in R14.12 was not a good idea, it would be missing there, r1622161 was committed 03/Sep/14 for OFBIZ-5750 "Convert Party entites CRUD service from simple to entity-auto" before R14.2 was created git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release13.07@1714408 13f79535-47bb-0310-9956-ffa450edef68
------------------------------------------------------------------------ r1714410 | jleroux | 2015-11-15 09:40:31 +0100 (dim. 15 nov. 2015) | 35 lignes A patch from Ankush Upadhyay attached by Ratnesh Upadhyay with analysis comments from Swapnil Shah for "Require Inventory of Marketing Package Product can't be shipped" https://issues.apache.org/jira/browse/OFBIZ-817 reported by Daniel Kunkel Setting Require Inventory for a Marketing Product and (or ???) its Marketing Component causes the shiping system to fail. The shipping system reports nothing is ready to ship, ( [0 + 0 = 0] < 1 ). ---- exception report ---------------------------------------------------------- [TransactionUtil.setRollbackOnly] Calling transaction setRollbackOnly; this stack trace shows where this is happening: Exception: java.lang.Exception Message: Error in simple-method [Quick ships an entire order from multiple facilities [file:/wrk/ofbiz/ofbiz/applications/ product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml#quickShipEntireOrder]]: ; [Warning: no shipments created; could not find anything ready and needing to be shipped.] ---- stack trace --------------------------------------------------------------- java.lang.Exception: Error in simple-method [Quick ships an entire order from multiple facilities [file:/wrk/ofbiz/ofbiz/ applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml#quickShipEntireOrder]]: ; [Warning: no shipments created; could not find anything ready and needing to be shipped.] Swapnil Shah As per further testing over trunk, it is found that setting requireInventory=Y over any marketing package type product means that for component products as well it would get honored even if its not set as Y for each or any of the components. In other words say, * The flag is as set as Y for a marketing package type product A and it has ATP/QOH=15/15 * Product A has two component B & C as finished good and each having ATP/QOH = 8/8 and requireInventory is not set as Y for any of the components. * If sales order is attempted to be placed for A with ordered qty = 10 then system won't allow it to be placed because component B & C don't have sufficient ATP (irrespective of fact that none of them have requireInventory=Y) Expected behavior in above case should be to allow user to place the order for Product A as it has sufficient ATP=15 to fulfill the ordered qty=10. If the ordered qty happens to exceed 15 then only it should prevent ordering based on requireInventory=Y Ideally we shouldn't use the MARKETING_PKG product types as its a parent product type for product types MARKETING_PKG_AUTO, MARKETING_PKG_PICK. Thus we have changed the logic in "getMktgPackagesAvailable" service to handle product types MARKETING_PKG_AUTO, MARKETING_PKG_PICK to handle the reported issues more gracefully. Following are the changes we have done in the service vis-a-vis RequireInventory=Y setting for Package and/or its components. Now at the time of add to cart : # if product type is MARKETING_PKG_AUTO then system will check it's own ATP instead of checking it's component ATP to allow or prevent placing order for package product.. # If product type is MARKETING_PKG_PICK then system will check it's component ATP to allow or prevent placing order for package product. jleroux: I agree with Swapnil,, since we can receive inventories of MARKETING_PKG_AUTO, without regard to their components availability, I see no reasons why we could not ship them. BTW I tried the same with MARKETING_PKG_PICK and it works as expected: you need to have the components at hand to ship them even if you tried to receive an inventory before. Since they need to be picked this makes sense. While at it I fixed a related French label, so it will be backported as well... ------------------------------------------------------------------------ � git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release13.07@1714412 13f79535-47bb-0310-9956-ffa450edef68
… hand (conflicts) ------------------------------------------------------------------------ r1714571 | jleroux | 2015-11-16 13:24:13 +0100 (lun. 16 nov. 2015) | 2 lignes Updates commons-collections lib from 3.2.1 to 3.2.2 [CVE-2016-2170] The infamous Java serialization vulnerability ------------------------------------------------------------------------ git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release13.07@1714576 13f79535-47bb-0310-9956-ffa450edef68
------------------------------------------------------------------------ r1714657 | jleroux | 2015-11-16 21:32:00 +0100 (lun. 16 nov. 2015) | 1 ligne Fixes OFBIZ-6727 - Webtools Entity edition, the suggested date and time formats are not localised ------------------------------------------------------------------------ � git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release13.07@1714659 13f79535-47bb-0310-9956-ffa450edef68
…nto account cancelled orders. Thanks Jacques for reporting the issue. Applying fix from trunk r1715471 with some minor changes. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release13.07@1715473 13f79535-47bb-0310-9956-ffa450edef68
=== (OFBIZ-6683) Corrected the lookup-target request for AddCommEventWorkEffort, Thanks Irshad for your contribution. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release13.07@1715480 13f79535-47bb-0310-9956-ffa450edef68
=== (OFBIZ-6683) Corrected the lookup-target request for AddCommEventWorkEffort, Thanks Irshad for your contribution. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release13.07@1715483 13f79535-47bb-0310-9956-ffa450edef68
============================================================================================== Applied bug fix from jira issue - OFBIZ-6741 - The state list is not populated when trying to add a shipping address from the Quick Finalize Order screen. Thanks Aditya for reporting the issue and providing the fix for the same. ============================================================================================== git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release13.07@1715497 13f79535-47bb-0310-9956-ffa450edef68
=== (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/branches/release13.07@1715503 13f79535-47bb-0310-9956-ffa450edef68
… was generating error as well. Applying patch from OFBIZ-6534. Thanks Pierre Smits for reporting the issue. Applying fix from trunk r1715531. Also applying the relevant fix from trunk r1704227. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release13.07@1715534 13f79535-47bb-0310-9956-ffa450edef68
------------------------------------------------------------------------ r1717058 | jleroux | 2015-11-29 14:08:27 +0100 (dim. 29 nov. 2015) | 3 lignes Temporary workaround which should be used by anyone responsible for OFBiz security until OFBIZ-6568 is fixed. To get the contrast-rO0.jar see https://github.com/Contrast-Security-OSS/contrast-rO0 Note that we are safe from an exploit using the commons collections see OFBIZ-6726. The demos will be using contrast-rO0.jar starting this night. ------------------------------------------------------------------------ � git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release13.07@1717060 13f79535-47bb-0310-9956-ffa450edef68
------------------------------------------------------------------------ r1717180 | jleroux | 2015-11-30 06:23:29 +0100 (lun. 30 nov. 2015) | 3 lignes Temporary workaround which should be used by anyone responsible for OFBiz security until OFBIZ-6568 is fixed. To get the contrast-rO0.jar see https://github.com/Contrast-Security-OSS/contrast-rO0 In r1717058 I missed to add start-batch-secure and both-secure ------------------------------------------------------------------------ � git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release13.07@1717183 13f79535-47bb-0310-9956-ffa450edef68
…y hand) ------------------------------------------------------------------------ r1717682 | jleroux | 2015-12-02 22:24:35 +0100 (mer. 02 déc. 2015) | 3 lignes Fixes "POI security fix" https://issues.apache.org/jira/browse/OFBIZ-6751 Updates POI from poi-3.10.1-20140818.jar to poi-3.13-20150929.jar ------------------------------------------------------------------------ git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release13.07@1717686 13f79535-47bb-0310-9956-ffa450edef68
…th edited by hand) ------------------------------------------------------------------------ r1717760 | jleroux | 2015-12-03 14:26:23 +0100 (jeu. 03 déc. 2015) | 3 lignes Updates Tomcat to 7.0.65 Though disputed CVE-2013-2185 indicates a possible vulnerability with jasper.jar. Better safe than sorry: I will backport to all concerned branches (R14 and R13) ------------------------------------------------------------------------ git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release13.07@1717762 13f79535-47bb-0310-9956-ffa450edef68
…th handled by hand) ------------------------------------------------------------------------ r1718023 | jleroux | 2015-12-04 21:30:39 +0100 (ven. 04 déc. 2015) | 1 ligne Upgrades Axis2 to 1.6.3, with its dependencies on Axiom 1.2.9 and Neethi 3.0.2 ------------------------------------------------------------------------ git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release13.07@1718028 13f79535-47bb-0310-9956-ffa450edef68
…th handled by hand) ------------------------------------------------------------------------ r1718109 | jleroux | 2015-12-05 18:39:44 +0100 (sam. 05 déc. 2015) | 1 ligne Updates Spring Framework to 4.2.3, rename org.springframework.*-3.1.0.M2.jar to spring-*-4.2.3.jar as it's the name used by Spring. ------------------------------------------------------------------------ git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release13.07@1718111 13f79535-47bb-0310-9956-ffa450edef68
------------------------------------------------------------------------ r1719094 | jleroux | 2015-12-10 16:17:02 +0100 (jeu. 10 déc. 2015) | 17 lignes A patch from Pierre Smits for "Wrong purchase invoice item type for product type IDs RAW_MATERIAL, GOOD" https://issues.apache.org/jira/browse/OFBIZ-6763 Reported by Michael Powacht System incorrectly derives invoice item type INV_FPROD_ITEM (instead of PINV_FPROD_ITEM, for example) in purchase invoices for purchase orders with products of type RAW_MATERIAL and GOOD. As a result, the GL account derivation is incorrect as well where a revenue GL account gets debited instead of GL "Uninvoiced Shipment Receipts". The incorrect accounting entry posted is: DR Revenue (as a result of invoice item type INV_FPROD_ITEM) CR A/P The correct entry should be: DR Uninvoiced Shipment Receipts (derived from PINV_FPROD_ITEM) CR A/P It seems the above is caused by missing entries in table invoice_item_type_map where INVOICE_ITEM_MAP_KEY should contain RAW_MATERIAL and GOOD and/or PRODUCT_ORDER_ITEM. The above symptom does not affect the Goods Receipt Transactions, which gets correctly posted as: DR Inventory CR Uninvoiced Shipment Receipts jleroux: Rupert Howell gave the missing data in a comment, Pierre the patch ------------------------------------------------------------------------ � git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release13.07@1719096 13f79535-47bb-0310-9956-ffa450edef68
…the contained hyperlink git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release13.07@1720907 13f79535-47bb-0310-9956-ffa450edef68
…result. Applying patch from OFBIZ-6185. Thanks Pierre Smits for reporting the issue. Applying fix from trunk r1720920. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release13.07@1720923 13f79535-47bb-0310-9956-ffa450edef68
… forward and backward in a create order process. Applying patch from OFBIZ-6043. Thanks Pierre Smits for reporting the issue. Applying fix from trunk r1720932. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release13.07@1720935 13f79535-47bb-0310-9956-ffa450edef68
------------------------------------------------------------------------ r1721067 | jleroux | 2015-12-20 22:14:05 +0100 (dim. 20 déc. 2015) | 6 lignes Prevents a possible "NPE", found in trunk demo logs (it's a treasure I will continue to dig in...) freemarker.core.InvalidReferenceException: The following has evaluated to null or missing: ==> lastContent.description [in template "component://ecommerce/webapp/ecommerce/content/viewcontent.ftl" at line 38, column 38] ------------------------------------------------------------------------ � git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release13.07@1721069 13f79535-47bb-0310-9956-ffa450edef68
------------------------------------------------------------------------ r1765108 | jleroux | 2016-10-15 22:56:04 +0200 (sam. 15 oct. 2016) | 15 lignes Fixed: Updating Party Content Image does not work (OFBIZ-8458) Steps to reproduce - - Go to any Party Profile. - Add an image from Party Content section. - Once image is added, click on the contentId, it will redirect you to the Party Content screen. - Click on Edit button and upload a new image. Expected - Image should be updated. Actual - No changes can be observed, still old image is associated with the content. Thanks: Vishal Chhabria for report and patch ------------------------------------------------------------------------ git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release13.07@1765109 13f79535-47bb-0310-9956-ffa450edef68
----------------------------------------------------------------------------------------- Fix for: Add WorkEffort Timesheet to Invoice or to New Invoice does not work. (OFBIZ-5636) Thanks: Ahmad Ludin for reporting and Avnindra Sharma for the patch. ----------------------------------------------------------------------------------------- git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release13.07@1768683 13f79535-47bb-0310-9956-ffa450edef68
…5.12, 14.12 and 13.07) (OFBIZ-8339) As Deepak did for trunk and said: "As setting set-if-null to false fix one issue and introduced another one, reverting commit for now will debug it in more detail and will commit proper fix if found." git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release13.07@1769097 13f79535-47bb-0310-9956-ffa450edef68
(OFBIZ-9120) In PartyUiLabels.xml are the following labels deleted but still in use in some files: PartyCountryMissing PartyCountryCode PartyCountryCodeMissing Fix: Use the labels from CommonUiLabels: CommonCountryMissing CommonCountryCode CommonCountryCodeMissing Thanks: Heiko Elberg git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release13.07@1770442 13f79535-47bb-0310-9956-ffa450edef68
------------------------------------------------------------------------ r1770481 | deepak | 2016-11-19 12:22:25 +0100 (sam. 19 nov. 2016) | 4 lignes Fixed: Lookup of initial account in new opportunity doesn't work. (OFBIZ-8617) Thanks Pierre Smits for reporting the issue. ------------------------------------------------------------------------ � git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release13.07@1770495 13f79535-47bb-0310-9956-ffa450edef68
============================================================================= Fixed: Errormessage is displayed twice in LoginEvents.java (OFBIZ-9125) Issue: The errormessage "The password does not match the pattern" is called twice in LoginServices.java. Fix: Delete second assignment for variable "errMsg". jleroux: I simply removed the author commented out comment (2 lines) Thanks: Heiko Elberg ============================================================================= git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release13.07@1771518 13f79535-47bb-0310-9956-ffa450edef68
------------------------------------------------------------------------ r1775441 | jleroux | 2016-12-21 15:30:52 +0100 (mer. 21 déc. 2016) | 1 ligne No functional change, updates location of view handlers ------------------------------------------------------------------------ � git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release13.07@1775450 13f79535-47bb-0310-9956-ffa450edef68
…uired (OFBIZ-9184) Currently in the entitymodel.xsd the line <xs:attribute name="entity-alias" type="xs:string"/> is wrong, should be <xs:attribute name="entity-alias" type="xs:string" use="required"/> Else in line this.entityAlias = entityAlias; in ModelViewEntity.ViewConditionExpr() this.entityAlias receives null. All supported branches are concerned git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release13.07@1779625 13f79535-47bb-0310-9956-ffa450edef68
------------------------------------------------------------------------ r1779724 | jleroux | 2017-01-21 12:15:17 +0100 (sam. 21 janv. 2017) | 26 lignes Fixed: "View Order" throws exception in getReturnableQuantity (OFBIZ-9157) Steps to Reproduce: - Create a sales order - Add 1 orderitem with no unitPrice set (unitPrice = null) for the product - set the status of the order to completed - go to order-management and try to open the order for display like: https://localhost:8443/ordermgr/control/orderview?orderId=XXXXX Expected: - the order is displayed with status completed Actual: - A groovy exception is displayed. Analysis: The service "getReturnableQuantity" throws an exception because it returns the returnablePrice = null, because the unitPrice of the orderItem was null. The OUT field returnablePrice is mandatory according to the service-definition. The return parameter is set but the value is null, hence the exception. Solution: adjust the service-definition to allow for "null" value of the returnablePrice OUT parameter. Thanks: Leonard Lin ------------------------------------------------------------------------ � git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release13.07@1779728 13f79535-47bb-0310-9956-ffa450edef68
Backport from trunk Because the log level always is display as FATAL on log, this raise useless log and generate many noise for production site. Generally these logs are present for debugging historical reason git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release13.07@1780694 13f79535-47bb-0310-9956-ffa450edef68
Even includes R4.0 :D git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release13.07@1783210 13f79535-47bb-0310-9956-ffa450edef68
…ct handled by and) ------------------------------------------------------------------------ r1784708 | jleroux | 2017-02-28 11:02:25 +0100 (mar. 28 f귲. 2017) | 21 lignes Fixed: The ecommerce breadcrumb fails when you come from the catalog product link (OFBIZ-9234) To reproduce # Get to https://demo-stable.ofbiz.apache.org/catalog/control/EditProduct?productId=GZ-1000 # Click on the "Product Page" button You may notice an error which does appear erratically but most of the time, same on trunk demo and locally. This happens because sometimes the _BREAD_CRUMB_TRAIL_ session attribute is empty or null. "Why not alway?" you might ask. I had no time to investigate but I guess because there is no bread crum trail when coming from catalog, and for some weird reasons, it's sometimes there. Anyway my fix is simple, if there is no _BREAD_CRUMB_TRAIL_ in session I bypass the bread crum block in BreadCrumbs.ftl. It's not perfect but look far better BTW for another reason, when coming from catalog/product or not, the ecommerce webapp is broken in R14/15 ------------------------------------------------------------------------ git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release13.07@1784721 13f79535-47bb-0310-9956-ffa450edef68
…784549 " ------------------------------------------------------------------------ r1784549 | jleroux | 2017-02-27 13:33:42 +0100 (lun. 27 fev. 2017) | 26 lignes Here, unlike in r1784549, I kept getDefaultServerRootUrl() and did no changes in url.properties. URL properties will be, for instance, used to specify the ports used in demos (18443/18080) Fixed: "Login and logout process in demos shows a certificate issue" (OFBIZ-9206) Also fixes "16.11 ofbizUrl include host+port and break some reverse-proxy/docker setups" (OFBIZ-9224) The idea is to use the port initially passed by a successful login request as it's done since WebSiteProperties class exists. I also don't add twice the portOffset when it's build from the request, and only then. Keep it as is when it's build from a WebSite GenericValue. We then trust the user and don't rely on the request. Thanks: Pierre Smits and Leonard Lin for reports ------------------------------------------------------------------------ git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release13.07@1784745 13f79535-47bb-0310-9956-ffa450edef68
"Partially backport the fix idea from trunk framework for revision: 1784549 " ------------------------------------------------------------------------ r1784549 | jleroux | 2017-02-27 13:33:42 +0100 (lun. 27 fev. 2017) | 26 lignes Here, unlike in r1784549, I kept getDefaultServerRootUrl() and did no changes in url.properties. URL properties will be, for instance, used to specify the ports used in demos (18443/18080) Fixed: "Login and logout process in demos shows a certificate issue" (OFBIZ-9206) Also fixes "16.11 ofbizUrl include host+port and break some reverse-proxy/docker setups" (OFBIZ-9224) The idea is to use the port initially passed by a successful login request as it's done since WebSiteProperties class exists. I also don't add twice the portOffset when it's build from the request, and only then. Keep it as is when it's build from a WebSite GenericValue. We then trust the user and don't rely on the request. Thanks: Pierre Smits and Leonard Lin for reports ------------------------------------------------------------------------ ........ git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release13.07@1784771 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release13.07@1785097 13f79535-47bb-0310-9956-ffa450edef68
(OFBIZ-9206) After my conclusions at OFBIZ-9240 I decided to reapply the changes Here, unlike in trunk and stable, I kept getDefaultServerRootUrl() and did no changes in url.properties. URL properties will be, for instance, used to specify the ports used in demos (28443/28080) The idea is to use the port initially passed by a successful login request as it's done since WebSiteProperties class exists. I also don't add twice the portOffset when it's build from the request, and only then. Keep it as is when it's build from a WebSite GenericValue. We then trust the user and don't rely on the request. Thanks: Pierre Smits for report git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release13.07@1785098 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release13.07@1785275 13f79535-47bb-0310-9956-ffa450edef68
shows a certificate issue (OFBIZ-9206) I, for now, decided that I'll not handle the certificate for the old demo. Too much troubles! So I reverts all related changes git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release13.07@1785276 13f79535-47bb-0310-9956-ffa450edef68
------------------------------------------------------------------------ r1786525 | jleroux | 2017-03-11 20:25:31 +0100 (sam. 11 mars 2017) | 25 lignes Fixed: catalog/control/FindReviews does not render proper column data (OFBIZ-) go to https://localhost:8443/catalog/control/FindReviews find productId=GZ-2644 notice the table columns do not match the data Here the problem is : 1. FindReviews page includes "ListReviews" form to render this content. 2. Here "use-when" attribute is used with "field" element on "productRating" and "productReview" for conditions "statusId != 'PRR_DELETED'" and "statusId == 'PRR_DELETED'" 3. Citing documentation of "ignore-when": "This attribute is defined to enable ignoring a field on a form of type list or multi, which is not possible using use-when attribute". 4. So when condition is not true it renders a empty <td></td> causing data to be placed inappropriately 5. Here if the "use-when" attribute is replaced with "ignore-when" attribute it will make the columns to match with apt data. Solution: Replace "use-when" attribute with "ignore-when" attribute amending conditions used accordingly. Thanks: Wai Tam for the report, Aditya Sharma for the patch ------------------------------------------------------------------------ � git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release13.07@1786529 13f79535-47bb-0310-9956-ffa450edef68
…comment "Applied fix from trunk framework for revision: 1787133 " (conflicts handled by hand) ------------------------------------------------------------------------ r1787133 | jleroux | 2017-03-16 08:16:40 +0100 (jeu. 16 mars 2017) | 10 lignes Fixed: While re-ordering an order, order terms doesn't set (OFBIZ-9252) Place an order and click on create as new order button on order detail page. All the information is properly copied over to that order but order terms are not copied to newly created order. Order Terms should be copied while creating cart object. Thanks: Suraj Khurana ------------------------------------------------------------------------ git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release13.07@1787135 13f79535-47bb-0310-9956-ffa450edef68
------------------------------------------------------------------------ r1787176 | jleroux | 2017-03-16 14:18:05 +0100 (jeu. 16 mars 2017) | 10 lignes Fixed: Error in accounting report inventory valuation with through date with an empty value. (OFBIZ-9265) Go to https://localhost:8443/accounting/control/InventoryValuation and clear the Through Date, we get an error. The provided patch fixes this by setting the default thruDate to now. Thanks: Francis Douet ------------------------------------------------------------------------ � git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release13.07@1787180 13f79535-47bb-0310-9956-ffa450edef68
------------------------------------------------------------------------ r1791634 | jleroux | 2017-04-16 22:56:52 +0200 (dim. 16 avr. 2017) | 17 lignes Fixed: Routing should not be allow to update with empty routing name (OFBIZ-7375) Steps to regenerate - 1) Navigate to manufacturing -> Routing 2) Press New Routing button. 3) Try to create a routing without entering Routing Name. It will not allowed to create the record as routing name is mandatory field. 4) Create routing by adding proper details. 5) Now, select newly create routing from manufacturing -> Routing 6) Try to update selected routing with empty Routing Name. Actual : Routing can be update with empty Routing Name. Expected : Routing should not allow to update with empty Routing Name. Thanks: Ankit Joshi for analysis and patch ------------------------------------------------------------------------ � git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release13.07@1791638 13f79535-47bb-0310-9956-ffa450edef68
------------------------------------------------------------------------ r1804319 | jleroux | 2017-08-07 12:40:32 +0200 (lun. 07 août 2017) | 20 lignes Fixed: Bug SQL Count Distinct command in GenericDAO.java (OFBIZ-5701) jleroux: Kieuanhvu's explanation was not totally clear. So I rather provide Renuka Srishti's at OFBIZ-9428 "getResultsSizeAfterPartialList() return wrong count with distinct() for View Entity" Here is the code sample to test the issue: EntityListIterator productAssocListItr = null; productAssocListItr = from("ProductAndAssoc").distinct().queryIterator(); productAssocListSize = productAssocListItr.getResultsSizeAfterPartialList(); productAssocListSize will differ from the actual distinct records in the ProductAndAssoc View Entity. This issue exists because it gives distinct records on the basis of the first column in the table. Thanks: Kieuanhvu for the patch, Renuka Srishti for a clear explanation and a simple way to test (in a groovy for me) ------------------------------------------------------------------------ git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release13.07@1804323 13f79535-47bb-0310-9956-ffa450edef68
(OFBIZ-9567) Changes a division with two long variables whose result was casted into a double Now it performs a proper double division Thanks: Dennis Balkir (and FB ;)) git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release13.07@1804658 13f79535-47bb-0310-9956-ffa450edef68
------------------------------------------------------------------------ r1805558 | jleroux | 2017-08-20 16:14:26 +0200 (dim. 20 août 2017) | 11 lignes Fixed: LabelManager doesn't search labels in .groovy files (OFBIZ-8153) The logic written needs more use cases to be covered for groovy files, existing findUiLabelMapInFile is not fit for groovy files. Following patterns are currently used in groovy files: 1. uiLabelMap.xxxxx 2. uiLabelMap.get("xxxxx") Thanks: Suraj Khurana ------------------------------------------------------------------------ git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release13.07@1805560 13f79535-47bb-0310-9956-ffa450edef68
------------------------------------------------------------------------ r1806266 | jleroux | 2017-08-26 09:37:49 +0200 (sam., 26 août 2017) | 23 lines Fixed: Improvements in LabelReferences class (OFBIZ-9623) For Java: Current support is only for occurrences like "UtilProperties.getMessage(", but there are other occurrences such as "uiLabelMap.get(" in Java as well. Need to add support for same. For groovy: After some recent improvements for groovy handling, still, there is a possibility that someone is using "UtilProperties.getMessage(" in groovy files as well, so IMO, that must also be handled. For XML forms: In XML forms current support in handled for auto-fields-service and auto-fields-entity but there are some occurrences of tooltip element of field tag as well, that must also be handled. For XML Simple Methods: Doesn't handle case of property-to-field and default-message elements. (Separate ticket created OFBIZ-9606, just adding it here for reference) Thanks: Suraj Khurana ------------------------------------------------------------------------ git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release13.07@1806271 13f79535-47bb-0310-9956-ffa450edef68
------------------------------------------------------------------------ r1806269 | jleroux | 2017-08-26 09:43:54 +0200 (sam., 26 août 2017) | 8 lines Fixed: LabelManager doesn't search labels in all elements in xml (OFBIZ-9606) Currently, label manager for xml search only for fail-property elements in xml files, it should also search for the property-to-field, default-message element in xml files. Thanks: Suraj Khurana ------------------------------------------------------------------------ git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release13.07@1806272 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.