details: /erp/devel/int/rev/919cfa2a9e68
changeset: 7124:919cfa2a9e68
user: Harikrishnan Raja <harikrishnan.raja <at> openbravo.com>
date: Fri Apr 23 15:40:23 2010 +0530
summary: Fixes Issue 12842: Currency value not assigned in Requsition header
page.
details: /erp/devel/int/rev/f416696344a6
changeset: 7125:f416696344a6
user: Sivaraman Rajagopal <sivaraman.rajagopal <at> openbravo.com>
date: Fri Apr 23 15:50:49 2010 +0530
summary: Fixes issue 12857: It is possible to generate an invoice with a
Transaction Document disabled
details: /erp/devel/int/rev/aeacb7e398a6
changeset: 7126:aeacb7e398a6
user: Sivaraman Rajagopal <sivaraman.rajagopal <at> openbravo.com>
date: Fri Apr 23 15:53:55 2010 +0530
summary: Fixes issue 12805: Inactive Discount still apples to the sales order
details: /erp/devel/int/rev/c1385e451739
changeset: 7127:c1385e451739
user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com>
date: Fri Apr 23 01:24:27 2010 +0200
summary: Fixes wrong default value for processed and processing
details: /erp/devel/int/rev/8f769fcf0b0a
changeset: 7128:8f769fcf0b0a
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Fri Apr 23 12:51:39 2010 +0200
summary: fixed bug 12626: Toolbar: Search pop-up is not working well
diffstat:
src-db/database/model/functions/C_INVOICE_CREATE.xml |
16 ++++-
src-db/database/model/functions/C_ORDER_POST1.xml |
1 +
src-db/database/model/tables/FIN_FINACC_TRANSACTION.xml |
4 +-
src-db/database/sourcedata/AD_MESSAGE.xml |
11 +++
src-db/database/sourcedata/AD_VAL_RULE.xml |
2 +-
src/org/openbravo/erpCommon/ad_callouts/SL_Requisition_BPartner.java |
5 +-
src/org/openbravo/erpCommon/ad_callouts/SL_Requisition_BPartner_data.xsql |
7 +-
src/org/openbravo/erpCommon/ad_forms/GenerateInvoicesmanual.java |
30 +---------
src/org/openbravo/reference/ui/UIReference.java |
9 ++-
9 files changed, 44 insertions(+), 41 deletions(-)
diffs (207 lines):
diff -r a14284c69f01 -r 8f769fcf0b0a
src-db/database/model/functions/C_INVOICE_CREATE.xml
--- a/src-db/database/model/functions/C_INVOICE_CREATE.xml Fri Apr 23
10:00:29 2010 +0200
+++ b/src-db/database/model/functions/C_INVOICE_CREATE.xml Fri Apr 23
12:51:39 2010 +0200
@@ -372,6 +372,7 @@
* Create Invoice Header ---------------------------------------
*/
-- Get Order DocType Info - approved from Invoice DocType
+ BEGIN
v_ResultStr:='GetDocTypeInfo - ' || Cur_Order.C_DocType_ID;
SELECT od.C_DocTypeInvoice_ID,
od.DocSubTypeSO
INTO v_DocType_ID,
@@ -379,7 +380,12 @@
FROM C_DOCTYPE od,
C_DOCTYPE ID
WHERE od.C_DocType_ID=Cur_Order.C_DocType_ID
- AND od.C_DocTypeInvoice_ID=ID.C_DocType_ID;
+ AND od.C_DocTypeInvoice_ID=ID.C_DocType_ID
+ AND ID.IsActive='Y';
+ EXCEPTION
+ WHEN OTHERS THEN
+ RAISE_APPLICATION_ERROR(-20000, '@NoDocumentTypeFound@') ;
+ END;
--
Ad_Sequence_Next('C_Invoice', Cur_Order.AD_Client_ID,
p_Invoice_ID) ;
Ad_Sequence_Doctype(v_DocType_ID, Cur_Order.AD_Client_ID, 'Y',
v_DocumentNo) ;
@@ -890,6 +896,7 @@
RAISE_APPLICATION_ERROR(-20000, '@NoDefaultInvoice@') ;
END;
ELSE
+ BEGIN
SELECT od.C_DocTypeInvoice_ID
INTO v_DocType_ID
FROM C_DOCTYPE od,
@@ -897,7 +904,12 @@
C_ORDER o
WHERE od.C_DocType_ID=o.C_DocType_ID
AND od.C_DocTypeInvoice_ID=ID.C_DocType_ID
- AND o.C_Order_ID=Cur_InvoiceSchedule.C_Order_ID;
+ AND o.C_Order_ID=Cur_InvoiceSchedule.C_Order_ID
+ AND ID.IsActive='Y';
+ EXCEPTION
+ WHEN OTHERS THEN
+ RAISE_APPLICATION_ERROR(-20000, '@NoDocumentTypeFound@') ;
+ END;
END IF;
IF(NOT FINISH_PROCESS) THEN
-- Get other defaults
diff -r a14284c69f01 -r 8f769fcf0b0a
src-db/database/model/functions/C_ORDER_POST1.xml
--- a/src-db/database/model/functions/C_ORDER_POST1.xml Fri Apr 23 10:00:29
2010 +0200
+++ b/src-db/database/model/functions/C_ORDER_POST1.xml Fri Apr 23 12:51:39
2010 +0200
@@ -619,6 +619,7 @@
AND C_DISCOUNT.M_PRODUCT_ID=M_PRODUCT.M_PRODUCT_ID
AND C_ORDER_DISCOUNT.C_ORDER_ID=v_Record_ID
AND C_ORDER_DISCOUNT.ISACTIVE='Y'
+ AND C_DISCOUNT.ISACTIVE='Y'
ORDER BY C_ORDER_DISCOUNT.LINE
)
LOOP
diff -r a14284c69f01 -r 8f769fcf0b0a
src-db/database/model/tables/FIN_FINACC_TRANSACTION.xml
--- a/src-db/database/model/tables/FIN_FINACC_TRANSACTION.xml Fri Apr 23
10:00:29 2010 +0200
+++ b/src-db/database/model/tables/FIN_FINACC_TRANSACTION.xml Fri Apr 23
12:51:39 2010 +0200
@@ -70,11 +70,11 @@
<onCreateDefault/>
</column>
<column name="PROCESSED" primaryKey="false" required="false" type="CHAR"
size="1" autoIncrement="false">
- <default><![CDATA[Y]]></default>
+ <default><![CDATA[N]]></default>
<onCreateDefault/>
</column>
<column name="PROCESSING" primaryKey="false" required="false"
type="CHAR" size="1" autoIncrement="false">
- <default><![CDATA[Y]]></default>
+ <default><![CDATA[N]]></default>
<onCreateDefault/>
</column>
<column name="POSTED" primaryKey="false" required="false" type="VARCHAR"
size="60" autoIncrement="false">
diff -r a14284c69f01 -r 8f769fcf0b0a src-db/database/sourcedata/AD_MESSAGE.xml
--- a/src-db/database/sourcedata/AD_MESSAGE.xml Fri Apr 23 10:00:29 2010 +0200
+++ b/src-db/database/sourcedata/AD_MESSAGE.xml Fri Apr 23 12:51:39 2010 +0200
@@ -30783,6 +30783,17 @@
<!--51AF5F10036A4B14A54EC2DF10A94B7C-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--51AF5F10036A4B14A54EC2DF10A94B7C--></AD_MESSAGE>
+<!--5383FDEB68134637A9344226B026533A--><AD_MESSAGE>
+<!--5383FDEB68134637A9344226B026533A-->
<AD_MESSAGE_ID><![CDATA[5383FDEB68134637A9344226B026533A]]></AD_MESSAGE_ID>
+<!--5383FDEB68134637A9344226B026533A-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--5383FDEB68134637A9344226B026533A--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--5383FDEB68134637A9344226B026533A--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--5383FDEB68134637A9344226B026533A-->
<VALUE><![CDATA[NoDocumentTypeFound]]></VALUE>
+<!--5383FDEB68134637A9344226B026533A--> <MSGTEXT><![CDATA[No document type
found for invoice]]></MSGTEXT>
+<!--5383FDEB68134637A9344226B026533A--> <MSGTYPE><![CDATA[E]]></MSGTYPE>
+<!--5383FDEB68134637A9344226B026533A-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--5383FDEB68134637A9344226B026533A--></AD_MESSAGE>
+
<!--548069F5D9E04ECF80B3EA2EA7218036--><AD_MESSAGE>
<!--548069F5D9E04ECF80B3EA2EA7218036-->
<AD_MESSAGE_ID><![CDATA[548069F5D9E04ECF80B3EA2EA7218036]]></AD_MESSAGE_ID>
<!--548069F5D9E04ECF80B3EA2EA7218036-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r a14284c69f01 -r 8f769fcf0b0a src-db/database/sourcedata/AD_VAL_RULE.xml
--- a/src-db/database/sourcedata/AD_VAL_RULE.xml Fri Apr 23 10:00:29
2010 +0200
+++ b/src-db/database/sourcedata/AD_VAL_RULE.xml Fri Apr 23 12:51:39
2010 +0200
@@ -1202,7 +1202,7 @@
<!--1004400000--> <NAME><![CDATA[C_Currency of PriceList]]></NAME>
<!--1004400000--> <DESCRIPTION><![CDATA[Sets the currency of the
pricelist]]></DESCRIPTION>
<!--1004400000--> <TYPE><![CDATA[S]]></TYPE>
-<!--1004400000--> <CODE><![CDATA[C_Currency.C_Currency_ID IN (SELECT
C_Currency_ID FROM M_Pricelist WHERE M_Pricelist_ID =
@M_Pricelist_ID@)]]></CODE>
+<!--1004400000--> <CODE><![CDATA[C_Currency.C_Currency_ID IN (SELECT
C_Currency_ID FROM M_Pricelist WHERE ISACTIVE='Y')]]></CODE>
<!--1004400000--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--1004400000--></AD_VAL_RULE>
diff -r a14284c69f01 -r 8f769fcf0b0a
src/org/openbravo/erpCommon/ad_callouts/SL_Requisition_BPartner.java
--- a/src/org/openbravo/erpCommon/ad_callouts/SL_Requisition_BPartner.java
Fri Apr 23 10:00:29 2010 +0200
+++ b/src/org/openbravo/erpCommon/ad_callouts/SL_Requisition_BPartner.java
Fri Apr 23 12:51:39 2010 +0200
@@ -66,12 +66,13 @@
XmlDocument xmlDocument = xmlEngine.readXmlTemplate(
"org/openbravo/erpCommon/ad_callouts/CallOut").createXmlDocument();
- String strPriceList = SLRequisitionBPartnerData.select(this, strBPartner);
+ SLRequisitionBPartnerData[] data = SLRequisitionBPartnerData.select(this,
strBPartner);
StringBuffer resultado = new StringBuffer();
resultado.append("var calloutName='SL_Requisition_BPartner';\n\n");
resultado.append("var respuesta = new Array(");
- resultado.append("new Array(\"inpmPricelistId\", \"" + strPriceList +
"\")");
+ resultado.append("new Array(\"inpmPricelistId\", \"" +
data[0].poPricelistId + "\"),");
+ resultado.append("new Array(\"inpcCurrencyId\", \"" + data[0].cCurrencyId
+ "\")");
resultado.append(");");
xmlDocument.setParameter("array", resultado.toString());
xmlDocument.setParameter("frameName", "appFrame");
diff -r a14284c69f01 -r 8f769fcf0b0a
src/org/openbravo/erpCommon/ad_callouts/SL_Requisition_BPartner_data.xsql
--- a/src/org/openbravo/erpCommon/ad_callouts/SL_Requisition_BPartner_data.xsql
Fri Apr 23 10:00:29 2010 +0200
+++ b/src/org/openbravo/erpCommon/ad_callouts/SL_Requisition_BPartner_data.xsql
Fri Apr 23 12:51:39 2010 +0200
@@ -18,13 +18,14 @@
************************************************************************
-->
<SqlClass name="SLRequisitionBPartnerData"
package="org.openbravo.erpCommon.ad_callouts">
- <SqlMethod name="select" type="preparedStatement" return="string" default="">
+ <SqlMethod name="select" type="preparedStatement" return="multiple"
default="">
<SqlMethodComment></SqlMethodComment>
<Sql>
<![CDATA[
- SELECT p.PO_PriceList_ID
- FROM C_BPartner p
+ SELECT p.PO_PriceList_ID, m.c_currency_id
+ FROM C_BPartner p,M_Pricelist m
WHERE p.C_BPartner_ID = ?
+ AND m.M_Pricelist_ID = p.PO_PriceList_ID
]]>
</Sql>
<Parameter name="cBpartnerId"/>
diff -r a14284c69f01 -r 8f769fcf0b0a
src/org/openbravo/erpCommon/ad_forms/GenerateInvoicesmanual.java
--- a/src/org/openbravo/erpCommon/ad_forms/GenerateInvoicesmanual.java Fri Apr
23 10:00:29 2010 +0200
+++ b/src/org/openbravo/erpCommon/ad_forms/GenerateInvoicesmanual.java Fri Apr
23 12:51:39 2010 +0200
@@ -92,35 +92,7 @@
OBError myMessage = new OBError();
String message = "";
myMessage.setTitle("");
- if (pinstanceData != null && pinstanceData.length > 0) {
- if (!pinstanceData[0].errormsg.equals("")) {
- message = pinstanceData[0].errormsg;
- myMessage.setType("Success");
- myMessage.setTitle(Utility.messageBD(this, "Success",
vars.getLanguage()));
- if (message.startsWith("@") && message.endsWith("@")) {
- myMessage.setMessage(message.substring(1, message.length() - 1));
- if (message.indexOf("@") == -1)
- myMessage.setMessage(Utility.messageBD(this, message,
vars.getLanguage()));
- else
- myMessage.setMessage(Utility.parseTranslation(this, vars,
vars.getLanguage(), "@"
- + message + "@"));
- } else
- myMessage.setMessage(Utility.parseTranslation(this, vars,
vars.getLanguage(), message));
- } else if (!pinstanceData[0].pMsg.equals("")) {
- myMessage.setType("Success");
- myMessage.setTitle(Utility.messageBD(this, "Success",
vars.getLanguage()));
- message = pinstanceData[0].pMsg;
- myMessage.setMessage(Utility.parseTranslation(this, vars,
vars.getLanguage(), message));
- } else if (pinstanceData[0].result.equals("1")) {
- myMessage.setType("Success");
- myMessage.setTitle(Utility.messageBD(this, "Success",
vars.getLanguage()));
- myMessage.setMessage(Utility.messageBD(this, "Success",
vars.getLanguage()));
- } else {
- myMessage.setType("Error");
- myMessage.setTitle(Utility.messageBD(this, "Error",
vars.getLanguage()));
- myMessage.setMessage(Utility.messageBD(this, "Error",
vars.getLanguage()));
- }
- }
+ myMessage = Utility.getProcessInstanceMessage(this, vars, pinstanceData);
vars.setMessage("GenerateInvoicesmanual", myMessage);
GenerateInvoicesmanualData.resetSelection(this, strCOrderId);
if (log4j.isDebugEnabled())
diff -r a14284c69f01 -r 8f769fcf0b0a
src/org/openbravo/reference/ui/UIReference.java
--- a/src/org/openbravo/reference/ui/UIReference.java Fri Apr 23 10:00:29
2010 +0200
+++ b/src/org/openbravo/reference/ui/UIReference.java Fri Apr 23 12:51:39
2010 +0200
@@ -109,8 +109,13 @@
.getProperty("ColumnName"), prop.getProperty("ColumnName"),
reference, true, aux);
}
if (addSecondaryFilter) {
- aux = vars.getRequestGlobalVariable("inpParam" +
prop.getProperty("ColumnName") + "_f",
- tableSQL.getTabID() + "|param" + prop.getProperty("ColumnName") +
"_f");
+ if (isNewFilter) {
+ aux = vars.getRequestGlobalVariable("inpParam" +
prop.getProperty("ColumnName") + "_f",
+ tableSQL.getTabID() + "|param" + prop.getProperty("ColumnName") +
"_f");
+ } else {
+ aux = vars.getSessionValue(tableSQL.getTabID() + "|param" +
prop.getProperty("ColumnName")
+ + "_f");
+ }
if (!aux.equals("")) {
UIReferenceUtility.addFilter(filter, filterParams, result, tableSQL,
prop
.getProperty("ColumnName"), prop.getProperty("ColumnName") + "_f",
reference, false,
------------------------------------------------------------------------------
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
