svn commit: r629475 - in /ofbiz/branches/release4.0: applications/order/script/org/ofbiz/order/order/OrderServices.xml specialpurpose/pos/config/xpos.properties

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r629475 - in /ofbiz/branches/release4.0: applications/order/script/org/ofbiz/order/order/OrderServices.xml specialpurpose/pos/config/xpos.properties

jleroux@apache.org
Author: jleroux
Date: Wed Feb 20 06:32:08 2008
New Revision: 629475

URL: http://svn.apache.org/viewvc?rev=629475&view=rev
Log:
Undoing stupid changes committed in r629464

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=629475&r1=629474&r2=629475&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:32:08 2008
@@ -505,12 +505,7 @@
         <check-errors/>
 
         <make-value value-name="newEntity" entity-name="OrderHeader"/>
-        <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>
+        <sequenced-id-to-env sequence-name="OrderHeader" env-name="newEntity.orderId"/>
         <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=629475&r1=629474&r2=629475&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:32:08 2008
@@ -1,27 +1,24 @@
 ###############################################################################
-# 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_fr
+Language=XuiLabels
 ClientWidth=1024
 StartClass=default/pospanel
 Title=OFBiz POS