0021611: Product selector in window assortment is showing sales and purchase products.

diff --git a/src-db/database/sourcedata/AD_COLUMN.xml b/src-db/database/sourcedata/AD_COLUMN.xml --- a/src-db/database/sourcedata/AD_COLUMN.xml +++ b/src-db/database/sourcedata/AD_COLUMN.xml @@ -225,7 +225,7 @@  <COLUMNNAME><![CDATA[M_Product_ID]]></COLUMNNAME>  <AD_TABLE_ID><![CDATA[B0186626ABEC4D3398EF6CF0DAEE9FD5]]></AD_TABLE_ID>  <AD_REFERENCE_ID><![CDATA[30]]></AD_REFERENCE_ID> - <AD_REFERENCE_VALUE_ID><![CDATA[800011]]></AD_REFERENCE_VALUE_ID> + <AD_REFERENCE_VALUE_ID><![CDATA[B0EAEFDB4D5046C3BAB792160CB0D127]]></AD_REFERENCE_VALUE_ID>  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>  <ISKEY><![CDATA[N]]></ISKEY>  <ISPARENT><![CDATA[N]]></ISPARENT> diff --git a/src-db/database/sourcedata/AD_MODEL_OBJECT.xml b/src-db/database/sourcedata/AD_MODEL_OBJECT.xml --- a/src-db/database/sourcedata/AD_MODEL_OBJECT.xml +++ b/src-db/database/sourcedata/AD_MODEL_OBJECT.xml @@ -1,5 +1,17 @@ <?xml version='1.0' encoding='UTF-8'?> <data> +<AD_MODEL_OBJECT> + <AD_MODEL_OBJECT_ID><![CDATA[07C527561924468E98D07C6C96EE5E4F]]></AD_MODEL_OBJECT_ID> + <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> + <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> + <ISACTIVE><![CDATA[Y]]></ISACTIVE> + <ACTION><![CDATA[S]]></ACTION> + <CLASSNAME><![CDATA[org.openbravo.retail.config.info.SaleProductComplete]]></CLASSNAME> + <ISDEFAULT><![CDATA[Y]]></ISDEFAULT> + <AD_REFERENCE_ID><![CDATA[B0EAEFDB4D5046C3BAB792160CB0D127]]></AD_REFERENCE_ID> + <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE> +</AD_MODEL_OBJECT> + <AD_MODEL_OBJECT>  <AD_MODEL_OBJECT_ID><![CDATA[8B52EB0FD7A448BE875A45E4FC8DDDA7]]></AD_MODEL_OBJECT_ID>  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff --git a/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml b/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml --- a/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml +++ b/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml @@ -10,6 +10,16 @@  <ISDEFAULT><![CDATA[Y]]></ISDEFAULT> </AD_MODEL_OBJECT_MAPPING> +<AD_MODEL_OBJECT_MAPPING> + <AD_MODEL_OBJECT_MAPPING_ID><![CDATA[A45D4D256F344157AA3F614192A128CA]]></AD_MODEL_OBJECT_MAPPING_ID> + <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> + <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> + <ISACTIVE><![CDATA[Y]]></ISACTIVE> + <AD_MODEL_OBJECT_ID><![CDATA[07C527561924468E98D07C6C96EE5E4F]]></AD_MODEL_OBJECT_ID> + <MAPPINGNAME><![CDATA[/org.openbravo.retail.config.info/SaleProductComplete.html]]></MAPPINGNAME> + <ISDEFAULT><![CDATA[Y]]></ISDEFAULT> +</AD_MODEL_OBJECT_MAPPING> + <AD_MODEL_OBJECT_MAPPING>  <AD_MODEL_OBJECT_MAPPING_ID><![CDATA[E9DDEE4703A043E1B38F57B5D8FEC58D]]></AD_MODEL_OBJECT_MAPPING_ID>  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff --git a/src-db/database/sourcedata/AD_REFERENCE.xml b/src-db/database/sourcedata/AD_REFERENCE.xml --- a/src-db/database/sourcedata/AD_REFERENCE.xml +++ b/src-db/database/sourcedata/AD_REFERENCE.xml @@ -25,6 +25,18 @@  <ISVALUEDISPLAYED><![CDATA[N]]></ISVALUEDISPLAYED> </AD_REFERENCE> +<AD_REFERENCE> + <AD_REFERENCE_ID><![CDATA[B0EAEFDB4D5046C3BAB792160CB0D127]]></AD_REFERENCE_ID> + <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> + <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> + <ISACTIVE><![CDATA[Y]]></ISACTIVE> + <NAME><![CDATA[Sale Product Complete]]></NAME> + <AD_MODULE_ID><![CDATA[50BF0CEB5D7E438CBBE80688EDB68039]]></AD_MODULE_ID> + <ISBASEREFERENCE><![CDATA[N]]></ISBASEREFERENCE> + <PARENTREFERENCE_ID><![CDATA[30]]></PARENTREFERENCE_ID> + <ISVALUEDISPLAYED><![CDATA[N]]></ISVALUEDISPLAYED> +</AD_REFERENCE> + <AD_REFERENCE>  <AD_REFERENCE_ID><![CDATA[B6C0F97E6722441187E79E94C9A2F00F]]></AD_REFERENCE_ID>  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff --git a/src/org/openbravo/retail/config/process/IncludeAllProducts.java b/src/org/openbravo/retail/config/process/IncludeAllProducts.java --- a/src/org/openbravo/retail/config/process/IncludeAllProducts.java +++ b/src/org/openbravo/retail/config/process/IncludeAllProducts.java @@ -50,6 +50,7 @@ whereClause.append(" as p "); whereClause.append(" where not exists (select 1 from OBRETCO_Prol_Product as retpro "); whereClause.append("where retpro.product.id = p.id and retpro.obretcoProductlist.id = ?) "); + whereClause.append("and p.sale = 'Y' "); whereClause.append("and p.organization.id in ("); whereClause.append(Utility .getInStrSet(OBContext.getOBContext().getOrganizationStructureProvider()

Notes
(0052000) jecharri (viewer) 2012-09-11 17:19	ticket 16904 26/11/2012 4:08 PM

(0054841) jonalegriaesarte (viewer) 2012-12-11 15:40	Patch attached. Pending to repository unfrozen.

(0054956) hgbot (developer) 2012-12-17 10:50	Repository: erp/pmods/org.openbravo.retail.config Changeset: c8b284849305614ceb03c07b0377a78fdf6af656 Author: Miguel de Juana <miguel.dejuana <at> openbravo.com> Date: Mon Dec 17 10:47:18 2012 +0100 URL: http://code.openbravo.com/erp/pmods/org.openbravo.retail.config/rev/c8b284849305614ceb03c07b0377a78fdf6af656 [^] Fixed issue 21611: Product selector shows sales products only --- M src-db/database/sourcedata/AD_COLUMN.xml M src-db/database/sourcedata/AD_MODEL_OBJECT.xml M src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml M src-db/database/sourcedata/AD_REFERENCE.xml M src/org/openbravo/retail/config/process/IncludeAllProducts.java ---

(0055110) hgbot (developer) 2012-12-20 12:08	Repository: erp/pmods/org.openbravo.retail.config Changeset: 1fde3c61360bb0474cfa04e41f0e1a62fa36c6f5 Author: Miguel de Juana <miguel.dejuana <at> openbravo.com> Date: Thu Dec 20 12:08:23 2012 +0100 URL: http://code.openbravo.com/erp/pmods/org.openbravo.retail.config/rev/1fde3c61360bb0474cfa04e41f0e1a62fa36c6f5 [^] Related to issue 21611 --- A src-db/database/sourcedata/OBCLKER_UIDEFINITION.xml A src-db/database/sourcedata/OBUISEL_SELECTOR.xml A src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml ---

(0055201) guilleaer (viewer) 2012-12-26 15:21	tested & verified

Issue History
Date Modified	Username	Field	Change
2012-09-11 17:11	jecharri	New Issue
2012-09-11 17:11	jecharri	Assigned To	=> adrianromero
2012-09-11 17:11	jecharri	OBNetwork customer	=> No
2012-09-11 17:11	jecharri	OBNetwork customer	No => Yes
2012-09-11 17:19	jecharri	Note Added: 0052000
2012-11-09 13:38	alostale	Status	new => scheduled
2012-11-09 13:38	alostale	Assigned To	adrianromero => migueldejuana
2012-11-09 13:38	alostale	fix_in_branch	=> pi
2012-12-10 12:41	migueldejuana	Target Version	=> RMP18
2012-12-10 12:41	migueldejuana	fix_in_branch	pi =>
2012-12-10 12:41	migueldejuana	Priority	high => immediate
2012-12-11 15:37	migueldejuana	File Added: issue21611.diff
2012-12-11 15:40	jonalegriaesarte	Note Added: 0054841
2012-12-11 15:40	jonalegriaesarte	Status	scheduled => resolved
2012-12-11 15:40	jonalegriaesarte	Fixed in Version	=> RMP18
2012-12-11 15:40	jonalegriaesarte	Resolution	open => fixed
2012-12-17 10:50	hgbot	Checkin
2012-12-17 10:50	hgbot	Note Added: 0054956
2012-12-17 10:50	hgbot	Fixed in SCM revision	=> http://code.openbravo.com/erp/pmods/org.openbravo.retail.config/rev/c8b284849305614ceb03c07b0377a78fdf6af656 [^]
2012-12-20 12:08	hgbot	Checkin
2012-12-20 12:08	hgbot	Note Added: 0055110
2012-12-26 15:21	guilleaer	Note Added: 0055201
2012-12-26 15:21	guilleaer	Status	resolved => closed

Relationships [ Relation Graph ] [ Dependency Graph ]