details: /erp/devel/pi/rev/c9abf23b4e2d
changeset: 11978:c9abf23b4e2d
user: Egoitz Castillo <egoitz.castillo <at> openbravo.com>
date: Wed May 04 18:52:32 2011 +0200
summary: Fixed Issue 16829. Copy lines in purchase invoice, incorrect linenum
details: /erp/devel/pi/rev/c37322edb87c
changeset: 11979:c37322edb87c
user: Egoitz Castillo <egoitz.castillo <at> openbravo.com>
date: Wed May 04 18:56:27 2011 +0200
summary: Fixed Issue 16958. Attachnments on Goods movement not allowed
details: /erp/devel/pi/rev/e4d4c0d00dae
changeset: 11980:e4d4c0d00dae
user: Egoitz Castillo <egoitz.castillo <at> openbravo.com>
date: Wed May 04 19:01:58 2011 +0200
summary: Fixed Issue 17001. General Ledger Journal description is cut
diffstat:
src-db/database/sourcedata/AD_TAB.xml | 2 +-
src/org/openbravo/erpCommon/ad_actionButton/CopyFromInvoice.java | 4
++--
src/org/openbravo/erpCommon/ad_actionButton/CopyFromInvoice_data.xsql | 4
++--
src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.jrxml | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diffs (59 lines):
diff -r 5005c48efc28 -r e4d4c0d00dae src-db/database/sourcedata/AD_TAB.xml
--- a/src-db/database/sourcedata/AD_TAB.xml Wed May 04 21:11:46 2011 +0200
+++ b/src-db/database/sourcedata/AD_TAB.xml Wed May 04 19:01:58 2011 +0200
@@ -2588,7 +2588,7 @@
<!--259--> <SEQNO><![CDATA[10]]></SEQNO>
<!--259--> <TABLEVEL><![CDATA[0]]></TABLEVEL>
<!--259--> <ISSINGLEROW><![CDATA[N]]></ISSINGLEROW>
-<!--259--> <ISINFOTAB><![CDATA[Y]]></ISINFOTAB>
+<!--259--> <ISINFOTAB><![CDATA[N]]></ISINFOTAB>
<!--259--> <ISTRANSLATIONTAB><![CDATA[N]]></ISTRANSLATIONTAB>
<!--259--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
<!--259--> <HASTREE><![CDATA[N]]></HASTREE>
diff -r 5005c48efc28 -r e4d4c0d00dae
src/org/openbravo/erpCommon/ad_actionButton/CopyFromInvoice.java
--- a/src/org/openbravo/erpCommon/ad_actionButton/CopyFromInvoice.java Wed May
04 21:11:46 2011 +0200
+++ b/src/org/openbravo/erpCommon/ad_actionButton/CopyFromInvoice.java Wed May
04 19:01:58 2011 +0200
@@ -168,8 +168,8 @@
linenetamt = data[i].linenetamt;
}
CopyFromInvoiceData.insert(conn, this, strSequence, strKey,
dataInvoice[0].adClientId,
- dataInvoice[0].adOrgId, vars.getUser(),
data[i].cInvoicelineId, pricelist,
- priceactual, pricelimit, linenetamt, strCTaxID);
+ dataInvoice[0].adOrgId, vars.getUser(), pricelist,
+ priceactual, pricelimit, linenetamt, strCTaxID,
data[i].cInvoicelineId);
// Copy accounting dimensions
CopyFromInvoiceData.insertAcctDimension(conn, this,
dataInvoice[0].adClientId,
diff -r 5005c48efc28 -r e4d4c0d00dae
src/org/openbravo/erpCommon/ad_actionButton/CopyFromInvoice_data.xsql
--- a/src/org/openbravo/erpCommon/ad_actionButton/CopyFromInvoice_data.xsql
Wed May 04 21:11:46 2011 +0200
+++ b/src/org/openbravo/erpCommon/ad_actionButton/CopyFromInvoice_data.xsql
Wed May 04 19:01:58 2011 +0200
@@ -63,7 +63,7 @@
S_RESOURCEASSIGNMENT_ID, TAXAMT, M_ATTRIBUTESETINSTANCE_ID,
ISDESCRIPTION, QUANTITYORDER, M_PRODUCT_UOM_ID,
PRICESTD)
SELECT ?, ?, ?, ?, 'Y', now(), ?, now(), ?,
- (SELECT COALESCE(MAX(LINE),0)+10 FROM C_InvoiceLine WHERE
C_InvoiceLine_ID = ?), DESCRIPTION, M_PRODUCT_ID,
+ (SELECT COALESCE(MAX(LINE),0)+10 FROM C_InvoiceLine WHERE C_Invoice_ID
= ?), DESCRIPTION, M_PRODUCT_ID,
QTYINVOICED, TO_NUMBER(?), TO_NUMBER(?), TO_NUMBER(?), TO_NUMBER(?),
C_CHARGE_ID, CHARGEAMT, C_UOM_ID, ?,
S_RESOURCEASSIGNMENT_ID, TAXAMT, M_ATTRIBUTESETINSTANCE_ID,
ISDESCRIPTION, QUANTITYORDER, M_PRODUCT_UOM_ID,
PRICESTD
@@ -77,7 +77,7 @@
<Parameter name="adOrgId"/>
<Parameter name="adUserId"/>
<Parameter name="adUserId"/>
- <Parameter name="cInvoicelineId"/>
+ <Parameter name="cInvoiceId"/>
<Parameter name="priceList"/>
<Parameter name="priceActual"/>
<Parameter name="priceLimit"/>
diff -r 5005c48efc28 -r e4d4c0d00dae
src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.jrxml
--- a/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.jrxml
Wed May 04 21:11:46 2011 +0200
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.jrxml
Wed May 04 19:01:58 2011 +0200
@@ -574,7 +574,7 @@
</columnHeader>
<detail>
<band height="16" isSplitAllowed="true" >
- <textField isStretchWithOverflow="false"
isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"
hyperlinkTarget="Self" >
+ <textField isStretchWithOverflow="true"
isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"
hyperlinkTarget="Self" >
<reportElement
x="100"
y="0"
------------------------------------------------------------------------------
WhatsUp Gold - Download Free Network Management Software
The most intuitive, comprehensive, and cost-effective network
management toolset available today. Delivers lowest initial
acquisition cost and overall TCO of any competing solution.
http://p.sf.net/sfu/whatsupgold-sd
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
