details: /erp/devel/pi/rev/f1d8412beedc
changeset: 11445:f1d8412beedc
user: Ioritz Cia <ioritz.cia <at> openbravo.com>
date: Fri Apr 01 12:18:33 2011 +0200
summary: Fixes issue 16175: According to law, Reversed Invoices should follow
its own DocumentSequence.
details: /erp/devel/pi/rev/78fb61ffcae7
changeset: 11446:78fb61ffcae7
user: Ioritz Cia <ioritz.cia <at> openbravo.com>
date: Mon Apr 04 09:52:09 2011 +0200
summary: Fixes issue 15658: In purchase order report, the taxes are not
displayed.
diffstat:
referencedata/standard/Initial_Setup.xml | 76 ++++++++++++++++++++++-
src-db/database/sourcedata/AD_TEXTINTERFACES.xml | 2 +-
src/org/openbravo/erpReports/C_OrderJR.jrxml | 33 ++++-----
src/org/openbravo/erpReports/C_OrderLinesJR.jrxml | 10 +-
4 files changed, 94 insertions(+), 27 deletions(-)
diffs (252 lines):
diff -r 0d9752224f7a -r 78fb61ffcae7 referencedata/standard/Initial_Setup.xml
--- a/referencedata/standard/Initial_Setup.xml Mon Apr 04 11:19:19 2011 +0200
+++ b/referencedata/standard/Initial_Setup.xml Mon Apr 04 09:52:09 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 0d9752224f7a -r 78fb61ffcae7
src-db/database/sourcedata/AD_TEXTINTERFACES.xml
--- a/src-db/database/sourcedata/AD_TEXTINTERFACES.xml Mon Apr 04 11:19:19
2011 +0200
+++ b/src-db/database/sourcedata/AD_TEXTINTERFACES.xml Mon Apr 04 09:52:09
2011 +0200
@@ -5257,7 +5257,7 @@
<!--805937--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--805937--> <TEXT><![CDATA[Not invoiced]]></TEXT>
<!--805937-->
<FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/GenerateInvoicesmanual.html]]></FILENAME>
-<!--805937--> <ISUSED><![CDATA[N]]></ISUSED>
+<!--805937--> <ISUSED><![CDATA[Y]]></ISUSED>
<!--805937--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--805937--></AD_TEXTINTERFACES>
diff -r 0d9752224f7a -r 78fb61ffcae7
src/org/openbravo/erpReports/C_OrderJR.jrxml
--- a/src/org/openbravo/erpReports/C_OrderJR.jrxml Mon Apr 04 11:19:19
2011 +0200
+++ b/src/org/openbravo/erpReports/C_OrderJR.jrxml Mon Apr 04 09:52:09
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>
diff -r 0d9752224f7a -r 78fb61ffcae7
src/org/openbravo/erpReports/C_OrderLinesJR.jrxml
--- a/src/org/openbravo/erpReports/C_OrderLinesJR.jrxml Mon Apr 04 11:19:19
2011 +0200
+++ b/src/org/openbravo/erpReports/C_OrderLinesJR.jrxml Mon Apr 04 09:52:09
2011 +0200
@@ -366,7 +366,7 @@
<bottomPen lineWidth="0.0"
lineColor="#000000"/>
<rightPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
</box>
- </frame>
<textField isStretchWithOverflow="false" pattern="" isBlankWhenNull="false"
evaluationTime="Now" hyperlinkType="None" hyperlinkTarget="Self" >
+ </frame>
<textField isStretchWithOverflow="false" pattern="" isBlankWhenNull="true"
evaluationTime="Now" hyperlinkType="None" hyperlinkTarget="Self" >
<reportElement
style="default"
x="235"
@@ -423,7 +423,7 @@
</textElement>
<textFieldExpression
class="java.lang.String"><![CDATA[$F{PRODUCT_NAME}]]></textFieldExpression>
</textField>
- <textField isStretchWithOverflow="false"
pattern="" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"
hyperlinkTarget="Self" >
+ <textField isStretchWithOverflow="false"
pattern="" isBlankWhenNull="true" evaluationTime="Now" hyperlinkType="None"
hyperlinkTarget="Self" >
<reportElement
style="default"
x="290"
@@ -442,7 +442,7 @@
</textElement>
<textFieldExpression
class="java.lang.String"><![CDATA[($F{PRICEACTUAL}!=null)?$P{NUMBERFORMAT}.format($F{PRICEACTUAL}).toString():new
String(" ")]]></textFieldExpression>
</textField>
- <textField isStretchWithOverflow="false"
pattern="" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"
hyperlinkTarget="Self" >
+ <textField isStretchWithOverflow="false"
pattern="" isBlankWhenNull="true" evaluationTime="Now" hyperlinkType="None"
hyperlinkTarget="Self" >
<reportElement
style="default"
x="355"
@@ -461,7 +461,7 @@
</textElement>
<textFieldExpression
class="java.lang.String"><![CDATA[($F{BASE}!=null)?$P{NUMBERFORMAT}.format($F{BASE}).toString()
:new String(" ")]]></textFieldExpression>
</textField>
- <textField isStretchWithOverflow="false"
pattern="" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"
hyperlinkTarget="Self" >
+ <textField isStretchWithOverflow="false"
pattern="" isBlankWhenNull="true" evaluationTime="Now" hyperlinkType="None"
hyperlinkTarget="Self" >
<reportElement
style="default"
x="415"
@@ -550,7 +550,7 @@
stretchType="RelativeToBandHeight"/>
<graphicElement
stretchType="RelativeToBandHeight"/>
</line>
- <textField isStretchWithOverflow="false"
isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"
hyperlinkTarget="Self" >
+ <textField isStretchWithOverflow="false"
isBlankWhenNull="true" evaluationTime="Now" hyperlinkType="None"
hyperlinkTarget="Self" >
<reportElement
style="default"
x="1"
------------------------------------------------------------------------------
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
