Author: jleroux
Date: Wed Feb 20 06:12:05 2008
New Revision: 629464
URL:
http://svn.apache.org/viewvc?rev=629464&view=revLog:
Applied fix from trunk for revision: 629463
Modified:
ofbiz/branches/release4.0/applications/order/script/org/ofbiz/order/order/OrderServices.xml
ofbiz/branches/release4.0/specialpurpose/pos/config/xpos.properties
Modified: ofbiz/branches/release4.0/applications/order/script/org/ofbiz/order/order/OrderServices.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/order/script/org/ofbiz/order/order/OrderServices.xml?rev=629464&r1=629463&r2=629464&view=diff==============================================================================
--- ofbiz/branches/release4.0/applications/order/script/org/ofbiz/order/order/OrderServices.xml (original)
+++ ofbiz/branches/release4.0/applications/order/script/org/ofbiz/order/order/OrderServices.xml Wed Feb 20 06:12:05 2008
@@ -505,7 +505,12 @@
<check-errors/>
<make-value value-name="newEntity" entity-name="OrderHeader"/>
- <sequenced-id-to-env sequence-name="OrderHeader" env-name="newEntity.orderId"/>
+ <if-not-empty field-name="parameters.orderId">
+ <set field="newEntity.orderId" from-field="parameters.orderId"/>
+ <else>
+ <sequenced-id-to-env sequence-name="OrderHeader" env-name="newEntity.orderId"/>
+ </else>
+ </if-not-empty>
<field-to-result field-name="newEntity.orderId" result-name="orderId"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
Modified: ofbiz/branches/release4.0/specialpurpose/pos/config/xpos.properties
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release4.0/specialpurpose/pos/config/xpos.properties?rev=629464&r1=629463&r2=629464&view=diff==============================================================================
--- ofbiz/branches/release4.0/specialpurpose/pos/config/xpos.properties (original)
+++ ofbiz/branches/release4.0/specialpurpose/pos/config/xpos.properties Wed Feb 20 06:12:05 2008
@@ -1,24 +1,27 @@
###############################################################################
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#
http://www.apache.org/licenses/LICENSE-2.0-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+#
http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
###############################################################################
+#
+#Dynamically modified by OFBiz Framework (org.ofbiz.base.util : UtilProperties.setPropertyValue)
+#Mon Feb 18 18:40:35 CET 2008
CenterWin=true
ClientHeight=768
-Language=XuiLabels
+Language=XuiLabels_fr
ClientWidth=1024
StartClass=default/pospanel
Title=OFBiz POS
Locked
