details: /erp/devel/int/rev/ac78d8c03d14
changeset: 6468:ac78d8c03d14
user: Harikrishnan Raja <harikrishnan.raja <at> openbravo.com>
date: Mon Feb 22 12:02:37 2010 +0530
summary: Fixes Issue 12197: Pending Goods Receipts window doesn't order
properly.
details: /erp/devel/int/rev/46957ab44fec
changeset: 6469:46957ab44fec
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Mon Feb 22 10:22:54 2010 +0100
summary: related to issue 11039
Criteria to close sessions because of timeout now closes also sessions
without last ping
details: /erp/devel/int/rev/cc397411a08a
changeset: 6470:cc397411a08a
user: Antonio Moreno <antonio.moreno <at> openbravo.com>
date: Mon Feb 22 15:49:11 2010 +0100
summary: Fixed issue 12395. compile.complete.war will now set the system
status correctly.
details: /erp/devel/int/rev/04e7af9646a0
changeset: 6471:04e7af9646a0
user: David Alsasua <david.alsasua <at> openbravo.com>
date: Mon Feb 22 18:10:25 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/build.xml | 1 +
src/org/openbravo/erpCommon/ad_forms/DocInOut_data.xsql | 4 +++-
src/org/openbravo/erpCommon/ad_forms/DocMatchInv.java | 2 +-
src/org/openbravo/erpCommon/ad_forms/DocMatchInv_data.xsql | 6
++++--
src/org/openbravo/erpCommon/ad_forms/MaterialReceiptPending_data.xsql | 2 +-
src/org/openbravo/erpCommon/obps/ActivationKey.java | 9
++++++---
6 files changed, 16 insertions(+), 8 deletions(-)
diffs (91 lines):
diff -r c2f5064a60dc -r 04e7af9646a0 src/build.xml
--- a/src/build.xml Fri Feb 19 17:35:58 2010 +0100
+++ b/src/build.xml Mon Feb 22 18:10:25 2010 +0100
@@ -804,6 +804,7 @@
</zipfileset>
<classes dir="${build}" />
</war>
+ <updatesystemstatus v="RB51"/>
</target>
<target name="generate-wsdd">
diff -r c2f5064a60dc -r 04e7af9646a0
src/org/openbravo/erpCommon/ad_forms/DocInOut_data.xsql
--- a/src/org/openbravo/erpCommon/ad_forms/DocInOut_data.xsql Fri Feb 19
17:35:58 2010 +0100
+++ b/src/org/openbravo/erpCommon/ad_forms/DocInOut_data.xsql Mon Feb 22
18:10:25 2010 +0100
@@ -71,11 +71,13 @@
<SqlMethod name="selectClientCurrencyPrecission" type="preparedStatement"
return="string">
<SqlMethodComment></SqlMethodComment>
<Sql>
+ <![CDATA[
select stdprecision
from c_currency cu, ad_client cl
where cu.c_currency_id=cl.c_currency_id
and cl.ad_client_id=?
+ ]]>
</Sql>
<Parameter name="adClientId"/>
</SqlMethod>
-</SqlClass>
\ No newline at end of file
+</SqlClass>
diff -r c2f5064a60dc -r 04e7af9646a0
src/org/openbravo/erpCommon/ad_forms/DocMatchInv.java
--- a/src/org/openbravo/erpCommon/ad_forms/DocMatchInv.java Fri Feb 19
17:35:58 2010 +0100
+++ b/src/org/openbravo/erpCommon/ad_forms/DocMatchInv.java Mon Feb 22
18:10:25 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("DateTrx")));
+ .getField("M_Product_Id"), data[0].getField("DateAcct")));
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 c2f5064a60dc -r 04e7af9646a0
src/org/openbravo/erpCommon/ad_forms/DocMatchInv_data.xsql
--- a/src/org/openbravo/erpCommon/ad_forms/DocMatchInv_data.xsql Fri Feb
19 17:35:58 2010 +0100
+++ b/src/org/openbravo/erpCommon/ad_forms/DocMatchInv_data.xsql Mon Feb
22 18:10:25 2010 +0100
@@ -37,10 +37,12 @@
<![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
- FROM M_MATCHINV M, C_INVOICELINE IL, C_INVOICE I
+ M.PROCESSED, M.POSTED, M.DATETRX AS DATEACCT, M.DATETRX AS DATEDOC,
I.C_BPARTNER_ID, IO.DATEACCT
+ 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
+ AND IOL.M_INOUTLINE_ID = M.M_INOUTLINE_ID
+ AND IO.M_INOUT_ID = IOL.M_INOUT_ID
AND M.AD_Client_ID=?
AND M.M_MATCHINV_ID=?
]]>
diff -r c2f5064a60dc -r 04e7af9646a0
src/org/openbravo/erpCommon/ad_forms/MaterialReceiptPending_data.xsql
--- a/src/org/openbravo/erpCommon/ad_forms/MaterialReceiptPending_data.xsql
Fri Feb 19 17:35:58 2010 +0100
+++ b/src/org/openbravo/erpCommon/ad_forms/MaterialReceiptPending_data.xsql
Mon Feb 22 18:10:25 2010 +0100
@@ -65,7 +65,7 @@
C_BPARTNER.NAME, C_ORDERLINE.M_PRODUCT_ID,
M_ATTRIBUTESETINSTANCE.DESCRIPTION, C_ORDERLINE.QTYORDERED
ORDER BY PARTNER_NAME, DOCUMENTNO, DATEORDERED) A
WHERE QTYORDERED <>0
- ORDER BY C_BPARTNER_ID, ID
+ ORDER BY C_BPARTNER_ID
]]></Sql>
<Field name="rownum" value="count"/>
<Parameter name="dateFormat"/>
diff -r c2f5064a60dc -r 04e7af9646a0
src/org/openbravo/erpCommon/obps/ActivationKey.java
--- a/src/org/openbravo/erpCommon/obps/ActivationKey.java Fri Feb 19
17:35:58 2010 +0100
+++ b/src/org/openbravo/erpCommon/obps/ActivationKey.java Mon Feb 22
18:10:25 2010 +0100
@@ -391,9 +391,12 @@
Date lastValidPingTime = new Date(cal.getTimeInMillis());
OBCriteria<Session> obCriteria =
OBDal.getInstance().createCriteria(Session.class);
- obCriteria.add(Expression.eq(Session.PROPERTY_SESSIONACTIVE, true));
- obCriteria.add(Expression.isNotNull(Session.PROPERTY_LASTPING));
- obCriteria.add(Expression.lt(Session.PROPERTY_LASTPING,
lastValidPingTime));
+
+ // sesion_active='Y' and (lastPing is null or lastPing<lastValidPing)
+
obCriteria.add(Expression.and(Expression.eq(Session.PROPERTY_SESSIONACTIVE,
true), Expression
+ .or(Expression.isNull(Session.PROPERTY_LASTPING),
Expression.lt(Session.PROPERTY_LASTPING,
+ lastValidPingTime))));
+
boolean sessionDeactivated = false;
for (Session expiredSession : obCriteria.list()) {
expiredSession.setSessionActive(false);
------------------------------------------------------------------------------
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
