details: https://code.openbravo.com/erp/devel/pi/rev/911b29d316f8 changeset: 32430:911b29d316f8 user: Nono Carballo <nonofce <at> gmail.com>Nono Carballo <nonofce <at> gmail.com> date: Mon Jul 10 09:04:57 2017 +0200 summary: Fixes Issue 36400: Adds a method to get default AUM for a product in Logistic Flow
details: https://code.openbravo.com/erp/devel/pi/rev/4091bd40e433 changeset: 32431:4091bd40e433 user: Nono Carballo <nonofce <at> gmail.com> date: Tue Jun 20 14:45:55 2017 -0400 summary: Related to Issue 36400: Added AUM fields to M_MOVEMENT based windows - Added c_aum and aumqty to m_movemeneline - Added c_aum and aumqty columns to M_MovementLine table in AD - Addes c_aum and aumqty fields to Goods Movement window details: https://code.openbravo.com/erp/devel/pi/rev/7a4238bcf81e changeset: 32432:7a4238bcf81e user: Nono Carballo <nonofce <at> gmail.com> date: Tue Jun 20 14:54:09 2017 -0400 summary: Related to Issue 36400: Updated callouts to work with AUM fields - Assigned callouts to c_aum and aumqty columns - Adapted SL_Movement_Product to work with AUM fields details: https://code.openbravo.com/erp/devel/pi/rev/24b9cf5d974a changeset: 32433:24b9cf5d974a user: Nono Carballo <nonofce <at> gmail.com> date: Tue Jun 20 15:58:41 2017 -0400 summary: Related to Issue 36400: Allow AUM fields be shown in grid view in Goods Movement window details: https://code.openbravo.com/erp/devel/pi/rev/17e39b7f0195 changeset: 32434:17e39b7f0195 user: David Miguelez <david.miguelez <at> openbravo.com> date: Mon Jul 03 17:24:27 2017 +0200 summary: Related to Issue 36400: Checks isProcessed column of M_Movement as stored in session Also, removes dependencies from Distribution Order Module into OperativeQty_To_BaseQty Callout. It checks the table instead of the Window in that scenario details: https://code.openbravo.com/erp/devel/pi/rev/9ec2fdaa6afd changeset: 32435:9ec2fdaa6afd user: David Miguelez <david.miguelez <at> openbravo.com> date: Tue Jul 04 12:53:15 2017 +0200 summary: Related to Issue 36400: Adds validation for UOM's in Logistic flow diffstat: src-db/database/model/tables/M_MOVEMENTLINE.xml | 14 + src-db/database/sourcedata/AD_COLUMN.xml | 86 +++++++++- src-db/database/sourcedata/AD_FIELD.xml | 60 ++++++ src-db/database/sourcedata/AD_VAL_RULE.xml | 11 + src/org/openbravo/erpCommon/ad_callouts/OperativeQuantity_To_BaseQuantity.java | 49 ++++- src/org/openbravo/erpCommon/ad_callouts/SL_Movement_Product.java | 14 +- src/org/openbravo/materialmgmt/UOMUtil.java | 31 +++ 7 files changed, 249 insertions(+), 16 deletions(-) diffs (truncated from 454 to 300 lines): diff -r 6203c605f739 -r 9ec2fdaa6afd src-db/database/model/tables/M_MOVEMENTLINE.xml --- a/src-db/database/model/tables/M_MOVEMENTLINE.xml Mon Jul 10 08:49:51 2017 +0200 +++ b/src-db/database/model/tables/M_MOVEMENTLINE.xml Tue Jul 04 12:53:15 2017 +0200 @@ -81,12 +81,23 @@ <default/> <onCreateDefault/> </column> + <column name="C_AUM" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false"> + <default/> + <onCreateDefault/> + </column> + <column name="AUMQTY" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false"> + <default/> + <onCreateDefault/> + </column> <foreign-key foreignTable="AD_CLIENT" name="M_MOVEMENTLINE_AD_CLIENT"> <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/> </foreign-key> <foreign-key foreignTable="AD_ORG" name="M_MOVEMENTLINE_AD_ORG"> <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/> </foreign-key> + <foreign-key foreignTable="C_UOM" name="M_MOVEMENTLINE_C_AUM"> + <reference local="C_AUM" foreign="C_UOM_ID"/> + </foreign-key> <foreign-key foreignTable="C_UOM" name="M_MOVEMENTLINE_C_UOM"> <reference local="C_UOM_ID" foreign="C_UOM_ID"/> </foreign-key> @@ -111,6 +122,9 @@ <foreign-key foreignTable="M_RESERVATION" name="M_MOVEMENTLINE_RESERVATION"> <reference local="M_RESERVATION_ID" foreign="M_RESERVATION_ID"/> </foreign-key> + <index name="M_MOVEMENTLINE_C_AUM" unique="false"> + <index-column name="C_AUM"/> + </index> <index name="M_MOVEMENTLINE_MOVEMENT" unique="false"> <index-column name="M_MOVEMENT_ID"/> </index> diff -r 6203c605f739 -r 9ec2fdaa6afd src-db/database/sourcedata/AD_COLUMN.xml --- a/src-db/database/sourcedata/AD_COLUMN.xml Mon Jul 10 08:49:51 2017 +0200 +++ b/src-db/database/sourcedata/AD_COLUMN.xml Tue Jul 04 12:53:15 2017 +0200 @@ -62915,7 +62915,7 @@ <!--3580--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> <!--3580--> <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN> <!--3580--> <AD_ELEMENT_ID><![CDATA[1047]]></AD_ELEMENT_ID> -<!--3580--> <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR> +<!--3580--> <ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR> <!--3580--> <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY> <!--3580--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE> <!--3580--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS> @@ -63446,7 +63446,7 @@ <!--3594--> <ISPARENT><![CDATA[N]]></ISPARENT> <!--3594--> <ISMANDATORY><![CDATA[Y]]></ISMANDATORY> <!--3594--> <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE> -<!--3594--> <READONLYLOGIC><![CDATA[@Processed@='Y']]></READONLYLOGIC> +<!--3594--> <READONLYLOGIC><![CDATA[@Processed@='Y' | @UomManagement@='Y']]></READONLYLOGIC> <!--3594--> <ISIDENTIFIER><![CDATA[Y]]></ISIDENTIFIER> <!--3594--> <SEQNO><![CDATA[2]]></SEQNO> <!--3594--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED> @@ -363376,6 +363376,46 @@ <!--D09DB7E52BFB468BBB10DB2AA00EF465--> <EM_OBUIAPP_PROCESS_ID><![CDATA[2669887A12CA495787BEBD2F425849AB]]></EM_OBUIAPP_PROCESS_ID> <!--D09DB7E52BFB468BBB10DB2AA00EF465--></AD_COLUMN> +<!--D0B078B5FC054979A1D62A846D79F7CD--><AD_COLUMN> +<!--D0B078B5FC054979A1D62A846D79F7CD--> <AD_COLUMN_ID><![CDATA[D0B078B5FC054979A1D62A846D79F7CD]]></AD_COLUMN_ID> +<!--D0B078B5FC054979A1D62A846D79F7CD--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--D0B078B5FC054979A1D62A846D79F7CD--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--D0B078B5FC054979A1D62A846D79F7CD--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--D0B078B5FC054979A1D62A846D79F7CD--> <NAME><![CDATA[Operative Quantity]]></NAME> +<!--D0B078B5FC054979A1D62A846D79F7CD--> <DESCRIPTION><![CDATA[The number of a certain item involved in the transaction, according to the defined Operative UOM.]]></DESCRIPTION> +<!--D0B078B5FC054979A1D62A846D79F7CD--> <HELP><![CDATA[The number of a certain item involved in the transaction, according to the defined Operative UOM.]]></HELP> +<!--D0B078B5FC054979A1D62A846D79F7CD--> <COLUMNNAME><![CDATA[Aumqty]]></COLUMNNAME> +<!--D0B078B5FC054979A1D62A846D79F7CD--> <AD_TABLE_ID><![CDATA[324]]></AD_TABLE_ID> +<!--D0B078B5FC054979A1D62A846D79F7CD--> <AD_REFERENCE_ID><![CDATA[29]]></AD_REFERENCE_ID> +<!--D0B078B5FC054979A1D62A846D79F7CD--> <FIELDLENGTH><![CDATA[2]]></FIELDLENGTH> +<!--D0B078B5FC054979A1D62A846D79F7CD--> <ISKEY><![CDATA[N]]></ISKEY> +<!--D0B078B5FC054979A1D62A846D79F7CD--> <ISPARENT><![CDATA[N]]></ISPARENT> +<!--D0B078B5FC054979A1D62A846D79F7CD--> <ISMANDATORY><![CDATA[Y]]></ISMANDATORY> +<!--D0B078B5FC054979A1D62A846D79F7CD--> <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE> +<!--D0B078B5FC054979A1D62A846D79F7CD--> <READONLYLOGIC><![CDATA[@Processed@='Y']]></READONLYLOGIC> +<!--D0B078B5FC054979A1D62A846D79F7CD--> <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER> +<!--D0B078B5FC054979A1D62A846D79F7CD--> <SEQNO><![CDATA[53]]></SEQNO> +<!--D0B078B5FC054979A1D62A846D79F7CD--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED> +<!--D0B078B5FC054979A1D62A846D79F7CD--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> +<!--D0B078B5FC054979A1D62A846D79F7CD--> <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN> +<!--D0B078B5FC054979A1D62A846D79F7CD--> <AD_ELEMENT_ID><![CDATA[9AAC1EE202DB487D89C4A3E75631E6C4]]></AD_ELEMENT_ID> +<!--D0B078B5FC054979A1D62A846D79F7CD--> <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR> +<!--D0B078B5FC054979A1D62A846D79F7CD--> <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY> +<!--D0B078B5FC054979A1D62A846D79F7CD--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE> +<!--D0B078B5FC054979A1D62A846D79F7CD--> <AD_CALLOUT_ID><![CDATA[1AB9BD3356D643A79C058AA3B4EB175E]]></AD_CALLOUT_ID> +<!--D0B078B5FC054979A1D62A846D79F7CD--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS> +<!--D0B078B5FC054979A1D62A846D79F7CD--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> +<!--D0B078B5FC054979A1D62A846D79F7CD--> <POSITION><![CDATA[24]]></POSITION> +<!--D0B078B5FC054979A1D62A846D79F7CD--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT> +<!--D0B078B5FC054979A1D62A846D79F7CD--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE> +<!--D0B078B5FC054979A1D62A846D79F7CD--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> +<!--D0B078B5FC054979A1D62A846D79F7CD--> <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION> +<!--D0B078B5FC054979A1D62A846D79F7CD--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE> +<!--D0B078B5FC054979A1D62A846D79F7CD--> <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING> +<!--D0B078B5FC054979A1D62A846D79F7CD--> <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING> +<!--D0B078B5FC054979A1D62A846D79F7CD--> <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK> +<!--D0B078B5FC054979A1D62A846D79F7CD--></AD_COLUMN> + <!--D0C775ACDFFE43E0B9ECE73CEBE31D4B--><AD_COLUMN> <!--D0C775ACDFFE43E0B9ECE73CEBE31D4B--> <AD_COLUMN_ID><![CDATA[D0C775ACDFFE43E0B9ECE73CEBE31D4B]]></AD_COLUMN_ID> <!--D0C775ACDFFE43E0B9ECE73CEBE31D4B--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -380345,6 +380385,48 @@ <!--FA378E83BDF64E50B44290065FA22F54--> <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK> <!--FA378E83BDF64E50B44290065FA22F54--></AD_COLUMN> +<!--FA4D837211D94085B37247595B490179--><AD_COLUMN> +<!--FA4D837211D94085B37247595B490179--> <AD_COLUMN_ID><![CDATA[FA4D837211D94085B37247595B490179]]></AD_COLUMN_ID> +<!--FA4D837211D94085B37247595B490179--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--FA4D837211D94085B37247595B490179--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--FA4D837211D94085B37247595B490179--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--FA4D837211D94085B37247595B490179--> <NAME><![CDATA[Alternative UOM]]></NAME> +<!--FA4D837211D94085B37247595B490179--> <DESCRIPTION><![CDATA[A non monetary unit of measure.]]></DESCRIPTION> +<!--FA4D837211D94085B37247595B490179--> <HELP><![CDATA[The Alternative UOM defines a unique non monetary unit of measure]]></HELP> +<!--FA4D837211D94085B37247595B490179--> <COLUMNNAME><![CDATA[C_Aum]]></COLUMNNAME> +<!--FA4D837211D94085B37247595B490179--> <AD_TABLE_ID><![CDATA[324]]></AD_TABLE_ID> +<!--FA4D837211D94085B37247595B490179--> <AD_REFERENCE_ID><![CDATA[18]]></AD_REFERENCE_ID> +<!--FA4D837211D94085B37247595B490179--> <AD_REFERENCE_VALUE_ID><![CDATA[D8CABB4103B14B42BE3064A68C600935]]></AD_REFERENCE_VALUE_ID> +<!--FA4D837211D94085B37247595B490179--> <AD_VAL_RULE_ID><![CDATA[D9A3E30D0CCA43F487EC83756C33D435]]></AD_VAL_RULE_ID> +<!--FA4D837211D94085B37247595B490179--> <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH> +<!--FA4D837211D94085B37247595B490179--> <ISKEY><![CDATA[N]]></ISKEY> +<!--FA4D837211D94085B37247595B490179--> <ISPARENT><![CDATA[N]]></ISPARENT> +<!--FA4D837211D94085B37247595B490179--> <ISMANDATORY><![CDATA[Y]]></ISMANDATORY> +<!--FA4D837211D94085B37247595B490179--> <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE> +<!--FA4D837211D94085B37247595B490179--> <READONLYLOGIC><![CDATA[@Processed@='Y']]></READONLYLOGIC> +<!--FA4D837211D94085B37247595B490179--> <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER> +<!--FA4D837211D94085B37247595B490179--> <SEQNO><![CDATA[43]]></SEQNO> +<!--FA4D837211D94085B37247595B490179--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED> +<!--FA4D837211D94085B37247595B490179--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> +<!--FA4D837211D94085B37247595B490179--> <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN> +<!--FA4D837211D94085B37247595B490179--> <AD_ELEMENT_ID><![CDATA[397A72C953A54C3BA77B8B8F8C11407E]]></AD_ELEMENT_ID> +<!--FA4D837211D94085B37247595B490179--> <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR> +<!--FA4D837211D94085B37247595B490179--> <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY> +<!--FA4D837211D94085B37247595B490179--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE> +<!--FA4D837211D94085B37247595B490179--> <AD_CALLOUT_ID><![CDATA[1AB9BD3356D643A79C058AA3B4EB175E]]></AD_CALLOUT_ID> +<!--FA4D837211D94085B37247595B490179--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS> +<!--FA4D837211D94085B37247595B490179--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> +<!--FA4D837211D94085B37247595B490179--> <POSITION><![CDATA[23]]></POSITION> +<!--FA4D837211D94085B37247595B490179--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT> +<!--FA4D837211D94085B37247595B490179--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE> +<!--FA4D837211D94085B37247595B490179--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> +<!--FA4D837211D94085B37247595B490179--> <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION> +<!--FA4D837211D94085B37247595B490179--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE> +<!--FA4D837211D94085B37247595B490179--> <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING> +<!--FA4D837211D94085B37247595B490179--> <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING> +<!--FA4D837211D94085B37247595B490179--> <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK> +<!--FA4D837211D94085B37247595B490179--></AD_COLUMN> + <!--FA5FCE09EB7F40999DD0DF1D51AF7DB7--><AD_COLUMN> <!--FA5FCE09EB7F40999DD0DF1D51AF7DB7--> <AD_COLUMN_ID><![CDATA[FA5FCE09EB7F40999DD0DF1D51AF7DB7]]></AD_COLUMN_ID> <!--FA5FCE09EB7F40999DD0DF1D51AF7DB7--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r 6203c605f739 -r 9ec2fdaa6afd src-db/database/sourcedata/AD_FIELD.xml --- a/src-db/database/sourcedata/AD_FIELD.xml Mon Jul 10 08:49:51 2017 +0200 +++ b/src-db/database/sourcedata/AD_FIELD.xml Tue Jul 04 12:53:15 2017 +0200 @@ -198409,6 +198409,36 @@ <!--317E7BE2AEB1474F9F37D3C115B72EB6--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY> <!--317E7BE2AEB1474F9F37D3C115B72EB6--></AD_FIELD> +<!--3181A5FA77E04CDB8CF1019A8B74F559--><AD_FIELD> +<!--3181A5FA77E04CDB8CF1019A8B74F559--> <AD_FIELD_ID><![CDATA[3181A5FA77E04CDB8CF1019A8B74F559]]></AD_FIELD_ID> +<!--3181A5FA77E04CDB8CF1019A8B74F559--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--3181A5FA77E04CDB8CF1019A8B74F559--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--3181A5FA77E04CDB8CF1019A8B74F559--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--3181A5FA77E04CDB8CF1019A8B74F559--> <NAME><![CDATA[Alternative UOM]]></NAME> +<!--3181A5FA77E04CDB8CF1019A8B74F559--> <DESCRIPTION><![CDATA[A non monetary unit of measure.]]></DESCRIPTION> +<!--3181A5FA77E04CDB8CF1019A8B74F559--> <HELP><![CDATA[The Alternative UOM defines a unique non monetary unit of measure]]></HELP> +<!--3181A5FA77E04CDB8CF1019A8B74F559--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED> +<!--3181A5FA77E04CDB8CF1019A8B74F559--> <AD_TAB_ID><![CDATA[260]]></AD_TAB_ID> +<!--3181A5FA77E04CDB8CF1019A8B74F559--> <AD_COLUMN_ID><![CDATA[FA4D837211D94085B37247595B490179]]></AD_COLUMN_ID> +<!--3181A5FA77E04CDB8CF1019A8B74F559--> <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD> +<!--3181A5FA77E04CDB8CF1019A8B74F559--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED> +<!--3181A5FA77E04CDB8CF1019A8B74F559--> <DISPLAYLOGIC><![CDATA[@M_Product_Uom_Id@='']]></DISPLAYLOGIC> +<!--3181A5FA77E04CDB8CF1019A8B74F559--> <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH> +<!--3181A5FA77E04CDB8CF1019A8B74F559--> <ISREADONLY><![CDATA[N]]></ISREADONLY> +<!--3181A5FA77E04CDB8CF1019A8B74F559--> <SEQNO><![CDATA[45]]></SEQNO> +<!--3181A5FA77E04CDB8CF1019A8B74F559--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE> +<!--3181A5FA77E04CDB8CF1019A8B74F559--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY> +<!--3181A5FA77E04CDB8CF1019A8B74F559--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> +<!--3181A5FA77E04CDB8CF1019A8B74F559--> <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION> +<!--3181A5FA77E04CDB8CF1019A8B74F559--> <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD> +<!--3181A5FA77E04CDB8CF1019A8B74F559--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> +<!--3181A5FA77E04CDB8CF1019A8B74F559--> <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN> +<!--3181A5FA77E04CDB8CF1019A8B74F559--> <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE> +<!--3181A5FA77E04CDB8CF1019A8B74F559--> <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR> +<!--3181A5FA77E04CDB8CF1019A8B74F559--> <DISPLAYLOGIC_SERVER><![CDATA[@UomManagement@='Y']]></DISPLAYLOGIC_SERVER> +<!--3181A5FA77E04CDB8CF1019A8B74F559--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY> +<!--3181A5FA77E04CDB8CF1019A8B74F559--></AD_FIELD> + <!--318588F6E35249488A0470C1905F3E0B--><AD_FIELD> <!--318588F6E35249488A0470C1905F3E0B--> <AD_FIELD_ID><![CDATA[318588F6E35249488A0470C1905F3E0B]]></AD_FIELD_ID> <!--318588F6E35249488A0470C1905F3E0B--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -303863,6 +303893,36 @@ <!--E08B7961A1894624A25918204633568E--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY> <!--E08B7961A1894624A25918204633568E--></AD_FIELD> +<!--E0940FDF8A404210BB13AFFBE0C58645--><AD_FIELD> +<!--E0940FDF8A404210BB13AFFBE0C58645--> <AD_FIELD_ID><![CDATA[E0940FDF8A404210BB13AFFBE0C58645]]></AD_FIELD_ID> +<!--E0940FDF8A404210BB13AFFBE0C58645--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--E0940FDF8A404210BB13AFFBE0C58645--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--E0940FDF8A404210BB13AFFBE0C58645--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--E0940FDF8A404210BB13AFFBE0C58645--> <NAME><![CDATA[Operative Quantity]]></NAME> +<!--E0940FDF8A404210BB13AFFBE0C58645--> <DESCRIPTION><![CDATA[The number of a certain item involved in the transaction, according to the defined Operative UOM.]]></DESCRIPTION> +<!--E0940FDF8A404210BB13AFFBE0C58645--> <HELP><![CDATA[The number of a certain item involved in the transaction, according to the defined Operative UOM.]]></HELP> +<!--E0940FDF8A404210BB13AFFBE0C58645--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED> +<!--E0940FDF8A404210BB13AFFBE0C58645--> <AD_TAB_ID><![CDATA[260]]></AD_TAB_ID> +<!--E0940FDF8A404210BB13AFFBE0C58645--> <AD_COLUMN_ID><![CDATA[D0B078B5FC054979A1D62A846D79F7CD]]></AD_COLUMN_ID> +<!--E0940FDF8A404210BB13AFFBE0C58645--> <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD> +<!--E0940FDF8A404210BB13AFFBE0C58645--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED> +<!--E0940FDF8A404210BB13AFFBE0C58645--> <DISPLAYLOGIC><![CDATA[@M_Product_Uom_Id@='']]></DISPLAYLOGIC> +<!--E0940FDF8A404210BB13AFFBE0C58645--> <DISPLAYLENGTH><![CDATA[2]]></DISPLAYLENGTH> +<!--E0940FDF8A404210BB13AFFBE0C58645--> <ISREADONLY><![CDATA[N]]></ISREADONLY> +<!--E0940FDF8A404210BB13AFFBE0C58645--> <SEQNO><![CDATA[43]]></SEQNO> +<!--E0940FDF8A404210BB13AFFBE0C58645--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE> +<!--E0940FDF8A404210BB13AFFBE0C58645--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY> +<!--E0940FDF8A404210BB13AFFBE0C58645--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> +<!--E0940FDF8A404210BB13AFFBE0C58645--> <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION> +<!--E0940FDF8A404210BB13AFFBE0C58645--> <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD> +<!--E0940FDF8A404210BB13AFFBE0C58645--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> +<!--E0940FDF8A404210BB13AFFBE0C58645--> <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN> +<!--E0940FDF8A404210BB13AFFBE0C58645--> <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE> +<!--E0940FDF8A404210BB13AFFBE0C58645--> <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR> +<!--E0940FDF8A404210BB13AFFBE0C58645--> <DISPLAYLOGIC_SERVER><![CDATA[@UomManagement@='Y']]></DISPLAYLOGIC_SERVER> +<!--E0940FDF8A404210BB13AFFBE0C58645--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY> +<!--E0940FDF8A404210BB13AFFBE0C58645--></AD_FIELD> + <!--E0B9705EA3F64E78ACBFB1E7284A4BB3--><AD_FIELD> <!--E0B9705EA3F64E78ACBFB1E7284A4BB3--> <AD_FIELD_ID><![CDATA[E0B9705EA3F64E78ACBFB1E7284A4BB3]]></AD_FIELD_ID> <!--E0B9705EA3F64E78ACBFB1E7284A4BB3--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r 6203c605f739 -r 9ec2fdaa6afd src-db/database/sourcedata/AD_VAL_RULE.xml --- a/src-db/database/sourcedata/AD_VAL_RULE.xml Mon Jul 10 08:49:51 2017 +0200 +++ b/src-db/database/sourcedata/AD_VAL_RULE.xml Tue Jul 04 12:53:15 2017 +0200 @@ -2320,6 +2320,17 @@ <!--D9463AFD77E44F619D396C19BF9E6A15--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> <!--D9463AFD77E44F619D396C19BF9E6A15--></AD_VAL_RULE> +<!--D9A3E30D0CCA43F487EC83756C33D435--><AD_VAL_RULE> +<!--D9A3E30D0CCA43F487EC83756C33D435--> <AD_VAL_RULE_ID><![CDATA[D9A3E30D0CCA43F487EC83756C33D435]]></AD_VAL_RULE_ID> +<!--D9A3E30D0CCA43F487EC83756C33D435--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--D9A3E30D0CCA43F487EC83756C33D435--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--D9A3E30D0CCA43F487EC83756C33D435--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--D9A3E30D0CCA43F487EC83756C33D435--> <NAME><![CDATA[Available UOM's for Product for Logistics flow]]></NAME> +<!--D9A3E30D0CCA43F487EC83756C33D435--> <TYPE><![CDATA[S]]></TYPE> +<!--D9A3E30D0CCA43F487EC83756C33D435--> <CODE><![CDATA[td0.c_uom_id IN(select p.c_uom_id from m_product p where p.m_product_id = @M_Product_ID@) or td0.c_uom_id IN (select a.c_uom_id from m_product_aum a where a.m_product_id = @M_Product_ID@ and a.logistics <> 'NA')]]></CODE> +<!--D9A3E30D0CCA43F487EC83756C33D435--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> +<!--D9A3E30D0CCA43F487EC83756C33D435--></AD_VAL_RULE> + <!--DB85A30739C3487988921CE3FFFD3BAD--><AD_VAL_RULE> <!--DB85A30739C3487988921CE3FFFD3BAD--> <AD_VAL_RULE_ID><![CDATA[DB85A30739C3487988921CE3FFFD3BAD]]></AD_VAL_RULE_ID> <!--DB85A30739C3487988921CE3FFFD3BAD--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r 6203c605f739 -r 9ec2fdaa6afd src/org/openbravo/erpCommon/ad_callouts/OperativeQuantity_To_BaseQuantity.java --- a/src/org/openbravo/erpCommon/ad_callouts/OperativeQuantity_To_BaseQuantity.java Mon Jul 10 08:49:51 2017 +0200 +++ b/src/org/openbravo/erpCommon/ad_callouts/OperativeQuantity_To_BaseQuantity.java Tue Jul 04 12:53:15 2017 +0200 @@ -11,7 +11,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) 2016 Openbravo SLU + * All portions are Copyright (C) 2016-2017 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************ @@ -22,10 +22,17 @@ import javax.servlet.ServletException; +import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; +import org.hibernate.criterion.Restrictions; import org.openbravo.base.exception.OBException; import org.openbravo.dal.core.OBContext; +import org.openbravo.dal.service.OBCriteria; +import org.openbravo.dal.service.OBDal; import org.openbravo.materialmgmt.UOMUtil; +import org.openbravo.model.ad.datamodel.Table; +import org.openbravo.model.ad.ui.Tab; +import org.openbravo.model.ad.ui.Window; /** * @@ -33,17 +40,20 @@ * */ public class OperativeQuantity_To_BaseQuantity extends SimpleCallout { + private static final Logger logger = Logger.getLogger(OperativeQuantity_To_BaseQuantity.class); private static final String ADWINDOW_SalesOrder = "143"; private static final String ADWINDOW_PurchaseOrder = "181"; private static final String ADWINDOW_GoodsShipment = "169"; private static final String ADWINDOW_GoodsReceipt = "184"; + private static final String ADWINDOW_GoodsMovements = "170"; private static final String ADWINDOW_SalesInvoice = "167"; private static final String ADWINDOW_PurchaseInvoice = "183"; private static final String ADWINDOW_Requisition = "800092"; private static final String ADWINDOW_ManageRequisition = "1004400000"; private static final String ADWINDOW_SalesQuotation = "6CB5B67ED33F47DFA334079D3EA2340E"; + private static final String ADTABLE_GoodsMovement = "323"; ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot _______________________________________________ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
