details: https://code.openbravo.com/erp/devel/pi/rev/df2d72114d5f changeset: 16576:df2d72114d5f user: Sandra Huguet <sandra.huguet <at> openbravo.com> date: Wed May 09 13:16:59 2012 +0200 summary: Fixed bug 9866 Warehouse mandatory in Create Purchase Orders in Purchasing Plan
details: https://code.openbravo.com/erp/devel/pi/rev/77280833bda6 changeset: 16577:77280833bda6 user: Naiara Martinez <naiara.martinez <at> openbravo.com> date: Mon May 14 09:31:01 2012 +0200 summary: fixed bug 10758 Change Warehouse Control Report.Add Coalesce in order to get c_project.value when this is not null. If this is null get ''. details: https://code.openbravo.com/erp/devel/pi/rev/20df7cdc3147 changeset: 16578:20df7cdc3147 user: Mikel Irurita <mikel.irurita <at> openbravo.com> date: Fri May 18 14:45:01 2012 +0200 summary: Related to issue 9866: use # for parameter default value diffstat: src-db/database/sourcedata/AD_PROCESS_PARA.xml | 3 ++- src/org/openbravo/erpCommon/ad_reports/ReportWarehouseControl_data.xsql | 10 +++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diffs (54 lines): diff -r 167c68cd47a0 -r 20df7cdc3147 src-db/database/sourcedata/AD_PROCESS_PARA.xml --- a/src-db/database/sourcedata/AD_PROCESS_PARA.xml Fri May 18 14:32:06 2012 +0200 +++ b/src-db/database/sourcedata/AD_PROCESS_PARA.xml Fri May 18 14:45:01 2012 +0200 @@ -3634,8 +3634,9 @@ <!--800053--> <COLUMNNAME><![CDATA[M_Warehouse_ID]]></COLUMNNAME> <!--800053--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED> <!--800053--> <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH> -<!--800053--> <ISMANDATORY><![CDATA[N]]></ISMANDATORY> +<!--800053--> <ISMANDATORY><![CDATA[Y]]></ISMANDATORY> <!--800053--> <ISRANGE><![CDATA[N]]></ISRANGE> +<!--800053--> <DEFAULTVALUE><![CDATA[@#M_Warehouse_ID@]]></DEFAULTVALUE> <!--800053--> <AD_ELEMENT_ID><![CDATA[459]]></AD_ELEMENT_ID> <!--800053--></AD_PROCESS_PARA> diff -r 167c68cd47a0 -r 20df7cdc3147 src/org/openbravo/erpCommon/ad_reports/ReportWarehouseControl_data.xsql --- a/src/org/openbravo/erpCommon/ad_reports/ReportWarehouseControl_data.xsql Fri May 18 14:32:06 2012 +0200 +++ b/src/org/openbravo/erpCommon/ad_reports/ReportWarehouseControl_data.xsql Fri May 18 14:45:01 2012 +0200 @@ -12,7 +12,7 @@ * under the License. * The Original Code is Openbravo ERP. * The Initial Developer of the Original Code is Openbravo SLU - * All portions are Copyright (C) 2001-2010 Openbravo SLU + * All portions are Copyright (C) 2001-2012 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************ @@ -30,23 +30,23 @@ <![CDATA[ SELECT A.DESCRIPTION, M_PRODUCT.NAME AS PRODUCTNAME, SUBSTR(M_ATTRIBUTESETINSTANCE.DESCRIPTION, 2, (LENGTH(M_ATTRIBUTESETINSTANCE.DESCRIPTION)-1)) AS REFERENTIAL, M_TRANSACTION.MOVEMENTDATE, SUM(M_TRANSACTION.MOVEMENTQTY) AS MOVEMENTQTY, A.UBICATION, A.ID, A.INP, C_UOM.NAME AS UOM - FROM (SELECT (M_INOUT.DOCUMENTNO||' '||M_INOUT.MOVEMENTDATE||' '||C_PROJECT.VALUE) AS DESCRIPTION, M_TRANSACTION.M_TRANSACTION_ID, M_INOUT.M_INOUT_ID AS ID, '../'|| (CASE M_INOUT.ISSOTRX WHEN 'Y' THEN 'GoodsShipment' ELSE 'GoodsReceipt' END) || '/' || 'Header_Relation.html' AS UBICATION, 'inpmInoutId' AS INP + FROM (SELECT (M_INOUT.DOCUMENTNO||' '||M_INOUT.MOVEMENTDATE||' '||COALESCE(TO_CHAR(C_PROJECT.VALUE), '')) AS DESCRIPTION, M_TRANSACTION.M_TRANSACTION_ID, M_INOUT.M_INOUT_ID AS ID, '../'|| (CASE M_INOUT.ISSOTRX WHEN 'Y' THEN 'GoodsShipment' ELSE 'GoodsReceipt' END) || '/' || 'Header_Relation.html' AS UBICATION, 'inpmInoutId' AS INP FROM M_TRANSACTION, M_INOUTLINE, M_INOUT left join C_PROJECT on M_INOUT.C_PROJECT_ID = C_PROJECT.C_PROJECT_ID WHERE M_TRANSACTION.M_INOUTLINE_ID = M_INOUTLINE.M_INOUTLINE_ID AND M_INOUTLINE.M_INOUT_ID = M_INOUT.M_INOUT_ID UNION - SELECT (M_PRODUCTION.NAME||' '||M_PRODUCTION.MOVEMENTDATE||' '||C_PROJECT.VALUE) AS DESCRIPTION, M_TRANSACTION.M_TRANSACTION_ID, M_PRODUCTION.M_PRODUCTION_ID AS ID, '../BillofMaterialsProduction/BOMProduction_Edition.html' AS UBICATION, 'inpmProductionId' AS INP + SELECT (M_PRODUCTION.NAME||' '||M_PRODUCTION.MOVEMENTDATE||' '||COALESCE(TO_CHAR(C_PROJECT.VALUE), '')) AS DESCRIPTION, M_TRANSACTION.M_TRANSACTION_ID, M_PRODUCTION.M_PRODUCTION_ID AS ID, '../BillofMaterialsProduction/BOMProduction_Edition.html' AS UBICATION, 'inpmProductionId' AS INP FROM M_TRANSACTION, M_PRODUCTIONLINE, M_PRODUCTIONPLAN, M_PRODUCTION left join C_PROJECT on M_PRODUCTION.C_PROJECT_ID = C_PROJECT.C_PROJECT_ID WHERE M_TRANSACTION.M_PRODUCTIONLINE_ID = M_PRODUCTIONLINE.M_PRODUCTIONLINE_ID AND M_PRODUCTIONLINE.M_PRODUCTIONPLAN_ID = M_PRODUCTIONPLAN.M_PRODUCTIONPLAN_ID AND M_PRODUCTIONPLAN.M_PRODUCTION_ID = M_PRODUCTION.M_PRODUCTION_ID UNION - SELECT (M_INVENTORY.NAME||' '||M_INVENTORY.MOVEMENTDATE||' '||C_PROJECT.VALUE) AS DESCRIPTION, M_TRANSACTION.M_TRANSACTION_ID, M_INVENTORY.M_INVENTORY_ID AS ID, '../PhysicalInventory/Header_Edition.html' AS UBICATION, 'inpmInventoryId' AS INP + SELECT (M_INVENTORY.NAME||' '||M_INVENTORY.MOVEMENTDATE||' '||COALESCE(TO_CHAR(C_PROJECT.VALUE), '')) AS DESCRIPTION, M_TRANSACTION.M_TRANSACTION_ID, M_INVENTORY.M_INVENTORY_ID AS ID, '../PhysicalInventory/Header_Edition.html' AS UBICATION, 'inpmInventoryId' AS INP FROM M_TRANSACTION, M_INVENTORYLINE, M_INVENTORY left join C_PROJECT on M_INVENTORY.C_PROJECT_ID = C_PROJECT.C_PROJECT_ID WHERE M_TRANSACTION.M_INVENTORYLINE_ID = M_INVENTORYLINE.M_INVENTORYLINE_ID AND M_INVENTORYLINE.M_INVENTORY_ID = M_INVENTORY.M_INVENTORY_ID UNION - SELECT (M_MOVEMENT.NAME||' '||M_MOVEMENT.MOVEMENTDATE||' '||C_PROJECT.VALUE) AS DESCRIPTION, M_TRANSACTION.M_TRANSACTION_ID, M_MOVEMENT.M_MOVEMENT_ID AS ID, '../GoodsMovements/Header_Edition.html' AS UBICATION, 'inpmMovementId' AS INP + SELECT (M_MOVEMENT.NAME||' '||M_MOVEMENT.MOVEMENTDATE||' '||COALESCE(TO_CHAR(C_PROJECT.VALUE), '')) AS DESCRIPTION, M_TRANSACTION.M_TRANSACTION_ID, M_MOVEMENT.M_MOVEMENT_ID AS ID, '../GoodsMovements/Header_Edition.html' AS UBICATION, 'inpmMovementId' AS INP FROM M_TRANSACTION, M_MOVEMENTLINE, M_MOVEMENT left join C_PROJECT on M_MOVEMENT.C_PROJECT_ID = C_PROJECT.C_PROJECT_ID WHERE M_TRANSACTION.M_MOVEMENTLINE_ID = M_MOVEMENTLINE.M_MOVEMENTLINE_ID AND M_MOVEMENTLINE.M_MOVEMENT_ID = M_MOVEMENT.M_MOVEMENT_ID) A, M_TRANSACTION, M_PRODUCT, M_ATTRIBUTESETINSTANCE, C_UOM ------------------------------------------------------------------------------ Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
