details: /erp/devel/pi/rev/e5c51e8fd720
changeset: 8539:e5c51e8fd720
user: Adrián Romero <adrianromero <at> openbravo.com>
date: Mon Oct 04 16:58:09 2010 +0200
summary: Fixes issue 0014750: I can not access to the application when there
are many organizations.
It has been modified the logic that builds the list of organizations reading
directly the table AD_ROLE_ORGACCESS instead the ORGLIST and CLIENTLIST fields
The fields ORGLIST and CLIENTLIST has been marked as deprecated
The AD_ROLE_ORG_ACCESS has been shielded if the organizations list or clients
list is too long
details: /erp/devel/pi/rev/53f73a88a984
changeset: 8540:53f73a88a984
user: Adrián Romero <adrianromero <at> openbravo.com>
date: Wed Oct 13 15:56:23 2010 +0200
summary: merge
details: /erp/devel/pi/rev/ff88423ee721
changeset: 8541:ff88423ee721
user: Adrián Romero <adrianromero <at> openbravo.com>
date: Thu Oct 14 18:51:38 2010 +0200
summary: merge
diffstat:
build.xml
| 2 +-
src-core/src/org/openbravo/base/BuildTask.java
| 3 +-
src-db/database/lib/dbsourcemanager.jar
| 0
src-db/database/model/functions/C_BANKSTATEMENT_POST.xml
| 16 +
src-db/database/model/functions/C_INVOICE_POST.xml
| 2 +-
src-db/database/model/functions/MRP_PURCHASEORDER.xml
| 11 +-
src-db/database/model/tables/AD_USER.xml
| 2 +-
src-db/database/model/triggers/AD_ROLE_ORGACCESS_TRG.xml
| 24 +-
src-db/database/sourcedata/AD_COLUMN.xml
| 18 +-
src-db/database/sourcedata/AD_ELEMENT.xml
| 2 +-
src-db/database/sourcedata/AD_FIELD.xml
| 16 +-
src-db/database/sourcedata/AD_MESSAGE.xml
| 68 +++++
src-db/database/sourcedata/AD_PROCESS.xml
| 3 +-
src-db/database/sourcedata/AD_REF_LIST.xml
| 12 +
src-db/database/sourcedata/AD_TEXTINTERFACES.xml
| 128 ++++-----
src-db/database/sourcedata/AD_VAL_RULE.xml
| 24 +
src-wad/src/org/openbravo/wad/javasource.javaxml
| 29 ++-
src/org/openbravo/base/secureApp/LoginUtils.java
| 39 ++-
src/org/openbravo/erpCommon/ad_actionButton/ExpenseSOrder.html
| 6 +-
src/org/openbravo/erpCommon/ad_actionButton/ExpenseSOrder.java
| 18 +-
src/org/openbravo/erpCommon/ad_actionButton/ExpenseSOrder.xml
| 8 +-
src/org/openbravo/erpCommon/ad_callouts/SE_PaymentMethod_FinAccount.java
| 18 +-
src/org/openbravo/erpCommon/ad_callouts/SL_Invoice_Product.java
| 2 +-
src/org/openbravo/erpCommon/ad_callouts/SL_Requisition_BPartner.java
| 12 +-
src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransaction.java
| 8 +-
src/org/openbravo/erpCommon/ad_forms/DocInvoice.java
| 23 +-
src/org/openbravo/erpCommon/ad_forms/DocInvoice_data.xsql
| 19 +-
src/org/openbravo/erpCommon/ad_forms/ModuleManagement.java
| 45 +++-
src/org/openbravo/erpCommon/ad_forms/ModuleManagementInstalled.html
| 12 +
src/org/openbravo/erpCommon/ad_forms/ModuleManagement_data.xsql
| 10 +-
src/org/openbravo/erpCommon/ad_forms/RequisitionToOrder.java
| 27 ++-
src/org/openbravo/erpCommon/ad_process/ChangeOrderOrg.java
| 26 +-
src/org/openbravo/erpCommon/ad_process/ExpenseAPInvoice.java
| 68 ++++-
src/org/openbravo/erpCommon/ad_process/ExpenseAPInvoice_data.xsql
| 24 +-
src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReportsPDF.fo
| 12 +-
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceVendorDimensionalAnalysesJR.java
| 13 +-
src/org/openbravo/erpCommon/ad_reports/ReportOrderNotInvoiceJR.java
| 13 +-
src/org/openbravo/erpCommon/ad_reports/ReportPurchaseDimensionalAnalysesJR.java
| 13 +-
src/org/openbravo/erpCommon/ad_reports/ReportRefundSalesDimensionalAnalyses.java
| 13 +-
src/org/openbravo/erpCommon/ad_reports/ReportSalesDimensionalAnalyzeJR.java
| 13 +-
src/org/openbravo/erpCommon/ad_reports/ReportShipmentDimensionalAnalyzeJR.java
| 13 +-
src/org/openbravo/erpCommon/ad_reports/ReportTaxInvoice.java
| 15 +-
src/org/openbravo/erpCommon/ad_reports/ReportTaxInvoiceJR.java
| 14 +-
src/org/openbravo/erpCommon/info/AccountElementValue.java
| 2 +-
src/org/openbravo/erpCommon/info/AccountElementValue_data.xsql
| 4 +-
src/org/openbravo/erpCommon/modules/VersionUtility.java
| 19 +-
src/org/openbravo/erpCommon/security/Login.java
| 22 +
src/org/openbravo/erpCommon/security/Login_F1.html
| 2 +-
src/org/openbravo/erpCommon/utility/DynamicJS.java
| 12 +-
src/org/openbravo/erpCommon/utility/OBError.java
| 11 +
web/js/utils.js
| 4 +-
51 files changed, 705 insertions(+), 215 deletions(-)
diffs (truncated from 2128 to 300 lines):
diff -r 331c9ca70ae9 -r ff88423ee721 build.xml
--- a/build.xml Fri Oct 01 11:19:40 2010 +0200
+++ b/build.xml Thu Oct 14 18:51:38 2010 +0200
@@ -722,7 +722,7 @@
</target>
- <target name="apply.modules" depends="update.database.mod">
+ <target name="apply.modules">
<condition property="apply.modules.complete.compilation.var">
<istrue value="${apply.modules.complete.compilation}" />
diff -r 331c9ca70ae9 -r ff88423ee721
src-core/src/org/openbravo/base/BuildTask.java
--- a/src-core/src/org/openbravo/base/BuildTask.java Fri Oct 01 11:19:40
2010 +0200
+++ b/src-core/src/org/openbravo/base/BuildTask.java Thu Oct 14 18:51:38
2010 +0200
@@ -71,8 +71,8 @@
final Vector<String> tasks = new Vector<String>();
final String unnappliedModules = getUnnapliedModules();
+ tasks.add("update.database");
if (isUpdatingCoreOrTemplate()) {
- tasks.add("update.database");
tasks.add("core.lib");
tasks.add("wad.lib");
tasks.add("trl.lib");
@@ -85,7 +85,6 @@
// files and references
ant.setProperty("apply.modules.complete.compilation", "true");
}
- ant.setProperty("force", "true");
tasks.add("apply.modules");
ant.setProperty("module", unnappliedModules);
}
diff -r 331c9ca70ae9 -r ff88423ee721 src-db/database/lib/dbsourcemanager.jar
Binary file src-db/database/lib/dbsourcemanager.jar has changed
diff -r 331c9ca70ae9 -r ff88423ee721
src-db/database/model/functions/C_BANKSTATEMENT_POST.xml
--- a/src-db/database/model/functions/C_BANKSTATEMENT_POST.xml Fri Oct 01
11:19:40 2010 +0200
+++ b/src-db/database/model/functions/C_BANKSTATEMENT_POST.xml Thu Oct 14
18:51:38 2010 +0200
@@ -65,6 +65,7 @@
TYPE RECORD IS REF CURSOR;
Cur_Parameter RECORD;
Cur_BankstatementDebtpayment RECORD;
+ Cur_BankstatementLine RECORD;
-- Parameter Variables
-- Parameter Variables
v_Processed CHAR(1) ;
@@ -80,6 +81,8 @@
v_BS_Date DATE;
v_AD_Org_ID VARCHAR2(32);
v_AD_Client_ID VARCHAR2(32) ;
+ v_ValutadatePeriod_ID NUMBER(10) ;
+ v_DateacctPeriod_ID NUMBER(10) ;
FINISH_PROCESS BOOLEAN:=false;
BEGIN
-- Update AD_PInstance
@@ -371,6 +374,19 @@
RAISE_APPLICATION_ERROR(-20000, '@Inline@'||v_line||'
'||'@DebtAmountsSamemoneyNoMatch@') ;
END IF;
END IF;--FINISH_PROCESS
+ FOR Cur_BankstatementLine IN
+ (SELECT valutadate,
+ dateacct
+ FROM C_BANKSTATEMENTLINE
+ WHERE C_BANKSTATEMENT_ID = v_Record_ID
+ AND ISACTIVE='Y')
+ LOOP
+ v_ValutadatePeriod_ID := C_CHK_OPEN_PERIOD (v_AD_Org_ID,
Cur_BankstatementLine.valutadate, 'CMB',NULL);
+ v_DateacctPeriod_ID := C_CHK_OPEN_PERIOD (v_AD_Org_ID,
Cur_BankstatementLine.dateacct, 'CMB',NULL);
+ IF (v_ValutadatePeriod_ID <> 1 OR v_DateacctPeriod_ID <> 1) THEN
+ RAISE_APPLICATION_ERROR(-20000, '@PeriodNotAvailable@') ;
+ END IF;
+ END LOOP;
IF(NOT FINISH_PROCESS) THEN
SELECT COUNT(*),
MAX(bsl.Line)
diff -r 331c9ca70ae9 -r ff88423ee721
src-db/database/model/functions/C_INVOICE_POST.xml
--- a/src-db/database/model/functions/C_INVOICE_POST.xml Fri Oct 01
11:19:40 2010 +0200
+++ b/src-db/database/model/functions/C_INVOICE_POST.xml Thu Oct 14
18:51:38 2010 +0200
@@ -1555,12 +1555,12 @@
FROM C_DEBT_PAYMENT DP
WHERE C_BPartner_ID=v_BPartner_ID
AND C_Debt_Payment_Status(C_Settlement_Cancel_ID,
Cancel_Processed, Generate_Processed, IsPaid, IsValid, C_Cashline_ID,
C_BankstatementLine_ID)='P'
+ AND ISRECEIPT=v_IsSOTrx
AND (-1) *Amount=v_paymentAmount
AND c_currency_ID=v_Currency_ID
AND C_SETTLEMENT_GENERATE_ID IS NOT NULL
AND Ad_Isorgincluded(v_Org_id, dp.ad_org_id,v_Client_ID) != -1
AND ad_client_id = v_Client_ID
- AND C_INVOICE_ID=v_Record_ID
AND EXISTS (SELECT 1
FROM C_SETTLEMENT S
WHERE DP.C_SETTLEMENT_GENERATE_ID =
S.C_Settlement_ID
diff -r 331c9ca70ae9 -r ff88423ee721
src-db/database/model/functions/MRP_PURCHASEORDER.xml
--- a/src-db/database/model/functions/MRP_PURCHASEORDER.xml Fri Oct 01
11:19:40 2010 +0200
+++ b/src-db/database/model/functions/MRP_PURCHASEORDER.xml Thu Oct 14
18:51:38 2010 +0200
@@ -51,6 +51,8 @@
v_PriceStd NUMBER;
v_TaxId varchar2(32);
v_ProductName NVARCHAR2(90);
+ v_IsAPRMinstalled NUMBER;
+ v_DefaultPaymentRule VARCHAR2(60):=null;
v_Count NUMBER;
@@ -133,6 +135,13 @@
AND ISBILLTO='Y'
AND C_BPARTNER_ID=Cur_workproposal.C_BPARTNER_ID;
+ SELECT COUNT(1) INTO v_IsAPRMinstalled
+ FROM ad_preference
+ WHERE property = 'FinancialManagement' AND ad_module_id <> '0';
+ IF (v_IsAPRMinstalled > 0) THEN
+ v_DefaultPaymentRule := 'P';
+ END IF;
+
INSERT INTO C_Order
(C_ORDER_ID, AD_CLIENT_ID, AD_ORG_ID, ISACTIVE,
CREATED, CREATEDBY, UPDATED, UPDATEDBY,
@@ -150,7 +159,7 @@
'N', v_DocumentNo, 'DR', 'CO','N',
v_CDocTypeID, v_CDocTypeID, v_Description,
v_DateDoc,v_DateDoc, Cur_workproposal.C_BPartner_ID,v_BillTo_ID,
- v_BPartner_Location_ID, Cur_workproposal.C_Currency_ID,
Cur_workproposal.paymentrule, Cur_workproposal.C_PAYMENTTERM_ID,
+ v_BPartner_Location_ID, Cur_workproposal.C_Currency_ID,
COALESCE(Cur_workproposal.paymentrule, v_DefaultPaymentRule),
Cur_workproposal.C_PAYMENTTERM_ID,
'D', 'A', 'I',COALESCE(Cur_workproposal.DeliveryViaRule,'D'),
'5',0,0,
v_M_Warehouse_ID, Cur_workproposal.PO_PRICELIST_ID, 'N', v_DateDoc,
diff -r 331c9ca70ae9 -r ff88423ee721 src-db/database/model/tables/AD_USER.xml
--- a/src-db/database/model/tables/AD_USER.xml Fri Oct 01 11:19:40 2010 +0200
+++ b/src-db/database/model/tables/AD_USER.xml Thu Oct 14 18:51:38 2010 +0200
@@ -152,7 +152,7 @@
<foreign-key foreignTable="AD_ORG" name="AD_USER_AD_ORGTRX">
<reference local="AD_ORGTRX_ID" foreign="AD_ORG_ID"/>
</foreign-key>
- <foreign-key foreignTable="C_BPARTNER" name="AD_USER_C_BPARTNER">
+ <foreign-key foreignTable="C_BPARTNER" name="AD_USER_C_BPARTNER"
onDelete="cascade">
<reference local="C_BPARTNER_ID" foreign="C_BPARTNER_ID"/>
</foreign-key>
<foreign-key foreignTable="C_BPARTNER_LOCATION"
name="AD_USER_C_BPARTNER_LOCATION">
diff -r 331c9ca70ae9 -r ff88423ee721
src-db/database/model/triggers/AD_ROLE_ORGACCESS_TRG.xml
--- a/src-db/database/model/triggers/AD_ROLE_ORGACCESS_TRG.xml Fri Oct 01
11:19:40 2010 +0200
+++ b/src-db/database/model/triggers/AD_ROLE_ORGACCESS_TRG.xml Thu Oct 14
18:51:38 2010 +0200
@@ -61,17 +61,23 @@
)
LOOP
IF(v_Client_ID <> Cur_Org.AD_Client_ID) THEN
- v_Client_ID:=Cur_Org.AD_Client_ID;
- IF(LENGTH(v_ClientList) <> 0) THEN
- v_ClientList:=v_ClientList || ',';
+ IF (LENGTH(v_ClientList) + LENGTH(Cur_Org.AD_Client_ID) + 1 < 2000) THEN
+ v_Client_ID:=Cur_Org.AD_Client_ID;
+ IF(LENGTH(v_ClientList) <> 0) THEN
+ v_ClientList:=v_ClientList || ',';
+ END IF;
+ v_ClientList:=v_ClientList || Cur_Org.AD_Client_ID;
+ END IF;
+ END IF;
+
+ -- Org
+ IF (LENGTH(v_OrgList) + LENGTH(Cur_Org.AD_Org_ID) + 1 < 2000) THEN
+ IF(LENGTH(v_OrgList) <> 0) THEN
+ v_OrgList:=v_OrgList || ',';
END IF;
- v_ClientList:=v_ClientList || Cur_Org.AD_Client_ID;
+ v_OrgList:=v_OrgList || Cur_Org.AD_Org_ID;
END IF;
- -- Org
- IF(LENGTH(v_OrgList) <> 0) THEN
- v_OrgList:=v_OrgList || ',';
- END IF;
- v_OrgList:=v_OrgList || Cur_Org.AD_Org_ID;
+
END LOOP;
-- Org
--
diff -r 331c9ca70ae9 -r ff88423ee721 src-db/database/sourcedata/AD_COLUMN.xml
--- a/src-db/database/sourcedata/AD_COLUMN.xml Fri Oct 01 11:19:40 2010 +0200
+++ b/src-db/database/sourcedata/AD_COLUMN.xml Thu Oct 14 18:51:38 2010 +0200
@@ -8113,7 +8113,7 @@
<!--535--> <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
<!--535--> <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
<!--535--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
-<!--535--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--535--> <DEVELOPMENTSTATUS><![CDATA[DP]]></DEVELOPMENTSTATUS>
<!--535--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--535--> <POSITION><![CDATA[12]]></POSITION>
<!--535--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
@@ -8146,7 +8146,7 @@
<!--536--> <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
<!--536--> <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
<!--536--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
-<!--536--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--536--> <DEVELOPMENTSTATUS><![CDATA[DP]]></DEVELOPMENTSTATUS>
<!--536--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--536--> <POSITION><![CDATA[13]]></POSITION>
<!--536--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
@@ -34076,7 +34076,7 @@
<!--2225--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--2225--> <NAME><![CDATA[Reserved Quantity]]></NAME>
<!--2225--> <DESCRIPTION><![CDATA[Reserved Quantity]]></DESCRIPTION>
-<!--2225--> <HELP><![CDATA[The Reserved Quantity indicates the quantity of a
product that is currently reserved for other orders.]]></HELP>
+<!--2225--> <HELP><![CDATA[The Reserved Quantity indicates the quantity of a
product that is currently reserved for this order.]]></HELP>
<!--2225--> <COLUMNNAME><![CDATA[QtyReserved]]></COLUMNNAME>
<!--2225--> <AD_TABLE_ID><![CDATA[260]]></AD_TABLE_ID>
<!--2225--> <AD_REFERENCE_ID><![CDATA[29]]></AD_REFERENCE_ID>
@@ -71161,7 +71161,7 @@
<!--4367--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--4367--> <NAME><![CDATA[Reserved Quantity]]></NAME>
<!--4367--> <DESCRIPTION><![CDATA[Reserved Quantity]]></DESCRIPTION>
-<!--4367--> <HELP><![CDATA[The Reserved Quantity indicates the quantity of a
product that is currently reserved for other orders.]]></HELP>
+<!--4367--> <HELP><![CDATA[The Reserved Quantity indicates the quantity of a
product that is currently reserved for this order.]]></HELP>
<!--4367--> <COLUMNNAME><![CDATA[QtyReserved]]></COLUMNNAME>
<!--4367--> <AD_TABLE_ID><![CDATA[360]]></AD_TABLE_ID>
<!--4367--> <AD_REFERENCE_ID><![CDATA[29]]></AD_REFERENCE_ID>
@@ -175753,7 +175753,7 @@
<!--800656--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--800656--> <NAME><![CDATA[Reserved Quantity]]></NAME>
<!--800656--> <DESCRIPTION><![CDATA[Reserved Quantity]]></DESCRIPTION>
-<!--800656--> <HELP><![CDATA[The Reserved Quantity indicates the quantity of
a product that is currently reserved for other orders.]]></HELP>
+<!--800656--> <HELP><![CDATA[The Reserved Quantity indicates the quantity of
a product that is currently reserved for this order.]]></HELP>
<!--800656--> <COLUMNNAME><![CDATA[QtyReserved]]></COLUMNNAME>
<!--800656--> <AD_TABLE_ID><![CDATA[800037]]></AD_TABLE_ID>
<!--800656--> <AD_REFERENCE_ID><![CDATA[29]]></AD_REFERENCE_ID>
@@ -300026,6 +300026,7 @@
<!--828EE0AE7FF25FA1E040007F010067C7-->
<COLUMNNAME><![CDATA[FIN_Paymentmethod_ID]]></COLUMNNAME>
<!--828EE0AE7FF25FA1E040007F010067C7-->
<AD_TABLE_ID><![CDATA[AC389EBD8A774AAE8223A77F692983D8]]></AD_TABLE_ID>
<!--828EE0AE7FF25FA1E040007F010067C7-->
<AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--828EE0AE7FF25FA1E040007F010067C7-->
<AD_VAL_RULE_ID><![CDATA[9D87FCD2F19D4CB7AA55F15F5A6C0FBA]]></AD_VAL_RULE_ID>
<!--828EE0AE7FF25FA1E040007F010067C7-->
<FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
<!--828EE0AE7FF25FA1E040007F010067C7--> <ISKEY><![CDATA[N]]></ISKEY>
<!--828EE0AE7FF25FA1E040007F010067C7--> <ISPARENT><![CDATA[Y]]></ISPARENT>
@@ -300755,6 +300756,7 @@
<!--828EE0AE80255FA1E040007F010067C7-->
<COLUMNNAME><![CDATA[FIN_Paymentmethod_ID]]></COLUMNNAME>
<!--828EE0AE80255FA1E040007F010067C7-->
<AD_TABLE_ID><![CDATA[203]]></AD_TABLE_ID>
<!--828EE0AE80255FA1E040007F010067C7-->
<AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--828EE0AE80255FA1E040007F010067C7-->
<AD_VAL_RULE_ID><![CDATA[34A2733B41B04DC19B3E54F764753D19]]></AD_VAL_RULE_ID>
<!--828EE0AE80255FA1E040007F010067C7-->
<FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
<!--828EE0AE80255FA1E040007F010067C7--> <ISKEY><![CDATA[N]]></ISKEY>
<!--828EE0AE80255FA1E040007F010067C7--> <ISPARENT><![CDATA[N]]></ISPARENT>
@@ -300787,6 +300789,7 @@
<!--828EE0AE802B5FA1E040007F010067C7-->
<COLUMNNAME><![CDATA[FIN_Paymentmethod_ID]]></COLUMNNAME>
<!--828EE0AE802B5FA1E040007F010067C7-->
<AD_TABLE_ID><![CDATA[800003]]></AD_TABLE_ID>
<!--828EE0AE802B5FA1E040007F010067C7-->
<AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--828EE0AE802B5FA1E040007F010067C7-->
<AD_VAL_RULE_ID><![CDATA[34A2733B41B04DC19B3E54F764753D19]]></AD_VAL_RULE_ID>
<!--828EE0AE802B5FA1E040007F010067C7-->
<FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
<!--828EE0AE802B5FA1E040007F010067C7--> <ISKEY><![CDATA[N]]></ISKEY>
<!--828EE0AE802B5FA1E040007F010067C7--> <ISPARENT><![CDATA[N]]></ISPARENT>
@@ -300819,6 +300822,7 @@
<!--828EE0AE802C5FA1E040007F010067C7-->
<COLUMNNAME><![CDATA[FIN_Paymentmethod_ID]]></COLUMNNAME>
<!--828EE0AE802C5FA1E040007F010067C7-->
<AD_TABLE_ID><![CDATA[259]]></AD_TABLE_ID>
<!--828EE0AE802C5FA1E040007F010067C7-->
<AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--828EE0AE802C5FA1E040007F010067C7-->
<AD_VAL_RULE_ID><![CDATA[34A2733B41B04DC19B3E54F764753D19]]></AD_VAL_RULE_ID>
<!--828EE0AE802C5FA1E040007F010067C7-->
<FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
<!--828EE0AE802C5FA1E040007F010067C7--> <ISKEY><![CDATA[N]]></ISKEY>
<!--828EE0AE802C5FA1E040007F010067C7--> <ISPARENT><![CDATA[N]]></ISPARENT>
@@ -300853,6 +300857,7 @@
<!--828EE0AE802D5FA1E040007F010067C7-->
<AD_TABLE_ID><![CDATA[291]]></AD_TABLE_ID>
<!--828EE0AE802D5FA1E040007F010067C7-->
<AD_REFERENCE_ID><![CDATA[18]]></AD_REFERENCE_ID>
<!--828EE0AE802D5FA1E040007F010067C7-->
<AD_REFERENCE_VALUE_ID><![CDATA[EED0EF97D4A7421687F3B365D009E7A6]]></AD_REFERENCE_VALUE_ID>
+<!--828EE0AE802D5FA1E040007F010067C7-->
<AD_VAL_RULE_ID><![CDATA[34A2733B41B04DC19B3E54F764753D19]]></AD_VAL_RULE_ID>
<!--828EE0AE802D5FA1E040007F010067C7-->
<FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
<!--828EE0AE802D5FA1E040007F010067C7--> <ISKEY><![CDATA[N]]></ISKEY>
<!--828EE0AE802D5FA1E040007F010067C7--> <ISPARENT><![CDATA[N]]></ISPARENT>
@@ -300886,6 +300891,7 @@
<!--828EE0AE802E5FA1E040007F010067C7-->
<AD_TABLE_ID><![CDATA[291]]></AD_TABLE_ID>
<!--828EE0AE802E5FA1E040007F010067C7-->
<AD_REFERENCE_ID><![CDATA[18]]></AD_REFERENCE_ID>
<!--828EE0AE802E5FA1E040007F010067C7-->
<AD_REFERENCE_VALUE_ID><![CDATA[EED0EF97D4A7421687F3B365D009E7A6]]></AD_REFERENCE_VALUE_ID>
+<!--828EE0AE802E5FA1E040007F010067C7-->
<AD_VAL_RULE_ID><![CDATA[34A2733B41B04DC19B3E54F764753D19]]></AD_VAL_RULE_ID>
<!--828EE0AE802E5FA1E040007F010067C7-->
<FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
<!--828EE0AE802E5FA1E040007F010067C7--> <ISKEY><![CDATA[N]]></ISKEY>
<!--828EE0AE802E5FA1E040007F010067C7--> <ISPARENT><![CDATA[N]]></ISPARENT>
@@ -300987,6 +300993,7 @@
<!--828EE0AE80385FA1E040007F010067C7-->
<COLUMNNAME><![CDATA[FIN_Paymentmethod_ID]]></COLUMNNAME>
<!--828EE0AE80385FA1E040007F010067C7-->
<AD_TABLE_ID><![CDATA[318]]></AD_TABLE_ID>
<!--828EE0AE80385FA1E040007F010067C7-->
<AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--828EE0AE80385FA1E040007F010067C7-->
<AD_VAL_RULE_ID><![CDATA[34A2733B41B04DC19B3E54F764753D19]]></AD_VAL_RULE_ID>
<!--828EE0AE80385FA1E040007F010067C7-->
<FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
<!--828EE0AE80385FA1E040007F010067C7--> <ISKEY><![CDATA[N]]></ISKEY>
<!--828EE0AE80385FA1E040007F010067C7--> <ISPARENT><![CDATA[N]]></ISPARENT>
@@ -301020,6 +301027,7 @@
<!--828EE0AE80395FA1E040007F010067C7-->
<COLUMNNAME><![CDATA[FIN_Paymentmethod_ID]]></COLUMNNAME>
<!--828EE0AE80395FA1E040007F010067C7-->
<AD_TABLE_ID><![CDATA[800058]]></AD_TABLE_ID>
<!--828EE0AE80395FA1E040007F010067C7-->
<AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--828EE0AE80395FA1E040007F010067C7-->
<AD_VAL_RULE_ID><![CDATA[34A2733B41B04DC19B3E54F764753D19]]></AD_VAL_RULE_ID>
<!--828EE0AE80395FA1E040007F010067C7-->
<FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
<!--828EE0AE80395FA1E040007F010067C7--> <ISKEY><![CDATA[N]]></ISKEY>
<!--828EE0AE80395FA1E040007F010067C7--> <ISPARENT><![CDATA[N]]></ISPARENT>
diff -r 331c9ca70ae9 -r ff88423ee721 src-db/database/sourcedata/AD_ELEMENT.xml
--- a/src-db/database/sourcedata/AD_ELEMENT.xml Fri Oct 01 11:19:40 2010 +0200
+++ b/src-db/database/sourcedata/AD_ELEMENT.xml Thu Oct 14 18:51:38 2010 +0200
@@ -3692,7 +3692,7 @@
<!--532--> <NAME><![CDATA[Reserved Quantity]]></NAME>
<!--532--> <PRINTNAME><![CDATA[Reserved Qty]]></PRINTNAME>
<!--532--> <DESCRIPTION><![CDATA[Reserved Quantity]]></DESCRIPTION>
-<!--532--> <HELP><![CDATA[The Reserved Quantity indicates the quantity of a
product that is currently reserved for other orders.]]></HELP>
+<!--532--> <HELP><![CDATA[The Reserved Quantity indicates the quantity of a
product that is currently reserved for this order.]]></HELP>
<!--532--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--532--></AD_ELEMENT>
diff -r 331c9ca70ae9 -r ff88423ee721 src-db/database/sourcedata/AD_FIELD.xml
------------------------------------------------------------------------------
Beautiful is writing same markup. Internet Explorer 9 supports
standards for HTML5, CSS3, SVG 1.1, ECMAScript5, and DOM L2 & L3.
Spend less time writing and rewriting code and more time creating great
experiences on the web. Be a part of the beta today.
http://p.sf.net/sfu/beautyoftheweb
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
