[OpenbravoERP-commits] devel/pi: Fixes issue 0032855: In the screen *Create invoices fr...

[hg]

details:   https://code.openbravo.com/erp/devel/pi/rev/98d966006ddb
changeset: 29437:98d966006ddb
user:      Adrián Romero <adrianromero <at> openbravo.com>
date:      Wed May 04 13:23:26 2016 +0200
summary:   Fixes issue 0032855: In the screen *Create invoices from orders* the 
invoice term are in English.

diffstat:

 src/org/openbravo/erpCommon/ad_forms/GenerateInvoicesmanual_data.xsql |  6 
+++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (30 lines):

diff -r dc6646d8f5d1 -r 98d966006ddb 
src/org/openbravo/erpCommon/ad_forms/GenerateInvoicesmanual_data.xsql
--- a/src/org/openbravo/erpCommon/ad_forms/GenerateInvoicesmanual_data.xsql     
Fri May 06 08:50:17 2016 +0200
+++ b/src/org/openbravo/erpCommon/ad_forms/GenerateInvoicesmanual_data.xsql     
Wed May 04 13:23:26 2016 +0200
@@ -12,7 +12,7 @@
  * under the License. 
  * The Original Code is Openbravo ERP. 
  * The Initial Developer of the Original Code is Openbravo SLU 
- * All portions are Copyright (C) 2001-2014 Openbravo SLU 
+ * All portions are Copyright (C) 2001-2016 Openbravo SLU 
  * All Rights Reserved. 
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -29,7 +29,7 @@
     <Sql>
     <![CDATA[
       SELECT ic.C_Order_ID, o.Name as adorgname, COALESCE(dttrl.Name, dt.Name) 
as cdoctypename, ic.DocumentNo, bp.Name as cbpartnername, ic.DateOrdered,
-      amountlines, notinvoicedlines, l.Name as TermName, l.Value as TermValue, 
pendinglines as pendinglines, '' as amountlinesgross, '' as 
notinvoicedlinesgross,
+      amountlines, notinvoicedlines, COALESCE(ltrl.Name, l.Name) as TermName, 
l.Value as TermValue, pendinglines as pendinglines, '' as amountlinesgross, '' 
as notinvoicedlinesgross,
       '' as pendinglinesgross, ic.qtyordered as qtyordered, ic.qtydelivered as 
qtydelivered, (amountlines-notinvoicedlines) as linesinvoiced, amountlinesgross 
as totalgross
       FROM C_Invoice_Candidate_v ic, C_ORDER ord, AD_Org o, C_BPartner bp, 
AD_Ref_List l left join AD_Ref_List_trl ltrl on 
l.AD_Ref_List_ID=ltrl.AD_Ref_List_ID and ltrl.ad_language=?, 
       C_DocType dt left join C_DocType_trl dttrl on 
dt.C_DocType_ID=dttrl.C_DocType_ID AND dttrl.ad_language=?
@@ -61,7 +61,7 @@
     <Sql>
     <![CDATA[
       SELECT ic.C_Order_ID, o.Name as adorgname, COALESCE(dttrl.Name, dt.Name) 
as cdoctypename, ic.DocumentNo, bp.Name as cbpartnername, ic.DateOrdered,
-      amountlinesgross as amountlines, notinvoicedlinesgross as 
notinvoicedlines, l.Name as TermName, l.Value as TermValue, pendinglinesgross 
as pendinglines,
+      amountlinesgross as amountlines, notinvoicedlinesgross as 
notinvoicedlines, COALESCE(ltrl.Name, l.Name) as TermName, l.Value as 
TermValue, pendinglinesgross as pendinglines,
       ic.qtyordered as qtyordered, ic.qtydelivered as qtydelivered, 
(amountlinesgross-notinvoicedlinesgross) as linesinvoiced, amountlinesgross as 
totalgross
       FROM C_Invoice_Candidate_v ic, C_ORDER ord, AD_Org o, C_BPartner bp, 
AD_Ref_List l left join AD_Ref_List_trl ltrl on 
l.AD_Ref_List_ID=ltrl.AD_Ref_List_ID and ltrl.ad_language=?, 
       C_DocType dt left join C_DocType_trl dttrl on 
dt.C_DocType_ID=dttrl.C_DocType_ID AND dttrl.ad_language=?

------------------------------------------------------------------------------
Find and fix application performance issues faster with Applications Manager
Applications Manager provides deep performance insights into multiple tiers of
your business applications. It resolves application problems quickly and
reduces your MTTR. Get your free trial!
https://ad.doubleclick.net/ddm/clk/302982198;130105516;z
_______________________________________________
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits