details: https://code.openbravo.com/erp/devel/pi/rev/30b3bd0350b0 changeset: 18135:30b3bd0350b0 user: David Miguelez <david.miguelez <at> openbravo.com> date: Tue Oct 02 12:24:26 2012 +0200 summary: [PIT] Requisitions.
details: https://code.openbravo.com/erp/devel/pi/rev/d370a83f9a43 changeset: 18136:d370a83f9a43 user: David Miguelez <david.miguelez <at> openbravo.com> date: Tue Oct 02 12:26:21 2012 +0200 summary: [PIT] Print Documents. diffstat: src-db/database/model/functions/M_REQUISITION_CREATEPO.xml | 55 +- src-db/database/model/tables/M_REQUISITIONLINE.xml | 8 + src-db/database/sourcedata/AD_AUXILIARINPUT.xml | 22 + src-db/database/sourcedata/AD_COLUMN.xml | 76 ++- src-db/database/sourcedata/AD_ELEMENT.xml | 12 + src-db/database/sourcedata/AD_FIELD.xml | 136 +++- src-db/database/sourcedata/AD_TEXTINTERFACES.xml | 44 +- src/org/openbravo/erpCommon/ad_callouts/SL_RequisitionLine_Amt.java | 41 +- src/org/openbravo/erpCommon/ad_callouts/SL_RequisitionLine_Product.java | 17 +- src/org/openbravo/erpCommon/ad_forms/RequisitionToOrder.java | 17 +- src/org/openbravo/erpCommon/ad_forms/RequisitionToOrder_data.xsql | 67 +- src/org/openbravo/erpReports/C_OrderJR.jrxml | 84 ++- src/org/openbravo/erpReports/C_OrderLinesJR.jrxml | 15 +- src/org/openbravo/erpReports/C_OrderLinesTaxIncludedJR.jrxml | 327 ++++++++++ src/org/openbravo/erpReports/RptC_Invoice.jrxml | 80 +- src/org/openbravo/erpReports/RptC_Invoice_Lines.jrxml | 32 +- src/org/openbravo/erpReports/RptC_Invoice_TaxLines.jrxml | 47 +- src/org/openbravo/erpReports/RptC_Order_TaxLines.jrxml | 117 +++ 18 files changed, 1054 insertions(+), 143 deletions(-) diffs (truncated from 1962 to 300 lines): diff -r 1d2b86422c02 -r d370a83f9a43 src-db/database/model/functions/M_REQUISITION_CREATEPO.xml --- a/src-db/database/model/functions/M_REQUISITION_CREATEPO.xml Mon Oct 01 12:51:18 2012 +0200 +++ b/src-db/database/model/functions/M_REQUISITION_CREATEPO.xml Tue Oct 02 12:26:21 2012 +0200 @@ -16,7 +16,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) 2008-2010 Openbravo SLU +* All portions are Copyright (C) 2008-2012 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************/ @@ -49,13 +49,19 @@ v_PriceActual NUMBER; v_Discount NUMBER; v_Tax_ID VARCHAR2(32); + v_gross_unit_price NUMBER; + v_line_gross_amount NUMBER; + v_lineNetAmt NUMBER; + v_stdPre NUMBER; + v_priPre NUMBER; + v_Gross NUMBER; p_OrderDate DATE; p_Vendor_ID VARCHAR2(32); p_PriceList_ID VARCHAR2(32); p_Org_ID VARCHAR2(32); p_Warehouse_ID VARCHAR2(32); - + -- Parameter TYPE RECORD IS REF CURSOR; Cur_Parameter RECORD; @@ -119,7 +125,8 @@ (SELECT A.*, COALESCE(A.A_PRICELIST_ID, C_BPARTNER.PO_PRICELIST_ID) AS PRICELIST_ID, C_BPARTNER.PAYMENTRULEPO AS PAYMENTRULE, C_BPARTNER.PO_PAYMENTMETHOD_ID, C_BPARTNER.PO_PAYMENTTERM_ID AS C_PAYMENTTERM_ID, - C_BPARTNER.DELIVERYRULE, C_BPARTNER.DELIVERYVIARULE, C_BPARTNER.C_BPARTNER_ID AS C_BPID + C_BPARTNER.DELIVERYRULE, C_BPARTNER.DELIVERYVIARULE, C_BPARTNER.C_BPARTNER_ID AS C_BPID, + M_PRICELIST.ISTAXINCLUDED FROM (SELECT COALESCE(p_Vendor_ID, M_REQUISITIONLINE.C_BPARTNER_ID, M_REQUISITION.C_BPARTNER_ID, PRODUCT_PO.C_BPARTNER_ID) AS VENDOR_ID, COALESCE(p_PriceList_ID, M_REQUISITIONLINE.M_PRICELIST_ID, M_REQUISITION.M_PRICELIST_ID) AS A_PRICELIST_ID, M_REQUISITIONLINE.* @@ -135,8 +142,9 @@ AND M_REQUISITIONLINE.REQSTATUS = 'O' AND NOT (COALESCE(M_REQUISITIONLINE.LOCKEDBY, v_User_ID) <> v_User_ID AND COALESCE(M_REQUISITIONLINE.LOCKDATE, TO_DATE('01-01-1900', 'DD-MM-YYYY')) >= (now()-3)) - ) A, C_BPARTNER + ) A, C_BPARTNER, M_PRICELIST WHERE A.VENDOR_ID = C_BPARTNER.C_BPARTNER_ID + AND m_pricelist.m_pricelist_ID = CASE WHEN A.A_PRICELIST_ID is not null then A.A_PRICELIST_ID ELSE C_BPARTNER.PO_PRICELIST_ID END ORDER BY A.VENDOR_ID, COALESCE(A.A_PRICELIST_ID, C_BPARTNER.PO_PRICELIST_ID), A.NEEDBYDATE) LOOP v_ResultStr:='Line start'; @@ -219,13 +227,14 @@ Ad_Sequence_Next('C_OrderLine', v_Client_ID, v_COrderLine_ID); SELECT pp.PRICELIST, pp.PRICELIMIT, pp.PRICESTD, - ROUND(M_GET_OFFERS_PRICE(TO_DATE(p_OrderDate),Cur_Lines.C_BPID,Cur_Lines.M_Product_ID,COALESCE(Cur_Lines.PRICEACTUAL, pp.PRICESTD),Cur_Lines.QTY - Cur_Lines.ORDEREDQTY,Cur_Lines.PRICELIST_ID),CUR.PRICEPRECISION), - ROUND((pp.PRICELIST - pp.PRICESTD)/pp.PRICELIST*100,CUR.STDPRECISION) - INTO v_PriceList, v_PriceLimit, v_PriceStd, v_PriceActual, v_Discount + ROUND(M_GET_OFFERS_PRICE(TO_DATE(p_OrderDate),Cur_Lines.C_BPID,Cur_Lines.M_Product_ID,COALESCE(Cur_Lines.PRICEACTUAL, pp.PRICESTD),Cur_Lines.QTY - Cur_Lines.ORDEREDQTY,Cur_Lines.PRICELIST_ID),CUR.PRICEPRECISION), + pp.Gross + INTO v_PriceList, v_PriceLimit, v_PriceStd, v_PriceActual, v_Gross FROM (SELECT COALESCE(Cur_Lines.PRICELIST, MAX(M_PRODUCTPRICE.PRICELIST), Cur_Lines.PRICEACTUAL) AS PRICELIST, COALESCE(MAX(M_PRODUCTPRICE.PRICELIMIT), Cur_Lines.PRICEACTUAL) AS PRICELIMIT, - COALESCE(Cur_Lines.PRICEACTUAL, MAX(M_PRODUCTPRICE.PRICESTD)) AS PRICESTD + COALESCE(Cur_Lines.PRICEACTUAL, MAX(M_PRODUCTPRICE.PRICESTD)) AS PRICESTD, + COALESCE(Cur_Lines.Gross_Unit_Price, 0) as Gross FROM M_PRODUCTPRICE WHERE M_PRICELIST_VERSION_ID = M_GET_PRICELIST_VERSION(Cur_Lines.PRICELIST_ID, p_OrderDate) AND M_PRODUCT_ID = Cur_Lines.M_PRODUCT_ID) pp, (SELECT PRICEPRECISION, STDPRECISION FROM C_CURRENCY WHERE C_CURRENCY_ID = v_Currency_ID) CUR; @@ -236,8 +245,30 @@ END IF; v_Tax_ID := C_GetTax(Cur_Lines.M_Product_ID, p_OrderDate, p_Org_ID, p_Warehouse_ID, v_BillTo_ID, v_BPartner_Location_ID, null, 'N'); - + SELECT STDPRECISION, PRICEPRECISION INTO v_stdPre, v_priPre FROM C_CURRENCY WHERE C_CURRENCY_ID = v_Currency_ID; + v_ResultStr:='Insert order line'; + IF (Cur_Lines.istaxincluded = 'Y') THEN + v_gross_unit_price:= v_Gross; + v_line_gross_amount:= ROUND(v_gross_unit_price * (Cur_Lines.QTY - Cur_Lines.ORDEREDQTY), v_stdPre); + v_PriceActual:= C_GET_NET_PRICE_FROM_GROSS(v_Tax_ID, v_line_gross_amount, v_line_gross_amount, v_priPre, (Cur_Lines.QTY - Cur_Lines.ORDEREDQTY)); + v_LineNetAmt:= ROUND(v_PriceActual * (Cur_Lines.QTY - Cur_Lines.ORDEREDQTY), v_stdPre); + IF (v_PriceList = 0) THEN + v_Discount := 0 ; + ELSE + v_Discount :=ROUND((v_PriceList-v_gross_unit_price) / v_PriceList*100, v_stdPre); -- Calculate rounded discount + END IF; + ELSE + v_LineNetAmt:= ROUND(v_PriceActual*(Cur_Lines.QTY - Cur_Lines.ORDEREDQTY), v_stdPre); + v_gross_unit_price := 0; + v_line_gross_amount:= 0; + IF (v_PriceList = 0) THEN + v_Discount := 0 ; + ELSE + v_Discount :=ROUND((v_PriceList-v_PriceActual) / v_PriceList*100, v_stdPre); -- Calculate rounded discount + END IF; + END IF; + INSERT INTO C_OrderLine ( C_ORDERLINE_ID, AD_CLIENT_ID, AD_ORG_ID, ISACTIVE, CREATED, CREATEDBY, UPDATED, UPDATEDBY, @@ -247,7 +278,7 @@ M_WAREHOUSE_ID, C_UOM_ID, QTYORDERED, C_CURRENCY_ID, PRICELIST, PRICEACTUAL, PRICELIMIT, PRICESTD, LINENETAMT, DISCOUNT, - C_TAX_ID, M_PRODUCT_UOM_ID, QUANTITYORDER + C_TAX_ID, M_PRODUCT_UOM_ID, QUANTITYORDER, GROSS_UNIT_PRICE, LINE_GROSS_AMOUNT ) VALUES ( v_COrderLine_ID,v_Client_ID, p_Org_ID,'Y', now(), v_User_ID, now(), v_User_ID, @@ -256,8 +287,8 @@ Cur_Lines.M_AttributeSetInstance_ID, p_Warehouse_ID, Cur_Lines.C_UOM_ID, Cur_Lines.QTY - Cur_Lines.ORDEREDQTY, v_Currency_ID, v_PriceList, v_PriceActual, v_PriceLimit, - v_PriceStd, v_PriceActual*(Cur_Lines.QTY - Cur_Lines.ORDEREDQTY),v_Discount, - v_Tax_ID, Cur_Lines.M_Product_UOM_ID, Cur_Lines.QuantityOrder + v_PriceStd, v_LineNetAmt,v_Discount, + v_Tax_ID, Cur_Lines.M_Product_UOM_ID, Cur_Lines.QuantityOrder, v_gross_unit_price, v_line_gross_amount ); Ad_Sequence_Next('M_RequisitionOrder', v_User_ID, v_RequisitionOrder_ID); diff -r 1d2b86422c02 -r d370a83f9a43 src-db/database/model/tables/M_REQUISITIONLINE.xml --- a/src-db/database/model/tables/M_REQUISITIONLINE.xml Mon Oct 01 12:51:18 2012 +0200 +++ b/src-db/database/model/tables/M_REQUISITIONLINE.xml Tue Oct 02 12:26:21 2012 +0200 @@ -145,6 +145,14 @@ <default/> <onCreateDefault/> </column> + <column name="GROSS_UNIT_PRICE" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false"> + <default><![CDATA[0]]></default> + <onCreateDefault/> + </column> + <column name="GROSS_AMT" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false"> + <default><![CDATA[0]]></default> + <onCreateDefault/> + </column> <foreign-key foreignTable="AD_CLIENT" name="AD_CLIENT_M_REQUISITIONLINE"> <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/> </foreign-key> diff -r 1d2b86422c02 -r d370a83f9a43 src-db/database/sourcedata/AD_AUXILIARINPUT.xml --- a/src-db/database/sourcedata/AD_AUXILIARINPUT.xml Mon Oct 01 12:51:18 2012 +0200 +++ b/src-db/database/sourcedata/AD_AUXILIARINPUT.xml Tue Oct 02 12:26:21 2012 +0200 @@ -874,6 +874,17 @@ <!--1FEA6AF375714E1A962C67E094001342--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> <!--1FEA6AF375714E1A962C67E094001342--></AD_AUXILIARINPUT> +<!--2252C06D4EA7419FA38E7B5565EF411C--><AD_AUXILIARINPUT> +<!--2252C06D4EA7419FA38E7B5565EF411C--> <AD_AUXILIARINPUT_ID><![CDATA[2252C06D4EA7419FA38E7B5565EF411C]]></AD_AUXILIARINPUT_ID> +<!--2252C06D4EA7419FA38E7B5565EF411C--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--2252C06D4EA7419FA38E7B5565EF411C--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--2252C06D4EA7419FA38E7B5565EF411C--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--2252C06D4EA7419FA38E7B5565EF411C--> <AD_TAB_ID><![CDATA[1004400002]]></AD_TAB_ID> +<!--2252C06D4EA7419FA38E7B5565EF411C--> <NAME><![CDATA[GROSSPRICE]]></NAME> +<!--2252C06D4EA7419FA38E7B5565EF411C--> <CODE><![CDATA[@SQL=SELECT istaxincluded from m_pricelist where m_pricelist_id = CASE WHEN COALESCE(@M_PRICELIST_ID@,'') <> '' THEN @M_PRICELIST_ID@ ELSE (SELECT m_pricelist_id from m_requisition where m_requisition_id = @M_Requisition_ID@) END]]></CODE> +<!--2252C06D4EA7419FA38E7B5565EF411C--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> +<!--2252C06D4EA7419FA38E7B5565EF411C--></AD_AUXILIARINPUT> + <!--2280D23A4CDB4F2AB21EBD991F2A1886--><AD_AUXILIARINPUT> <!--2280D23A4CDB4F2AB21EBD991F2A1886--> <AD_AUXILIARINPUT_ID><![CDATA[2280D23A4CDB4F2AB21EBD991F2A1886]]></AD_AUXILIARINPUT_ID> <!--2280D23A4CDB4F2AB21EBD991F2A1886--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -1050,6 +1061,17 @@ <!--3C0056E8C25843C387DFB2896D83FEE3--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> <!--3C0056E8C25843C387DFB2896D83FEE3--></AD_AUXILIARINPUT> +<!--3C6B0BCF770446E1BE14CFEE4E6ABC23--><AD_AUXILIARINPUT> +<!--3C6B0BCF770446E1BE14CFEE4E6ABC23--> <AD_AUXILIARINPUT_ID><![CDATA[3C6B0BCF770446E1BE14CFEE4E6ABC23]]></AD_AUXILIARINPUT_ID> +<!--3C6B0BCF770446E1BE14CFEE4E6ABC23--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--3C6B0BCF770446E1BE14CFEE4E6ABC23--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--3C6B0BCF770446E1BE14CFEE4E6ABC23--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--3C6B0BCF770446E1BE14CFEE4E6ABC23--> <AD_TAB_ID><![CDATA[800251]]></AD_TAB_ID> +<!--3C6B0BCF770446E1BE14CFEE4E6ABC23--> <NAME><![CDATA[GROSSPRICE]]></NAME> +<!--3C6B0BCF770446E1BE14CFEE4E6ABC23--> <CODE><![CDATA[@SQL=SELECT istaxincluded from m_pricelist where m_pricelist_id = CASE WHEN COALESCE(@M_PRICELIST_ID@,'') <> '' THEN @M_PRICELIST_ID@ ELSE (SELECT m_pricelist_id from m_requisition where m_requisition_id = @M_Requisition_ID@) END]]></CODE> +<!--3C6B0BCF770446E1BE14CFEE4E6ABC23--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> +<!--3C6B0BCF770446E1BE14CFEE4E6ABC23--></AD_AUXILIARINPUT> + <!--3C83C6D91C664F6A96AE0530C75277A9--><AD_AUXILIARINPUT> <!--3C83C6D91C664F6A96AE0530C75277A9--> <AD_AUXILIARINPUT_ID><![CDATA[3C83C6D91C664F6A96AE0530C75277A9]]></AD_AUXILIARINPUT_ID> <!--3C83C6D91C664F6A96AE0530C75277A9--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r 1d2b86422c02 -r d370a83f9a43 src-db/database/sourcedata/AD_COLUMN.xml --- a/src-db/database/sourcedata/AD_COLUMN.xml Mon Oct 01 12:51:18 2012 +0200 +++ b/src-db/database/sourcedata/AD_COLUMN.xml Tue Oct 02 12:26:21 2012 +0200 @@ -197564,7 +197564,7 @@ <!--803540--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> <!--803540--> <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN> <!--803540--> <AD_ELEMENT_ID><![CDATA[449]]></AD_ELEMENT_ID> -<!--803540--> <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR> +<!--803540--> <ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR> <!--803540--> <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY> <!--803540--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE> <!--803540--> <AD_CALLOUT_ID><![CDATA[82D4C96A30324E08969EB848395D0287]]></AD_CALLOUT_ID> @@ -215029,7 +215029,7 @@ <!--1004400037--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> <!--1004400037--> <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN> <!--1004400037--> <AD_ELEMENT_ID><![CDATA[449]]></AD_ELEMENT_ID> -<!--1004400037--> <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR> +<!--1004400037--> <ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR> <!--1004400037--> <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY> <!--1004400037--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE> <!--1004400037--> <AD_CALLOUT_ID><![CDATA[800013]]></AD_CALLOUT_ID> @@ -221633,6 +221633,40 @@ <!--11D5E322E2EC45E884C876155BCE29AA--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE> <!--11D5E322E2EC45E884C876155BCE29AA--></AD_COLUMN> +<!--1322478AD1C444D7B9116099CA2B7787--><AD_COLUMN> +<!--1322478AD1C444D7B9116099CA2B7787--> <AD_COLUMN_ID><![CDATA[1322478AD1C444D7B9116099CA2B7787]]></AD_COLUMN_ID> +<!--1322478AD1C444D7B9116099CA2B7787--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--1322478AD1C444D7B9116099CA2B7787--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--1322478AD1C444D7B9116099CA2B7787--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--1322478AD1C444D7B9116099CA2B7787--> <NAME><![CDATA[Gross Amount]]></NAME> +<!--1322478AD1C444D7B9116099CA2B7787--> <COLUMNNAME><![CDATA[Gross_Amt]]></COLUMNNAME> +<!--1322478AD1C444D7B9116099CA2B7787--> <AD_TABLE_ID><![CDATA[800214]]></AD_TABLE_ID> +<!--1322478AD1C444D7B9116099CA2B7787--> <AD_REFERENCE_ID><![CDATA[12]]></AD_REFERENCE_ID> +<!--1322478AD1C444D7B9116099CA2B7787--> <FIELDLENGTH><![CDATA[2]]></FIELDLENGTH> +<!--1322478AD1C444D7B9116099CA2B7787--> <DEFAULTVALUE><![CDATA[0]]></DEFAULTVALUE> +<!--1322478AD1C444D7B9116099CA2B7787--> <ISKEY><![CDATA[N]]></ISKEY> +<!--1322478AD1C444D7B9116099CA2B7787--> <ISPARENT><![CDATA[N]]></ISPARENT> +<!--1322478AD1C444D7B9116099CA2B7787--> <ISMANDATORY><![CDATA[N]]></ISMANDATORY> +<!--1322478AD1C444D7B9116099CA2B7787--> <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE> +<!--1322478AD1C444D7B9116099CA2B7787--> <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER> +<!--1322478AD1C444D7B9116099CA2B7787--> <SEQNO><![CDATA[420]]></SEQNO> +<!--1322478AD1C444D7B9116099CA2B7787--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED> +<!--1322478AD1C444D7B9116099CA2B7787--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> +<!--1322478AD1C444D7B9116099CA2B7787--> <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN> +<!--1322478AD1C444D7B9116099CA2B7787--> <AD_ELEMENT_ID><![CDATA[C958F9CA64A6AD2DE040007F01004595]]></AD_ELEMENT_ID> +<!--1322478AD1C444D7B9116099CA2B7787--> <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR> +<!--1322478AD1C444D7B9116099CA2B7787--> <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY> +<!--1322478AD1C444D7B9116099CA2B7787--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE> +<!--1322478AD1C444D7B9116099CA2B7787--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS> +<!--1322478AD1C444D7B9116099CA2B7787--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> +<!--1322478AD1C444D7B9116099CA2B7787--> <POSITION><![CDATA[39]]></POSITION> +<!--1322478AD1C444D7B9116099CA2B7787--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT> +<!--1322478AD1C444D7B9116099CA2B7787--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE> +<!--1322478AD1C444D7B9116099CA2B7787--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> +<!--1322478AD1C444D7B9116099CA2B7787--> <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION> +<!--1322478AD1C444D7B9116099CA2B7787--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE> +<!--1322478AD1C444D7B9116099CA2B7787--></AD_COLUMN> + <!--1395BD95B14149C29B10B1B455A154DC--><AD_COLUMN> <!--1395BD95B14149C29B10B1B455A154DC--> <AD_COLUMN_ID><![CDATA[1395BD95B14149C29B10B1B455A154DC]]></AD_COLUMN_ID> <!--1395BD95B14149C29B10B1B455A154DC--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -288235,6 +288269,44 @@ <!--BC6780F14973479185DBC4BC94BCF08D--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE> <!--BC6780F14973479185DBC4BC94BCF08D--></AD_COLUMN> +<!--BD29550316AC4DFEA994934546D6CED4--><AD_COLUMN> +<!--BD29550316AC4DFEA994934546D6CED4--> <AD_COLUMN_ID><![CDATA[BD29550316AC4DFEA994934546D6CED4]]></AD_COLUMN_ID> +<!--BD29550316AC4DFEA994934546D6CED4--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--BD29550316AC4DFEA994934546D6CED4--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--BD29550316AC4DFEA994934546D6CED4--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--BD29550316AC4DFEA994934546D6CED4--> <NAME><![CDATA[Gross Unit Price]]></NAME> +<!--BD29550316AC4DFEA994934546D6CED4--> <DESCRIPTION><![CDATA[Price inclusive of taxes]]></DESCRIPTION> +<!--BD29550316AC4DFEA994934546D6CED4--> <HELP><![CDATA[This is the price that is provided when the price is inclusive of taxes. ]]></HELP> +<!--BD29550316AC4DFEA994934546D6CED4--> <COLUMNNAME><![CDATA[Gross_Unit_Price]]></COLUMNNAME> +<!--BD29550316AC4DFEA994934546D6CED4--> <AD_TABLE_ID><![CDATA[800214]]></AD_TABLE_ID> +<!--BD29550316AC4DFEA994934546D6CED4--> <AD_REFERENCE_ID><![CDATA[800008]]></AD_REFERENCE_ID> +<!--BD29550316AC4DFEA994934546D6CED4--> <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH> +<!--BD29550316AC4DFEA994934546D6CED4--> <DEFAULTVALUE><![CDATA[0]]></DEFAULTVALUE> +<!--BD29550316AC4DFEA994934546D6CED4--> <ISKEY><![CDATA[N]]></ISKEY> +<!--BD29550316AC4DFEA994934546D6CED4--> <ISPARENT><![CDATA[N]]></ISPARENT> +<!--BD29550316AC4DFEA994934546D6CED4--> <ISMANDATORY><![CDATA[N]]></ISMANDATORY> +<!--BD29550316AC4DFEA994934546D6CED4--> <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE> +<!--BD29550316AC4DFEA994934546D6CED4--> <READONLYLOGIC><![CDATA[@Processed@='Y'|@GROSSPRICE@='N']]></READONLYLOGIC> +<!--BD29550316AC4DFEA994934546D6CED4--> <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER> +<!--BD29550316AC4DFEA994934546D6CED4--> <SEQNO><![CDATA[410]]></SEQNO> +<!--BD29550316AC4DFEA994934546D6CED4--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED> +<!--BD29550316AC4DFEA994934546D6CED4--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> +<!--BD29550316AC4DFEA994934546D6CED4--> <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN> +<!--BD29550316AC4DFEA994934546D6CED4--> <AD_ELEMENT_ID><![CDATA[FAD7A4095B904B23A8A9292EEC110C6D]]></AD_ELEMENT_ID> +<!--BD29550316AC4DFEA994934546D6CED4--> <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR> +<!--BD29550316AC4DFEA994934546D6CED4--> <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY> +<!--BD29550316AC4DFEA994934546D6CED4--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE> +<!--BD29550316AC4DFEA994934546D6CED4--> <AD_CALLOUT_ID><![CDATA[1004400000]]></AD_CALLOUT_ID> +<!--BD29550316AC4DFEA994934546D6CED4--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS> +<!--BD29550316AC4DFEA994934546D6CED4--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> +<!--BD29550316AC4DFEA994934546D6CED4--> <POSITION><![CDATA[37]]></POSITION> +<!--BD29550316AC4DFEA994934546D6CED4--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT> +<!--BD29550316AC4DFEA994934546D6CED4--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE> +<!--BD29550316AC4DFEA994934546D6CED4--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> +<!--BD29550316AC4DFEA994934546D6CED4--> <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION> +<!--BD29550316AC4DFEA994934546D6CED4--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE> +<!--BD29550316AC4DFEA994934546D6CED4--></AD_COLUMN> + <!--BD4D0980F314451086F4A861BD92C25E--><AD_COLUMN> <!--BD4D0980F314451086F4A861BD92C25E--> <AD_COLUMN_ID><![CDATA[BD4D0980F314451086F4A861BD92C25E]]></AD_COLUMN_ID> <!--BD4D0980F314451086F4A861BD92C25E--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r 1d2b86422c02 -r d370a83f9a43 src-db/database/sourcedata/AD_ELEMENT.xml --- a/src-db/database/sourcedata/AD_ELEMENT.xml Mon Oct 01 12:51:18 2012 +0200 +++ b/src-db/database/sourcedata/AD_ELEMENT.xml Tue Oct 02 12:26:21 2012 +0200 @@ -28789,6 +28789,18 @@ <!--C8561E14272B427EB15A6C5E81DAC83A--> <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY> <!--C8561E14272B427EB15A6C5E81DAC83A--></AD_ELEMENT> +<!--C958F9CA64A6AD2DE040007F01004595--><AD_ELEMENT> +<!--C958F9CA64A6AD2DE040007F01004595--> <AD_ELEMENT_ID><![CDATA[C958F9CA64A6AD2DE040007F01004595]]></AD_ELEMENT_ID> +<!--C958F9CA64A6AD2DE040007F01004595--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--C958F9CA64A6AD2DE040007F01004595--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> ------------------------------------------------------------------------------ Don't let slow site performance ruin your business. Deploy New Relic APM Deploy New Relic app performance management and know exactly what is happening inside your Ruby, Python, PHP, Java, and .NET app Try New Relic at no cost today and get our sweet Data Nerd shirt too! http://p.sf.net/sfu/newrelic-dev2dev _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
