details: /erp/devel/main/rev/a3213b55a054
changeset: 7994:a3213b55a054
user: Antonio Moreno <antonio.moreno <at> openbravo.com>
date: Thu Jul 29 13:17:26 2010 +0200
summary: Fixed issue 13921. Improved validation so that the message is clearer
We haven't changed the naming rule used to infer the owner of a database
column. Therefore, a column which starts with EM_dbprefix needs to use a
dbprefix of a _different_ module from the one which owns the table (this makes
sense, as EM means External Module). However, we have changed the message so
that now it warns of this rule in case the column starts with EM_dbprefix and
is missing in the physical model.
details: /erp/devel/main/rev/cd9768088160
changeset: 7995:cd9768088160
user: David Alsasua <david.alsasua <at> openbravo.com>
date: Fri Jul 23 16:45:24 2010 +0200
summary: Fixes issue 13246: AR Invoice indirect should be deleted
details: /erp/devel/main/rev/d56303e65d26
changeset: 7996:d56303e65d26
user: Juan Pablo Aroztegi <juanpablo.aroztegi <at> openbravo.com>
date: Thu Jul 29 16:36:30 2010 +0200
summary: Merge from main, import tags
details: /erp/devel/main/rev/7392a64d7b88
changeset: 7997:7392a64d7b88
user: Juan Pablo Aroztegi <juanpablo.aroztegi <at> openbravo.com>
date: Thu Jul 29 16:37:04 2010 +0200
summary: AD_MODULE: increase version, set dev label
details: /erp/devel/main/rev/eb76ac1b1a84
changeset: 7998:eb76ac1b1a84
user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com>
date: Fri Jul 30 01:27:59 2010 +0200
summary: Fixes bug 0013195: Review search filters
details: /erp/devel/main/rev/3cc59dc273be
changeset: 7999:3cc59dc273be
user: Harikrishnan Raja <harikrishnan.raja <at> openbravo.com>
date: Fri Jul 30 10:15:06 2010 +0530
summary: Fixes Issue 13944: Completed Sales Orders still appear on 'Create
Lines From' and 'Generate Invoices from Orders'
details: /erp/devel/main/rev/a61b8d63c966
changeset: 8000:a61b8d63c966
user: Sivaraman Rajagopal <sivaraman.rajagopal <at> openbravo.com>
date: Fri Jul 30 13:55:17 2010 +0530
summary: Fixes issue 14007: Once a Sales Order of the type 'warehouse order'
is saved but not completed, the form of payment can not be updated anymore
Read Only Logic has been modified in order to resolve the issue
details: /erp/devel/main/rev/c34340ca5222
changeset: 8001:c34340ca5222
user: Sivaraman Rajagopal <sivaraman.rajagopal <at> openbravo.com>
date: Fri Jul 30 15:10:10 2010 +0530
summary: Fixes issue 13677: Organization main missing in Generate shipment
process window
Reference Search Key is removed for the column AD_Org_ID in order to resolve
the issue
details: /erp/devel/main/rev/a4f478c51a8c
changeset: 8002:a4f478c51a8c
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Fri Jul 30 19:32:14 2010 +0200
summary: CI: promote changesets from pi to main
details: /erp/devel/main/rev/a2a477578cf4
changeset: 8003:a2a477578cf4
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Fri Jul 30 19:32:16 2010 +0200
summary: CI: update AD_MODULE - Core version and label
diffstat:
.hgsigs | 1
+
.hgtags | 1
+
referencedata/standard/Initial_Setup.xml | 58
+---------
src-db/database/sourcedata/AD_COLUMN.xml | 14
+-
src-db/database/sourcedata/AD_MODULE.xml | 4
+-
src-db/database/sourcedata/AD_PROCESS_PARA.xml | 4
+-
src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Invoice_data.xsql | 5
+-
src/org/openbravo/erpCommon/ad_forms/GenerateInvoicesmanual_data.xsql | 7
+-
src/org/openbravo/service/system/DatabaseValidator.java | 7
+-
9 files changed, 27 insertions(+), 74 deletions(-)
diffs (275 lines):
diff -r 5ef94bee291c -r a2a477578cf4 .hgsigs
--- a/.hgsigs Thu Jul 29 12:34:09 2010 +0200
+++ b/.hgsigs Fri Jul 30 19:32:16 2010 +0200
@@ -20,3 +20,4 @@
9f343a616b2f998c3867661467de5dd9daeb7112 0
iEYEABECAAYFAkvq7PIACgkQCX/oGf+2qkMcHQCg3eHGql848ExhA5oOgtqfjIE3toUAn0GiWHkItn3YxPFitn8+e0IfOEaj
9b4bbe8362f54f7212653fddf5bd053183a7ffda 0
iEYEABECAAYFAkv8vDgACgkQCX/oGf+2qkPC3ACfURoh78/OY95XuFkAKNfaLQQzuCsAoNoNLdSqMVYuAJMAI2mimGZ5BXaw
7fe932c5c015da84a972d6945dd0451366bbf325 0
iEYEABECAAYFAkwodmcACgkQCX/oGf+2qkM4jQCgq2n4X0Tzi8EcGqNLhtzjOJ/1YcgAn3Fh9aZRpXmM2zYmMwuecn4UR5tt
+618363224a381737439e0bd4461e2d36c4fd986e 0
iEYEABECAAYFAkxFkHoACgkQCX/oGf+2qkP7DQCeK9qCv3jETpO5iM89PV2bJYmpErMAoO/H2QyeKKZjublcgFmH7g1tEomB
diff -r 5ef94bee291c -r a2a477578cf4 .hgtags
--- a/.hgtags Thu Jul 29 12:34:09 2010 +0200
+++ b/.hgtags Fri Jul 30 19:32:16 2010 +0200
@@ -30,3 +30,4 @@
41915c2f5ec639dadab8e797a1e5f1e0922fa029 2.50MP17
f7b9678ebb10f1fb0963b7e3cc4724aa6aeca565 2.50MP18
34eed7b386965b19e191fbfe03195588cdc75254 2.50MP19
+99ff33f6588973f7e738b6afd47ad44f3ac08d20 2.50MP20
diff -r 5ef94bee291c -r a2a477578cf4 referencedata/standard/Initial_Setup.xml
--- a/referencedata/standard/Initial_Setup.xml Thu Jul 29 12:34:09 2010 +0200
+++ b/referencedata/standard/Initial_Setup.xml Fri Jul 30 19:32:16 2010 +0200
@@ -9,15 +9,6 @@
<default>true</default>
<language id="192" entity-name="ADLanguage" identifier="English (USA)"/>
</EmailTemplate>
- <EmailTemplate id="878ECF0D5A268C7BE040007F010129BA" identifier="AR Invoice
Indirect Report template - ">
- <id>878ECF0D5A268C7BE040007F010129BA</id>
- <active>true</active>
- <pocDocumentType id="29F7240568EC43E583E157911773C3A5"
entity-name="DocumentTemplate" identifier="AR Invoice Indirect Report
template"/>
- <subject xsi:nil="true"/>
- <body xsi:nil="true"/>
- <default>true</default>
- <language id="192" entity-name="ADLanguage" identifier="English (USA)"/>
- </EmailTemplate>
<EmailTemplate id="878ECF0D5A298C7BE040007F010129BA" identifier="AR Credit
Memo Report template - ">
<id>878ECF0D5A298C7BE040007F010129BA</id>
<active>true</active>
@@ -557,7 +548,7 @@
<salesTransaction>true</salesTransaction>
<sOSubType>WR</sOSubType>
<documentTypeForShipment id="F8CC92C7234644DEAD9F63174F45B2BF"
entity-name="DocumentType" identifier="MM Shipment Indirect"/>
- <documentTypeForInvoice id="B896128A9164438A9B85CC8821FC7162"
entity-name="DocumentType" identifier="AR Invoice Indirect"/>
+ <documentTypeForInvoice id="40EE9B1CD3B345FABEFDA62B407B407F"
entity-name="DocumentType" identifier="AR Invoice Indirect"/>
<sequencedDocument>true</sequencedDocument>
<documentSequence id="FFB42B38D6A34634B534AB499B13644C"
entity-name="ADSequence" identifier="POS Order"/>
<gLCategory id="745A2B441A2644DF934D1B1E462292E9"
entity-name="FinancialMgmtGLCategory" identifier="None"/>
@@ -855,28 +846,6 @@
<documentCancelled xsi:nil="true"/>
<expense>false</expense>
</DocumentType>
- <DocumentType id="B896128A9164438A9B85CC8821FC7162" identifier="AR Invoice
Indirect">
- <id>B896128A9164438A9B85CC8821FC7162</id>
- <active>true</active>
- <name>AR Invoice Indirect</name>
- <printText>Invoice Indirect.</printText>
- <description xsi:nil="true"/>
- <documentCategory>ARI</documentCategory>
- <salesTransaction>true</salesTransaction>
- <sOSubType xsi:nil="true"/>
- <documentTypeForShipment id="0" entity-name="DocumentType" identifier="**
New **"/>
- <documentTypeForInvoice id="0" entity-name="DocumentType" identifier="**
New **"/>
- <sequencedDocument>true</sequencedDocument>
- <documentSequence id="4ED4DE47C4F44E578747E0FA81E29885"
entity-name="ADSequence" identifier="AR Invoice Indirect"/>
- <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>
- </DocumentType>
<DocumentType id="B968C737ED3E4C808E425A72CC445DFE" identifier="Manual
Settlement">
<id>B968C737ED3E4C808E425A72CC445DFE</id>
<active>true</active>
@@ -1111,22 +1080,6 @@
<suffix xsi:nil="true"/>
<restartSequenceEveryYear>false</restartSequenceEveryYear>
</ADSequence>
- <ADSequence id="4ED4DE47C4F44E578747E0FA81E29885" identifier="AR Invoice
Indirect">
- <id>4ED4DE47C4F44E578747E0FA81E29885</id>
- <active>true</active>
- <name>AR Invoice Indirect</name>
- <description xsi:nil="true"/>
- <valueFormat xsi:nil="true"/>
- <autoNumbering>true</autoNumbering>
- <incrementBy>1</incrementBy>
- <startingNo>200000</startingNo>
- <nextAssignedNumber>200000</nextAssignedNumber>
- <currentNextSystem>20000</currentNextSystem>
- <usedForRecordID>false</usedForRecordID>
- <prefix xsi:nil="true"/>
- <suffix xsi:nil="true"/>
- <restartSequenceEveryYear>false</restartSequenceEveryYear>
- </ADSequence>
<ADSequence id="6D3C7477332F47CD8A0F6A5C4805EBD4" identifier="Prepay Order">
<id>6D3C7477332F47CD8A0F6A5C4805EBD4</id>
<active>true</active>
@@ -1513,15 +1466,6 @@
<reportFilename>Sales ord...@our_ref@</reportFilename>
<templateFilename>C_OrderJR.jrxml</templateFilename>
</DocumentTemplate>
- <DocumentTemplate id="29F7240568EC43E583E157911773C3A5" identifier="AR
Invoice Indirect Report template">
- <name>AR Invoice Indirect Report template</name>
- <id>29F7240568EC43E583E157911773C3A5</id>
- <active>true</active>
- <documentType id="B896128A9164438A9B85CC8821FC7162"
entity-name="DocumentType" identifier="AR Invoice Indirect"/>
- <templateLocation>@basedesign@/org/openbravo/erpReports</templateLocation>
- <reportFilename>Sales invoi...@our_ref@</reportFilename>
- <templateFilename>RptC_Invoice.jrxml</templateFilename>
- </DocumentTemplate>
<DocumentTemplate id="4F23CD7CD64D468EA4753C0C7B09FD53" identifier="Return
Material Report template">
<name>Return Material Report template</name>
<id>4F23CD7CD64D468EA4753C0C7B09FD53</id>
diff -r 5ef94bee291c -r a2a477578cf4 src-db/database/sourcedata/AD_COLUMN.xml
--- a/src-db/database/sourcedata/AD_COLUMN.xml Thu Jul 29 12:34:09 2010 +0200
+++ b/src-db/database/sourcedata/AD_COLUMN.xml Fri Jul 30 19:32:16 2010 +0200
@@ -67812,7 +67812,7 @@
<!--4019--> <ISPARENT><![CDATA[N]]></ISPARENT>
<!--4019--> <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
<!--4019--> <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
-<!--4019--> <READONLYLOGIC><![cda...@ordertype@='WP' |
@proces...@='Y']]></READONLYLOGIC>
+<!--4019--> <READONLYLOGIC><![cda...@processed@='Y']]></READONLYLOGIC>
<!--4019--> <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
<!--4019--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
<!--4019--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -263631,7 +263631,7 @@
<!--112E72136642484B95A9CD0EB79ED7F3--> <SEQNO><![CDATA[110]]></SEQNO>
<!--112E72136642484B95A9CD0EB79ED7F3-->
<ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
<!--112E72136642484B95A9CD0EB79ED7F3-->
<ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--112E72136642484B95A9CD0EB79ED7F3-->
<ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--112E72136642484B95A9CD0EB79ED7F3-->
<ISSELECTIONCOLUMN><![CDATA[Y]]></ISSELECTIONCOLUMN>
<!--112E72136642484B95A9CD0EB79ED7F3-->
<AD_ELEMENT_ID><![CDATA[187]]></AD_ELEMENT_ID>
<!--112E72136642484B95A9CD0EB79ED7F3-->
<ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
<!--112E72136642484B95A9CD0EB79ED7F3-->
<ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
@@ -264846,7 +264846,7 @@
<!--1EAEE8AF503C4348B565DB81325665D2--> <SEQNO><![CDATA[150]]></SEQNO>
<!--1EAEE8AF503C4348B565DB81325665D2-->
<ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
<!--1EAEE8AF503C4348B565DB81325665D2-->
<ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--1EAEE8AF503C4348B565DB81325665D2-->
<ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--1EAEE8AF503C4348B565DB81325665D2-->
<ISSELECTIONCOLUMN><![CDATA[Y]]></ISSELECTIONCOLUMN>
<!--1EAEE8AF503C4348B565DB81325665D2-->
<AD_ELEMENT_ID><![CDATA[7890366979712CEFE040007F01013334]]></AD_ELEMENT_ID>
<!--1EAEE8AF503C4348B565DB81325665D2-->
<ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
<!--1EAEE8AF503C4348B565DB81325665D2-->
<ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
@@ -292023,7 +292023,7 @@
<!--7DC34559B410B45BE040007F0100784A--> <SEQNO><![CDATA[250]]></SEQNO>
<!--7DC34559B410B45BE040007F0100784A-->
<ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
<!--7DC34559B410B45BE040007F0100784A-->
<ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--7DC34559B410B45BE040007F0100784A-->
<ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--7DC34559B410B45BE040007F0100784A-->
<ISSELECTIONCOLUMN><![CDATA[Y]]></ISSELECTIONCOLUMN>
<!--7DC34559B410B45BE040007F0100784A-->
<AD_ELEMENT_ID><![CDATA[7DC34559B411B45BE040007F0100784A]]></AD_ELEMENT_ID>
<!--7DC34559B410B45BE040007F0100784A-->
<ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
<!--7DC34559B410B45BE040007F0100784A-->
<ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
@@ -305492,7 +305492,7 @@
<!--8B042E0FE87E44F68B30A31E67C1E158--> <SEQNO><![CDATA[120]]></SEQNO>
<!--8B042E0FE87E44F68B30A31E67C1E158-->
<ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
<!--8B042E0FE87E44F68B30A31E67C1E158-->
<ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--8B042E0FE87E44F68B30A31E67C1E158-->
<ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--8B042E0FE87E44F68B30A31E67C1E158-->
<ISSELECTIONCOLUMN><![CDATA[Y]]></ISSELECTIONCOLUMN>
<!--8B042E0FE87E44F68B30A31E67C1E158-->
<AD_ELEMENT_ID><![CDATA[7891269C840C655DE040007F010155CE]]></AD_ELEMENT_ID>
<!--8B042E0FE87E44F68B30A31E67C1E158-->
<ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
<!--8B042E0FE87E44F68B30A31E67C1E158-->
<ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
@@ -307301,7 +307301,7 @@
<!--AB42E56233264B32B435742B45F5B154--> <SEQNO><![CDATA[180]]></SEQNO>
<!--AB42E56233264B32B435742B45F5B154-->
<ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
<!--AB42E56233264B32B435742B45F5B154-->
<ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--AB42E56233264B32B435742B45F5B154-->
<ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--AB42E56233264B32B435742B45F5B154-->
<ISSELECTIONCOLUMN><![CDATA[Y]]></ISSELECTIONCOLUMN>
<!--AB42E56233264B32B435742B45F5B154-->
<AD_ELEMENT_ID><![CDATA[290]]></AD_ELEMENT_ID>
<!--AB42E56233264B32B435742B45F5B154-->
<ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
<!--AB42E56233264B32B435742B45F5B154-->
<ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
@@ -309187,7 +309187,7 @@
<!--E9A4CCD256404FDDA9EDDC07F9FCAE4B--> <SEQNO><![CDATA[130]]></SEQNO>
<!--E9A4CCD256404FDDA9EDDC07F9FCAE4B-->
<ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
<!--E9A4CCD256404FDDA9EDDC07F9FCAE4B-->
<ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--E9A4CCD256404FDDA9EDDC07F9FCAE4B-->
<ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--E9A4CCD256404FDDA9EDDC07F9FCAE4B-->
<ISSELECTIONCOLUMN><![CDATA[Y]]></ISSELECTIONCOLUMN>
<!--E9A4CCD256404FDDA9EDDC07F9FCAE4B-->
<AD_ELEMENT_ID><![CDATA[7891269C83E6655DE040007F010155CE]]></AD_ELEMENT_ID>
<!--E9A4CCD256404FDDA9EDDC07F9FCAE4B-->
<ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
<!--E9A4CCD256404FDDA9EDDC07F9FCAE4B-->
<ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
diff -r 5ef94bee291c -r a2a477578cf4 src-db/database/sourcedata/AD_MODULE.xml
--- a/src-db/database/sourcedata/AD_MODULE.xml Thu Jul 29 12:34:09 2010 +0200
+++ b/src-db/database/sourcedata/AD_MODULE.xml Fri Jul 30 19:32:16 2010 +0200
@@ -6,7 +6,7 @@
<!--0--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--0--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--0--> <NAME><![CDATA[core]]></NAME>
-<!--0--> <VERSION><![CDATA[2.50.17732]]></VERSION>
+<!--0--> <VERSION><![CDATA[2.50.18002]]></VERSION>
<!--0--> <DESCRIPTION><![CDATA[Core module is the base one]]></DESCRIPTION>
<!--0--> <HELP><![CDATA[Core module is the base one, all developments in core
are included as part of the standard Openbravo ERP.]]></HELP>
<!--0--> <URL><![CDATA[www.openbravo.com]]></URL>
@@ -22,7 +22,7 @@
<!--0--> <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
<!--0--> <HASREFERENCEDATA><![CDATA[Y]]></HASREFERENCEDATA>
<!--0--> <REFERENCEDATAINFO><![CDATA[Standard document types for orders,
invoices, etc. and settings]]></REFERENCEDATAINFO>
-<!--0--> <VERSION_LABEL><![CDATA[dev]]></VERSION_LABEL>
+<!--0--> <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
<!--0--> <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
<!--0--></AD_MODULE>
diff -r 5ef94bee291c -r a2a477578cf4
src-db/database/sourcedata/AD_PROCESS_PARA.xml
--- a/src-db/database/sourcedata/AD_PROCESS_PARA.xml Thu Jul 29 12:34:09
2010 +0200
+++ b/src-db/database/sourcedata/AD_PROCESS_PARA.xml Fri Jul 30 19:32:16
2010 +0200
@@ -445,8 +445,8 @@
<!--152--> <HELP><![CDATA[An organization is a unit of your client or legal
entity - examples are store, department. You can share data between
organizations.]]></HELP>
<!--152--> <AD_PROCESS_ID><![CDATA[118]]></AD_PROCESS_ID>
<!--152--> <SEQNO><![CDATA[10]]></SEQNO>
-<!--152--> <AD_REFERENCE_ID><![CDATA[18]]></AD_REFERENCE_ID>
-<!--152--> <AD_REFERENCE_VALUE_ID><![CDATA[130]]></AD_REFERENCE_VALUE_ID>
+<!--152--> <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--152--> <AD_VAL_RULE_ID><![CDATA[130]]></AD_VAL_RULE_ID>
<!--152--> <COLUMNNAME><![CDATA[AD_Org_ID]]></COLUMNNAME>
<!--152--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
<!--152--> <FIELDLENGTH><![CDATA[0]]></FIELDLENGTH>
diff -r 5ef94bee291c -r a2a477578cf4
src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Invoice_data.xsql
--- a/src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Invoice_data.xsql
Thu Jul 29 12:34:09 2010 +0200
+++ b/src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Invoice_data.xsql
Fri Jul 30 19:32:16 2010 +0200
@@ -114,12 +114,13 @@
<Sql>
<![CDATA[
SELECT o.C_ORDER_ID as ID, Ad_Column_Identifier(to_char('C_Order'),
to_char(o.c_order_id), to_char(?)) AS NAME
- FROM C_INVOICE_CANDIDATE_V ic, C_ORDER o
+ FROM C_INVOICE_CANDIDATE_V ic, C_ORDER o
WHERE o.C_ORDER_ID = ic.C_ORDER_ID
AND ic.AD_Client_ID IN ('1')
AND ic.AD_Org_ID IN ('1')
AND ic.C_BPartner_ID = ?
- AND ((ic.term = 'D' AND ic.qtydelivered <>0) OR (ic.term = 'I') OR
(ic.term <> 'N' AND (ic.term IN ('O','S') AND (ic.qtyordered = ic.qtydelivered)
)) )
+ AND o.C_Order_Id = ic.C_Order_Id
+ AND ((ic.term = 'D' AND ic.qtydelivered <>0) OR (ic.term = 'I' AND
(SELECT SUM(ol.QTYORDERED)-SUM(ol.QTYINVOICED) FROM C_ORDERLINE ol WHERE
ol.C_ORDER_ID = o.C_ORDER_ID) <> 0) OR (ic.term <> 'N' AND (ic.term IN
('O','S') AND (ic.qtyordered = ic.qtydelivered) )) )
GROUP BY o.C_ORDER_ID, o.DocumentNo, o.DateOrdered, o.GrandTotal
ORDER BY NAME
]]>
diff -r 5ef94bee291c -r a2a477578cf4
src/org/openbravo/erpCommon/ad_forms/GenerateInvoicesmanual_data.xsql
--- a/src/org/openbravo/erpCommon/ad_forms/GenerateInvoicesmanual_data.xsql
Thu Jul 29 12:34:09 2010 +0200
+++ b/src/org/openbravo/erpCommon/ad_forms/GenerateInvoicesmanual_data.xsql
Fri Jul 30 19:32:16 2010 +0200
@@ -28,16 +28,17 @@
<SqlMethodComment></SqlMethodComment>
<Sql>
<![CDATA[
- SELECT C_Order_ID, o.Name as adorgname, COALESCE(dttrl.Name, dt.Name) as
cdoctypename, DocumentNo, bp.Name as cbpartnername, DateOrdered,
+ 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
- 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=?,
+ 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
AND ic.C_BPartner_ID=bp.C_BPartner_ID
AND ic.C_DocType_ID=dt.C_DocType_ID
AND l.value = ic.term
- AND ic.term <> 'N'
+ AND ord.C_ORDER_ID=ic.C_ORDER_ID
+ AND ((ic.term = 'D' AND ic.qtydelivered <>0) OR (ic.term = 'I' AND
(SELECT SUM(ol.QTYORDERED)-SUM(ol.QTYINVOICED) FROM C_ORDERLINE ol WHERE
ol.C_ORDER_ID = ord.C_ORDER_ID) <> 0) OR (ic.term <> 'N' AND (ic.term IN
('O','S') AND (ic.qtyordered = ic.qtydelivered) )) )
AND AD_Reference_ID='150'
AND ic.ad_client_id in ('1')
AND ic.ad_org_id in ('1')
diff -r 5ef94bee291c -r a2a477578cf4
src/org/openbravo/service/system/DatabaseValidator.java
--- a/src/org/openbravo/service/system/DatabaseValidator.java Thu Jul 29
12:34:09 2010 +0200
+++ b/src/org/openbravo/service/system/DatabaseValidator.java Fri Jul 30
19:32:16 2010 +0200
@@ -385,9 +385,14 @@
final org.apache.ddlutils.model.Column dbColumn =
dbColumnsByName.get(column
.getDBColumnName().toUpperCase());
if (dbColumn == null) {
+ String message = "";
+ if (column.getDBColumnName().substring(0, 3).equalsIgnoreCase("EM_")) {
+ message = " The problem could also be that the column name has a
dbprefix of a non existant module or that it starts with the dbprefix of the
module which owns the table. In this second case, the column doesn't need the
'EM_DBPREFIX' prefix, you can use the name you want.";
+ }
result.addError(SystemValidationResult.SystemValidationType.NOT_EXIST_IN_DB,
"Column "
+ adTable.getDBTableName() + "." + column.getDBColumnName()
- + " defined in the Application Dictionary but not present in the
database.");
+ + " defined in the Application Dictionary but not present in the
database." + message);
+
} else {
checkDataType(column, dbColumn, result, dbTable);
------------------------------------------------------------------------------
The Palm PDK Hot Apps Program offers developers who use the
Plug-In Development Kit to bring their C/C++ apps to Palm for a share
of $1 Million in cash or HP Products. Visit us here for more details:
http://p.sf.net/sfu/dev2dev-palm
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
