[RTL] Merge from pi
authorDavid Baz Fayos <david.baz@openbravo.com>
Wed, 02 May 2012 15:51:26 +0200
changeset 16360 176a087b1b8a
parent 16359 95e133cb2041 (current diff)
parent 16269 21e30409f813 (diff)
child 16361 84a791b45fae
[RTL] Merge from pi
--- a/.hgsigs	Wed May 02 15:50:09 2012 +0200
+++ b/.hgsigs	Wed May 02 15:51:26 2012 +0200
@@ -56,6 +56,7 @@
 cb27736b6ddbcf70d5a9c8878bdb012134818585 0 iEYEABECAAYFAk8pORIACgkQCX/oGf+2qkNT1ACgt0zVkZRcUGvubOPpiwStjh2c41YAn2J6v2/Cop95IKkUtVaBclL4c+89
 d034d0b54ffb6c401b3741be99d4237f82aa9d76 0 iEYEABECAAYFAk8EN/IACgkQCX/oGf+2qkMPzgCg/gXTYW5Vv9s02aG3VAi3lSvNiMwAn29/22CruqkJ9sTWkyA8lCChqk/r
 aa474df671aa2c3d4a16419479cf8098d5fbca82 0 iEYEABECAAYFAk8N8JAACgkQCX/oGf+2qkMFLACbB+b+pdKa0rd7O+ig6so/ETi1x0YAnRKPM91wMwdONWZ5AOazDoSj6h/c
+5cba5141fb8bb820c066f55b3b04713e3ba77439 0 iEYEABECAAYFAk+aaVcACgkQCX/oGf+2qkNnpwCaA0r7amMCeZiKyHJJT4QErFDVolkAniQ1iPNuyS3BGCCO8RWe/m/UH1IW
 4463903e11ac52337be6041dcfb593022f35427f 0 iEYEABECAAYFAk8qiYkACgkQCX/oGf+2qkP6cgCfcsvKoCUqTvEE9+9qeLRBrjKy64YAn1Eg4n1WZcu4dxxnIDgAsjEywG/C
 f7c288af065f5425b20bd8bbef645df237282d4c 0 iEYEABECAAYFAk87pWEACgkQCX/oGf+2qkM1cgCg5Cp8jLM2gcEh+e+4QiJSJanE6J4An1iZUE2/OlrA8jLt9SQCs6/efCNq
 4f5fd4acb98e5fb7ef587debb5ffd20487e2bb32 0 iEYEABECAAYFAk9CRa4ACgkQCX/oGf+2qkPC4ACeJ5HQ20QAW0ULMU/+SUGJvz9YNEYAoJwLMrqwWkt3GuJFyp7TwpULPeKu
--- a/.hgtags	Wed May 02 15:50:09 2012 +0200
+++ b/.hgtags	Wed May 02 15:51:26 2012 +0200
@@ -73,6 +73,7 @@
 482fdc3919a19e72bfa675ddfbeb5aee83144698 3.0MP8.1
 b625648e103ef1d0ae41eff56c9a1e33877e53f9 3.0MP8.2
 2b3682085de417caee2ba0c2bb3f049e452cbc64 3.0MP8.3
+3cd18772018f9fdff29aa4f9a6980a5d834e8aad 3.0MP8.4
 952c381e3ada4a4e3511782945d3aa66e09a697e 3.0MP9
 fb8d27aba52ce894846d0561c08aced707d99069 3.0MP9.1
 00280ab1ed3ab01d41ed048ccd01694af1223341 3.0MP10
--- a/src-db/database/sourcedata/OBUISEL_SELECTOR.xml	Wed May 02 15:50:09 2012 +0200
+++ b/src-db/database/sourcedata/OBUISEL_SELECTOR.xml	Wed May 02 15:51:26 2012 +0200
@@ -9,7 +9,7 @@
 <!--2E64F551C7C4470C80C29DBA24B34A5F-->  <AD_REFERENCE_ID><![CDATA[800060]]></AD_REFERENCE_ID>
 <!--2E64F551C7C4470C80C29DBA24B34A5F-->  <AD_TABLE_ID><![CDATA[FF8080812DFFA1CF012DFFB889F40016]]></AD_TABLE_ID>
 <!--2E64F551C7C4470C80C29DBA24B34A5F-->  <WHERECLAUSE><![CDATA[e.active='Y']]></WHERECLAUSE>
-<!--2E64F551C7C4470C80C29DBA24B34A5F-->  <FILTER_EXPRESSION><![CDATA[" e.productPrice.priceListVersion.priceList.salesPriceList = " + OB.isSalesTransaction()  + " AND e.productPrice.priceListVersion.priceList.currency.id = '" + OB.getParameters().get('inpcCurrencyId') + "'"]]></FILTER_EXPRESSION>
+<!--2E64F551C7C4470C80C29DBA24B34A5F-->  <FILTER_EXPRESSION><![CDATA[if (OB.getParameters().get('inpcCurrencyId')){ " e.productPrice.priceListVersion.priceList.salesPriceList = " + OB.isSalesTransaction()  + " AND e.productPrice.priceListVersion.priceList.currency.id = '" + OB.getParameters().get('inpcCurrencyId') + "'" }]]></FILTER_EXPRESSION>
 <!--2E64F551C7C4470C80C29DBA24B34A5F-->  <OBCLKER_TEMPLATE_ID><![CDATA[9314DE8599AD44E7BFC4CC50699042AB]]></OBCLKER_TEMPLATE_ID>
 <!--2E64F551C7C4470C80C29DBA24B34A5F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--2E64F551C7C4470C80C29DBA24B34A5F-->  <VALUEFIELD_ID><![CDATA[2CB91FE062B541ACB00D82AC69858446]]></VALUEFIELD_ID>