Author: jleroux
Date: Sat Nov 11 08:23:34 2006
New Revision: 473745
URL: http://svn.apache.org/viewvc?view=rev&rev=473745
Log:
Mods inspired from an issue created by Krzysztof Podejma :
https://issues.apache.org/jira/browse/OFBIZ-448
Modified:
incubator/ofbiz/trunk/applications/order/config/OrderUiLabels.properties
incubator/ofbiz/trunk/applications/order/config/OrderUiLabels_fr.properties
incubator/ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/FacilityContactMechServices.xml
Modified:
incubator/ofbiz/trunk/applications/order/config/OrderUiLabels.properties
URL:
http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/config/OrderUiLabels.properties?view=diff&rev=473745&r1=473744&r2=473745
==============================================================================
--- incubator/ofbiz/trunk/applications/order/config/OrderUiLabels.properties
(original)
+++ incubator/ofbiz/trunk/applications/order/config/OrderUiLabels.properties
Sat Nov 11 08:23:34 2006
@@ -18,7 +18,6 @@
# UiLabels for the order Component
# ========================================
FacilityBillingAddressSameShipping=Billing address is the same as the shipping
address
-FacilityContactMechNotFoundCannotDelete=ERROR: Could not delete contact info
(facility contact mech not found
FacilityDeliveryOrder=Delivery order
FacilityFacility=Facility
FacilityInventory=Inventory
Modified:
incubator/ofbiz/trunk/applications/order/config/OrderUiLabels_fr.properties
URL:
http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/config/OrderUiLabels_fr.properties?view=diff&rev=473745&r1=473744&r2=473745
==============================================================================
--- incubator/ofbiz/trunk/applications/order/config/OrderUiLabels_fr.properties
(original)
+++ incubator/ofbiz/trunk/applications/order/config/OrderUiLabels_fr.properties
Sat Nov 11 08:23:34 2006
@@ -18,7 +18,6 @@
# UiLabels for the order Component
# ========================================
FacilityBillingAddressSameShipping=L'adresse de facturation est la m\u00EAme
que celle de livraison
-FacilityContactMechNotFoundCannotDelete=ERREUR: les infos du contact n'ont pu
\u00EAtre supprim\u00E9es (ce m\u00E9canisme de contact n'existe pas)\r\n
FacilityDeliveryOrder=Bon de livraison
FacilityFacility=Stock
FacilityInventory=Inventaire
Modified:
incubator/ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/FacilityContactMechServices.xml
URL:
http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/FacilityContactMechServices.xml?view=diff&rev=473745&r1=473744&r2=473745
==============================================================================
---
incubator/ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/FacilityContactMechServices.xml
(original)
+++
incubator/ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/FacilityContactMechServices.xml
Sat Nov 11 08:23:34 2006
@@ -34,7 +34,6 @@
</call-service>
<log level="info" message="ContactMech created"/>
<else>
-
<set field="newValue.contactMechId"
from-field="parameters.contactMechId" />
</else>
</if-empty>
@@ -131,7 +130,7 @@
<first-from-list entry-name="facilityContactMech"
list-name="validFacilityContactMechs"/>
<if-empty field-name="facilityContactMech">
<add-error>
- <fail-property resource="FacilityUiLabels"
property="FacilityContactMechNotFoundCannotDelete"/>
+ <fail-property resource="PartyUiLabels"
property="PartyContactMechNotFoundCannotDelete"/>
</add-error>
<return/>
</if-empty>
@@ -241,6 +240,11 @@
<check-permission permission="FACILITY" action="_UPDATE"><fail-message
message="You do not have permission to perform this operation for this
facility."/></check-permission>
<check-errors/>
+ <if-validate-method field-name="parameters.emailAddress"
method="isEmail">
+ <else><add-error><fail-property resource="PartyUiLabels"
property="PartyEmailAddressNotFormattedCorrectly"/></add-error></else>
+ </if-validate-method>
+ <check-errors/>
+
<set-service-fields service-name="createFacilityContactMech"
map-name="parameters" to-map-name="createFacilityContactMechMap"/>
<set field="createFacilityContactMechMap.infoString"
from-field="parameters.emailAddress"/>
<set field="createFacilityContactMechMap.contactMechTypeId"
value="EMAIL_ADDRESS"/>
@@ -257,7 +261,7 @@
<check-errors/>
<if-validate-method field-name="parameters.emailAddress"
method="isEmail">
- <else><add-error><fail-property resource="FacilityUiLabels"
property="FacilityEmailAddressNotFormattedCorrectly"/></add-error></else>
+ <else><add-error><fail-property resource="PartyUiLabels"
property="PartyEmailAddressNotFormattedCorrectly"/></add-error></else>
</if-validate-method>
<check-errors/>
