details: /erp/devel/pi/rev/75a13a19cfdf
changeset: 11439:75a13a19cfdf
user: Pablo Sarobe <pablo.sarobe <at> openbravo.com>
date: Sat Apr 02 18:46:09 2011 +0200
summary: Fixes issue 16438: Some improvements and renamed columns
diffstat:
src-db/database/sourcedata/AD_TEXTINTERFACES.xml | 55
++++++++++
src/org/openbravo/erpCommon/ad_forms/GenerateInvoicesmanual.html | 14 +-
src/org/openbravo/erpCommon/ad_forms/GenerateInvoicesmanual.xml | 5 +-
src/org/openbravo/erpCommon/ad_forms/GenerateInvoicesmanual_data.xsql | 6 +-
4 files changed, 69 insertions(+), 11 deletions(-)
diffs (169 lines):
diff -r 5defe5fe3c5f -r 75a13a19cfdf
src-db/database/sourcedata/AD_TEXTINTERFACES.xml
--- a/src-db/database/sourcedata/AD_TEXTINTERFACES.xml Fri Apr 01 21:44:30
2011 +0200
+++ b/src-db/database/sourcedata/AD_TEXTINTERFACES.xml Sat Apr 02 18:46:09
2011 +0200
@@ -16363,6 +16363,17 @@
<!--2B21DC35615C450F83BD69A744CA0764-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--2B21DC35615C450F83BD69A744CA0764--></AD_TEXTINTERFACES>
+<!--2CB15919FC0B465DB60FAD99DA53467E--><AD_TEXTINTERFACES>
+<!--2CB15919FC0B465DB60FAD99DA53467E-->
<AD_TEXTINTERFACES_ID><![CDATA[2CB15919FC0B465DB60FAD99DA53467E]]></AD_TEXTINTERFACES_ID>
+<!--2CB15919FC0B465DB60FAD99DA53467E-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--2CB15919FC0B465DB60FAD99DA53467E--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--2CB15919FC0B465DB60FAD99DA53467E--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--2CB15919FC0B465DB60FAD99DA53467E--> <TEXT><![CDATA[Lines include
taxes]]></TEXT>
+<!--2CB15919FC0B465DB60FAD99DA53467E-->
<FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/GenerateInvoicesmanual.html]]></FILENAME>
+<!--2CB15919FC0B465DB60FAD99DA53467E--> <ISUSED><![CDATA[Y]]></ISUSED>
+<!--2CB15919FC0B465DB60FAD99DA53467E-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--2CB15919FC0B465DB60FAD99DA53467E--></AD_TEXTINTERFACES>
+
<!--2D82E0461832484296B382E9E153E347--><AD_TEXTINTERFACES>
<!--2D82E0461832484296B382E9E153E347-->
<AD_TEXTINTERFACES_ID><![CDATA[2D82E0461832484296B382E9E153E347]]></AD_TEXTINTERFACES_ID>
<!--2D82E0461832484296B382E9E153E347-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -16396,6 +16407,17 @@
<!--2F88E56E83B04A9BA4E716417B50DF99-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--2F88E56E83B04A9BA4E716417B50DF99--></AD_TEXTINTERFACES>
+<!--332430557CCF4B2680A237E7453CBA7D--><AD_TEXTINTERFACES>
+<!--332430557CCF4B2680A237E7453CBA7D-->
<AD_TEXTINTERFACES_ID><![CDATA[332430557CCF4B2680A237E7453CBA7D]]></AD_TEXTINTERFACES_ID>
+<!--332430557CCF4B2680A237E7453CBA7D-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--332430557CCF4B2680A237E7453CBA7D--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--332430557CCF4B2680A237E7453CBA7D--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--332430557CCF4B2680A237E7453CBA7D--> <TEXT><![CDATA[Ready to
invoice]]></TEXT>
+<!--332430557CCF4B2680A237E7453CBA7D-->
<FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/GenerateInvoicesmanual.html]]></FILENAME>
+<!--332430557CCF4B2680A237E7453CBA7D--> <ISUSED><![CDATA[Y]]></ISUSED>
+<!--332430557CCF4B2680A237E7453CBA7D-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--332430557CCF4B2680A237E7453CBA7D--></AD_TEXTINTERFACES>
+
<!--3609345ACEC044BE9CB80F287CF5B019--><AD_TEXTINTERFACES>
<!--3609345ACEC044BE9CB80F287CF5B019-->
<AD_TEXTINTERFACES_ID><![CDATA[3609345ACEC044BE9CB80F287CF5B019]]></AD_TEXTINTERFACES_ID>
<!--3609345ACEC044BE9CB80F287CF5B019-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -20718,6 +20740,17 @@
<!--8A67F581FB204D48E040007F01015A50-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--8A67F581FB204D48E040007F01015A50--></AD_TEXTINTERFACES>
+<!--8A9750C09D0D4A3583669AC61095296B--><AD_TEXTINTERFACES>
+<!--8A9750C09D0D4A3583669AC61095296B-->
<AD_TEXTINTERFACES_ID><![CDATA[8A9750C09D0D4A3583669AC61095296B]]></AD_TEXTINTERFACES_ID>
+<!--8A9750C09D0D4A3583669AC61095296B-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--8A9750C09D0D4A3583669AC61095296B--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--8A9750C09D0D4A3583669AC61095296B--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--8A9750C09D0D4A3583669AC61095296B--> <TEXT><![CDATA[Total Gross]]></TEXT>
+<!--8A9750C09D0D4A3583669AC61095296B-->
<FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/GenerateInvoicesmanual.html]]></FILENAME>
+<!--8A9750C09D0D4A3583669AC61095296B--> <ISUSED><![CDATA[Y]]></ISUSED>
+<!--8A9750C09D0D4A3583669AC61095296B-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--8A9750C09D0D4A3583669AC61095296B--></AD_TEXTINTERFACES>
+
<!--8ADB6BC10E2F5E46E040007F0101106A--><AD_TEXTINTERFACES>
<!--8ADB6BC10E2F5E46E040007F0101106A-->
<AD_TEXTINTERFACES_ID><![CDATA[8ADB6BC10E2F5E46E040007F0101106A]]></AD_TEXTINTERFACES_ID>
<!--8ADB6BC10E2F5E46E040007F0101106A-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -21729,6 +21762,17 @@
<!--95CA79458E40C420E040007F01015644-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--95CA79458E40C420E040007F01015644--></AD_TEXTINTERFACES>
+<!--982644405A4C4BC6AD687D6014C11878--><AD_TEXTINTERFACES>
+<!--982644405A4C4BC6AD687D6014C11878-->
<AD_TEXTINTERFACES_ID><![CDATA[982644405A4C4BC6AD687D6014C11878]]></AD_TEXTINTERFACES_ID>
+<!--982644405A4C4BC6AD687D6014C11878-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--982644405A4C4BC6AD687D6014C11878--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--982644405A4C4BC6AD687D6014C11878--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--982644405A4C4BC6AD687D6014C11878--> <TEXT><![CDATA[Invoiced]]></TEXT>
+<!--982644405A4C4BC6AD687D6014C11878-->
<FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/GenerateInvoicesmanual.html]]></FILENAME>
+<!--982644405A4C4BC6AD687D6014C11878--> <ISUSED><![CDATA[Y]]></ISUSED>
+<!--982644405A4C4BC6AD687D6014C11878-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--982644405A4C4BC6AD687D6014C11878--></AD_TEXTINTERFACES>
+
<!--99A697728AAA426DBBBC95474D01E93D--><AD_TEXTINTERFACES>
<!--99A697728AAA426DBBBC95474D01E93D-->
<AD_TEXTINTERFACES_ID><![CDATA[99A697728AAA426DBBBC95474D01E93D]]></AD_TEXTINTERFACES_ID>
<!--99A697728AAA426DBBBC95474D01E93D-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -21993,6 +22037,17 @@
<!--9F0EC49B72309932E040A8C021013095-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--9F0EC49B72309932E040A8C021013095--></AD_TEXTINTERFACES>
+<!--9F749B6889814698B50D9701AD7A9AA0--><AD_TEXTINTERFACES>
+<!--9F749B6889814698B50D9701AD7A9AA0-->
<AD_TEXTINTERFACES_ID><![CDATA[9F749B6889814698B50D9701AD7A9AA0]]></AD_TEXTINTERFACES_ID>
+<!--9F749B6889814698B50D9701AD7A9AA0-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--9F749B6889814698B50D9701AD7A9AA0--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--9F749B6889814698B50D9701AD7A9AA0--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--9F749B6889814698B50D9701AD7A9AA0--> <TEXT><![CDATA[Total Lines]]></TEXT>
+<!--9F749B6889814698B50D9701AD7A9AA0-->
<FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/GenerateInvoicesmanual.html]]></FILENAME>
+<!--9F749B6889814698B50D9701AD7A9AA0--> <ISUSED><![CDATA[Y]]></ISUSED>
+<!--9F749B6889814698B50D9701AD7A9AA0-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--9F749B6889814698B50D9701AD7A9AA0--></AD_TEXTINTERFACES>
+
<!--A25FFD50C924486E93F3A39A593C5C20--><AD_TEXTINTERFACES>
<!--A25FFD50C924486E93F3A39A593C5C20-->
<AD_TEXTINTERFACES_ID><![CDATA[A25FFD50C924486E93F3A39A593C5C20]]></AD_TEXTINTERFACES_ID>
<!--A25FFD50C924486E93F3A39A593C5C20-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r 5defe5fe3c5f -r 75a13a19cfdf
src/org/openbravo/erpCommon/ad_forms/GenerateInvoicesmanual.html
--- a/src/org/openbravo/erpCommon/ad_forms/GenerateInvoicesmanual.html Fri Apr
01 21:44:30 2011 +0200
+++ b/src/org/openbravo/erpCommon/ad_forms/GenerateInvoicesmanual.html Sat Apr
02 18:46:09 2011 +0200
@@ -323,7 +323,7 @@
</tr>
<tr>
<td class="TitleCell">
- <SPAN class="LabelText">Include taxes</SPAN>
+ <SPAN class="LabelText">Lines include taxes</SPAN>
</td>
<td class="Radio_Check_ContentCell">
<SPAN class="Checkbox_container_Focused">
@@ -382,9 +382,10 @@
<th class="DataGrid_Header_Cell" width="200">Doc No.</th>
<th class="DataGrid_Header_Cell" width="257">Business Partner</th>
<th class="DataGrid_Header_Cell" width="71">Order Date</th>
- <th class="DataGrid_Header_Cell" width="75">Lines amt</th>
- <th class="DataGrid_Header_Cell" width="81">Not invoiced</th>
- <th class="DataGrid_Header_Cell" width="85">Pending to inv.</th>
+ <th class="DataGrid_Header_Cell" width="71">Total
Gross</th>
+ <th class="DataGrid_Header_Cell" width="75">Total Lines</th>
+ <th class="DataGrid_Header_Cell" width="81">Invoiced</th>
+ <th class="DataGrid_Header_Cell" width="85">Ready to invoice</th>
<th class="DataGrid_Header_Cell" width="91">Invoice term</th>
</tr>
<div id="sectionDetail">
@@ -397,8 +398,9 @@
<span id="fieldDocumentno">xx24/10/2004</span></a></td>
<td class="DataGrid_Body_Cell"
id="fieldCbpartnername">xxHuesker</td>
<td class="DataGrid_Body_Cell"
id="fieldDateordered">xx12/03/2004</td>
- <td class="DataGrid_Body_Cell" id="fieldGrandtotal">xx3</td>
- <td class="DataGrid_Body_Cell" id="fieldTotallines">xx3</td>
+ <td class="DataGrid_Body_Cell"
id="fieldTotalGross">xx3</td>
+ <td class="DataGrid_Body_Cell" id="fieldTotalLines">xx3</td>
+ <td class="DataGrid_Body_Cell" id="fieldInvoiced">xx3</td>
<td class="DataGrid_Body_Cell"
id="fieldPendingtoInvoice">xx3</td>
<td class="DataGrid_Body_Cell"
id="fieldInvoiceTerm">xxImmediate</td>
</tr>
diff -r 5defe5fe3c5f -r 75a13a19cfdf
src/org/openbravo/erpCommon/ad_forms/GenerateInvoicesmanual.xml
--- a/src/org/openbravo/erpCommon/ad_forms/GenerateInvoicesmanual.xml Fri Apr
01 21:44:30 2011 +0200
+++ b/src/org/openbravo/erpCommon/ad_forms/GenerateInvoicesmanual.xml Sat Apr
02 18:46:09 2011 +0200
@@ -59,8 +59,9 @@
<FIELD id="fieldDocumentno">documentno</FIELD>
<FIELD id="fieldCbpartnername">cbpartnername</FIELD>
<FIELD id="fieldDateordered">dateordered</FIELD>
- <FIELD id="fieldTotallines"
format="euroRelation">notinvoicedlines</FIELD>
- <FIELD id="fieldGrandtotal"
format="euroRelation">amountlines</FIELD>
+ <FIELD id="fieldTotalGross"
format="euroRelation">totalgross</FIELD>
+ <FIELD id="fieldTotalLines"
format="euroRelation">amountlines</FIELD>
+ <FIELD id="fieldInvoiced"
format="euroRelation">linesinvoiced</FIELD>
<FIELD id="fieldPendingtoInvoice"
format="euroRelation">pendinglines</FIELD>
<FIELD id="fieldInvoiceTerm">termname</FIELD>
<SECTION id="sectionDetail"/>
diff -r 5defe5fe3c5f -r 75a13a19cfdf
src/org/openbravo/erpCommon/ad_forms/GenerateInvoicesmanual_data.xsql
--- a/src/org/openbravo/erpCommon/ad_forms/GenerateInvoicesmanual_data.xsql
Fri Apr 01 21:44:30 2011 +0200
+++ b/src/org/openbravo/erpCommon/ad_forms/GenerateInvoicesmanual_data.xsql
Sat Apr 02 18:46:09 2011 +0200
@@ -29,8 +29,8 @@
<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,
- '' as pendinglinesgross, ic.qtyordered as qtyordered, ic.qtydelivered as
qtydelivered
+ amountlines, notinvoicedlines, 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=?
WHERE ic.AD_Org_ID=o.AD_Org_ID
@@ -62,7 +62,7 @@
<![CDATA[
SELECT C_Order_ID, o.Name as adorgname, COALESCE(dttrl.Name, dt.Name) as
cdoctypename, DocumentNo, bp.Name as cbpartnername, DateOrdered,
amountlinesgross as amountlines, notinvoicedlinesgross as
notinvoicedlines, l.Name as TermName, l.Value as TermValue, pendinglinesgross
as pendinglines,
- ic.qtyordered as qtyordered, ic.qtydelivered as qtydelivered
+ ic.qtyordered as qtyordered, ic.qtydelivered as qtydelivered,
(amountlinesgross-notinvoicedlinesgross) as linesinvoiced, amountlinesgross as
totalgross
FROM C_Invoice_Candidate_v ic, 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=?
WHERE ic.AD_Org_ID=o.AD_Org_ID
------------------------------------------------------------------------------
Create and publish websites with WebMatrix
Use the most popular FREE web apps or write code yourself;
WebMatrix provides all the features you need to develop and
publish your website. http://p.sf.net/sfu/ms-webmatrix-sf
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
