details: /erp/devel/main/rev/220470337d06 changeset: 7948:220470337d06 user: Antonio Moreno <antonio.moreno <at> openbravo.com> date: Wed Jul 21 13:13:07 2010 +0200 summary: Fixed issue 14020. oncreatedefaults which reference other columns should work now. > The main change basically has been not to execute the oncreatedefault on the > INSERT SELECT statement which is executed when a table is recreated. This > will allow oncreatedefaults which reference other tables and columns to work, > and the statements shouldn't be needed anyway, because the same > oncreatedefault is executed at the end of the update.database process, and > the NOT NULL constraints are not activated when the data is copied.
details: /erp/devel/main/rev/6d562dba2dfa changeset: 7949:6d562dba2dfa user: Mikel Irurita <mikel.irurita <at> openbravo.com> date: Wed Jul 21 16:42:52 2010 +0200 summary: Fixes issue 13742 and 13868: improve fields text. 13742: Column names are not rightly defined in Grid view for Payment method tab in financial account window. 13868: In purchase invoice, Payment plan tab, Field label Receive to be changed to Paid details: /erp/devel/main/rev/b788095e7704 changeset: 7950:b788095e7704 user: Juan Pablo Aroztegi <juanpablo.aroztegi <at> openbravo.com> date: Wed Jul 21 18:07:54 2010 +0200 summary: Fixes issue 14029. ant setup: get the 32bit binary in 64bit Windows details: /erp/devel/main/rev/289974ed369e changeset: 7951:289974ed369e user: Sivaraman Rajagopal <sivaraman.rajagopal <at> openbravo.com> date: Thu Jul 22 09:56:13 2010 +0530 summary: Fixes issue 13900: The Payment Tracker does not work with a big amount of data Pagination has been implemented for Payment Tracker report and also validation rule has been implemented for exporting PDF functionality. details: /erp/devel/main/rev/152032f5fa94 changeset: 7952:152032f5fa94 user: Harikrishnan Raja <harikrishnan.raja <at> openbravo.com> date: Thu Jul 22 09:59:28 2010 +0530 summary: Fixes Issue 13870: warehouse/Storage bin for inactive organisation are selectable in screens details: /erp/devel/main/rev/5013a579164c changeset: 7953:5013a579164c user: Sivaraman Rajagopal <sivaraman.rajagopal <at> openbravo.com> date: Thu Jul 22 10:02:25 2010 +0530 summary: Fixes issue 13732: The field where clause on the alert definition window does not work well if you want to refere to ad_user_id field Alias names of the tables have been removed from select queries in order to avoid ambiguity in defining where clause details: /erp/devel/main/rev/d24e1139ded8 changeset: 7954:d24e1139ded8 user: Adrián Romero <adrianromero <at> openbravo.com> date: Thu Jul 22 18:22:49 2010 +0200 summary: Fixes issue 0013959: Error division by zero when processing Purchasing Plan It has been added a check that verifies when the capacity is zero and raises an error message explaining it details: /erp/devel/main/rev/a24b3384f853 changeset: 7955:a24b3384f853 user: Sathiyan Sivaprakasam <sathiyan.sivaprakasam <at> openbravo.com> date: Fri Jul 23 10:49:14 2010 +0530 summary: Fixed issues 13979: setMessageResult should be public in AcctServer details: /erp/devel/main/rev/eace8ee261f0 changeset: 7956:eace8ee261f0 user: Balamurugan Ramadoss <balamurugan.ramadoss <at> openbravo.com> date: Fri Jul 23 13:17:58 2010 +0530 summary: Fixed Issue 0014001: It isnt possible process a remittance. details: /erp/devel/main/rev/bba492491e7e changeset: 7957:bba492491e7e user: Balamurugan Ramadoss <balamurugan.ramadoss <at> openbravo.com> date: Fri Jul 23 13:41:02 2010 +0530 summary: Fixed Issue 0013991: incorrect characters in Report Budget. details: /erp/devel/main/rev/965b96738de4 changeset: 7958:965b96738de4 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Fri Jul 23 10:51:43 2010 +0200 summary: fixed bug 13983: Add new table to core dataset not possible without core in dev The module checked to be in development was the one in parent AD_Dataset, not the one in the record itself. This has been fixed for AD_Dataset_Table and AD_Dataset_Column. details: /erp/devel/main/rev/303db86de507 changeset: 7959:303db86de507 user: Balamurugan Ramadoss <balamurugan.ramadoss <at> openbravo.com> date: Fri Jul 23 14:30:28 2010 +0530 summary: Fixed Issue 0013992: It does not possible open a Report Budget with EXCEL details: /erp/devel/main/rev/fa203c41fbfd changeset: 7960:fa203c41fbfd user: Antonio Moreno <antonio.moreno <at> openbravo.com> date: Fri Jul 23 13:03:10 2010 +0200 summary: Related to issue 13947. Cleaned update.database.mod changes a bit. Moved log messages inside the if() clause, so that if they will not be shown if there is no database model to update for that particular module. Also, moved the removeDeletedFKTriggers method call inside that if clause too, for basically the same reason. details: /erp/devel/main/rev/d7482229a1ec changeset: 7961:d7482229a1ec user: Stefan Hühner <stefan.huehner <at> openbravo.com> date: Thu Jul 22 16:05:00 2010 +0200 summary: Fixed 14035: fact_acct_reset is too slow Speed up this pl-function by: - add missing index to c_periodcontrol table - move one function call out of a complex query as it does not depend on any data from the query, instead execute the function onces before the bigger query. details: /erp/devel/main/rev/11d7faf63841 changeset: 7962:11d7faf63841 user: Juan Pablo Aroztegi <juanpablo.aroztegi <at> openbravo.com> date: Fri Jul 23 14:26:42 2010 +0200 summary: Add new contributor: Valery Lezhebokov details: /erp/devel/main/rev/7d166747db4d changeset: 7963:7d166747db4d user: Martin Taal <martin.taal <at> openbravo.com> date: Fri Jul 23 14:30:31 2010 +0200 summary: Fixes issue 13749: CallProcess is not able to handle parameters typed other than String details: /erp/devel/main/rev/27da3568c48f changeset: 7964:27da3568c48f user: Valery Lezhebokov <valery.lezhebokov <at> gmail.com> date: Mon Jul 12 22:58:55 2010 +0200 summary: Fixes issue 0009740: Module version number validator (DB trigger) changed to allow integers only. details: /erp/devel/main/rev/24bb544a4424 changeset: 7965:24bb544a4424 user: Valery Lezhebokov <valery.lezhebokov <at> gmail.com> date: Mon Jul 26 14:43:05 2010 +0200 summary: Fixes issue 9740: Module version number validator (DB trigger) changed to allow integers only. details: /erp/devel/main/rev/7aabb80b744d changeset: 7966:7aabb80b744d user: Valery Lezhebokov <valery.lezhebokov <at> gmail.com> date: Mon Jul 26 15:01:24 2010 +0200 summary: Merge branches details: /erp/devel/main/rev/13df5b8fc723 changeset: 7967:13df5b8fc723 user: Ioritz Cia <ioritz.cia <at> openbravo.com> date: Mon Jul 26 12:15:32 2010 +0200 summary: improved printable templates details: /erp/devel/main/rev/f1b53dfc9e0d changeset: 7968:f1b53dfc9e0d user: David Alsasua <david.alsasua <at> openbravo.com> date: Mon Jul 26 19:27:40 2010 +0200 summary: Fixes issue 14047. Currently, callout in invoice line uses client warehouse set in context to retrieve client location, and uses it to select the appropriate tax rate. Now, once the warehouse is retrieved, it is checked if the organization for which this warehouse is set, is in the same branch of the organizational tree. If not, chooses another warehouse: once set for an organization in the same branch of the tree of organizations. details: /erp/devel/main/rev/6834c4694499 changeset: 7969:6834c4694499 user: Mikel Irurita <mikel.irurita <at> openbravo.com> date: Tue Jul 27 10:12:49 2010 +0200 summary: Fixes issue 13604: payment method - financial account assignment Changed name of the message (FIN_FINACC_PAYMETHOD_UN) More meaningful message is shown now when you try to assign the same method twice to the same financial account. details: /erp/devel/main/rev/1df90310fec9 changeset: 7970:1df90310fec9 user: RM packaging bot <staff.rm <at> openbravo.com> date: Tue Jul 27 15:41:08 2010 +0200 summary: CI: promote changesets from pi to main details: /erp/devel/main/rev/634cc0909ed2 changeset: 7971:634cc0909ed2 user: RM packaging bot <staff.rm <at> openbravo.com> date: Tue Jul 27 15:41:09 2010 +0200 summary: CI: update AD_MODULE - Core version and label diffstat: .hgsigs | 1 + .hgtags | 1 + CONTRIBUTORS | 1 + build.xml | 4 + src-db/database/lib/dbsourcemanager.jar | 0 src-db/database/model/functions/C_REMITTANCE_POST.xml | 2 +- src-db/database/model/functions/FACT_ACCT_RESET.xml | 4 +- src-db/database/model/functions/MRP_PURCHASEPLAN.xml | 12 +- src-db/database/model/tables/C_PERIODCONTROL.xml | 3 + src-db/database/model/tables/C_POC_DOCTYPE_TEMPLATE.xml | 14 + src-db/database/model/tables/FIN_FINACC_PAYMENTMETHOD.xml | 8 +- src-db/database/model/triggers/AD_DATASET_COLUMN_MOD_TRG.xml | 17 +- src-db/database/model/triggers/AD_DATASET_TABLE_MOD_TRG.xml | 15 +- src-db/database/model/triggers/AD_MODULE_VERSION_TRG.xml | 10 +- src-db/database/sourcedata/AD_COLUMN.xml | 104 +- src-db/database/sourcedata/AD_ELEMENT.xml | 44 +- src-db/database/sourcedata/AD_FIELD.xml | 75 +- src-db/database/sourcedata/AD_MESSAGE.xml | 13 +- src-db/database/sourcedata/AD_MODULE.xml | 4 +- src-db/database/sourcedata/AD_REFERENCE.xml | 13 + src-db/database/sourcedata/AD_REF_LIST.xml | 33 + src-db/database/sourcedata/AD_REF_TABLE.xml | 2 +- src-db/database/sourcedata/AD_TEXTINTERFACES.xml | 725 ++-- src-test/org/openbravo/test/dal/IssuesTest.java | 23 + src/org/openbravo/erpCommon/ad_callouts/SL_Invoice_Product.java | 8 + src/org/openbravo/erpCommon/ad_callouts/SL_Order_Product_data.xsql | 29 + src/org/openbravo/erpCommon/ad_forms/AcctServer.java | 4 +- src/org/openbravo/erpCommon/ad_forms/AlertManagement_data.xsql | 98 +- src/org/openbravo/erpCommon/ad_reports/ReportBudgetExportExcel.java | 3 +- src/org/openbravo/erpCommon/ad_reports/ReportBudgetGenerateExcelXLS.html | 1 - src/org/openbravo/erpCommon/ad_reports/ReportBudgetGenerateExcelXLS.xml | 1 - src/org/openbravo/erpCommon/ad_reports/ReportDebtPaymentTrack.java | 111 +- src/org/openbravo/erpCommon/ad_reports/ReportDebtPaymentTrack_data.xsql | 282 +- src/org/openbravo/erpCommon/businessUtility/Organization_data.xsql | 65 + src/org/openbravo/erpCommon/info/Locator_data.xsql | 4 +- src/org/openbravo/erpReports/C_OrderJR.jrxml | 1112 +++--- src/org/openbravo/erpReports/C_OrderLinesJR.jrxml | 679 +++- src/org/openbravo/erpReports/RptC_Invoice.jrxml | 1488 ++++----- src/org/openbravo/erpReports/RptC_Invoice_Lines.jrxml | 1103 ++++--- src/org/openbravo/erpReports/RptC_Invoice_TaxLines.jrxml | 567 +- src/org/openbravo/erpReports/RptC_OrderPO.jrxml | 1338 ++++---- src/org/openbravo/erpReports/RptC_OrderPO_Lines.jrxml | 1131 +++--- src/org/openbravo/erpReports/RptM_InOut.jrxml | 647 ++- src/org/openbravo/erpReports/Rptm_InOut_Lines.jrxml | 771 +++- src/org/openbravo/service/db/CallProcess.java | 38 +- 45 files changed, 5978 insertions(+), 4630 deletions(-) diffs (truncated from 12341 to 300 lines): diff -r edda5328f260 -r 634cc0909ed2 .hgsigs --- a/.hgsigs Wed Jul 21 15:51:48 2010 +0530 +++ b/.hgsigs Tue Jul 27 15:41:09 2010 +0200 @@ -20,3 +20,4 @@ 9f343a616b2f998c3867661467de5dd9daeb7112 0 iEYEABECAAYFAkvq7PIACgkQCX/oGf+2qkMcHQCg3eHGql848ExhA5oOgtqfjIE3toUAn0GiWHkItn3YxPFitn8+e0IfOEaj 9b4bbe8362f54f7212653fddf5bd053183a7ffda 0 iEYEABECAAYFAkv8vDgACgkQCX/oGf+2qkPC3ACfURoh78/OY95XuFkAKNfaLQQzuCsAoNoNLdSqMVYuAJMAI2mimGZ5BXaw 7fe932c5c015da84a972d6945dd0451366bbf325 0 iEYEABECAAYFAkwodmcACgkQCX/oGf+2qkM4jQCgq2n4X0Tzi8EcGqNLhtzjOJ/1YcgAn3Fh9aZRpXmM2zYmMwuecn4UR5tt +618363224a381737439e0bd4461e2d36c4fd986e 0 iEYEABECAAYFAkxFkHoACgkQCX/oGf+2qkP7DQCeK9qCv3jETpO5iM89PV2bJYmpErMAoO/H2QyeKKZjublcgFmH7g1tEomB diff -r edda5328f260 -r 634cc0909ed2 .hgtags --- a/.hgtags Wed Jul 21 15:51:48 2010 +0530 +++ b/.hgtags Tue Jul 27 15:41:09 2010 +0200 @@ -30,3 +30,4 @@ 41915c2f5ec639dadab8e797a1e5f1e0922fa029 2.50MP17 f7b9678ebb10f1fb0963b7e3cc4724aa6aeca565 2.50MP18 34eed7b386965b19e191fbfe03195588cdc75254 2.50MP19 +99ff33f6588973f7e738b6afd47ad44f3ac08d20 2.50MP20 diff -r edda5328f260 -r 634cc0909ed2 CONTRIBUTORS --- a/CONTRIBUTORS Wed Jul 21 15:51:48 2010 +0530 +++ b/CONTRIBUTORS Tue Jul 27 15:41:09 2010 +0200 @@ -7,3 +7,4 @@ Ben Sommerville <[email protected]> - Bug fixing Ville Lindfors <[email protected]> - Code clean up Miroslav Lazarevic <[email protected]> - Fixes to the build system +Valery Lezhebokov <[email protected]> - Bug fixing diff -r edda5328f260 -r 634cc0909ed2 build.xml --- a/build.xml Wed Jul 21 15:51:48 2010 +0530 +++ b/build.xml Tue Jul 27 15:41:09 2010 +0200 @@ -926,12 +926,16 @@ <or> <equals arg1="${os.arch}" arg2="x86" /> <equals arg1="${os.arch}" arg2="i386" /> + <contains string="${os.name}" substring="Windows" /> </or> </condition> <condition property="osarch" value="-x64"> <or> <equals arg1="${os.arch}" arg2="amd64" /> <equals arg1="${os.arch}" arg2="x86_64" /> + <not> + <contains string="${os.name}" substring="Windows" /> + </not> </or> </condition> <condition property="osarch" value="-ia64"> diff -r edda5328f260 -r 634cc0909ed2 src-db/database/lib/dbsourcemanager.jar Binary file src-db/database/lib/dbsourcemanager.jar has changed diff -r edda5328f260 -r 634cc0909ed2 src-db/database/model/functions/C_REMITTANCE_POST.xml --- a/src-db/database/model/functions/C_REMITTANCE_POST.xml Wed Jul 21 15:51:48 2010 +0530 +++ b/src-db/database/model/functions/C_REMITTANCE_POST.xml Tue Jul 27 15:41:09 2010 +0200 @@ -78,7 +78,7 @@ v_DPId varchar2(32); v_DPMLineId varchar2(32); v_GeneratedAmt NUMBER; - v_PaymetRule VARCHAR2(2) ; + v_PaymetRule VARCHAR2(60) ; v_IsReceipt CHAR(1) ; v_BankPartner varchar2(32); v_vSettlementId varchar2(32); diff -r edda5328f260 -r 634cc0909ed2 src-db/database/model/functions/FACT_ACCT_RESET.xml --- a/src-db/database/model/functions/FACT_ACCT_RESET.xml Wed Jul 21 15:51:48 2010 +0530 +++ b/src-db/database/model/functions/FACT_ACCT_RESET.xml Tue Jul 27 15:41:09 2010 +0200 @@ -41,6 +41,7 @@ v_DateColumn VARCHAR2(2000):=''; v_AD_Org_ID VARCHAR2(32); v_TableName VARCHAR2(48):=''; + v_AD_Org_CalOwner VARCHAR(32); -- Parameter TYPE RECORD IS REF CURSOR; Cur_Parameter RECORD; @@ -207,6 +208,7 @@ -- Update Table v_ResultStr:='ResetTable:' || Cur_Tables.TableName; IF(v_DeletePosting='Y') THEN + v_AD_Org_CalOwner := AD_ORG_GETCALENDAROWNER(v_AD_Org_ID); FOR Cur_Fact_Acct IN ( SELECT DISTINCT Record_ID FROM FACT_ACCT @@ -226,7 +228,7 @@ AND fa_aux.AD_TABLE_ID = FACT_ACCT.AD_TABLE_ID AND fa_aux.RECORD_ID = FACT_ACCT.RECORD_ID AND C_PeriodControl.AD_Org_ID=AD_Org.AD_Org_ID - AND C_PeriodControl.AD_Org_ID=AD_ORG_GETCALENDAROWNER(v_AD_Org_ID) + AND C_PeriodControl.AD_Org_ID=v_AD_Org_CalOwner ) AND Record_ID=( CASE COALESCE(v_Record_ID, '0') WHEN '0' THEN Record_ID ELSE v_Record_ID diff -r edda5328f260 -r 634cc0909ed2 src-db/database/model/functions/MRP_PURCHASEPLAN.xml --- a/src-db/database/model/functions/MRP_PURCHASEPLAN.xml Wed Jul 21 15:51:48 2010 +0530 +++ b/src-db/database/model/functions/MRP_PURCHASEPLAN.xml Tue Jul 27 15:41:09 2010 +0200 @@ -72,7 +72,7 @@ v_ResultStr := 'Purchase mrp'; FOR Cur_PlanProduct IN ( - SELECT MRP_RUN_PURCHASELINE.M_PRODUCT_ID, + SELECT MRP_RUN_PURCHASELINE.M_PRODUCT_ID, M_PRODUCT.NAME AS PRODUCTNAME, COALESCE(M_PRODUCT_PO.CAPACITY, M_PRODUCT_ORG.CAPACITY, M_PRODUCT.CAPACITY) AS CAPACITY, COALESCE(M_PRODUCT_PO.DELIVERYTIME_PROMISED, M_PRODUCT_ORG.DELAYMIN, M_PRODUCT.DELAYMIN, 0) AS DELAYMIN, COALESCE(M_PRODUCT_PO.QTYTYPE, M_PRODUCT_ORG.QTYTYPE, M_PRODUCT_ORG.QTYTYPE, 'E') AS qtytype, @@ -93,7 +93,7 @@ AND PRODUCT_PO.C_BPARTNER_ID = M_PRODUCT_PO.C_BPARTNER_ID AND PRODUCT_PO.M_PRODUCT_ID = M_PRODUCT_PO.M_PRODUCT_ID AND M_PRODUCT.ISPURCHASED = 'Y' - GROUP BY MRP_RUN_PURCHASELINE.M_PRODUCT_ID, M_PRODUCT_PO.CAPACITY, M_PRODUCT_ORG.CAPACITY, M_PRODUCT.CAPACITY, + GROUP BY MRP_RUN_PURCHASELINE.M_PRODUCT_ID, M_PRODUCT.NAME, M_PRODUCT_PO.CAPACITY, M_PRODUCT_ORG.CAPACITY, M_PRODUCT.CAPACITY, M_PRODUCT_PO.DELIVERYTIME_PROMISED, M_PRODUCT_ORG.DELAYMIN, M_PRODUCT.DELAYMIN, M_PRODUCT_PO.QTYTYPE, M_PRODUCT_ORG.QTYTYPE, M_PRODUCT_ORG.QTYTYPE, M_PRODUCT_PO.ORDER_MIN, M_PRODUCT_ORG.QTYMIN, M_PRODUCT_ORG.QTYMIN, @@ -133,6 +133,10 @@ v_Qty_new := CEIL(v_qty_new/Cur_PlanProduct.qtystd)*Cur_PlanProduct.qtystd; END IF; + IF (Cur_PlanProduct.CAPACITY = 0) THEN + RAISE_APPLICATION_ERROR(-20000, '@CapacityZero@ ' || Cur_PlanProduct.PRODUCTNAME); + END IF; + v_plannedorderdate_new := TRUNC(v_planneddate_new - GREATEST(Cur_PlanProduct.DELAYMIN, (CASE WHEN Cur_PlanProduct.CAPACITY IS NULL THEN 0 ELSE CEIL(v_Qty_new/Cur_PlanProduct.CAPACITY) @@ -148,6 +152,10 @@ v_Qty_new := CEIL(v_qty_new/Cur_PlanProduct.qtystd)*Cur_PlanProduct.qtystd; END IF; + IF (Cur_PlanProduct.CAPACITY = 0) THEN + RAISE_APPLICATION_ERROR(-20000, '@CapacityZero@ ' || Cur_PlanProduct.PRODUCTNAME); + END IF; + v_plannedorderdate_new := TRUNC(v_planneddate_old - GREATEST(Cur_PlanProduct.DELAYMIN, (CASE WHEN Cur_PlanProduct.CAPACITY IS NULL THEN 0 ELSE CEIL(v_Qty_new/Cur_PlanProduct.CAPACITY) diff -r edda5328f260 -r 634cc0909ed2 src-db/database/model/tables/C_PERIODCONTROL.xml --- a/src-db/database/model/tables/C_PERIODCONTROL.xml Wed Jul 21 15:51:48 2010 +0530 +++ b/src-db/database/model/tables/C_PERIODCONTROL.xml Tue Jul 27 15:41:09 2010 +0200 @@ -62,6 +62,9 @@ <foreign-key foreignTable="AD_ORG" name="C_PERIODCONTROL_AD_ORG"> <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/> </foreign-key> + <index name="C_PERIODCONTROL_PERIOD" unique="false"> + <index-column name="C_PERIOD_ID"/> + </index> <check name="C_PERIODCONTROL_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check> </table> </database> diff -r edda5328f260 -r 634cc0909ed2 src-db/database/model/tables/C_POC_DOCTYPE_TEMPLATE.xml --- a/src-db/database/model/tables/C_POC_DOCTYPE_TEMPLATE.xml Wed Jul 21 15:51:48 2010 +0530 +++ b/src-db/database/model/tables/C_POC_DOCTYPE_TEMPLATE.xml Tue Jul 27 15:41:09 2010 +0200 @@ -53,6 +53,18 @@ <default/> <onCreateDefault/> </column> + <column name="SHOWCOMPANYDATA" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"> + <default><![CDATA[Y]]></default> + <onCreateDefault/> + </column> + <column name="SHOWLOGO" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"> + <default><![CDATA[Y]]></default> + <onCreateDefault/> + </column> + <column name="HEADERMARGIN" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"> + <default/> + <onCreateDefault/> + </column> <foreign-key foreignTable="AD_CLIENT" name="C_POC_DOCTYPE_TEMPLATE_AD_CLIE"> <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/> </foreign-key> @@ -65,5 +77,7 @@ <index name="C_POC_DOCTYPE_TEMP_DOCTYPE_IDX" unique="false"> <index-column name="C_DOCTYPE_ID"/> </index> + <check name="C_POC_DOCTYPETEMP_SHOWCOMP_CHK"><![CDATA[SHOWCOMPANYDATA IN ('Y', 'N')]]></check> + <check name="C_POC_DOCTYPETEMP_SHOWLOGO_CHK"><![CDATA[SHOWLOGO IN ('Y', 'N')]]></check> </table> </database> diff -r edda5328f260 -r 634cc0909ed2 src-db/database/model/tables/FIN_FINACC_PAYMENTMETHOD.xml --- a/src-db/database/model/tables/FIN_FINACC_PAYMENTMETHOD.xml Wed Jul 21 15:51:48 2010 +0530 +++ b/src-db/database/model/tables/FIN_FINACC_PAYMENTMETHOD.xml Tue Jul 27 15:41:09 2010 +0200 @@ -131,10 +131,10 @@ <foreign-key foreignTable="FIN_PAY_EXEC_PROCESS" name="FIN_FINACCMETH_PAYOUTEXECPROC"> <reference local="PAYOUT_EXECUTION_PROCESS_ID" foreign="FIN_PAY_EXEC_PROCESS_ID"/> </foreign-key> - <index name="FIN_FINACC_PAYMETHOD_UNIQUEKEY" unique="true"> - <index-column name="FIN_PAYMENTMETHOD_ID"/> - <index-column name="FIN_FINANCIAL_ACCOUNT_ID"/> - </index> + <unique name="FIN_FINACC_PAYMENTMETHOD_UN"> + <unique-column name="FIN_PAYMENTMETHOD_ID"/> + <unique-column name="FIN_FINANCIAL_ACCOUNT_ID"/> + </unique> <check name="FIN_FINACC_METHOD_ACTIVE_CHK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check> <check name="FIN_FINACC_METHOD_DEPOSIT_CHK"><![CDATA[AUTOMATIC_DEPOSIT IN ('Y', 'N')]]></check> <check name="FIN_FINACC_METHOD_PAYMENT_CHK"><![CDATA[AUTOMATIC_PAYMENT IN ('Y', 'N')]]></check> diff -r edda5328f260 -r 634cc0909ed2 src-db/database/model/triggers/AD_DATASET_COLUMN_MOD_TRG.xml --- a/src-db/database/model/triggers/AD_DATASET_COLUMN_MOD_TRG.xml Wed Jul 21 15:51:48 2010 +0530 +++ b/src-db/database/model/triggers/AD_DATASET_COLUMN_MOD_TRG.xml Tue Jul 27 15:41:09 2010 +0200 @@ -15,13 +15,12 @@ * under the License. * The Original Code is Openbravo ERP. * The Initial Developer of the Original Code is Openbravo SLU -* All portions are Copyright (C) 2008-2009 Openbravo SLU +* All portions are Copyright (C) 2008-2010 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************/ devTemplate NUMBER; devModule CHAR(1); - cuerrentID VARCHAR2(32); cuerrentModuleID VARCHAR2(32); vAux NUMBER; @@ -51,19 +50,15 @@ AND Type = 'T'; IF (UPDATING OR INSERTING) THEN - cuerrentID := :new.AD_Dataset_Column_ID; - cuerrentModuleID := :new.AD_Dataset_Table_ID; + cuerrentModuleID := :new.AD_Module_ID; ELSE - cuerrentID := :old.AD_Dataset_Column_ID; - cuerrentModuleID := :old.AD_Dataset_Table_ID; + cuerrentModuleID := :old.AD_Module_ID; END IF; - SELECT M.IsInDevelopment + SELECT M.IsInDevelopment INTO devModule - FROM AD_MODULE M, AD_DATASET T, AD_DATASET_TABLE T1 - WHERE M.AD_MODULE_ID = T.AD_MODULE_ID - AND T1.AD_DATASET_ID = T.AD_DATASET_ID - AND T1.AD_DATASET_TABLE_ID = cuerrentModuleID; + FROM AD_MODULE M + WHERE M.AD_MODULE_ID = cuerrentModuleID; IF (UPDATING AND devTemplate=0 AND devModule='N') THEN IF ( diff -r edda5328f260 -r 634cc0909ed2 src-db/database/model/triggers/AD_DATASET_TABLE_MOD_TRG.xml --- a/src-db/database/model/triggers/AD_DATASET_TABLE_MOD_TRG.xml Wed Jul 21 15:51:48 2010 +0530 +++ b/src-db/database/model/triggers/AD_DATASET_TABLE_MOD_TRG.xml Tue Jul 27 15:41:09 2010 +0200 @@ -15,13 +15,12 @@ * under the License. * The Original Code is Openbravo ERP. * The Initial Developer of the Original Code is Openbravo SLU -* All portions are Copyright (C) 2008-2009 Openbravo SLU +* All portions are Copyright (C) 2008-2010 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************/ devTemplate NUMBER; devModule CHAR(1); - cuerrentID VARCHAR2(32); cuerrentModuleID VARCHAR2(32); vAux NUMBER; @@ -51,19 +50,15 @@ AND Type = 'T'; IF (UPDATING OR INSERTING) THEN - cuerrentID := :new.AD_Dataset_Table_ID; - cuerrentModuleID := :new.AD_Dataset_ID; + cuerrentModuleID := :new.AD_Module_ID; ELSE - cuerrentID := :old.AD_Dataset_Table_ID; - cuerrentModuleID := :old.AD_Dataset_ID; + cuerrentModuleID := :old.AD_Module_ID; END IF; SELECT M.IsInDevelopment INTO devModule - FROM AD_MODULE M, AD_DATASET T - WHERE M.AD_MODULE_ID = T.AD_MODULE_ID - AND T.AD_DATASET_ID = cuerrentModuleID; - + FROM AD_MODULE M + WHERE M.AD_MODULE_ID = cuerrentModuleID; IF (UPDATING AND devTemplate=0 AND devModule='N') THEN IF ( diff -r edda5328f260 -r 634cc0909ed2 src-db/database/model/triggers/AD_MODULE_VERSION_TRG.xml --- a/src-db/database/model/triggers/AD_MODULE_VERSION_TRG.xml Wed Jul 21 15:51:48 2010 +0530 +++ b/src-db/database/model/triggers/AD_MODULE_VERSION_TRG.xml Tue Jul 27 15:41:09 2010 +0200 @@ -17,8 +17,10 @@ * The Initial Developer of the Original Code is Openbravo SLU * All portions are Copyright (C) 2009 Openbravo SLU * All Rights Reserved. -* Contributor(s): ______________________________________. +* Contributor(s): Valery Lezhebokov. ************************************************************************/ + number_pattern CONSTANT CHAR(10):= '0123456789'; + v1 VARCHAR(10); v2 VARCHAR(10); v3 VARCHAR(10); @@ -36,8 +38,10 @@ v2 := SUBSTR(:new.VERSION,instr(:new.VERSION,'.')+1,instr(:new.VERSION,'.',1,2)-instr(:new.VERSION,'.')-1); v3 := SUBSTR(:new.VERSION,instr(:new.VERSION,'.',1,2)+1); - IF TRIM(TRANSLATE(v1, '0123456789','')) <> '' OR TRIM(TRANSLATE(v2, '0123456789','')) <> '' OR TRIM(TRANSLATE(v3, '0123456789','')) <> '' THEN - RAISE_APPLICATION_ERROR(-20104, 'The version has to be formatted like x.y.z where x, y and z are integers.'); + IF COALESCE(LENGTH(TRIM(TRANSLATE(v1, number_pattern, ' '))),0) <> 0 OR + COALESCE(LENGTH(TRIM(TRANSLATE(v2, number_pattern, ' '))),0) <> 0 OR + COALESCE(LENGTH(TRIM(TRANSLATE(v3, number_pattern, ' '))),0) <> 0 THEN + RAISE_APPLICATION_ERROR(-20104, 'The version has to be formatted like x.y.z where x, y and z are integers.'); ------------------------------------------------------------------------------ The Palm PDK Hot Apps Program offers developers who use the Plug-In Development Kit to bring their C/C++ apps to Palm for a share of $1 Million in cash or HP Products. Visit us here for more details: http://ad.doubleclick.net/clk;226879339;13503038;l? http://clk.atdmt.com/CRS/go/247765532/direct/01/ _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
