details: /erp/devel/pi/rev/3dbe020a2565
changeset: 8722:3dbe020a2565
user: Valery Lezhebokov <valery.lezhebokov <at> gmail.com>
date: Mon Oct 11 09:36:19 2010 +0200
summary: Related to issue 14650: When uninstalling a module with an update
available, I still have Install Updates Now option
details: /erp/devel/pi/rev/a633b87e13af
changeset: 8723:a633b87e13af
user: Valery Lezhebokov <valery.lezhebokov <at> gmail.com>
date: Mon Oct 11 09:38:22 2010 +0200
summary: Related to issue 14650: When uninstalling a module with an update
available, I still have Install Updates Now option
details: /erp/devel/pi/rev/7ddd3c114bad
changeset: 8724:7ddd3c114bad
user: Valery Lezhebokov <valery.lezhebokov <at> gmail.com>
date: Mon Oct 11 09:38:58 2010 +0200
summary: Related to issue 14433: MMC settings tab: When you save the tab you
don't know if it has been saved
details: /erp/devel/pi/rev/96ddca6672b7
changeset: 8725:96ddca6672b7
user: Valery Lezhebokov <valery.lezhebokov <at> gmail.com>
date: Mon Oct 11 09:39:23 2010 +0200
summary: Related to issue 14650: When uninstalling a module with an update
available, I still have Install Updates Now option
Related to issue 14433: MMC settings tab: When you save the tab you don't know
if it has been saved
details: /erp/devel/pi/rev/9229034bb715
changeset: 8726:9229034bb715
user: Valery Lezhebokov <valery.lezhebokov <at> gmail.com>
date: Mon Oct 11 11:23:43 2010 +0200
summary: Related to issue 14650: When uninstalling a module with an update
available, I still have Install Updates Now option
details: /erp/devel/pi/rev/213c137df029
changeset: 8727:213c137df029
user: Valery Lezhebokov <valery.lezhebokov <at> gmail.com>
date: Mon Oct 18 17:03:20 2010 +0200
summary: Related to issue 14650: Reverting changesets 3dbe020a2565 and
9229034bb715.
details: /erp/devel/pi/rev/5f912ab3818b
changeset: 8728:5f912ab3818b
user: Valery Lezhebokov <valery.lezhebokov <at> gmail.com>
date: Mon Oct 18 17:39:54 2010 +0200
summary: Related to issue 14650: Use a constant to refer Status property
details: /erp/devel/pi/rev/d867193e4054
changeset: 8729:d867193e4054
user: Valery Lezhebokov <valery.lezhebokov <at> gmail.com>
date: Sun Oct 24 15:09:23 2010 +0200
summary: merge with PI
details: /erp/devel/pi/rev/0bc1c826b4c1
changeset: 8730:0bc1c826b4c1
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Mon Oct 25 09:55:02 2010 +0200
summary: Added missing license
details: /erp/devel/pi/rev/ba3a725bf4ae
changeset: 8731:ba3a725bf4ae
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Mon Oct 25 09:56:52 2010 +0200
summary: merge
diffstat:
build.xml
| 2 +-
src-core/src/org/openbravo/base/BuildTask.java
| 3 +-
src-core/src/org/openbravo/database/SessionInfo.java
| 15 +
src-db/database/lib/dbsourcemanager.jar
| 0
src-db/database/model/functions/C_BANKSTATEMENT_POST.xml
| 16 +
src-db/database/model/functions/C_DEBT_PAYMENT_CREATE.xml
| 11 +-
src-db/database/model/functions/C_INVOICE_POST.xml
| 9 +-
src-db/database/model/functions/MRP_PURCHASEORDER.xml
| 11 +-
src-db/database/model/tables/AD_HB_LOG_CQUERY.xml
| 66 +
src-db/database/model/tables/AD_HB_LOG_CQUERY_ROW.xml
| 66 +
src-db/database/model/tables/AD_HEARTBEAT_LOG.xml
| 62 +-
src-db/database/model/tables/AD_REF_TABLE.xml
| 8 +
src-db/database/model/tables/AD_SESSION_USAGE_AUDIT.xml
| 80 +
src-db/database/model/tables/AD_SYSTEM_INFO.xml
| 26 +
src-db/database/model/tables/AD_TAB.xml
| 12 +
src-db/database/model/tables/AD_USER.xml
| 2 +-
src-db/database/model/tables/FIN_FINANCIAL_ACCOUNT.xml
| 4 +
src-db/database/model/tables/FIN_FINANCIAL_ACCOUNT_ACCT.xml
| 6 +-
src-db/database/model/triggers/AD_ROLE_ORGACCESS_TRG.xml
| 18 +-
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
| 23 +
src-db/database/sourcedata/AD_COLUMN.xml
| 2198 +++++++++-
src-db/database/sourcedata/AD_ELEMENT.xml
| 418 +-
src-db/database/sourcedata/AD_FIELD.xml
| 1411 ++++++-
src-db/database/sourcedata/AD_MESSAGE.xml
| 158 +-
src-db/database/sourcedata/AD_MODEL_OBJECT.xml
| 108 +-
src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml
| 176 +-
src-db/database/sourcedata/AD_PROCESS.xml
| 39 +-
src-db/database/sourcedata/AD_REFERENCE.xml
| 12 +
src-db/database/sourcedata/AD_REF_LIST.xml
| 122 +-
src-db/database/sourcedata/AD_TAB.xml
| 72 +-
src-db/database/sourcedata/AD_TABLE.xml
| 67 +-
src-db/database/sourcedata/AD_TEXTINTERFACES.xml
| 612 +-
src-db/database/sourcedata/AD_VAL_RULE.xml
| 26 +-
src-db/database/sourcedata/AD_WINDOW.xml
| 26 +-
src-test/org/openbravo/test/AllWebserviceTests.java
| 1 -
src-test/org/openbravo/test/dal/DalTest.java
| 7 +
src-test/org/openbravo/test/system/SystemValidatorTest.java
| 7 +-
src-test/org/openbravo/test/webservice/WSUpdateTest.java
| 31 +-
src-wad/src/org/openbravo/wad/ActionButtonJava_Responser.javaxml
| 57 +-
src-wad/src/org/openbravo/wad/ActionButton_Relation_data.xsql
| 6 +-
src-wad/src/org/openbravo/wad/ActionButton_Responser.javaxml
| 59 +-
src-wad/src/org/openbravo/wad/Fields_data.xsql
| 1 +
src-wad/src/org/openbravo/wad/Wad.java
| 43 +-
src-wad/src/org/openbravo/wad/javasource.javaxml
| 56 +-
src-wad/src/org/openbravo/wad/javasource.xml
| 12 +
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/ClassInfo_data.xsql
| 48 +-
src/org/openbravo/base/secureApp/DefaultOptions_data.xsql
| 2 +-
src/org/openbravo/base/secureApp/HttpSecureAppServlet.java
| 33 +-
src/org/openbravo/base/secureApp/LoginUtils.java
| 57 +-
src/org/openbravo/base/secureApp/Seguridad_data.xsql
| 11 +-
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/SL_Invoice_Product.java
| 16 +-
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/DocFINFinAccTransaction.java
| 8 +-
src/org/openbravo/erpCommon/ad_forms/DocInvoice.java
| 17 +-
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/Heartbeat.html
| 139 +-
src/org/openbravo/erpCommon/ad_forms/Heartbeat.java
| 121 +-
src/org/openbravo/erpCommon/ad_forms/Heartbeat.xml
| 18 +-
src/org/openbravo/erpCommon/ad_forms/InstanceManagement.html
| 23 +-
src/org/openbravo/erpCommon/ad_forms/InstanceManagement.java
| 55 +-
src/org/openbravo/erpCommon/ad_forms/InstanceManagementActivateLocal.html
| 2 +-
src/org/openbravo/erpCommon/ad_forms/InstanceManagementActivateOnline.html
| 2 +-
src/org/openbravo/erpCommon/ad_forms/InstanceManagementDeactivate.html
| 6 +-
src/org/openbravo/erpCommon/ad_forms/InstancePurpose.html
| 239 +
src/org/openbravo/erpCommon/ad_forms/InstancePurpose.java
| 144 +
src/org/openbravo/erpCommon/ad_forms/InstancePurpose.xml
| 36 +
src/org/openbravo/erpCommon/ad_forms/ModuleManagement.java
| 48 +-
src/org/openbravo/erpCommon/ad_forms/ModuleManagement_ErrorCommercial.html
| 10 +-
src/org/openbravo/erpCommon/ad_forms/Registration.java
| 13 +-
src/org/openbravo/erpCommon/ad_forms/RequisitionToOrder.java
| 27 +-
src/org/openbravo/erpCommon/ad_forms/Role.java
| 4 +-
src/org/openbravo/erpCommon/ad_forms/RoleCombo_data.xsql
| 4 +-
src/org/openbravo/erpCommon/ad_forms/TranslationHandler.java
| 18 +-
src/org/openbravo/erpCommon/ad_process/ChangeOrderOrg.java
| 26 +-
src/org/openbravo/erpCommon/ad_process/ClientCombo_data.xsql
| 5 +-
src/org/openbravo/erpCommon/ad_process/CreateAccountingReport.java
| 35 +-
src/org/openbravo/erpCommon/ad_process/CreateTaxReport.java
| 36 +-
src/org/openbravo/erpCommon/ad_process/HeartbeatProcess.java
| 590 ++-
src/org/openbravo/erpCommon/ad_process/HeartbeatProcess_data.xsql
| 74 -
src/org/openbravo/erpCommon/ad_process/TestHeartbeat.java
| 14 +-
src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReportsPDF.fo
| 19 +-
src/org/openbravo/erpCommon/ad_reports/ReportDebtPayment.html
| 32 +-
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/businessUtility/InitialClientSetup.java
| 16 +-
src/org/openbravo/erpCommon/info/ProductMultiple.html
| 3 +
src/org/openbravo/erpCommon/info/ProjectMultiple.html
| 3 +
src/org/openbravo/erpCommon/modules/ImportModule.java
| 15 +-
src/org/openbravo/erpCommon/modules/VersionUtility.java
| 19 +-
src/org/openbravo/erpCommon/obps/ActivationKey.java
| 6 +-
src/org/openbravo/erpCommon/obps/ActiveInstanceProcess.java
| 9 +-
src/org/openbravo/erpCommon/security/Login.java
| 22 +
src/org/openbravo/erpCommon/utility/DynamicJS.java
| 12 +-
src/org/openbravo/erpCommon/utility/Home.html
| 43 +
src/org/openbravo/erpCommon/utility/Home.java
| 100 +-
src/org/openbravo/erpCommon/utility/Home.xml
| 9 +-
src/org/openbravo/erpCommon/utility/HttpsUtils.java
| 311 +-
src/org/openbravo/erpCommon/utility/OBError.java
| 11 +
src/org/openbravo/erpCommon/utility/OBErrorBuilder.java
| 85 +
src/org/openbravo/erpCommon/utility/StaticCommunityBranding.java
| 79 +
src/org/openbravo/erpCommon/utility/SystemInfo.java
| 555 ++-
src/org/openbravo/erpCommon/utility/SystemInfo_data.xsql
| 40 -
src/org/openbravo/erpCommon/utility/Utility.java
| 6 +-
src/org/openbravo/erpCommon/utility/VerticalMenu.html
| 4 +
src/org/openbravo/erpCommon/utility/VerticalMenu.java
| 5 +-
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
| 40 +
web/html/en_US/StaticCommunityBranding-2.50-Basic.html
| 46 +
web/html/en_US/StaticCommunityBranding-2.50-Basic_files/banner.png
| 0
web/html/en_US/StaticCommunityBranding-2.50-Comm.html
| 47 +
web/html/en_US/StaticCommunityBranding-2.50-Comm_files/banner.png
| 0
web/html/en_US/StaticCommunityBranding-2.50-STD.html
| 48 +
web/html/en_US/StaticCommunityBranding-2.50-STD_files/banner.png
| 0
web/skins/Default/Login/banner-development.png
| 0
web/skins/Default/Login/banner-evaluation.png
| 0
web/skins/Default/Login/banner-production.png
| 0
web/skins/Default/Login/banner-testing.png
| 0
web/skins/Default/Login/banner-unknown.png
| 0
web/skins/Default/Login/communityBrandingBackground.png
| 0
web/skins/Default/Login/communityBrandingBottom.png
| 0
web/skins/Default/Login/communityBrandingTop.png
| 0
web/skins/Default/Openbravo_ERP_250.css
| 106 +
web/skins/Default/Popup/WindowLogo/iconInstancePurpose.png
| 0
149 files changed, 8636 insertions(+), 1562 deletions(-)
diffs (truncated from 14851 to 300 lines):
diff -r c8cc677ecd99 -r ba3a725bf4ae build.xml
--- a/build.xml Wed Oct 06 12:03:47 2010 +0200
+++ b/build.xml Mon Oct 25 09:56:52 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 c8cc677ecd99 -r ba3a725bf4ae
src-core/src/org/openbravo/base/BuildTask.java
--- a/src-core/src/org/openbravo/base/BuildTask.java Wed Oct 06 12:03:47
2010 +0200
+++ b/src-core/src/org/openbravo/base/BuildTask.java Mon Oct 25 09:56:52
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 c8cc677ecd99 -r ba3a725bf4ae
src-core/src/org/openbravo/database/SessionInfo.java
--- a/src-core/src/org/openbravo/database/SessionInfo.java Wed Oct 06
12:03:47 2010 +0200
+++ b/src-core/src/org/openbravo/database/SessionInfo.java Mon Oct 25
09:56:52 2010 +0200
@@ -57,6 +57,12 @@
private static ThreadLocal<Connection> sessionConnection = new
ThreadLocal<Connection>();
private static ThreadLocal<Boolean> changedInfo = new ThreadLocal<Boolean>();
+ /*
+ * Maintain artifact's module id. This element is not persisted in auxiliary
session table, it is
+ * intended to be used in the usage audit.
+ */
+ private static ThreadLocal<String> moduleId = new ThreadLocal<String>();
+
/**
* Sets all session information to null. Called at the end of http-request
handling, to reset the
* audit information for that thread.
@@ -67,6 +73,7 @@
processType.set(null);
processId.set(null);
changedInfo.set(null);
+ moduleId.set(null);
// if there is an open connection associated to get current request, close
it
Connection conn = sessionConnection.get();
try {
@@ -264,4 +271,12 @@
static void setSessionConnection(Connection conn) {
sessionConnection.set(conn);
}
+
+ public static String getModuleId() {
+ return moduleId.get();
+ }
+
+ public static void setModuleId(String moduleId) {
+ SessionInfo.moduleId.set(moduleId);
+ }
}
diff -r c8cc677ecd99 -r ba3a725bf4ae src-db/database/lib/dbsourcemanager.jar
Binary file src-db/database/lib/dbsourcemanager.jar has changed
diff -r c8cc677ecd99 -r ba3a725bf4ae
src-db/database/model/functions/C_BANKSTATEMENT_POST.xml
--- a/src-db/database/model/functions/C_BANKSTATEMENT_POST.xml Wed Oct 06
12:03:47 2010 +0200
+++ b/src-db/database/model/functions/C_BANKSTATEMENT_POST.xml Mon Oct 25
09:56:52 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 c8cc677ecd99 -r ba3a725bf4ae
src-db/database/model/functions/C_DEBT_PAYMENT_CREATE.xml
--- a/src-db/database/model/functions/C_DEBT_PAYMENT_CREATE.xml Wed Oct 06
12:03:47 2010 +0200
+++ b/src-db/database/model/functions/C_DEBT_PAYMENT_CREATE.xml Mon Oct 25
09:56:52 2010 +0200
@@ -16,7 +16,7 @@
* under the License.
* The Original Code is Openbravo ERP.
* The Initial Developer of the Original Code is Openbravo SLU
-* All portions are Copyright (C) 2001-2006 Openbravo SLU
+* All portions are Copyright (C) 2001-2010 Openbravo SLU
* All Rights Reserved.
* Contributor(s): ______________________________________.
************************************************************************/
@@ -51,6 +51,7 @@
v_c_withholding_id C_DEBT_PAYMENT.C_Withholding_ID%TYPE;
v_withholdingamount C_DEBT_PAYMENT.withholdingamount%TYPE;
v_count NUMBER;
+ v_dateacct C_BankStatementLine.DateAcct%TYPE;
BEGIN
-- Update AD_PInstance
DBMS_OUTPUT.PUT_LINE('Updating PInstance - Processing ' || p_PInstance_ID)
;
@@ -113,10 +114,12 @@
v_ResultStr:='ReadingBankStatementLine '||v_record_Id;
SELECT L.AD_Client_ID,
L.AD_Org_ID,
- B.C_BankAccount_ID
+ B.C_BankAccount_ID,
+ L.DateAcct
INTO v_Client_ID,
v_AD_Org_ID,
- v_CBankAccount_ID
+ v_CBankAccount_ID,
+ v_dateacct
FROM C_BankStatementLine L,
C_BankStatement B
WHERE L.C_BankStatementLine_ID=v_Record_ID
@@ -155,7 +158,7 @@
(
v_SettlementID, v_Client_ID, v_AD_Org_ID, 'Y',
now(), v_AD_User_ID, now(), v_AD_User_ID,
- '*DPC*'||v_SDocumentNo, trunc(now()), trunc(now()), 'C',
+ '*DPC*'||v_SDocumentNo, v_dateacct, v_dateacct, 'C',
v_SettlementDocType_ID, 'N', 'N', 'N',
v_C_Currency_ID, v_Description, 'Y'
)
diff -r c8cc677ecd99 -r ba3a725bf4ae
src-db/database/model/functions/C_INVOICE_POST.xml
--- a/src-db/database/model/functions/C_INVOICE_POST.xml Wed Oct 06
12:03:47 2010 +0200
+++ b/src-db/database/model/functions/C_INVOICE_POST.xml Mon Oct 25
09:56:52 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,12 +1560,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 c8cc677ecd99 -r ba3a725bf4ae
src-db/database/model/functions/MRP_PURCHASEORDER.xml
--- a/src-db/database/model/functions/MRP_PURCHASEORDER.xml Wed Oct 06
12:03:47 2010 +0200
+++ b/src-db/database/model/functions/MRP_PURCHASEORDER.xml Mon Oct 25
09:56:52 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 c8cc677ecd99 -r ba3a725bf4ae
src-db/database/model/tables/AD_HB_LOG_CQUERY.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src-db/database/model/tables/AD_HB_LOG_CQUERY.xml Mon Oct 25 09:56:52
2010 +0200
@@ -0,0 +1,66 @@
+<?xml version="1.0"?>
+ <database name="TABLE AD_HB_LOG_CQUERY">
+ <table name="AD_HB_LOG_CQUERY" primaryKey="AD_HB_LOG_CQUERY_KEY">
+ <column name="AD_HB_LOG_CQUERY_ID" primaryKey="true" required="true"
type="VARCHAR" size="32" autoIncrement="false">
+ <default/>
+ <onCreateDefault/>
+ </column>
+ <column name="AD_CLIENT_ID" primaryKey="false" required="true"
type="VARCHAR" size="32" autoIncrement="false">
+ <default/>
+ <onCreateDefault/>
+ </column>
+ <column name="AD_ORG_ID" primaryKey="false" required="true"
type="VARCHAR" size="32" autoIncrement="false">
+ <default/>
+ <onCreateDefault/>
+ </column>
+ <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR"
size="1" autoIncrement="false">
+ <default><![CDATA[Y]]></default>
+ <onCreateDefault/>
+ </column>
+ <column name="CREATED" primaryKey="false" required="true"
type="TIMESTAMP" size="7" autoIncrement="false">
+ <default><![CDATA[SYSDATE]]></default>
+ <onCreateDefault/>
+ </column>
+ <column name="CREATEDBY" primaryKey="false" required="true"
type="VARCHAR" size="32" autoIncrement="false">
+ <default/>
+ <onCreateDefault/>
+ </column>
+ <column name="UPDATED" primaryKey="false" required="true"
type="TIMESTAMP" size="7" autoIncrement="false">
+ <default><![CDATA[SYSDATE]]></default>
+ <onCreateDefault/>
+ </column>
+ <column name="UPDATEDBY" primaryKey="false" required="true"
type="VARCHAR" size="32" autoIncrement="false">
+ <default/>
+ <onCreateDefault/>
+ </column>
+ <column name="AD_HEARTBEAT_LOG_ID" primaryKey="false" required="true"
type="VARCHAR" size="32" autoIncrement="false">
+ <default/>
+ <onCreateDefault/>
+ </column>
+ <column name="NAME" primaryKey="false" required="true" type="NVARCHAR"
size="60" autoIncrement="false">
+ <default/>
+ <onCreateDefault/>
+ </column>
+ <column name="TYPE" primaryKey="false" required="true" type="VARCHAR"
size="60" autoIncrement="false">
+ <default/>
+ <onCreateDefault/>
+ </column>
+ <column name="CODE" primaryKey="false" required="false" type="NVARCHAR"
size="2000" autoIncrement="false">
+ <default/>
+ <onCreateDefault/>
+ </column>
+ <foreign-key foreignTable="AD_CLIENT" name="AD_HB_LOG_CQUERY_AD_CLIENT">
+ <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
+ </foreign-key>
+ <foreign-key foreignTable="AD_ORG" name="AD_HB_LOG_CQUERY_AD_ORG">
+ <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
+ </foreign-key>
+ <foreign-key foreignTable="AD_HEARTBEAT_LOG"
name="AD_HB_LOG_CQUERY_HEARTBEAT_LOG">
+ <reference local="AD_HEARTBEAT_LOG_ID" foreign="AD_HEARTBEAT_LOG_ID"/>
+ </foreign-key>
+ <index name="AD_HB_LOG_CQUERY_HEARTBEAT_LOG" unique="false">
+ <index-column name="AD_HEARTBEAT_LOG_ID"/>
+ </index>
+ <check name="AD_HB_LOG_CQUERY_ISACTIVE"><![CDATA[ISACTIVE IN ('Y',
'N')]]></check>
+ </table>
+ </database>
diff -r c8cc677ecd99 -r ba3a725bf4ae
src-db/database/model/tables/AD_HB_LOG_CQUERY_ROW.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src-db/database/model/tables/AD_HB_LOG_CQUERY_ROW.xml Mon Oct 25
09:56:52 2010 +0200
@@ -0,0 +1,66 @@
+<?xml version="1.0"?>
+ <database name="TABLE AD_HB_LOG_CQUERY_ROW">
+ <table name="AD_HB_LOG_CQUERY_ROW" primaryKey="AD_HB_LOG_CQUERY_ROW_KEY">
+ <column name="AD_HB_LOG_CQUERY_ROW_ID" primaryKey="true" required="true"
type="VARCHAR" size="32" autoIncrement="false">
------------------------------------------------------------------------------
Nokia and AT&T present the 2010 Calling All Innovators-North America contest
Create new apps & games for the Nokia N8 for consumers in U.S. and Canada
$10 million total in prizes - $4M cash, 500 devices, nearly $6M in marketing
Develop with Nokia Qt SDK, Web Runtime, or Java and Publish to Ovi Store
http://p.sf.net/sfu/nokia-dev2dev
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
