details: /erp/devel/pi/rev/21b6c14389e2
changeset: 8558:21b6c14389e2
user: Adrián Romero <adrianromero <at> openbravo.com>
date: Mon Oct 18 12:50:50 2010 +0200
summary: Backed out changeset e5c51e8fd720
details: /erp/devel/pi/rev/1ee95cec6ce6
changeset: 8559:1ee95cec6ce6
user: Adrián Romero <adrianromero <at> openbravo.com>
date: Mon Oct 18 12:51:26 2010 +0200
summary: merge backout
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/tables/FIN_FINANCIAL_ACCOUNT_ACCT.xml
| 6 +-
src-db/database/model/triggers/AD_ROLE_ORGACCESS_TRG.xml
| 22 +-
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
| 46 ++--
src-db/database/sourcedata/AD_ELEMENT.xml
| 2 +-
src-db/database/sourcedata/AD_FIELD.xml
| 30 +-
src-db/database/sourcedata/AD_MESSAGE.xml
| 79 ++++++++
src-db/database/sourcedata/AD_PROCESS.xml
| 3 +-
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
| 95 +--------
src-db/database/sourcedata/AD_VAL_RULE.xml
| 24 ++
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-wad/src/org/openbravo/wad/javasource.javaxml
| 29 ++-
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/secureApp/LoginUtils.java
| 39 +---
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_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_forms/TranslationHandler.java
| 18 +-
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
| 19 +-
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 +
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 +++
web/js/utils.js
| 4 +-
76 files changed, 965 insertions(+), 337 deletions(-)
diffs (truncated from 2983 to 300 lines):
diff -r e5c51e8fd720 -r 1ee95cec6ce6 build.xml
--- a/build.xml Mon Oct 04 16:58:09 2010 +0200
+++ b/build.xml Mon Oct 18 12:51:26 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 e5c51e8fd720 -r 1ee95cec6ce6
src-core/src/org/openbravo/base/BuildTask.java
--- a/src-core/src/org/openbravo/base/BuildTask.java Mon Oct 04 16:58:09
2010 +0200
+++ b/src-core/src/org/openbravo/base/BuildTask.java Mon Oct 18 12:51:26
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 e5c51e8fd720 -r 1ee95cec6ce6 src-db/database/lib/dbsourcemanager.jar
Binary file src-db/database/lib/dbsourcemanager.jar has changed
diff -r e5c51e8fd720 -r 1ee95cec6ce6
src-db/database/model/functions/C_BANKSTATEMENT_POST.xml
--- a/src-db/database/model/functions/C_BANKSTATEMENT_POST.xml Mon Oct 04
16:58:09 2010 +0200
+++ b/src-db/database/model/functions/C_BANKSTATEMENT_POST.xml Mon Oct 18
12:51:26 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 e5c51e8fd720 -r 1ee95cec6ce6
src-db/database/model/functions/C_INVOICE_POST.xml
--- a/src-db/database/model/functions/C_INVOICE_POST.xml Mon Oct 04
16:58:09 2010 +0200
+++ b/src-db/database/model/functions/C_INVOICE_POST.xml Mon Oct 18
12:51:26 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 e5c51e8fd720 -r 1ee95cec6ce6
src-db/database/model/functions/MRP_PURCHASEORDER.xml
--- a/src-db/database/model/functions/MRP_PURCHASEORDER.xml Mon Oct 04
16:58:09 2010 +0200
+++ b/src-db/database/model/functions/MRP_PURCHASEORDER.xml Mon Oct 18
12:51:26 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 e5c51e8fd720 -r 1ee95cec6ce6 src-db/database/model/tables/AD_USER.xml
--- a/src-db/database/model/tables/AD_USER.xml Mon Oct 04 16:58:09 2010 +0200
+++ b/src-db/database/model/tables/AD_USER.xml Mon Oct 18 12:51:26 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 e5c51e8fd720 -r 1ee95cec6ce6
src-db/database/model/tables/FIN_FINANCIAL_ACCOUNT_ACCT.xml
--- a/src-db/database/model/tables/FIN_FINANCIAL_ACCOUNT_ACCT.xml Mon Oct
04 16:58:09 2010 +0200
+++ b/src-db/database/model/tables/FIN_FINANCIAL_ACCOUNT_ACCT.xml Mon Oct
18 12:51:26 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 e5c51e8fd720 -r 1ee95cec6ce6
src-db/database/model/triggers/AD_ROLE_ORGACCESS_TRG.xml
--- a/src-db/database/model/triggers/AD_ROLE_ORGACCESS_TRG.xml Mon Oct 04
16:58:09 2010 +0200
+++ b/src-db/database/model/triggers/AD_ROLE_ORGACCESS_TRG.xml Mon Oct 18
12:51:26 2010 +0200
@@ -61,23 +61,17 @@
)
LOOP
IF(v_Client_ID <> Cur_Org.AD_Client_ID) THEN
- 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;
+ 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;
-
-- 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_OrgList:=v_OrgList || Cur_Org.AD_Org_ID;
+ 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 e5c51e8fd720 -r 1ee95cec6ce6
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 Mon Oct 18 12:51:26
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 e5c51e8fd720 -r 1ee95cec6ce6
src-db/database/model/triggers/C_INVOICE_TRG2.xml
--- a/src-db/database/model/triggers/C_INVOICE_TRG2.xml Mon Oct 04 16:58:09
2010 +0200
+++ b/src-db/database/model/triggers/C_INVOICE_TRG2.xml Mon Oct 18 12:51:26
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'
------------------------------------------------------------------------------
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
