svn commit: r428973 - in /incubator/ofbiz/trunk/applications/product: servicedef/services_facility.xml webapp/facility/facility/EditFacility.ftl

[jacopoc]

Author: jacopoc
Date: Sat Aug  5 00:49:27 2006
New Revision: 428973

URL: http://svn.apache.org/viewvc?rev=428973&view=rev
Log:
The Facility.ownerPartyId is now a mandatory field; if this is not set many of the cost and accounting routines will complain.

Modified:
    incubator/ofbiz/trunk/applications/product/servicedef/services_facility.xml
    incubator/ofbiz/trunk/applications/product/webapp/facility/facility/EditFacility.ftl

Modified: incubator/ofbiz/trunk/applications/product/servicedef/services_facility.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/servicedef/services_facility.xml?rev=428973&r1=428972&r2=428973&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/product/servicedef/services_facility.xml (original)
+++ incubator/ofbiz/trunk/applications/product/servicedef/services_facility.xml Sat Aug  5 00:49:27 2006
@@ -369,6 +369,7 @@
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
         <override name="facilityTypeId" optional="false"/>
         <override name="facilityName" optional="false"/>
+        <override name="ownerPartyId" optional="false"/>
     </service>
     <service name="updateFacility" default-entity-name="Facility" engine="simple"
                 location="org/ofbiz/product/storage/StorageServices.xml" invoke="updateFacility" auth="true">

Modified: incubator/ofbiz/trunk/applications/product/webapp/facility/facility/EditFacility.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/webapp/facility/facility/EditFacility.ftl?rev=428973&r1=428972&r2=428973&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/product/webapp/facility/facility/EditFacility.ftl (original)
+++ incubator/ofbiz/trunk/applications/product/webapp/facility/facility/EditFacility.ftl Sat Aug  5 00:49:27 2006
@@ -54,21 +54,19 @@
       </select>
     </td>
   </tr>
-<#if ownerParties?has_content>
   <tr>
     <td width="26%" align="right"><div class="tabletext">${uiLabelMap.ProductFacilityOwner}</div></td>
     <td>&nbsp;</td>
     <td width="74%">
       <select name="ownerPartyId" size="1" class='selectBox'>
-        <option selected value='${facility.ownerPartyId?if_exists}'>${facility.ownerPartyId?if_exists}</option>
-        <option value='${facility.ownerPartyId?if_exists}'>----</option>
-        <#list ownerParties as party>
-          <option value='${party.partyId?if_exists}'>${party.partyId?if_exists}</option>
-        </#list>
+        <#if ownerParties?has_content>
+            <#list ownerParties as party>
+              <option value='${party.partyId?if_exists}' <#if facility.ownerPartyId?exists && party.partyId = facility.ownerPartyId>selected</#if>>${party.partyId?if_exists}</option>
+            </#list>
+        </#if>
       </select>
     </td>
   </tr>
-</#if>
   <tr>
     <td width="26%" align="right"><div class="tabletext">${uiLabelMap.ProductFacilityDefaultWeightUnit}</div></td>
     <td>&nbsp;</td>