details: /erp/devel/pi/rev/f4338c624078
changeset: 12055:f4338c624078
user: Javier Etxarri <javier.echarri <at> openbravo.com>
date: Tue May 03 16:44:28 2011 +0200
summary: fises issue 16559: When setting project in Purchase Invoice, payment
terms and form of payment fields should not be modified
details: /erp/devel/pi/rev/90e06fce74fb
changeset: 12056:90e06fce74fb
user: Javier Etxarri <javier.echarri <at> openbravo.com>
date: Mon May 09 09:04:30 2011 +0200
summary: fises issue 16992: Wrong organization in lines created using Create
Lines From
diffstat:
src/org/openbravo/erpCommon/ad_actionButton/CreateFrom.java | 3 +-
src/org/openbravo/erpCommon/ad_callouts/SE_Invoice_Project.java | 40 ++++-----
src/org/openbravo/erpCommon/ad_callouts/SE_Order_Project.java | 41 ++++++---
3 files changed, 45 insertions(+), 39 deletions(-)
diffs (146 lines):
diff -r 16dace193c15 -r 90e06fce74fb
src/org/openbravo/erpCommon/ad_actionButton/CreateFrom.java
--- a/src/org/openbravo/erpCommon/ad_actionButton/CreateFrom.java Mon May
09 10:50:24 2011 +0200
+++ b/src/org/openbravo/erpCommon/ad_actionButton/CreateFrom.java Mon May
09 09:04:30 2011 +0200
@@ -1505,8 +1505,9 @@
data[i].id));
LineNetAmt = LineNetAmt.setScale(curPrecision,
BigDecimal.ROUND_HALF_UP);
try {
+ final String strOrg2 = vars.getGlobalVariable("inpadOrgId",
"CreateFrom|adOrgId", "");
CreateFromInvoiceData.insert(conn, this, strSequence, strKey,
vars.getClient(),
- data[i].adOrgId, vars.getUser(), data[i].cOrderlineId,
data[i].mInoutlineId,
+ strOrg2, vars.getUser(), data[i].cOrderlineId,
data[i].mInoutlineId,
data[i].description, data[i].mProductId, data[i].cUomId,
data[i].id, priceList,
priceActual, priceLimit, LineNetAmt.toString(), C_Tax_ID,
data[i].quantityorder,
data[i].mProductUomId, data[i].mAttributesetinstanceId,
priceStd,
diff -r 16dace193c15 -r 90e06fce74fb
src/org/openbravo/erpCommon/ad_callouts/SE_Invoice_Project.java
--- a/src/org/openbravo/erpCommon/ad_callouts/SE_Invoice_Project.java Mon May
09 10:50:24 2011 +0200
+++ b/src/org/openbravo/erpCommon/ad_callouts/SE_Invoice_Project.java Mon May
09 09:04:30 2011 +0200
@@ -72,32 +72,28 @@
StringBuffer resultado = new StringBuffer();
- // To be consistent with Purchase/Sales Orders and Sales invoices,
- // This behaviour is implemented for Purchase invoices too
- // as requiested in issue 0013323
+ if (strIsSOTrx.equals("Y")) {
+ if (data == null || data.length == 0) {
+ resultado.append("var calloutName='SE_Invoice_Project';\n\n");
+ resultado.append("var respuesta = null;");
+ } else {
+ resultado.append("var calloutName='SE_Invoice_Project';\n\n");
+ resultado.append("var respuesta = new Array(");
- // if (strIsSOTrx.equals("Y")) {
- if (data == null || data.length == 0) {
+ String strPaymentRule = data[0].paymentrule;
+ if (strPaymentRule != null && !"".equals(strPaymentRule)) {
+ resultado.append("new Array(\"inppaymentrule\", \"" + strPaymentRule
+ "\"),");
+ }
+ String PaymentTerm = data[0].paymentterm;
+ if (PaymentTerm != null && !"".equals(PaymentTerm)) {
+ resultado.append("new Array(\"inpcPaymenttermId\", \"" + PaymentTerm
+ "\")");
+ }
+ resultado.append(");");
+ }
+ } else {
resultado.append("var calloutName='SE_Invoice_Project';\n\n");
resultado.append("var respuesta = null;");
- } else {
- resultado.append("var calloutName='SE_Invoice_Project';\n\n");
- resultado.append("var respuesta = new Array(");
-
- String strPaymentRule = data[0].paymentrule;
- if (strPaymentRule != null && !"".equals(strPaymentRule)) {
- resultado.append("new Array(\"inppaymentrule\", \"" + strPaymentRule +
"\"),");
- }
- String PaymentTerm = data[0].paymentterm;
- if (PaymentTerm != null && !"".equals(PaymentTerm)) {
- resultado.append("new Array(\"inpcPaymenttermId\", \"" + PaymentTerm +
"\")");
- }
- resultado.append(");");
}
- // } else {
- // resultado.append("var calloutName='SE_Invoice_Project';\n\n");
- // resultado.append("var respuesta = null;");
- // }
xmlDocument.setParameter("array", resultado.toString());
xmlDocument.setParameter("frameName", "appFrame");
response.setContentType("text/html; charset=UTF-8");
diff -r 16dace193c15 -r 90e06fce74fb
src/org/openbravo/erpCommon/ad_callouts/SE_Order_Project.java
--- a/src/org/openbravo/erpCommon/ad_callouts/SE_Order_Project.java Mon May
09 10:50:24 2011 +0200
+++ b/src/org/openbravo/erpCommon/ad_callouts/SE_Order_Project.java Mon May
09 09:04:30 2011 +0200
@@ -28,6 +28,7 @@
import org.openbravo.base.secureApp.HttpSecureAppServlet;
import org.openbravo.base.secureApp.VariablesSecureApp;
+import org.openbravo.erpCommon.utility.Utility;
import org.openbravo.xmlEngine.XmlDocument;
public class SE_Order_Project extends HttpSecureAppServlet {
@@ -45,11 +46,13 @@
String strChanged = vars.getStringParameter("inpLastFieldChanged");
if (log4j.isDebugEnabled())
log4j.debug("CHANGED: " + strChanged);
+ String strWindowId = vars.getStringParameter("inpwindowId");
String strProjectId = vars.getStringParameter("inpcProjectId");
String strTabId = vars.getStringParameter("inpTabId");
+ String strIsSOTrx = Utility.getContext(this, vars, "isSOTrx",
strWindowId);
try {
- printPage(response, vars, strProjectId, strTabId);
+ printPage(response, vars, strProjectId, strTabId, strIsSOTrx);
} catch (ServletException ex) {
pageErrorCallOut(response);
}
@@ -58,7 +61,7 @@
}
private void printPage(HttpServletResponse response, VariablesSecureApp vars,
- String strProjectId, String strTabId) throws IOException,
ServletException {
+ String strProjectId, String strTabId, String strIsSOTrx) throws
IOException, ServletException {
if (log4j.isDebugEnabled())
log4j.debug("Output: dataSheet");
XmlDocument xmlDocument = xmlEngine.readXmlTemplate(
@@ -67,22 +70,28 @@
SEOrderProjectData[] data = SEOrderProjectData.select(this, strProjectId);
boolean hasData = false;
StringBuffer resultado = new StringBuffer();
- resultado.append("var calloutName='SE_Order_Project';\n\n");
- resultado.append("var respuesta = new Array(");
- if (data != null && data.length > 0) {
- if (!data[0].paymentrule.equals("")) {
- String strPaymentRule = data[0].paymentrule;
- resultado.append("new Array(\"inppaymentrule\", \"" + strPaymentRule +
"\")");
- hasData = true;
+
+ if (strIsSOTrx.equals("Y")) {
+ resultado.append("var calloutName='SE_Order_Project';\n\n");
+ resultado.append("var respuesta = new Array(");
+ if (data != null && data.length > 0) {
+ if (!data[0].paymentrule.equals("")) {
+ String strPaymentRule = data[0].paymentrule;
+ resultado.append("new Array(\"inppaymentrule\", \"" + strPaymentRule
+ "\")");
+ hasData = true;
+ }
+ if (!data[0].paymentterm.equals("")) {
+ if (hasData)
+ resultado.append(",");
+ String PaymentTerm = data[0].paymentterm;
+ resultado.append("new Array(\"inpcPaymenttermId\", \"" + PaymentTerm
+ "\")");
+ }
}
- if (!data[0].paymentterm.equals("")) {
- if (hasData)
- resultado.append(",");
- String PaymentTerm = data[0].paymentterm;
- resultado.append("new Array(\"inpcPaymenttermId\", \"" + PaymentTerm +
"\")");
- }
+ resultado.append(");");
+ } else {
+ resultado.append("var calloutName='SE_Order_Project';\n\n");
+ resultado.append("var respuesta = null;");
}
- resultado.append(");");
xmlDocument.setParameter("array", resultado.toString());
xmlDocument.setParameter("frameName", "appFrame");
response.setContentType("text/html; charset=UTF-8");
------------------------------------------------------------------------------
WhatsUp Gold - Download Free Network Management Software
The most intuitive, comprehensive, and cost-effective network
management toolset available today. Delivers lowest initial
acquisition cost and overall TCO of any competing solution.
http://p.sf.net/sfu/whatsupgold-sd
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
