details: /erp/stable/2.50/rev/54219a618db1
changeset: 9552:54219a618db1
user: Víctor Martínez Romanos <victor.martinez <at> openbravo.com>
date: Wed Jun 29 10:58:05 2011 +0200
summary: Issue 17802: Void Payments in Awaiting Execution status (Core)
When a payment is in awaiting execution status, the user should be able to void
it.
In this case the details related to invoices or orders should be canceled.
The next time the user adds a payment to an invoice or an order, the suggested
amount
will be all the pending amount to be paid, without taking into account the
previously canceled details.
details: /erp/stable/2.50/rev/06ce8d957df5
changeset: 9553:06ce8d957df5
user: Víctor Martínez Romanos <victor.martinez <at> openbravo.com>
date: Mon Jul 04 10:58:39 2011 +0200
summary: merge
diffstat:
.hgsigs
| 1 +
.hgtags
| 1 +
src-db/database/model/functions/AD_SYNCHRONIZE.xml
| 28 +++-
src-db/database/model/tables/FIN_PAYMENT_SCHEDULEDETAIL.xml
| 5 +
src-db/database/model/views/FIN_PAYMENT_DETAIL_V.xml
| 2 +-
src-db/database/sourcedata/AD_COLUMN.xml
| 64 ++++++++++
src-db/database/sourcedata/AD_ELEMENT.xml
| 11 +
src-db/database/sourcedata/AD_FIELD.xml
| 50 +++++++
src-db/database/sourcedata/AD_MODULE.xml
| 4 +-
src-db/database/sourcedata/AD_REF_LIST.xml
| 23 +++
src/org/openbravo/erpCommon/ad_forms/MaturityLevel.java
| 2 +-
src/org/openbravo/erpCommon/ad_forms/ModuleManagement_InstallP1.html
| 6 +-
src/org/openbravo/erpCommon/ad_process/ImportBudget.java
| 9 +-
src/org/openbravo/erpCommon/ad_process/ImportBudget_data.xsql
| 31 ++++
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesJR.java
| 16 ++-
src/org/openbravo/erpCommon/ad_reports/ReportMaterialDimensionalAnalysesFilterJR.html
| 10 +-
src/org/openbravo/erpCommon/ad_reports/ReportMaterialDimensionalAnalysesJR.java
| 17 ++-
src/org/openbravo/erpCommon/businessUtility/COAUtility.java
| 10 +-
src/org/openbravo/erpCommon/businessUtility/InitialSetupUtility.java
| 4 +-
src/org/openbravo/erpCommon/modules/ModuleBox.srpt
| 4 +-
20 files changed, 266 insertions(+), 32 deletions(-)
diffs (truncated from 605 to 300 lines):
diff -r 5d3ac3ba6234 -r 06ce8d957df5 .hgsigs
--- a/.hgsigs Tue Jun 28 10:11:43 2011 +0200
+++ b/.hgsigs Mon Jul 04 10:58:39 2011 +0200
@@ -35,3 +35,4 @@
e6f5f1263cc3010c106d98d52567c9cf122c6b19 0
iEYEABECAAYFAk22pxAACgkQCX/oGf+2qkNWWACglj41gaAYb95rgGFdHP6rK/23xIkAnRLZeA6Bfv+fwxwyphpew1CrBTYp
8c925d63b87469a41eed771bafb1cea6c5e58e0e 0
iEYEABECAAYFAk2+4GQACgkQCX/oGf+2qkN+HQCg+yISqbY8wQ+XniKkfARy3Hbarw0AoNcwR9ivJWABVUC7i4r9trOBA9sU
2cfa03023503ef72a8c4838cdb763e2cbd707893 0
iEYEABECAAYFAk3c2n4ACgkQCX/oGf+2qkO6GACg7qrg2WS8mGIH5hebESW1aoOmHMcAoP7wTmjIzUxn7w3ZRihDuh5xQLzK
+9b6869b8aa4b3b9dbe9d6a855f0e491e793cbf65 0
iEYEABECAAYFAk4JrfQACgkQCX/oGf+2qkOXNgCgjKVRMwPIH8rNg+RhUOfOIVeXVqAAoPrpGfR5GWFTQYdS1GLiKHzwrast
diff -r 5d3ac3ba6234 -r 06ce8d957df5 .hgtags
--- a/.hgtags Tue Jun 28 10:11:43 2011 +0200
+++ b/.hgtags Mon Jul 04 10:58:39 2011 +0200
@@ -46,3 +46,4 @@
2cd4bac992f78c0e44909842c5b1c1e189ce77df 2.50MP28EU1
75cd97dc706ca9edb3452e19c5708c8a16bfeb18 2.50MP29
d467781fb9a6174eece3684b52c186bbf0c2651e 2.50MP30
+845811ab032b0e0039533be91c1e31f33d848364 2.50MP31
diff -r 5d3ac3ba6234 -r 06ce8d957df5
src-db/database/model/functions/AD_SYNCHRONIZE.xml
--- a/src-db/database/model/functions/AD_SYNCHRONIZE.xml Tue Jun 28
10:11:43 2011 +0200
+++ b/src-db/database/model/functions/AD_SYNCHRONIZE.xml Mon Jul 04
10:58:39 2011 +0200
@@ -634,19 +634,25 @@
DBMS_OUTPUT.PUT_LINE('Synchronize PO Field Translations') ;
UPDATE AD_FIELD_TRL
SET NAME=
- (SELECT e.PO_Name
+ (SELECT (CASE WHEN e.PO_Name='' THEN e.Name
+ ELSE COALESCE(e.PO_Name, e.Name)
+ END)
FROM AD_ELEMENT_TRL e, AD_COLUMN c, AD_FIELD f
WHERE e.AD_LANGUAGE=AD_FIELD_TRL.AD_LANGUAGE AND
e.AD_Element_ID=c.AD_Element_ID
AND c.AD_Column_ID=f.AD_Column_ID AND
f.AD_Field_ID=AD_FIELD_TRL.AD_Field_ID
)
, Description=
- (SELECT e.PO_Description
+ (SELECT (CASE WHEN e.PO_Description='' THEN e.Description
+ ELSE COALESCE(e.PO_Description, e.Description)
+ END)
FROM AD_ELEMENT_TRL e, AD_COLUMN c, AD_FIELD f
WHERE e.AD_LANGUAGE=AD_FIELD_TRL.AD_LANGUAGE AND
e.AD_Element_ID=c.AD_Element_ID
AND c.AD_Column_ID=f.AD_Column_ID AND
f.AD_Field_ID=AD_FIELD_TRL.AD_Field_ID
)
, Help=
- (SELECT e.PO_Help
+ (SELECT (CASE WHEN e.PO_Help='' THEN e.Help
+ ELSE COALESCE(e.PO_Help, e.Help)
+ END)
FROM AD_ELEMENT_TRL e, AD_COLUMN c, AD_FIELD f
WHERE e.AD_LANGUAGE=AD_FIELD_TRL.AD_LANGUAGE AND
e.AD_Element_ID=c.AD_Element_ID
AND c.AD_Column_ID=f.AD_Column_ID AND
f.AD_Field_ID=AD_FIELD_TRL.AD_Field_ID
@@ -668,7 +674,7 @@
AND (M.ISINDEVELOPMENT='Y' OR v_TemplateInDev ='Y')
AND M.AD_LANGUAGE != E.AD_LANGUAGE
AND(AD_FIELD_TRL.NAME<>e.PO_Name OR
COALESCE(TO_CHAR(AD_FIELD_TRL.Description), '
')<>COALESCE(TO_CHAR(e.PO_Description), ' ')
- OR COALESCE(TO_CHAR(AD_FIELD_TRL.Help), '
')<>COALESCE(TO_CHAR(e.PO_Help), ' ')) AND (e.PO_Name IS NOT NULL AND e.PO_Name
<> '')
+ OR COALESCE(TO_CHAR(AD_FIELD_TRL.Help), '
')<>COALESCE(TO_CHAR(e.PO_Help), ' '))
)
AND EXISTS
(SELECT *
@@ -681,19 +687,25 @@
--Translation from non-trl table
UPDATE AD_FIELD_TRL
SET NAME=
- (SELECT e.PO_Name
+ (SELECT (CASE WHEN e.PO_Name='' THEN e.Name
+ ELSE COALESCE(e.PO_Name, e.Name)
+ END)
FROM AD_ELEMENT e, AD_COLUMN c, AD_FIELD f
WHERE e.AD_Element_ID=c.AD_Element_ID
AND c.AD_Column_ID=f.AD_Column_ID AND
f.AD_Field_ID=AD_FIELD_TRL.AD_Field_ID
)
, Description=
- (SELECT e.PO_Description
+ (SELECT (CASE WHEN e.PO_Description='' THEN e.Description
+ ELSE COALESCE(e.PO_Description, e.Description)
+ END)
FROM AD_ELEMENT e, AD_COLUMN c, AD_FIELD f
WHERE e.AD_Element_ID=c.AD_Element_ID
AND c.AD_Column_ID=f.AD_Column_ID AND
f.AD_Field_ID=AD_FIELD_TRL.AD_Field_ID
)
, Help=
- (SELECT e.PO_Help
+ (SELECT (CASE WHEN e.PO_Help='' THEN e.Help
+ ELSE COALESCE(e.PO_Help, e.Help)
+ END)
FROM AD_ELEMENT e, AD_COLUMN c, AD_FIELD f
WHERE e.AD_Element_ID=c.AD_Element_ID
AND c.AD_Column_ID=f.AD_Column_ID AND
f.AD_Field_ID=AD_FIELD_TRL.AD_Field_ID
@@ -712,7 +724,7 @@
AND M1.AD_MODULE_ID = E.AD_MODULE_ID
AND M.AD_LANGUAGE != M1.AD_LANGUAGE
AND(AD_FIELD_TRL.NAME<>e.PO_Name OR
COALESCE(TO_CHAR(AD_FIELD_TRL.Description), '
')<>COALESCE(TO_CHAR(e.PO_Description), ' ')
- OR COALESCE(TO_CHAR(AD_FIELD_TRL.Help), '
')<>COALESCE(TO_CHAR(e.PO_Help), ' ')) AND (e.PO_Name IS NOT NULL AND e.PO_Name
<> '')
+ OR COALESCE(TO_CHAR(AD_FIELD_TRL.Help), '
')<>COALESCE(TO_CHAR(e.PO_Help), ' '))
)
AND EXISTS
(SELECT *
diff -r 5d3ac3ba6234 -r 06ce8d957df5
src-db/database/model/tables/FIN_PAYMENT_SCHEDULEDETAIL.xml
--- a/src-db/database/model/tables/FIN_PAYMENT_SCHEDULEDETAIL.xml Tue Jun
28 10:11:43 2011 +0200
+++ b/src-db/database/model/tables/FIN_PAYMENT_SCHEDULEDETAIL.xml Mon Jul
04 10:58:39 2011 +0200
@@ -53,6 +53,10 @@
<default><![CDATA[0]]></default>
<onCreateDefault/>
</column>
+ <column name="ISCANCELED" primaryKey="false" required="true" type="CHAR"
size="1" autoIncrement="false">
+ <default><![CDATA[N]]></default>
+ <onCreateDefault><![CDATA['N']]></onCreateDefault>
+ </column>
<foreign-key foreignTable="AD_CLIENT"
name="FIN_AD_CLIENT_SCHEDULEDETAIL">
<reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
</foreign-key>
@@ -68,5 +72,6 @@
<foreign-key foreignTable="FIN_PAYMENT_SCHEDULE"
name="FIN_PAYMENT_SCHORD_SCHDETAIL">
<reference local="FIN_PAYMENT_SCHEDULE_ORDER"
foreign="FIN_PAYMENT_SCHEDULE_ID"/>
</foreign-key>
+ <check name="FIN_PAY_SCHE_DETAIL_ISCANC_CHK"><![CDATA[ISCANCELED IN
('Y', 'N')]]></check>
</table>
</database>
diff -r 5d3ac3ba6234 -r 06ce8d957df5
src-db/database/model/views/FIN_PAYMENT_DETAIL_V.xml
--- a/src-db/database/model/views/FIN_PAYMENT_DETAIL_V.xml Tue Jun 28
10:11:43 2011 +0200
+++ b/src-db/database/model/views/FIN_PAYMENT_DETAIL_V.xml Mon Jul 04
10:58:39 2011 +0200
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<database name="VIEW FIN_PAYMENT_DETAIL_V">
- <view name="FIN_PAYMENT_DETAIL_V"><![CDATA[SELECT
psd.fin_payment_scheduledetail_id AS fin_payment_detail_v_id, psd.ad_client_id,
psd.ad_org_id, psd.isactive, psd.created, psd.createdby, psd.updated,
psd.updatedby, psi.fin_payment_schedule_id AS fin_payment_sched_inv_v_id,
pso.fin_payment_schedule_id AS fin_payment_sched_ord_v_id, i.documentno AS
invoiceno, o.documentno AS orderno, p.documentno AS paymentno,
pd.fin_payment_id, COALESCE(psi.duedate, pso.duedate) AS duedate,
COALESCE(i.grandtotal, o.grandtotal) AS invoicedamt, COALESCE(psi.amount,
pso.amount) AS expected, psd.amount AS paidamt, p.c_bpartner_id,
p.fin_paymentmethod_id, p.fin_financial_account_id, p.c_currency_id,
p.paymentdate, gli.name AS glitemname, pd.writeoffamt
+ <view name="FIN_PAYMENT_DETAIL_V"><![CDATA[SELECT
psd.fin_payment_scheduledetail_id AS fin_payment_detail_v_id, psd.ad_client_id,
psd.ad_org_id, psd.isactive, psd.created, psd.createdby, psd.updated,
psd.updatedby, psi.fin_payment_schedule_id AS fin_payment_sched_inv_v_id,
pso.fin_payment_schedule_id AS fin_payment_sched_ord_v_id, i.documentno AS
invoiceno, o.documentno AS orderno, p.documentno AS paymentno,
pd.fin_payment_id, COALESCE(psi.duedate, pso.duedate) AS duedate,
COALESCE(i.grandtotal, o.grandtotal) AS invoicedamt, COALESCE(psi.amount,
pso.amount) AS expected, psd.amount AS paidamt, p.c_bpartner_id,
p.fin_paymentmethod_id, p.fin_financial_account_id, p.c_currency_id,
p.paymentdate, gli.name AS glitemname, pd.writeoffamt, psd.iscanceled
FROM fin_payment p, fin_payment_detail pd
JOIN fin_payment_scheduledetail psd ON pd.fin_payment_detail_id =
psd.fin_payment_detail_id
LEFT JOIN fin_payment_schedule psi ON psd.fin_payment_schedule_invoice =
psi.fin_payment_schedule_id
diff -r 5d3ac3ba6234 -r 06ce8d957df5 src-db/database/sourcedata/AD_COLUMN.xml
--- a/src-db/database/sourcedata/AD_COLUMN.xml Tue Jun 28 10:11:43 2011 +0200
+++ b/src-db/database/sourcedata/AD_COLUMN.xml Mon Jul 04 10:58:39 2011 +0200
@@ -280410,6 +280410,39 @@
<!--5BA94E7B7D4810ACE040007F0101152B-->
<VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
<!--5BA94E7B7D4810ACE040007F0101152B--></AD_COLUMN>
+<!--5BC978BD972A4CB9936D7B5794153BE1--><AD_COLUMN>
+<!--5BC978BD972A4CB9936D7B5794153BE1-->
<AD_COLUMN_ID><![CDATA[5BC978BD972A4CB9936D7B5794153BE1]]></AD_COLUMN_ID>
+<!--5BC978BD972A4CB9936D7B5794153BE1-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--5BC978BD972A4CB9936D7B5794153BE1--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--5BC978BD972A4CB9936D7B5794153BE1--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--5BC978BD972A4CB9936D7B5794153BE1--> <NAME><![CDATA[Canceled]]></NAME>
+<!--5BC978BD972A4CB9936D7B5794153BE1-->
<COLUMNNAME><![CDATA[Iscanceled]]></COLUMNNAME>
+<!--5BC978BD972A4CB9936D7B5794153BE1-->
<AD_TABLE_ID><![CDATA[C0233061EA504EFEAB0483E836BBAF31]]></AD_TABLE_ID>
+<!--5BC978BD972A4CB9936D7B5794153BE1-->
<AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
+<!--5BC978BD972A4CB9936D7B5794153BE1-->
<FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
+<!--5BC978BD972A4CB9936D7B5794153BE1-->
<DEFAULTVALUE><![CDATA[N]]></DEFAULTVALUE>
+<!--5BC978BD972A4CB9936D7B5794153BE1--> <ISKEY><![CDATA[N]]></ISKEY>
+<!--5BC978BD972A4CB9936D7B5794153BE1--> <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--5BC978BD972A4CB9936D7B5794153BE1-->
<ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--5BC978BD972A4CB9936D7B5794153BE1-->
<ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--5BC978BD972A4CB9936D7B5794153BE1--> <READONLYLOGIC><![CDATA['Y' =
'Y']]></READONLYLOGIC>
+<!--5BC978BD972A4CB9936D7B5794153BE1-->
<ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--5BC978BD972A4CB9936D7B5794153BE1--> <SEQNO><![CDATA[140]]></SEQNO>
+<!--5BC978BD972A4CB9936D7B5794153BE1-->
<ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--5BC978BD972A4CB9936D7B5794153BE1-->
<ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--5BC978BD972A4CB9936D7B5794153BE1-->
<ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--5BC978BD972A4CB9936D7B5794153BE1-->
<AD_ELEMENT_ID><![CDATA[B465F3438BE64D2D99A6343B63B7E76E]]></AD_ELEMENT_ID>
+<!--5BC978BD972A4CB9936D7B5794153BE1-->
<ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--5BC978BD972A4CB9936D7B5794153BE1-->
<ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--5BC978BD972A4CB9936D7B5794153BE1-->
<ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--5BC978BD972A4CB9936D7B5794153BE1-->
<DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--5BC978BD972A4CB9936D7B5794153BE1-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--5BC978BD972A4CB9936D7B5794153BE1--> <POSITION><![CDATA[14]]></POSITION>
+<!--5BC978BD972A4CB9936D7B5794153BE1-->
<ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--5BC978BD972A4CB9936D7B5794153BE1--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--5BC978BD972A4CB9936D7B5794153BE1-->
<VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--5BC978BD972A4CB9936D7B5794153BE1--></AD_COLUMN>
+
<!--5BE185F526BBFA15E040007F01016962--><AD_COLUMN>
<!--5BE185F526BBFA15E040007F01016962-->
<AD_COLUMN_ID><![CDATA[5BE185F526BBFA15E040007F01016962]]></AD_COLUMN_ID>
<!--5BE185F526BBFA15E040007F01016962-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -288043,6 +288076,37 @@
<!--7296009E504AA348E040007F01013C92-->
<VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
<!--7296009E504AA348E040007F01013C92--></AD_COLUMN>
+<!--7299BF93D2984DF8932FE2800DA0ED2A--><AD_COLUMN>
+<!--7299BF93D2984DF8932FE2800DA0ED2A-->
<AD_COLUMN_ID><![CDATA[7299BF93D2984DF8932FE2800DA0ED2A]]></AD_COLUMN_ID>
+<!--7299BF93D2984DF8932FE2800DA0ED2A-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7299BF93D2984DF8932FE2800DA0ED2A--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7299BF93D2984DF8932FE2800DA0ED2A--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7299BF93D2984DF8932FE2800DA0ED2A--> <NAME><![CDATA[Canceled]]></NAME>
+<!--7299BF93D2984DF8932FE2800DA0ED2A-->
<COLUMNNAME><![CDATA[Iscanceled]]></COLUMNNAME>
+<!--7299BF93D2984DF8932FE2800DA0ED2A-->
<AD_TABLE_ID><![CDATA[DC63963AB3F1489BAAB5A9A7EFD1B407]]></AD_TABLE_ID>
+<!--7299BF93D2984DF8932FE2800DA0ED2A-->
<AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
+<!--7299BF93D2984DF8932FE2800DA0ED2A-->
<FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
+<!--7299BF93D2984DF8932FE2800DA0ED2A--> <ISKEY><![CDATA[N]]></ISKEY>
+<!--7299BF93D2984DF8932FE2800DA0ED2A--> <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--7299BF93D2984DF8932FE2800DA0ED2A-->
<ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--7299BF93D2984DF8932FE2800DA0ED2A-->
<ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--7299BF93D2984DF8932FE2800DA0ED2A-->
<ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--7299BF93D2984DF8932FE2800DA0ED2A--> <SEQNO><![CDATA[360]]></SEQNO>
+<!--7299BF93D2984DF8932FE2800DA0ED2A-->
<ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--7299BF93D2984DF8932FE2800DA0ED2A-->
<ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--7299BF93D2984DF8932FE2800DA0ED2A-->
<ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--7299BF93D2984DF8932FE2800DA0ED2A-->
<AD_ELEMENT_ID><![CDATA[B465F3438BE64D2D99A6343B63B7E76E]]></AD_ELEMENT_ID>
+<!--7299BF93D2984DF8932FE2800DA0ED2A-->
<ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--7299BF93D2984DF8932FE2800DA0ED2A-->
<ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--7299BF93D2984DF8932FE2800DA0ED2A-->
<ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--7299BF93D2984DF8932FE2800DA0ED2A-->
<DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--7299BF93D2984DF8932FE2800DA0ED2A-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--7299BF93D2984DF8932FE2800DA0ED2A--> <POSITION><![CDATA[30]]></POSITION>
+<!--7299BF93D2984DF8932FE2800DA0ED2A-->
<ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--7299BF93D2984DF8932FE2800DA0ED2A--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--7299BF93D2984DF8932FE2800DA0ED2A-->
<VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--7299BF93D2984DF8932FE2800DA0ED2A--></AD_COLUMN>
+
<!--72F4EB7BF7C24F6AA8BB4149E68BF665--><AD_COLUMN>
<!--72F4EB7BF7C24F6AA8BB4149E68BF665-->
<AD_COLUMN_ID><![CDATA[72F4EB7BF7C24F6AA8BB4149E68BF665]]></AD_COLUMN_ID>
<!--72F4EB7BF7C24F6AA8BB4149E68BF665-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r 5d3ac3ba6234 -r 06ce8d957df5 src-db/database/sourcedata/AD_ELEMENT.xml
--- a/src-db/database/sourcedata/AD_ELEMENT.xml Tue Jun 28 10:11:43 2011 +0200
+++ b/src-db/database/sourcedata/AD_ELEMENT.xml Mon Jul 04 10:58:39 2011 +0200
@@ -27805,6 +27805,17 @@
<!--B43D23CAEBD211DD9AFA0016D4EE9DB3-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--B43D23CAEBD211DD9AFA0016D4EE9DB3--></AD_ELEMENT>
+<!--B465F3438BE64D2D99A6343B63B7E76E--><AD_ELEMENT>
+<!--B465F3438BE64D2D99A6343B63B7E76E-->
<AD_ELEMENT_ID><![CDATA[B465F3438BE64D2D99A6343B63B7E76E]]></AD_ELEMENT_ID>
+<!--B465F3438BE64D2D99A6343B63B7E76E-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--B465F3438BE64D2D99A6343B63B7E76E--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--B465F3438BE64D2D99A6343B63B7E76E--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--B465F3438BE64D2D99A6343B63B7E76E-->
<COLUMNNAME><![CDATA[Iscanceled]]></COLUMNNAME>
+<!--B465F3438BE64D2D99A6343B63B7E76E--> <NAME><![CDATA[Canceled]]></NAME>
+<!--B465F3438BE64D2D99A6343B63B7E76E-->
<PRINTNAME><![CDATA[Canceled]]></PRINTNAME>
+<!--B465F3438BE64D2D99A6343B63B7E76E-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--B465F3438BE64D2D99A6343B63B7E76E--></AD_ELEMENT>
+
<!--B4D4121446D847EA91B262AEDA567798--><AD_ELEMENT>
<!--B4D4121446D847EA91B262AEDA567798-->
<AD_ELEMENT_ID><![CDATA[B4D4121446D847EA91B262AEDA567798]]></AD_ELEMENT_ID>
<!--B4D4121446D847EA91B262AEDA567798-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r 5d3ac3ba6234 -r 06ce8d957df5 src-db/database/sourcedata/AD_FIELD.xml
--- a/src-db/database/sourcedata/AD_FIELD.xml Tue Jun 28 10:11:43 2011 +0200
+++ b/src-db/database/sourcedata/AD_FIELD.xml Mon Jul 04 10:58:39 2011 +0200
@@ -193435,6 +193435,31 @@
<!--623FEEB84688C86EE040007F0101639E-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--623FEEB84688C86EE040007F0101639E--></AD_FIELD>
+<!--624A567748534046B21FF892CA4FF4DC--><AD_FIELD>
+<!--624A567748534046B21FF892CA4FF4DC-->
<AD_FIELD_ID><![CDATA[624A567748534046B21FF892CA4FF4DC]]></AD_FIELD_ID>
+<!--624A567748534046B21FF892CA4FF4DC-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--624A567748534046B21FF892CA4FF4DC--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--624A567748534046B21FF892CA4FF4DC--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--624A567748534046B21FF892CA4FF4DC--> <NAME><![CDATA[Canceled]]></NAME>
+<!--624A567748534046B21FF892CA4FF4DC-->
<ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--624A567748534046B21FF892CA4FF4DC-->
<AD_TAB_ID><![CDATA[173B46EC4F91406E9B68DCF6464BB308]]></AD_TAB_ID>
+<!--624A567748534046B21FF892CA4FF4DC-->
<AD_COLUMN_ID><![CDATA[7299BF93D2984DF8932FE2800DA0ED2A]]></AD_COLUMN_ID>
+<!--624A567748534046B21FF892CA4FF4DC-->
<ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--624A567748534046B21FF892CA4FF4DC-->
<DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
+<!--624A567748534046B21FF892CA4FF4DC--> <ISREADONLY><![CDATA[Y]]></ISREADONLY>
+<!--624A567748534046B21FF892CA4FF4DC--> <SEQNO><![CDATA[80]]></SEQNO>
+<!--624A567748534046B21FF892CA4FF4DC--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--624A567748534046B21FF892CA4FF4DC-->
<ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--624A567748534046B21FF892CA4FF4DC-->
<ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--624A567748534046B21FF892CA4FF4DC-->
<SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--624A567748534046B21FF892CA4FF4DC-->
<ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--624A567748534046B21FF892CA4FF4DC-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--624A567748534046B21FF892CA4FF4DC-->
<GRID_SEQNO><![CDATA[80]]></GRID_SEQNO>
+<!--624A567748534046B21FF892CA4FF4DC-->
<STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--624A567748534046B21FF892CA4FF4DC-->
<STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--624A567748534046B21FF892CA4FF4DC-->
<ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--624A567748534046B21FF892CA4FF4DC--></AD_FIELD>
+
<!--625117B1E5874923BF97181AB349E8E3--><AD_FIELD>
<!--625117B1E5874923BF97181AB349E8E3-->
<AD_FIELD_ID><![CDATA[625117B1E5874923BF97181AB349E8E3]]></AD_FIELD_ID>
<!--625117B1E5874923BF97181AB349E8E3-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -203535,6 +203560,31 @@
<!--9297652C3C0A2C95E040007F0100484A-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--9297652C3C0A2C95E040007F0100484A--></AD_FIELD>
+<!--929C26927DF84A94908BFDAEE6A2E9FF--><AD_FIELD>
+<!--929C26927DF84A94908BFDAEE6A2E9FF-->
<AD_FIELD_ID><![CDATA[929C26927DF84A94908BFDAEE6A2E9FF]]></AD_FIELD_ID>
+<!--929C26927DF84A94908BFDAEE6A2E9FF-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--929C26927DF84A94908BFDAEE6A2E9FF--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--929C26927DF84A94908BFDAEE6A2E9FF--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--929C26927DF84A94908BFDAEE6A2E9FF--> <NAME><![CDATA[Canceled]]></NAME>
+<!--929C26927DF84A94908BFDAEE6A2E9FF-->
<ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--929C26927DF84A94908BFDAEE6A2E9FF-->
<AD_TAB_ID><![CDATA[07F009753DA647C2AF38697BA9F1B1A0]]></AD_TAB_ID>
+<!--929C26927DF84A94908BFDAEE6A2E9FF-->
<AD_COLUMN_ID><![CDATA[7299BF93D2984DF8932FE2800DA0ED2A]]></AD_COLUMN_ID>
+<!--929C26927DF84A94908BFDAEE6A2E9FF-->
<ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--929C26927DF84A94908BFDAEE6A2E9FF-->
<DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
+<!--929C26927DF84A94908BFDAEE6A2E9FF--> <ISREADONLY><![CDATA[Y]]></ISREADONLY>
+<!--929C26927DF84A94908BFDAEE6A2E9FF--> <SEQNO><![CDATA[80]]></SEQNO>
+<!--929C26927DF84A94908BFDAEE6A2E9FF--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--929C26927DF84A94908BFDAEE6A2E9FF-->
<ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--929C26927DF84A94908BFDAEE6A2E9FF-->
<ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--929C26927DF84A94908BFDAEE6A2E9FF-->
<SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--929C26927DF84A94908BFDAEE6A2E9FF-->
<ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--929C26927DF84A94908BFDAEE6A2E9FF-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--929C26927DF84A94908BFDAEE6A2E9FF-->
<GRID_SEQNO><![CDATA[80]]></GRID_SEQNO>
+<!--929C26927DF84A94908BFDAEE6A2E9FF-->
<STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--929C26927DF84A94908BFDAEE6A2E9FF-->
<STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--929C26927DF84A94908BFDAEE6A2E9FF-->
<ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--929C26927DF84A94908BFDAEE6A2E9FF--></AD_FIELD>
+
<!--92FC7D0E63E80A15E040007F0100490C--><AD_FIELD>
<!--92FC7D0E63E80A15E040007F0100490C-->
<AD_FIELD_ID><![CDATA[92FC7D0E63E80A15E040007F0100490C]]></AD_FIELD_ID>
<!--92FC7D0E63E80A15E040007F0100490C-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r 5d3ac3ba6234 -r 06ce8d957df5 src-db/database/sourcedata/AD_MODULE.xml
--- a/src-db/database/sourcedata/AD_MODULE.xml Tue Jun 28 10:11:43 2011 +0200
+++ b/src-db/database/sourcedata/AD_MODULE.xml Mon Jul 04 10:58:39 2011 +0200
@@ -6,7 +6,7 @@
------------------------------------------------------------------------------
All of the data generated in your IT infrastructure is seriously valuable.
Why? It contains a definitive record of application performance, security
threats, fraudulent activity, and more. Splunk takes this data and makes
sense of it. IT sense. And common sense.
http://p.sf.net/sfu/splunk-d2d-c2
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
