details: https://code.openbravo.com/erp/stable/2.50/rev/882fa1c6f142
changeset: 9738:882fa1c6f142
user: Javier Etxarri <javier.echarri <at> openbravo.com>
date: Mon Nov 14 09:23:39 2011 +0100
summary: Fixes issue 18919: Copy from invoice does not take into account
sales or purchase
diffstat:
src/org/openbravo/erpCommon/ad_actionButton/CopyFromInvoice.html | 2 +-
src/org/openbravo/erpCommon/ad_actionButton/CopyFromInvoice.xml | 1 +
src/org/openbravo/erpCommon/info/Invoice.java | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diffs (35 lines):
diff -r a8c1b910f50b -r 882fa1c6f142
src/org/openbravo/erpCommon/ad_actionButton/CopyFromInvoice.html
--- a/src/org/openbravo/erpCommon/ad_actionButton/CopyFromInvoice.html Thu Nov
10 12:56:07 2011 +0100
+++ b/src/org/openbravo/erpCommon/ad_actionButton/CopyFromInvoice.html Mon Nov
14 09:23:39 2011 +0100
@@ -162,7 +162,7 @@
<input dojotype="openbravo:ValidationTextbox"
class="TextBox_btn_TwoCells_width required" required="true" type="text"
name="inpNewcInvoiceId_DES" maxlength="22" value=""
id="id_inpNewcInvoiceId_DES"></input><script>djConfig.searchIds.push("id_inpNewcInvoiceId_DES");</script>
</td>
<td class="FieldButton_ContentCell">
- <a class="FieldButtonLink" href="#"
onfocus="setWindowElementFocus(this); window.status='Invoice'; return true;"
onblur="window.status=''; return true;"
onkeypress="this.className='FieldButtonLink_active'; return true;"
onkeyup="this.className='FieldButtonLink_focus'; return true;"
onclick="openSearch(null, null, '../info/Invoice.html', 'SELECTOR_INVOICE',
false, 'frmMain', 'inpNewcInvoiceId', 'inpNewcInvoiceId_DES',
document.frmMain.inpNewcInvoiceId_DES.value, 'WindowID', 'xx');return false;">
+ <a class="FieldButtonLink" href="#" id="windowId"
onfocus="setWindowElementFocus(this); window.status='Invoice'; return true;"
onblur="window.status=''; return true;"
onkeypress="this.className='FieldButtonLink_active'; return true;"
onkeyup="this.className='FieldButtonLink_focus'; return true;"
onclick="openSearch(null, null, '../info/Invoice.html', 'SELECTOR_INVOICE',
false, 'frmMain', 'inpNewcInvoiceId', 'inpNewcInvoiceId_DES',
document.frmMain.inpNewcInvoiceId_DES.value, 'WindowID', 'xx');return false;">
<table class="FieldButton"
onmousedown="this.className='FieldButton_active'; return true;"
onmouseup="this.className='FieldButton'; return true;"
onmouseover="this.className='FieldButton_hover'; window.status='Invoice';
return true;" onmouseout="this.className='FieldButton'; window.status='';
return true;" id="fieldWindowID">
<tr>
<td class="FieldButton_bg">
diff -r a8c1b910f50b -r 882fa1c6f142
src/org/openbravo/erpCommon/ad_actionButton/CopyFromInvoice.xml
--- a/src/org/openbravo/erpCommon/ad_actionButton/CopyFromInvoice.xml Thu Nov
10 12:56:07 2011 +0100
+++ b/src/org/openbravo/erpCommon/ad_actionButton/CopyFromInvoice.xml Mon Nov
14 09:23:39 2011 +0100
@@ -22,6 +22,7 @@
<PARAMETER id="paramLanguage" name="language" default=""/>
<PARAMETER id="paramcInvoiceId" name="key" default=""
attribute="value"/>
<PARAMETER id="window" name="window" default="" attribute="value"/>
+ <PARAMETER id="windowId" name="window" default="" attribute="onclick"
replace="xx"/>
<PARAMETER id="tab" name="tab" default="" attribute="value"/>
<PARAMETER id="paramMessage" name="message" default=""
attribute="onload" replace="xx();"/>
<PARAMETER id="question" name="question" default=""/>
diff -r a8c1b910f50b -r 882fa1c6f142
src/org/openbravo/erpCommon/info/Invoice.java
--- a/src/org/openbravo/erpCommon/info/Invoice.java Thu Nov 10 12:56:07
2011 +0100
+++ b/src/org/openbravo/erpCommon/info/Invoice.java Mon Nov 14 09:23:39
2011 +0100
@@ -63,7 +63,7 @@
if (vars.commandIn("DEFAULT")) {
String strNameValue = vars.getRequestGlobalVariable("inpNameValue",
"Invoice.name");
String strWindowId = vars.getRequestGlobalVariable("WindowID",
"Invoice.windowId");
- String strSOTrx = Utility.getContext(this, vars, "isSOTrx", strWindowId);
+ String strSOTrx = vars.getSessionValue(strWindowId + "|ISSOTRX");
if (!strWindowId.equals("")) {
vars.setSessionValue("Invoice.isSOTrx", (strSOTrx.equals("") ? "N" :
strSOTrx));
}
------------------------------------------------------------------------------
RSA(R) Conference 2012
Save $700 by Nov 18
Register now
http://p.sf.net/sfu/rsa-sfdev2dev1
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
