details: /erp/devel/pi/rev/480b20422e2f
changeset: 9153:480b20422e2f
user: Adrián Romero <adrianromero <at> openbravo.com>
date: Wed Dec 15 14:25:05 2010 +0100
summary: Fixes issue 0015439: The unique constraint c_doctype_name on
c_doctype table should include ad_org_id column
It has been added the required constraint
details: /erp/devel/pi/rev/362dd3d976d6
changeset: 9154:362dd3d976d6
user: Adrián Romero <adrianromero <at> openbravo.com>
date: Wed Dec 15 16:02:04 2010 +0100
summary: merging
diffstat:
modules/org.openbravo.advpaymentmngt/src-db/database/model/views/APRM_RECONCILIATION_V.xml
| 23 +-
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml
| 2 +
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml
| 2 +-
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml
| 8 +-
modules/org.openbravo.client.application/src-db/database/sourcedata/OBCLKER_TEMPLATE.xml
| 13 -
modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationComponentProvider.java
| 9 -
modules/org.openbravo.client.application/src/org/openbravo/client/application/ParametersActionHandler.java
| 4 +-
modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/templates/application-menu.js.ftl
| 3 +
modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/entity-tab-mapping.js.ftl
| 43 -
modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-field.js.ftl
| 2 +
modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-grid.js.ftl
| 2 +
modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-tab.js.ftl
| 2 +
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/ComputeSelectedRecordActionHandler.java
| 81 +-
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/EntityWindowMappingComponent.java
| 130 -
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java
| 6 +-
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewFormComponent.java
| 31 +
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewGridComponent.java
| 31 +-
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewTab.java
| 4 +
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-view.js
| 290 +++-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-utilities.js
| 37 +
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-grid.js
| 153 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-manager.js
| 11 +
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/BaseComponent.java
| 24 +-
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/BaseComponentProvider.java
| 21 +-
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/Component.java
| 5 +
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/ComponentGenerator.java
| 4 +-
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/KernelUtils.java
| 29 +-
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/StaticResourceComponent.java
| 25 +-
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/EnumUIDefinition.java
| 10 +-
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/FKComboUIDefinition.java
| 10 +-
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/UIDefinition.java
| 32 +-
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/UIDefinitionController.java
| 1 +
modules/org.openbravo.client.myob/src-db/database/model/tables/OBKMO_WIDGET_CLASS_MENU.xml
| 68 +
modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_COLUMN.xml
| 446 ++++++
modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_ELEMENT.xml
| 40 +
modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_FIELD.xml
| 217 +++
modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODEL_OBJECT.xml
| 24 +
modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml
| 40 +
modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_TAB.xml
| 24 +
modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_TABLE.xml
| 20 +
modules/org.openbravo.client.myob/src/org/openbravo/client/myob/MyOBUtils.java
| 33 +
modules/org.openbravo.client.myob/src/org/openbravo/client/myob/WidgetProvider.java
| 8 +-
modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-myopenbravo.js
| 1 +
modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-widget.js
| 41 +-
modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_COLUMN.xml
| 1 +
modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_FIELD.xml
| 1 +
modules/org.openbravo.client.querylist/src-db/database/sourcedata/OBKMO_WIDGET_CLASS.xml
| 2 +-
modules/org.openbravo.client.querylist/src/org/openbravo/client/querylist/QueryListDataSource.java
| 19 +-
modules/org.openbravo.client.querylist/src/org/openbravo/client/querylist/QueryListUtils.java
| 62 +-
modules/org.openbravo.client.querylist/src/org/openbravo/client/querylist/QueryListWidgetProvider.java
| 32 +-
modules/org.openbravo.client.querylist/web/org.openbravo.client.querylist/js/ob-querylist-widget.js
| 36 +-
modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/ModelDataSourceService.java
| 2 +-
modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/ReadOnlyDataSourceService.java
| 2 +-
modules/org.openbravo.service.json/src/org/openbravo/service/json/DefaultJsonDataService.java
| 212 +-
modules/org.openbravo.service.json/src/org/openbravo/service/json/JsonConstants.java
| 8 +-
modules/org.openbravo.service.json/src/org/openbravo/service/json/JsonUtils.java
| 2 +-
modules/org.openbravo.v3.datasets/referencedata/standard/V3_Roles.xml
| 703 +++++----
src-db/database/model/tables/C_DOCTYPE.xml
| 1 +
src-db/database/sourcedata/AD_COLUMN.xml
| 2 +-
src-db/database/sourcedata/AD_MESSAGE.xml
| 11 +
src-wad/src/org/openbravo/wad/controls/WADDate.java
| 6 +-
src-wad/src/org/openbravo/wad/controls/WADDateTime.java
| 6 +-
src/org/openbravo/erpCommon/ad_actionButton/ExportReferenceData.java
| 2 +-
src/org/openbravo/erpCommon/modules/UninstallModule.java
| 39 +-
src/org/openbravo/erpCommon/modules/UninstallModule_data.xsql
| 4 +-
src/org/openbravo/erpCommon/utility/MessageBD_data.xsql
| 39 +-
src/org/openbravo/erpCommon/utility/ReferencedLink.java
| 8 +-
src/org/openbravo/erpCommon/utility/TableSQLData.java
| 33 +-
src/org/openbravo/erpCommon/utility/Utility.java
| 15 +-
src/org/openbravo/service/db/DalConnectionProvider.java
| 24 +-
web/js/jscalendar/lang/calendar-lang.js
| 25 +
71 files changed, 2301 insertions(+), 1006 deletions(-)
diffs (truncated from 6289 to 300 lines):
diff -r 79d70b18309e -r 362dd3d976d6
modules/org.openbravo.advpaymentmngt/src-db/database/model/views/APRM_RECONCILIATION_V.xml
---
a/modules/org.openbravo.advpaymentmngt/src-db/database/model/views/APRM_RECONCILIATION_V.xml
Tue Dec 14 10:43:05 2010 +0100
+++
b/modules/org.openbravo.advpaymentmngt/src-db/database/model/views/APRM_RECONCILIATION_V.xml
Wed Dec 15 16:02:04 2010 +0100
@@ -2,22 +2,16 @@
<database name="VIEW APRM_RECONCILIATION_V">
<view name="APRM_RECONCILIATION_V"><![CDATA[SELECT
fin_reconciliation.fin_reconciliation_id AS aprm_reconciliation_v_id,
fin_reconciliation.fin_reconciliation_id, fin_reconciliation.ad_client_id,
fin_reconciliation.ad_org_id, fin_reconciliation.created,
fin_reconciliation.createdby, fin_reconciliation.updated,
fin_reconciliation.updatedby, fin_reconciliation.isactive,
fin_reconciliation.fin_financial_account_id, fin_reconciliation.documentno,
fin_reconciliation.c_doctype_id, fin_reconciliation.dateto,
fin_reconciliation.statementdate, fin_reconciliation.endingbalance,
fin_reconciliation.startingbalance, fin_reconciliation.docstatus,
fin_reconciliation.processing, fin_reconciliation.processed,
fin_reconciliation.posted, fin_reconciliation.printdetailed,
fin_reconciliation.printsummary, COALESCE(item.item_no, 0) AS item_no,
COALESCE(item.item_amt, 0) AS item_amt, COALESCE(unrec.unrec_no, 0) AS
unrec_no, COALESCE(unrec.unrec_amt, 0) AS unrec_amt,
COALESCE(outstanding.payment_no, 0) AS payment_no,
COALESCE(outstanding.payment_amt, 0) AS payment_amt,
COALESCE(outstanding.deposit_no, 0) AS deposit_no,
COALESCE(outstanding.deposit_amt, 0) AS deposit_amt, (SELECT
ad_table.ad_table_id
FROM ad_table
-WHERE lower(ad_table.tablename) like 'fin_reconciliation') AS forced_table_id
+WHERE lower(ad_table.tablename) = 'fin_reconciliation') AS forced_table_id
FROM fin_reconciliation
-LEFT JOIN (SELECT fin_finacc_transaction.fin_reconciliation_id, count(*) AS
item_no,
-COALESCE(sum(fin_finacc_transaction.depositamt -
fin_finacc_transaction.paymentamt), 0) AS item_amt
+LEFT JOIN (SELECT fin_finacc_transaction.fin_reconciliation_id, count(*) AS
item_no, COALESCE(sum(fin_finacc_transaction.depositamt -
fin_finacc_transaction.paymentamt), 0) AS item_amt
FROM fin_finacc_transaction
GROUP BY fin_finacc_transaction.fin_reconciliation_id) item ON
fin_reconciliation.fin_reconciliation_id = item.fin_reconciliation_id
LEFT JOIN (SELECT fin_reconciliation.fin_reconciliation_id, count(*) AS
unrec_no, COALESCE(sum(fin_bankstatementline.cramount -
fin_bankstatementline.dramount), 0) AS unrec_amt
FROM fin_bankstatementline, fin_bankstatement, fin_reconciliation
-WHERE (fin_bankstatementline.fin_finacc_transaction_id IS NULL
-or fin_bankstatementline.fin_finacc_transaction_id in (select
fin_finacc_transaction_id from fin_finacc_transaction, fin_reconciliation rec
-WHERE fin_finacc_transaction.fin_reconciliation_id = rec.fin_reconciliation_id
-AND fin_finacc_transaction.fin_financial_account_id =
fin_bankstatement.fin_financial_account_id
-AND rec.created > fin_reconciliation.created))
-AND fin_bankstatementline.datetrx<= fin_reconciliation.dateto
-AND fin_bankstatement.fin_bankstatement_id =
fin_bankstatementline.fin_bankstatement_id
-AND fin_bankstatement.fin_financial_account_id =
fin_reconciliation.fin_financial_account_id
+WHERE (fin_bankstatementline.fin_finacc_transaction_id IS NULL OR
(fin_bankstatementline.fin_finacc_transaction_id IN (SELECT
fin_finacc_transaction.fin_finacc_transaction_id
+FROM fin_finacc_transaction, fin_reconciliation rec
+WHERE fin_finacc_transaction.fin_reconciliation_id = rec.fin_reconciliation_id
AND fin_finacc_transaction.fin_financial_account_id =
fin_bankstatement.fin_financial_account_id AND rec.created >
fin_reconciliation.created))) AND fin_bankstatementline.datetrx <=
fin_reconciliation.dateto AND fin_bankstatement.fin_bankstatement_id =
fin_bankstatementline.fin_bankstatement_id AND
fin_bankstatement.fin_financial_account_id =
fin_reconciliation.fin_financial_account_id
GROUP BY fin_reconciliation.fin_reconciliation_id) unrec ON
fin_reconciliation.fin_reconciliation_id = unrec.fin_reconciliation_id
LEFT JOIN (SELECT fin_reconciliation.fin_reconciliation_id, COALESCE(sum(
CASE COALESCE(fin_finacc_transaction.paymentamt, 0)
@@ -29,11 +23,8 @@
ELSE 1
END), 0) AS deposit_no, COALESCE(sum(fin_finacc_transaction.depositamt), 0) AS
deposit_amt
FROM fin_finacc_transaction, fin_reconciliation
-WHERE (fin_finacc_transaction.fin_reconciliation_id IS NULL
-OR (fin_finacc_transaction.fin_reconciliation_id IN (SELECT
r.fin_reconciliation_id
+WHERE (fin_finacc_transaction.fin_reconciliation_id IS NULL OR
(fin_finacc_transaction.fin_reconciliation_id IN (SELECT r.fin_reconciliation_id
FROM fin_reconciliation r
-WHERE r.dateto > fin_reconciliation.dateto)))
-AND fin_finacc_transaction.statementdate <= fin_reconciliation.dateto
-AND fin_finacc_transaction.fin_financial_account_id =
fin_reconciliation.fin_financial_account_id
+WHERE r.dateto > fin_reconciliation.dateto))) AND
fin_finacc_transaction.statementdate <= fin_reconciliation.dateto AND
fin_finacc_transaction.fin_financial_account_id =
fin_reconciliation.fin_financial_account_id
GROUP BY fin_reconciliation.fin_reconciliation_id) outstanding ON
fin_reconciliation.fin_reconciliation_id =
outstanding.fin_reconciliation_id]]></view>
</database>
diff -r 79d70b18309e -r 362dd3d976d6
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml
---
a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml
Tue Dec 14 10:43:05 2010 +0100
+++
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml
Wed Dec 15 16:02:04 2010 +0100
@@ -1675,6 +1675,8 @@
<!--82EFB8E4045119C9E040007F01003778--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--82EFB8E4045119C9E040007F01003778--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--82EFB8E4045119C9E040007F01003778--> <NAME><![CDATA[Print
Detailed]]></NAME>
+<!--82EFB8E4045119C9E040007F01003778--> <DESCRIPTION><![CDATA[Print
Detailed]]></DESCRIPTION>
+<!--82EFB8E4045119C9E040007F01003778--> <HELP><![CDATA[Print
Detailed]]></HELP>
<!--82EFB8E4045119C9E040007F01003778-->
<COLUMNNAME><![CDATA[Printdetailed]]></COLUMNNAME>
<!--82EFB8E4045119C9E040007F01003778-->
<AD_TABLE_ID><![CDATA[0DFF5BACFB964FDABAA5042C8809C813]]></AD_TABLE_ID>
<!--82EFB8E4045119C9E040007F01003778-->
<AD_REFERENCE_ID><![CDATA[28]]></AD_REFERENCE_ID>
diff -r 79d70b18309e -r 362dd3d976d6
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml
---
a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml
Tue Dec 14 10:43:05 2010 +0100
+++
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml
Wed Dec 15 16:02:04 2010 +0100
@@ -1533,7 +1533,7 @@
<!--674E0470AD104D238EE08F7C11264E57-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
<!--674E0470AD104D238EE08F7C11264E57--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--674E0470AD104D238EE08F7C11264E57--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--674E0470AD104D238EE08F7C11264E57--> <NAME><![CDATA[PO Financial
account]]></NAME>
+<!--674E0470AD104D238EE08F7C11264E57--> <NAME><![CDATA[PO Financial
Account]]></NAME>
<!--674E0470AD104D238EE08F7C11264E57--> <DESCRIPTION><![CDATA[Financial
account used to deposit / withdrawal money such as bank accounts or petty
cash]]></DESCRIPTION>
<!--674E0470AD104D238EE08F7C11264E57--> <HELP><![CDATA[Financial account used
to deposit / withdrawal money such as bank accounts or petty cash]]></HELP>
<!--674E0470AD104D238EE08F7C11264E57-->
<ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
diff -r 79d70b18309e -r 362dd3d976d6
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml
---
a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml
Tue Dec 14 10:43:05 2010 +0100
+++
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml
Wed Dec 15 16:02:04 2010 +0100
@@ -173,7 +173,9 @@
<!--64F6733BE6654339AE67403E0925F525--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--64F6733BE6654339AE67403E0925F525-->
<AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
<!--64F6733BE6654339AE67403E0925F525-->
<AD_COLUMN_ID><![CDATA[7891269C8418655DE040007F010155CE]]></AD_COLUMN_ID>
-<!--64F6733BE6654339AE67403E0925F525--> <NAME><![CDATA[ReferenceNo]]></NAME>
+<!--64F6733BE6654339AE67403E0925F525--> <NAME><![CDATA[Payment]]></NAME>
+<!--64F6733BE6654339AE67403E0925F525--> <DESCRIPTION><![CDATA[Payment
event]]></DESCRIPTION>
+<!--64F6733BE6654339AE67403E0925F525--> <HELP><![CDATA[Payment event]]></HELP>
<!--64F6733BE6654339AE67403E0925F525-->
<PROPERTY><![CDATA[finPayment.referenceNo]]></PROPERTY>
<!--64F6733BE6654339AE67403E0925F525-->
<ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
<!--64F6733BE6654339AE67403E0925F525--> <SORT><![CDATA[Y]]></SORT>
@@ -193,6 +195,8 @@
<!--8EE2C299C0D7421DBEFE0FEBC9DED657-->
<AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
<!--8EE2C299C0D7421DBEFE0FEBC9DED657-->
<AD_COLUMN_ID><![CDATA[828EE0AE801E5FA1E040007F010067C7]]></AD_COLUMN_ID>
<!--8EE2C299C0D7421DBEFE0FEBC9DED657--> <NAME><![CDATA[Description]]></NAME>
+<!--8EE2C299C0D7421DBEFE0FEBC9DED657--> <DESCRIPTION><![CDATA[A space to
write additional related information.]]></DESCRIPTION>
+<!--8EE2C299C0D7421DBEFE0FEBC9DED657--> <HELP><![CDATA[A description is
limited to 255 characters.]]></HELP>
<!--8EE2C299C0D7421DBEFE0FEBC9DED657-->
<PROPERTY><![CDATA[description]]></PROPERTY>
<!--8EE2C299C0D7421DBEFE0FEBC9DED657-->
<ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
<!--8EE2C299C0D7421DBEFE0FEBC9DED657--> <SORT><![CDATA[Y]]></SORT>
@@ -253,7 +257,7 @@
<!--C5CFD3978631444EB97539BCEE3D5239--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--C5CFD3978631444EB97539BCEE3D5239-->
<AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
<!--C5CFD3978631444EB97539BCEE3D5239-->
<AD_COLUMN_ID><![CDATA[828EE0AE801D5FA1E040007F010067C7]]></AD_COLUMN_ID>
-<!--C5CFD3978631444EB97539BCEE3D5239--> <NAME><![CDATA[Date]]></NAME>
+<!--C5CFD3978631444EB97539BCEE3D5239--> <NAME><![CDATA[Transaction
Date]]></NAME>
<!--C5CFD3978631444EB97539BCEE3D5239--> <DESCRIPTION><![CDATA[The date the
transaction is carried out and registered in the cash journal.]]></DESCRIPTION>
<!--C5CFD3978631444EB97539BCEE3D5239--> <HELP><![CDATA[The Statement Date
field defines the date of the statement being processed.]]></HELP>
<!--C5CFD3978631444EB97539BCEE3D5239-->
<PROPERTY><![CDATA[transactionDate]]></PROPERTY>
diff -r 79d70b18309e -r 362dd3d976d6
modules/org.openbravo.client.application/src-db/database/sourcedata/OBCLKER_TEMPLATE.xml
---
a/modules/org.openbravo.client.application/src-db/database/sourcedata/OBCLKER_TEMPLATE.xml
Tue Dec 14 10:43:05 2010 +0100
+++
b/modules/org.openbravo.client.application/src-db/database/sourcedata/OBCLKER_TEMPLATE.xml
Wed Dec 15 16:02:04 2010 +0100
@@ -95,19 +95,6 @@
<!--6DE62635998E4030B01DC2C4EA8567BE--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--6DE62635998E4030B01DC2C4EA8567BE--></OBCLKER_TEMPLATE>
-<!--7130F3674BCC434C8F939DFC2F58002B--><OBCLKER_TEMPLATE>
-<!--7130F3674BCC434C8F939DFC2F58002B-->
<OBCLKER_TEMPLATE_ID><![CDATA[7130F3674BCC434C8F939DFC2F58002B]]></OBCLKER_TEMPLATE_ID>
-<!--7130F3674BCC434C8F939DFC2F58002B-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--7130F3674BCC434C8F939DFC2F58002B--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--7130F3674BCC434C8F939DFC2F58002B-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
-<!--7130F3674BCC434C8F939DFC2F58002B--> <NAME><![CDATA[Entity to Window
Mapping]]></NAME>
-<!--7130F3674BCC434C8F939DFC2F58002B--> <DESCRIPTION><![CDATA[Generates the
mapping from entity to window/tabs maintaining them]]></DESCRIPTION>
-<!--7130F3674BCC434C8F939DFC2F58002B-->
<TEMPLATECLASSPATHLOCATION><![CDATA[/org/openbravo/client/application/templates/entity-tab-mapping.js.ftl]]></TEMPLATECLASSPATHLOCATION>
-<!--7130F3674BCC434C8F939DFC2F58002B-->
<TEMPLATE_LANGUAGE><![CDATA[OBCLFRE_Freemarker]]></TEMPLATE_LANGUAGE>
-<!--7130F3674BCC434C8F939DFC2F58002B-->
<COMPONENT_TYPE><![CDATA[OBUIAPP_MainLayout]]></COMPONENT_TYPE>
-<!--7130F3674BCC434C8F939DFC2F58002B--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--7130F3674BCC434C8F939DFC2F58002B--></OBCLKER_TEMPLATE>
-
<!--91DD63545B674BE8801E1FA4F48FF4C6--><OBCLKER_TEMPLATE>
<!--91DD63545B674BE8801E1FA4F48FF4C6-->
<OBCLKER_TEMPLATE_ID><![CDATA[91DD63545B674BE8801E1FA4F48FF4C6]]></OBCLKER_TEMPLATE_ID>
<!--91DD63545B674BE8801E1FA4F48FF4C6-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r 79d70b18309e -r 362dd3d976d6
modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationComponentProvider.java
---
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationComponentProvider.java
Tue Dec 14 10:43:05 2010 +0100
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationComponentProvider.java
Wed Dec 15 16:02:04 2010 +0100
@@ -24,7 +24,6 @@
import javax.enterprise.context.ApplicationScoped;
-import org.openbravo.client.application.window.EntityWindowMappingComponent;
import org.openbravo.client.kernel.BaseComponentProvider;
import org.openbravo.client.kernel.Component;
import org.openbravo.client.kernel.ComponentProvider;
@@ -52,11 +51,6 @@
component.setId(ApplicationConstants.MAIN_LAYOUT_ID);
component.setParameters(parameters);
return component;
- } else if (componentId.equals(EntityWindowMappingComponent.COMPONENT_ID)) {
- final EntityWindowMappingComponent component =
getComponent(EntityWindowMappingComponent.class);
- component.setId(EntityWindowMappingComponent.COMPONENT_ID);
- component.setParameters(parameters);
- return component;
} else if
(componentId.equals(ApplicationConstants.MAIN_LAYOUT_VIEW_COMPONENT_ID)) {
final ViewComponent component = getComponent(ViewComponent.class);
component.setId(ApplicationConstants.MAIN_LAYOUT_VIEW_COMPONENT_ID);
@@ -182,9 +176,6 @@
// Application
globalResources.add(createStaticResource("org.openbravo.client.kernel/"
+ ApplicationConstants.COMPONENT_TYPE + "/" +
ApplicationConstants.MAIN_LAYOUT_ID, false));
- globalResources.add(createStaticResource("org.openbravo.client.kernel/"
- + ApplicationConstants.COMPONENT_TYPE + "/" +
EntityWindowMappingComponent.COMPONENT_ID,
- false));
globalResources.add(createStaticResource(
"web/org.openbravo.client.application/js/ob-view-manager.js", false));
diff -r 79d70b18309e -r 362dd3d976d6
modules/org.openbravo.client.application/src/org/openbravo/client/application/ParametersActionHandler.java
---
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/ParametersActionHandler.java
Tue Dec 14 10:43:05 2010 +0100
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/ParametersActionHandler.java
Wed Dec 15 16:02:04 2010 +0100
@@ -32,6 +32,7 @@
import org.openbravo.base.model.domaintype.BigDecimalDomainType;
import org.openbravo.base.model.domaintype.DateDomainType;
import org.openbravo.base.model.domaintype.DomainType;
+import org.openbravo.base.model.domaintype.LongDomainType;
import org.openbravo.base.model.domaintype.StringDomainType;
import org.openbravo.base.provider.OBProvider;
import org.openbravo.base.structure.BaseOBObject;
@@ -161,7 +162,8 @@
} else if (domainType.getClass().equals(DateDomainType.class)) {
Date date = xmlDateFormat.parse(stringValue);
parameterValue.setValueDate(date);
- } else if
(domainType.getClass().getSuperclass().equals(BigDecimalDomainType.class)) {
+ } else if
(domainType.getClass().getSuperclass().equals(BigDecimalDomainType.class)
+ || domainType.getClass().equals(LongDomainType.class)) {
parameterValue.setValueNumber(new BigDecimal(stringValue));
} else { // default
parameterValue.setValueString(stringValue);
diff -r 79d70b18309e -r 362dd3d976d6
modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/templates/application-menu.js.ftl
---
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/templates/application-menu.js.ftl
Tue Dec 14 10:43:05 2010 +0100
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/templates/application-menu.js.ftl
Wed Dec 15 16:02:04 2010 +0100
@@ -118,6 +118,9 @@
// overridden to get reliable custom style name
getBaseStyle: function(record, rowNum, colNum){
+ if (!this.getField(colNum)) {
+ return '';
+ }
var name = this.getField(colNum).name;
return this.baseStyle + name.substr(0, 1).toUpperCase() +
name.substr(1) + 'Field';
},
diff -r 79d70b18309e -r 362dd3d976d6
modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/entity-tab-mapping.js.ftl
---
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/entity-tab-mapping.js.ftl
Tue Dec 14 10:43:05 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-/*
- *************************************************************************
- * The contents of this file are subject to the Openbravo Public License
- * Version 1.1 (the "License"), being the Mozilla Public License
- * Version 1.1 with a permitted attribution clause; you may not use this
- * file except in compliance with the License. You may obtain a copy of
- * the License at http://www.openbravo.com/legal/license.html
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
- * License for the specific language governing rights and limitations
- * under the License.
- * The Original Code is Openbravo ERP.
- * The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2010 Openbravo SLU
- * All Rights Reserved.
- * Contributor(s): ______________________________________.
- ************************************************************************
-*/
-
-// creates the mapping from entities to windows/tabs to support direct linking
-OB.EntityToWindowMapping = {
- <#list data.entityWindowMappings as mapping>
- '${mapping.entityName?js_string}': {viewId:
'_${mapping.windowId?js_string}', tabId: '${mapping.tabId?js_string}',
tabTitle: '${mapping.tabTitle?js_string}'}<#if mapping_has_next>,</#if>
- </#list>
-};
-
-OB.EntityToWindowMapping.openView = function(entity, recordId) {
- var mapping = OB.EntityToWindowMapping[entity];
- var openObject;
- if (!mapping) {
- // replace with a translatable warning
- isc.warn(OB.I18N.getLabel('OBUIAPP_NoAccess'), 'OB');
- } else {
- // create shallow copy
- openObject = isc.addProperties({}, mapping);
- // set the record id
- openObject.targetRecordId = recordId;
- openObject.targetEntity = entity;
- OB.Layout.ViewManager.openView(openObject.viewId, openObject);
- }
-};
-
-
diff -r 79d70b18309e -r 362dd3d976d6
modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-field.js.ftl
---
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-field.js.ftl
Tue Dec 14 10:43:05 2010 +0100
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-field.js.ftl
Wed Dec 15 16:02:04 2010 +0100
@@ -24,6 +24,8 @@
<#if fieldDefinition.standardField>
type: '${fieldDefinition.type}',
columnName: '${fieldDefinition.columnName?string}',
+ inpColumnName: '${fieldDefinition.inpColumnName?string}',
+ referencedKeyColumnName:
'${fieldDefinition.referencedKeyColumnName?string}',
required: ${fieldDefinition.required?string},
</#if>
${fieldDefinition.fieldProperties}
diff -r 79d70b18309e -r 362dd3d976d6
modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-grid.js.ftl
---
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-grid.js.ftl
Tue Dec 14 10:43:05 2010 +0100
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-grid.js.ftl
Wed Dec 15 16:02:04 2010 +0100
@@ -27,6 +27,8 @@
, targetEntity: '${field.targetEntity?js_string}'
, title: '${field.title?js_string}'
, showIf: '${field.initialShow?string}'
+ , inpColumnName: '${field.inpColumnName?string}'
+ , referencedKeyColumnName: '${field.referencedKeyColumnName?string}'
}
<#if field_has_next>,</#if>
</#list>
diff -r 79d70b18309e -r 362dd3d976d6
modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-tab.js.ftl
---
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-tab.js.ftl
Tue Dec 14 10:43:05 2010 +0100
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-tab.js.ftl
Wed Dec 15 16:02:04 2010 +0100
@@ -30,6 +30,8 @@
dataSourceId: '${tabComponent.dataSourceId?js_string}',
</#if>
+ defaultEditMode: ${tabComponent.defaultEditMode},
+
customToolbarButtons: [
<#list data.buttonFields as field>
{id: '${field.id?js_string}', title: '${field.label?js_string}'}<#if
field_has_next>,</#if>
diff -r 79d70b18309e -r 362dd3d976d6
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/ComputeSelectedRecordActionHandler.java
---
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/ComputeSelectedRecordActionHandler.java
Tue Dec 14 10:43:05 2010 +0100
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/ComputeSelectedRecordActionHandler.java
Wed Dec 15 16:02:04 2010 +0100
@@ -18,6 +18,7 @@
*/
package org.openbravo.client.application.window;
+import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -26,14 +27,19 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.codehaus.jettison.json.JSONArray;
import org.codehaus.jettison.json.JSONObject;
import org.openbravo.base.exception.OBException;
+import org.openbravo.base.model.Property;
+import org.openbravo.base.structure.BaseOBObject;
import org.openbravo.client.application.MenuManager;
import org.openbravo.client.application.MenuManager.MenuOption;
import org.openbravo.client.kernel.BaseActionHandler;
import org.openbravo.client.kernel.RequestContext;
import org.openbravo.client.kernel.StaticResourceComponent;
import org.openbravo.dal.core.OBContext;
------------------------------------------------------------------------------
Lotusphere 2011
Register now for Lotusphere 2011 and learn how
to connect the dots, take your collaborative environment
to the next level, and enter the era of Social Business.
http://p.sf.net/sfu/lotusphere-d2d
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
