details: /erp/devel/pi/rev/45db3a2f9503
changeset: 12497:45db3a2f9503
user: Mikel Irurita <mikel.irurita <at> openbravo.com>
date: Thu May 26 16:27:29 2011 +0200
summary: Fixes issue 17364: issotrx pre-filter and bp selector shows wrong
records
diffstat:
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml
| 2 ++
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.html
| 3 ++-
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.java
| 1 +
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.xml
| 1 +
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.html
| 4 +++-
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.java
| 2 ++
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.xml
| 2 ++
7 files changed, 13 insertions(+), 2 deletions(-)
diffs (111 lines):
diff -r 81d66d798cab -r 45db3a2f9503
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml
---
a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml
Thu May 26 15:09:11 2011 +0100
+++
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml
Thu May 26 16:27:29 2011 +0200
@@ -129,6 +129,7 @@
<!--583F20A11FD34C65BEC1F15D5DBF70BA--> <SORTNO><![CDATA[5]]></SORTNO>
<!--583F20A11FD34C65BEC1F15D5DBF70BA--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--583F20A11FD34C65BEC1F15D5DBF70BA--> <ISOUTFIELD><![CDATA[N]]></ISOUTFIELD>
+<!--583F20A11FD34C65BEC1F15D5DBF70BA--> <DEFAULT_EXPRESSION><![CDATA[if
(OB.isSalesTransaction() == true) { '' } else {'true'}]]></DEFAULT_EXPRESSION>
<!--583F20A11FD34C65BEC1F15D5DBF70BA-->
<SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
<!--583F20A11FD34C65BEC1F15D5DBF70BA--></OBUISEL_SELECTOR_FIELD>
@@ -238,6 +239,7 @@
<!--B67B839A695A44499277CF0D09FAC54F--> <SORTNO><![CDATA[4]]></SORTNO>
<!--B67B839A695A44499277CF0D09FAC54F--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--B67B839A695A44499277CF0D09FAC54F--> <ISOUTFIELD><![CDATA[N]]></ISOUTFIELD>
+<!--B67B839A695A44499277CF0D09FAC54F--> <DEFAULT_EXPRESSION><![CDATA[if
(OB.isSalesTransaction() == true) { 'true' } else {''}]]></DEFAULT_EXPRESSION>
<!--B67B839A695A44499277CF0D09FAC54F-->
<SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
<!--B67B839A695A44499277CF0D09FAC54F--></OBUISEL_SELECTOR_FIELD>
diff -r 81d66d798cab -r 45db3a2f9503
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.html
---
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.html
Thu May 26 15:09:11 2011 +0100
+++
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.html
Thu May 26 16:27:29 2011 +0200
@@ -488,6 +488,7 @@
<input type="hidden" name="inpadWindowId" value="" id="fieldWindowId"/>
<input type="hidden" name="inpTabId" value="" id="fieldTabId"/>
<input type="hidden" name="isReceipt" value="" id="fieldReceipt"/>
+ <input type="hidden" name="inpissotrx" value="" id="fieldIsSoTrx"/>
<input type="hidden" name="isFirstLoad" value="true"/>
<input type="hidden" name="isGLItem" value="N"/>
<input type="hidden" name="inpDeleteGLItem" value=""/>
@@ -913,7 +914,7 @@
<td style="padding-top: 0px;">
<script>var sc_C_BPartner_ID = null;</script>
<input type="hidden" name="inpcBPartnerId"
id="C_BPartner_ID" value="" onreset="sc_C_BPartner_ID.resetSelector();"
onchange="openbravo.Utilities.updateSmartClientComponentValue(this,
sc_C_BPartner_ID.selectorField);"></input>
- <script id="selectorLink"
src="../org.openbravo.client.kernel/OBUISEL_Selector/A98899B1C75A4F4EBD3414F1B654EFAB?columnName=C_BPartner_ID&disabled=false&CssSize=TwoCells&DisplayLength=45.0&required=true"></script>
+ <script id="selectorLink"
src="../org.openbravo.client.kernel/OBUISEL_Selector/A98899B1C75A4F4EBD3414F1B654EFAB?columnName=C_BPartner_ID&disabled=false&CssSize=TwoCells&DisplayLength=45.0&required=true&filterClass=org.openbravo.userinterface.selector.SelectorDataSourceFilter&_selectorDefinitionId=A98899B1C75A4F4EBD3414F1B654EFAB"></script>
</td>
</tr>
</table>
diff -r 81d66d798cab -r 45db3a2f9503
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.java
---
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.java
Thu May 26 15:09:11 2011 +0100
+++
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.java
Thu May 26 16:27:29 2011 +0200
@@ -274,6 +274,7 @@
xmlDocument.setParameter("actualPayment", payment.getAmount().toString());
xmlDocument.setParameter("headerAmount", payment.getAmount().toString());
xmlDocument.setParameter("isReceipt", (payment.isReceipt() ? "Y" : "N"));
+ xmlDocument.setParameter("isSoTrx", (payment.isReceipt()) ? "Y" : "N");
if (payment.getBusinessPartner() == null
&& (payment.getGeneratedCredit() != null ||
payment.getGeneratedCredit().compareTo(
BigDecimal.ZERO) != 0)) {
diff -r 81d66d798cab -r 45db3a2f9503
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.xml
---
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.xml
Thu May 26 15:09:11 2011 +0100
+++
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.xml
Thu May 26 16:27:29 2011 +0200
@@ -39,6 +39,7 @@
<PARAMETER id="fieldWindowId" name="windowId" attribute="value"/>
<PARAMETER id="fieldTabId" name="tabId" attribute="value"/>
<PARAMETER id="fieldReceipt" name="isReceipt" attribute="value"/>
+ <PARAMETER id="fieldIsSoTrx" name="isSoTrx" attribute="value"/>
<PARAMETER id="paramPrecision" name="precision" attribute="value"/>
<PARAMETER id="paramHeaderAmount" name="headerAmount" attribute="value"
format="euroEdition"/>
diff -r 81d66d798cab -r 45db3a2f9503
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.html
---
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.html
Thu May 26 15:09:11 2011 +0100
+++
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.html
Thu May 26 16:27:29 2011 +0200
@@ -367,8 +367,10 @@
<input type="hidden" name="IsPopUpCall" value="1" />
<input type="hidden" name="inpFinancialAccountId" value=""
id="paramFinancialAccountId"/>
<input type="hidden" name="isReceipt" value="" id="fieldReceipt"/>
+ <input type="hidden" name="inpissotrx" value="" id="fieldIsSoTrx"/>
<input type="hidden" name="inpFinBankStatementLineId" value=""
id="paramFinBankStatementLineId"></input>
<input type="hidden" name="isFirstLoad" value="true"/>
+ <input type="hidden" name="inpadOrgId" value="" id="fieldOrg"/>
<div class="Popup_ContentPane_CircleLogo">
<div class="Popup_WindowLogo">
<img class="Popup_WindowLogo_Icon Popup_WindowLogo_Icon_process"
src="../../../../../web/images/blank.gif" border=0/></img>
@@ -661,7 +663,7 @@
<td style="padding-top: 0px;">
<script>var sc_C_Bpartner_ID = null;</script>
<input type="hidden" name="inpcBpartnerId"
id="C_Bpartner_ID" value="" onreset="sc_C_Bpartner_ID.resetSelector();"
onchange="openbravo.Utilities.updateSmartClientComponentValue(this,
sc_C_Bpartner_ID.selectorField);"></input>
- <script id="selectorLink"
src="../org.openbravo.client.kernel/OBUISEL_Selector/A98899B1C75A4F4EBD3414F1B654EFAB?columnName=C_Bpartner_ID&disabled=false&CssSize=TwoCells&DisplayLength=45.0&callOut=onchangeBPartner&required=false"></script>
+ <script id="selectorLink"
src="../org.openbravo.client.kernel/OBUISEL_Selector/A98899B1C75A4F4EBD3414F1B654EFAB?columnName=C_Bpartner_ID&disabled=false&CssSize=TwoCells&DisplayLength=45.0&callOut=onchangeBPartner&required=false&filterClass=org.openbravo.userinterface.selector.SelectorDataSourceFilter&_selectorDefinitionId=A98899B1C75A4F4EBD3414F1B654EFAB"></script>
</td>
</tr>
</table>
diff -r 81d66d798cab -r 45db3a2f9503
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.java
---
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.java
Thu May 26 15:09:11 2011 +0100
+++
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.java
Thu May 26 16:27:29 2011 +0200
@@ -293,7 +293,9 @@
xmlDocument.setParameter("language", "defaultLang=\"" + vars.getLanguage()
+ "\";");
xmlDocument.setParameter("theme", vars.getTheme());
xmlDocument.setParameter("isReceipt", (isReceipt) ? "Y" : "N");
+ xmlDocument.setParameter("isSoTrx", (isReceipt) ? "Y" : "N");
xmlDocument.setParameter("finBankStatementLineId",
strFinBankStatementLineId);
+ xmlDocument.setParameter("orgId",
financialAccount.getOrganization().getId());
// get DocumentNo
final List<Object> parameters = new ArrayList<Object>();
diff -r 81d66d798cab -r 45db3a2f9503
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.xml
---
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.xml
Thu May 26 15:09:11 2011 +0100
+++
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.xml
Thu May 26 16:27:29 2011 +0200
@@ -39,8 +39,10 @@
<PARAMETER id="C_Bpartner_ID" name="businessPartner" attribute="value"/>
<PARAMETER id="paramCredit" name="credit" attribute="value"
format="euroEdition"/>
<PARAMETER id="fieldReceipt" name="isReceipt" attribute="value"/>
+ <PARAMETER id="fieldIsSoTrx" name="isSoTrx" attribute="value"/>
<PARAMETER id="paramPrecision" name="precision" attribute="value"/>
<PARAMETER id="paramFinBankStatementLineId" name="finBankStatementLineId"
attribute="value" default=""/>
+ <PARAMETER id="fieldOrg" name="orgId" attribute="value"/>
<PARAMETER id="paramPaymentDate" name="paymentDate" attribute="value"/>
<PARAMETER id="paramPaymentDate" name="dateDisplayFormat"
attribute="displayformat" replace="xx"/>
------------------------------------------------------------------------------
vRanger cuts backup time in half-while increasing security.
With the market-leading solution for virtual backup and recovery,
you get blazing-fast, flexible, and affordable data protection.
Download your free trial now.
http://p.sf.net/sfu/quest-d2dcopy1
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
