details: https://code.openbravo.com/erp/devel/pi/rev/f70eb0ef28f6
changeset: 13665:f70eb0ef28f6
user: Miguel A. Alsasua <miguel.alsasua <at> openbravo.com>
date: Tue Sep 06 17:39:44 2011 +0200
summary: changes in sheet report widget
diffstat:
modules/org.openbravo.client.widgets/src-db/database/sourcedata/OBCQL_QUERY_COLUMN.xml
| 6 +++---
modules/org.openbravo.client.widgets/src-db/database/sourcedata/OBCQL_WIDGET_QUERY.xml
| 5 +++--
modules/org.openbravo.client.widgets/src-db/database/sourcedata/OBKMO_WIDGET_CLASS.xml
| 2 +-
modules/org.openbravo.client.widgets/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml
| 2 +-
4 files changed, 8 insertions(+), 7 deletions(-)
diffs (72 lines):
diff -r 54ed9a0b2c83 -r f70eb0ef28f6
modules/org.openbravo.client.widgets/src-db/database/sourcedata/OBCQL_QUERY_COLUMN.xml
---
a/modules/org.openbravo.client.widgets/src-db/database/sourcedata/OBCQL_QUERY_COLUMN.xml
Tue Sep 06 12:08:54 2011 +0200
+++
b/modules/org.openbravo.client.widgets/src-db/database/sourcedata/OBCQL_QUERY_COLUMN.xml
Tue Sep 06 17:39:44 2011 +0200
@@ -91,7 +91,7 @@
<!--A7F9DA78BB164108B69479709BEE41A3-->
<OBCQL_QUERY_COLUMN_ID><![CDATA[A7F9DA78BB164108B69479709BEE41A3]]></OBCQL_QUERY_COLUMN_ID>
<!--A7F9DA78BB164108B69479709BEE41A3-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
<!--A7F9DA78BB164108B69479709BEE41A3--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--A7F9DA78BB164108B69479709BEE41A3--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--A7F9DA78BB164108B69479709BEE41A3--> <ISACTIVE><![CDATA[N]]></ISACTIVE>
<!--A7F9DA78BB164108B69479709BEE41A3-->
<OBCQL_WIDGET_QUERY_ID><![CDATA[D2003CD3F9984BF39457BA1F2FFF01C9]]></OBCQL_WIDGET_QUERY_ID>
<!--A7F9DA78BB164108B69479709BEE41A3-->
<DISPLAY_EXPRESSION><![CDATA[processed]]></DISPLAY_EXPRESSION>
<!--A7F9DA78BB164108B69479709BEE41A3--> <NAME><![CDATA[Processed]]></NAME>
@@ -147,7 +147,7 @@
<!--D3C5848B4225429A90B63B888EA5E1C6-->
<LINK_EXPRESSION><![CDATA[productId]]></LINK_EXPRESSION>
<!--D3C5848B4225429A90B63B888EA5E1C6--> <SEQNO><![CDATA[40]]></SEQNO>
<!--D3C5848B4225429A90B63B888EA5E1C6-->
<AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
-<!--D3C5848B4225429A90B63B888EA5E1C6--> <INCLUDE_IN><![CDATA[W]]></INCLUDE_IN>
+<!--D3C5848B4225429A90B63B888EA5E1C6--> <INCLUDE_IN><![CDATA[M]]></INCLUDE_IN>
<!--D3C5848B4225429A90B63B888EA5E1C6--> <HAS_LINK><![CDATA[Y]]></HAS_LINK>
<!--D3C5848B4225429A90B63B888EA5E1C6--> <AD_TAB_ID><![CDATA[180]]></AD_TAB_ID>
<!--D3C5848B4225429A90B63B888EA5E1C6-->
<CAN_BE_FILTERED><![CDATA[N]]></CAN_BE_FILTERED>
@@ -165,7 +165,7 @@
<!--E4755A4156FE4E87AFC771FDCE3F9A0B-->
<LINK_EXPRESSION><![CDATA[projectId]]></LINK_EXPRESSION>
<!--E4755A4156FE4E87AFC771FDCE3F9A0B--> <SEQNO><![CDATA[70]]></SEQNO>
<!--E4755A4156FE4E87AFC771FDCE3F9A0B-->
<AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
-<!--E4755A4156FE4E87AFC771FDCE3F9A0B--> <INCLUDE_IN><![CDATA[M]]></INCLUDE_IN>
+<!--E4755A4156FE4E87AFC771FDCE3F9A0B--> <INCLUDE_IN><![CDATA[W]]></INCLUDE_IN>
<!--E4755A4156FE4E87AFC771FDCE3F9A0B--> <HAS_LINK><![CDATA[Y]]></HAS_LINK>
<!--E4755A4156FE4E87AFC771FDCE3F9A0B--> <AD_TAB_ID><![CDATA[157]]></AD_TAB_ID>
<!--E4755A4156FE4E87AFC771FDCE3F9A0B-->
<CAN_BE_FILTERED><![CDATA[N]]></CAN_BE_FILTERED>
diff -r 54ed9a0b2c83 -r f70eb0ef28f6
modules/org.openbravo.client.widgets/src-db/database/sourcedata/OBCQL_WIDGET_QUERY.xml
---
a/modules/org.openbravo.client.widgets/src-db/database/sourcedata/OBCQL_WIDGET_QUERY.xml
Tue Sep 06 12:08:54 2011 +0200
+++
b/modules/org.openbravo.client.widgets/src-db/database/sourcedata/OBCQL_WIDGET_QUERY.xml
Tue Sep 06 17:39:44 2011 +0200
@@ -40,11 +40,12 @@
LEFT JOIN tel.project as p,
ADUser as u
where (month(current_date()) = month(tel.expenseDate) or
(month(current_date()) = month(tel.expenseSheet.reportDate) and tel.expenseDate
= null))
- and tel.timeSheet = 'Y'
+ and (year(current_date()) = year(tel.expenseDate) or
(year(current_date()) = year(tel.expenseSheet.reportDate) and tel.expenseDate =
null))
+ and tel.timeSheet = 'Y'
and tel.client.id=:client
and tel.expenseSheet.businessPartner=u.businessPartner
and u.id=:user
-order by tel.expenseSheet.documentNo]]></HQL>
+order by tel.expenseSheet.reportDate, tel.expenseSheet.documentNo]]></HQL>
<!--D2003CD3F9984BF39457BA1F2FFF01C9--></OBCQL_WIDGET_QUERY>
</data>
diff -r 54ed9a0b2c83 -r f70eb0ef28f6
modules/org.openbravo.client.widgets/src-db/database/sourcedata/OBKMO_WIDGET_CLASS.xml
---
a/modules/org.openbravo.client.widgets/src-db/database/sourcedata/OBKMO_WIDGET_CLASS.xml
Tue Sep 06 12:08:54 2011 +0200
+++
b/modules/org.openbravo.client.widgets/src-db/database/sourcedata/OBKMO_WIDGET_CLASS.xml
Tue Sep 06 17:39:44 2011 +0200
@@ -117,7 +117,7 @@
<!--862EEC18D6FC4FA68E7867E3CF337CC7--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--862EEC18D6FC4FA68E7867E3CF337CC7-->
<AD_MODULE_ID><![CDATA[FF8080812D842086012D844F3CC0003E]]></AD_MODULE_ID>
<!--862EEC18D6FC4FA68E7867E3CF337CC7--> <TITLE><![CDATA[My Current
Timesheets]]></TITLE>
-<!--862EEC18D6FC4FA68E7867E3CF337CC7--> <HEIGHT><![CDATA[500]]></HEIGHT>
+<!--862EEC18D6FC4FA68E7867E3CF337CC7--> <HEIGHT><![CDATA[600]]></HEIGHT>
<!--862EEC18D6FC4FA68E7867E3CF337CC7--> <DESCRIPTION><![CDATA[List of
timesheets entered for the current month.]]></DESCRIPTION>
<!--862EEC18D6FC4FA68E7867E3CF337CC7-->
<ALLOW_ANONYMOUS_ACCESS><![CDATA[N]]></ALLOW_ANONYMOUS_ACCESS>
<!--862EEC18D6FC4FA68E7867E3CF337CC7-->
<ISSUPERCLASS><![CDATA[N]]></ISSUPERCLASS>
diff -r 54ed9a0b2c83 -r f70eb0ef28f6
modules/org.openbravo.client.widgets/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml
---
a/modules/org.openbravo.client.widgets/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml
Tue Sep 06 12:08:54 2011 +0200
+++
b/modules/org.openbravo.client.widgets/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml
Tue Sep 06 17:39:44 2011 +0200
@@ -245,7 +245,7 @@
<!--D57E85EA046B475C94EEE74A9CF67C78-->
<ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
<!--D57E85EA046B475C94EEE74A9CF67C78-->
<FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
<!--D57E85EA046B475C94EEE74A9CF67C78-->
<ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
-<!--D57E85EA046B475C94EEE74A9CF67C78-->
<DEFAULTVALUE><![CDATA[false]]></DEFAULTVALUE>
+<!--D57E85EA046B475C94EEE74A9CF67C78-->
<DEFAULTVALUE><![CDATA[true]]></DEFAULTVALUE>
<!--D57E85EA046B475C94EEE74A9CF67C78-->
<AD_ELEMENT_ID><![CDATA[9C7735D7BEC33C9EE040A8C0EB06271C]]></AD_ELEMENT_ID>
<!--D57E85EA046B475C94EEE74A9CF67C78--> <ISFIXED><![CDATA[N]]></ISFIXED>
<!--D57E85EA046B475C94EEE74A9CF67C78-->
<EVALUATEFIXEDVALUE><![CDATA[N]]></EVALUATEFIXEDVALUE>
------------------------------------------------------------------------------
Special Offer -- Download ArcSight Logger for FREE!
Finally, a world-class log management solution at an even better
price-free! And you'll get a free "Love Thy Logs" t-shirt when you
download Logger. Secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsisghtdev2dev
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
