From e5be71f033a701d6ab214ccdad843912481b4490 Mon Sep 17 00:00:00 2001 From: vpj-cd Date: Thu, 6 Dec 2007 00:21:59 +0000 Subject: [PATCH] minor fixed with views --- db/ddlutils/postgresql/views/C_INVOICE_V.sql | 9 +++------ migration/330-trunk/postgresql/027_fix_typo_es.sql | 4 ++-- migration/330-trunk/postgresql/028_FR_1799601_PG.sql | 8 ++++---- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/db/ddlutils/postgresql/views/C_INVOICE_V.sql b/db/ddlutils/postgresql/views/C_INVOICE_V.sql index 0606c7d4e5..ac4d7bb3a6 100644 --- a/db/ddlutils/postgresql/views/C_INVOICE_V.sql +++ b/db/ddlutils/postgresql/views/C_INVOICE_V.sql @@ -18,7 +18,7 @@ SELECT i.C_Invoice_ID, i.AD_Client_ID, i.AD_Org_ID, i.IsActive, i.Created, i.Cre i.AD_User_ID, i.POReference, i.DateOrdered, i.C_Currency_ID, i.C_ConversionType_ID, i.PaymentRule, i.C_PaymentTerm_ID, i.C_Charge_ID, i.M_PriceList_ID, i.C_Campaign_ID, i.C_Project_ID, i.C_Activity_ID, i.IsPrinted, i.IsDiscountPrinted, i.IsPaid, i.IsInDispute, - i.IsPayScheduleValid, cast(null as numeric) AS C_InvoicePaySchedule_ID, i.InvoiceCollectionType,i.DunningGrace + i.IsPayScheduleValid, cast(null as numeric) AS C_InvoicePaySchedule_ID, i.InvoiceCollectionType,i.DunningGrace, cast(CASE WHEN charAt(d.DocBaseType,3)='C' THEN i.ChargeAmt*-1 ELSE i.ChargeAmt END as numeric) AS ChargeAmt, cast(CASE WHEN charAt(d.DocBaseType,3)='C' THEN i.TotalLines*-1 ELSE i.TotalLines END as numeric) AS TotalLines, cast(CASE WHEN charAt(d.DocBaseType,3)='C' THEN i.GrandTotal*-1 ELSE i.GrandTotal END as numeric) AS GrandTotal, @@ -36,7 +36,7 @@ SELECT i.C_Invoice_ID, i.AD_Client_ID, i.AD_Org_ID, i.IsActive, i.Created, i.Cre i.AD_User_ID, i.POReference, i.DateOrdered, i.C_Currency_ID, i.C_ConversionType_ID, i.PaymentRule, i.C_PaymentTerm_ID, i.C_Charge_ID, i.M_PriceList_ID, i.C_Campaign_ID, i.C_Project_ID, i.C_Activity_ID, i.IsPrinted, i.IsDiscountPrinted, i.IsPaid, i.IsInDispute, - i.IsPayScheduleValid, ips.C_InvoicePaySchedule_ID, i.InvoiceCollectionType, i.DunningGrace + i.IsPayScheduleValid, ips.C_InvoicePaySchedule_ID, i.InvoiceCollectionType, i.DunningGrace, null AS ChargeAmt, null AS TotalLines, CASE WHEN charAt(d.DocBaseType,3)='C' THEN ips.DueAmt*-1 ELSE ips.DueAmt END AS GrandTotal, @@ -47,7 +47,4 @@ FROM C_Invoice i INNER JOIN C_DocType d ON (i.C_DocType_ID=d.C_DocType_ID) INNER JOIN C_InvoicePaySchedule ips ON (i.C_Invoice_ID=ips.C_Invoice_ID) WHERE i.IsPayScheduleValid='Y' - AND ips.IsValid='Y'; - - - + AND ips.IsValid='Y'; \ No newline at end of file diff --git a/migration/330-trunk/postgresql/027_fix_typo_es.sql b/migration/330-trunk/postgresql/027_fix_typo_es.sql index 22d4e2e5d1..65c64f01bf 100644 --- a/migration/330-trunk/postgresql/027_fix_typo_es.sql +++ b/migration/330-trunk/postgresql/027_fix_typo_es.sql @@ -1,9 +1,9 @@ UPDATE AD_WINDOW_TRL SET HELP = - 'La terminal de PDV define los datos por omisión y las funciones disponibles para las formas de PDV.' + 'La terminal de PDV define los datos por omisión y las funciones disponibles para las formas de PDV.' WHERE ad_window_id = 338 AND HELP LIKE - '%La terminal de PDV define los datos por homición y las funciones disponibles para las formas de PDV.%' + '%La terminal de PDV define los datos por homición y las funciones disponibles para las formas de PDV.%' AND AD_LANGUAGE LIKE 'es_%'; COMMIT ; diff --git a/migration/330-trunk/postgresql/028_FR_1799601_PG.sql b/migration/330-trunk/postgresql/028_FR_1799601_PG.sql index 7d87da716f..4f3c75aceb 100644 --- a/migration/330-trunk/postgresql/028_FR_1799601_PG.sql +++ b/migration/330-trunk/postgresql/028_FR_1799601_PG.sql @@ -130,7 +130,7 @@ ALTER TABLE C_BPartner ADD DunningGrace date NULL; ALTER TABLE C_Invoice ADD DunningGrace date NULL; DROP VIEW c_invoiceline_v; ---DROP VIEW rv_bpartneropen; +DROP VIEW rv_bpartneropen; DROP VIEW c_invoice_v; CREATE OR REPLACE VIEW C_INVOICE_V @@ -142,7 +142,7 @@ SELECT i.C_Invoice_ID, i.AD_Client_ID, i.AD_Org_ID, i.IsActive, i.Created, i.Cre i.AD_User_ID, i.POReference, i.DateOrdered, i.C_Currency_ID, i.C_ConversionType_ID, i.PaymentRule, i.C_PaymentTerm_ID, i.C_Charge_ID, i.M_PriceList_ID, i.C_Campaign_ID, i.C_Project_ID, i.C_Activity_ID, i.IsPrinted, i.IsDiscountPrinted, i.IsPaid, i.IsInDispute, - i.IsPayScheduleValid, cast(null as numeric) AS C_InvoicePaySchedule_ID, i.InvoiceCollectionType,i.DunningGrace + i.IsPayScheduleValid, cast(null as numeric) AS C_InvoicePaySchedule_ID, i.InvoiceCollectionType,i.DunningGrace, cast(CASE WHEN charAt(d.DocBaseType,3)='C' THEN i.ChargeAmt*-1 ELSE i.ChargeAmt END as numeric) AS ChargeAmt, cast(CASE WHEN charAt(d.DocBaseType,3)='C' THEN i.TotalLines*-1 ELSE i.TotalLines END as numeric) AS TotalLines, cast(CASE WHEN charAt(d.DocBaseType,3)='C' THEN i.GrandTotal*-1 ELSE i.GrandTotal END as numeric) AS GrandTotal, @@ -160,7 +160,7 @@ SELECT i.C_Invoice_ID, i.AD_Client_ID, i.AD_Org_ID, i.IsActive, i.Created, i.Cre i.AD_User_ID, i.POReference, i.DateOrdered, i.C_Currency_ID, i.C_ConversionType_ID, i.PaymentRule, i.C_PaymentTerm_ID, i.C_Charge_ID, i.M_PriceList_ID, i.C_Campaign_ID, i.C_Project_ID, i.C_Activity_ID, i.IsPrinted, i.IsDiscountPrinted, i.IsPaid, i.IsInDispute, - i.IsPayScheduleValid, ips.C_InvoicePaySchedule_ID, i.InvoiceCollectionType, i.DunningGrace + i.IsPayScheduleValid, ips.C_InvoicePaySchedule_ID, i.InvoiceCollectionType, i.DunningGrace, null AS ChargeAmt, null AS TotalLines, CASE WHEN charAt(d.DocBaseType,3)='C' THEN ips.DueAmt*-1 ELSE ips.DueAmt END AS GrandTotal, @@ -182,7 +182,7 @@ SELECT il.AD_Client_ID, il.AD_Org_ID, ROUND(i.Multiplier*LineNetAmt, 2) AS LineNetAmt, ROUND(i.Multiplier*PriceList*QtyInvoiced, 2) AS LineListAmt, CASE WHEN COALESCE(il.PriceLimit, 0)=0 THEN ROUND(i.Multiplier*LineNetAmt,2) ELSE ROUND(i.Multiplier*il.PriceLimit*il.QtyInvoiced,2) END AS LineLimitAmt, - ROUND(i.Multiplier*il.PriceList*ilQtyInvoiced-il.LineNetAmt,2) AS LineDiscountAmt, + ROUND(i.Multiplier*il.PriceList*il.QtyInvoiced-il.LineNetAmt,2) AS LineDiscountAmt, CASE WHEN COALESCE(il.PriceLimit,0)=0 THEN 0 ELSE ROUND(i.Multiplier*il.LineNetAmt-il.PriceLimit*il.QtyInvoiced,2) END AS LineOverLimitAmt, il.QtyInvoiced, il.QtyEntered, il.Line, il.C_OrderLine_ID, il.C_UOM_ID,