details: /erp/devel/int/rev/b0e4fd2f413b
changeset: 6507:b0e4fd2f413b
user: David Baz Fayos <david.baz <at> openbravo.com>
date: Fri Feb 26 12:04:22 2010 +0100
summary: Related to issue 12479: Now utils.js has relative references -part2
details: /erp/devel/int/rev/0a8a5d995740
changeset: 6508:0a8a5d995740
user: David Baz Fayos <david.baz <at> openbravo.com>
date: Fri Feb 26 12:14:14 2010 +0100
summary: Related to issue 12479: Now utils.js has relative references -part3
details: /erp/devel/int/rev/751e62388ba5
changeset: 6509:751e62388ba5
user: Antonio Moreno <antonio.moreno <at> openbravo.com>
date: Fri Feb 26 12:14:54 2010 +0100
summary: Fixed issue 12483. update.database.script will now work again.
details: /erp/devel/int/rev/2a1430719d76
changeset: 6510:2a1430719d76
user: Antonio Moreno <antonio.moreno <at> openbravo.com>
date: Fri Feb 26 12:21:59 2010 +0100
summary: Fixed issue 12484. .svn folders will be filtered and not read when
loading the model.
details: /erp/devel/int/rev/4cc57d7e23c7
changeset: 6511:4cc57d7e23c7
user: David Baz Fayos <david.baz <at> openbravo.com>
date: Fri Feb 26 12:19:04 2010 +0100
summary: Related to issue 12479: Improved operation of getFrame('main')
details: /erp/devel/int/rev/7e4fbf963810
changeset: 6512:7e4fbf963810
user: David Baz Fayos <david.baz <at> openbravo.com>
date: Fri Feb 26 12:41:50 2010 +0100
summary: Related to issue 12479: Now utils.js has relative references -part4
details: /erp/devel/int/rev/dbfebf69b437
changeset: 6513:dbfebf69b437
user: David Baz Fayos <david.baz <at> openbravo.com>
date: Fri Feb 26 12:55:55 2010 +0100
summary: Related to issue 12479: Now Login_*.html has relative references
details: /erp/devel/int/rev/7e0bfcb1ddd5
changeset: 6514:7e0bfcb1ddd5
user: David Baz Fayos <david.baz <at> openbravo.com>
date: Fri Feb 26 13:03:33 2010 +0100
summary: Related to issue 12479: Now FileImport.java has relative references
details: /erp/devel/int/rev/8ee96fa90576
changeset: 6515:8ee96fa90576
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Fri Feb 26 13:04:35 2010 +0100
summary: Added some comments about session ping
details: /erp/devel/int/rev/825d188f527d
changeset: 6516:825d188f527d
user: Harikrishnan Raja <harikrishnan.raja <at> openbravo.com>
date: Fri Feb 26 18:03:54 2010 +0530
summary: Fixes Issue 12386: Price Precision error.
details: /erp/devel/int/rev/50061f759f44
changeset: 6517:50061f759f44
user: David Baz Fayos <david.baz <at> openbravo.com>
date: Fri Feb 26 13:52:52 2010 +0100
summary: Related to issue 12479: Now PopUp_*.html has relative references
details: /erp/devel/int/rev/4b33212d14a2
changeset: 6518:4b33212d14a2
user: Sathiyan Sivaprakasam <sathiyan.sivaprakasam <at> openbravo.com>
date: Fri Feb 26 20:33:46 2010 +0530
summary: Fixes Issue 12216: Some tables do not contain USER1_ID, USER2_ID,
C_PROJECT_ID and C_CAMPAIGN_ID
details: /erp/devel/int/rev/fd7dd0f300b7
changeset: 6519:fd7dd0f300b7
user: David Baz Fayos <david.baz <at> openbravo.com>
date: Fri Feb 26 16:44:28 2010 +0100
summary: Related to issue 12479: Now dojo.js has relative references
details: /erp/devel/int/rev/fbfa17b30b68
changeset: 6520:fbfa17b30b68
user: Antonio Moreno <antonio.moreno <at> openbravo.com>
date: Fri Feb 26 17:26:47 2010 +0100
summary: Fixed issue 12489. Modules will no longer be set as 'in development'
when they are being installed.
details: /erp/devel/int/rev/390168483611
changeset: 6521:390168483611
user: David Baz Fayos <david.baz <at> openbravo.com>
date: Fri Feb 26 17:40:06 2010 +0100
summary: Related to issue 12479: Now Log.html has relative references
details: /erp/devel/int/rev/7033c27bce27
changeset: 6522:7033c27bce27
user: David Baz Fayos <david.baz <at> openbravo.com>
date: Fri Feb 26 18:08:12 2010 +0100
summary: Related to issue 12479: Now VerticalMenu*.html has relative
references
details: /erp/devel/int/rev/b3e9df729fb8
changeset: 6523:b3e9df729fb8
user: Iván Perdomo <ivan.perdomo <at> openbravo.com>
date: Fri Feb 26 18:28:52 2010 +0100
summary: Fixes issue 12493: Changed copyright header template
details: /erp/devel/int/rev/8dd14059ac22
changeset: 6524:8dd14059ac22
user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com>
date: Fri Feb 26 18:46:56 2010 +0100
summary: Fixes changeset 825d188f527d
details: /erp/devel/int/rev/f718ec3e327c
changeset: 6525:f718ec3e327c
user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com>
date: Fri Feb 26 18:58:16 2010 +0100
summary: Fixes issue 12487. m_generate_average_costs doesn't round to Cost
Precision
diffstat:
src-db/database/build.xml | 2 +-
src-db/database/lib/dbsourcemanager.jar | 0
src-db/database/model/functions/C_CURRENCY_CONVERT.xml | 18 +-
src-db/database/model/functions/C_CURRENCY_CONVERT_PRECISION.xml | 67 +++
src-db/database/model/functions/C_GET_CURRENCY_PRECISION.xml | 52 +++
src-db/database/model/functions/M_BOM_PRICELIMIT.xml | 2 +-
src-db/database/model/functions/M_BOM_PRICELIST.xml | 2 +-
src-db/database/model/functions/M_BOM_PRICESTD.xml | 2 +-
src-db/database/model/functions/M_GENERATE_AVERAGE_COSTS.xml | 12 +-
src-db/database/model/tables/GL_JOURNAL.xml | 22 +
src-db/database/sourcedata/AD_COLUMN.xml | 172
++++++++-
src-db/database/sourcedata/AD_FIELD.xml | 111 ++++++-
src/org/openbravo/base/gen/entity.xpt | 10 +-
src/org/openbravo/base/secureApp/PopUp_Close_And_Refresh.html | 2 +-
src/org/openbravo/base/secureApp/PopUp_Download.html | 6 +-
src/org/openbravo/erpCommon/ad_forms/DocGLJournal_data.xsql | 3 +-
src/org/openbravo/erpCommon/ad_forms/FileImport.java | 8 +-
src/org/openbravo/erpCommon/modules/ImportModule.java | 1 -
src/org/openbravo/erpCommon/obps/ActivationKey.java | 2 +
src/org/openbravo/erpCommon/security/Login_F1.html | 4 +-
src/org/openbravo/erpCommon/security/Login_FS.html | 4 +-
src/org/openbravo/erpCommon/security/Login_FS_RTL.html | 4 +-
src/org/openbravo/erpCommon/utility/Log.html | 21 +-
src/org/openbravo/erpCommon/utility/VerticalMenu.html | 15 +-
src/org/openbravo/erpCommon/utility/VerticalMenuLoading.html | 11 +-
web/js/dojo/dojo.js | 2 +-
web/js/utils.js | 92 ++--
27 files changed, 519 insertions(+), 128 deletions(-)
diffs (truncated from 1360 to 300 lines):
diff -r fa2d62c2d918 -r f718ec3e327c src-db/database/build.xml
--- a/src-db/database/build.xml Fri Feb 26 10:00:14 2010 +0100
+++ b/src-db/database/build.xml Fri Feb 26 18:58:16 2010 +0100
@@ -136,7 +136,7 @@
</target>
<target name="update.database.script">
- <alterscript driver="${bbdd.driver}" url="${bbdd.owner.url}"
user="${bbdd.user}" password="${bbdd.password}"
excludeobjects="com.openbravo.db.OpenbravoExcludeFilter" model="model/"
filter="com.openbravo.db.OpenbravoMetadataFilter" input="sourcedata"
object="${bbdd.object}" failonerror="false" verbosity="${bbdd.verbosity}"
basedir="${base.modules}/" dirFilter="*/src-db/database/model/"
datadir="${base.modules}/" dataFilter="*/src-db/database/sourcedata" userId="0"
adminMode="true" propertiesFile="${base.config}/Openbravo.properties"
force="${force}" onlyIfModified="${onlyIfModified}"
output="${bbdd.outputscript}" />
+ <alterscript driver="${bbdd.driver}" url="${bbdd.owner.url}"
user="${bbdd.user}" password="${bbdd.password}"
excludeobjects="com.openbravo.db.OpenbravoExcludeFilter" model="model/"
filter="com.openbravo.db.OpenbravoMetadataFilter" input="sourcedata"
object="${bbdd.object}" failonerror="false" verbosity="${bbdd.verbosity}"
basedir="${base.modules}/" dirFilter="*/src-db/database/model"
datadir="${base.modules}/" dataFilter="*/src-db/database/sourcedata" userId="0"
adminMode="true" propertiesFile="${base.config}/Openbravo.properties"
force="${force}" onlyIfModified="${onlyIfModified}"
output="${bbdd.outputscript}" />
</target>
<target name="export.database.structure">
diff -r fa2d62c2d918 -r f718ec3e327c src-db/database/lib/dbsourcemanager.jar
Binary file src-db/database/lib/dbsourcemanager.jar has changed
diff -r fa2d62c2d918 -r f718ec3e327c
src-db/database/model/functions/C_CURRENCY_CONVERT.xml
--- a/src-db/database/model/functions/C_CURRENCY_CONVERT.xml Fri Feb 26
10:00:14 2010 +0100
+++ b/src-db/database/model/functions/C_CURRENCY_CONVERT.xml Fri Feb 26
18:58:16 2010 +0100
@@ -37,7 +37,7 @@
* parts created by ComPiere are Copyright (C) ComPiere, Inc.;
* All Rights Reserved.
* Contributor(s): Openbravo SL
-* Contributions are Copyright (C) 2001-2009 Openbravo, S.L.
+* Contributions are Copyright (C) 2001-2010 Openbravo, S.L.
*
* Specifically, this derivative work is based upon the following Compiere
* file and version.
@@ -54,21 +54,7 @@
************************************************************************/
v_Rate NUMBER;
BEGIN
- -- Return Amount
- IF(p_Amount=0 OR p_CurFrom_ID=p_CurTo_ID) THEN
- RETURN p_Amount;
- END IF;
- -- Return NULL
- IF(p_Amount IS NULL OR p_CurFrom_ID IS NULL OR p_CurTo_ID IS NULL) THEN
- RETURN NULL;
- END IF;
- -- Get Rate
- v_Rate:=C_Currency_Rate(p_CurFrom_ID, p_CurTo_ID, p_ConvDate, p_RateType,
p_Client_ID, p_Org_ID) ;
- IF(v_Rate IS NULL) THEN
- RETURN NULL;
- END IF;
- -- Standard Precision
- RETURN C_Currency_Round(p_Amount * v_Rate, p_CurTo_ID, null) ;
+ RETURN C_CURRENCY_CONVERT_PRECISION(p_amount, p_curfrom_id, p_curto_id,
p_convdate, p_ratetype, p_client_id, p_org_id, 'A');
EXCEPTION
WHEN OTHERS THEN
DBMS_OUTPUT.PUT_LINE(SQLERRM) ;
diff -r fa2d62c2d918 -r f718ec3e327c
src-db/database/model/functions/C_CURRENCY_CONVERT_PRECISION.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src-db/database/model/functions/C_CURRENCY_CONVERT_PRECISION.xml Fri Feb
26 18:58:16 2010 +0100
@@ -0,0 +1,67 @@
+<?xml version="1.0"?>
+ <database name="FUNCTION C_CURRENCY_CONVERT_PRECISION">
+ <function name="C_CURRENCY_CONVERT_PRECISION" type="NUMERIC">
+ <parameter name="p_amount" type="NUMERIC" mode="in">
+ <default/>
+ </parameter>
+ <parameter name="p_curfrom_id" type="VARCHAR" mode="in">
+ <default/>
+ </parameter>
+ <parameter name="p_curto_id" type="VARCHAR" mode="in">
+ <default/>
+ </parameter>
+ <parameter name="p_convdate" type="TIMESTAMP" mode="in">
+ <default/>
+ </parameter>
+ <parameter name="p_ratetype" type="VARCHAR" mode="in">
+ <default/>
+ </parameter>
+ <parameter name="p_client_id" type="VARCHAR" mode="in">
+ <default><![CDATA[0]]></default>
+ </parameter>
+ <parameter name="p_org_id" type="VARCHAR" mode="in">
+ <default><![CDATA[0]]></default>
+ </parameter>
+ <parameter name="p_precisiontype" type="CHAR" mode="in">
+ <default><![CDATA[A]]></default>
+ </parameter>
+
<body><![CDATA[/*************************************************************************
+ * The contents of this file are subject to the Openbravo Public License
+ * Version 1.0 (the "License"), being the Mozilla Public License
+ * Version 1.1 with a permitted attribution clause; you may not use this
+ * file except in compliance with the License. You may obtain a copy of
+ * the License at http://www.openbravo.com/legal/license.html
+ * Software distributed under the License is distributed on an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * The Original Code is Openbravo ERP.
+ * The Initial Developer of the Original Code is Openbravo SL
+ * All portions are Copyright (C) 2010 Openbravo SL
+ * All Rights Reserved.
+************************************************************************/
+ v_Rate NUMBER;
+BEGIN
+ -- Return Amount
+ IF(p_Amount=0 OR p_CurFrom_ID=p_CurTo_ID) THEN
+ RETURN p_Amount;
+ END IF;
+ -- Return NULL
+ IF(p_Amount IS NULL OR p_CurFrom_ID IS NULL OR p_CurTo_ID IS NULL) THEN
+ RETURN NULL;
+ END IF;
+ -- Get Rate
+ v_Rate:=C_Currency_Rate(p_CurFrom_ID, p_CurTo_ID, p_ConvDate, p_RateType,
p_Client_ID, p_Org_ID) ;
+ IF(v_Rate IS NULL) THEN
+ RETURN NULL;
+ END IF;
+ -- Standard Precision
+ RETURN ROUND(p_Amount * v_Rate, C_GET_CURRENCY_PRECISION(p_CurTo_ID,
p_precisiontype)) ;
+EXCEPTION
+WHEN OTHERS THEN
+ DBMS_OUTPUT.PUT_LINE(SQLERRM) ;
+ RAISE;
+END C_CURRENCY_CONVERT_PRECISION
+]]></body>
+ </function>
+ </database>
diff -r fa2d62c2d918 -r f718ec3e327c
src-db/database/model/functions/C_GET_CURRENCY_PRECISION.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src-db/database/model/functions/C_GET_CURRENCY_PRECISION.xml Fri Feb
26 18:58:16 2010 +0100
@@ -0,0 +1,52 @@
+<?xml version="1.0"?>
+ <database name="FUNCTION C_GET_CURRENCY_PRECISION">
+ <function name="C_GET_CURRENCY_PRECISION" type="NUMERIC">
+ <parameter name="p_curto_id" type="VARCHAR" mode="in">
+ <default/>
+ </parameter>
+ <parameter name="p_prec_type" type="VARCHAR" mode="in">
+ <default/>
+ </parameter>
+
<body><![CDATA[/*************************************************************************
+ * The contents of this file are subject to the Openbravo Public License
+ * Version 1.0 (the "License"), being the Mozilla Public License
+ * Version 1.1 with a permitted attribution clause; you may not use this
+ * file except in compliance with the License. You may obtain a copy of
+ * the License at http://www.openbravo.com/legal/license.html
+ * Software distributed under the License is distributed on an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * The Original Code is Openbravo ERP.
+ * The Initial Developer of the Original Code is Openbravo SL
+ * All portions are Copyright (C) 2010 Openbravo SL
+ * All Rights Reserved.
+*************************************************************************
+****
+* Title: Returns the currency Precision values
+* Description:
+* "A" for Amount(StdPrecision),"P" for PricePrecision and "C" for
CostingPrecision
+* Returns precision values.
+************************************************************************/
+ v_StdPrecision NUMBER;
+ v_PricePrecision NUMBER;
+ v_CostPrecision NUMBER;
+BEGIN
+ SELECT MAX(StdPrecision),
+ MAX(CostingPrecision),
+ MAX(PricePrecision)
+ INTO v_StdPrecision,
+ v_CostPrecision,v_PricePrecision
+ FROM C_Currency
+ WHERE C_Currency_ID = p_CurTo_ID;
+ IF(p_prec_type = 'P') THEN
+ RETURN v_PricePrecision;
+ ELSIF(p_prec_type = 'C') THEN
+ RETURN v_CostPrecision;
+ ELSIF(p_prec_type = 'A') THEN
+ RETURN v_StdPrecision;
+ END IF;
+END C_GET_CURRENCY_PRECISION
+]]></body>
+ </function>
+ </database>
diff -r fa2d62c2d918 -r f718ec3e327c
src-db/database/model/functions/M_BOM_PRICELIMIT.xml
--- a/src-db/database/model/functions/M_BOM_PRICELIMIT.xml Fri Feb 26
10:00:14 2010 +0100
+++ b/src-db/database/model/functions/M_BOM_PRICELIMIT.xml Fri Feb 26
18:58:16 2010 +0100
@@ -59,7 +59,7 @@
END LOOP;
END IF;
--
- RETURN c_currency_round(v_price, v_currency,null);
+ RETURN ROUND(v_price,C_GET_CURRENCY_PRECISION(v_currency,'P'));
END M_BOM_PRICELIMIT
]]></body>
</function>
diff -r fa2d62c2d918 -r f718ec3e327c
src-db/database/model/functions/M_BOM_PRICELIST.xml
--- a/src-db/database/model/functions/M_BOM_PRICELIST.xml Fri Feb 26
10:00:14 2010 +0100
+++ b/src-db/database/model/functions/M_BOM_PRICELIST.xml Fri Feb 26
18:58:16 2010 +0100
@@ -60,7 +60,7 @@
END LOOP; -- BOM
END IF;
--
- RETURN c_currency_round(v_price, v_currency,null);
+ RETURN ROUND(v_price,C_GET_CURRENCY_PRECISION(v_currency,'P'));
END M_BOM_PRICELIST
]]></body>
</function>
diff -r fa2d62c2d918 -r f718ec3e327c
src-db/database/model/functions/M_BOM_PRICESTD.xml
--- a/src-db/database/model/functions/M_BOM_PRICESTD.xml Fri Feb 26
10:00:14 2010 +0100
+++ b/src-db/database/model/functions/M_BOM_PRICESTD.xml Fri Feb 26
18:58:16 2010 +0100
@@ -60,7 +60,7 @@
END LOOP; -- BOM
END IF;
--
- RETURN c_currency_round(v_price, v_currency,null);
+ RETURN ROUND(v_price,C_GET_CURRENCY_PRECISION(v_currency,'P'));
END M_BOM_PRICESTD
]]></body>
</function>
diff -r fa2d62c2d918 -r f718ec3e327c
src-db/database/model/functions/M_GENERATE_AVERAGE_COSTS.xml
--- a/src-db/database/model/functions/M_GENERATE_AVERAGE_COSTS.xml Fri Feb
26 10:00:14 2010 +0100
+++ b/src-db/database/model/functions/M_GENERATE_AVERAGE_COSTS.xml Fri Feb
26 18:58:16 2010 +0100
@@ -177,7 +177,7 @@
v_Qty:=0;
END IF;
v_ResultStr:='invoice albaran: '||Cur_InOutLine.M_INOUTLINE_ID;
- SELECT CASE WHEN SUM(QTYINVOICED) <=0 THEN 0 ELSE
SUM(C_INVOICELINE.QTYINVOICED*C_CURRENCY_CONVERT(C_INVOICELINE.PRICEACTUAL,
C_INVOICE.C_CURRENCY_ID, v_BaseCurrency,
TO_DATE(COALESCE(C_INVOICE.DATEINVOICED, Cur_InOutLine.MOVEMENTDATE)), NULL,
C_INVOICELINE.AD_CLIENT_ID, C_INVOICELINE.AD_ORG_ID)) /SUM(QTYINVOICED) END,
+ SELECT CASE WHEN SUM(QTYINVOICED) <=0 THEN 0 ELSE
SUM(C_INVOICELINE.QTYINVOICED*C_CURRENCY_CONVERT_PRECISION(C_INVOICELINE.PRICEACTUAL,
C_INVOICE.C_CURRENCY_ID, v_BaseCurrency,
TO_DATE(COALESCE(C_INVOICE.DATEINVOICED, Cur_InOutLine.MOVEMENTDATE)), NULL,
C_INVOICELINE.AD_CLIENT_ID, C_INVOICELINE.AD_ORG_ID, 'C')) /SUM(QTYINVOICED)
END,
CASE WHEN SUM(QTYINVOICED) <=0 THEN 0 ELSE
COUNT(C_INVOICELINE.C_INVOICELINE_ID) END
INTO v_Price, v_Count
FROM M_MATCHINV, C_INVOICELINE, C_INVOICE
@@ -187,7 +187,7 @@
AND QTYINVOICED<>0;
IF(v_Count=0) THEN
v_ResultStr:='order albaran: '||Cur_InOutLine.M_INOUTLINE_ID;
- SELECT CASE WHEN SUM(C_ORDERLINE.QTYORDERED) <=0 THEN 0 ELSE
SUM(C_ORDERLINE.QTYORDERED*C_CURRENCY_CONVERT(C_ORDERLINE.PRICEACTUAL,
COALESCE(C_ORDERLINE.C_CURRENCY_ID, C_ORDER.C_CURRENCY_ID), v_BaseCurrency,
TO_DATE(COALESCE(C_ORDERLINE.DATEORDERED, C_ORDER.DATEORDERED,
Cur_InOutLine.MOVEMENTDATE)), NULL, C_ORDERLINE.AD_CLIENT_ID,
C_ORDERLINE.AD_ORG_ID)) /SUM(C_ORDERLINE.QTYORDERED) END,
+ SELECT CASE WHEN SUM(C_ORDERLINE.QTYORDERED) <=0 THEN 0 ELSE
SUM(C_ORDERLINE.QTYORDERED*C_CURRENCY_CONVERT_PRECISION(C_ORDERLINE.PRICEACTUAL,
COALESCE(C_ORDERLINE.C_CURRENCY_ID, C_ORDER.C_CURRENCY_ID), v_BaseCurrency,
TO_DATE(COALESCE(C_ORDERLINE.DATEORDERED, C_ORDER.DATEORDERED,
Cur_InOutLine.MOVEMENTDATE)), NULL, C_ORDERLINE.AD_CLIENT_ID,
C_ORDERLINE.AD_ORG_ID, 'C')) /SUM(C_ORDERLINE.QTYORDERED) END,
CASE WHEN SUM(C_ORDERLINE.QTYORDERED) <=0 THEN 0 ELSE
COUNT(C_ORDERLINE.C_ORDERLINE_ID) END
INTO v_Price, v_Count
FROM M_MATCHPO, C_ORDERLINE, C_ORDER
@@ -200,7 +200,7 @@
END IF;
IF(v_Count=0) THEN
FOR Cur_PriceList IN
- (SELECT C_CURRENCY_CONVERT(M_PRODUCTPRICE.PRICESTD,
M_PRICELIST.C_CURRENCY_ID, v_BaseCurrency, TO_DATE(Cur_InOutLine.MOVEMENTDATE),
NULL, M_PRODUCTPRICE.AD_CLIENT_ID, M_PRODUCTPRICE.AD_ORG_ID) AS PRICESTD
+ (SELECT C_CURRENCY_CONVERT_PRECISION(M_PRODUCTPRICE.PRICESTD,
M_PRICELIST.C_CURRENCY_ID, v_BaseCurrency, TO_DATE(Cur_InOutLine.MOVEMENTDATE),
NULL, M_PRODUCTPRICE.AD_CLIENT_ID, M_PRODUCTPRICE.AD_ORG_ID, 'C') AS PRICESTD
FROM M_PRICELIST, M_PRICELIST_VERSION, M_PRODUCTPRICE
WHERE M_PRICELIST_VERSION.M_PRICELIST_ID=
(SELECT po_pricelist_id
@@ -235,11 +235,11 @@
Ad_Sequence_Nextno('M_Costing'), now(), v_User, now(),
v_User, Cur_InOutLine.AD_CLIENT_ID, Cur_InOutLine.AD_ORG_ID,
Cur_InOutLine.M_PRODUCT_ID,
COALESCE(v_Date, TO_DATE('31-12-9999', 'DD-MM-YYYY')),
Cur_InOutLine.MOVEMENTDATE, 'N', Cur_InOutLine.M_INOUTLINE_ID,
- NULL, Cur_InOutLine.MOVEMENTQTY, v_Price, COALESCE(v_Qty, 0) +
Cur_InOutLine.MOVEMENTQTY + v_CumQty,(
- CASE
+ NULL, Cur_InOutLine.MOVEMENTQTY, v_Price, COALESCE(v_Qty, 0) +
Cur_InOutLine.MOVEMENTQTY + v_CumQty,
+ ROUND((CASE
WHEN v_Qty+v_CumQty<0 THEN v_Price
WHEN (v_Qty+Cur_InOutLine.MOVEMENTQTY+v_CumQty) = 0 THEN 0
- ELSE (((v_Qty+v_CumQty)*COALESCE(v_Cost, v_Price))
+(Cur_InOutLine.MOVEMENTQTY *v_Price))
/(v_Qty+Cur_InOutLine.MOVEMENTQTY+v_CumQty) END),
+ ELSE (((v_Qty+v_CumQty)*COALESCE(v_Cost, v_Price))
+(Cur_InOutLine.MOVEMENTQTY *v_Price))
/(v_Qty+Cur_InOutLine.MOVEMENTQTY+v_CumQty) END),
c_get_currency_precision(v_basecurrency, 'C')),
'AV', 'N'
)
;
diff -r fa2d62c2d918 -r f718ec3e327c src-db/database/model/tables/GL_JOURNAL.xml
--- a/src-db/database/model/tables/GL_JOURNAL.xml Fri Feb 26 10:00:14
2010 +0100
+++ b/src-db/database/model/tables/GL_JOURNAL.xml Fri Feb 26 18:58:16
2010 +0100
@@ -33,6 +33,22 @@
<default/>
<onCreateDefault/>
</column>
+ <column name="USER1_ID" primaryKey="false" required="false"
type="VARCHAR" size="32" autoIncrement="false">
+ <default/>
+ <onCreateDefault/>
+ </column>
+ <column name="USER2_ID" primaryKey="false" required="false"
type="VARCHAR" size="32" autoIncrement="false">
+ <default/>
+ <onCreateDefault/>
+ </column>
+ <column name="C_CAMPAIGN_ID" primaryKey="false" required="false"
type="VARCHAR" size="32" autoIncrement="false">
+ <default/>
+ <onCreateDefault/>
+ </column>
+ <column name="C_PROJECT_ID" primaryKey="false" required="false"
type="VARCHAR" size="32" autoIncrement="false">
+ <default/>
+ <onCreateDefault/>
+ </column>
<column name="C_ACCTSCHEMA_ID" primaryKey="false" required="true"
type="VARCHAR" size="32" autoIncrement="false">
<default/>
<onCreateDefault/>
@@ -141,12 +157,18 @@
<foreign-key foreignTable="AD_ORG" name="GL_JOURNAL_AD_ORG">
<reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
</foreign-key>
+ <foreign-key foreignTable="C_CAMPAIGN" name="GL_JOURNAL_C_CAMPAIGN">
+ <reference local="C_CAMPAIGN_ID" foreign="C_CAMPAIGN_ID"/>
+ </foreign-key>
<foreign-key foreignTable="C_CURRENCY" name="GL_JOURNAL_C_CURRENCY">
<reference local="C_CURRENCY_ID" foreign="C_CURRENCY_ID"/>
</foreign-key>
<foreign-key foreignTable="C_DOCTYPE" name="GL_JOURNAL_C_DOCTYPE">
<reference local="C_DOCTYPE_ID" foreign="C_DOCTYPE_ID"/>
</foreign-key>
+ <foreign-key foreignTable="C_PROJECT" name="GL_JOURNAL_C_PROJECT">
+ <reference local="C_PROJECT_ID" foreign="C_PROJECT_ID"/>
+ </foreign-key>
<foreign-key foreignTable="GL_CATEGORY" name="GL_JOURNAL_GL_CATEGORY">
------------------------------------------------------------------------------
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
