details: https://code.openbravo.com/erp/devel/pi/rev/89c732520bab changeset: 25187:89c732520bab user: Reinaldo Guerra <reinaldo.guerra <at> peoplewalking.com> date: Tue Oct 28 22:56:37 2014 -0500 summary: Fixed bug 27871: UOM is not taking the user language in requisition to order.
Requisition to order manual form xsql query was changed to obtain translated unit and secondary unit fields using AD_COLUMN_IDENTIFIER function. Now UOM of processed requisitions are translated to selected system language in Requisition to Order window. details: https://code.openbravo.com/erp/devel/pi/rev/ee16efd88b66 changeset: 25188:ee16efd88b66 user: Reinaldo Guerra <reinaldo.guerra <at> peoplewalking.com> date: Wed Oct 29 14:07:39 2014 -0500 summary: Fixed bug 27782: Message refering invoice when unprocessing an expense sheet. Error message when unprocessing an expense sheet and there is a purchase invoice created for this document has been changed to refer purchase invoice flow instead of sales order. This message is used only in process/unprocess Expense Sheet stored procedure. diffstat: src-db/database/sourcedata/AD_MESSAGE.xml | 2 +- src/org/openbravo/erpCommon/ad_forms/RequisitionToOrder_data.xsql | 16 +++++++-- 2 files changed, 13 insertions(+), 5 deletions(-) diffs (73 lines): diff -r cb2863024046 -r ee16efd88b66 src-db/database/sourcedata/AD_MESSAGE.xml --- a/src-db/database/sourcedata/AD_MESSAGE.xml Fri Nov 07 13:28:47 2014 +0100 +++ b/src-db/database/sourcedata/AD_MESSAGE.xml Wed Oct 29 14:07:39 2014 -0500 @@ -23911,7 +23911,7 @@ <!--C6DE79E703C743D7B0BF88E03EE2F742--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--C6DE79E703C743D7B0BF88E03EE2F742--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--C6DE79E703C743D7B0BF88E03EE2F742--> <VALUE><![CDATA[DocumentAssociated]]></VALUE> -<!--C6DE79E703C743D7B0BF88E03EE2F742--> <MSGTEXT><![CDATA[Sales Order has been already booked for the document]]></MSGTEXT> +<!--C6DE79E703C743D7B0BF88E03EE2F742--> <MSGTEXT><![CDATA[Purchase Invoice has been already booked for the document]]></MSGTEXT> <!--C6DE79E703C743D7B0BF88E03EE2F742--> <MSGTYPE><![CDATA[E]]></MSGTYPE> <!--C6DE79E703C743D7B0BF88E03EE2F742--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> <!--C6DE79E703C743D7B0BF88E03EE2F742--> <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N> diff -r cb2863024046 -r ee16efd88b66 src/org/openbravo/erpCommon/ad_forms/RequisitionToOrder_data.xsql --- a/src/org/openbravo/erpCommon/ad_forms/RequisitionToOrder_data.xsql Fri Nov 07 13:28:47 2014 +0100 +++ b/src/org/openbravo/erpCommon/ad_forms/RequisitionToOrder_data.xsql Wed Oct 29 14:07:39 2014 -0500 @@ -48,7 +48,9 @@ <![CDATA[ SELECT M_REQUISITIONLINE_ID, M_REQUISITIONLINE.NEEDBYDATE, M_REQUISITIONLINE.QTY - M_REQUISITIONLINE.ORDEREDQTY AS QTYTOORDER, - QUANTITYORDER, C_UOM1.NAME AS SECUOMNAME, C_UOM.NAME AS UOMNAME, + QUANTITYORDER, + AD_COLUMN_IDENTIFIER(to_char('C_Uom'), to_char(C_UOM1.C_UOM_ID), ?) AS SECUOMNAME, + AD_COLUMN_IDENTIFIER(to_char('C_Uom'), to_char(C_UOM.C_UOM_ID), ?) AS UOMNAME, CASE WHEN pl.istaxincluded = 'Y' THEN M_REQUISITIONLINE.GROSS_UNIT_PRICE ELSE M_REQUISITIONLINE.PRICEACTUAL END AS PRICE, AD_COLUMN_IDENTIFIER(to_char('C_BPartner'), to_char(COALESCE(M_REQUISITIONLINE.C_BPARTNER_ID, M_REQUISITION.C_BPARTNER_ID)), ?) AS VENDOR, AD_COLUMN_IDENTIFIER(to_char('M_PriceList'), to_char(COALESCE(M_REQUISITIONLINE.M_PRICELIST_ID, M_REQUISITION.M_PRICELIST_ID)), ?) AS PRICELISTID, @@ -69,7 +71,7 @@ AND M_REQUISITIONLINE.AD_ORG_ID IN ('1') AND 1=1 GROUP BY M_REQUISITIONLINE.M_REQUISITIONLINE_ID, M_REQUISITIONLINE.NEEDBYDATE, M_REQUISITIONLINE.QTY, M_REQUISITIONLINE.ORDEREDQTY, - QUANTITYORDER, C_UOM1.NAME, C_UOM.NAME, pl.istaxincluded, M_REQUISITIONLINE.GROSS_UNIT_PRICE, M_REQUISITIONLINE.PRICEACTUAL, + QUANTITYORDER, C_UOM1.C_UOM_ID, C_UOM.C_UOM_ID, pl.istaxincluded, M_REQUISITIONLINE.GROSS_UNIT_PRICE, M_REQUISITIONLINE.PRICEACTUAL, M_REQUISITIONLINE.C_BPARTNER_ID, M_REQUISITION.C_BPARTNER_ID, M_REQUISITIONLINE.M_PRICELIST_ID, M_REQUISITION.M_PRICELIST_ID, M_REQUISITIONLINE.M_PRODUCT_ID, M_REQUISITIONLINE.M_ATTRIBUTESETINSTANCE_ID, M_REQUISITION.AD_USER_ID ORDER BY MIN(M_REQUISITIONLINE.LINE), M_REQUISITIONLINE.NEEDBYDATE, M_REQUISITIONLINE.M_PRODUCT_ID, M_REQUISITIONLINE.M_ATTRIBUTESETINSTANCE_ID @@ -80,6 +82,8 @@ <Parameter name="language"/> <Parameter name="language"/> <Parameter name="language"/> + <Parameter name="language"/> + <Parameter name="language"/> <Parameter name="adUserClient" type="replace" optional="true" after="AND M_REQUISITION.AD_CLIENT_ID IN (" text="'1'"/> <Parameter name="adOrgId" optional="true" type="replace" after="AND M_REQUISITIONLINE.AD_ORG_ID IN (" text="'1'"/> <Parameter name="parDateFrom" optional="true" after="AND 1=1"><![CDATA[ AND M_REQUISITIONLINE.NEEDBYDATE >= TO_DATE(?)]]></Parameter> @@ -96,7 +100,9 @@ SELECT M_REQUISITIONLINE.M_REQUISITIONLINE_ID, M_REQUISITIONLINE.NEEDBYDATE, M_REQUISITIONLINE.QTY AS REQQTY, M_REQUISITIONLINE.ORDEREDQTY AS MATCHEDQTY, M_REQUISITIONLINE.PRICELIST, COALESCE(LOCKQTY, QTY-ORDEREDQTY) AS LOCKQTY, - QUANTITYORDER, C_UOM1.NAME AS SECUOMNAME, C_UOM.NAME AS UOMNAME, + QUANTITYORDER, + AD_COLUMN_IDENTIFIER(to_char('C_Uom'), to_char(C_UOM1.C_UOM_ID), ?) AS SECUOMNAME, + AD_COLUMN_IDENTIFIER(to_char('C_Uom'), to_char(C_UOM.C_UOM_ID), ?) AS UOMNAME, COALESCE(LOCKPRICE, CASE WHEN pl.istaxincluded = 'Y' THEN M_REQUISITIONLINE.GROSS_UNIT_PRICE ELSE M_REQUISITIONLINE.PRICEACTUAL END) AS LOCKPRICE, COALESCE(M_REQUISITIONLINE.C_BPARTNER_ID, M_REQUISITION.C_BPARTNER_ID, '-1') AS VENDOR_ID, COALESCE(M_REQUISITIONLINE.M_PRICELIST_ID, M_REQUISITION.M_PRICELIST_ID, '-1') AS M_PRICELIST_ID, @@ -118,7 +124,7 @@ AND M_REQUISITION.AD_CLIENT_ID IN ('1') AND M_REQUISITIONLINE.AD_ORG_ID IN ('1') GROUP BY M_REQUISITIONLINE.M_REQUISITIONLINE_ID, M_REQUISITIONLINE.NEEDBYDATE, M_REQUISITIONLINE.QTY, - M_REQUISITIONLINE.ORDEREDQTY, M_REQUISITIONLINE.PRICELIST, C_UOM1.NAME, C_UOM.NAME, PL.ISTAXINCLUDED, + M_REQUISITIONLINE.ORDEREDQTY, M_REQUISITIONLINE.PRICELIST, C_UOM1.C_UOM_ID, C_UOM.C_UOM_ID, PL.ISTAXINCLUDED, M_REQUISITION.C_BPARTNER_ID, M_REQUISITION.M_PRICELIST_ID, LOCKQTY, QUANTITYORDER, LOCKPRICE, M_REQUISITIONLINE.GROSS_UNIT_PRICE, M_REQUISITIONLINE.PRICEACTUAL, M_REQUISITIONLINE.C_BPARTNER_ID, M_REQUISITIONLINE.M_PRICELIST_ID, M_REQUISITIONLINE.M_PRODUCT_ID, M_REQUISITIONLINE.M_ATTRIBUTESETINSTANCE_ID @@ -129,6 +135,8 @@ <Parameter name="language"/> <Parameter name="language"/> <Parameter name="language"/> + <Parameter name="language"/> + <Parameter name="language"/> <Parameter name="adUserId"/> <Parameter name="adUserClient" type="replace" optional="true" after="AND M_REQUISITION.AD_CLIENT_ID IN (" text="'1'"/> <Parameter name="adOrgId" optional="true" type="replace" after="AND M_REQUISITIONLINE.AD_ORG_ID IN (" text="'1'"/> ------------------------------------------------------------------------------ _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
