details:   https://code.openbravo.com/erp/devel/main/rev/dd26f27fd606
changeset: 14193:dd26f27fd606
user:      Eduardo Argal Guibert <eduardo.argal <at> openbravo.com>
date:      Thu Nov 10 12:15:42 2011 +0100
summary:   Fixes bug 18940: Reconciliation posting does not work: This record 
is being posted by another process

details:   https://code.openbravo.com/erp/devel/main/rev/5a950007ca9f
changeset: 14194:5a950007ca9f
user:      Javier Etxarri <javier.echarri <at> openbravo.com>
date:      Thu Nov 10 11:42:34 2011 +0100
summary:   Fixes issue 19036: Material Receipt Dimensional Reports died, if the 
quantity ordered is 0

diffstat:

 
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_AUXILIARINPUT.xml
 |  11 +++++++
 
src/org/openbravo/erpCommon/ad_reports/ReportMaterialDimensionalAnalysesJR_data.xsql
 |  14 ++++++---
 2 files changed, 20 insertions(+), 5 deletions(-)

diffs (58 lines):

diff -r 8a364ab2536c -r 5a950007ca9f 
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_AUXILIARINPUT.xml
--- 
a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_AUXILIARINPUT.xml
      Tue Nov 08 15:28:58 2011 +0100
+++ 
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_AUXILIARINPUT.xml
      Thu Nov 10 11:42:34 2011 +0100
@@ -1,5 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <data>
+<!--21943DF0B89F4AE3AF14A9C06F1181C2--><AD_AUXILIARINPUT>
+<!--21943DF0B89F4AE3AF14A9C06F1181C2-->  
<AD_AUXILIARINPUT_ID><![CDATA[21943DF0B89F4AE3AF14A9C06F1181C2]]></AD_AUXILIARINPUT_ID>
+<!--21943DF0B89F4AE3AF14A9C06F1181C2-->  
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--21943DF0B89F4AE3AF14A9C06F1181C2-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--21943DF0B89F4AE3AF14A9C06F1181C2-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--21943DF0B89F4AE3AF14A9C06F1181C2-->  
<AD_TAB_ID><![CDATA[FF8080813320657F0133209DE21B0042]]></AD_TAB_ID>
+<!--21943DF0B89F4AE3AF14A9C06F1181C2-->  
<NAME><![CDATA[Forced_Table_ID]]></NAME>
+<!--21943DF0B89F4AE3AF14A9C06F1181C2-->  <CODE><![CDATA[@AD_TABLE_ID@]]></CODE>
+<!--21943DF0B89F4AE3AF14A9C06F1181C2-->  
<AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--21943DF0B89F4AE3AF14A9C06F1181C2--></AD_AUXILIARINPUT>
+
 <!--9D630C9E4C734361BFB09B153EEE3BCB--><AD_AUXILIARINPUT>
 <!--9D630C9E4C734361BFB09B153EEE3BCB-->  
<AD_AUXILIARINPUT_ID><![CDATA[9D630C9E4C734361BFB09B153EEE3BCB]]></AD_AUXILIARINPUT_ID>
 <!--9D630C9E4C734361BFB09B153EEE3BCB-->  
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r 8a364ab2536c -r 5a950007ca9f 
src/org/openbravo/erpCommon/ad_reports/ReportMaterialDimensionalAnalysesJR_data.xsql
--- 
a/src/org/openbravo/erpCommon/ad_reports/ReportMaterialDimensionalAnalysesJR_data.xsql
      Tue Nov 08 15:28:58 2011 +0100
+++ 
b/src/org/openbravo/erpCommon/ad_reports/ReportMaterialDimensionalAnalysesJR_data.xsql
      Thu Nov 10 11:42:34 2011 +0100
@@ -38,8 +38,9 @@
          C_CURRENCY_CONVERT(SUM(LINENETAMT), TRCURRENCYID, ?, TO_DATE(TRDATE), 
NULL, TRCLIENTID, TRORGID) AS CONVAMOUNT,
          C_CURRENCY_CONVERT(SUM(LINENETREF), TRCURRENCYID, ?, TO_DATE(TRDATE), 
NULL, TRCLIENTID, TRORGID) AS CONVAMOUNTREF,       
       TRCURRENCYID, TRDATE, TRCLIENTID, TRORGID
-      FROM (SELECT to_char('1') AS NIVEL1, to_char('2') AS NIVEL2, 
to_char('3') AS NIVEL3, to_char('4') AS NIVEL4, to_char('5') AS NIVEL5, 
-      C_ORDERLINE.LINENETAMT*(M_INOUTLINE.MOVEMENTQTY/C_ORDERLINE.QtyOrdered) 
as LINENETAMT, M_INOUTLINE.MOVEMENTQTY, 
+      FROM (SELECT to_char('1') AS NIVEL1, to_char('2') AS NIVEL2, 
to_char('3') AS NIVEL3, to_char('4') AS NIVEL4, to_char('5') AS NIVEL5,
+      CASE C_ORDERLINE.QtyOrdered WHEN 0 THEN C_ORDERLINE.LINENETAMT
+      ELSE 
C_ORDERLINE.LINENETAMT*(M_INOUTLINE.MOVEMENTQTY/C_ORDERLINE.QtyOrdered) END as 
LINENETAMT, M_INOUTLINE.MOVEMENTQTY, 
       0 AS LINENETREF, 0 AS MOVEMENTQTYREF, C_UOM.UOMSYMBOL,
       C_ORDERLINE.C_CURRENCY_ID AS TRCURRENCYID,  
          TO_DATE(COALESCE(C_ORDERLINE.DATEORDERED, NOW())) AS TRDATE,      
@@ -60,7 +61,9 @@
       AND 1=1
       UNION ALL SELECT to_char('7') AS NIVEL1 , to_char('8') AS NIVEL2 , 
to_char('9') AS NIVEL3 , to_char('10') AS NIVEL4 , to_char('11') AS NIVEL5, 
       0 AS LINENETAMT, 0 AS MOVEMENTQTY, 
-      C_ORDERLINE.LINENETAMT*(M_INOUTLINE.MOVEMENTQTY/C_ORDERLINE.QtyOrdered) 
AS LINENETREF, M_INOUTLINE.MOVEMENTQTY AS MOVEMENTQTYREF, C_UOM.UOMSYMBOL,
+      CASE C_ORDERLINE.QtyOrdered WHEN 0 THEN C_ORDERLINE.LINENETAMT
+      ELSE 
C_ORDERLINE.LINENETAMT*(M_INOUTLINE.MOVEMENTQTY/C_ORDERLINE.QtyOrdered) END as 
LINENETREF, 
+      M_INOUTLINE.MOVEMENTQTY AS MOVEMENTQTYREF, C_UOM.UOMSYMBOL,
       C_ORDERLINE.C_CURRENCY_ID AS TRCURRENCYID,  
          TO_DATE(COALESCE(C_ORDERLINE.DATEORDERED, NOW())) AS TRDATE,      
          C_ORDERLINE.AD_CLIENT_ID AS TRCLIENTID,      
@@ -134,8 +137,9 @@
          C_CURRENCY_CONVERT(SUM(LINENETAMT), TRCURRENCYID, ?, TO_DATE(TRDATE), 
NULL, TRCLIENTID, TRORGID) AS CONVAMOUNT,
       0 AS CONVAMOUNTREF,
       TRCURRENCYID, TRDATE, TRCLIENTID, TRORGID
-      FROM (SELECT to_char('1') AS NIVEL1, to_char('2') AS NIVEL2, 
to_char('3') AS NIVEL3, to_char('4') AS NIVEL4, to_char('5') AS NIVEL5, 
-      C_ORDERLINE.LINENETAMT*(M_INOUTLINE.MOVEMENTQTY/C_ORDERLINE.QtyOrdered) 
as LINENETAMT, M_INOUTLINE.MOVEMENTQTY, 
+      FROM (SELECT to_char('1') AS NIVEL1, to_char('2') AS NIVEL2, 
to_char('3') AS NIVEL3, to_char('4') AS NIVEL4, to_char('5') AS NIVEL5,
+      CASE C_ORDERLINE.QtyOrdered WHEN 0 THEN C_ORDERLINE.LINENETAMT
+      ELSE 
C_ORDERLINE.LINENETAMT*(M_INOUTLINE.MOVEMENTQTY/C_ORDERLINE.QtyOrdered) END as 
LINENETAMT, M_INOUTLINE.MOVEMENTQTY, 
       0 AS LINENETREF, 0 AS MOVEMENTQTYREF, C_UOM.UOMSYMBOL,
       C_ORDERLINE.C_CURRENCY_ID AS TRCURRENCYID,  
          TO_DATE(COALESCE(C_ORDERLINE.DATEORDERED, NOW())) AS TRDATE,      

------------------------------------------------------------------------------
RSA(R) Conference 2012
Save $700 by Nov 18
Register now
http://p.sf.net/sfu/rsa-sfdev2dev1
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits

Reply via email to