details: /erp/devel/int/rev/032a222bb905
changeset: 6481:032a222bb905
user: David Alsasua <david.alsasua <at> openbravo.com>
date: Wed Feb 24 12:08:38 2010 +0100
summary: fixes issue 12366
trigger was affecting the Create Sales Orders from Expenses window
details: /erp/devel/int/rev/b7f2cd7f9e22
changeset: 6482:b7f2cd7f9e22
user: Rajagopal Baskaran <rajagopal.baskaran <at> openbravo.com>
date: Wed Feb 24 17:44:22 2010 +0530
summary: Fixes issue 12304 - C_incoterms table is not properly defined
details: /erp/devel/int/rev/ef1675b0d23c
changeset: 6483:ef1675b0d23c
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Wed Feb 24 16:35:56 2010 +0100
summary: fixed bug 12432
Now it works if the Tomcat manager is not in the /manager context
details: /erp/devel/int/rev/44c644a0fb7c
changeset: 6484:44c644a0fb7c
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Wed Feb 24 16:42:12 2010 +0100
summary: fixed bug 12432
Now it works if the Tomcat manager is not in the /manager context
details: /erp/devel/int/rev/8925b5958741
changeset: 6485:8925b5958741
user: David Alsasua <david.alsasua <at> openbravo.com>
date: Wed Feb 24 19:00:37 2010 +0100
summary: fixes issue 12367: Matched puchase invoice not balanced
Now the cost of the product is calculated using
the accounting date of the order
diffstat:
src-db/database/sourcedata/AD_TABLE.xml | 3 ++-
src-diagnostics/src/org/openbravo/utils/ServerConnection.java | 7
++++---
src/org/openbravo/erpCommon/ad_actionButton/ExpenseSOrder_data.xsql | 6 ++++--
src/org/openbravo/erpCommon/ad_forms/DocMatchInv.java | 2 +-
src/org/openbravo/erpCommon/ad_forms/DocMatchInv_data.xsql | 4 ++--
5 files changed, 13 insertions(+), 9 deletions(-)
diffs (100 lines):
diff -r f1b39044e9e9 -r 8925b5958741 src-db/database/sourcedata/AD_TABLE.xml
--- a/src-db/database/sourcedata/AD_TABLE.xml Wed Feb 24 10:52:44 2010 +0100
+++ b/src-db/database/sourcedata/AD_TABLE.xml Wed Feb 24 19:00:37 2010 +0100
@@ -5868,7 +5868,7 @@
<!--800006--> <DESCRIPTION><![CDATA[Incoterms definition]]></DESCRIPTION>
<!--800006--> <HELP><![CDATA[EXW Ex-works, ex-factory, ex-warehouse, ex-mill.
FCA Free carrier (Franco Transportista)
-FAS (Free alongside ship)
+FAS (Free alongside ship)
FOB (Free on Board)
CFR (Cost & Freight)
CIF (Cost, Insurance & Freight)
@@ -5878,6 +5878,7 @@
<!--800006--> <CLASSNAME><![CDATA[Incoterms]]></CLASSNAME>
<!--800006--> <ISVIEW><![CDATA[N]]></ISVIEW>
<!--800006--> <ACCESSLEVEL><![CDATA[3]]></ACCESSLEVEL>
+<!--800006--> <AD_WINDOW_ID><![CDATA[800002]]></AD_WINDOW_ID>
<!--800006--> <ISSECURITYENABLED><![CDATA[N]]></ISSECURITYENABLED>
<!--800006--> <ISDELETEABLE><![CDATA[Y]]></ISDELETEABLE>
<!--800006--> <ISHIGHVOLUME><![CDATA[N]]></ISHIGHVOLUME>
diff -r f1b39044e9e9 -r 8925b5958741
src-diagnostics/src/org/openbravo/utils/ServerConnection.java
--- a/src-diagnostics/src/org/openbravo/utils/ServerConnection.java Wed Feb
24 10:52:44 2010 +0100
+++ b/src-diagnostics/src/org/openbravo/utils/ServerConnection.java Wed Feb
24 19:00:37 2010 +0100
@@ -31,9 +31,10 @@
public class ServerConnection {
private URL getUrl(String action, String additionalParameters) throws
MalformedURLException {
- return new URL(new
PropertiesManager("config/Openbravo.properties").getProperty(
- "tomcat.manager.url").replace("/manager", "")
- + "/OpenbravoDiagnostics/Check.html?Command=" + action +
additionalParameters);
+ String serverUrl=new
PropertiesManager("config/Openbravo.properties").getProperty(
+ "tomcat.manager.url");
+ serverUrl = serverUrl.substring(0,serverUrl.lastIndexOf('/'));
+ return new URL(serverUrl+ "/OpenbravoDiagnostics/Check.html?Command=" +
action + additionalParameters);
}
public String getCheck(String action, String additionalParameters) {
diff -r f1b39044e9e9 -r 8925b5958741
src/org/openbravo/erpCommon/ad_actionButton/ExpenseSOrder_data.xsql
--- a/src/org/openbravo/erpCommon/ad_actionButton/ExpenseSOrder_data.xsql
Wed Feb 24 10:52:44 2010 +0100
+++ b/src/org/openbravo/erpCommon/ad_actionButton/ExpenseSOrder_data.xsql
Wed Feb 24 19:00:37 2010 +0100
@@ -157,7 +157,7 @@
C_UOM_ID, QTYORDERED, C_CURRENCY_ID,
PRICELIST, PRICEACTUAL, PRICELIMIT,
C_TAX_ID, S_RESOURCEASSIGNMENT_ID, DISCOUNT,
- PRICESTD)
+ PRICESTD, LINENETAMT)
VALUES
(?,?,?,
now(),?,now(),?,
@@ -167,7 +167,7 @@
?,TO_NUMBER(?),?,
TO_NUMBER(?),
M_GET_OFFERS_PRICE(to_date(?),?,?,TO_NUMBER(?),TO_NUMBER(?),?),TO_NUMBER(?),
?, ?,TO_NUMBER(?),
- TO_NUMBER(?))
+ TO_NUMBER(?), (to_number(?) * to_number(?)))
]]>
</Sql>
<Parameter name="cOrderlineId"/>
@@ -199,6 +199,8 @@
<Parameter name="sResourceassignmentId"/>
<Parameter name="discount"/>
<Parameter name="priceactual"/>
+ <Parameter name="qtyordered"/>
+ <Parameter name="priceactual"/>
</SqlMethod>
<SqlMethod name="cDoctypeTarget" type="preparedStatement" connection="true"
return="string" default="">
<SqlMethodComment></SqlMethodComment>
diff -r f1b39044e9e9 -r 8925b5958741
src/org/openbravo/erpCommon/ad_forms/DocMatchInv.java
--- a/src/org/openbravo/erpCommon/ad_forms/DocMatchInv.java Wed Feb 24
10:52:44 2010 +0100
+++ b/src/org/openbravo/erpCommon/ad_forms/DocMatchInv.java Wed Feb 24
19:00:37 2010 +0100
@@ -138,7 +138,7 @@
FieldProvider[] data = getObjectFieldProvider();
BigDecimal bdCost = new
BigDecimal(DocMatchInvData.selectProductAverageCost(conn, data[0]
- .getField("M_Product_Id"), data[0].getField("DateAcct")));
+ .getField("M_Product_Id"), data[0].getField("orderAcctDate")));
String strScale = DocMatchInvData.selectClientCurrencyPrecission(conn,
vars.getClient());
bdCost = bdCost.multiply(new BigDecimal(data[0].getField("Qty"))).setScale(
new Integer(strScale), RoundingMode.HALF_UP);
diff -r f1b39044e9e9 -r 8925b5958741
src/org/openbravo/erpCommon/ad_forms/DocMatchInv_data.xsql
--- a/src/org/openbravo/erpCommon/ad_forms/DocMatchInv_data.xsql Wed Feb
24 10:52:44 2010 +0100
+++ b/src/org/openbravo/erpCommon/ad_forms/DocMatchInv_data.xsql Wed Feb
24 19:00:37 2010 +0100
@@ -26,7 +26,7 @@
'' AS CREATED, '' AS CREATEDBY, '' AS UPDATED, '' AS UPDATEDBY, ''
AS M_INOUTLINE_ID,
'' AS C_INVOICELINE_ID, '' AS M_PRODUCT_ID, '' AS DATETRX, '' AS
QTY, '' AS PROCESSING,
'' AS PROCESSED, '' AS POSTED, '' AS DATEACCT, '' AS DATEDOC, '' AS
C_BPARTNER_ID,
- '' AS LINENETAMT, '' AS C_CURRENCY_ID, '' AS stdprecision
+ '' AS LINENETAMT, '' AS C_CURRENCY_ID, '' AS stdprecision, '' as
orderAcctDate
FROM DUAL
]]>
</Sql>
@@ -37,7 +37,7 @@
<![CDATA[
SELECT M.M_MATCHINV_ID, M.AD_CLIENT_ID, M.AD_ORG_ID, M.ISACTIVE,
M.CREATED, M.CREATEDBY, M.UPDATED,
M.UPDATEDBY, M.M_INOUTLINE_ID, M.C_INVOICELINE_ID, M.M_PRODUCT_ID,
M.DATETRX, M.QTY, M.PROCESSING,
- M.PROCESSED, M.POSTED, M.DATETRX AS DATEACCT, M.DATETRX AS DATEDOC,
I.C_BPARTNER_ID, IO.DATEACCT
+ M.PROCESSED, M.POSTED, M.DATETRX AS DATEACCT, M.DATETRX AS DATEDOC,
I.C_BPARTNER_ID, IO.DATEACCT as orderAcctDate
FROM M_MATCHINV M, C_INVOICELINE IL, C_INVOICE I, M_INOUTLINE IOL,
M_INOUT IO
WHERE IL.C_INVOICELINE_ID = M.C_INVOICELINE_ID
AND IL.C_INVOICE_ID = I.C_INVOICE_ID
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
