details: /erp/devel/pi/rev/27fa7c5e6716
changeset: 8566:27fa7c5e6716
user: Adrián Romero <adrianromero <at> openbravo.com>
date: Tue Oct 19 16:37:36 2010 +0200
summary: Backed out changeset c2ed75573ccc
details: /erp/devel/pi/rev/e56627b53194
changeset: 8567:e56627b53194
user: Adrián Romero <adrianromero <at> openbravo.com>
date: Tue Oct 19 16:37:59 2010 +0200
summary: merge backout
details: /erp/devel/pi/rev/7bcd3fff7029
changeset: 8568:7bcd3fff7029
user: Adrián Romero <adrianromero <at> openbravo.com>
date: Tue Oct 19 16:38:24 2010 +0200
summary: Backed out changeset 20e4a87e4b12
details: /erp/devel/pi/rev/052fc413624d
changeset: 8569:052fc413624d
user: Adrián Romero <adrianromero <at> openbravo.com>
date: Tue Oct 19 16:38:33 2010 +0200
summary: merge backout
details: /erp/devel/pi/rev/df6a7233f38f
changeset: 8570:df6a7233f38f
user: Adrián Romero <adrianromero <at> openbravo.com>
date: Tue Oct 19 16:39:23 2010 +0200
summary: Backed out changeset 4babac33682f
details: /erp/devel/pi/rev/c0abfa29f642
changeset: 8571:c0abfa29f642
user: Adrián Romero <adrianromero <at> openbravo.com>
date: Tue Oct 19 16:39:31 2010 +0200
summary: merge backout
details: /erp/devel/pi/rev/12ab1003e0c3
changeset: 8572:12ab1003e0c3
user: Adrián Romero <adrianromero <at> openbravo.com>
date: Tue Oct 19 16:40:35 2010 +0200
summary: Backed out changeset fc2b40560e15
details: /erp/devel/pi/rev/f3745deedbc0
changeset: 8573:f3745deedbc0
user: Adrián Romero <adrianromero <at> openbravo.com>
date: Tue Oct 19 16:40:45 2010 +0200
summary: merge backout
diffstat:
src-db/database/lib/dbsourcemanager.jar | 0
src-db/database/model/functions/C_INVOICE_POST.xml | 8 +-
src-db/database/model/functions/MRP_PURCHASEORDER.xml | 11 +-
src-db/database/model/tables/FIN_FINANCIAL_ACCOUNT_ACCT.xml | 6 +-
src-db/database/model/triggers/C_ACTIVITY_TRG.xml | 84
++++++++++
src-db/database/model/triggers/C_INVOICE_TRG2.xml | 22 +-
src-db/database/sourcedata/AD_AUXILIARINPUT.xml | 12 +
src-db/database/sourcedata/AD_COLUMN.xml | 34
++--
src-db/database/sourcedata/AD_ELEMENT.xml | 2 +-
src-db/database/sourcedata/AD_FIELD.xml | 26 +-
src-db/database/sourcedata/AD_MESSAGE.xml | 11 +
src-db/database/sourcedata/AD_REF_LIST.xml | 12 +
src-db/database/sourcedata/AD_TAB.xml | 2 +-
src-db/database/sourcedata/AD_TABLE.xml | 3 +-
src-db/database/sourcedata/AD_TEXTINTERFACES.xml | 77
+-------
src-test/org/openbravo/test/AllWebserviceTests.java | 1 -
src-test/org/openbravo/test/dal/DalTest.java | 7 +
src-test/org/openbravo/test/webservice/WSUpdateTest.java | 20
++-
src/build.xml | 6 +-
src/org/openbravo/base/gen/GenerateEntitiesTask.java | 8 +
src/org/openbravo/base/gen/ModelProviderComponent.java | 8 +
src/org/openbravo/base/gen/gen_entity.oaw | 1 +
src/org/openbravo/base/model/Column.java | 8 +-
src/org/openbravo/base/model/ModelProvider.java | 22 +-
src/org/openbravo/base/model/domaintype/BaseForeignKeyDomainType.java | 14 +-
src/org/openbravo/base/session/OBPropertiesProvider.java | 10 +
src/org/openbravo/dal/core/DalUtil.java | 20 ++
src/org/openbravo/dal/service/OBQuery.java | 22 ++
src/org/openbravo/erpCommon/ad_callouts/SL_Requisition_BPartner.java | 12 +-
src/org/openbravo/erpCommon/ad_forms/DocCash.java | 7 +-
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/DocPayment.java | 30
+++-
src/org/openbravo/erpCommon/ad_forms/RequisitionToOrder.java | 27
+++-
src/org/openbravo/erpCommon/ad_forms/TranslationHandler.java | 18 +-
src/org/openbravo/erpCommon/ad_process/CreateAccountingReport.java | 35
++-
src/org/openbravo/erpCommon/ad_process/CreateTaxReport.java | 36
++--
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 | 19 +-
src/org/openbravo/erpCommon/security/Login.java | 22 ++
src/org/openbravo/erpReports/C_OrderJR.jrxml | 6 +-
src/org/openbravo/erpReports/RptC_Invoice.jrxml | 8 +-
src/org/openbravo/erpReports/RptC_OrderPO.jrxml | 7 +-
src/org/openbravo/erpReports/RptM_InOut.jrxml | 8 +-
src/org/openbravo/service/rest/DalWebService.java | 34
++++
46 files changed, 580 insertions(+), 280 deletions(-)
diffs (truncated from 1922 to 300 lines):
diff -r c2ed75573ccc -r f3745deedbc0 src-db/database/lib/dbsourcemanager.jar
Binary file src-db/database/lib/dbsourcemanager.jar has changed
diff -r c2ed75573ccc -r f3745deedbc0
src-db/database/model/functions/C_INVOICE_POST.xml
--- a/src-db/database/model/functions/C_INVOICE_POST.xml Wed Oct 13
21:30:23 2010 +1100
+++ b/src-db/database/model/functions/C_INVOICE_POST.xml Tue Oct 19
16:40:45 2010 +0200
@@ -422,7 +422,12 @@
SELECT COUNT(*) INTO v_Count
FROM C_INVOICE C,
C_DOCTYPE
- WHERE C_DOCTYPE.DocBaseType IN ('ARI', 'API','ARC','APC')
+ WHERE C_DOCTYPE.DocBaseType IN (
+ select docbasetype
+ from c_doctype
+ where ad_table_id='318'
+ and isactive='Y'
+ and ad_client_id=C.AD_Client_ID)
AND C_DOCTYPE.IsSOTrx=C.ISSOTRX
AND Ad_Isorgincluded(C.AD_Org_ID,C_DOCTYPE.AD_Org_ID, C.AD_Client_ID)
<> -1
AND C.C_DOCTYPETARGET_ID = C_DOCTYPE.C_DOCTYPE_ID
@@ -1555,6 +1560,7 @@
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
diff -r c2ed75573ccc -r f3745deedbc0
src-db/database/model/functions/MRP_PURCHASEORDER.xml
--- a/src-db/database/model/functions/MRP_PURCHASEORDER.xml Wed Oct 13
21:30:23 2010 +1100
+++ b/src-db/database/model/functions/MRP_PURCHASEORDER.xml Tue Oct 19
16:40:45 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 c2ed75573ccc -r f3745deedbc0
src-db/database/model/tables/FIN_FINANCIAL_ACCOUNT_ACCT.xml
--- a/src-db/database/model/tables/FIN_FINANCIAL_ACCOUNT_ACCT.xml Wed Oct
13 21:30:23 2010 +1100
+++ b/src-db/database/model/tables/FIN_FINANCIAL_ACCOUNT_ACCT.xml Tue Oct
19 16:40:45 2010 +0200
@@ -65,15 +65,15 @@
<default/>
<onCreateDefault/>
</column>
- <column name="FIN_BANKFEE_ACCT" primaryKey="false" required="true"
type="VARCHAR" size="32" autoIncrement="false">
+ <column name="FIN_BANKFEE_ACCT" primaryKey="false" required="false"
type="VARCHAR" size="32" autoIncrement="false">
<default/>
<onCreateDefault/>
</column>
- <column name="FIN_BANKREVALUATIONGAIN_ACCT" primaryKey="false"
required="true" type="VARCHAR" size="32" autoIncrement="false">
+ <column name="FIN_BANKREVALUATIONGAIN_ACCT" primaryKey="false"
required="false" type="VARCHAR" size="32" autoIncrement="false">
<default/>
<onCreateDefault/>
</column>
- <column name="FIN_BANKREVALUATIONLOSS_ACCT" primaryKey="false"
required="true" type="VARCHAR" size="32" autoIncrement="false">
+ <column name="FIN_BANKREVALUATIONLOSS_ACCT" primaryKey="false"
required="false" type="VARCHAR" size="32" autoIncrement="false">
<default/>
<onCreateDefault/>
</column>
diff -r c2ed75573ccc -r f3745deedbc0
src-db/database/model/triggers/C_ACTIVITY_TRG.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src-db/database/model/triggers/C_ACTIVITY_TRG.xml Tue Oct 19 16:40:45
2010 +0200
@@ -0,0 +1,84 @@
+<?xml version="1.0"?>
+ <database name="TRIGGER C_ACTIVITY_TRG">
+ <trigger name="C_ACTIVITY_TRG" table="C_ACTIVITY" fires="before"
insert="true" update="true" delete="false" foreach="row">
+ <body><![CDATA[
+/*************************************************************************
+* The contents of this file are subject to the Openbravo Public License
+* Version 1.0 (the "License"), being the Mozilla Public License
+* Version 1.1 with a permitted attribution clause; you may not use this
+* file except in compliance with the License. You may obtain a copy of
+* the License at http://www.openbravo.com/legal/license.html
+* Software distributed under the License is distributed on an "AS IS"
+* basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+* License for the specific language governing rights and limitations
+* under the License.
+* The Original Code is Openbravo ERP.
+* The Initial Developer of the Original Code is Openbravo SLU
+* All portions are Copyright (C) 2010 Openbravo SLU
+* All Rights Reserved.
+* Contributor(s): ______________________________________.
+************************************************************************/
+ v_xTree_ID VARCHAR2(32);
+ v_xParent_ID VARCHAR2(32);
+ v_NextNo VARCHAR2(32);
+
+BEGIN
+
+ IF AD_isTriggerEnabled()='N' THEN RETURN;
+ END IF;
+
+
+ -- Insert AD_Menu Trigger
+ -- for Translation
+ -- and TreeNode
+ IF INSERTING THEN
+ -- get AD_Tree_ID and ParentID
+ SELECT AD_TREE_ID,
+ 0
+ INTO v_xTree_ID,
+ v_xParent_ID
+ FROM AD_TREE
+ WHERE treetype='AY'
+ AND AD_Client_ID=:NEW.AD_Client_ID;
+ -- Insert into TreeNode
+ INSERT
+ INTO AD_TREENODE
+ (
+ AD_TreeNode_Id, AD_Client_ID, AD_Org_ID, IsActive,
+ Created, CreatedBy, Updated,
+ UpdatedBy, AD_Tree_ID, Node_ID,
+ Parent_ID, SeqNo
+ )
+ VALUES
+ (
+ get_uuid(), :NEW.AD_Client_ID, :NEW.AD_Org_ID, :NEW.IsActive,
+ :NEW.Created, :NEW.CreatedBy, :NEW.Updated,
+ :NEW.UpdatedBy, v_xTree_ID, :NEW.C_ACTIVITY_ID,
+ v_xParent_ID,(
+ CASE :NEW.IsSummary
+ WHEN 'Y'
+ THEN 100
+ ELSE 999
+ END
+ )
+ )
+ ;
+ -- Summary Nodes first
+ END IF;
+ IF UPDATING THEN
+ IF((COALESCE(:OLD.NAME, '.') <> COALESCE(:NEW.NAME, '.')
+ OR COALESCE(:OLD.Description, '.') <> COALESCE(:NEW.Description, '.')
+ OR COALESCE(:OLD.IsActive, '.') <> COALESCE(:NEW.IsActive, '.')))
+ THEN
+ IF(:OLD.IsActive!=:NEW.IsActive) THEN
+ UPDATE AD_TREENODE
+ SET IsActive=:NEW.IsActive
+ WHERE AD_Tree_ID=v_xTree_ID
+ AND Node_ID=:NEW.C_ACTIVITY_ID;
+ END IF;
+ END IF;
+ END IF;
+END C_ACTIVITY_TRG
+]]></body>
+ </trigger>
+ </database>
diff -r c2ed75573ccc -r f3745deedbc0
src-db/database/model/triggers/C_INVOICE_TRG2.xml
--- a/src-db/database/model/triggers/C_INVOICE_TRG2.xml Wed Oct 13 21:30:23
2010 +1100
+++ b/src-db/database/model/triggers/C_INVOICE_TRG2.xml Tue Oct 19 16:40:45
2010 +0200
@@ -34,16 +34,18 @@
FOR Cur_Discounts IN
(
- SELECT C_DISCOUNT_ID,
- LINE,
- CASCADE
- FROM C_BPARTNER_DISCOUNT
- WHERE C_BPARTNER_ID=:NEW.C_BPARTNER_ID
- AND ISACTIVE='Y'
- AND(ISCUSTOMER=:NEW.ISSOTRX
- OR ISVENDOR <> :NEW.ISSOTRX)
- AND APPLYINORDER='N'
- ORDER BY LINE
+ SELECT BPD.C_DISCOUNT_ID,
+ BPD.LINE,
+ BPD.CASCADE
+ FROM C_BPARTNER_DISCOUNT BPD, C_DISCOUNT D
+ WHERE BPD.C_BPARTNER_ID=:NEW.C_BPARTNER_ID
+ AND D.C_DISCOUNT_ID = BPD.C_DISCOUNT_ID
+ AND BPD.ISACTIVE='Y'
+ AND D.ISACTIVE='Y'
+ AND(BPD.ISCUSTOMER=:NEW.ISSOTRX
+ OR BPD.ISVENDOR <> :NEW.ISSOTRX)
+ AND BPD.APPLYINORDER='N'
+ ORDER BY BPD.LINE
)
LOOP
Ad_Sequence_Next('C_Invoice_Discount', :NEW.AD_Client_ID, v_Key) ;
diff -r c2ed75573ccc -r f3745deedbc0
src-db/database/sourcedata/AD_AUXILIARINPUT.xml
--- a/src-db/database/sourcedata/AD_AUXILIARINPUT.xml Wed Oct 13 21:30:23
2010 +1100
+++ b/src-db/database/sourcedata/AD_AUXILIARINPUT.xml Tue Oct 19 16:40:45
2010 +0200
@@ -1156,6 +1156,18 @@
<!--51568B79156646C8966F49F82EE51CB7-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--51568B79156646C8966F49F82EE51CB7--></AD_AUXILIARINPUT>
+<!--52AAC076AFF84DB58F19D32FBCE8F678--><AD_AUXILIARINPUT>
+<!--52AAC076AFF84DB58F19D32FBCE8F678-->
<AD_AUXILIARINPUT_ID><![CDATA[52AAC076AFF84DB58F19D32FBCE8F678]]></AD_AUXILIARINPUT_ID>
+<!--52AAC076AFF84DB58F19D32FBCE8F678-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--52AAC076AFF84DB58F19D32FBCE8F678--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--52AAC076AFF84DB58F19D32FBCE8F678--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--52AAC076AFF84DB58F19D32FBCE8F678-->
<AD_TAB_ID><![CDATA[8391062D5C6A47EA94A83A304AD720BE]]></AD_TAB_ID>
+<!--52AAC076AFF84DB58F19D32FBCE8F678--> <NAME><![CDATA[isBank]]></NAME>
+<!--52AAC076AFF84DB58F19D32FBCE8F678--> <CODE><![cda...@sql=select CASE WHEN
TYPE='B' THEN 'Y' ELSE 'N' END FROM FIN_FINANCIAL_ACCOUNT WHERE
FIN_FINANCIAL_ACCOUNT_ID = @FIN_FINANCIAL_ACCOUNT_ID@
+]]></CODE>
+<!--52AAC076AFF84DB58F19D32FBCE8F678-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--52AAC076AFF84DB58F19D32FBCE8F678--></AD_AUXILIARINPUT>
+
<!--52BCE83D589C498B9803D32847553A8D--><AD_AUXILIARINPUT>
<!--52BCE83D589C498B9803D32847553A8D-->
<AD_AUXILIARINPUT_ID><![CDATA[52BCE83D589C498B9803D32847553A8D]]></AD_AUXILIARINPUT_ID>
<!--52BCE83D589C498B9803D32847553A8D-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r c2ed75573ccc -r f3745deedbc0 src-db/database/sourcedata/AD_COLUMN.xml
--- a/src-db/database/sourcedata/AD_COLUMN.xml Wed Oct 13 21:30:23 2010 +1100
+++ b/src-db/database/sourcedata/AD_COLUMN.xml Tue Oct 19 16:40:45 2010 +0200
@@ -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>
@@ -281283,7 +281283,7 @@
<!--60FCCD631EA3EDF8E040007F01013AD4--> <HELP><![CDATA[A Client is a company
or a legal entity. You cannot share data between Clients.]]></HELP>
<!--60FCCD631EA3EDF8E040007F01013AD4-->
<COLUMNNAME><![CDATA[AD_Client_ID]]></COLUMNNAME>
<!--60FCCD631EA3EDF8E040007F01013AD4-->
<AD_TABLE_ID><![CDATA[CB391C8A13D74B688A34017B5B5D1F5D]]></AD_TABLE_ID>
-<!--60FCCD631EA3EDF8E040007F01013AD4-->
<AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--60FCCD631EA3EDF8E040007F01013AD4-->
<AD_REFERENCE_ID><![CDATA[30]]></AD_REFERENCE_ID>
<!--60FCCD631EA3EDF8E040007F01013AD4-->
<AD_VAL_RULE_ID><![CDATA[103]]></AD_VAL_RULE_ID>
<!--60FCCD631EA3EDF8E040007F01013AD4-->
<FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
<!--60FCCD631EA3EDF8E040007F01013AD4-->
<DEFAULTVALUE><![cda...@ad_client_id@]]></DEFAULTVALUE>
@@ -281318,7 +281318,7 @@
<!--60FCCD631EA4EDF8E040007F01013AD4--> <HELP><![CDATA[An organization is a
unit of your client or legal entity - examples are store, department. You can
share data between organizations.]]></HELP>
<!--60FCCD631EA4EDF8E040007F01013AD4-->
<COLUMNNAME><![CDATA[AD_Org_ID]]></COLUMNNAME>
<!--60FCCD631EA4EDF8E040007F01013AD4-->
<AD_TABLE_ID><![CDATA[CB391C8A13D74B688A34017B5B5D1F5D]]></AD_TABLE_ID>
-<!--60FCCD631EA4EDF8E040007F01013AD4-->
<AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--60FCCD631EA4EDF8E040007F01013AD4-->
<AD_REFERENCE_ID><![CDATA[30]]></AD_REFERENCE_ID>
<!--60FCCD631EA4EDF8E040007F01013AD4-->
<AD_VAL_RULE_ID><![CDATA[104]]></AD_VAL_RULE_ID>
<!--60FCCD631EA4EDF8E040007F01013AD4-->
<FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
<!--60FCCD631EA4EDF8E040007F01013AD4-->
<DEFAULTVALUE><![cda...@ad_org_id@]]></DEFAULTVALUE>
@@ -281360,7 +281360,7 @@
<!--60FCCD631EA5EDF8E040007F01013AD4--> <ISKEY><![CDATA[N]]></ISKEY>
<!--60FCCD631EA5EDF8E040007F01013AD4--> <ISPARENT><![CDATA[N]]></ISPARENT>
<!--60FCCD631EA5EDF8E040007F01013AD4-->
<ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
-<!--60FCCD631EA5EDF8E040007F01013AD4-->
<ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--60FCCD631EA5EDF8E040007F01013AD4-->
<ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
<!--60FCCD631EA5EDF8E040007F01013AD4-->
<ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
<!--60FCCD631EA5EDF8E040007F01013AD4--> <SEQNO><![CDATA[40]]></SEQNO>
<!--60FCCD631EA5EDF8E040007F01013AD4-->
<ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
@@ -281520,10 +281520,10 @@
<!--60FCCD631EAAEDF8E040007F01013AD4--> <HELP><![CDATA[The Period indicates
an exclusive range of dates for a calendar.]]></HELP>
<!--60FCCD631EAAEDF8E040007F01013AD4-->
<COLUMNNAME><![CDATA[C_Period_ID]]></COLUMNNAME>
<!--60FCCD631EAAEDF8E040007F01013AD4-->
<AD_TABLE_ID><![CDATA[CB391C8A13D74B688A34017B5B5D1F5D]]></AD_TABLE_ID>
-<!--60FCCD631EAAEDF8E040007F01013AD4-->
<AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--60FCCD631EAAEDF8E040007F01013AD4-->
<AD_REFERENCE_ID><![CDATA[30]]></AD_REFERENCE_ID>
<!--60FCCD631EAAEDF8E040007F01013AD4-->
<FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
<!--60FCCD631EAAEDF8E040007F01013AD4--> <ISKEY><![CDATA[N]]></ISKEY>
-<!--60FCCD631EAAEDF8E040007F01013AD4--> <ISPARENT><![CDATA[Y]]></ISPARENT>
+<!--60FCCD631EAAEDF8E040007F01013AD4--> <ISPARENT><![CDATA[N]]></ISPARENT>
<!--60FCCD631EAAEDF8E040007F01013AD4-->
<ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
<!--60FCCD631EAAEDF8E040007F01013AD4-->
<ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
<!--60FCCD631EAAEDF8E040007F01013AD4-->
<ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
@@ -281559,7 +281559,7 @@
<!--60FCCD631EABEDF8E040007F01013AD4--> <ISKEY><![CDATA[N]]></ISKEY>
<!--60FCCD631EABEDF8E040007F01013AD4--> <ISPARENT><![CDATA[N]]></ISPARENT>
<!--60FCCD631EABEDF8E040007F01013AD4-->
<ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
------------------------------------------------------------------------------
Download new Adobe(R) Flash(R) Builder(TM) 4
The new Adobe(R) Flex(R) 4 and Flash(R) Builder(TM) 4 (formerly
Flex(R) Builder(TM)) enable the development of rich applications that run
across multiple browsers and platforms. Download your free trials today!
http://p.sf.net/sfu/adobe-dev2dev
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
