details: /erp/devel/pi/rev/92b240b9440b
changeset: 8144:92b240b9440b
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Fri Aug 06 16:13:51 2010 +0200
summary: [cancel] Prevent deactivation in case commercial modules are present
details: /erp/devel/pi/rev/02f582288922
changeset: 8145:02f582288922
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Mon Aug 09 09:53:01 2010 +0200
summary: [cancel] Send cancel request to butler
details: /erp/devel/pi/rev/dd32dc480b31
changeset: 8146:dd32dc480b31
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Mon Aug 09 16:19:19 2010 +0200
summary: [cancel] Reword messages
details: /erp/devel/pi/rev/f8699e061c9a
changeset: 8147:f8699e061c9a
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Tue Aug 10 13:46:57 2010 +0200
summary: [cancel] Show subscription status in about box
details: /erp/devel/pi/rev/080b860406a7
changeset: 8148:080b860406a7
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Tue Aug 10 17:21:20 2010 +0200
summary: [cancel] pi merge
details: /erp/devel/pi/rev/06f4e3dd90a2
changeset: 8149:06f4e3dd90a2
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Wed Aug 11 16:15:06 2010 +0200
summary: [cancel] pi merge
details: /erp/devel/pi/rev/8d2154de1e47
changeset: 8150:8d2154de1e47
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Thu Aug 12 16:08:10 2010 +0200
summary: [cancel] Allow refresh of expired instances with commercial modules
installed
details: /erp/devel/pi/rev/a184999ee30a
changeset: 8151:a184999ee30a
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Thu Aug 12 16:21:42 2010 +0200
summary: [cancel] pi merge
details: /erp/devel/pi/rev/d2cbf0f2eb3b
changeset: 8152:d2cbf0f2eb3b
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Thu Aug 12 16:47:07 2010 +0200
summary: [cancel] fixed incorrect merge
details: /erp/devel/pi/rev/8cb4ad9cfdb7
changeset: 8153:8cb4ad9cfdb7
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Fri Aug 13 11:01:26 2010 +0200
summary: [cancel] typo
details: /erp/devel/pi/rev/3d3e7ced4ea6
changeset: 8154:3d3e7ced4ea6
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Fri Aug 13 11:04:07 2010 +0200
summary: Merged back to pi Cancel Subscription project
diffstat:
build.xml
| 1 +
config/licenseRestrictions
| 2 +-
src-db/database/model/functions/C_INVOICE_CREATE.xml
| 2 +-
src-db/database/model/tables/AD_MODULE.xml
| 4 +-
src-db/database/model/tables/AD_MODULE_DEPENDENCY.xml
| 12 +
src-db/database/model/tables/AD_MODULE_DEPENDENCY_INST.xml
| 8 +
src-db/database/model/tables/AD_MODULE_INSTALL.xml
| 4 +
src-db/database/model/triggers/AD_MODULE_DEPENDENCY_MOD_TRG.xml
| 20 +-
src-db/database/model/triggers/AD_MODULE_VERSION_TRG.xml
| 4 +
src-db/database/sourcedata/AD_COLUMN.xml
| 298 +++++++-
src-db/database/sourcedata/AD_DATASET_COLUMN.xml
| 11 +
src-db/database/sourcedata/AD_ELEMENT.xml
| 111 ++-
src-db/database/sourcedata/AD_FIELD.xml
| 367 ++++++++-
src-db/database/sourcedata/AD_MENU.xml
| 12 +-
src-db/database/sourcedata/AD_MESSAGE.xml
| 340 +++++---
src-db/database/sourcedata/AD_PROCESS.xml
| 6 +-
src-db/database/sourcedata/AD_PROCESS_PARA.xml
| 4 +-
src-db/database/sourcedata/AD_REFERENCE.xml
| 49 +-
src-db/database/sourcedata/AD_REF_LIST.xml
| 94 ++
src-db/database/sourcedata/AD_TABLE.xml
| 146 +-
src-db/database/sourcedata/AD_TEXTINTERFACES.xml
| 275 +++++-
src-db/database/sourcedata/AD_WINDOW.xml
| 16 +-
src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/DuplicatedJavaPackage.class
| 0
src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/DuplicatedJavaPackageData.class
| 0
src-util/buildvalidation/src/org/openbravo/buildvalidation/DuplicatedJavaPackage.java
| 54 +
src-util/buildvalidation/src/org/openbravo/buildvalidation/DuplicatedJavaPackage_data.xsql
| 34 +
src/build.xml
| 6 +-
src/org/openbravo/base/secureApp/LoginHandler.java
| 2 +-
src/org/openbravo/base/secureApp/LoginUtils.java
| 4 -
src/org/openbravo/erpCommon/ad_actionButton/CopyFromInvoice_data.xsql
| 27 +-
src/org/openbravo/erpCommon/ad_actionButton/CreateFrom.java
| 125 ++-
src/org/openbravo/erpCommon/ad_forms/About.html
| 3 +
src/org/openbravo/erpCommon/ad_forms/About.java
| 2 +
src/org/openbravo/erpCommon/ad_forms/About.xml
| 1 +
src/org/openbravo/erpCommon/ad_forms/InstanceManagement.html
| 52 +-
src/org/openbravo/erpCommon/ad_forms/InstanceManagement.java
| 156 +++-
src/org/openbravo/erpCommon/ad_forms/InstanceManagementDeactivate.html
| 54 +-
src/org/openbravo/erpCommon/ad_forms/ModuleManagement.java
| 199 +++++-
src/org/openbravo/erpCommon/ad_forms/ModuleManagementSettings.html
| 99 ++-
src/org/openbravo/erpCommon/ad_forms/ModuleManagementSettings.xml
| 17 +
src/org/openbravo/erpCommon/ad_forms/ModuleManagement_ErrorCommercial.html
| 2 +-
src/org/openbravo/erpCommon/ad_forms/RequisitionToOrder.java
| 2 +-
src/org/openbravo/erpCommon/ad_forms/RequisitionToOrder_data.xsql
| 11 +-
src/org/openbravo/erpCommon/ad_reports/ReportAgingBalance.html
| 8 +-
src/org/openbravo/erpCommon/ad_reports/ReportAgingBalance.java
| 76 +-
src/org/openbravo/erpCommon/ad_reports/ReportAgingBalance.xml
| 7 +-
src/org/openbravo/erpCommon/ad_reports/ReportAgingBalance_data.xsql
| 7 +-
src/org/openbravo/erpCommon/ad_workflow/WorkflowControl.java
| 16 +-
src/org/openbravo/erpCommon/modules/DisabledModules.java
| 130 ---
src/org/openbravo/erpCommon/modules/ImportModule.java
| 74 +-
src/org/openbravo/erpCommon/modules/ImportModule_data.xsql
| 9 +-
src/org/openbravo/erpCommon/modules/ModuleTree.java
| 2 +-
src/org/openbravo/erpCommon/modules/VersionUtility.java
| 82 +-
src/org/openbravo/erpCommon/modules/VersionUtility_data.xsql
| 11 +-
src/org/openbravo/erpCommon/obps/ActivationKey.java
| 92 +-
src/org/openbravo/erpCommon/obps/ActiveInstanceProcess.java
| 26 +-
src/org/openbravo/erpCommon/obps/DisabledModules.java
| 130 +++
src/org/openbravo/erpCommon/security/Login_F1.html
| 2 +-
src/org/openbravo/erpCommon/utility/GenericTree.srpt
| 2 +-
src/org/openbravo/erpCommon/utility/ToolBar_Button.java
| 2 +-
src/org/openbravo/erpCommon/utility/ToolBar_Image.java
| 2 +-
src/org/openbravo/erpCommon/utility/VerticalMenu.java
| 4 +-
web/js/shortcuts.js
| 16 +-
web/js/utils.js
| 39 +-
64 files changed, 2547 insertions(+), 826 deletions(-)
diffs (truncated from 7432 to 300 lines):
diff -r 2f41659aee71 -r 3d3e7ced4ea6 build.xml
--- a/build.xml Fri Aug 06 10:12:20 2010 +0200
+++ b/build.xml Fri Aug 13 11:04:07 2010 +0200
@@ -446,6 +446,7 @@
</target>
<target name="compile.deploy" depends="compile.war, compile.development">
+ <updatesystemstatus v="RB51"/>
</target>
<target name="compile.development" depends="init" unless="mode.war">
diff -r 2f41659aee71 -r 3d3e7ced4ea6 config/licenseRestrictions
--- a/config/licenseRestrictions Fri Aug 06 10:12:20 2010 +0200
+++ b/config/licenseRestrictions Fri Aug 13 11:04:07 2010 +0200
@@ -1,1 +1,1 @@
-W9LBt48Qo7d5QvFM3UAJg2bIboybo8LbrXsPIl8L/Jbg0CmnTfYN7G3RwLyUlpN+CBgcQz42ad3CtvR7sax1lXkk4aQOx4VgRNNf26ten9xU0ee5taPjFwr/NKf/ffUluOx1WXHOzF+eq59PzUpZPlWzteUpMwh40STUovQLyzaPMPEYYQRikHlz1CDJPiqEeQIhMejebxNmHa/VTLN5Hmhc+lyBfRVseGdJeJaf2Nh1YMwunKFAGMNKwPFFhqLyAXoGsNFs2BK5yPTgOEWaFRS+5Dei4fewUm7GI5k+a4xZ1qDrjYl+C/p6vod1oYf+KFsfH1P07v2k7J4VQ71XBANYXXDM81bgEWZJzz5F9mhUtabroQdejQdcTqGQPpX2ZOhmEfgelzN7WINpIF8rQHiMeVty8m3TG+zSTkc/Tj53UJaV8mjZ+cWSUAI7PFwIDbxeUcktfwV85yzpxAxu6Fln6h6fpxlmzy3DYhjBNTpMKYmjJX0ilomTCAivh31pCLA9cDk6Irac319cAiuwh2ZO9HAGJiOa1ASbjbkaZVgEIlS9py5CSz0H8jCxY2e7jzanzBV60uP6k8owprGgf/lDOE9FrR8NkNfb9cElbBEO852MDXVYRLEyB5/pVa1xNU7X/Sg7EosuVw+iLC5xqU3yBPiW6ZDDWpuWXMA1ltYztCpyT68SPLQTw5FRk1oT1g4n4yFKD+4vQORU7elCex/XHaqw6GAtcZnPCMH/Gw3KXdKvsrMHo2rpOxVCFvP8e2AMCTY1NElSvbCLGfeutgs9l/pBoAd0r/v8/u0/UwfuDnmg0ruBnJHp8XmEPkvNkKleyhNjahF7YiB38ALLiUgnSaly9FG2oP1DM2alkI9Vdc77EHW8Vjz5eID0EjM04rDKNvsbJygMCPF3XWaA2rpnUgcRB5Or0lCDe/z/zOoWK3p9N19TguH8y74cl0xd+jpkdfqfVEyUxqtTIG4/+0DZ8+VzPmOPArrFM51piby1Ym2L/J3Uuugiw1r8+RpRfuMadPnLnijqSduZqBPQS04KzaXMLiKw/j7Wsml5oWvdUjsnCRwsWKudASV8OIfGSZ2LRuL1NAqmKAlg9cWzH7fwJjukFrphw/w4pW4xfpR08qv1mXkZSFYifa92AYlW3qJkgWh/3aJlJm3q7FCzu5rvFWWP3qsDizfzbeJoD6cSiZgJfo+toa4U9q5JLlqkx5EDquXVVzWJd9bOxsTHUklhOVzdqblJEem2bkxdAS5l7/InYl3vQiSTPL4gq2Dele8RuW8q5EiBp/ySyZZxmp1EtNKepDsCygGdO6R4PqNgHVx61V9cMMUc6FZWUldEuq2nDZ7Riq6rH2d6v1JAsUQpvblupN0yBbywf0GMdS+KZsDR7Dsyqi7l1uV93etGc9kPLG6DqKIlVGt+mRQfwebA+oWoV799rWv3F9G+czF3jO1ajIsi3lQyr1GTDMmYtc1IBM7GwjJVV8WEKAEUHYycR1jbfLTXPCvNpI96yK1HWeJ0iVtwDi8uZtLYcStyaF62QJCsomob604GGrItGAteWA3dMfCxFRdesFkcR25V3m+iqFjbCjbPJou735sS1epaE02bb5op3DGxpmjon8Wbh7BSUuo/h1elhsoDgcyZFAyxkq9+sy08Bsox3d43ILOvf+rHXsUPgMd70byvyrcdjfyjRz6wO5Kt2frenug=
\ No newline at end of file
+IeqpfXkoobemyDLAJHNBi3JrTdjgnU0BnGiX9k78CBHK1Eqdek/Lsi/HpeBev9c8sNQPOf9nwq8jWE4j7X4e6TUzdPX5xukYcTshjeB3wKh9Y6LE5rgEw+OqUm8bcaKH6Nm5Efg2yQnwsHqqTyjFQPXa9IdijkazSRrAEVg/X0WPMPEYYQRikHlz1CDJPiqEeQIhMejebxNmHa/VTLN5Hmhc+lyBfRVseGdJeJaf2Nh1YMwunKFAGMNKwPFFhqLyAXoGsNFs2BK5yPTgOEWaFRS+5Dei4fewUm7GI5k+a4xZ1qDrjYl+C/p6vod1oYf+KFsfH1P07v2k7J4VQ71XBANYXXDM81bgEWZJzz5F9mhUtabroQdejQdcTqGQPpX2ZOhmEfgelzN7WINpIF8rQHiMeVty8m3TG+zSTkc/Tj53UJaV8mjZ+cWSUAI7PFwIDbxeUcktfwV85yzpxAxu6Fln6h6fpxlmzy3DYhjBNTpMKYmjJX0ilomTCAivh31pfCMDOkoLwMmDQoov/bCPJfLej9RlhmC0Y1EswNL/IAbuINX3DNk2+G8i7yXUOE6FsUtDJ6WdVhSKw0BvCH/28oJ38rfx3aCcuLHjAJI23L5RjlQlqnVsGOZsDeJ5UWQGeBotYJWdfz1mSRAiPB4RE6dv9Ap0X90Y0MDYrJP2jW2FmIrY1R5UTh2XcvAomsToZdwLrolZIWe26RIn1yYRpGEf2wqg5sGQaOxQ39BB11Xhj2bzz96mnnqSP6GZiv52/cibVcp8VtErmClvF4OByPuKsswTUD8Fs9FYMNv+myfJ928PxuHmpjT99igMw7NNtbSD+lPckVSM9kKvUIuWxUgnSaly9FG2oP1DM2alkI9Vdc77EHW8Vjz5eID0EjM04rDKNvsbJygMCPF3XWaA2rpnUgcRB5Or0lCDe/z/zOoWK3p9N19TguH8y74cl0xd+jpkdfqfVEyUxqtTIG4/+0DZ8+VzPmOPArrFM51piby1Ym2L/J3Uuugiw1r8+RpRVdiTMLHKbe15KpuECf8W9KMpaYc7hzXo94aJXKvWuui1Y1vcrJhAXdN0ib8Wjz8473ecV/STAt5njB4dJiSjBfek+JYeXZz/Ft/fkPlvzW1DVbHx9RCmu068DWefuNvWMqJLr69pKCrea8PZXBJpit9tx/JSj454C1FOwigR+qsi24FOaaQ5Zy6m3VReW0cZ+9sQXLDwkjOfjvzJPFQ9A7kDTYOYzorjHPbCwy0JyXAxkHQ+wlV5+52WeM9uiTxAWtoyqcr+OhBb1btFqiaDhetH6LqxcGXm+0iLckp+cu4FY2t4eYY81PRKBUUCrdh8N0+N68P8XMht4rWIzeRzLVlY1PnFz0BDZa6IecwK2egOPmlH+xG8uhOYgIbbUE7nhcz8b1MDllGTOpTSG1e9UDJj8wBTWzeVIrVpJRztWjldY45skuAohNh7PxxDubeUv7701GVBqlg1mO2rb19evzDAMLUHF4i5exoWEy9uQqrF/qMT+W4I0zwJbgFHTs1HIpgQelm/gSysdnbnbQs14YceXv+BYMYurafh7N2lkUMnmkVkHpPk/08R0hCeOtKjkbSUCuOy9XPg153iJmxE3NCBeZl/gY2mmsMNtaswMEN05HKSkRqlu/CKedv/HrYYhXtdbaqkL8Ay0mcRtXimQCvr3aNQ9fcQLuLpmqJh5Uo=
\ No newline at end of file
diff -r 2f41659aee71 -r 3d3e7ced4ea6
src-db/database/model/functions/C_INVOICE_CREATE.xml
--- a/src-db/database/model/functions/C_INVOICE_CREATE.xml Fri Aug 06
10:12:20 2010 +0200
+++ b/src-db/database/model/functions/C_INVOICE_CREATE.xml Fri Aug 13
11:04:07 2010 +0200
@@ -630,7 +630,7 @@
v_gBillTo_ID VARCHAR2(32) ;
v_gBPartner_Location_ID VARCHAR2(32) ;
v_gSalesRep_ID VARCHAR2(32) ;
- v_gPaymentRule CHAR(1) ;
+ v_gPaymentRule VARCHAR2(60) ;
v_gPaymentTerm_ID VARCHAR2(32) ;
v_gCurrency_ID VARCHAR2(32) ;
v_gCampaign_ID VARCHAR2(32) ;
diff -r 2f41659aee71 -r 3d3e7ced4ea6 src-db/database/model/tables/AD_MODULE.xml
--- a/src-db/database/model/tables/AD_MODULE.xml Fri Aug 06 10:12:20
2010 +0200
+++ b/src-db/database/model/tables/AD_MODULE.xml Fri Aug 13 11:04:07
2010 +0200
@@ -162,13 +162,15 @@
<foreign-key foreignTable="AD_ORG" name="AD_MODULE_AD_ORG">
<reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
</foreign-key>
+ <unique name="AD_MODULE_JAVAPACKAGE_UN">
+ <unique-column name="JAVAPACKAGE"/>
+ </unique>
<check name="AD_MODULE_INDEVELOPMENT_CHK"><![CDATA[ISINDEVELOPMENT IN
('Y', 'N')]]></check>
<check name="AD_MODULE_ISACTIVE_CHK"><![CDATA[ISACTIVE IN ('Y',
'N')]]></check>
<check name="AD_MODULE_ISCOMMERCIAL_CHCK"><![CDATA[ISCOMMERCIAL IN ('Y',
'N')]]></check>
<check name="AD_MODULE_ISDEFAULT_CHK"><![CDATA[(ISDEFAULT = 'N') OR
((ISDEFAULT = 'Y') AND (ISINDEVELOPMENT = 'Y'))]]></check>
<check name="AD_MODULE_ISREGISTERED_CHK"><![CDATA[ISREGISTERED IN ('Y',
'N')]]></check>
<check
name="AD_MODULE_ISTRANSLATEABLE_CHK"><![CDATA[ISTRANSLATIONREQUIRED IN ('Y',
'N')]]></check>
- <check name="AD_MODULE_TIER_CHK"><![CDATA[((ISCOMMERCIAL = 'N') AND
((COMMERCIAL_TIER) = 'NA')) OR ((ISCOMMERCIAL = 'Y') AND (((COMMERCIAL_TIER) =
'1') OR ((COMMERCIAL_TIER) = '2')))]]></check>
<check name="AD_MODULE_TYPE_CHK"><![CDATA[TYPE IN ('M', 'P',
'T')]]></check>
</table>
</database>
diff -r 2f41659aee71 -r 3d3e7ced4ea6
src-db/database/model/tables/AD_MODULE_DEPENDENCY.xml
--- a/src-db/database/model/tables/AD_MODULE_DEPENDENCY.xml Fri Aug 06
10:12:20 2010 +0200
+++ b/src-db/database/model/tables/AD_MODULE_DEPENDENCY.xml Fri Aug 13
11:04:07 2010 +0200
@@ -57,6 +57,18 @@
<default/>
<onCreateDefault/>
</column>
+ <column name="DEPENDENCY_ENFORCEMENT" primaryKey="false" required="true"
type="VARCHAR" size="60" autoIncrement="false">
+ <default><![CDATA[MAJOR]]></default>
+ <onCreateDefault><![CDATA['MAJOR']]></onCreateDefault>
+ </column>
+ <column name="USER_EDITABLE_ENFORCEMENT" primaryKey="false"
required="true" type="CHAR" size="1" autoIncrement="false">
+ <default><![CDATA[N]]></default>
+ <onCreateDefault><![CDATA['N']]></onCreateDefault>
+ </column>
+ <column name="INSTANCE_ENFORCEMENT" primaryKey="false" required="false"
type="VARCHAR" size="60" autoIncrement="false">
+ <default/>
+ <onCreateDefault/>
+ </column>
<foreign-key foreignTable="AD_CLIENT"
name="AD_MODULE_DEPENDENCY_AD_CLIENT">
<reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
</foreign-key>
diff -r 2f41659aee71 -r 3d3e7ced4ea6
src-db/database/model/tables/AD_MODULE_DEPENDENCY_INST.xml
--- a/src-db/database/model/tables/AD_MODULE_DEPENDENCY_INST.xml Fri Aug
06 10:12:20 2010 +0200
+++ b/src-db/database/model/tables/AD_MODULE_DEPENDENCY_INST.xml Fri Aug
13 11:04:07 2010 +0200
@@ -61,6 +61,14 @@
<default/>
<onCreateDefault/>
</column>
+ <column name="DEPENDENCY_ENFORCEMENT" primaryKey="false" required="true"
type="VARCHAR" size="60" autoIncrement="false">
+ <default><![CDATA[MAJOR]]></default>
+ <onCreateDefault><![CDATA['MAJOR']]></onCreateDefault>
+ </column>
+ <column name="USER_EDITABLE_ENFORCEMENT" primaryKey="false"
required="true" type="CHAR" size="1" autoIncrement="false">
+ <default><![CDATA[N]]></default>
+ <onCreateDefault><![CDATA['N']]></onCreateDefault>
+ </column>
<foreign-key foreignTable="AD_CLIENT"
name="AD_MODULE_DEPENDENCY_INST_AD_C">
<reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
</foreign-key>
diff -r 2f41659aee71 -r 3d3e7ced4ea6
src-db/database/model/tables/AD_MODULE_INSTALL.xml
--- a/src-db/database/model/tables/AD_MODULE_INSTALL.xml Fri Aug 06
10:12:20 2010 +0200
+++ b/src-db/database/model/tables/AD_MODULE_INSTALL.xml Fri Aug 13
11:04:07 2010 +0200
@@ -149,6 +149,10 @@
<default><![CDATA[NA]]></default>
<onCreateDefault/>
</column>
+ <column name="ENABLED" primaryKey="false" required="true" type="CHAR"
size="1" autoIncrement="false">
+ <default><![CDATA[Y]]></default>
+ <onCreateDefault><![CDATA['Y']]></onCreateDefault>
+ </column>
<foreign-key foreignTable="AD_CLIENT" name="AD_MODULE_INSTALL_AD_CLIENT">
<reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
</foreign-key>
diff -r 2f41659aee71 -r 3d3e7ced4ea6
src-db/database/model/triggers/AD_MODULE_DEPENDENCY_MOD_TRG.xml
--- a/src-db/database/model/triggers/AD_MODULE_DEPENDENCY_MOD_TRG.xml Fri Aug
06 10:12:20 2010 +0200
+++ b/src-db/database/model/triggers/AD_MODULE_DEPENDENCY_MOD_TRG.xml Fri Aug
13 11:04:07 2010 +0200
@@ -59,7 +59,8 @@
COALESCE(:NEW.StartVersion , '.') != COALESCE(:OLD.StartVersion , '.')
OR
COALESCE(:NEW.EndVersion , '.') != COALESCE(:OLD.EndVersion , '.') OR
COALESCE(:NEW.IsIncluded , '.') != COALESCE(:OLD.IsIncluded , '.') OR
- 1=2) THEN
+ COALESCE(:NEW.Dependency_Enforcement , '.') !=
COALESCE(:OLD.Dependency_Enforcement , '.') OR
+ COALESCE(:NEW.User_Editable_Enforcement , '.') !=
COALESCE(:OLD.User_Editable_Enforcement , '.')) THEN
RAISE_APPLICATION_ERROR(-20000, '@20532@');
END IF;
END IF;
@@ -67,6 +68,23 @@
IF (INSERTING AND devModule='N') THEN
RAISE_APPLICATION_ERROR(-20000, '@20533@');
END IF;
+
+ --Check the only updated column is instanceEnforcement. In this case maitin
updated
+ --column as it was to prevent changes detection when trying to update
database
+ IF (UPDATING) THEN
+ IF (COALESCE(:NEW.ISACTIVE ,'.') = COALESCE(:OLD.ISACTIVE
,'.') AND
+ COALESCE(:NEW.AD_MODULE_ID ,'.') =
COALESCE(:OLD.AD_MODULE_ID ,'.') AND
+ COALESCE(:NEW.AD_DEPENDENT_MODULE_ID ,'.') =
COALESCE(:OLD.AD_DEPENDENT_MODULE_ID ,'.') AND
+ COALESCE(:NEW.STARTVERSION ,'.') =
COALESCE(:OLD.STARTVERSION ,'.') AND
+ COALESCE(:NEW.ENDVERSION ,'.') =
COALESCE(:OLD.ENDVERSION ,'.') AND
+ COALESCE(:NEW.ISINCLUDED ,'.') =
COALESCE(:OLD.ISINCLUDED ,'.') AND
+ COALESCE(:NEW.DEPENDANT_MODULE_NAME ,'.') =
COALESCE(:OLD.DEPENDANT_MODULE_NAME ,'.') AND
+ COALESCE(:NEW.DEPENDENCY_ENFORCEMENT ,'.') =
COALESCE(:OLD.DEPENDENCY_ENFORCEMENT ,'.') AND
+ COALESCE(:NEW.USER_EDITABLE_ENFORCEMENT,'.') =
COALESCE(:OLD.USER_EDITABLE_ENFORCEMENT,'.') AND
+ COALESCE(:NEW.INSTANCE_ENFORCEMENT,'.') !=
COALESCE(:OLD.INSTANCE_ENFORCEMENT,'.')) THEN
+ :NEW.UPDATED := :OLD.UPDATED;
+ END IF;
+ END IF;
END AD_MODULE_DEPENDENCY_MOD_TRG
]]></body>
</trigger>
diff -r 2f41659aee71 -r 3d3e7ced4ea6
src-db/database/model/triggers/AD_MODULE_VERSION_TRG.xml
--- a/src-db/database/model/triggers/AD_MODULE_VERSION_TRG.xml Fri Aug 06
10:12:20 2010 +0200
+++ b/src-db/database/model/triggers/AD_MODULE_VERSION_TRG.xml Fri Aug 13
11:04:07 2010 +0200
@@ -35,6 +35,10 @@
:new.commercial_Tier := 'NA';
END IF;
END IF;
+
+ IF :new.IsCommercial='Y' AND :new.commercial_Tier NOT IN ('1','2') THEN
+ RAISE_APPLICATION_ERROR(-20000, '@AD_MODULE_TIER_CHK@');
+ END IF;
IF instr(:new.VERSION,'.') <= 0 OR instr(:new.VERSION,'.',1,2) <= 0 OR
instr(:new.VERSION,'.',1,3) > 0 THEN
RAISE_APPLICATION_ERROR(-20104, 'The version has to be formatted like
x.y.z where x, y and z are integers.');
diff -r 2f41659aee71 -r 3d3e7ced4ea6 src-db/database/sourcedata/AD_COLUMN.xml
--- a/src-db/database/sourcedata/AD_COLUMN.xml Fri Aug 06 10:12:20 2010 +0200
+++ b/src-db/database/sourcedata/AD_COLUMN.xml Fri Aug 13 11:04:07 2010 +0200
@@ -1853,8 +1853,8 @@
<!--177--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--177--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--177--> <NAME><![CDATA[Display Logic]]></NAME>
-<!--177--> <DESCRIPTION><![CDATA[A specification of statements which, when
evaluated as false, cause the the field to appear hidden.]]></DESCRIPTION>
-<!--177--> <HELP><![CDATA[A specification of statements which, when evaluated
as false, cause the the field to appear hidden.]]></HELP>
+<!--177--> <DESCRIPTION><![CDATA[A specification of statements which, when
evaluated as false, cause the field to appear hidden.]]></DESCRIPTION>
+<!--177--> <HELP><![CDATA[A specification of statements which, when evaluated
as false, cause the field to appear hidden.]]></HELP>
<!--177--> <COLUMNNAME><![CDATA[DisplayLogic]]></COLUMNNAME>
<!--177--> <AD_TABLE_ID><![CDATA[107]]></AD_TABLE_ID>
<!--177--> <AD_REFERENCE_ID><![CDATA[14]]></AD_REFERENCE_ID>
@@ -43667,7 +43667,7 @@
<!--2792--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--2792--> <NAME><![CDATA[P_String_To]]></NAME>
<!--2792--> <DESCRIPTION><![CDATA[Parameter String To]]></DESCRIPTION>
-<!--2792--> <HELP><![CDATA[String passed as maximun string range to a process
instance.]]></HELP>
+<!--2792--> <HELP><![CDATA[String passed as maximum string range to a process
instance.]]></HELP>
<!--2792--> <COLUMNNAME><![CDATA[P_String_To]]></COLUMNNAME>
<!--2792--> <AD_TABLE_ID><![CDATA[283]]></AD_TABLE_ID>
<!--2792--> <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
@@ -43730,8 +43730,8 @@
<!--2798--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--2798--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--2798--> <NAME><![CDATA[Process Date To]]></NAME>
-<!--2798--> <DESCRIPTION><![CDATA[Date passed as maximun date as parameter to
a process instance.]]></DESCRIPTION>
-<!--2798--> <HELP><![CDATA[Date passed as maximun date as parameter to a
process instance.]]></HELP>
+<!--2798--> <DESCRIPTION><![CDATA[Date passed as maximum date as parameter to
a process instance.]]></DESCRIPTION>
+<!--2798--> <HELP><![CDATA[Date passed as maximum date as parameter to a
process instance.]]></HELP>
<!--2798--> <COLUMNNAME><![CDATA[P_Date_To]]></COLUMNNAME>
<!--2798--> <AD_TABLE_ID><![CDATA[283]]></AD_TABLE_ID>
<!--2798--> <AD_REFERENCE_ID><![CDATA[15]]></AD_REFERENCE_ID>
@@ -61711,7 +61711,7 @@
<!--3724--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--3724--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--3724--> <NAME><![CDATA[Tax Search Key]]></NAME>
-<!--3724--> <DESCRIPTION><![CDATA[A fast method for finding a a specific
tax.]]></DESCRIPTION>
+<!--3724--> <DESCRIPTION><![CDATA[A fast method for finding a specific
tax.]]></DESCRIPTION>
<!--3724--> <HELP><![CDATA[The Tax Indicator identifies the short name that
will print on documents referencing this tax.]]></HELP>
<!--3724--> <COLUMNNAME><![CDATA[TaxIndicator]]></COLUMNNAME>
<!--3724--> <AD_TABLE_ID><![CDATA[261]]></AD_TABLE_ID>
@@ -61809,7 +61809,7 @@
<!--3735--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--3735--> <NAME><![CDATA[Process Number To]]></NAME>
<!--3735--> <DESCRIPTION><![CDATA[Parameter number to]]></DESCRIPTION>
-<!--3735--> <HELP><![CDATA[Number passed as maximun range as parameter to a
process instance.]]></HELP>
+<!--3735--> <HELP><![CDATA[Number passed as maximum range as parameter to a
process instance.]]></HELP>
<!--3735--> <COLUMNNAME><![CDATA[P_Number_To]]></COLUMNNAME>
<!--3735--> <AD_TABLE_ID><![CDATA[283]]></AD_TABLE_ID>
<!--3735--> <AD_REFERENCE_ID><![CDATA[22]]></AD_REFERENCE_ID>
@@ -76896,7 +76896,7 @@
<!--4710--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--4710--> <NAME><![CDATA[Print Details on Pick List]]></NAME>
<!--4710--> <DESCRIPTION><![CDATA[Print detail BOM elements on the pick
list]]></DESCRIPTION>
-<!--4710--> <HELP><![CDATA[If “Print Details on Pick List” is checked then
the details of the individual elements of the BOM will be printed on the Pick
List.]]></HELP>
+<!--4710--> <HELP><![CDATA[The Print Details on Pick List indicates that the
BOM element products will print on the Pick List as opposed to this
product.]]></HELP>
<!--4710--> <COLUMNNAME><![CDATA[IsPickListPrintDetails]]></COLUMNNAME>
<!--4710--> <AD_TABLE_ID><![CDATA[208]]></AD_TABLE_ID>
<!--4710--> <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
@@ -129101,7 +129101,7 @@
<!--8199--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--8199--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--8199--> <NAME><![CDATA[Tax Search Key]]></NAME>
-<!--8199--> <DESCRIPTION><![CDATA[A fast method for finding a a specific
tax.]]></DESCRIPTION>
+<!--8199--> <DESCRIPTION><![CDATA[A fast method for finding a specific
tax.]]></DESCRIPTION>
<!--8199--> <HELP><![CDATA[The Tax Indicator identifies the short name that
will print on documents referencing this tax.]]></HELP>
<!--8199--> <COLUMNNAME><![CDATA[TaxIndicator]]></COLUMNNAME>
<!--8199--> <AD_TABLE_ID><![CDATA[546]]></AD_TABLE_ID>
@@ -130042,7 +130042,7 @@
<!--8254--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--8254--> <NAME><![CDATA[Overdue Payment Day Rule]]></NAME>
<!--8254--> <DESCRIPTION><![CDATA[A plan to give until a specific day after
the agreed payment term to pay without penalty.]]></DESCRIPTION>
-<!--8254--> <HELP><![CDATA[When defined, overwrites the number of net days
with the relative number of days to the the day defined.]]></HELP>
+<!--8254--> <HELP><![CDATA[When defined, overwrites the number of net days
with the relative number of days to the day defined.]]></HELP>
<!--8254--> <COLUMNNAME><![CDATA[NetDay]]></COLUMNNAME>
<!--8254--> <AD_TABLE_ID><![CDATA[113]]></AD_TABLE_ID>
<!--8254--> <AD_REFERENCE_ID><![CDATA[17]]></AD_REFERENCE_ID>
@@ -142617,7 +142617,7 @@
<!--8910--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--8910--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--8910--> <NAME><![CDATA[Org Assignment]]></NAME>
-<!--8910--> <DESCRIPTION><![CDATA[Assigment to (transaction)
Organization]]></DESCRIPTION>
+<!--8910--> <DESCRIPTION><![CDATA[Assignment to (transaction)
Organization]]></DESCRIPTION>
<!--8910--> <HELP><![CDATA[Assignment to the transacation organization (cost
center).]]></HELP>
<!--8910--> <COLUMNNAME><![CDATA[C_OrgAssignment_ID]]></COLUMNNAME>
<!--8910--> <AD_TABLE_ID><![CDATA[585]]></AD_TABLE_ID>
@@ -143249,7 +143249,7 @@
<!--8991--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--8991--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--8991--> <NAME><![CDATA[Tax Search Key]]></NAME>
-<!--8991--> <DESCRIPTION><![CDATA[A fast method for finding a a specific
tax.]]></DESCRIPTION>
+<!--8991--> <DESCRIPTION><![CDATA[A fast method for finding a specific
tax.]]></DESCRIPTION>
<!--8991--> <HELP><![CDATA[The Tax Indicator identifies the short name that
will print on documents referencing this tax.]]></HELP>
<!--8991--> <COLUMNNAME><![CDATA[TaxIndicator]]></COLUMNNAME>
<!--8991--> <AD_TABLE_ID><![CDATA[591]]></AD_TABLE_ID>
@@ -146221,7 +146221,7 @@
<!--9186--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--9186--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--9186--> <NAME><![CDATA[Tax Search Key]]></NAME>
-<!--9186--> <DESCRIPTION><![CDATA[A fast method for finding a a specific
tax.]]></DESCRIPTION>
+<!--9186--> <DESCRIPTION><![CDATA[A fast method for finding a specific
tax.]]></DESCRIPTION>
<!--9186--> <HELP><![CDATA[The Tax Indicator identifies the short name that
will print on documents referencing this tax.]]></HELP>
<!--9186--> <COLUMNNAME><![CDATA[TaxIndicator]]></COLUMNNAME>
<!--9186--> <AD_TABLE_ID><![CDATA[598]]></AD_TABLE_ID>
@@ -162971,7 +162971,7 @@
<!--800173--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--800173--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--800173--> <NAME><![CDATA[Invoice to Project]]></NAME>
-<!--800173--> <HELP><![CDATA[This option indicates if invoices received are
to be posted to the project.]]></HELP>
+<!--800173--> <HELP><![CDATA[This option indicates if the invoices has been
sent to the winner are "Origen invoices"]]></HELP>
<!--800173--> <COLUMNNAME><![CDATA[Invoice_ToProject]]></COLUMNNAME>
<!--800173--> <AD_TABLE_ID><![CDATA[203]]></AD_TABLE_ID>
<!--800173--> <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
@@ -173715,7 +173715,7 @@
<!--800573--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--800573--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--800573--> <NAME><![CDATA[M_WH_Period_Invoiced_ID]]></NAME>
-<!--800573--> <HELP><![CDATA[The ID identifies a unique period invoiced for
the the period]]></HELP>
+<!--800573--> <HELP><![CDATA[The ID identifies a unique period invoiced for
the period]]></HELP>
<!--800573--> <COLUMNNAME><![CDATA[M_WH_Period_Invoiced_ID]]></COLUMNNAME>
<!--800573--> <AD_TABLE_ID><![CDATA[800032]]></AD_TABLE_ID>
<!--800573--> <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
@@ -181189,7 +181189,7 @@
<!--800832--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--800832--> <NAME><![CDATA[De-encryptable]]></NAME>
<!--800832--> <DESCRIPTION><![CDATA[Is desencryptable]]></DESCRIPTION>
-<!--800832--> <HELP><![CDATA[If “De-encryptable” is selected then the content
of this column can be decrypted.]]></HELP>
+<!--800832--> <HELP><![CDATA[When Is Desencryptable field is 'Y' the content
of this column will be saved in a desencryptable way.]]></HELP>
<!--800832--> <COLUMNNAME><![CDATA[IsDesencryptable]]></COLUMNNAME>
<!--800832--> <AD_TABLE_ID><![CDATA[101]]></AD_TABLE_ID>
<!--800832--> <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
@@ -188004,7 +188004,7 @@
<!--801041--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--801041--> <NAME><![CDATA[Overdue Payment Day Rule]]></NAME>
<!--801041--> <DESCRIPTION><![CDATA[A plan to give until a specific day after
the agreed payment term to pay without penalty.]]></DESCRIPTION>
-<!--801041--> <HELP><![CDATA[When defined, overwrites the number of net days
with the relative number of days to the the day defined.]]></HELP>
+<!--801041--> <HELP><![CDATA[When defined, overwrites the number of net days
with the relative number of days to the day defined.]]></HELP>
<!--801041--> <COLUMNNAME><![CDATA[NetDay]]></COLUMNNAME>
<!--801041--> <AD_TABLE_ID><![CDATA[800058]]></AD_TABLE_ID>
<!--801041--> <AD_REFERENCE_ID><![CDATA[17]]></AD_REFERENCE_ID>
@@ -201983,7 +201983,7 @@
<!--802197--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
------------------------------------------------------------------------------
This SF.net email is sponsored by
Make an app they can't live without
Enter the BlackBerry Developer Challenge
http://p.sf.net/sfu/RIM-dev2dev
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
