This repository has been archived by the owner on May 9, 2020. It is now read-only.
Ges erp #3
Open
Ges erp #3
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
------------------------------------------------------------------------ r1494202 | jleroux | 2013-06-18 19:00:37 +0200 (mar., 18 juin 2013) | 2 lines A patch from Ankit for "Priority field is missing on Add/Edit Project form." https://issues.apache.org/jira/browse/OFBIZ-5230 ------------------------------------------------------------------------ ?\026 git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1494261 13f79535-47bb-0310-9956-ffa450edef68
…typo) git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1499372 13f79535-47bb-0310-9956-ffa450edef68
=== Fixed wrong schemaLocation for manufacturing help files, see OFBIZ-5076 git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1499398 13f79535-47bb-0310-9956-ffa450edef68
=== Upgrade from Tomcat 7.0.40 to Tomcat 7.0.41 git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1499737 13f79535-47bb-0310-9956-ffa450edef68
…not hidden form." https://issues.apache.org/jira/browse/OFBIZ-4913 Application menu item should be link not hidden form. As if its hidden form then you can not open it in new tab. Default menu item link type auto, and its create an hidden for for link if controller request call an event, but in menu item this should be link. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1499920 13f79535-47bb-0310-9956-ffa450edef68
=== Upgrade from Tomcat 7.0.41 to 7.0.42 git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1500770 13f79535-47bb-0310-9956-ffa450edef68
Removed support for runtime nested expressions in FlexibleStringExpander.java. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1500824 13f79535-47bb-0310-9956-ffa450edef68
"Applied fix from trunk for revision: 1502121" ------------------------------------------------------------------------ r1502121 | jleroux | 2013-07-11 07:38:47 +0200 (jeu., 11 juil. 2013) | 3 lines No functional change. When I reverted r1311214 for "set different ports for testing in a CI environment (e.g. Jenkins)" https://issues.apache.org/jira/browse/OFBIZ-4794 I did not notice Jacopo's also changed some ports value at r1324614 This reverts r1324614 to have things consistent. I don't backport (only R12.04 is concerned) because as long as catalina/ofbiz-component.xml is consistent (port =+ 1) things are working ------------------------------------------------------------------------ git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1502145 13f79535-47bb-0310-9956-ffa450edef68
Fix bug preventing deadlock retries for groovy services, GenericEngine implementations and services should never modify the service context git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1509523 13f79535-47bb-0310-9956-ffa450edef68
------------------------------------------------------------------------ r1459222 | mor | 2013-03-21 11:49:38 +0100 (jeu., 21 mars 2013) | 1 line OrderItemAttributes not correctly saved while creating an order due to a typo in a variable name, reported and patch provided by Mirko as part of OFBIZ-5158. ------------------------------------------------------------------------ ?\026 git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1511611 13f79535-47bb-0310-9956-ffa450edef68
… by Ruth Unfortunately in my 1st backport try changes related to https://issues.apache.org/jira/browse/OFBIZ-4794 slipped in inadvertently, this removes them git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1511615 13f79535-47bb-0310-9956-ffa450edef68
…perty git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1512888 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1512891 13f79535-47bb-0310-9956-ffa450edef68
…tps://issues.apache.org/jira/browse/OFBIZ-4794 *What's for?* OOTB the port offset is interesting in at least 3 cases: # To simultaneously run tests on the same Buildbot machine. This is related to http://mail-archives.apache.org/mod_mbox/www-builds/201209.mbox/%3C002101cd991b$0a16de50$1e449af0$@16degrees.com.au%3E # To simultaneously run the demos without having to change much things, just one parameter # To eventually run Sonar on OFBiz sources https://issues.apache.org/jira/browse/INFRA-3590 *How it's done?* Basically, I just added a portoffset integer parameter to some ant targets (of course this JVM param can also be used in a Java call from command line): * in trunk and R13.07: start, start-batch, start-debug, start-pos, start-both, run-tests and run-test * in R12.04 and R11.04: run-tests, run-test. I did not set start targets because anyway it would miss the admin port offset, withouh much changes. So can't be used to demonstrate. We will continue to use the current paches for those. The portoffset parameter is set to zero by default in ClassLoaderContainer.java. If a value is passed, it's then grabed by Config.java and passed to ClassLoaderContainer.java, where it's set to this value. The portoffset is then used to change in one shoot all the default ports values defined (in config or hardcoded), and the admin port value in R13.07 and trunk. This is done in following classes: CatalinaContainer NamingServiceContainer ServiceEngine through ServiceLocation RmiServiceContainer XMLRPCClientEngine XmlRpcTests To avoid hardcoding locations in services definitions, I also had to create some service-locations: main-local-soap and main-remote-soap *What are the constraints?* * For demos: the offset should not be applied to trunk because <service-location name="main-remote-soap" location="http://demo-trunk.ofbiz.apache.org:8080/webtools/control/SOAPService"/> is used for tests by trunk *and all releases*. It's useless to apply to trunk anyway, offsetting port in releases is enough. * I did not take into account the Ideal payment harcoded port values in IdealPaymentServiceTest.java. Weirdly I did not cross error during tests, though it seems there are tests using an harcoded port in url. *What is the status?* Locally (on Win XP) I ran many tests combinations with <<ant load-demo run-tests>>. Applying the portoffset on a sole running test instance has no effects. I have still some fails (no errors) but those are not related to my changes, they appear also without. But when I run a combination of any releases/trunk but with R11.04, I get a time out error with testSOAPSimpleService, that I can't explain so far. If I run the trunk alone with the portoffset no errors occur. Same if I run a release with portoffset and only testSOAPSimpleService in trunk (w/ or w/o portoffset) *To summarize:* these changes will be used to run Buildot tests instances simultaneously . And, for coming releases, to run demos without having to create patches. Simply running ant start with a portoffset value which will take care of all ports values, including admin port. For running R12.04 demo as stable we will still need to create a patch for the last time. *What I will to do for now:* commit the patches and test if I cross the same issue on Buildbot. If it's the same (99% chances it will) I will revert and will continue to locally try to find the reason . I believe this issue is unrelated to the changes I implemened. And it's just because it's now possible to simultaneously run tests that it appears. BTW I just noticed that when you run R11.04 with R12.04, R12.04 takes almost all the CPU (XP is not very, while when running any combinations w/o R11.04 the CPU load is shared. Also there are far less tests in R11.04, which coul be the reason when I run it with another test run instance there are no issues. Because R11.04 tests finish before the other instance gets to run testSOAPSimpleService. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1525906 13f79535-47bb-0310-9956-ffa450edef68
…tps://issues.apache.org/jira/browse/OFBIZ-4794 Complete previous work because of INFRA-6790 git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1526535 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1526621 13f79535-47bb-0310-9956-ffa450edef68
------------------------------------------------------------------------ r1347559 | jacopoc | 2012-06-07 12:26:40 +0200 (jeu., 07 juin 2012) | 2 lines Fixed xml validation for misplaced "error-page" element added by Hans in rev. 1208335. Unfortunately the bug has been backported by Jacques to the 11.04 branch but I don't have time to backport the fix to the branches at the moment. ------------------------------------------------------------------------ ?\026 git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1531349 13f79535-47bb-0310-9956-ffa450edef68
------------------------------------------------------------------------ r1381146 | erwan | 2012-09-05 13:17:02 +0200 (mer., 05 sept. 2012) | 1 line A patch from Leon - OFBIZ-5025 - jquery validator localization looks for messages_cn.js for locale zh_CN and _tw for zh_TW ------------------------------------------------------------------------ ?\026 git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1531640 13f79535-47bb-0310-9956-ffa450edef68
------------------------------------------------------------------------ r1502944 | jleroux | 2013-07-14 08:50:19 +0200 (dim. 14 juil. 2013) | 4 lignes A patch from Pierre Smits for "Enhance GeoData.xml with Croatia as a member of the European Union" https://issues.apache.org/jira/browse/OFBIZ-5263 Per July 1st, 2013 Croatia joined the European Union. ------------------------------------------------------------------------ ?\026 git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1533179 13f79535-47bb-0310-9956-ffa450edef68
------------------------------------------------------------------------ r1506269 | jleroux | 2013-07-23 22:44:10 +0200 (mar. 23 juil. 2013) | 17 lignes A patch from Petr Pytelka for "upload content at party profile is not working" https://issues.apache.org/jira/browse/OFBIZ-5202 I tried to upload content at party profile screen with purpose "Logo Image URL" and Is public "YES" but i got the following exception ---- exception report ---------------------------------------------------------- ERROR: Could not complete the Create Content Alternative URLs. [file:/media/68C2E6E0C2E6B18C/Work/Developers_foundation/Workspace/OFBiz/ofbiz/applications/content/script/org/ofbiz/content/content/ContentServices.xml#createContentAlternativeUrl] process [problem invoking the [createContent] service with the map named [contentCtx] containing [{dataResourceId=10001, statusId=CTNT_IN_PROGRESS, localeString=en_US, userLogin=[GenericEntity:UserLogin][createdStamp,2013-05-23 12:19:58.0(java.sql.Timestamp)][createdTxStamp,2013-05-23 12:19:58.0(java.sql.Timestamp)][currentPassword,null()][disabledDateTime,null()][enabled,N(java.lang.String)][externalAuthId,null()][hasLoggedOut,null()][isSystem,Y(java.lang.String)][lastCurrencyUom,null()][lastLocale,null()][lastTimeZone,null()][lastUpdatedStamp,2013-05-23 12:19:58.0(java.sql.Timestamp)][lastUpdatedTxStamp,2013-05-23 12:19:58.0(java.sql.Timestamp)][partyId,null()][passwordHint,null()][requirePasswordChange,null()][successiveFailedLogins,null()][userLdapDn,null()][userLoginId,system(java.lang.String)], locale=en_US}]: The following required parameter is missing: [IN] [createContentRole.partyId]] Exception: org.ofbiz.service.ServiceValidationException Message: The following required parameter is missing: [IN] [createContentRole.partyId] jleroux: I see no reasons to not move the lines <!-- Party for System UserLogin Account - just in case logic depends on it --> <Party partyId="system" partyTypeId="PERSON"/> <Person partyId="system" firstName="System" lastName="Account"/> from UserDemoData.xml to SecurityPermissionSeedData.xml This patch allows to load data for party "system" when load-extseed is called. ------------------------------------------------------------------------ ?\026 git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1533343 13f79535-47bb-0310-9956-ffa450edef68
------------------------------------------------------------------------ r1502946 | jleroux | 2013-07-14 09:39:16 +0200 (dim. 14 juil. 2013) | 4 lignes A patch from Pierre Smits for "Currency names of CZK and HRK are wrong" https://issues.apache.org/jira/browse/OFBIZ-5264 In CurrencyData.xml the names of the currencies of the Czech Republic and of Croatia are wrong. ------------------------------------------------------------------------ ?\026 git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1533409 13f79535-47bb-0310-9956-ffa450edef68
------------------------------------------------------------------------ r1512573 | jleroux | 2013-08-10 09:46:55 +0200 (sam. 10 août 2013) | 3 lignes Fixes https://issues.apache.org/jira/browse/OFBIZ-5272 "Sales by Store report generates an error" jleroux: I vaguely remember a change related to ignore-if-null and ignore-if-empty. Anyway replacing ignore-if-null by ignore-if-empty does the trick, which makes sense ------------------------------------------------------------------------ ?\026 git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1533414 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1533419 13f79535-47bb-0310-9956-ffa450edef68
------------------------------------------------------------------------ r1512376 | jleroux | 2013-08-09 18:19:16 +0200 (ven. 09 août 2013) | 14 lignes This should fix https://issues.apache.org/jira/browse/OFBIZ-2574 "Not possible to show the shipment information (packaging slip) in the purchase order approvement screen" See Purchase Order #DEMO10090 in the Order Managaer application, where the order are to be approved. Try to click on the link; Shipments Nbr 9998 Packing Slip ---------------------------------------------- Then the following error is shown: ---------------------------------------------------------- The Following Errors Occurred: Problems with the response writer/output stream: org.ofbiz.widget.screen.ScreenRenderException: Error rendering screen [component://product/widget/facility/ShipmentScreens.xml#PackingSlip.fo]: java.lang.IllegalArgumentException: Operator must be EQUALS or NOT_EQUAL when right/rhs argument is NULL (Operator must be EQUALS or NOT_EQUAL when right/rhs argument is NULL ) ----------------------------------------------------------- ------------------------------------------------------------------------ ?\026 git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1533483 13f79535-47bb-0310-9956-ffa450edef68
------------------------------------------------------------------------ r1510042 | jleroux | 2013-08-03 19:24:45 +0200 (sam. 03 août 2013) | 9 lignes A patch from Pierre Smits for "Receive inventory generates an error when product has mandatory lotid" https://issues.apache.org/jira/browse/OFBIZ-5275 When a product has lotid set to mandatory the receipt of inventory in facility generates following error: The Following Errors Occurred: The lotId is mandatory for the product M-AMBER-40. However, it is not possible to set the lotid on the receipt form. ------------------------------------------------------------------------ ?\026 git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1533487 13f79535-47bb-0310-9956-ffa450edef68
------------------------------------------------------------------------ r1504864 | jleroux | 2013-07-19 15:01:03 +0200 (ven. 19 juil. 2013) | 3 lignes A patch from Leon for "minor patch to "create email address"" https://issues.apache.org/jira/browse/OFBIZ-5278 In rare case where email address is same as other type contact info, such as internal party note, you cannot create this email address after the internal party note is created. ------------------------------------------------------------------------ ?\026 git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1533490 13f79535-47bb-0310-9956-ffa450edef68
------------------------------------------------------------------------
r1506499 | jleroux | 2013-07-24 13:20:45 +0200 (mer. 24 juil. 2013) | 3 lignes
Completes "Wrong to use !jQuery('#content-messages') in \framework\images\webapp\images\selectall.js line #354" https://issues.apache.org/jira/browse/OFBIZ-5279
Using submitted patch as a basis.
------------------------------------------------------------------------
?\026
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1533496 13f79535-47bb-0310-9956-ffa450edef68
------------------------------------------------------------------------ r1506504 | jleroux | 2013-07-24 13:31:45 +0200 (mer. 24 juil. 2013) | 1 ligne Rhaaa another typo, better use patches really :/ ------------------------------------------------------------------------ ?\026 git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1533501 13f79535-47bb-0310-9956-ffa450edef68
------------------------------------------------------------------------ r1506828 | jleroux | 2013-07-25 09:18:03 +0200 (jeu. 25 juil. 2013) | 1 ligne Rhaaa another wrong C/P, better use patches really :/ ------------------------------------------------------------------------ ?\026 git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1533509 13f79535-47bb-0310-9956-ffa450edef68
------------------------------------------------------------------------ r1517780 | jleroux | 2013-08-27 12:26:02 +0200 (mar. 27 août 2013) | 6 lignes A patch from Pierre Smits for "ProudctionRunServices.xml doesn't set dateTimeManufactured in inventoryItem" https://issues.apache.org/jira/browse/OFBIZ-5299 When producing a good in Manufacturing the manufacturing date and time doesn't get set in the inventoryItem jleroux: I also noticed that 1 instance of datetimeReceived for SERIALIZED_INV_ITEM in productionRunTaskProduce used UtilDateTime.nowDate() instead UtilDateTime.nowTimestamp(), I changed it. ------------------------------------------------------------------------ ?\026 git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1533519 13f79535-47bb-0310-9956-ffa450edef68
=== Fixed miscellaneous errors spotted while reviewing the logs generated by the ArtifactInfo tool. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1610920 13f79535-47bb-0310-9956-ffa450edef68
=== Add missing import from my last commit. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1610927 13f79535-47bb-0310-9956-ffa450edef68
…able with recent versions of Java. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1611010 13f79535-47bb-0310-9956-ffa450edef68
=== This reverts most of the changes committed in rev.951013 for OFBIZ-3802 because they caused a few issues as reported in the same Jira ticket. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1611323 13f79535-47bb-0310-9956-ffa450edef68
…rsions. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1611392 13f79535-47bb-0310-9956-ffa450edef68
=== Fixed bug I introduced in rev. 1610918: thanks to Deepak Dixit for the bug report and resolution. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1612192 13f79535-47bb-0310-9956-ffa450edef68
Fixed a bug in Mini-Language where a NPE could be thrown while using Verbose logging: https://issues.apache.org/jira/browse/OFBIZ-5689. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1612214 13f79535-47bb-0310-9956-ffa450edef68
------------------------------------------------------------------------ r1613121 | jleroux | 2014-07-24 15:35:15 +0200 (jeu. 24 juil. 2014) | 1 ligne Fixes descriptions in createProductPrice service definition and implementation (no functional changes) ------------------------------------------------------------------------ ?\026 git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1613127 13f79535-47bb-0310-9956-ffa450edef68
=== OFBIZ-5692 Wrong eca event set on changeOrderStatus and updateReturnStatusFromReceipt; thanks to Deepak Dixit for the help in testing the fix. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1614021 13f79535-47bb-0310-9956-ffa450edef68
=== Fixed the event of an eca definition from in-validate to invoke; this fixes a service validation exception. Part of OFBIZ-4363 git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1614027 13f79535-47bb-0310-9956-ffa450edef68
------------------------------------------------------------------------ r1614355 | jleroux | 2014-07-29 16:03:38 +0200 (mar. 29 juil. 2014) | 16 lignes A patch from Julien Nicolas for "modification on daemon script for debian" https://issues.apache.org/jira/browse/OFBIZ-5693 The file rc.ofbiz.for.debian generate some error because of the bash type contained in the first line. !/bin/sh should be !/bin/bash To add it in the startup process, it must contained a specific header : ### BEGIN INIT INFO # Provides: Apache-OFBiz ERP software # Required-Start: $remote_fs $syslog # Required-Stop: $remote_fs $syslog # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 # Short-Description: Apache-OFBiz # Description: Apache-OFBiz ERP Software ### END INIT INFO ------------------------------------------------------------------------ ?\026 git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1614357 13f79535-47bb-0310-9956-ffa450edef68
------------------------------------------------------------------------ r1614366 | jleroux | 2014-07-29 16:37:48 +0200 (mar. 29 juil. 2014) | 4 lignes A patch from Pierre Smits for "AddOtherPartyRelationship allows user to select roles the selected party doesn't have" https://issues.apache.org/jira/browse/OFBIZ-5694 When a relationship must be set for a party to another party, the role selector for the party shows all roles available in the data set. This, however, must be limitied to the roles the party has. ------------------------------------------------------------------------ ?\026 git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1614368 13f79535-47bb-0310-9956-ffa450edef68
------------------------------------------------------------------------ r1614556 | jleroux | 2014-07-30 08:40:23 +0200 (mer. 30 juil. 2014) | 1 ligne Fixes a possible ArithmeticException: Division undefined ------------------------------------------------------------------------ ?\026 git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1614558 13f79535-47bb-0310-9956-ffa450edef68
…ix requires some enhancements to set-service-fields that were not backported into the branch git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1614563 13f79535-47bb-0310-9956-ffa450edef68
------------------------------------------------------------------------ r1615296 | jleroux | 2014-08-02 13:18:26 +0200 (sam. 02 août 2014) | 3 lignes Update Tomcat from 7.0.54 to 7.0.55 No changes in framework\base\lib\j2eespecs ------------------------------------------------------------------------ ?\026 git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1615299 13f79535-47bb-0310-9956-ffa450edef68
------------------------------------------------------------------------ r1615297 | jleroux | 2014-08-02 13:20:09 +0200 (sam. 02 août 2014) | 3 lignes Update Tomcat from 7.0.54 to 7.0.55 Forgot LICENSE and .classpath ------------------------------------------------------------------------ ?\026 git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1615301 13f79535-47bb-0310-9956-ffa450edef68
…hand) ------------------------------------------------------------------------ r1616272 | jleroux | 2014-08-06 18:39:30 +0200 (mer. 06 août 2014) | 3 lignes A patch from Leon for "Wrong timeFormat of datetimepicker causes hours represented as 12 not 24" https://issues.apache.org/jira/browse/OFBIZ-5702 Latest datetimepicker add-on uses "timeFormat" option to detect am/pm, lowercase "h" represents 12hr am/pm, uppercase "H" represents 24 hr. (see trentrichardson/jQuery-Timepicker-Addon#547). The datetime input widget that relying on this add-on does not work correctly: it's in 12-hours format not 24 hours. ------------------------------------------------------------------------ git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1616276 13f79535-47bb-0310-9956-ffa450edef68
=== Fix for the wrong jar committed by Jacques in rev. 1615296; this one is actually from the Tomcat extras distribution, not from the standard distribution as the former was. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1616686 13f79535-47bb-0310-9956-ffa450edef68
------------------------------------------------------------------------ r1616940 | jleroux | 2014-08-09 15:05:05 +0200 (sam. 09 août 2014) | 2 lignes The updateApprovedOrderItems defines the itemAttributesMap, itemEstimatedDeliveryDateMap and itemEstimatedShipDateMap IN parameters as optional. But if you use this service out of an event context then you cross NPEs This is because in the context of an event the missing parameters are initialised as empty. This hid the issue so far because updateApprovedOrderItems is only used once, called by an event. ------------------------------------------------------------------------ ?\026 git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1616949 13f79535-47bb-0310-9956-ffa450edef68
------------------------------------------------------------------------ r1617229 | jleroux | 2014-08-11 11:10:42 +0200 (lun. 11 août 2014) | 4 lignes A patch from Pierre Smits for "ListEmplPositionFulfillments links to wrong profile of employee" at https://issues.apache.org/jira/browse/OFBIZ-5708 Instead it should link to EmployeeProfile of the employee. ------------------------------------------------------------------------ ?\026 git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1617231 13f79535-47bb-0310-9956-ffa450edef68
------------------------------------------------------------------------ r1618570 | jleroux | 2014-08-18 12:17:45 +0200 (lun. 18 août 2014) | 1 ligne [Rhino] Trailing comma is not legal in an ECMA-262 object initializer ------------------------------------------------------------------------ ?\026 git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1618572 13f79535-47bb-0310-9956-ffa450edef68
=== OFBIZ-5514 correct calculation of seconds (instead of minutes) in EntitySyncServices.cleanSyncRemoveInfo(). Thanks to Roberto Benítez Monje for reporting git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1619103 13f79535-47bb-0310-9956-ffa450edef68
…presented as 12 not 24", I wrongly committed changes in R12 and R11 branches. Though I thought I checked the jquery-ui-timepicker-addon version in R12 and R11, I obviously did it wrong. The jquery-ui-timepicker-addon version are there older (0.9.7 and 0.9.6 respectively) and don't contain the 24 hours format handling. So the changes in R12.04 r1616276 and R11.04 r1616281 were wrong. This reverts r1616276 git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1621058 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/tags/REL-12.04.05@1621444 13f79535-47bb-0310-9956-ffa450edef68
asfgit
pushed a commit
that referenced
this pull request
Oct 20, 2014
…duplicate logic and responsibilities between the start and base components. Before this change the following classloader hierarchy was setup: 1) the "application" classloader for the "start" component 2) one "native lib" classloader for the "base" component 3) one "native lib" classloader for the all the other (non "base") framework/application/specialpurpose/hot-deploy components 4) one "web app" classloader for each of the webapplications After this commit the hierarchy is simplified by merging #2 and #3: a) the "application" classloader for the "start" component b) one "native lib" classloader for the all the framework/application/specialpurpose/hot-deploy components (including the "base" component) c) one "web app" classloader for each of the webapplications This has been achieved by merging the code that was setting up classloader #2 in the start component (for the "base" component) with the code that was setting up the classloader #3 in the base component: now all the code is in the start component. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1633182 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.