details: /erp/devel/pi/rev/84da0073d386
changeset: 12170:84da0073d386
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Fri May 13 18:27:25 2011 +0200
summary: CI: update AD_MODULE to version 12152
details: /erp/devel/pi/rev/ff8c522e1316
changeset: 12171:ff8c522e1316
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Fri May 13 18:43:49 2011 +0200
summary: CI: merge back from main
diffstat:
modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml
| 51 +-
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml
| 474 +-
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 4 +-
modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_07.java
| 313 +
modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_08.java
| 299 +
modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_09.java
| 326 +
modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_10.java
| 322 +
modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/TestUtility.java
| 108 +-
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/AdvPaymentMngtDao.java
| 35 +
modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 2 +-
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_FIELD.xml
| 78 +-
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 8 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-action-button.js
| 25 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-view.js
| 2 +-
modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 2 +-
modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_FIELD.xml
| 45 +-
modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 6 +-
modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_FIELD.xml
| 119 +-
modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 4 +-
modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_FIELD.xml
| 40 +-
modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 2 +-
modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 2 +-
modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 2 +-
modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 2 +-
modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_FIELD.xml
| 39 +-
modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 10 +-
modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 2 +-
modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_FIELD.xml
| 142 +-
modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 12 +-
modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 2 +-
modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 6 +-
modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 6 +-
modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 24 +-
modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 14 +-
src-db/database/sourcedata/AD_FIELD.xml
| 10645 +++++----
src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
src/org/openbravo/erpCommon/ad_process/PaymentMonitorProcess.java
| 6 +-
55 files changed, 8124 insertions(+), 5093 deletions(-)
diffs (truncated from 64079 to 300 lines):
diff -r 310c45e82c0d -r ff8c522e1316
modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml
---
a/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml
Fri May 13 10:42:25 2011 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml
Fri May 13 18:43:49 2011 +0200
@@ -164,6 +164,7 @@
v_invoicedamount NUMBER;
v_notassignedamount NUMBER;
v_assignedamount NUMBER;
+ v_pendingAmountFromOrder NUMBER:=0;
v_scheduledetailamount NUMBER;
v_oldorder VARCHAR2(32) := '-1';
v_payment_schedule_invoice VARCHAR2(32);
@@ -335,6 +336,16 @@
IF(v_Count=0) THEN
v_differenceamount:= 0;
+ -- Calculate
+ SELECT SUM(amount) + v_pendingAmountFromOrder INTO
v_pendingAmountFromOrder
+ FROM fin_payment_scheduledetail
+ WHERE fin_payment_schedule_order =
order_schdet.fin_payment_schedule_order
+ AND fin_payment_detail_id is null;
+ -- link remaining payment schedule detail from order to the
invoice as it is fully invoiced
+ UPDATE fin_payment_scheduledetail
+ SET fin_payment_schedule_invoice = v_payment_schedule_invoice
+ WHERE fin_payment_schedule_order =
order_schdet.fin_payment_schedule_order
+ AND fin_payment_detail_id is null;
END IF;
IF (v_differenceamount > 0) THEN
@@ -400,7 +411,7 @@
v_oldorder := order_schdet.order_id;
END LOOP;
- IF (v_scheduledamount != 0 ) THEN
+ IF (v_scheduledamount - v_pendingAmountFromOrder != 0 ) THEN
-- no orders, insert payment schedule detail with remaining amount
INSERT INTO fin_payment_scheduledetail
(
@@ -418,8 +429,9 @@
null,
v_payment_schedule_invoice,
null,
- v_scheduledamount
+ v_scheduledamount - v_pendingAmountFromOrder
);
+ v_pendingAmountFromOrder:=0;
END IF;
END LOOP;
@@ -433,7 +445,7 @@
FROM FIN_PAYMENT_SCHEDULE
WHERE C_INVOICE_ID=P_RECORD_ID;
-- Getting DueAmount from FIN_PAYMENT_SCHEDULE for the Invoice
- SELECT sum(OUTSTANDINGAMT) as DueAmount
+ SELECT coalesce(sum(OUTSTANDINGAMT),0) as DueAmount
INTO V_DueAmount
FROM FIN_PAYMENT_SCHEDULE
WHERE C_INVOICE_ID=P_RECORD_ID
@@ -567,20 +579,43 @@
AND FIN_PAYMENT_SCHEDULE_ORDER IS NOT NULL
GROUP BY FIN_PAYMENT_SCHEDULE_ORDER
) LOOP
+
UPDATE FIN_PAYMENT_SCHEDULE
- SET PAIDAMT = PAIDAMT + cur_paymentschedule.OUTSTANDINGAMT,
- OUTSTANDINGAMT=OUTSTANDINGAMT -
cur_paymentschedule.OUTSTANDINGAMT
+ SET PAIDAMT = (SELECT COALESCE(sum(amount +
COALESCE(writeoffamt, 0)), 0)
+ FROM fin_payment_scheduledetail
+ WHERE
fin_payment_schedule_order=cur_PaymentScheduleOrder.FIN_PAYMENT_SCHEDULE_ORDER
AND
+ fin_payment_detail_id is not null AND
+ exists (SELECT 1
+ FROM fin_payment,
fin_payment_detail
+ WHERE
fin_payment.fin_payment_id = fin_payment_detail.fin_payment_id
+ and
fin_payment.processed='Y' and fin_payment.status<>'RPAE'
+ and
fin_payment_detail.fin_payment_detail_id =
fin_payment_scheduledetail.fin_payment_detail_id)),
+ OUTSTANDINGAMT = (SELECT COALESCE(sum(amount), 0)
+ FROM fin_payment_scheduledetail
+ WHERE
fin_payment_schedule_order=cur_PaymentScheduleOrder.FIN_PAYMENT_SCHEDULE_ORDER
AND
+ (fin_payment_detail_id is null OR
+ exists (SELECT 1
+ FROM fin_payment,
fin_payment_detail
+ WHERE
fin_payment.fin_payment_id = fin_payment_detail.fin_payment_id
+ and
fin_payment.processed='Y' and fin_payment.status = 'RPAE'
+ and
fin_payment_detail.fin_payment_detail_id =
fin_payment_scheduledetail.fin_payment_detail_id)))
WHERE FIN_PAYMENT_SCHEDULE_ID =
cur_PaymentScheduleOrder.FIN_PAYMENT_SCHEDULE_ORDER;
END LOOP;
UPDATE FIN_PAYMENT_SCHEDULE
SET PAIDAMT = PAIDAMT +
COALESCE(cur_paymentschedule.OUTSTANDINGAMT,0),
- OUTSTANDINGAMT=0
+ OUTSTANDINGAMT = OUTSTANDINGAMT -
COALESCE(cur_paymentschedule.OUTSTANDINGAMT, 0)
WHERE FIN_PAYMENT_SCHEDULE_ID =
cur_paymentschedule.FIN_PAYMENT_SCHEDULE_ID;
+ -- Getting DueAmount from FIN_PAYMENT_SCHEDULE for the Invoice
+ SELECT coalesce(sum(OUTSTANDINGAMT),0) as DueAmount
+ INTO V_DueAmount
+ FROM FIN_PAYMENT_SCHEDULE
+ WHERE C_INVOICE_ID=P_RECORD_ID
+ AND duedate<=now();
UPDATE C_INVOICE
SET TOTALPAID = TOTALPAID +
COALESCE(cur_paymentschedule.OUTSTANDINGAMT, 0),
- OUTSTANDINGAMT = 0,
- DUEAMT = DUEAMT -
COALESCE(cur_paymentschedule.OUTSTANDINGAMT, 0)
+ OUTSTANDINGAMT = OUTSTANDINGAMT -
COALESCE(cur_paymentschedule.OUTSTANDINGAMT, 0),
+ DUEAMT = V_DueAmount
WHERE C_INVOICE_ID = P_RECORD_ID;
UPDATE C_INVOICE
SET ISPAID = 'Y'
diff -r 310c45e82c0d -r ff8c522e1316
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml
---
a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml
Fri May 13 10:42:25 2011 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml
Fri May 13 18:43:49 2011 +0200
@@ -64,14 +64,14 @@
<!--01B8FF7E7F30432F81D841FFE94E5DD7-->
<ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
<!--01B8FF7E7F30432F81D841FFE94E5DD7-->
<DISPLAYLENGTH><![CDATA[12]]></DISPLAYLENGTH>
<!--01B8FF7E7F30432F81D841FFE94E5DD7--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--01B8FF7E7F30432F81D841FFE94E5DD7--> <SEQNO><![CDATA[105]]></SEQNO>
+<!--01B8FF7E7F30432F81D841FFE94E5DD7--> <SEQNO><![CDATA[70]]></SEQNO>
<!--01B8FF7E7F30432F81D841FFE94E5DD7--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
<!--01B8FF7E7F30432F81D841FFE94E5DD7-->
<ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
<!--01B8FF7E7F30432F81D841FFE94E5DD7-->
<ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
<!--01B8FF7E7F30432F81D841FFE94E5DD7-->
<SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
<!--01B8FF7E7F30432F81D841FFE94E5DD7-->
<ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
<!--01B8FF7E7F30432F81D841FFE94E5DD7-->
<AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--01B8FF7E7F30432F81D841FFE94E5DD7-->
<GRID_SEQNO><![CDATA[60]]></GRID_SEQNO>
+<!--01B8FF7E7F30432F81D841FFE94E5DD7-->
<GRID_SEQNO><![CDATA[70]]></GRID_SEQNO>
<!--01B8FF7E7F30432F81D841FFE94E5DD7-->
<STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
<!--01B8FF7E7F30432F81D841FFE94E5DD7-->
<STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
<!--01B8FF7E7F30432F81D841FFE94E5DD7-->
<ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
@@ -91,7 +91,6 @@
<!--03B212D251EB4117B5C2D3AE1EF09B7A-->
<ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
<!--03B212D251EB4117B5C2D3AE1EF09B7A-->
<DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
<!--03B212D251EB4117B5C2D3AE1EF09B7A--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--03B212D251EB4117B5C2D3AE1EF09B7A--> <SEQNO><![CDATA[10]]></SEQNO>
<!--03B212D251EB4117B5C2D3AE1EF09B7A--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
<!--03B212D251EB4117B5C2D3AE1EF09B7A-->
<ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
<!--03B212D251EB4117B5C2D3AE1EF09B7A-->
<ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -139,7 +138,7 @@
<!--07D342328D8B4289811B84E1E56D45D0-->
<ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
<!--07D342328D8B4289811B84E1E56D45D0-->
<DISPLAYLENGTH><![CDATA[19]]></DISPLAYLENGTH>
<!--07D342328D8B4289811B84E1E56D45D0--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--07D342328D8B4289811B84E1E56D45D0--> <SEQNO><![CDATA[90]]></SEQNO>
+<!--07D342328D8B4289811B84E1E56D45D0--> <SEQNO><![CDATA[60]]></SEQNO>
<!--07D342328D8B4289811B84E1E56D45D0--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
<!--07D342328D8B4289811B84E1E56D45D0-->
<ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
<!--07D342328D8B4289811B84E1E56D45D0-->
<ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -166,14 +165,14 @@
<!--07EC2EF3577B4AAC84EBABCC8DA7C292-->
<ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
<!--07EC2EF3577B4AAC84EBABCC8DA7C292-->
<DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
<!--07EC2EF3577B4AAC84EBABCC8DA7C292--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--07EC2EF3577B4AAC84EBABCC8DA7C292--> <SEQNO><![CDATA[80]]></SEQNO>
+<!--07EC2EF3577B4AAC84EBABCC8DA7C292--> <SEQNO><![CDATA[50]]></SEQNO>
<!--07EC2EF3577B4AAC84EBABCC8DA7C292--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
<!--07EC2EF3577B4AAC84EBABCC8DA7C292-->
<ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
<!--07EC2EF3577B4AAC84EBABCC8DA7C292-->
<ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
<!--07EC2EF3577B4AAC84EBABCC8DA7C292-->
<SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
<!--07EC2EF3577B4AAC84EBABCC8DA7C292-->
<ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
<!--07EC2EF3577B4AAC84EBABCC8DA7C292-->
<AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--07EC2EF3577B4AAC84EBABCC8DA7C292-->
<GRID_SEQNO><![CDATA[60]]></GRID_SEQNO>
+<!--07EC2EF3577B4AAC84EBABCC8DA7C292-->
<GRID_SEQNO><![CDATA[80]]></GRID_SEQNO>
<!--07EC2EF3577B4AAC84EBABCC8DA7C292-->
<STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
<!--07EC2EF3577B4AAC84EBABCC8DA7C292-->
<STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
<!--07EC2EF3577B4AAC84EBABCC8DA7C292-->
<ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
@@ -193,7 +192,7 @@
<!--094DD8003BA24ABA91866634E25D24C2-->
<ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
<!--094DD8003BA24ABA91866634E25D24C2-->
<DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
<!--094DD8003BA24ABA91866634E25D24C2--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--094DD8003BA24ABA91866634E25D24C2--> <SEQNO><![CDATA[90]]></SEQNO>
+<!--094DD8003BA24ABA91866634E25D24C2--> <SEQNO><![CDATA[60]]></SEQNO>
<!--094DD8003BA24ABA91866634E25D24C2--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
<!--094DD8003BA24ABA91866634E25D24C2-->
<ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
<!--094DD8003BA24ABA91866634E25D24C2-->
<ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -247,7 +246,7 @@
<!--1186723500D044EBBDB20410F8E0FED8-->
<ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
<!--1186723500D044EBBDB20410F8E0FED8-->
<DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
<!--1186723500D044EBBDB20410F8E0FED8--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--1186723500D044EBBDB20410F8E0FED8--> <SEQNO><![CDATA[120]]></SEQNO>
+<!--1186723500D044EBBDB20410F8E0FED8--> <SEQNO><![CDATA[90]]></SEQNO>
<!--1186723500D044EBBDB20410F8E0FED8--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
<!--1186723500D044EBBDB20410F8E0FED8-->
<ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
<!--1186723500D044EBBDB20410F8E0FED8-->
<ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -273,7 +272,6 @@
<!--119600FA97BC4B57910B55AE11F01BEB-->
<ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
<!--119600FA97BC4B57910B55AE11F01BEB-->
<DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
<!--119600FA97BC4B57910B55AE11F01BEB--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--119600FA97BC4B57910B55AE11F01BEB--> <SEQNO><![CDATA[10]]></SEQNO>
<!--119600FA97BC4B57910B55AE11F01BEB--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
<!--119600FA97BC4B57910B55AE11F01BEB-->
<ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
<!--119600FA97BC4B57910B55AE11F01BEB-->
<ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -299,14 +297,13 @@
<!--11F8370880F0417BA23C7CC0100FBD57-->
<ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
<!--11F8370880F0417BA23C7CC0100FBD57-->
<DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
<!--11F8370880F0417BA23C7CC0100FBD57--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--11F8370880F0417BA23C7CC0100FBD57--> <SEQNO><![CDATA[130]]></SEQNO>
+<!--11F8370880F0417BA23C7CC0100FBD57--> <SEQNO><![CDATA[90]]></SEQNO>
<!--11F8370880F0417BA23C7CC0100FBD57--> <ISSAMELINE><![CDATA[Y]]></ISSAMELINE>
<!--11F8370880F0417BA23C7CC0100FBD57-->
<ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
<!--11F8370880F0417BA23C7CC0100FBD57-->
<ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
<!--11F8370880F0417BA23C7CC0100FBD57-->
<SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
<!--11F8370880F0417BA23C7CC0100FBD57-->
<ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
<!--11F8370880F0417BA23C7CC0100FBD57-->
<AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--11F8370880F0417BA23C7CC0100FBD57-->
<GRID_SEQNO><![CDATA[90]]></GRID_SEQNO>
<!--11F8370880F0417BA23C7CC0100FBD57-->
<STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
<!--11F8370880F0417BA23C7CC0100FBD57-->
<STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
<!--11F8370880F0417BA23C7CC0100FBD57-->
<ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
@@ -326,7 +323,7 @@
<!--18CBF8AE96B346D9966F40783008C6A2-->
<ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
<!--18CBF8AE96B346D9966F40783008C6A2-->
<DISPLAYLENGTH><![CDATA[10]]></DISPLAYLENGTH>
<!--18CBF8AE96B346D9966F40783008C6A2--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--18CBF8AE96B346D9966F40783008C6A2--> <SEQNO><![CDATA[140]]></SEQNO>
+<!--18CBF8AE96B346D9966F40783008C6A2--> <SEQNO><![CDATA[110]]></SEQNO>
<!--18CBF8AE96B346D9966F40783008C6A2--> <ISSAMELINE><![CDATA[Y]]></ISSAMELINE>
<!--18CBF8AE96B346D9966F40783008C6A2-->
<ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
<!--18CBF8AE96B346D9966F40783008C6A2-->
<ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -353,7 +350,7 @@
<!--19FBF0F2D58C4680ABC4A5EBE144F5C0-->
<ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
<!--19FBF0F2D58C4680ABC4A5EBE144F5C0-->
<DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
<!--19FBF0F2D58C4680ABC4A5EBE144F5C0--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--19FBF0F2D58C4680ABC4A5EBE144F5C0--> <SEQNO><![CDATA[110]]></SEQNO>
+<!--19FBF0F2D58C4680ABC4A5EBE144F5C0--> <SEQNO><![CDATA[70]]></SEQNO>
<!--19FBF0F2D58C4680ABC4A5EBE144F5C0--> <ISSAMELINE><![CDATA[Y]]></ISSAMELINE>
<!--19FBF0F2D58C4680ABC4A5EBE144F5C0-->
<ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
<!--19FBF0F2D58C4680ABC4A5EBE144F5C0-->
<ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -429,7 +426,7 @@
<!--1CA0DBABE3C0410D92CC121714AB2DA6-->
<ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
<!--1CA0DBABE3C0410D92CC121714AB2DA6-->
<DISPLAYLENGTH><![CDATA[19]]></DISPLAYLENGTH>
<!--1CA0DBABE3C0410D92CC121714AB2DA6--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--1CA0DBABE3C0410D92CC121714AB2DA6--> <SEQNO><![CDATA[60]]></SEQNO>
+<!--1CA0DBABE3C0410D92CC121714AB2DA6--> <SEQNO><![CDATA[30]]></SEQNO>
<!--1CA0DBABE3C0410D92CC121714AB2DA6--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
<!--1CA0DBABE3C0410D92CC121714AB2DA6-->
<ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
<!--1CA0DBABE3C0410D92CC121714AB2DA6-->
<ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -481,7 +478,7 @@
<!--1F5BF8D0EB784E60B786C5E6666B5944-->
<ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
<!--1F5BF8D0EB784E60B786C5E6666B5944-->
<DISPLAYLENGTH><![CDATA[19]]></DISPLAYLENGTH>
<!--1F5BF8D0EB784E60B786C5E6666B5944--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--1F5BF8D0EB784E60B786C5E6666B5944--> <SEQNO><![CDATA[40]]></SEQNO>
+<!--1F5BF8D0EB784E60B786C5E6666B5944--> <SEQNO><![CDATA[10]]></SEQNO>
<!--1F5BF8D0EB784E60B786C5E6666B5944--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
<!--1F5BF8D0EB784E60B786C5E6666B5944-->
<ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
<!--1F5BF8D0EB784E60B786C5E6666B5944-->
<ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -583,7 +580,7 @@
<!--274C3E501D074CD3B023C755F8DE548A-->
<ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
<!--274C3E501D074CD3B023C755F8DE548A-->
<DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
<!--274C3E501D074CD3B023C755F8DE548A--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--274C3E501D074CD3B023C755F8DE548A--> <SEQNO><![CDATA[80]]></SEQNO>
+<!--274C3E501D074CD3B023C755F8DE548A--> <SEQNO><![CDATA[50]]></SEQNO>
<!--274C3E501D074CD3B023C755F8DE548A--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
<!--274C3E501D074CD3B023C755F8DE548A-->
<ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
<!--274C3E501D074CD3B023C755F8DE548A-->
<ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -635,7 +632,6 @@
<!--29669BE23C574732A8BE6A8F8A879DAF-->
<ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
<!--29669BE23C574732A8BE6A8F8A879DAF-->
<DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
<!--29669BE23C574732A8BE6A8F8A879DAF--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--29669BE23C574732A8BE6A8F8A879DAF--> <SEQNO><![CDATA[10]]></SEQNO>
<!--29669BE23C574732A8BE6A8F8A879DAF--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
<!--29669BE23C574732A8BE6A8F8A879DAF-->
<ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
<!--29669BE23C574732A8BE6A8F8A879DAF-->
<ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -661,7 +657,6 @@
<!--29C2DD5D908D489A85910DA3C3068621-->
<ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
<!--29C2DD5D908D489A85910DA3C3068621-->
<DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
<!--29C2DD5D908D489A85910DA3C3068621--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--29C2DD5D908D489A85910DA3C3068621--> <SEQNO><![CDATA[10]]></SEQNO>
<!--29C2DD5D908D489A85910DA3C3068621--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
<!--29C2DD5D908D489A85910DA3C3068621-->
<ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
<!--29C2DD5D908D489A85910DA3C3068621-->
<ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -687,7 +682,7 @@
<!--2C3C6561C2DB4025A367330BB9070FCB-->
<ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
<!--2C3C6561C2DB4025A367330BB9070FCB-->
<DISPLAYLENGTH><![CDATA[19]]></DISPLAYLENGTH>
<!--2C3C6561C2DB4025A367330BB9070FCB--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--2C3C6561C2DB4025A367330BB9070FCB--> <SEQNO><![CDATA[110]]></SEQNO>
+<!--2C3C6561C2DB4025A367330BB9070FCB--> <SEQNO><![CDATA[80]]></SEQNO>
<!--2C3C6561C2DB4025A367330BB9070FCB--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
<!--2C3C6561C2DB4025A367330BB9070FCB-->
<ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
<!--2C3C6561C2DB4025A367330BB9070FCB-->
<ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -716,7 +711,7 @@
<!--2E37863A6E9246D8907247CB693F447F-->
<ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
<!--2E37863A6E9246D8907247CB693F447F-->
<DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
<!--2E37863A6E9246D8907247CB693F447F--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--2E37863A6E9246D8907247CB693F447F--> <SEQNO><![CDATA[30]]></SEQNO>
+<!--2E37863A6E9246D8907247CB693F447F--> <SEQNO><![CDATA[10]]></SEQNO>
<!--2E37863A6E9246D8907247CB693F447F--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
<!--2E37863A6E9246D8907247CB693F447F-->
<ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
<!--2E37863A6E9246D8907247CB693F447F-->
<ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -766,14 +761,14 @@
<!--2FF77BE337D74C23BE0AF89A815C2FD3-->
<ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
<!--2FF77BE337D74C23BE0AF89A815C2FD3-->
<DISPLAYLENGTH><![CDATA[12]]></DISPLAYLENGTH>
<!--2FF77BE337D74C23BE0AF89A815C2FD3--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--2FF77BE337D74C23BE0AF89A815C2FD3--> <SEQNO><![CDATA[110]]></SEQNO>
+<!--2FF77BE337D74C23BE0AF89A815C2FD3--> <SEQNO><![CDATA[80]]></SEQNO>
<!--2FF77BE337D74C23BE0AF89A815C2FD3--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
<!--2FF77BE337D74C23BE0AF89A815C2FD3-->
<ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
<!--2FF77BE337D74C23BE0AF89A815C2FD3-->
<ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
<!--2FF77BE337D74C23BE0AF89A815C2FD3-->
<SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
<!--2FF77BE337D74C23BE0AF89A815C2FD3-->
<ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
<!--2FF77BE337D74C23BE0AF89A815C2FD3-->
<AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--2FF77BE337D74C23BE0AF89A815C2FD3-->
<GRID_SEQNO><![CDATA[50]]></GRID_SEQNO>
+<!--2FF77BE337D74C23BE0AF89A815C2FD3-->
<GRID_SEQNO><![CDATA[70]]></GRID_SEQNO>
<!--2FF77BE337D74C23BE0AF89A815C2FD3-->
<STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
<!--2FF77BE337D74C23BE0AF89A815C2FD3-->
<STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
<!--2FF77BE337D74C23BE0AF89A815C2FD3-->
<ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
@@ -842,7 +837,6 @@
<!--344DBD51F19444C3A50D67480A4925B7-->
<ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
------------------------------------------------------------------------------
Achieve unprecedented app performance and reliability
What every C/C++ and Fortran developer should know.
Learn how Intel has extended the reach of its next-generation tools
to help boost performance applications - inlcuding clusters.
http://p.sf.net/sfu/intel-dev2devmay
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
