details: /erp/stable/2.50/rev/478bd99001cd
changeset: 9152:478bd99001cd
user: Adrián Romero <adrianromero <at> openbravo.com>
date: Thu Jan 20 13:18:39 2011 +0100
summary: Fixes issue 0011248: Work Requirement: Rounding issue for Quantity
field for WR created by MRP
It has been fixed the way of calculating the planned quantity value to match
the especifications of a work requirement. The planned quantity is an integer
value that describes the minimum number of times required to build at least the
number of products in the Manufacturing Plan
details: /erp/stable/2.50/rev/895b86fe7753
changeset: 9153:895b86fe7753
user: Adrián Romero <adrianromero <at> openbravo.com>
date: Fri Jan 21 12:03:32 2011 +0100
summary: Fixes issue 0015560: Error in Bank Account combo in Funds Transfer
process
It has been fixed the two SQL sentences with the problem of not properly
filtering by client: selectBankDouble and selectCashDouble
details: /erp/stable/2.50/rev/d1e872fa524f
changeset: 9154:d1e872fa524f
user: Adrián Romero <adrianromero <at> openbravo.com>
date: Mon Jan 24 15:50:07 2011 +0100
summary: Fixes issue 0015746: Create invoices from orders. Invoice rule.
After delivery not working properly
It has been restored the line removed
diffstat:
src-db/database/model/functions/C_INVOICE_CREATE.xml | 3 +
src-db/database/model/functions/MRP_WORKREQUIREMENT.xml | 8 +---
src/org/openbravo/erpCommon/ad_process/CashBankOperations_data.xsql | 16
+++++-----
3 files changed, 14 insertions(+), 13 deletions(-)
diffs (73 lines):
diff -r bdddf706ef62 -r d1e872fa524f
src-db/database/model/functions/C_INVOICE_CREATE.xml
--- a/src-db/database/model/functions/C_INVOICE_CREATE.xml Mon Jan 24
12:36:49 2011 +0100
+++ b/src-db/database/model/functions/C_INVOICE_CREATE.xml Mon Jan 24
15:50:07 2011 +0100
@@ -984,6 +984,9 @@
v_InOut_ID:='-1';
END IF;
END IF;--FINISH_PROCESS
+
+ v_InOut_ID:=Cur_InvoiceSchedule.M_InOut_ID;
+
IF(NOT FINISH_PROCESS) THEN
-- Normal Line
Ad_Sequence_Next('C_InvoiceLine',
Cur_InvoiceSchedule.C_Order_ID, v_NextNo) ;
diff -r bdddf706ef62 -r d1e872fa524f
src-db/database/model/functions/MRP_WORKREQUIREMENT.xml
--- a/src-db/database/model/functions/MRP_WORKREQUIREMENT.xml Mon Jan 24
12:36:49 2011 +0100
+++ b/src-db/database/model/functions/MRP_WORKREQUIREMENT.xml Mon Jan 24
15:50:07 2011 +0100
@@ -67,13 +67,11 @@
FOR Cur_workproposal IN (
SELECT MRP_RUN_PRODUCTIONLINE.* , MA_PROCESSPLAN.EXPLODEPHASES,
MA_PROCESSPLAN.CONVERSIONRATE, MA_PROCESSPLAN.SECONDARYUNIT,
- ROUND((MRP_RUN_PRODUCTIONLINE.qty/A.PROQTY), C_UOM.STDPRECISION) AS
PROCESSPLANQTY, MRP_RUN_PRODUCTIONLINE.AD_ORG_ID AS ADORG_ID
- FROM MRP_RUN_PRODUCTIONLINE, M_PRODUCT, C_UOM, MA_PROCESSPLAN,
+ CEIL(MRP_RUN_PRODUCTIONLINE.qty/A.PROQTY) AS PROCESSPLANQTY,
MRP_RUN_PRODUCTIONLINE.AD_ORG_ID AS ADORG_ID
+ FROM MRP_RUN_PRODUCTIONLINE, MA_PROCESSPLAN,
(SELECT DISTINCT produced, proqty, ma_processplan_id
FROM MA_PROCESSPLAN_TOTALIZED) A
- WHERE MRP_RUN_PRODUCTIONLINE.M_PRODUCT_ID = M_PRODUCT.M_PRODUCT_ID
- AND M_PRODUCT.C_UOM_ID = C_UOM.C_UOM_ID
- AND MRP_RUN_PRODUCTIONLINE.MA_PROCESSPLAN_ID =
MA_PROCESSPLAN.MA_PROCESSPLAN_ID
+ WHERE MRP_RUN_PRODUCTIONLINE.MA_PROCESSPLAN_ID =
MA_PROCESSPLAN.MA_PROCESSPLAN_ID
AND MA_PROCESSPLAN.MA_PROCESSPLAN_ID = A.MA_PROCESSPLAN_ID
AND A.PRODUCED = MRP_RUN_PRODUCTIONLINE.M_PRODUCT_ID
AND MRP_RUN_PRODUCTION_ID = v_Record_ID
diff -r bdddf706ef62 -r d1e872fa524f
src/org/openbravo/erpCommon/ad_process/CashBankOperations_data.xsql
--- a/src/org/openbravo/erpCommon/ad_process/CashBankOperations_data.xsql
Mon Jan 24 12:36:49 2011 +0100
+++ b/src/org/openbravo/erpCommon/ad_process/CashBankOperations_data.xsql
Mon Jan 24 15:50:07 2011 +0100
@@ -43,13 +43,13 @@
FROM AD_ORG O, AD_ORG P, C_BANKACCOUNT C
WHERE O.AD_ORG_ID = C.AD_ORG_ID
AND AD_ISORGINCLUDED(P.AD_ORG_ID,C.AD_ORG_ID,P.AD_CLIENT_ID)
<> -1
- AND O.AD_ORG_ID IN ('1')
- AND P.AD_CLIENT_ID IN ('2')
+ AND C.AD_ORG_ID IN ('1')
+ AND C.AD_CLIENT_ID IN ('2')
ORDER BY PADRE, NAME
]]>
</Sql>
- <Parameter name="adOrgId" optional="true" type="replace" after="AND
O.AD_ORG_ID IN (" text="'1'"/>
- <Parameter name="adClientId" optional="true" type="replace" after="AND
P.AD_CLIENT_ID IN (" text="'2'"/>
+ <Parameter name="adOrgId" optional="true" type="replace" after="AND
C.AD_ORG_ID IN (" text="'1'"/>
+ <Parameter name="adClientId" optional="true" type="replace" after="AND
C.AD_CLIENT_ID IN (" text="'2'"/>
</SqlMethod>
<SqlMethod name="selectCashDouble" type="preparedStatement"
return="multiple">
<SqlMethodComment></SqlMethodComment>
@@ -59,14 +59,14 @@
FROM AD_ORG O, AD_ORG P, C_CASHBOOK C
WHERE O.AD_ORG_ID = C.AD_ORG_ID
AND AD_ISORGINCLUDED(P.AD_ORG_ID,C.AD_ORG_ID,P.AD_CLIENT_ID)
<> -1
- AND O.AD_ORG_ID IN ('1')
- AND P.AD_CLIENT_ID IN ('2')
+ AND C.AD_ORG_ID IN ('1')
+ AND C.AD_CLIENT_ID IN ('2')
ORDER BY PADRE, NAME
]]>
</Sql>
<Parameter name="adLanguage"/>
- <Parameter name="adOrgId" optional="true" type="replace" after="AND
O.AD_ORG_ID IN (" text="'1'"/>
- <Parameter name="adClientId" optional="true" type="replace" after="AND
P.AD_CLIENT_ID IN (" text="'2'"/>
+ <Parameter name="adOrgId" optional="true" type="replace" after="AND
C.AD_ORG_ID IN (" text="'1'"/>
+ <Parameter name="adClientId" optional="true" type="replace" after="AND
C.AD_CLIENT_ID IN (" text="'2'"/>
</SqlMethod>
<SqlMethod name="select" type="preparedStatement" return="String">
<SqlMethodComment></SqlMethodComment>
------------------------------------------------------------------------------
Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)!
Finally, a world-class log management solution at an even better price-free!
Download using promo code Free_Logger_4_Dev2Dev. Offer expires
February 28th, so secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsight-sfd2d
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
