details: /erp/devel/pi/rev/0ee185c69279
changeset: 10354:0ee185c69279
user: Pablo Sarobe <pablo.sarobe <at> openbravo.com>
date: Thu Feb 03 11:40:16 2011 +0100
summary: Adding org for widget Pending goods receipt
diffstat:
modules/org.openbravo.client.querylist/src-db/database/sourcedata/OBCQL_QUERY_COLUMN.xml
| 17 +++
modules/org.openbravo.client.querylist/src-db/database/sourcedata/OBCQL_WIDGET_QUERY.xml
| 44 +---------
modules/org.openbravo.client.querylist/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml
| 41 +++++++++
3 files changed, 60 insertions(+), 42 deletions(-)
diffs (146 lines):
diff -r 79ab4a6052e9 -r 0ee185c69279
modules/org.openbravo.client.querylist/src-db/database/sourcedata/OBCQL_QUERY_COLUMN.xml
---
a/modules/org.openbravo.client.querylist/src-db/database/sourcedata/OBCQL_QUERY_COLUMN.xml
Thu Feb 03 11:32:22 2011 +0100
+++
b/modules/org.openbravo.client.querylist/src-db/database/sourcedata/OBCQL_QUERY_COLUMN.xml
Thu Feb 03 11:40:16 2011 +0100
@@ -386,6 +386,23 @@
<!--7EFCCE042B4841D0B9377B54F11973E7-->
<WHERECLAUSE_LEFT_PART><![CDATA[inv.daysTillDue]]></WHERECLAUSE_LEFT_PART>
<!--7EFCCE042B4841D0B9377B54F11973E7--></OBCQL_QUERY_COLUMN>
+<!--837952B858F447D0965FFA2B7DE2476A--><OBCQL_QUERY_COLUMN>
+<!--837952B858F447D0965FFA2B7DE2476A-->
<OBCQL_QUERY_COLUMN_ID><![CDATA[837952B858F447D0965FFA2B7DE2476A]]></OBCQL_QUERY_COLUMN_ID>
+<!--837952B858F447D0965FFA2B7DE2476A-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--837952B858F447D0965FFA2B7DE2476A--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--837952B858F447D0965FFA2B7DE2476A--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--837952B858F447D0965FFA2B7DE2476A-->
<OBCQL_WIDGET_QUERY_ID><![CDATA[F5DEE669DD8047FB831A12064BB277BE]]></OBCQL_WIDGET_QUERY_ID>
+<!--837952B858F447D0965FFA2B7DE2476A-->
<DISPLAY_EXPRESSION><![CDATA[organizationName]]></DISPLAY_EXPRESSION>
+<!--837952B858F447D0965FFA2B7DE2476A--> <NAME><![CDATA[Organization]]></NAME>
+<!--837952B858F447D0965FFA2B7DE2476A--> <WIDTH><![CDATA[30]]></WIDTH>
+<!--837952B858F447D0965FFA2B7DE2476A--> <SEQNO><![CDATA[5]]></SEQNO>
+<!--837952B858F447D0965FFA2B7DE2476A-->
<AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
+<!--837952B858F447D0965FFA2B7DE2476A--> <INCLUDE_IN><![CDATA[M]]></INCLUDE_IN>
+<!--837952B858F447D0965FFA2B7DE2476A--> <HAS_LINK><![CDATA[N]]></HAS_LINK>
+<!--837952B858F447D0965FFA2B7DE2476A-->
<CAN_BE_FILTERED><![CDATA[Y]]></CAN_BE_FILTERED>
+<!--837952B858F447D0965FFA2B7DE2476A-->
<WHERECLAUSE_LEFT_PART><![CDATA[ol.salesOrder.organization.name]]></WHERECLAUSE_LEFT_PART>
+<!--837952B858F447D0965FFA2B7DE2476A--></OBCQL_QUERY_COLUMN>
+
<!--879667D64C66466297E4113CBABEACA5--><OBCQL_QUERY_COLUMN>
<!--879667D64C66466297E4113CBABEACA5-->
<OBCQL_QUERY_COLUMN_ID><![CDATA[879667D64C66466297E4113CBABEACA5]]></OBCQL_QUERY_COLUMN_ID>
<!--879667D64C66466297E4113CBABEACA5-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r 79ab4a6052e9 -r 0ee185c69279
modules/org.openbravo.client.querylist/src-db/database/sourcedata/OBCQL_WIDGET_QUERY.xml
---
a/modules/org.openbravo.client.querylist/src-db/database/sourcedata/OBCQL_WIDGET_QUERY.xml
Thu Feb 03 11:32:22 2011 +0100
+++
b/modules/org.openbravo.client.querylist/src-db/database/sourcedata/OBCQL_WIDGET_QUERY.xml
Thu Feb 03 11:40:16 2011 +0100
@@ -6,23 +6,7 @@
<!--1EF87E8E961A4E5BA3B41E1AB772B47C--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--1EF87E8E961A4E5BA3B41E1AB772B47C--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--1EF87E8E961A4E5BA3B41E1AB772B47C-->
<OBKMO_WIDGET_CLASS_ID><![CDATA[147D825456D54D0486C3D7072531C5C9]]></OBKMO_WIDGET_CLASS_ID>
-<!--1EF87E8E961A4E5BA3B41E1AB772B47C--> <HQL><![CDATA[select inv.id as
invoiceId, inv.documentNo as documentNo,
- inv.businessPartner.id as businessPartnerId, inv.businessPartner.name
as businessPartnerName,
- inv.invoiceDate as invoiceDate, inv.grandTotalAmount as
grandTotalAmount,
- inv.currency.iSOCode as currency, inv.paymentTerms.name as paymentTerms,
- inv.outstandingAmount as outstandingAmount, inv.daysTillDue as
daysTillDue,
- inv.dueAmount as dueAmount, inv.organization.name as organizationName
-from Invoice as inv
-where inv.businessPartner.name like :businessPartnerName
- and inv.documentNo like :documentNo
- and inv.processed = true
- and inv.paymentComplete = false
- and inv.salesTransaction = true
- and inv.client.id = :client
- and inv.organization.id in (:organizationList)
- and inv.organization.name like :organizationName
- and @optional_filters@
-order by inv.invoiceDate]]></HQL>
+<!--1EF87E8E961A4E5BA3B41E1AB772B47C--> <HQL><![CDATA[select inv.id as
invoiceId, inv.documentNo as documentNo, inv.businessPartner.id as
businessPartnerId, inv.businessPartner.name as businessPartnerName,
inv.invoiceDate as invoiceDate, inv.grandTotalAmount as grandTotalAmount,
inv.currency.iSOCode as currency, inv.paymentTerms.name as paymentTerms,
inv.outstandingAmount as outstandingAmount, inv.daysTillDue as daysTillDue,
inv.dueAmount as dueAmount, inv.organization.name as organizationName from
Invoice as inv where inv.businessPartner.name like :businessPartnerName
and inv.documentNo like :documentNo and inv.processed = true and
inv.paymentComplete = false and inv.salesTransaction = true and
inv.client.id = :client and inv.organization.id in (:organizationList)
and inv.organization.name like :organizationName and
@optional_filters@ order by inv.invoiceDate]]></HQL>
<!--1EF87E8E961A4E5BA3B41E1AB772B47C--></OBCQL_WIDGET_QUERY>
<!--58BCB96595FA45678CC1423402238309--><OBCQL_WIDGET_QUERY>
@@ -79,31 +63,7 @@
<!--F5DEE669DD8047FB831A12064BB277BE--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--F5DEE669DD8047FB831A12064BB277BE--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--F5DEE669DD8047FB831A12064BB277BE-->
<OBKMO_WIDGET_CLASS_ID><![CDATA[8267FB3F59D7401980DDDEFF51FE55C3]]></OBKMO_WIDGET_CLASS_ID>
-<!--F5DEE669DD8047FB831A12064BB277BE--> <HQL><![CDATA[select ol.salesOrder.id
as orderId, ol.salesOrder.orderDate as dateordered,
ol.salesOrder.scheduledDeliveryDate as plannedDeliveryDate,
-ol.salesOrder.documentNo as salesorder, ol.salesOrder.businessPartner.name as
bpartner,
-ol.product.name as productname, ol.attributeSetValue.description as attribute,
ol.uOM.name as uom,
-ol.orderedQuantity as totalqty,
- (select coalesce(sum(po.quantity),0)
- from ProcurementPOInvoiceMatch po
- where po.goodsShipmentLine is not null
- and po.salesOrderLine = ol) as qtyReceived,
- (select ol.orderedQuantity-coalesce(sum(po2.quantity),0) from
ProcurementPOInvoiceMatch po2
- where po2.goodsShipmentLine is not null
- and po2.salesOrderLine = ol) as qtyPending
-from OrderLine as ol left join ol.attributeSetValue
-where ol.client.id =:client
-and ol.salesOrder.documentStatus='CO'
-and ol.salesOrder.salesTransaction=false
-and ol.orderedQuantity <> (select coalesce(sum(po3.quantity),0)
- from ProcurementPOInvoiceMatch po3
- where po3.goodsShipmentLine is not null
- and po3.salesOrderLine = ol)
-and ol.salesOrder.scheduledDeliveryDate<=now()
-and ol.product.name like :productname
-and ol.salesOrder.businessPartner.name like :suppliername
-and ol.salesOrder.documentNo like :documentno
-and @optional_filters@
-order by ol.salesOrder.scheduledDeliveryDate, ol.salesOrder.documentNo]]></HQL>
+<!--F5DEE669DD8047FB831A12064BB277BE--> <HQL><![CDATA[select ol.salesOrder.id
as orderId, ol.salesOrder.organization.name as organizationName,
ol.salesOrder.orderDate as dateordered, ol.salesOrder.scheduledDeliveryDate as
plannedDeliveryDate, ol.salesOrder.documentNo as salesorder,
ol.salesOrder.businessPartner.name as bpartner, ol.product.name as productname,
ol.attributeSetValue.description as attribute, ol.uOM.name as uom,
ol.orderedQuantity as totalqty, (select coalesce(sum(po.quantity),0)
from ProcurementPOInvoiceMatch po where po.goodsShipmentLine is not null
and po.salesOrderLine = ol) as qtyReceived, (select
ol.orderedQuantity-coalesce(sum(po2.quantity),0) from ProcurementPOInvoiceMatch
po2 where po2.goodsShipmentLine is not null and po2.salesOrderLine =
ol) as qtyPending from OrderLine as ol left join ol.attributeSetValue where
ol.salesOrder.client.id =:client and ol.salesOrder.organization.id in
(:organizationList) and ol.salesOrder.documentStatus='CO' and
ol.salesOrder.salesTransaction=false and ol.orderedQuantity <> (select
coalesce(sum(po3.quantity),0) from
ProcurementPOInvoiceMatch po3 where
po3.goodsShipmentLine is not null and
po3.salesOrderLine = ol) and ol.salesOrder.scheduledDeliveryDate<=now() and
ol.product.name like :productname and ol.salesOrder.businessPartner.name like
:suppliername and ol.salesOrder.documentNo like :documentno and
ol.salesOrder.organization.name like :organizationName and @optional_filters@
order by ol.salesOrder.scheduledDeliveryDate, ol.salesOrder.documentNo]]></HQL>
<!--F5DEE669DD8047FB831A12064BB277BE--></OBCQL_WIDGET_QUERY>
<!--F94AEB4680AD4AD48255071903000A43--><OBCQL_WIDGET_QUERY>
diff -r 79ab4a6052e9 -r 0ee185c69279
modules/org.openbravo.client.querylist/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml
---
a/modules/org.openbravo.client.querylist/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml
Thu Feb 03 11:32:22 2011 +0100
+++
b/modules/org.openbravo.client.querylist/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml
Thu Feb 03 11:40:16 2011 +0100
@@ -455,6 +455,27 @@
<!--A0A9C9C09E3E4B3FB139B336B142318C-->
<EM_OBKMO_WIDGET_CLASS_ID><![CDATA[2662490B7D3B4F80AF308C88F6DB68C0]]></EM_OBKMO_WIDGET_CLASS_ID>
<!--A0A9C9C09E3E4B3FB139B336B142318C--></OBUIAPP_PARAMETER>
+<!--A25B44403B41453EB74662BE7CADE8E6--><OBUIAPP_PARAMETER>
+<!--A25B44403B41453EB74662BE7CADE8E6-->
<OBUIAPP_PARAMETER_ID><![CDATA[A25B44403B41453EB74662BE7CADE8E6]]></OBUIAPP_PARAMETER_ID>
+<!--A25B44403B41453EB74662BE7CADE8E6-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--A25B44403B41453EB74662BE7CADE8E6--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--A25B44403B41453EB74662BE7CADE8E6--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--A25B44403B41453EB74662BE7CADE8E6-->
<AD_MODULE_ID><![CDATA[0A060B2AF1974E8EAA8DB61388E9AECC]]></AD_MODULE_ID>
+<!--A25B44403B41453EB74662BE7CADE8E6--> <NAME><![CDATA[Organization]]></NAME>
+<!--A25B44403B41453EB74662BE7CADE8E6--> <HELP><![CDATA[An organization is a
unit of your client or legal entity - examples are store, department. You can
share data between organizations.]]></HELP>
+<!--A25B44403B41453EB74662BE7CADE8E6--> <SEQNO><![CDATA[15]]></SEQNO>
+<!--A25B44403B41453EB74662BE7CADE8E6-->
<AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
+<!--A25B44403B41453EB74662BE7CADE8E6-->
<COLUMNNAME><![CDATA[organizationName]]></COLUMNNAME>
+<!--A25B44403B41453EB74662BE7CADE8E6-->
<ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--A25B44403B41453EB74662BE7CADE8E6-->
<FIELDLENGTH><![CDATA[60]]></FIELDLENGTH>
+<!--A25B44403B41453EB74662BE7CADE8E6-->
<ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--A25B44403B41453EB74662BE7CADE8E6-->
<DEFAULTVALUE><![CDATA[%]]></DEFAULTVALUE>
+<!--A25B44403B41453EB74662BE7CADE8E6-->
<AD_ELEMENT_ID><![CDATA[113]]></AD_ELEMENT_ID>
+<!--A25B44403B41453EB74662BE7CADE8E6--> <ISFIXED><![CDATA[N]]></ISFIXED>
+<!--A25B44403B41453EB74662BE7CADE8E6-->
<EVALUATEFIXEDVALUE><![CDATA[N]]></EVALUATEFIXEDVALUE>
+<!--A25B44403B41453EB74662BE7CADE8E6-->
<EM_OBKMO_WIDGET_CLASS_ID><![CDATA[8267FB3F59D7401980DDDEFF51FE55C3]]></EM_OBKMO_WIDGET_CLASS_ID>
+<!--A25B44403B41453EB74662BE7CADE8E6--></OBUIAPP_PARAMETER>
+
<!--A7A63C2BB6114D999FE017B516FEF6BD--><OBUIAPP_PARAMETER>
<!--A7A63C2BB6114D999FE017B516FEF6BD-->
<OBUIAPP_PARAMETER_ID><![CDATA[A7A63C2BB6114D999FE017B516FEF6BD]]></OBUIAPP_PARAMETER_ID>
<!--A7A63C2BB6114D999FE017B516FEF6BD-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -700,6 +721,26 @@
<!--E5824A3DCC9D475EAC49D01BAB9A94C9-->
<EM_OBKMO_WIDGET_CLASS_ID><![CDATA[34F279BBB85945519DC38F21573106C0]]></EM_OBKMO_WIDGET_CLASS_ID>
<!--E5824A3DCC9D475EAC49D01BAB9A94C9--></OBUIAPP_PARAMETER>
+<!--E5EE883287774E28AC9621D70CCF50DB--><OBUIAPP_PARAMETER>
+<!--E5EE883287774E28AC9621D70CCF50DB-->
<OBUIAPP_PARAMETER_ID><![CDATA[E5EE883287774E28AC9621D70CCF50DB]]></OBUIAPP_PARAMETER_ID>
+<!--E5EE883287774E28AC9621D70CCF50DB-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--E5EE883287774E28AC9621D70CCF50DB--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--E5EE883287774E28AC9621D70CCF50DB--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--E5EE883287774E28AC9621D70CCF50DB-->
<AD_MODULE_ID><![CDATA[0A060B2AF1974E8EAA8DB61388E9AECC]]></AD_MODULE_ID>
+<!--E5EE883287774E28AC9621D70CCF50DB--> <NAME><![CDATA[Organization
List]]></NAME>
+<!--E5EE883287774E28AC9621D70CCF50DB--> <SEQNO><![CDATA[100]]></SEQNO>
+<!--E5EE883287774E28AC9621D70CCF50DB-->
<AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
+<!--E5EE883287774E28AC9621D70CCF50DB-->
<COLUMNNAME><![CDATA[organizationList]]></COLUMNNAME>
+<!--E5EE883287774E28AC9621D70CCF50DB-->
<ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--E5EE883287774E28AC9621D70CCF50DB-->
<FIELDLENGTH><![CDATA[0]]></FIELDLENGTH>
+<!--E5EE883287774E28AC9621D70CCF50DB-->
<ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--E5EE883287774E28AC9621D70CCF50DB-->
<AD_ELEMENT_ID><![CDATA[478]]></AD_ELEMENT_ID>
+<!--E5EE883287774E28AC9621D70CCF50DB--> <ISFIXED><![CDATA[Y]]></ISFIXED>
+<!--E5EE883287774E28AC9621D70CCF50DB-->
<FIXEDVALUE><![CDATA[OB.getContext().getReadableOrganizations()]]></FIXEDVALUE>
+<!--E5EE883287774E28AC9621D70CCF50DB-->
<EVALUATEFIXEDVALUE><![CDATA[Y]]></EVALUATEFIXEDVALUE>
+<!--E5EE883287774E28AC9621D70CCF50DB-->
<EM_OBKMO_WIDGET_CLASS_ID><![CDATA[8267FB3F59D7401980DDDEFF51FE55C3]]></EM_OBKMO_WIDGET_CLASS_ID>
+<!--E5EE883287774E28AC9621D70CCF50DB--></OBUIAPP_PARAMETER>
+
<!--F2D289D700814FB7B4E1F746A1C0C101--><OBUIAPP_PARAMETER>
<!--F2D289D700814FB7B4E1F746A1C0C101-->
<OBUIAPP_PARAMETER_ID><![CDATA[F2D289D700814FB7B4E1F746A1C0C101]]></OBUIAPP_PARAMETER_ID>
<!--F2D289D700814FB7B4E1F746A1C0C101-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
------------------------------------------------------------------------------
Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)!
Finally, a world-class log management solution at an even better price-free!
Download using promo code Free_Logger_4_Dev2Dev. Offer expires
February 28th, so secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsight-sfd2d
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
