svn commit: r614988 - in /ofbiz/trunk/applications: manufacturing/src/org/ofbiz/ma
Locked
svn commit: r614988 - in /ofbiz/trunk/applications: manufacturing/src/org/ofbiz/ma
 
|
Author: mrisaliti
Date: Thu Jan 24 12:56:56 2008 New Revision: 614988 URL: http://svn.apache.org/viewvc?rev=614988&view=rev Log: Converted same tabs in 4 spaces (No functional changes) Modified: ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMNode.java ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java ofbiz/trunk/applications/party/build.xml ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml ofbiz/trunk/applications/party/script/org/ofbiz/party/customer/CustomerEvents.xml ofbiz/trunk/applications/party/src/org/ofbiz/party/contact/ContactMechWorker.java ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml ofbiz/trunk/applications/party/webapp/partymgr/js/PartyProfileContent.js ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Party.ftl ofbiz/trunk/applications/party/widget/partymgr/PartyClassificationForms.xml Modified: ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMNode.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMNode.java?rev=614988&r1=614987&r2=614988&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMNode.java (original) +++ ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMNode.java Thu Jan 24 12:56:56 2008 @@ -127,7 +127,7 @@ break; case BOMTree.EXPLOSION_MANUFACTURING: // for manfacturing trees, do not look through and create production runs for children unless there is no warehouse stocking of this node item - if (!oneChildNode.isWarehouseManaged()) { + if (!oneChildNode.isWarehouseManaged()) { oneChildNode.loadChildren(partBomTypeId, inDate, productFeatures, type); } break; @@ -629,7 +629,7 @@ } catch(GenericEntityException gee) { Debug.logError("Problem in BOMNode.isWarehouseManaged()", module); } - return isWarehouseManaged; + return isWarehouseManaged; } /** Modified: ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java?rev=614988&r1=614987&r2=614988&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java (original) +++ ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java Thu Jan 24 12:56:56 2008 @@ -619,7 +619,7 @@ } catch (GenericEntityException e) { return ServiceUtil.returnError("Problem running createOrUpdateMrpEvent"); } - // days to ship is only relevant for sales order to plan for preparatory days to ship. Otherwise MRP will push event dates for manufacturing parts + // days to ship is only relevant for sales order to plan for preparatory days to ship. Otherwise MRP will push event dates for manufacturing parts // as well and cause problems daysToShip = 0; if (productFacility != null) { Modified: ofbiz/trunk/applications/party/build.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/build.xml?rev=614988&r1=614987&r2=614988&view=diff ============================================================================== --- ofbiz/trunk/applications/party/build.xml (original) +++ ofbiz/trunk/applications/party/build.xml Thu Jan 24 12:56:56 2008 @@ -82,7 +82,7 @@ <!-- ================================================================== --> <target name="classes" depends="prepare,classpath"> - <javac debug="on" source="1.5" deprecation="on" destdir="${build.dir}/classes"> + <javac debug="on" source="1.5" deprecation="on" destdir="${build.dir}/classes"> <classpath> <path refid="local.class.path"/> </classpath> Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml?rev=614988&r1=614987&r2=614988&view=diff ============================================================================== --- ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml (original) +++ ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml Thu Jan 24 12:56:56 2008 @@ -266,7 +266,7 @@ </call-service> <field-to-result map-name="parameters" field-name="contactMechId" result-name="oldContactMechId"/> </simple-method> - + <simple-method method-name="findPartyFromEmailAddress" short-description="Find partyId from email address"> <set field="input.entityName" value="PartyAndContactMech"/> <set field="input.filterByDate" value="Y"/> Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/customer/CustomerEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/customer/CustomerEvents.xml?rev=614988&r1=614987&r2=614988&view=diff ============================================================================== --- ofbiz/trunk/applications/party/script/org/ofbiz/party/customer/CustomerEvents.xml (original) +++ ofbiz/trunk/applications/party/script/org/ofbiz/party/customer/CustomerEvents.xml Thu Jan 24 12:56:56 2008 @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8" ?> +<?xml version="1.0" encoding="UTF-8"?> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file @@ -248,7 +248,7 @@ <set field="partyDataSource.isCreate" value="Y" /> <!-- get the visit from the session to get the visitId --> <session-to-field field-name="visit"/> - <set from-field="visit.visitId" field="partyDataSource.visitId"/> + <set from-field="visit.visitId" field="partyDataSource.visitId"/> <!-- now that everything is validated & setup, check to see if there are errors, then call the services --> Modified: ofbiz/trunk/applications/party/src/org/ofbiz/party/contact/ContactMechWorker.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/src/org/ofbiz/party/contact/ContactMechWorker.java?rev=614988&r1=614987&r2=614988&view=diff ============================================================================== --- ofbiz/trunk/applications/party/src/org/ofbiz/party/contact/ContactMechWorker.java (original) +++ ofbiz/trunk/applications/party/src/org/ofbiz/party/contact/ContactMechWorker.java Thu Jan 24 12:56:56 2008 @@ -871,37 +871,37 @@ } public static String getPostalAddressPostalCodeGeoId(GenericValue postalAddress, GenericDelegator delegator) throws GenericEntityException { - // if postalCodeGeoId not empty use that - if (UtilValidate.isNotEmpty(postalAddress.getString("postalCodeGeoId"))) { - return postalAddress.getString("postalCodeGeoId"); - } - - // no postalCodeGeoId, see if there is a Geo record matching the countryGeoId and postalCode fields - if (UtilValidate.isNotEmpty(postalAddress.getString("countryGeoId")) && UtilValidate.isNotEmpty(postalAddress.getString("postalCode"))) { - // first try the shortcut with the geoId convention for "{countryGeoId}-{postalCode}" - GenericValue geo = delegator.findByPrimaryKeyCache("Geo", UtilMisc.toMap("geoId", postalAddress.getString("countryGeoId") + "-" + postalAddress.getString("postalCode"))); - if (geo != null) { - // save the value to the database for quicker future reference - postalAddress.set("postalCodeGeoId", geo.getString("geoId")); - postalAddress.store(); - - return geo.getString("geoId"); - } + // if postalCodeGeoId not empty use that + if (UtilValidate.isNotEmpty(postalAddress.getString("postalCodeGeoId"))) { + return postalAddress.getString("postalCodeGeoId"); + } + + // no postalCodeGeoId, see if there is a Geo record matching the countryGeoId and postalCode fields + if (UtilValidate.isNotEmpty(postalAddress.getString("countryGeoId")) && UtilValidate.isNotEmpty(postalAddress.getString("postalCode"))) { + // first try the shortcut with the geoId convention for "{countryGeoId}-{postalCode}" + GenericValue geo = delegator.findByPrimaryKeyCache("Geo", UtilMisc.toMap("geoId", postalAddress.getString("countryGeoId") + "-" + postalAddress.getString("postalCode"))); + if (geo != null) { + // save the value to the database for quicker future reference + postalAddress.set("postalCodeGeoId", geo.getString("geoId")); + postalAddress.store(); + + return geo.getString("geoId"); + } - // no shortcut, try the longcut to see if there is something with a geoCode associated to the countryGeoId - List geoAssocAndGeoToList = delegator.findByAndCache("GeoAssocAndGeoTo", - UtilMisc.toMap("geoIdFrom", postalAddress.getString("countryGeoId"), "geoCode", postalAddress.getString("postalCode"), "geoAssocTypeId", "REGIONS")); - GenericValue geoAssocAndGeoTo = EntityUtil.getFirst(geoAssocAndGeoToList); - if (geoAssocAndGeoTo != null) { - // save the value to the database for quicker future reference - postalAddress.set("postalCodeGeoId", geoAssocAndGeoTo.getString("geoId")); - postalAddress.store(); - - return geoAssocAndGeoTo.getString("geoId"); - } - } - - // nothing found, return null - return null; + // no shortcut, try the longcut to see if there is something with a geoCode associated to the countryGeoId + List geoAssocAndGeoToList = delegator.findByAndCache("GeoAssocAndGeoTo", + UtilMisc.toMap("geoIdFrom", postalAddress.getString("countryGeoId"), "geoCode", postalAddress.getString("postalCode"), "geoAssocTypeId", "REGIONS")); + GenericValue geoAssocAndGeoTo = EntityUtil.getFirst(geoAssocAndGeoToList); + if (geoAssocAndGeoTo != null) { + // save the value to the database for quicker future reference + postalAddress.set("postalCodeGeoId", geoAssocAndGeoTo.getString("geoId")); + postalAddress.store(); + + return geoAssocAndGeoTo.getString("geoId"); + } + } + + // nothing found, return null + return null; } } Modified: ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml?rev=614988&r1=614987&r2=614988&view=diff ============================================================================== --- ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml (original) +++ ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml Thu Jan 24 12:56:56 2008 @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8" ?> +<?xml version="1.0" encoding="UTF-8"?> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file @@ -705,21 +705,21 @@ <response name="error" type="view" value="AddCommContent"/> <response name="success" type="view" value="EditCommContent"/> </request-map> - + <request-map uri="updateCommContentDataResource"> <security https="true" auth="true"/> <event type="service" invoke="updateCommContentDataResource"/> <response name="success" type="view" value="EditCommContent"/> <response name="error" type="view" value="EditCommContent"/> </request-map> - + <request-map uri="uploadCommEventContent"> <security https="true" auth="true"/> <event type="service" invoke="persistContentAndAssoc"/> <response name="success" type="view" value="EditCommContent"/> <response name="error" type="view" value="EditCommContent"/> </request-map> - + <request-map uri="UpdateCommPurposes"><security https="true" auth="true"/><response name="success" type="view" value="UpdateCommPurposes"/></request-map> <request-map uri="createCommunicationEventPurpose"> <security https="true" auth="true"/> @@ -1042,7 +1042,7 @@ <view-map name="LookupDataResource" page="component://content/widget/content/DataResourceScreens.xml#LookupDataResource" type="screen"/> <view-map name="LookupSegmentGroup" type="screen" page="component://marketing/widget/LookupScreens.xml#LookupSegmentGroup"/> - + <view-map name="ViewSimpleContent" page="" type="simplecontent"/> <view-map name="AddressMatchMap" type="screen" page="component://party/widget/partymgr/PartyScreens.xml#AddressMatchMap"/> Modified: ofbiz/trunk/applications/party/webapp/partymgr/js/PartyProfileContent.js URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/js/PartyProfileContent.js?rev=614988&r1=614987&r2=614988&view=diff ============================================================================== --- ofbiz/trunk/applications/party/webapp/partymgr/js/PartyProfileContent.js (original) +++ ofbiz/trunk/applications/party/webapp/partymgr/js/PartyProfileContent.js Thu Jan 24 12:56:56 2008 @@ -25,41 +25,41 @@ progressBar = new Control.ProgressBar('progress_bar'); }); function uploadPartyContent(event){ - var targetFrame = $('target_upload'); - if(!targetFrame){ + var targetFrame = $('target_upload'); + if(!targetFrame){ $('partyContent').insert("<iframe id='target_upload' name='target_upload' style='display: none' src=''> </iframe>"); - } + } $('uploadPartyContent').target="target_upload"; Event.observe('target_upload', 'load', uploadCompleted); var errordiv = $('content-messages'); - if(errordiv){ + if(errordiv){ $('content-messages').remove(); - } + } } function uploadCompleted(event){ - var doc = getIframeDocument($('target_upload')); - var errordiv = doc.getElementById('content-messages'); - //console.log(errordiv); - if(errordiv){ + var doc = getIframeDocument($('target_upload')); + var errordiv = doc.getElementById('content-messages'); + //console.log(errordiv); + if(errordiv){ $('partyContent').insert(errordiv); - } - var partyContentListDiv = doc.getElementById('partyContentList'); - //console.log(partyContentListDiv); - if(partyContentListDiv){ + } + var partyContentListDiv = doc.getElementById('partyContentList'); + //console.log(partyContentListDiv); + if(partyContentListDiv){ $('partyContentList').update(partyContentListDiv.innerHTML); - } - if($('progressBarSavingMsg')){ + } + if($('progressBarSavingMsg')){ $('progressBarSavingMsg').remove(); - } - progressBar.reset(); + } + progressBar.reset(); } function getUploadProgressStatus(event){ - var i=0; - new PeriodicalExecuter(function(event){ - new Ajax.Request('/partymgr/control/getFileUploadProgressStatus', { - onSuccess: function(transport){ + var i=0; + new PeriodicalExecuter(function(event){ + new Ajax.Request('/partymgr/control/getFileUploadProgressStatus', { + onSuccess: function(transport){ var data = transport.responseText.evalJSON(true); if (data._ERROR_MESSAGE_LIST_ != undefined) { //console.log(data._ERROR_MESSAGE_LIST_); @@ -68,16 +68,16 @@ //console.log(data._ERROR_MESSAGE_); //alert(data._ERROR_MESSAGE_); }else { - //console.log(data.readPercent); - var readPercent = data.readPercent; - progressBar.setProgress(readPercent); - if(readPercent > 99){ - $('uploadPartyContent').insert("<span id='progressBarSavingMsg' class='label'>Saving..</span>"); + //console.log(data.readPercent); + var readPercent = data.readPercent; + progressBar.setProgress(readPercent); + if(readPercent > 99){ + $('uploadPartyContent').insert("<span id='progressBarSavingMsg' class='label'>Saving..</span>"); event.stop(); - } - + } + } - }}); + }}); },1); } Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Party.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Party.ftl?rev=614988&r1=614987&r2=614988&view=diff ============================================================================== --- ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Party.ftl (original) +++ ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Party.ftl Thu Jan 24 12:56:56 2008 @@ -52,7 +52,7 @@ <#if lookupPerson.nickname?has_content> <tr><td class="label">${uiLabelMap.PartyNickname}</td><td>${lookupPerson.nickname}</td></tr> </#if> - <#if lookupPerson.gender?has_content> + <#if lookupPerson.gender?has_content> <tr><td class="label">${uiLabelMap.PartyGender}</td><td>${lookupPerson.gender}</td></tr> </#if> <#if lookupPerson.birthDate?has_content> Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyClassificationForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyClassificationForms.xml?rev=614988&r1=614987&r2=614988&view=diff ============================================================================== --- ofbiz/trunk/applications/party/widget/partymgr/PartyClassificationForms.xml (original) +++ ofbiz/trunk/applications/party/widget/partymgr/PartyClassificationForms.xml Thu Jan 24 12:56:56 2008 @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8" ?> +<?xml version="1.0" encoding="UTF-8"?> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file @@ -119,7 +119,7 @@ </field> <field name="partyId" title="${uiLabelMap.Party}"> <display-entity entity-name="PartyNameView" key-field-name="partyId" description="${firstName} ${lastName} ${groupName}"> - <sub-hyperlink target="viewprofile?partyId=${partyId}" description="${partyId}" link-style="smallSubmit"/> + <sub-hyperlink target="viewprofile?partyId=${partyId}" description="${partyId}" link-style="smallSubmit"/> </display-entity> </field> <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><display/></field> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |