details: /erp/devel/pi/rev/394d01e28e38
changeset: 8413:394d01e28e38
user: Adrián Romero <adrianromero <at> openbravo.com>
date: Wed Sep 15 17:41:15 2010 +0200
summary: Backed out changeset dd3183be1a44
Issue 14479
details: /erp/devel/pi/rev/a83687dfd69c
changeset: 8414:a83687dfd69c
user: Adrián Romero <adrianromero <at> openbravo.com>
date: Wed Sep 15 17:42:14 2010 +0200
summary: Merge with previous
Issue 14479
diffstat:
src-db/database/model/functions/MRP_RUN_INITIALIZE.xml | 2 +
src-db/database/model/functions/M_INOUT_CREATEINVOICE.xml | 12 +-
src-db/database/sourcedata/AD_COLUMN.xml | 17 +-
src-db/database/sourcedata/AD_ELEMENT.xml | 14 +-
src-db/database/sourcedata/AD_FIELD.xml | 38 +-
src-db/database/sourcedata/AD_MESSAGE.xml | 4 +-
src-db/database/sourcedata/AD_REF_LIST.xml | 2 +-
src-db/src/com/openbravo/db/OpenbravoExcludeFilter.java | 4 +-
src/org/openbravo/erpCommon/ad_forms/AcctServer.java | 15 +
src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransaction.java | 63 +-
src/org/openbravo/erpCommon/ad_forms/DocFINReconciliation.java | 188
+++++++++-
src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance.java | 12 +-
src/org/openbravo/erpReports/C_OrderJR.jrxml | 10 +-
src/org/openbravo/erpReports/RptC_Invoice.jrxml | 7 +-
src/org/openbravo/erpReports/RptC_OrderPO.jrxml | 5 +-
src/org/openbravo/erpReports/RptM_InOut.jrxml | 7 +-
16 files changed, 301 insertions(+), 99 deletions(-)
diffs (truncated from 983 to 300 lines):
diff -r dd3183be1a44 -r a83687dfd69c
src-db/database/model/functions/MRP_RUN_INITIALIZE.xml
--- a/src-db/database/model/functions/MRP_RUN_INITIALIZE.xml Tue Sep 14
17:54:00 2010 +0200
+++ b/src-db/database/model/functions/MRP_RUN_INITIALIZE.xml Wed Sep 15
17:42:14 2010 +0200
@@ -137,6 +137,7 @@
--AND C_Order_Status(o.C_ORDER_ID)
IN (1, 2, 3)
AND o.PROCESSED = 'Y'
AND ol.QTYORDERED <> ol.QTYDELIVERED
+ AND ol.m_product_id = p.m_product_id
AND ol.DatePromised IS NOT NULL
AND Mrp_Check_Planningmethod(
COALESCE(po.MRP_PlanningMethod_ID, p.MRP_PlanningMethod_ID),
@@ -147,6 +148,7 @@
WHERE sf.MRP_SALESFORECAST_ID =
sfl.MRP_SALESFORECAST_ID
AND sf.IsActive = 'Y'
AND sf.C_BPartner_ID =
bp.C_BPartner_ID
+ AND sfl.m_product_id =
p.m_product_id
AND bp.C_BP_Group_ID =
p_BP_Group_ID
AND Mrp_Check_Planningmethod(
COALESCE(po.MRP_PlanningMethod_ID, p.MRP_PlanningMethod_ID),
diff -r dd3183be1a44 -r a83687dfd69c
src-db/database/model/functions/M_INOUT_CREATEINVOICE.xml
--- a/src-db/database/model/functions/M_INOUT_CREATEINVOICE.xml Tue Sep 14
17:54:00 2010 +0200
+++ b/src-db/database/model/functions/M_INOUT_CREATEINVOICE.xml Wed Sep 15
17:42:14 2010 +0200
@@ -85,6 +85,7 @@
v_C_PaymentTerm_ID VARCHAR2(32) ;
v_C_Currency_ID VARCHAR2(32) ;
v_M_PriceList_ID VARCHAR2(32) ;
+ v_FIN_PaymentMethod_ID VARCHAR2(32) ;
--
v_C_UOM_ID VARCHAR2(32) ;
v_C_Tax_ID VARCHAR2(32) ;
@@ -168,9 +169,9 @@
IF(CUR_Shipment.C_Order_ID IS NOT NULL) THEN
v_ResultStr:='GetCurrencyInfo-Order';
SELECT C_Currency_ID,
- M_PriceList_ID
+ M_PriceList_ID, FIN_PaymentMethod_ID
INTO v_C_Currency_ID,
- v_M_PriceList_ID
+ v_M_PriceList_ID, v_FIN_PaymentMethod_ID
FROM C_ORDER
WHERE C_Order_ID=CUR_Shipment.C_Order_ID;
ELSE
@@ -183,6 +184,9 @@
M_PRICELIST_VERSION plv
WHERE pl.M_PriceList_ID=plv.M_PriceList_ID
AND M_PriceList_Version_ID=v_M_PriceList_Version_ID;
+ SELECT po_paymentmethod_id INTO v_FIN_PaymentMethod_ID
+ FROM c_bpartner
+ WHERE c_bpartner_id = CUR_Shipment.C_BPartner_ID;
END IF;
--
v_ResultStr:='GetDocTypeInfo';
@@ -214,7 +218,7 @@
C_Currency_ID, PaymentRule, C_Charge_ID, ChargeAmt,
TotalLines, GrandTotal, M_PriceList_ID, C_Campaign_ID,
C_Project_ID, C_Activity_ID, AD_OrgTrx_ID, User1_ID,
- User2_ID
+ User2_ID, fin_paymentmethod_id
)
VALUES
(
@@ -229,7 +233,7 @@
v_C_Currency_ID, v_PaymentRule, NULL, 0,
0, 0, v_M_PriceList_ID, CUR_Shipment.C_Campaign_ID,
CUR_Shipment.C_Project_ID, CUR_Shipment.C_Activity_ID,
CUR_Shipment.AD_OrgTrx_ID, CUR_Shipment.User1_ID,
- CUR_Shipment.User2_ID
+ CUR_Shipment.User2_ID, v_fin_paymentmethod_id
)
;
-- Lines
diff -r dd3183be1a44 -r a83687dfd69c src-db/database/sourcedata/AD_COLUMN.xml
--- a/src-db/database/sourcedata/AD_COLUMN.xml Tue Sep 14 17:54:00 2010 +0200
+++ b/src-db/database/sourcedata/AD_COLUMN.xml Wed Sep 15 17:42:14 2010 +0200
@@ -46991,7 +46991,7 @@
<!--2920--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--2920--> <NAME><![CDATA[Credit Limit]]></NAME>
<!--2920--> <DESCRIPTION><![CDATA[Total outstanding invoice amounts
allowed]]></DESCRIPTION>
-<!--2920--> <HELP><![CDATA[The Credit Limit indicates the total amount
allowed 'on account'. If this is exceeded a warning message will be
generated.]]></HELP>
+<!--2920--> <HELP><![CDATA[The Credit Line Limit indicates the total amount
allowed 'on account'. If this is exceeded a warning message will be
generated.]]></HELP>
<!--2920--> <COLUMNNAME><![CDATA[SO_CreditLimit]]></COLUMNNAME>
<!--2920--> <AD_TABLE_ID><![CDATA[291]]></AD_TABLE_ID>
<!--2920--> <AD_REFERENCE_ID><![CDATA[12]]></AD_REFERENCE_ID>
@@ -47023,7 +47023,7 @@
<!--2921--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--2921--> <NAME><![CDATA[Credit Used]]></NAME>
<!--2921--> <DESCRIPTION><![CDATA[Current open balance]]></DESCRIPTION>
-<!--2921--> <HELP><![CDATA[The Credit Used indicates the total amount of open
or unpaid invoices for this Business Partner.]]></HELP>
+<!--2921--> <HELP><![CDATA[The Customer Balance indicates the total amount of
open or unpaid invoices for this Business Partner.]]></HELP>
<!--2921--> <COLUMNNAME><![CDATA[SO_CreditUsed]]></COLUMNNAME>
<!--2921--> <AD_TABLE_ID><![CDATA[291]]></AD_TABLE_ID>
<!--2921--> <AD_REFERENCE_ID><![CDATA[12]]></AD_REFERENCE_ID>
@@ -119745,7 +119745,7 @@
<!--7571--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--7571--> <NAME><![CDATA[Credit Used]]></NAME>
<!--7571--> <DESCRIPTION><![CDATA[Current open balance]]></DESCRIPTION>
-<!--7571--> <HELP><![CDATA[The Credit Used indicates the total amount of open
or unpaid invoices for this Business Partner.]]></HELP>
+<!--7571--> <HELP><![CDATA[The Customer Balance indicates the total amount of
open or unpaid invoices for this Business Partner.]]></HELP>
<!--7571--> <COLUMNNAME><![CDATA[SO_CreditUsed]]></COLUMNNAME>
<!--7571--> <AD_TABLE_ID><![CDATA[520]]></AD_TABLE_ID>
<!--7571--> <AD_REFERENCE_ID><![CDATA[12]]></AD_REFERENCE_ID>
@@ -119877,7 +119877,7 @@
<!--7575--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--7575--> <NAME><![CDATA[Credit Limit]]></NAME>
<!--7575--> <DESCRIPTION><![CDATA[Total outstanding invoice amounts
allowed]]></DESCRIPTION>
-<!--7575--> <HELP><![CDATA[The Credit Limit indicates the total amount
allowed 'on account'. If this is exceeded a warning message will be
generated.]]></HELP>
+<!--7575--> <HELP><![CDATA[The Credit Line Limit indicates the total amount
allowed 'on account'. If this is exceeded a warning message will be
generated.]]></HELP>
<!--7575--> <COLUMNNAME><![CDATA[SO_CreditLimit]]></COLUMNNAME>
<!--7575--> <AD_TABLE_ID><![CDATA[520]]></AD_TABLE_ID>
<!--7575--> <AD_REFERENCE_ID><![CDATA[12]]></AD_REFERENCE_ID>
@@ -288927,7 +288927,6 @@
<!--7891269C83DE655DE040007F010155CE--> <ISPARENT><![CDATA[N]]></ISPARENT>
<!--7891269C83DE655DE040007F010155CE-->
<ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
<!--7891269C83DE655DE040007F010155CE-->
<ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
-<!--7891269C83DE655DE040007F010155CE-->
<READONLYLOGIC><![cda...@processed@='Y']]></READONLYLOGIC>
<!--7891269C83DE655DE040007F010155CE-->
<ISIDENTIFIER><![CDATA[Y]]></ISIDENTIFIER>
<!--7891269C83DE655DE040007F010155CE--> <SEQNO><![CDATA[150]]></SEQNO>
<!--7891269C83DE655DE040007F010155CE-->
<ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
@@ -300816,7 +300815,8 @@
<!--828EE0AE802D5FA1E040007F010067C7--> <DESCRIPTION><![CDATA[It is the
method by which payment is expected to be made or received.]]></DESCRIPTION>
<!--828EE0AE802D5FA1E040007F010067C7-->
<COLUMNNAME><![CDATA[FIN_Paymentmethod_ID]]></COLUMNNAME>
<!--828EE0AE802D5FA1E040007F010067C7-->
<AD_TABLE_ID><![CDATA[291]]></AD_TABLE_ID>
-<!--828EE0AE802D5FA1E040007F010067C7-->
<AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--828EE0AE802D5FA1E040007F010067C7-->
<AD_REFERENCE_ID><![CDATA[18]]></AD_REFERENCE_ID>
+<!--828EE0AE802D5FA1E040007F010067C7-->
<AD_REFERENCE_VALUE_ID><![CDATA[EED0EF97D4A7421687F3B365D009E7A6]]></AD_REFERENCE_VALUE_ID>
<!--828EE0AE802D5FA1E040007F010067C7-->
<FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
<!--828EE0AE802D5FA1E040007F010067C7--> <ISKEY><![CDATA[N]]></ISKEY>
<!--828EE0AE802D5FA1E040007F010067C7--> <ISPARENT><![CDATA[N]]></ISPARENT>
@@ -300883,7 +300883,8 @@
<!--828EE0AE802F5FA1E040007F010067C7--> <HELP><![CDATA[Financial account used
to deposit / withdrawal money such as bank accounts or petty cash]]></HELP>
<!--828EE0AE802F5FA1E040007F010067C7-->
<COLUMNNAME><![CDATA[FIN_Financial_Account_ID]]></COLUMNNAME>
<!--828EE0AE802F5FA1E040007F010067C7-->
<AD_TABLE_ID><![CDATA[291]]></AD_TABLE_ID>
-<!--828EE0AE802F5FA1E040007F010067C7-->
<AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--828EE0AE802F5FA1E040007F010067C7-->
<AD_REFERENCE_ID><![CDATA[18]]></AD_REFERENCE_ID>
+<!--828EE0AE802F5FA1E040007F010067C7-->
<AD_REFERENCE_VALUE_ID><![CDATA[DF1CEA94B3564A33AFDB37C07E1CE353]]></AD_REFERENCE_VALUE_ID>
<!--828EE0AE802F5FA1E040007F010067C7-->
<FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
<!--828EE0AE802F5FA1E040007F010067C7--> <ISKEY><![CDATA[N]]></ISKEY>
<!--828EE0AE802F5FA1E040007F010067C7--> <ISPARENT><![CDATA[N]]></ISPARENT>
@@ -300912,6 +300913,8 @@
<!--828EE0AE80305FA1E040007F010067C7--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--828EE0AE80305FA1E040007F010067C7--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--828EE0AE80305FA1E040007F010067C7--> <NAME><![CDATA[PO Financial
Account]]></NAME>
+<!--828EE0AE80305FA1E040007F010067C7--> <DESCRIPTION><![CDATA[Financial
account used to deposit / withdrawal money such as bank accounts or petty
cash]]></DESCRIPTION>
+<!--828EE0AE80305FA1E040007F010067C7--> <HELP><![CDATA[Financial account used
to deposit / withdrawal money such as bank accounts or petty cash]]></HELP>
<!--828EE0AE80305FA1E040007F010067C7-->
<COLUMNNAME><![CDATA[PO_Financial_Account_ID]]></COLUMNNAME>
<!--828EE0AE80305FA1E040007F010067C7-->
<AD_TABLE_ID><![CDATA[291]]></AD_TABLE_ID>
<!--828EE0AE80305FA1E040007F010067C7-->
<AD_REFERENCE_ID><![CDATA[18]]></AD_REFERENCE_ID>
diff -r dd3183be1a44 -r a83687dfd69c src-db/database/sourcedata/AD_ELEMENT.xml
--- a/src-db/database/sourcedata/AD_ELEMENT.xml Tue Sep 14 17:54:00 2010 +0200
+++ b/src-db/database/sourcedata/AD_ELEMENT.xml Wed Sep 15 17:42:14 2010 +0200
@@ -3871,10 +3871,10 @@
<!--553--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--553--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--553--> <COLUMNNAME><![CDATA[SO_CreditLimit]]></COLUMNNAME>
-<!--553--> <NAME><![CDATA[Credit Limit]]></NAME>
-<!--553--> <PRINTNAME><![CDATA[Credit Limit]]></PRINTNAME>
+<!--553--> <NAME><![CDATA[Credit Line Limit]]></NAME>
+<!--553--> <PRINTNAME><![CDATA[Credit Line Limit]]></PRINTNAME>
<!--553--> <DESCRIPTION><![CDATA[Total outstanding invoice amounts
allowed]]></DESCRIPTION>
-<!--553--> <HELP><![CDATA[The Credit Limit indicates the total amount allowed
'on account'. If this is exceeded a warning message will be
generated.]]></HELP>
+<!--553--> <HELP><![CDATA[The Credit Line Limit indicates the total amount
allowed 'on account'. If this is exceeded a warning message will be
generated.]]></HELP>
<!--553--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--553--></AD_ELEMENT>
@@ -3884,10 +3884,10 @@
<!--554--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--554--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--554--> <COLUMNNAME><![CDATA[SO_CreditUsed]]></COLUMNNAME>
-<!--554--> <NAME><![CDATA[Credit Used]]></NAME>
-<!--554--> <PRINTNAME><![CDATA[Credit Used]]></PRINTNAME>
+<!--554--> <NAME><![CDATA[Customer Balance]]></NAME>
+<!--554--> <PRINTNAME><![CDATA[Customer Balance]]></PRINTNAME>
<!--554--> <DESCRIPTION><![CDATA[Current open balance]]></DESCRIPTION>
-<!--554--> <HELP><![CDATA[The Credit Used indicates the total amount of open
or unpaid invoices for this Business Partner.]]></HELP>
+<!--554--> <HELP><![CDATA[The Customer Balance indicates the total amount of
open or unpaid invoices for this Business Partner.]]></HELP>
<!--554--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--554--></AD_ELEMENT>
@@ -26336,6 +26336,8 @@
<!--828EE0AE80325FA1E040007F010067C7-->
<COLUMNNAME><![CDATA[PO_Financial_Account_ID]]></COLUMNNAME>
<!--828EE0AE80325FA1E040007F010067C7--> <NAME><![CDATA[PO Financial
account]]></NAME>
<!--828EE0AE80325FA1E040007F010067C7--> <PRINTNAME><![CDATA[PO Financial
account]]></PRINTNAME>
+<!--828EE0AE80325FA1E040007F010067C7--> <DESCRIPTION><![CDATA[Financial
account used to deposit / withdrawal money such as bank accounts or petty
cash]]></DESCRIPTION>
+<!--828EE0AE80325FA1E040007F010067C7--> <HELP><![CDATA[Financial account used
to deposit / withdrawal money such as bank accounts or petty cash]]></HELP>
<!--828EE0AE80325FA1E040007F010067C7-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--828EE0AE80325FA1E040007F010067C7--></AD_ELEMENT>
diff -r dd3183be1a44 -r a83687dfd69c src-db/database/sourcedata/AD_FIELD.xml
--- a/src-db/database/sourcedata/AD_FIELD.xml Tue Sep 14 17:54:00 2010 +0200
+++ b/src-db/database/sourcedata/AD_FIELD.xml Wed Sep 15 17:42:14 2010 +0200
@@ -27134,9 +27134,9 @@
<!--2427--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
<!--2427--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--2427--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--2427--> <NAME><![CDATA[Credit Limit]]></NAME>
+<!--2427--> <NAME><![CDATA[Credit Line Limit]]></NAME>
<!--2427--> <DESCRIPTION><![CDATA[Total outstanding invoice amounts
allowed]]></DESCRIPTION>
-<!--2427--> <HELP><![CDATA[The Credit Limit indicates the total amount
allowed 'on account'. If this is exceeded a warning message will be
generated.]]></HELP>
+<!--2427--> <HELP><![CDATA[The Credit Line Limit indicates the total amount
allowed 'on account'. If this is exceeded a warning message will be
generated.]]></HELP>
<!--2427--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
<!--2427--> <AD_TAB_ID><![CDATA[223]]></AD_TAB_ID>
<!--2427--> <AD_COLUMN_ID><![CDATA[2920]]></AD_COLUMN_ID>
@@ -27158,9 +27158,9 @@
<!--2428--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
<!--2428--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--2428--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--2428--> <NAME><![CDATA[Credit Used]]></NAME>
+<!--2428--> <NAME><![CDATA[Customer Balance]]></NAME>
<!--2428--> <DESCRIPTION><![CDATA[Current open balance]]></DESCRIPTION>
-<!--2428--> <HELP><![CDATA[The Credit Used indicates the total amount of open
or unpaid invoices for this Business Partner.]]></HELP>
+<!--2428--> <HELP><![CDATA[The Customer Balance indicates the total amount of
open or unpaid invoices for this Business Partner.]]></HELP>
<!--2428--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
<!--2428--> <AD_TAB_ID><![CDATA[223]]></AD_TAB_ID>
<!--2428--> <AD_COLUMN_ID><![CDATA[2921]]></AD_COLUMN_ID>
@@ -37437,9 +37437,9 @@
<!--3277--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
<!--3277--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--3277--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--3277--> <NAME><![CDATA[Credit Used]]></NAME>
+<!--3277--> <NAME><![CDATA[Customer Balance]]></NAME>
<!--3277--> <DESCRIPTION><![CDATA[Current open balance]]></DESCRIPTION>
-<!--3277--> <HELP><![CDATA[The Credit Used indicates the total amount of open
or unpaid invoices for this Business Partner.]]></HELP>
+<!--3277--> <HELP><![CDATA[The Customer Balance indicates the total amount of
open or unpaid invoices for this Business Partner.]]></HELP>
<!--3277--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
<!--3277--> <AD_TAB_ID><![CDATA[220]]></AD_TAB_ID>
<!--3277--> <AD_COLUMN_ID><![CDATA[2921]]></AD_COLUMN_ID>
@@ -174158,7 +174158,7 @@
<!--1002100045--> <AD_COLUMN_ID><![CDATA[1002100012]]></AD_COLUMN_ID>
<!--1002100045--> <AD_FIELDGROUP_ID><![CDATA[101]]></AD_FIELDGROUP_ID>
<!--1002100045--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--1002100045--> <DISPLAYLOGIC><![cda...@financialmanagement@='' &
@financialmanagement...@='N']]></DISPLAYLOGIC>
+<!--1002100045-->
<DISPLAYLOGIC><![cda...@financialmanagement@='']]></DISPLAYLOGIC>
<!--1002100045--> <DISPLAYLENGTH><![CDATA[12]]></DISPLAYLENGTH>
<!--1002100045--> <ISREADONLY><![CDATA[Y]]></ISREADONLY>
<!--1002100045--> <SEQNO><![CDATA[420]]></SEQNO>
@@ -175835,7 +175835,7 @@
<!--1002100233--> <AD_TAB_ID><![CDATA[290]]></AD_TAB_ID>
<!--1002100233--> <AD_COLUMN_ID><![CDATA[1002100009]]></AD_COLUMN_ID>
<!--1002100233--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--1002100233--> <DISPLAYLOGIC><![cda...@financialmanagement@='' &
@financialmanagement...@='N']]></DISPLAYLOGIC>
+<!--1002100233--> <DISPLAYLOGIC><![cda...@financialmanagement@=''
]]></DISPLAYLOGIC>
<!--1002100233--> <DISPLAYLENGTH><![CDATA[12]]></DISPLAYLENGTH>
<!--1002100233--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
<!--1002100233--> <SEQNO><![CDATA[240]]></SEQNO>
@@ -195459,7 +195459,7 @@
<!--7C541AC0C76CFDD7E040007F01016B4D-->
<AD_COLUMN_ID><![CDATA[7891269C83DE655DE040007F010155CE]]></AD_COLUMN_ID>
<!--7C541AC0C76CFDD7E040007F01016B4D-->
<ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
<!--7C541AC0C76CFDD7E040007F01016B4D-->
<DISPLAYLENGTH><![CDATA[12]]></DISPLAYLENGTH>
-<!--7C541AC0C76CFDD7E040007F01016B4D--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--7C541AC0C76CFDD7E040007F01016B4D--> <ISREADONLY><![CDATA[Y]]></ISREADONLY>
<!--7C541AC0C76CFDD7E040007F01016B4D--> <SEQNO><![CDATA[130]]></SEQNO>
<!--7C541AC0C76CFDD7E040007F01016B4D--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
<!--7C541AC0C76CFDD7E040007F01016B4D-->
<ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
@@ -199542,6 +199542,7 @@
<!--830698140BED4AC3E040007F01000289-->
<AD_COLUMN_ID><![CDATA[828EE0AE800F5FA1E040007F010067C7]]></AD_COLUMN_ID>
<!--830698140BED4AC3E040007F01000289-->
<AD_FIELDGROUP_ID><![CDATA[800000]]></AD_FIELDGROUP_ID>
<!--830698140BED4AC3E040007F01000289-->
<ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--830698140BED4AC3E040007F01000289-->
<DISPLAYLOGIC><![cda...@$element_ay@='Y']]></DISPLAYLOGIC>
<!--830698140BED4AC3E040007F01000289-->
<DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
<!--830698140BED4AC3E040007F01000289--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
<!--830698140BED4AC3E040007F01000289--> <SEQNO><![CDATA[180]]></SEQNO>
@@ -199566,6 +199567,7 @@
<!--830698140BEE4AC3E040007F01000289-->
<AD_COLUMN_ID><![CDATA[828EE0AE800E5FA1E040007F010067C7]]></AD_COLUMN_ID>
<!--830698140BEE4AC3E040007F01000289-->
<AD_FIELDGROUP_ID><![CDATA[800000]]></AD_FIELDGROUP_ID>
<!--830698140BEE4AC3E040007F01000289-->
<ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--830698140BEE4AC3E040007F01000289-->
<DISPLAYLOGIC><![cda...@$element_mc@='Y']]></DISPLAYLOGIC>
<!--830698140BEE4AC3E040007F01000289-->
<DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
<!--830698140BEE4AC3E040007F01000289--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
<!--830698140BEE4AC3E040007F01000289--> <SEQNO><![CDATA[190]]></SEQNO>
@@ -199590,6 +199592,7 @@
<!--830698140BEF4AC3E040007F01000289-->
<AD_COLUMN_ID><![CDATA[828EE0AE800D5FA1E040007F010067C7]]></AD_COLUMN_ID>
<!--830698140BEF4AC3E040007F01000289-->
<AD_FIELDGROUP_ID><![CDATA[800000]]></AD_FIELDGROUP_ID>
<!--830698140BEF4AC3E040007F01000289-->
<ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--830698140BEF4AC3E040007F01000289-->
<DISPLAYLOGIC><![cda...@$element_pj@='Y']]></DISPLAYLOGIC>
<!--830698140BEF4AC3E040007F01000289-->
<DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
<!--830698140BEF4AC3E040007F01000289--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
<!--830698140BEF4AC3E040007F01000289--> <SEQNO><![CDATA[170]]></SEQNO>
@@ -199614,6 +199617,7 @@
<!--830698140BF04AC3E040007F01000289-->
<AD_COLUMN_ID><![CDATA[828EE0AE80105FA1E040007F010067C7]]></AD_COLUMN_ID>
<!--830698140BF04AC3E040007F01000289-->
<AD_FIELDGROUP_ID><![CDATA[800000]]></AD_FIELDGROUP_ID>
<!--830698140BF04AC3E040007F01000289-->
<ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--830698140BF04AC3E040007F01000289-->
<DISPLAYLOGIC><![cda...@$element_u1@='Y']]></DISPLAYLOGIC>
<!--830698140BF04AC3E040007F01000289-->
<DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
<!--830698140BF04AC3E040007F01000289--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
<!--830698140BF04AC3E040007F01000289--> <SEQNO><![CDATA[200]]></SEQNO>
@@ -199638,6 +199642,7 @@
<!--830698140BF14AC3E040007F01000289-->
<AD_COLUMN_ID><![CDATA[828EE0AE80115FA1E040007F010067C7]]></AD_COLUMN_ID>
<!--830698140BF14AC3E040007F01000289-->
<AD_FIELDGROUP_ID><![CDATA[800000]]></AD_FIELDGROUP_ID>
<!--830698140BF14AC3E040007F01000289-->
<ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--830698140BF14AC3E040007F01000289-->
<DISPLAYLOGIC><![cda...@$element_u2@='Y']]></DISPLAYLOGIC>
<!--830698140BF14AC3E040007F01000289-->
<DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
<!--830698140BF14AC3E040007F01000289--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
<!--830698140BF14AC3E040007F01000289--> <SEQNO><![CDATA[210]]></SEQNO>
@@ -199662,6 +199667,7 @@
<!--830698140BF24AC3E040007F01000289-->
<AD_COLUMN_ID><![CDATA[828EE0AE800F5FA1E040007F010067C7]]></AD_COLUMN_ID>
<!--830698140BF24AC3E040007F01000289-->
<AD_FIELDGROUP_ID><![CDATA[800000]]></AD_FIELDGROUP_ID>
<!--830698140BF24AC3E040007F01000289-->
<ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--830698140BF24AC3E040007F01000289-->
<DISPLAYLOGIC><![cda...@$element_ay@='Y']]></DISPLAYLOGIC>
<!--830698140BF24AC3E040007F01000289-->
<DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
<!--830698140BF24AC3E040007F01000289--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
<!--830698140BF24AC3E040007F01000289--> <SEQNO><![CDATA[180]]></SEQNO>
------------------------------------------------------------------------------
Start uncovering the many advantages of virtual appliances
and start using them to simplify application deployment and
accelerate your shift to cloud computing.
http://p.sf.net/sfu/novell-sfdev2dev
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
