details: https://code.openbravo.com/erp/devel/pi/rev/80b907dfcfa5
changeset: 21912:80b907dfcfa5
user: Javier Etxarri <javier.echarri <at> openbravo.com>
date: Tue Feb 04 11:54:18 2014 +0100
summary: Fixes issue issue 24685: After an Expense Sheet is processed,
processing column stays 'Y'
diffstat:
src-db/database/model/functions/S_TIMEEXPENSE_POST.xml | 4 +-
src-db/database/model/tables/S_TIMEEXPENSE.xml | 4 +-
src-db/database/sourcedata/AD_COLUMN.xml | 49 +++++++++++++++--
src-db/database/sourcedata/AD_FIELD.xml | 44 +++++++++++++--
4 files changed, 83 insertions(+), 18 deletions(-)
diffs (204 lines):
diff -r 8de81243779e -r 80b907dfcfa5
src-db/database/model/functions/S_TIMEEXPENSE_POST.xml
--- a/src-db/database/model/functions/S_TIMEEXPENSE_POST.xml Mon Feb 03
09:41:23 2014 +0100
+++ b/src-db/database/model/functions/S_TIMEEXPENSE_POST.xml Tue Feb 04
11:54:18 2014 +0100
@@ -101,7 +101,7 @@
GROUP BY S_TimeExpense.PROCESSED;
IF (v_Processed = 'Y') THEN
IF (v_CInvoicelineId IS NULL AND v_COrderlineId IS NULL) THEN
- UPDATE S_TimeExpense SET Processed = 'N',Processing = 'N' WHERE
S_TimeExpense_ID = v_Record_ID;
+ UPDATE S_TimeExpense SET Processed = 'N' WHERE S_TimeExpense_ID =
v_Record_ID;
ELSE
v_Message:='@DocumentAssociated@';
v_Result:=0;
@@ -121,7 +121,7 @@
-- Checks come here
-- Complete
UPDATE S_TimeExpense
- SET Processed='Y',processing = 'Y',
+ SET Processed='Y',
Updated=now(),
UpdatedBy=v_AD_User_ID
WHERE S_TimeExpense_ID=CUR_te.S_TimeExpense_ID;
diff -r 8de81243779e -r 80b907dfcfa5
src-db/database/model/tables/S_TIMEEXPENSE.xml
--- a/src-db/database/model/tables/S_TIMEEXPENSE.xml Mon Feb 03 09:41:23
2014 +0100
+++ b/src-db/database/model/tables/S_TIMEEXPENSE.xml Tue Feb 04 11:54:18
2014 +0100
@@ -49,11 +49,11 @@
<default/>
<onCreateDefault/>
</column>
- <column name="PROCESSING" primaryKey="false" required="false"
type="VARCHAR" size="60" autoIncrement="false">
+ <column name="PROCESSING" primaryKey="false" required="false"
type="CHAR" size="1" autoIncrement="false">
<default/>
<onCreateDefault/>
</column>
- <column name="PROCESSED" primaryKey="false" required="true" type="CHAR"
size="1" autoIncrement="false">
+ <column name="PROCESSED" primaryKey="false" required="true"
type="VARCHAR" size="60" autoIncrement="false">
<default><![CDATA[N]]></default>
<onCreateDefault/>
</column>
diff -r 8de81243779e -r 80b907dfcfa5 src-db/database/sourcedata/AD_COLUMN.xml
--- a/src-db/database/sourcedata/AD_COLUMN.xml Mon Feb 03 09:41:23 2014 +0100
+++ b/src-db/database/sourcedata/AD_COLUMN.xml Tue Feb 04 11:54:18 2014 +0100
@@ -95797,8 +95797,9 @@
<!--6835--> <HELP><![CDATA[The Processed checkbox indicates that a document
has been processed.]]></HELP>
<!--6835--> <COLUMNNAME><![CDATA[Processed]]></COLUMNNAME>
<!--6835--> <AD_TABLE_ID><![CDATA[486]]></AD_TABLE_ID>
-<!--6835--> <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
-<!--6835--> <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
+<!--6835--> <AD_REFERENCE_ID><![CDATA[28]]></AD_REFERENCE_ID>
+<!--6835-->
<AD_REFERENCE_VALUE_ID><![CDATA[1005900000]]></AD_REFERENCE_VALUE_ID>
+<!--6835--> <FIELDLENGTH><![CDATA[60]]></FIELDLENGTH>
<!--6835--> <ISKEY><![CDATA[N]]></ISKEY>
<!--6835--> <ISPARENT><![CDATA[N]]></ISPARENT>
<!--6835--> <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
@@ -95809,6 +95810,7 @@
<!--6835--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
<!--6835--> <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
<!--6835--> <AD_ELEMENT_ID><![CDATA[1047]]></AD_ELEMENT_ID>
+<!--6835--> <AD_PROCESS_ID><![CDATA[184]]></AD_PROCESS_ID>
<!--6835--> <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
<!--6835--> <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
<!--6835--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
@@ -95832,9 +95834,8 @@
<!--6836--> <HELP><![CDATA[When this field is set as 'Y' a process is being
performed on this record.]]></HELP>
<!--6836--> <COLUMNNAME><![CDATA[Processing]]></COLUMNNAME>
<!--6836--> <AD_TABLE_ID><![CDATA[486]]></AD_TABLE_ID>
-<!--6836--> <AD_REFERENCE_ID><![CDATA[28]]></AD_REFERENCE_ID>
-<!--6836-->
<AD_REFERENCE_VALUE_ID><![CDATA[1005900000]]></AD_REFERENCE_VALUE_ID>
-<!--6836--> <FIELDLENGTH><![CDATA[60]]></FIELDLENGTH>
+<!--6836--> <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
+<!--6836--> <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
<!--6836--> <ISKEY><![CDATA[N]]></ISKEY>
<!--6836--> <ISPARENT><![CDATA[N]]></ISPARENT>
<!--6836--> <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
@@ -95845,7 +95846,6 @@
<!--6836--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
<!--6836--> <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
<!--6836--> <AD_ELEMENT_ID><![CDATA[524]]></AD_ELEMENT_ID>
-<!--6836--> <AD_PROCESS_ID><![CDATA[184]]></AD_PROCESS_ID>
<!--6836--> <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
<!--6836--> <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
<!--6836--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
@@ -321293,6 +321293,43 @@
<!--EA08CC350401425D83DD1EBE52311306-->
<ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
<!--EA08CC350401425D83DD1EBE52311306--></AD_COLUMN>
+<!--EA1AE62C7E1A40EDABD45C2BF25248A9--><AD_COLUMN>
+<!--EA1AE62C7E1A40EDABD45C2BF25248A9-->
<AD_COLUMN_ID><![CDATA[EA1AE62C7E1A40EDABD45C2BF25248A9]]></AD_COLUMN_ID>
+<!--EA1AE62C7E1A40EDABD45C2BF25248A9-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--EA1AE62C7E1A40EDABD45C2BF25248A9--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--EA1AE62C7E1A40EDABD45C2BF25248A9--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--EA1AE62C7E1A40EDABD45C2BF25248A9-->
<NAME><![CDATA[processed_logic]]></NAME>
+<!--EA1AE62C7E1A40EDABD45C2BF25248A9--> <DESCRIPTION><![CDATA[A confirmation
that the associated documents or requests are processed.]]></DESCRIPTION>
+<!--EA1AE62C7E1A40EDABD45C2BF25248A9--> <HELP><![CDATA[The Processed checkbox
indicates that a document has been processed.]]></HELP>
+<!--EA1AE62C7E1A40EDABD45C2BF25248A9-->
<COLUMNNAME><![CDATA[processed_logic]]></COLUMNNAME>
+<!--EA1AE62C7E1A40EDABD45C2BF25248A9-->
<AD_TABLE_ID><![CDATA[486]]></AD_TABLE_ID>
+<!--EA1AE62C7E1A40EDABD45C2BF25248A9-->
<AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
+<!--EA1AE62C7E1A40EDABD45C2BF25248A9-->
<FIELDLENGTH><![CDATA[0]]></FIELDLENGTH>
+<!--EA1AE62C7E1A40EDABD45C2BF25248A9--> <ISKEY><![CDATA[N]]></ISKEY>
+<!--EA1AE62C7E1A40EDABD45C2BF25248A9--> <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--EA1AE62C7E1A40EDABD45C2BF25248A9-->
<ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--EA1AE62C7E1A40EDABD45C2BF25248A9-->
<ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--EA1AE62C7E1A40EDABD45C2BF25248A9-->
<ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--EA1AE62C7E1A40EDABD45C2BF25248A9--> <SEQNO><![CDATA[93]]></SEQNO>
+<!--EA1AE62C7E1A40EDABD45C2BF25248A9-->
<ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--EA1AE62C7E1A40EDABD45C2BF25248A9-->
<ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--EA1AE62C7E1A40EDABD45C2BF25248A9-->
<ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--EA1AE62C7E1A40EDABD45C2BF25248A9-->
<AD_ELEMENT_ID><![CDATA[1047]]></AD_ELEMENT_ID>
+<!--EA1AE62C7E1A40EDABD45C2BF25248A9-->
<ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--EA1AE62C7E1A40EDABD45C2BF25248A9-->
<ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--EA1AE62C7E1A40EDABD45C2BF25248A9-->
<ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--EA1AE62C7E1A40EDABD45C2BF25248A9-->
<DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--EA1AE62C7E1A40EDABD45C2BF25248A9-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--EA1AE62C7E1A40EDABD45C2BF25248A9-->
<ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--EA1AE62C7E1A40EDABD45C2BF25248A9--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--EA1AE62C7E1A40EDABD45C2BF25248A9-->
<VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--EA1AE62C7E1A40EDABD45C2BF25248A9-->
<IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--EA1AE62C7E1A40EDABD45C2BF25248A9-->
<ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--EA1AE62C7E1A40EDABD45C2BF25248A9--> <SQLLOGIC><![CDATA[select processed
+from S_TimeExpense TE
+where TE.S_TimeExpense_id=S_TimeExpense_id]]></SQLLOGIC>
+<!--EA1AE62C7E1A40EDABD45C2BF25248A9--></AD_COLUMN>
+
<!--EA41590A5EF24F7388E0354B3A10432C--><AD_COLUMN>
<!--EA41590A5EF24F7388E0354B3A10432C-->
<AD_COLUMN_ID><![CDATA[EA41590A5EF24F7388E0354B3A10432C]]></AD_COLUMN_ID>
<!--EA41590A5EF24F7388E0354B3A10432C-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r 8de81243779e -r 80b907dfcfa5 src-db/database/sourcedata/AD_FIELD.xml
--- a/src-db/database/sourcedata/AD_FIELD.xml Mon Feb 03 09:41:23 2014 +0100
+++ b/src-db/database/sourcedata/AD_FIELD.xml Tue Feb 04 11:54:18 2014 +0100
@@ -67548,9 +67548,9 @@
<!--5441--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
<!--5441--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--5441--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--5441--> <NAME><![CDATA[Processed]]></NAME>
-<!--5441--> <DESCRIPTION><![CDATA[A confirmation that the associated
documents or requests are processed.]]></DESCRIPTION>
-<!--5441--> <HELP><![CDATA[The Processed checkbox indicates that a document
has been processed.]]></HELP>
+<!--5441--> <NAME><![CDATA[Process/Unprocess Expenses]]></NAME>
+<!--5441--> <DESCRIPTION><![CDATA[Process/Unprocess Expenses]]></DESCRIPTION>
+<!--5441--> <HELP><![CDATA[Process/Unprocess expense sheet.]]></HELP>
<!--5441--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
<!--5441--> <AD_TAB_ID><![CDATA[412]]></AD_TAB_ID>
<!--5441--> <AD_COLUMN_ID><![CDATA[6835]]></AD_COLUMN_ID>
@@ -67567,7 +67567,7 @@
<!--5441--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--5441--> <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
<!--5441--> <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
-<!--5441--> <ISSHOWNINSTATUSBAR><![CDATA[Y]]></ISSHOWNINSTATUSBAR>
+<!--5441--> <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
<!--5441--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
<!--5441--></AD_FIELD>
@@ -67576,14 +67576,14 @@
<!--5442--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
<!--5442--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--5442--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--5442--> <NAME><![CDATA[Process/Unprocess Expenses]]></NAME>
-<!--5442--> <DESCRIPTION><![CDATA[Process/Unprocess Expenses]]></DESCRIPTION>
-<!--5442--> <HELP><![CDATA[Process/Unprocess expense sheet.]]></HELP>
+<!--5442--> <NAME><![CDATA[Process Now]]></NAME>
+<!--5442--> <DESCRIPTION><![CDATA[A request to process the respective
document or task.]]></DESCRIPTION>
+<!--5442--> <HELP><![CDATA[When this field is set as 'Y' a process is being
performed on this record.]]></HELP>
<!--5442--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
<!--5442--> <AD_TAB_ID><![CDATA[412]]></AD_TAB_ID>
<!--5442--> <AD_COLUMN_ID><![CDATA[6836]]></AD_COLUMN_ID>
<!--5442--> <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
-<!--5442--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--5442--> <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
<!--5442--> <DISPLAYLENGTH><![CDATA[23]]></DISPLAYLENGTH>
<!--5442--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
<!--5442--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
@@ -241181,6 +241181,34 @@
<!--A2F9D04C36A64FC293128875629FEAF9-->
<EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
<!--A2F9D04C36A64FC293128875629FEAF9--></AD_FIELD>
+<!--A30D860B26DD4FE6A1E43725BE45B748--><AD_FIELD>
+<!--A30D860B26DD4FE6A1E43725BE45B748-->
<AD_FIELD_ID><![CDATA[A30D860B26DD4FE6A1E43725BE45B748]]></AD_FIELD_ID>
+<!--A30D860B26DD4FE6A1E43725BE45B748-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--A30D860B26DD4FE6A1E43725BE45B748--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--A30D860B26DD4FE6A1E43725BE45B748--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--A30D860B26DD4FE6A1E43725BE45B748--> <NAME><![CDATA[Processed]]></NAME>
+<!--A30D860B26DD4FE6A1E43725BE45B748--> <DESCRIPTION><![CDATA[A confirmation
that the associated documents or requests are processed.]]></DESCRIPTION>
+<!--A30D860B26DD4FE6A1E43725BE45B748--> <HELP><![CDATA[The Processed checkbox
indicates that a document has been processed.]]></HELP>
+<!--A30D860B26DD4FE6A1E43725BE45B748-->
<ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--A30D860B26DD4FE6A1E43725BE45B748--> <AD_TAB_ID><![CDATA[412]]></AD_TAB_ID>
+<!--A30D860B26DD4FE6A1E43725BE45B748-->
<AD_COLUMN_ID><![CDATA[EA1AE62C7E1A40EDABD45C2BF25248A9]]></AD_COLUMN_ID>
+<!--A30D860B26DD4FE6A1E43725BE45B748-->
<IGNOREINWAD><![CDATA[Y]]></IGNOREINWAD>
+<!--A30D860B26DD4FE6A1E43725BE45B748-->
<ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--A30D860B26DD4FE6A1E43725BE45B748-->
<DISPLAYLENGTH><![CDATA[0]]></DISPLAYLENGTH>
+<!--A30D860B26DD4FE6A1E43725BE45B748--> <ISREADONLY><![CDATA[Y]]></ISREADONLY>
+<!--A30D860B26DD4FE6A1E43725BE45B748--> <SEQNO><![CDATA[100]]></SEQNO>
+<!--A30D860B26DD4FE6A1E43725BE45B748--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--A30D860B26DD4FE6A1E43725BE45B748-->
<ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--A30D860B26DD4FE6A1E43725BE45B748-->
<ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--A30D860B26DD4FE6A1E43725BE45B748-->
<SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--A30D860B26DD4FE6A1E43725BE45B748-->
<ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--A30D860B26DD4FE6A1E43725BE45B748-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--A30D860B26DD4FE6A1E43725BE45B748-->
<STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--A30D860B26DD4FE6A1E43725BE45B748-->
<STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--A30D860B26DD4FE6A1E43725BE45B748-->
<ISSHOWNINSTATUSBAR><![CDATA[Y]]></ISSHOWNINSTATUSBAR>
+<!--A30D860B26DD4FE6A1E43725BE45B748-->
<EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--A30D860B26DD4FE6A1E43725BE45B748--></AD_FIELD>
+
<!--A31A8439F760465BB82093CEBBAB210A--><AD_FIELD>
<!--A31A8439F760465BB82093CEBBAB210A-->
<AD_FIELD_ID><![CDATA[A31A8439F760465BB82093CEBBAB210A]]></AD_FIELD_ID>
<!--A31A8439F760465BB82093CEBBAB210A-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
------------------------------------------------------------------------------
Managing the Performance of Cloud-Based Applications
Take advantage of what the Cloud has to offer - Avoid Common Pitfalls.
Read the Whitepaper.
http://pubads.g.doubleclick.net/gampad/clk?id=121051231&iu=/4140/ostg.clktrk
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
