details: https://code.openbravo.com/erp/devel/pi/rev/ac2a7ca14b20 changeset: 17480:ac2a7ca14b20 user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com> date: Mon Jul 16 12:23:09 2012 +0200 summary: Related to issue 21077.Add new column and fields.
details: https://code.openbravo.com/erp/devel/pi/rev/bd04b3561c93 changeset: 17481:bd04b3561c93 user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com> date: Mon Jul 16 12:23:41 2012 +0200 summary: Related to issue 21077.Remove warnings and format code of SL_Order_Product. details: https://code.openbravo.com/erp/devel/pi/rev/e65ac02cea6b changeset: 17482:e65ac02cea6b user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com> date: Mon Jul 16 13:29:55 2012 +0200 summary: Related to issue 21077.Remove warnings and format code of SL_Order_Amt. details: https://code.openbravo.com/erp/devel/pi/rev/cd961154b923 changeset: 17483:cd961154b923 user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com> date: Mon Jul 16 13:31:08 2012 +0200 summary: Related to issue 21077.Calculate discount on product selector. details: https://code.openbravo.com/erp/devel/pi/rev/2b36a2615987 changeset: 17484:2b36a2615987 user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com> date: Mon Jul 16 13:31:32 2012 +0200 summary: Related to issue 21077.Changes in readonly and display logics. details: https://code.openbravo.com/erp/devel/pi/rev/33370af72d4d changeset: 17485:33370af72d4d user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com> date: Mon Jul 16 16:58:18 2012 +0200 summary: Related to issue 21077.Calculate discount on amount selector. details: https://code.openbravo.com/erp/devel/pi/rev/b08c32e4e264 changeset: 17486:b08c32e4e264 user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com> date: Mon Jul 16 17:23:35 2012 +0200 summary: Related to issue 21077.Remove warnings and format code of CopyFromPOOrder. diffstat: src-db/database/model/tables/C_ORDERLINE.xml | 4 + src-db/database/sourcedata/AD_COLUMN.xml | 38 +- src-db/database/sourcedata/AD_ELEMENT.xml | 13 + src-db/database/sourcedata/AD_FIELD.xml | 111 ++++- src/org/openbravo/erpCommon/ad_actionButton/CopyFromPOOrder.java | 44 +- src/org/openbravo/erpCommon/ad_callouts/SL_Order_Amt.java | 259 +++++---- src/org/openbravo/erpCommon/ad_callouts/SL_Order_Product.java | 120 ++- 7 files changed, 399 insertions(+), 190 deletions(-) diffs (truncated from 972 to 300 lines): diff -r eefb7b36438c -r b08c32e4e264 src-db/database/model/tables/C_ORDERLINE.xml --- a/src-db/database/model/tables/C_ORDERLINE.xml Mon Jul 16 13:41:04 2012 +0200 +++ b/src-db/database/model/tables/C_ORDERLINE.xml Mon Jul 16 17:23:35 2012 +0200 @@ -209,6 +209,10 @@ <default><![CDATA[0]]></default> <onCreateDefault/> </column> + <column name="GROSSPRICELIST" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false"> + <default/> + <onCreateDefault/> + </column> <foreign-key foreignTable="AD_CLIENT" name="C_ORDERLINE_AD_CLIENT"> <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/> </foreign-key> diff -r eefb7b36438c -r b08c32e4e264 src-db/database/sourcedata/AD_COLUMN.xml --- a/src-db/database/sourcedata/AD_COLUMN.xml Mon Jul 16 13:41:04 2012 +0200 +++ b/src-db/database/sourcedata/AD_COLUMN.xml Mon Jul 16 17:23:35 2012 +0200 @@ -220091,7 +220091,7 @@ <!--025E1896618449A4B30FE9CC729CC615--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE> <!--025E1896618449A4B30FE9CC729CC615--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS> <!--025E1896618449A4B30FE9CC729CC615--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> -<!--025E1896618449A4B30FE9CC729CC615--> <POSITION><![CDATA[54]]></POSITION> +<!--025E1896618449A4B30FE9CC729CC615--> <POSITION><![CDATA[52]]></POSITION> <!--025E1896618449A4B30FE9CC729CC615--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT> <!--025E1896618449A4B30FE9CC729CC615--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE> <!--025E1896618449A4B30FE9CC729CC615--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> @@ -289358,6 +289358,40 @@ <!--C4EBD68726074887B5FFC0D344FA5CC4--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE> <!--C4EBD68726074887B5FFC0D344FA5CC4--></AD_COLUMN> +<!--C4EEB8D909C48483E040007F01001710--><AD_COLUMN> +<!--C4EEB8D909C48483E040007F01001710--> <AD_COLUMN_ID><![CDATA[C4EEB8D909C48483E040007F01001710]]></AD_COLUMN_ID> +<!--C4EEB8D909C48483E040007F01001710--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--C4EEB8D909C48483E040007F01001710--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--C4EEB8D909C48483E040007F01001710--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--C4EEB8D909C48483E040007F01001710--> <NAME><![CDATA[Gross List Price]]></NAME> +<!--C4EEB8D909C48483E040007F01001710--> <HELP><![CDATA[The Gross List Price is the official price stated by the selected tax included pricelist and the currency of the document.]]></HELP> +<!--C4EEB8D909C48483E040007F01001710--> <COLUMNNAME><![CDATA[GrossPriceList]]></COLUMNNAME> +<!--C4EEB8D909C48483E040007F01001710--> <AD_TABLE_ID><![CDATA[260]]></AD_TABLE_ID> +<!--C4EEB8D909C48483E040007F01001710--> <AD_REFERENCE_ID><![CDATA[22]]></AD_REFERENCE_ID> +<!--C4EEB8D909C48483E040007F01001710--> <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH> +<!--C4EEB8D909C48483E040007F01001710--> <ISKEY><![CDATA[N]]></ISKEY> +<!--C4EEB8D909C48483E040007F01001710--> <ISPARENT><![CDATA[N]]></ISPARENT> +<!--C4EEB8D909C48483E040007F01001710--> <ISMANDATORY><![CDATA[N]]></ISMANDATORY> +<!--C4EEB8D909C48483E040007F01001710--> <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE> +<!--C4EEB8D909C48483E040007F01001710--> <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER> +<!--C4EEB8D909C48483E040007F01001710--> <SEQNO><![CDATA[134]]></SEQNO> +<!--C4EEB8D909C48483E040007F01001710--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED> +<!--C4EEB8D909C48483E040007F01001710--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> +<!--C4EEB8D909C48483E040007F01001710--> <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN> +<!--C4EEB8D909C48483E040007F01001710--> <AD_ELEMENT_ID><![CDATA[C4EEB8D909BE8483E040007F01001710]]></AD_ELEMENT_ID> +<!--C4EEB8D909C48483E040007F01001710--> <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR> +<!--C4EEB8D909C48483E040007F01001710--> <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY> +<!--C4EEB8D909C48483E040007F01001710--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE> +<!--C4EEB8D909C48483E040007F01001710--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS> +<!--C4EEB8D909C48483E040007F01001710--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> +<!--C4EEB8D909C48483E040007F01001710--> <POSITION><![CDATA[53]]></POSITION> +<!--C4EEB8D909C48483E040007F01001710--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT> +<!--C4EEB8D909C48483E040007F01001710--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE> +<!--C4EEB8D909C48483E040007F01001710--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> +<!--C4EEB8D909C48483E040007F01001710--> <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION> +<!--C4EEB8D909C48483E040007F01001710--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE> +<!--C4EEB8D909C48483E040007F01001710--></AD_COLUMN> + <!--C523906F9ACC461A9C95D7DEB111D566--><AD_COLUMN> <!--C523906F9ACC461A9C95D7DEB111D566--> <AD_COLUMN_ID><![CDATA[C523906F9ACC461A9C95D7DEB111D566]]></AD_COLUMN_ID> <!--C523906F9ACC461A9C95D7DEB111D566--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -292270,7 +292304,7 @@ <!--EB0B8E4554EF4A9CA512B9C5FF4FFABF--> <AD_CALLOUT_ID><![CDATA[138]]></AD_CALLOUT_ID> <!--EB0B8E4554EF4A9CA512B9C5FF4FFABF--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS> <!--EB0B8E4554EF4A9CA512B9C5FF4FFABF--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> -<!--EB0B8E4554EF4A9CA512B9C5FF4FFABF--> <POSITION><![CDATA[53]]></POSITION> +<!--EB0B8E4554EF4A9CA512B9C5FF4FFABF--> <POSITION><![CDATA[51]]></POSITION> <!--EB0B8E4554EF4A9CA512B9C5FF4FFABF--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT> <!--EB0B8E4554EF4A9CA512B9C5FF4FFABF--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE> <!--EB0B8E4554EF4A9CA512B9C5FF4FFABF--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> diff -r eefb7b36438c -r b08c32e4e264 src-db/database/sourcedata/AD_ELEMENT.xml --- a/src-db/database/sourcedata/AD_ELEMENT.xml Mon Jul 16 13:41:04 2012 +0200 +++ b/src-db/database/sourcedata/AD_ELEMENT.xml Mon Jul 16 17:23:35 2012 +0200 @@ -28529,6 +28529,19 @@ <!--C2FE8DEF5C13482F8758744125B6251E--> <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY> <!--C2FE8DEF5C13482F8758744125B6251E--></AD_ELEMENT> +<!--C4EEB8D909BE8483E040007F01001710--><AD_ELEMENT> +<!--C4EEB8D909BE8483E040007F01001710--> <AD_ELEMENT_ID><![CDATA[C4EEB8D909BE8483E040007F01001710]]></AD_ELEMENT_ID> +<!--C4EEB8D909BE8483E040007F01001710--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--C4EEB8D909BE8483E040007F01001710--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--C4EEB8D909BE8483E040007F01001710--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--C4EEB8D909BE8483E040007F01001710--> <COLUMNNAME><![CDATA[GrossPriceList]]></COLUMNNAME> +<!--C4EEB8D909BE8483E040007F01001710--> <NAME><![CDATA[Gross List Price]]></NAME> +<!--C4EEB8D909BE8483E040007F01001710--> <PRINTNAME><![CDATA[Gross List Price]]></PRINTNAME> +<!--C4EEB8D909BE8483E040007F01001710--> <HELP><![CDATA[The Gross List Price is the official price stated by the selected tax included pricelist and the currency of the document.]]></HELP> +<!--C4EEB8D909BE8483E040007F01001710--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> +<!--C4EEB8D909BE8483E040007F01001710--> <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY> +<!--C4EEB8D909BE8483E040007F01001710--></AD_ELEMENT> + <!--C8561E14272B427EB15A6C5E81DAC83A--><AD_ELEMENT> <!--C8561E14272B427EB15A6C5E81DAC83A--> <AD_ELEMENT_ID><![CDATA[C8561E14272B427EB15A6C5E81DAC83A]]></AD_ELEMENT_ID> <!--C8561E14272B427EB15A6C5E81DAC83A--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r eefb7b36438c -r b08c32e4e264 src-db/database/sourcedata/AD_FIELD.xml --- a/src-db/database/sourcedata/AD_FIELD.xml Mon Jul 16 13:41:04 2012 +0200 +++ b/src-db/database/sourcedata/AD_FIELD.xml Mon Jul 16 17:23:35 2012 +0200 @@ -39202,7 +39202,6 @@ <!--3124--> <AD_COLUMN_ID><![CDATA[4031]]></AD_COLUMN_ID> <!--3124--> <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD> <!--3124--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED> -<!--3124--> <DISPLAYLOGIC><![CDATA[@GROSSPRICE@='N']]></DISPLAYLOGIC> <!--3124--> <DISPLAYLENGTH><![CDATA[10]]></DISPLAYLENGTH> <!--3124--> <ISREADONLY><![CDATA[N]]></ISREADONLY> <!--3124--> <SEQNO><![CDATA[100]]></SEQNO> @@ -43193,7 +43192,6 @@ <!--3383--> <AD_COLUMN_ID><![CDATA[4031]]></AD_COLUMN_ID> <!--3383--> <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD> <!--3383--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED> -<!--3383--> <DISPLAYLOGIC><![CDATA[@GROSSPRICE@='N']]></DISPLAYLOGIC> <!--3383--> <DISPLAYLENGTH><![CDATA[10]]></DISPLAYLENGTH> <!--3383--> <ISREADONLY><![CDATA[N]]></ISREADONLY> <!--3383--> <SEQNO><![CDATA[110]]></SEQNO> @@ -230037,6 +230035,115 @@ <!--C424D68ACE9C4A90A5037D81633A0E9E--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY> <!--C424D68ACE9C4A90A5037D81633A0E9E--></AD_FIELD> +<!--C4EEBC80311BE6EEE040007F0100171C--><AD_FIELD> +<!--C4EEBC80311BE6EEE040007F0100171C--> <AD_FIELD_ID><![CDATA[C4EEBC80311BE6EEE040007F0100171C]]></AD_FIELD_ID> +<!--C4EEBC80311BE6EEE040007F0100171C--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--C4EEBC80311BE6EEE040007F0100171C--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--C4EEBC80311BE6EEE040007F0100171C--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--C4EEBC80311BE6EEE040007F0100171C--> <NAME><![CDATA[Gross List Price]]></NAME> +<!--C4EEBC80311BE6EEE040007F0100171C--> <HELP><![CDATA[The Gross List Price is the official price stated by the selected tax included pricelist and the currency of the document.]]></HELP> +<!--C4EEBC80311BE6EEE040007F0100171C--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED> +<!--C4EEBC80311BE6EEE040007F0100171C--> <AD_TAB_ID><![CDATA[293]]></AD_TAB_ID> +<!--C4EEBC80311BE6EEE040007F0100171C--> <AD_COLUMN_ID><![CDATA[C4EEB8D909C48483E040007F01001710]]></AD_COLUMN_ID> +<!--C4EEBC80311BE6EEE040007F0100171C--> <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD> +<!--C4EEBC80311BE6EEE040007F0100171C--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED> +<!--C4EEBC80311BE6EEE040007F0100171C--> <DISPLAYLOGIC><![CDATA[@GROSSPRICE@='Y']]></DISPLAYLOGIC> +<!--C4EEBC80311BE6EEE040007F0100171C--> <DISPLAYLENGTH><![CDATA[10]]></DISPLAYLENGTH> +<!--C4EEBC80311BE6EEE040007F0100171C--> <ISREADONLY><![CDATA[Y]]></ISREADONLY> +<!--C4EEBC80311BE6EEE040007F0100171C--> <SEQNO><![CDATA[105]]></SEQNO> +<!--C4EEBC80311BE6EEE040007F0100171C--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE> +<!--C4EEBC80311BE6EEE040007F0100171C--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY> +<!--C4EEBC80311BE6EEE040007F0100171C--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> +<!--C4EEBC80311BE6EEE040007F0100171C--> <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION> +<!--C4EEBC80311BE6EEE040007F0100171C--> <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD> +<!--C4EEBC80311BE6EEE040007F0100171C--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> +<!--C4EEBC80311BE6EEE040007F0100171C--> <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN> +<!--C4EEBC80311BE6EEE040007F0100171C--> <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE> +<!--C4EEBC80311BE6EEE040007F0100171C--> <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR> +<!--C4EEBC80311BE6EEE040007F0100171C--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY> +<!--C4EEBC80311BE6EEE040007F0100171C--></AD_FIELD> + +<!--C4EEC6CC73A96B7BE040007F0100175B--><AD_FIELD> +<!--C4EEC6CC73A96B7BE040007F0100175B--> <AD_FIELD_ID><![CDATA[C4EEC6CC73A96B7BE040007F0100175B]]></AD_FIELD_ID> +<!--C4EEC6CC73A96B7BE040007F0100175B--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--C4EEC6CC73A96B7BE040007F0100175B--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--C4EEC6CC73A96B7BE040007F0100175B--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--C4EEC6CC73A96B7BE040007F0100175B--> <NAME><![CDATA[Gross List Price]]></NAME> +<!--C4EEC6CC73A96B7BE040007F0100175B--> <HELP><![CDATA[The Gross List Price is the official price stated by the selected tax included pricelist and the currency of the document.]]></HELP> +<!--C4EEC6CC73A96B7BE040007F0100175B--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED> +<!--C4EEC6CC73A96B7BE040007F0100175B--> <AD_TAB_ID><![CDATA[187]]></AD_TAB_ID> +<!--C4EEC6CC73A96B7BE040007F0100175B--> <AD_COLUMN_ID><![CDATA[C4EEB8D909C48483E040007F01001710]]></AD_COLUMN_ID> +<!--C4EEC6CC73A96B7BE040007F0100175B--> <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD> +<!--C4EEC6CC73A96B7BE040007F0100175B--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED> +<!--C4EEC6CC73A96B7BE040007F0100175B--> <DISPLAYLOGIC><![CDATA[@GROSSPRICE@='Y']]></DISPLAYLOGIC> +<!--C4EEC6CC73A96B7BE040007F0100175B--> <DISPLAYLENGTH><![CDATA[10]]></DISPLAYLENGTH> +<!--C4EEC6CC73A96B7BE040007F0100175B--> <ISREADONLY><![CDATA[Y]]></ISREADONLY> +<!--C4EEC6CC73A96B7BE040007F0100175B--> <SEQNO><![CDATA[95]]></SEQNO> +<!--C4EEC6CC73A96B7BE040007F0100175B--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE> +<!--C4EEC6CC73A96B7BE040007F0100175B--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY> +<!--C4EEC6CC73A96B7BE040007F0100175B--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> +<!--C4EEC6CC73A96B7BE040007F0100175B--> <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION> +<!--C4EEC6CC73A96B7BE040007F0100175B--> <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD> +<!--C4EEC6CC73A96B7BE040007F0100175B--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> +<!--C4EEC6CC73A96B7BE040007F0100175B--> <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN> +<!--C4EEC6CC73A96B7BE040007F0100175B--> <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE> +<!--C4EEC6CC73A96B7BE040007F0100175B--> <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR> +<!--C4EEC6CC73A96B7BE040007F0100175B--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY> +<!--C4EEC6CC73A96B7BE040007F0100175B--></AD_FIELD> + +<!--C4EEC6CCC863D7C1E040007F0100175D--><AD_FIELD> +<!--C4EEC6CCC863D7C1E040007F0100175D--> <AD_FIELD_ID><![CDATA[C4EEC6CCC863D7C1E040007F0100175D]]></AD_FIELD_ID> +<!--C4EEC6CCC863D7C1E040007F0100175D--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--C4EEC6CCC863D7C1E040007F0100175D--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--C4EEC6CCC863D7C1E040007F0100175D--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--C4EEC6CCC863D7C1E040007F0100175D--> <NAME><![CDATA[Gross List Price]]></NAME> +<!--C4EEC6CCC863D7C1E040007F0100175D--> <HELP><![CDATA[The Gross List Price is the official price stated by the selected tax included pricelist and the currency of the document.]]></HELP> +<!--C4EEC6CCC863D7C1E040007F0100175D--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED> +<!--C4EEC6CCC863D7C1E040007F0100175D--> <AD_TAB_ID><![CDATA[AF4090093D471431E040007F010048A5]]></AD_TAB_ID> +<!--C4EEC6CCC863D7C1E040007F0100175D--> <AD_COLUMN_ID><![CDATA[C4EEB8D909C48483E040007F01001710]]></AD_COLUMN_ID> +<!--C4EEC6CCC863D7C1E040007F0100175D--> <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD> +<!--C4EEC6CCC863D7C1E040007F0100175D--> <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED> +<!--C4EEC6CCC863D7C1E040007F0100175D--> <DISPLAYLENGTH><![CDATA[10]]></DISPLAYLENGTH> +<!--C4EEC6CCC863D7C1E040007F0100175D--> <ISREADONLY><![CDATA[N]]></ISREADONLY> +<!--C4EEC6CCC863D7C1E040007F0100175D--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE> +<!--C4EEC6CCC863D7C1E040007F0100175D--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY> +<!--C4EEC6CCC863D7C1E040007F0100175D--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> +<!--C4EEC6CCC863D7C1E040007F0100175D--> <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION> +<!--C4EEC6CCC863D7C1E040007F0100175D--> <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD> +<!--C4EEC6CCC863D7C1E040007F0100175D--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> +<!--C4EEC6CCC863D7C1E040007F0100175D--> <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN> +<!--C4EEC6CCC863D7C1E040007F0100175D--> <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE> +<!--C4EEC6CCC863D7C1E040007F0100175D--> <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR> +<!--C4EEC6CCC863D7C1E040007F0100175D--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY> +<!--C4EEC6CCC863D7C1E040007F0100175D--></AD_FIELD> + +<!--C4EED3241F928D5FE040007F010017B9--><AD_FIELD> +<!--C4EED3241F928D5FE040007F010017B9--> <AD_FIELD_ID><![CDATA[C4EED3241F928D5FE040007F010017B9]]></AD_FIELD_ID> +<!--C4EED3241F928D5FE040007F010017B9--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--C4EED3241F928D5FE040007F010017B9--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--C4EED3241F928D5FE040007F010017B9--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--C4EED3241F928D5FE040007F010017B9--> <NAME><![CDATA[Gross List Price]]></NAME> +<!--C4EED3241F928D5FE040007F010017B9--> <HELP><![CDATA[The Gross List Price is the official price stated by the selected tax included pricelist and the currency of the document.]]></HELP> +<!--C4EED3241F928D5FE040007F010017B9--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED> +<!--C4EED3241F928D5FE040007F010017B9--> <AD_TAB_ID><![CDATA[387B6179438D4C4CB40769A77F4C304C]]></AD_TAB_ID> +<!--C4EED3241F928D5FE040007F010017B9--> <AD_COLUMN_ID><![CDATA[C4EEB8D909C48483E040007F01001710]]></AD_COLUMN_ID> +<!--C4EED3241F928D5FE040007F010017B9--> <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD> +<!--C4EED3241F928D5FE040007F010017B9--> <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED> +<!--C4EED3241F928D5FE040007F010017B9--> <DISPLAYLENGTH><![CDATA[10]]></DISPLAYLENGTH> +<!--C4EED3241F928D5FE040007F010017B9--> <ISREADONLY><![CDATA[N]]></ISREADONLY> +<!--C4EED3241F928D5FE040007F010017B9--> <SEQNO><![CDATA[95]]></SEQNO> +<!--C4EED3241F928D5FE040007F010017B9--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE> +<!--C4EED3241F928D5FE040007F010017B9--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY> +<!--C4EED3241F928D5FE040007F010017B9--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> +<!--C4EED3241F928D5FE040007F010017B9--> <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION> +<!--C4EED3241F928D5FE040007F010017B9--> <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD> +<!--C4EED3241F928D5FE040007F010017B9--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> +<!--C4EED3241F928D5FE040007F010017B9--> <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN> +<!--C4EED3241F928D5FE040007F010017B9--> <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE> +<!--C4EED3241F928D5FE040007F010017B9--> <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR> +<!--C4EED3241F928D5FE040007F010017B9--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY> +<!--C4EED3241F928D5FE040007F010017B9--></AD_FIELD> + <!--C5116A0D29494E20B74E16BB6F8D1577--><AD_FIELD> <!--C5116A0D29494E20B74E16BB6F8D1577--> <AD_FIELD_ID><![CDATA[C5116A0D29494E20B74E16BB6F8D1577]]></AD_FIELD_ID> <!--C5116A0D29494E20B74E16BB6F8D1577--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r eefb7b36438c -r b08c32e4e264 src/org/openbravo/erpCommon/ad_actionButton/CopyFromPOOrder.java --- a/src/org/openbravo/erpCommon/ad_actionButton/CopyFromPOOrder.java Mon Jul 16 13:41:04 2012 +0200 +++ b/src/org/openbravo/erpCommon/ad_actionButton/CopyFromPOOrder.java Mon Jul 16 17:23:35 2012 +0200 @@ -66,20 +66,19 @@ String strTab = vars.getStringParameter("inpTabId"); String strWindowPath = Utility.getTabURL(strTab, "R", true); - if (strWindowPath.equals("")) + if (strWindowPath.equals("")) { strWindowPath = strDefaultServlet; + } - OBError myError = processButton(vars, strKey, strOrder, strWindow); - if (log4j.isDebugEnabled()) - log4j.debug(myError.getMessage()); + OBError myError = processButton(vars, strKey, strOrder); + log4j.debug(myError.getMessage()); vars.setMessage(strTab, myError); printPageClosePopUp(response, vars, strWindowPath); } else pageErrorPopUp(response); } - private OBError processButton(VariablesSecureApp vars, String strKey, String strOrder, - String windowId) { + private OBError processButton(VariablesSecureApp vars, String strKey, String strOrder) { OBError myError = null; int i = 0; String strPriceActual = ""; @@ -116,24 +115,30 @@ priceActual = (strPriceActual.equals("") ? ZERO : (new BigDecimal(strPriceActual))) .setScale(pricePrecision, BigDecimal.ROUND_HALF_UP); priceList = (strPriceList.equals("") ? ZERO : new BigDecimal(strPriceList)); - if (priceList.compareTo(ZERO) == 0) + if (priceList.compareTo(ZERO) == 0) { discount = ZERO; - else + } else { + // ((PL-PA)/PL)*100 discount = ((priceList.subtract(priceActual)).divide(priceList, 12, - BigDecimal.ROUND_HALF_EVEN)).multiply(new BigDecimal("100")); // ((PL-PA)/PL)*100 - if (discount.scale() > stdPrecision) + BigDecimal.ROUND_HALF_EVEN)).multiply(new BigDecimal("100")); + } + if (discount.scale() > stdPrecision) { discount = discount.setScale(stdPrecision, BigDecimal.ROUND_HALF_UP); + } strDiscount = discount.toString(); strPriceActual = priceActual.toString(); strPriceList = priceList.toString(); } } - if (strPriceActual.equals("")) + if (strPriceActual.equals("")) { strPriceActual = "0"; - if (strPriceList.equals("")) + } + if (strPriceList.equals("")) { strPriceList = "0"; - if (strPriceLimit.equals("")) + } + if (strPriceLimit.equals("")) { strPriceLimit = "0"; + } String strCTaxID = Tax.get(this, data[i].mProductId, orderData[0].datepromised, ------------------------------------------------------------------------------ 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
