details: /erp/stable/2.50/rev/8232257f524f
changeset: 9337:8232257f524f
user: Ioritz Cia <ioritz.cia <at> openbravo.com>
date: Fri Apr 01 09:22:26 2011 +0200
summary: Fixes issue 16596: According to law, Reversed Invoices should follow
its own DocumentSequence.
details: /erp/stable/2.50/rev/c105fa00cd66
changeset: 9338:c105fa00cd66
user: Ioritz Cia <ioritz.cia <at> openbravo.com>
date: Fri Apr 01 13:52:23 2011 +0200
summary: Fixes issue 16597: In purchase order report, the taxes are not
displayed.
diffstat:
referencedata/standard/Initial_Setup.xml | 76 +++++++++++++++++++++++-
src-db/database/sourcedata/AD_DATASET.xml | 2 +-
src-db/database/sourcedata/AD_TEXTINTERFACES.xml | 22 ++++++
src/org/openbravo/erpReports/C_OrderJR.jrxml | 33 ++++-----
4 files changed, 111 insertions(+), 22 deletions(-)
diffs (243 lines):
diff -r 7aa0c5da0436 -r c105fa00cd66 referencedata/standard/Initial_Setup.xml
--- a/referencedata/standard/Initial_Setup.xml Mon Apr 04 11:12:26 2011 +0200
+++ b/referencedata/standard/Initial_Setup.xml Fri Apr 01 13:52:23 2011 +0200
@@ -516,7 +516,7 @@
<numberOfCopies>0</numberOfCopies>
<table id="318" entity-name="ADTable" identifier="C_Invoice"/>
<filterByOrganization>false</filterByOrganization>
- <documentCancelled xsi:nil="true"/>
+ <documentCancelled id="67C3266D11A04078B7A14AC21E91C711"
entity-name="DocumentType" identifier="Reversed Sales Invoice"/>
<expense>false</expense>
<reversal>false</reversal>
</DocumentType>
@@ -608,7 +608,7 @@
<numberOfCopies>0</numberOfCopies>
<table id="318" entity-name="ADTable" identifier="C_Invoice"/>
<filterByOrganization>false</filterByOrganization>
- <documentCancelled xsi:nil="true"/>
+ <documentCancelled id="AFFD4594FB734E9682D5769669A9D471"
entity-name="DocumentType" identifier="Reversed Purchase Invoice"/>
<expense>false</expense>
<reversal>false</reversal>
</DocumentType>
@@ -658,6 +658,29 @@
<expense>false</expense>
<reversal>false</reversal>
</DocumentType>
+ <DocumentType id="67C3266D11A04078B7A14AC21E91C711" identifier="Reversed
Sales Invoice">
+ <id>67C3266D11A04078B7A14AC21E91C711</id>
+ <active>true</active>
+ <name>Reversed Sales Invoice</name>
+ <printText>Reversed Sales Invoice</printText>
+ <description xsi:nil="true"/>
+ <documentCategory>ARI</documentCategory>
+ <salesTransaction>true</salesTransaction>
+ <sOSubType xsi:nil="true"/>
+ <documentTypeForShipment xsi:nil="true"/>
+ <documentTypeForInvoice xsi:nil="true"/>
+ <sequencedDocument>true</sequencedDocument>
+ <documentSequence id="31A0AE4B070A49EAA5D755D33D7B9C8C"
entity-name="ADSequence" identifier="Reversed Sales Invoice"/>
+ <gLCategory id="102C08DF5D4341D5B7FDF758632503D2"
entity-name="FinancialMgmtGLCategory" identifier="AR Invoice"/>
+ <comments xsi:nil="true"/>
+ <default>false</default>
+ <numberOfCopies>0</numberOfCopies>
+ <table id="318" entity-name="ADTable" identifier="C_Invoice"/>
+ <filterByOrganization>false</filterByOrganization>
+ <documentCancelled xsi:nil="true"/>
+ <expense>false</expense>
+ <reversal>true</reversal>
+ </DocumentType>
<DocumentType id="6B13D02AD3C44C4CB0CFBD1288E0CB10" identifier="Physical
Inventory">
<id>6B13D02AD3C44C4CB0CFBD1288E0CB10</id>
<active>true</active>
@@ -865,6 +888,29 @@
<expense>false</expense>
<reversal>false</reversal>
</DocumentType>
+ <DocumentType id="AFFD4594FB734E9682D5769669A9D471" identifier="Reversed
Purchase Invoice">
+ <id>AFFD4594FB734E9682D5769669A9D471</id>
+ <active>true</active>
+ <name>Reversed Purchase Invoice</name>
+ <printText>Reversed Purchase Invoice</printText>
+ <description xsi:nil="true"/>
+ <documentCategory>API</documentCategory>
+ <salesTransaction>false</salesTransaction>
+ <sOSubType xsi:nil="true"/>
+ <documentTypeForShipment xsi:nil="true"/>
+ <documentTypeForInvoice xsi:nil="true"/>
+ <sequencedDocument>true</sequencedDocument>
+ <documentSequence id="B277787F93854F888B32177DCF14C43D"
entity-name="ADSequence" identifier="Reversed Purchase Invoice"/>
+ <gLCategory id="A431AFE1356141728139523053B672C4"
entity-name="FinancialMgmtGLCategory" identifier="AP Invoice"/>
+ <comments xsi:nil="true"/>
+ <default>false</default>
+ <numberOfCopies>0</numberOfCopies>
+ <table id="318" entity-name="ADTable" identifier="C_Invoice"/>
+ <filterByOrganization>false</filterByOrganization>
+ <documentCancelled xsi:nil="true"/>
+ <expense>false</expense>
+ <reversal>true</reversal>
+ </DocumentType>
<DocumentType id="B476CFAE109047DEB5BC9AC80A03297A" identifier="AR Credit
Memo">
<id>B476CFAE109047DEB5BC9AC80A03297A</id>
<active>true</active>
@@ -1097,6 +1143,18 @@
<usedForRecordID>false</usedForRecordID>
<restartSequenceEveryYear>false</restartSequenceEveryYear>
</ADSequence>
+ <ADSequence id="31A0AE4B070A49EAA5D755D33D7B9C8C" identifier="Reversed Sales
Invoice">
+ <id>31A0AE4B070A49EAA5D755D33D7B9C8C</id>
+ <active>true</active>
+ <name>Reversed Sales Invoice</name>
+ <description>Reversed Sales Invoice</description>
+ <valueFormat xsi:nil="true"/>
+ <autoNumbering>true</autoNumbering>
+ <incrementBy>1</incrementBy>
+ <startingNo>1000000</startingNo>
+ <usedForRecordID>false</usedForRecordID>
+ <restartSequenceEveryYear>false</restartSequenceEveryYear>
+ </ADSequence>
<ADSequence id="4D72691638A24A0194882A302FCF9494" identifier="AP Payment">
<id>4D72691638A24A0194882A302FCF9494</id>
<active>true</active>
@@ -1253,6 +1311,18 @@
<usedForRecordID>false</usedForRecordID>
<restartSequenceEveryYear>false</restartSequenceEveryYear>
</ADSequence>
+ <ADSequence id="B277787F93854F888B32177DCF14C43D" identifier="Reversed
Purchase Invoice">
+ <id>B277787F93854F888B32177DCF14C43D</id>
+ <active>true</active>
+ <name>Reversed Purchase Invoice</name>
+ <description>Reversed Purchase Invoice</description>
+ <valueFormat xsi:nil="true"/>
+ <autoNumbering>true</autoNumbering>
+ <incrementBy>1</incrementBy>
+ <startingNo>1000000</startingNo>
+ <usedForRecordID>false</usedForRecordID>
+ <restartSequenceEveryYear>false</restartSequenceEveryYear>
+ </ADSequence>
<ADSequence id="B380E35582BD4D1A930146F1BA72C03F" identifier="GL Journal">
<id>B380E35582BD4D1A930146F1BA72C03F</id>
<active>true</active>
@@ -1392,7 +1462,7 @@
<name>Purchase Order Report template</name>
<templateLocation>@basedesign@/org/openbravo/erpReports</templateLocation>
<reportFilename>Purchase Order-@our_ref@</reportFilename>
- <templateFilename>RptC_OrderPO.jrxml</templateFilename>
+ <templateFilename>C_OrderJR.jrxml</templateFilename>
<showcompanydata>true</showcompanydata>
<showlogo>true</showlogo>
<headermargin xsi:nil="true"/>
diff -r 7aa0c5da0436 -r c105fa00cd66 src-db/database/sourcedata/AD_DATASET.xml
--- a/src-db/database/sourcedata/AD_DATASET.xml Mon Apr 04 11:12:26 2011 +0200
+++ b/src-db/database/sourcedata/AD_DATASET.xml Fri Apr 01 13:52:23 2011 +0200
@@ -40,7 +40,7 @@
<!--10C9DA9D9A6345DC9080E0102492FF1B--> <EXPORT><![CDATA[N]]></EXPORT>
<!--10C9DA9D9A6345DC9080E0102492FF1B-->
<ACCESSLEVEL><![CDATA[3]]></ACCESSLEVEL>
<!--10C9DA9D9A6345DC9080E0102492FF1B-->
<EXPORTALLOWED><![CDATA[Y]]></EXPORTALLOWED>
-<!--10C9DA9D9A6345DC9080E0102492FF1B-->
<CHECKSUM><![CDATA[204303149172035464319244074964864775026]]></CHECKSUM>
+<!--10C9DA9D9A6345DC9080E0102492FF1B-->
<CHECKSUM><![CDATA[254195407662840758973998080203970590727]]></CHECKSUM>
<!--10C9DA9D9A6345DC9080E0102492FF1B--></AD_DATASET>
<!--D81C5C810AEF47C690E4F688ABC8AAC8--><AD_DATASET>
diff -r 7aa0c5da0436 -r c105fa00cd66
src-db/database/sourcedata/AD_TEXTINTERFACES.xml
--- a/src-db/database/sourcedata/AD_TEXTINTERFACES.xml Mon Apr 04 11:12:26
2011 +0200
+++ b/src-db/database/sourcedata/AD_TEXTINTERFACES.xml Fri Apr 01 13:52:23
2011 +0200
@@ -22167,6 +22167,17 @@
<!--B35BF36A90874AAB8C56A216554A5537-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--B35BF36A90874AAB8C56A216554A5537--></AD_TEXTINTERFACES>
+<!--B4A2058C3F4544629796A44E9DDEF488--><AD_TEXTINTERFACES>
+<!--B4A2058C3F4544629796A44E9DDEF488-->
<AD_TEXTINTERFACES_ID><![CDATA[B4A2058C3F4544629796A44E9DDEF488]]></AD_TEXTINTERFACES_ID>
+<!--B4A2058C3F4544629796A44E9DDEF488-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--B4A2058C3F4544629796A44E9DDEF488--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--B4A2058C3F4544629796A44E9DDEF488--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--B4A2058C3F4544629796A44E9DDEF488--> <TEXT><![CDATA[PURCHASE
ORDER]]></TEXT>
+<!--B4A2058C3F4544629796A44E9DDEF488-->
<FILENAME><![CDATA[/org/openbravo/erpReports/C_OrderJR.jrxml]]></FILENAME>
+<!--B4A2058C3F4544629796A44E9DDEF488--> <ISUSED><![CDATA[Y]]></ISUSED>
+<!--B4A2058C3F4544629796A44E9DDEF488-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--B4A2058C3F4544629796A44E9DDEF488--></AD_TEXTINTERFACES>
+
<!--B9FE576F39B34B66BAEC1A638B1ADA59--><AD_TEXTINTERFACES>
<!--B9FE576F39B34B66BAEC1A638B1ADA59-->
<AD_TEXTINTERFACES_ID><![CDATA[B9FE576F39B34B66BAEC1A638B1ADA59]]></AD_TEXTINTERFACES_ID>
<!--B9FE576F39B34B66BAEC1A638B1ADA59-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -22684,6 +22695,17 @@
<!--EB55B64BF87742D0BAE1CCF77670887A-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--EB55B64BF87742D0BAE1CCF77670887A--></AD_TEXTINTERFACES>
+<!--EF87B07028F54627A0FBBC5A2B448A8F--><AD_TEXTINTERFACES>
+<!--EF87B07028F54627A0FBBC5A2B448A8F-->
<AD_TEXTINTERFACES_ID><![CDATA[EF87B07028F54627A0FBBC5A2B448A8F]]></AD_TEXTINTERFACES_ID>
+<!--EF87B07028F54627A0FBBC5A2B448A8F-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--EF87B07028F54627A0FBBC5A2B448A8F--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--EF87B07028F54627A0FBBC5A2B448A8F--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--EF87B07028F54627A0FBBC5A2B448A8F--> <TEXT><![CDATA[Purchase Order Report
template]]></TEXT>
+<!--EF87B07028F54627A0FBBC5A2B448A8F-->
<FILENAME><![CDATA[/org/openbravo/erpReports/C_OrderJR.jrxml]]></FILENAME>
+<!--EF87B07028F54627A0FBBC5A2B448A8F--> <ISUSED><![CDATA[Y]]></ISUSED>
+<!--EF87B07028F54627A0FBBC5A2B448A8F-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--EF87B07028F54627A0FBBC5A2B448A8F--></AD_TEXTINTERFACES>
+
<!--F0B3D9CE4C8448518277E20EED9AF403--><AD_TEXTINTERFACES>
<!--F0B3D9CE4C8448518277E20EED9AF403-->
<AD_TEXTINTERFACES_ID><![CDATA[F0B3D9CE4C8448518277E20EED9AF403]]></AD_TEXTINTERFACES_ID>
<!--F0B3D9CE4C8448518277E20EED9AF403-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r 7aa0c5da0436 -r c105fa00cd66
src/org/openbravo/erpReports/C_OrderJR.jrxml
--- a/src/org/openbravo/erpReports/C_OrderJR.jrxml Mon Apr 04 11:12:26
2011 +0200
+++ b/src/org/openbravo/erpReports/C_OrderJR.jrxml Fri Apr 01 13:52:23
2011 +0200
@@ -160,7 +160,7 @@
COALESCE(TO_CHAR(ADDRESS1), '') || CASE WHEN ADDRESS1 IS null THEN '' ELSE
CHR(13) END || COALESCE(TO_CHAR(POSTAL), '') || CASE WHEN POSTAL IS null THEN
'' ELSE CHR(13) END ||
COALESCE(TO_CHAR(C_BPARTNER_LOCATION.PHONE), '') || CASE WHEN
C_BPARTNER_LOCATION.PHONE IS null THEN '' ELSE CHR(13) END ||
COALESCE(TO_CHAR(C_BPARTNER_LOCATION.FAX), '') ||
CASE WHEN C_BPARTNER_LOCATION.FAX IS null THEN '' ELSE CHR(13) END) AS
BP_DATA, AD_ORGINFO.TAXID AS ORG_TAXID, SHOWLOGO, SHOWCOMPANYDATA, HEADERMARGIN,
-AD_ORG.NAME AS ORG_NAME, DELIVERYRULE.NAME AS DELIVERYTERM, PAYMENTTERM.TERM
AS PAYMENTTERM
+AD_ORG.NAME AS ORG_NAME, DELIVERYRULE.NAME AS DELIVERYTERM, PAYMENTTERM.TERM
AS PAYMENTTERM, C_POC_DOCTYPE_TEMPLATE.NAME AS DOC_TYPE
FROM C_BPARTNER_LOCATION left join C_LOCATION L on
C_BPARTNER_LOCATION.C_LOCATION_ID = L.C_LOCATION_ID
left join C_REGION R on L.C_REGION_ID = R.C_REGION_ID,
AD_USER right join C_ORDER on AD_USER.AD_USER_ID = C_ORDER.AD_USER_ID
@@ -206,6 +206,7 @@
<field name="ORG_NAME" class="java.lang.String"/>
<field name="DELIVERYTERM" class="java.lang.String"/>
<field name="PAYMENTTERM" class="java.lang.String"/>
+ <field name="DOC_TYPE" class="java.lang.String"/>
<group name="PrintLarge" isReprintHeaderOnEachPage="true" >
@@ -250,23 +251,6 @@
<band height="255" isSplitAllowed="true" >
<staticText>
<reportElement
- x="0"
- y="6"
- width="206"
- height="37"
- key="staticText-2"/>
- <box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
- <leftPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
- <bottomPen lineWidth="0.0"
lineColor="#000000"/>
- <rightPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
-</box>
- <textElement verticalAlignment="Middle">
- <font size="26"/>
- </textElement>
- <text><![CDATA[SALES ORDER]]></text>
- </staticText>
- <staticText>
- <reportElement
style="Group_Data_Label"
x="0"
y="214"
@@ -405,6 +389,19 @@
</textElement>
<textFieldExpression
class="java.lang.String"><![CDATA[($F{LOCATION}==null ? $F{ORG_NAME} + "\n" +
$F{ORG_TAXID} + "\n" : $F{ORG_NAME} + "\n" + $F{ORG_TAXID} + "\n" +
$F{LOCATION})]]></textFieldExpression>
</textField>
+ <textField isStretchWithOverflow="false"
isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"
hyperlinkTarget="Self" >
+ <reportElement
+ x="0"
+ y="6"
+ width="250"
+ height="37"
+ key="textField-23"/>
+ <box></box>
+ <textElement>
+ <font size="26"/>
+ </textElement>
+ <textFieldExpression
class="java.lang.String"><![CDATA[($F{DOC_TYPE}.equalsIgnoreCase("Purchase
Order Report template")) == true ? "PURCHASE ORDER" : "SALES
ORDER"]]></textFieldExpression>
+ </textField>
</band>
</groupHeader>
<groupFooter>
------------------------------------------------------------------------------
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
