details: /erp/devel/pi/rev/3be4b45f2c07
changeset: 9792:3be4b45f2c07
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Thu Jan 13 23:30:24 2011 +0100
summary: CI: update AD_MODULE to version 9765
details: /erp/devel/pi/rev/c3c3f5f1fd8b
changeset: 9793:c3c3f5f1fd8b
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Thu Jan 13 23:48:37 2011 +0100
summary: CI: merge back from main
diffstat:
modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/buildvalidation/UnpostRefundPayments.class
| 0
modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/buildvalidation/UnpostRefundPaymentsData.class
| 0
modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/modulescript/CreateAccountingConfiguration.class
| 0
modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/modulescript/CreateAccountingConfigurationData.class
| 0
modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/modulescript/CreateDocumentNoSequence.class
| 0
modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/modulescript/CreateDocumentNoSequenceData.class
| 0
modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/modulescript/UpdateGeneratedUsedCreditColumns.class
| 0
modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/modulescript/UpdateGeneratedUsedCreditColumnsData.class
| 0
modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_ORD.xml
| 6 +-
modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/org/openbravo/advpaymentmngt/modulescript/CreateAccountingConfiguration.java
| 3 +-
modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/org/openbravo/advpaymentmngt/modulescript/CreateAccountingConfiguration_data.xsql
| 9 -
modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/src/org/openbravo/advpaymentmngt/modulescript/CreateAccountingConfigurationData.java
| 72 +-
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_ExecutePayment.java
| 15 +
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProposalProcess.java
|
18 +-
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_BankStatementImport.java
| 29 +-
modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 2 +-
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 8 +-
modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-tab.js.ftl
| 1 +
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewTab.java
| 26 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-action-button.js
| 25 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-formitem-widgets.js
| 9 +
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-view.js
| 5 -
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-utilities.js
| 54 -
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/form/dateChooser-arrow_left.png
| 0
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/form/dateChooser-arrow_right.png
| 0
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/form/dateChooser-bg-button.png
| 0
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/form/dateChooser-bg-button_Down.png
| 0
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/form/dateChooser-bg-button_Over.png
| 0
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/form/dateChooser-doubleArrow_left.png
| 0
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/form/dateChooser-doubleArrow_right.png
| 0
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/form/dateChooser-popup_B.png
| 0
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/form/dateChooser-popup_BL.png
| 0
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/form/dateChooser-popup_BR.png
| 0
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/form/dateChooser-popup_L.png
| 0
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/form/dateChooser-popup_R.png
| 0
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/form/dateChooser-popup_T.png
| 0
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/form/dateChooser-popup_TL.png
| 0
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/form/dateChooser-popup_TR.png
| 0
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-application-styles.js
| 49 +-
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-form-styles.css
| 304 +++++++++-
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-form-styles.js
| 2 +-
modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 2 +-
modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 6 +-
modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 4 +-
modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 2 +-
modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 10 +-
modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 2 +-
modules/org.openbravo.userinterface.selector/build/classes/org/openbravo/userinterface/selector/UpdateLanguageColumn.class
| 0
modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 12 +-
modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 6 +-
modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 2 +-
modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 22 +-
modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 8 +-
src-db/database/model/tables/AD_MODULE.xml
| 4 +
src-db/database/model/triggers/AD_MODULE_TRG2.xml
| 67 ++
src-db/database/sourcedata/AD_COLUMN.xml
| 36 +
src-db/database/sourcedata/AD_DATASET_COLUMN.xml
| 11 +
src-db/database/sourcedata/AD_ELEMENT.xml
| 15 +
src-db/database/sourcedata/AD_FIELD.xml
| 30 +-
src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
src-test/org/openbravo/test/xml/DatasetExportTest.java
| 13 +-
src/org/openbravo/base/model/ModelProvider.java
| 72 +-
src/org/openbravo/base/model/NamingUtil.java
| 2 +
src/org/openbravo/base/model/Property.java
| 9 +
src/org/openbravo/base/model/domaintype/ButtonDomainType.java
| 6 +
src/org/openbravo/dal/core/DalUtil.java
| 22 +-
src/org/openbravo/dal/xml/BaseXMLEntityConverter.java
| 2 +-
src/org/openbravo/dal/xml/EntityXMLConverter.java
| 6 +-
src/org/openbravo/dal/xml/ModelXMLConverter.java
| 4 +-
src/org/openbravo/dal/xml/XMLEntityConverter.java
| 2 +-
src/org/openbravo/erpCommon/ad_forms/DocFINReconciliation.java
| 8 +-
src/org/openbravo/erpCommon/ad_process/ImportOrder.java
| 125 ++-
src/org/openbravo/erpCommon/ad_reports/ReportExpense.java
| 26 +-
src/org/openbravo/erpCommon/ad_reports/ReportProjectProfitabilityJR.java
| 13 +-
src/org/openbravo/service/system/ModuleValidator.java
| 2 +-
89 files changed, 886 insertions(+), 332 deletions(-)
diffs (truncated from 2413 to 300 lines):
diff -r 962238acceaf -r c3c3f5f1fd8b
modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/buildvalidation/UnpostRefundPayments.class
Binary file
modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/buildvalidation/UnpostRefundPayments.class
has changed
diff -r 962238acceaf -r c3c3f5f1fd8b
modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/buildvalidation/UnpostRefundPaymentsData.class
Binary file
modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/buildvalidation/UnpostRefundPaymentsData.class
has changed
diff -r 962238acceaf -r c3c3f5f1fd8b
modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/modulescript/CreateAccountingConfiguration.class
Binary file
modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/modulescript/CreateAccountingConfiguration.class
has changed
diff -r 962238acceaf -r c3c3f5f1fd8b
modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/modulescript/CreateAccountingConfigurationData.class
Binary file
modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/modulescript/CreateAccountingConfigurationData.class
has changed
diff -r 962238acceaf -r c3c3f5f1fd8b
modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/modulescript/CreateDocumentNoSequence.class
Binary file
modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/modulescript/CreateDocumentNoSequence.class
has changed
diff -r 962238acceaf -r c3c3f5f1fd8b
modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/modulescript/CreateDocumentNoSequenceData.class
Binary file
modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/modulescript/CreateDocumentNoSequenceData.class
has changed
diff -r 962238acceaf -r c3c3f5f1fd8b
modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/modulescript/UpdateGeneratedUsedCreditColumns.class
Binary file
modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/modulescript/UpdateGeneratedUsedCreditColumns.class
has changed
diff -r 962238acceaf -r c3c3f5f1fd8b
modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/modulescript/UpdateGeneratedUsedCreditColumnsData.class
Binary file
modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/modulescript/UpdateGeneratedUsedCreditColumnsData.class
has changed
diff -r 962238acceaf -r c3c3f5f1fd8b
modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_ORD.xml
---
a/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_ORD.xml
Thu Jan 13 10:26:55 2011 +0100
+++
b/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_ORD.xml
Thu Jan 13 23:48:37 2011 +0100
@@ -77,9 +77,8 @@
FROM c_doctype
WHERE c_doctype_id = v_C_Doctype_ID;
-
- IF(v_docSubType not in ('OB', 'ON')) THEN
- IF (p_docaction = 'CO') THEN
+ IF(v_docSubType is null or v_docSubType not in ('OB', 'ON')) THEN
+ IF (p_docaction = 'CO') THEN
-- Checking Payment Method ID is available
IF(v_paymentmethod_id IS NULL) THEN
RAISE_APPLICATION_ERROR(-20000, '@APRM_PAYMENTMETHOD_MISSING@');
@@ -98,7 +97,6 @@
IF (v_count > 0) THEN
RAISE_APPLICATION_ERROR(-20000, '@APRM_ORDER_MAN_PAYMENTS@');
END IF;
-
v_payment_schedule_order := get_uuid();
INSERT INTO fin_payment_schedule
(
diff -r 962238acceaf -r c3c3f5f1fd8b
modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/org/openbravo/advpaymentmngt/modulescript/CreateAccountingConfiguration.java
---
a/modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/org/openbravo/advpaymentmngt/modulescript/CreateAccountingConfiguration.java
Thu Jan 13 10:26:55 2011 +0100
+++
b/modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/org/openbravo/advpaymentmngt/modulescript/CreateAccountingConfiguration.java
Thu Jan 13 23:48:37 2011 +0100
@@ -69,8 +69,7 @@
//Inserts table access for FIN_FinAcc_Transaction table
void createTableAccess(ConnectionProvider cp) throws Exception{
- boolean exist = CreateAccountingConfigurationData.selectTableAccess(cp);
- if(!exist)
CreateAccountingConfigurationData.insertTableAccess(cp.getConnection(), cp);
+ CreateAccountingConfigurationData.insertTableAccess(cp.getConnection(),
cp);
}
void updateTableDocType(ConnectionProvider cp) throws Exception{
diff -r 962238acceaf -r c3c3f5f1fd8b
modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/org/openbravo/advpaymentmngt/modulescript/CreateAccountingConfiguration_data.xsql
---
a/modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/org/openbravo/advpaymentmngt/modulescript/CreateAccountingConfiguration_data.xsql
Thu Jan 13 10:26:55 2011 +0100
+++
b/modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/org/openbravo/advpaymentmngt/modulescript/CreateAccountingConfiguration_data.xsql
Thu Jan 13 23:48:37 2011 +0100
@@ -74,15 +74,6 @@
]]>
</Sql>
</SqlMethod>
- <SqlMethod name="selectTableAccess" type="preparedStatement"
return="boolean">
- <SqlMethodComment></SqlMethodComment>
- <Sql>
- <![CDATA[
- select count(*) as name from ad_table_access
- where ad_table_id = '4D8C3B3C31D1410DA046140C9F024D17'
- ]]>
- </Sql>
- </SqlMethod>
<SqlMethod name="insertTableAccess" type="preparedStatement"
connection="true" return="rowCount">
<SqlMethodComment></SqlMethodComment>
<Sql>
diff -r 962238acceaf -r c3c3f5f1fd8b
modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/src/org/openbravo/advpaymentmngt/modulescript/CreateAccountingConfigurationData.java
---
a/modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/src/org/openbravo/advpaymentmngt/modulescript/CreateAccountingConfigurationData.java
Thu Jan 13 10:26:55 2011 +0100
+++
b/modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/src/org/openbravo/advpaymentmngt/modulescript/CreateAccountingConfigurationData.java
Thu Jan 13 23:48:37 2011 +0100
@@ -30,23 +30,23 @@
}
public String getField(String fieldName) {
- if (fieldName.equalsIgnoreCase("C_ACCTSCHEMA_ID") ||
fieldName.equals("cAcctschemaId"))
+ if (fieldName.equalsIgnoreCase("c_acctschema_id") ||
fieldName.equals("cAcctschemaId"))
return cAcctschemaId;
- else if (fieldName.equalsIgnoreCase("AD_CLIENT_ID") ||
fieldName.equals("adClientId"))
+ else if (fieldName.equalsIgnoreCase("ad_client_id") ||
fieldName.equals("adClientId"))
return adClientId;
- else if (fieldName.equalsIgnoreCase("AD_ORG_ID") ||
fieldName.equals("adOrgId"))
+ else if (fieldName.equalsIgnoreCase("ad_org_id") ||
fieldName.equals("adOrgId"))
return adOrgId;
- else if (fieldName.equalsIgnoreCase("AD_TABLE_ID") ||
fieldName.equals("adTableId"))
+ else if (fieldName.equalsIgnoreCase("ad_table_id") ||
fieldName.equals("adTableId"))
return adTableId;
- else if (fieldName.equalsIgnoreCase("NAME"))
+ else if (fieldName.equalsIgnoreCase("name"))
return name;
- else if (fieldName.equalsIgnoreCase("C_PERIOD_ID") ||
fieldName.equals("cPeriodId"))
+ else if (fieldName.equalsIgnoreCase("c_period_id") ||
fieldName.equals("cPeriodId"))
return cPeriodId;
- else if (fieldName.equalsIgnoreCase("VALUE"))
+ else if (fieldName.equalsIgnoreCase("value"))
return value;
- else if (fieldName.equalsIgnoreCase("STATUS"))
+ else if (fieldName.equalsIgnoreCase("status"))
return status;
- else if (fieldName.equalsIgnoreCase("ISDEFAULTACCT"))
+ else if (fieldName.equalsIgnoreCase("isdefaultacct"))
return isdefaultacct;
else {
log4j.debug("Field does not exist: " + fieldName);
@@ -83,15 +83,15 @@
while(continueResult && result.next()) {
countRecord++;
CreateAccountingConfigurationData
objectCreateAccountingConfigurationData = new
CreateAccountingConfigurationData();
- objectCreateAccountingConfigurationData.cAcctschemaId =
UtilSql.getValue(result, "C_ACCTSCHEMA_ID");
- objectCreateAccountingConfigurationData.adClientId =
UtilSql.getValue(result, "AD_CLIENT_ID");
- objectCreateAccountingConfigurationData.adOrgId =
UtilSql.getValue(result, "AD_ORG_ID");
- objectCreateAccountingConfigurationData.adTableId =
UtilSql.getValue(result, "AD_TABLE_ID");
- objectCreateAccountingConfigurationData.name =
UtilSql.getValue(result, "NAME");
- objectCreateAccountingConfigurationData.cPeriodId =
UtilSql.getValue(result, "C_PERIOD_ID");
- objectCreateAccountingConfigurationData.value =
UtilSql.getValue(result, "VALUE");
- objectCreateAccountingConfigurationData.status =
UtilSql.getValue(result, "STATUS");
- objectCreateAccountingConfigurationData.isdefaultacct =
UtilSql.getValue(result, "ISDEFAULTACCT");
+ objectCreateAccountingConfigurationData.cAcctschemaId =
UtilSql.getValue(result, "c_acctschema_id");
+ objectCreateAccountingConfigurationData.adClientId =
UtilSql.getValue(result, "ad_client_id");
+ objectCreateAccountingConfigurationData.adOrgId =
UtilSql.getValue(result, "ad_org_id");
+ objectCreateAccountingConfigurationData.adTableId =
UtilSql.getValue(result, "ad_table_id");
+ objectCreateAccountingConfigurationData.name =
UtilSql.getValue(result, "name");
+ objectCreateAccountingConfigurationData.cPeriodId =
UtilSql.getValue(result, "c_period_id");
+ objectCreateAccountingConfigurationData.value =
UtilSql.getValue(result, "value");
+ objectCreateAccountingConfigurationData.status =
UtilSql.getValue(result, "status");
+ objectCreateAccountingConfigurationData.isdefaultacct =
UtilSql.getValue(result, "isdefaultacct");
objectCreateAccountingConfigurationData.InitRecordNumber =
Integer.toString(firstRegister);
vector.addElement(objectCreateAccountingConfigurationData);
if (countRecord >= numberRegisters && numberRegisters != 0) {
@@ -136,7 +136,7 @@
result = st.executeQuery();
if(result.next()) {
- boolReturn = !UtilSql.getValue(result, "NAME").equals("0");
+ boolReturn = !UtilSql.getValue(result, "name").equals("0");
}
result.close();
} catch(SQLException e){
@@ -239,40 +239,6 @@
return(updateCount);
}
- public static boolean selectTableAccess(ConnectionProvider
connectionProvider) throws ServletException {
- String strSql = "";
- strSql = strSql +
- " select count(*) as name from ad_table_access" +
- " where ad_table_id = '4D8C3B3C31D1410DA046140C9F024D17'";
-
- ResultSet result;
- boolean boolReturn = false;
- PreparedStatement st = null;
-
- try {
- st = connectionProvider.getPreparedStatement(strSql);
-
- result = st.executeQuery();
- if(result.next()) {
- boolReturn = !UtilSql.getValue(result, "NAME").equals("0");
- }
- result.close();
- } catch(SQLException e){
- log4j.error("SQL error in query: " + strSql + "Exception:"+ e);
- throw new ServletException("@CODE=" + Integer.toString(e.getErrorCode())
+ "@" + e.getMessage());
- } catch(Exception ex){
- log4j.error("Exception in query: " + strSql + "Exception:"+ ex);
- throw new ServletException("@CODE=@" + ex.getMessage());
- } finally {
- try {
- connectionProvider.releasePreparedStatement(st);
- } catch(Exception ignore){
- ignore.printStackTrace();
- }
- }
- return(boolReturn);
- }
-
public static int insertTableAccess(Connection conn, ConnectionProvider
connectionProvider) throws ServletException {
String strSql = "";
strSql = strSql +
diff -r 962238acceaf -r c3c3f5f1fd8b
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_ExecutePayment.java
---
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_ExecutePayment.java
Thu Jan 13 10:26:55 2011 +0100
+++
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_ExecutePayment.java
Thu Jan 13 23:48:37 2011 +0100
@@ -27,11 +27,14 @@
import org.openbravo.advpaymentmngt.exception.NoExecutionProcessFoundException;
import org.openbravo.advpaymentmngt.utility.FIN_PaymentExecutionProcess;
import org.openbravo.advpaymentmngt.utility.FIN_Utility;
+import org.openbravo.advpaymentmngt.utility.Value;
import org.openbravo.dal.service.OBDal;
import org.openbravo.erpCommon.utility.OBError;
import org.openbravo.model.common.enterprise.Organization;
import org.openbravo.model.financialmgmt.payment.FIN_FinaccTransaction;
import org.openbravo.model.financialmgmt.payment.FIN_Payment;
+import org.openbravo.model.financialmgmt.payment.FIN_PaymentPropDetailV;
+import org.openbravo.model.financialmgmt.payment.FIN_PaymentProposal;
import org.openbravo.model.financialmgmt.payment.PaymentExecutionProcess;
import
org.openbravo.model.financialmgmt.payment.PaymentExecutionProcessParameter;
import org.openbravo.model.financialmgmt.payment.PaymentRun;
@@ -110,6 +113,12 @@
paymentStatus = paymentRunPayment.getPayment().isReceipt() ?
"RPR" : "PPM";
paymentRunPayment.getPayment().setStatus(paymentStatus);
}
+ if ("PPW".equals(paymentRun.getSourceOfTheExecution())) {
+ FIN_PaymentProposal pp =
getPaymentProposalFromPayment(paymentRunPayment.getPayment());
+ pp.setStatus("PPM");
+ OBDal.getInstance().save(pp);
+ OBDal.getInstance().flush();
+ }
paymentRunPayment.getPayment().setPosted("N");
if (("RPR".equals(paymentStatus) || "PPM".equals(paymentStatus))
&&
FIN_Utility.isAutomaticDepositWithdrawn(paymentRunPayment.getPayment())
@@ -135,6 +144,12 @@
}
}
+ FIN_PaymentProposal getPaymentProposalFromPayment(FIN_Payment payment) {
+ FIN_PaymentPropDetailV ppv =
FIN_Utility.getOneInstance(FIN_PaymentPropDetailV.class,
+ new Value(FIN_PaymentPropDetailV.PROPERTY_PAYMENT, payment));
+ return ppv.getPaymentProposal();
+ }
+
private void setDefaultParameters() {
final List<PaymentExecutionProcessParameter> allParameters =
executionProcess
.getFinancialMgmtPaymentExecutionProcessParameterList();
diff -r 962238acceaf -r c3c3f5f1fd8b
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProposalProcess.java
---
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProposalProcess.java
Thu Jan 13 10:26:55 2011 +0100
+++
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProposalProcess.java
Thu Jan 13 23:48:37 2011 +0100
@@ -172,6 +172,11 @@
paymentProposal.setStatus(isReceipt ? "RPR" : "PPM");
// process payment
message = FIN_AddPayment.processPayment(vars, conProvider, "P",
payment);
+ if ("RPAE".equals(payment.getStatus())) {
+ paymentProposal.setStatus("RPAE");
+ OBDal.getInstance().save(paymentProposal);
+ OBDal.getInstance().flush();
+ }
if (message.getType().equals("Error")) {
String exceptionMessage = payment.getBusinessPartner().getName();
exceptionMessage += ": " + message.getMessage();
@@ -189,11 +194,14 @@
OBDal.getInstance().flush();
OBContext.restorePreviousMode();
}
- // If Automatic step is enabled get proposal status
- if (FIN_Utility.isAutomaticDepositWithdrawn(paymentProposal))
- paymentProposal.setStatus(isReceipt ? "RDNC" : "PWNC");
- else
- paymentProposal.setStatus(isReceipt ? "RPR" : "PPM");
+ // If Automatic step is enabled and not awaiting execution get
proposal status
+ if (!"RPAE".equals(paymentProposal.getStatus())) {
+ if (FIN_Utility.isAutomaticDepositWithdrawn(paymentProposal)) {
+ paymentProposal.setStatus(isReceipt ? "RDNC" : "PWNC");
+ } else {
+ paymentProposal.setStatus(isReceipt ? "RPR" : "PPM");
+ }
+ }
paymentProposal.setProcessed(true);
paymentProposal.setAPRMProcessProposal("RE");
OBDal.getInstance().save(paymentProposal);
diff -r 962238acceaf -r c3c3f5f1fd8b
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_BankStatementImport.java
---
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_BankStatementImport.java
Thu Jan 13 10:26:55 2011 +0100
+++
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_BankStatementImport.java
Thu Jan 13 23:48:37 2011 +0100
@@ -268,7 +268,11 @@
BusinessPartner matchBusinessPartner(String partnername) {
// TODO extend with other matching methods. It will make it easier to
later reconcile
- return matchBusinessPartnerByName(partnername);
+ BusinessPartner bp = matchBusinessPartnerByName(partnername);
+ if (bp == null) {
+ bp = finBPByName(partnername);
+ }
+ return bp;
}
BusinessPartner matchBusinessPartnerByName(String partnername) {
@@ -296,6 +300,29 @@
}
}
+ BusinessPartner finBPByName(String partnername) {
+ final StringBuilder whereClause = new StringBuilder();
+
+ OBContext.setAdminMode();
+ try {
+
+ whereClause.append(" as bp ");
+ whereClause.append(" where bp." + BusinessPartner.PROPERTY_NAME + " = '"
+ partnername + "'");
+ whereClause.append(" and bp." + BusinessPartner.PROPERTY_CLIENT + " = "
+ + OBContext.getOBContext().getCurrentClient());
+ final OBQuery<BusinessPartner> bp =
OBDal.getInstance().createQuery(BusinessPartner.class,
+ whereClause.toString());
+ List<BusinessPartner> matchedBP = bp.list();
+ if (matchedBP.size() == 0)
+ return null;
+ else
+ return matchedBP.get(0);
+
+ } finally {
------------------------------------------------------------------------------
Protect Your Site and Customers from Malware Attacks
Learn about various malware tactics and how to avoid them. Understand
malware threats, the impact they can have on your business, and how you
can protect your company and customers by using code signing.
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
