details: https://code.openbravo.com/erp/stable/2.50/rev/cab2322adf42 changeset: 9883:cab2322adf42 user: Víctor Martínez Romanos <victor.martinez <at> openbravo.com> date: Mon Aug 06 14:38:55 2012 +0200 summary: Fixed bug 21294, Fixed bug 21316: Enterprise Module Management
+ Client/Org modules are now properly displayed + An already applied dataset is not shown anymore for ancestor/child orgs + Checksum is now taken into account in case of updates. We also use the versions for those scenarios where the dataset has been created without checksum (old 2.50 modules) + ISACTIVE column is taken into account + The LEFT JOIN is now filtering by the selected organization. The client is also included into the join clause to avoid swapping the client and org parameters into the generated sqlc method. details: https://code.openbravo.com/erp/stable/2.50/rev/d96d77790ca9 changeset: 9884:d96d77790ca9 user: RM packaging bot <staff.rm <at> openbravo.com> date: Wed Aug 08 21:48:11 2012 +0000 summary: Update AD_MODULE version to 2.50MP44.1 details: https://code.openbravo.com/erp/stable/2.50/rev/14ab07d6d8d2 changeset: 9885:14ab07d6d8d2 user: RM packaging bot <staff.rm <at> openbravo.com> date: Wed Aug 08 21:48:12 2012 +0000 summary: Added tag 2.50MP44.1 for changeset d96d77790ca9 details: https://code.openbravo.com/erp/stable/2.50/rev/daf6bc224dee changeset: 9886:daf6bc224dee user: RM packaging bot <staff.rm <at> openbravo.com> date: Wed Aug 08 21:48:12 2012 +0000 summary: Added signature for changeset 14ab07d6d8d2 details: https://code.openbravo.com/erp/stable/2.50/rev/1506f11efe15 changeset: 9887:1506f11efe15 user: RM packaging bot <staff.rm <at> openbravo.com> date: Thu Aug 09 18:45:57 2012 +0000 summary: Merge temporary head for 2.50MP44.1 diffstat: .hgsigs | 3 + .hgtags | 3 + src/org/openbravo/erpCommon/modules/ModuleReferenceDataOrgTree_data.xsql | 29 +++++++-- 3 files changed, 29 insertions(+), 6 deletions(-) diffs (98 lines): diff -r ae4783f13a71 -r 1506f11efe15 .hgsigs --- a/.hgsigs Tue Jul 17 06:02:47 2012 +0000 +++ b/.hgsigs Thu Aug 09 18:45:57 2012 +0000 @@ -50,3 +50,6 @@ 2c848102025d9073ebee66a2ed3547282fa65b6d 0 iEYEABECAAYFAk9jf/MACgkQCX/oGf+2qkM7EQCgoSgZdKK8XyuLuYuY28wnyrn0E2MAoJyxuApTzIzLV6AfR8pMa5ImnDxW 862d0f5550813b0088a1618861534ed7ae958229 0 iEYEABECAAYFAk+MRt8ACgkQCX/oGf+2qkOIawCbBjOYJQITpaJjroLxH03QiTZxXSwAoM0RcGpvtVITTcCu79hoTnuy0Mp4 ee13d3872de31beba028d398cd082c61968f6b98 0 iEYEABECAAYFAk/puR8ACgkQCX/oGf+2qkMZjwCeI27XIqbGIvea2zAt6wad/pjl6fMAoOfj2U+5ilvZxt0QVMn/Hvlk/OQK +6cf28c19c472e1ef059be192a47c014694c5635b 0 iEYEABECAAYFAlAiKgwACgkQCX/oGf+2qkNYTACg0gmPpWzgsl94j+atJK/JS9I/Hv4AoKXuTijxeeYU9YDX2zF8qa6V9DuY +bdfc34dda2725d0f526d8151ab2099248f114630 0 iEYEABECAAYFAlAFAAgACgkQCX/oGf+2qkNymwCgkg77E54Pe5C6UNh3emHXzxPrjvgAnRm2fpq+YoWVnTp5GMR2okMdmgkT +14ab07d6d8d26e6d145027d1ae4bb4ce3fa37620 0 iEYEABECAAYFAlAi3pwACgkQCX/oGf+2qkNfhACg4JXQCoZbzpvc0jVYXVzl1RwGJX8AoLtA8k7+t3uZZXjyCOIwacYtFv4k diff -r ae4783f13a71 -r 1506f11efe15 .hgtags --- a/.hgtags Tue Jul 17 06:02:47 2012 +0000 +++ b/.hgtags Thu Aug 09 18:45:57 2012 +0000 @@ -61,3 +61,6 @@ d26b6290e0ab88bcf6eb76440ede69b43f9704d7 2.50MP40 a687de381f06486696f8149d70000104caeb4a60 2.50MP41 e98b36a3ad92b427bac6233d289a77d5974ad500 2.50MP43 +48b25af4e8b319b0698e7dbd83ae18a6268fa92b 2.50MP43.1 +ae4783f13a713e4bca56fe224525241f3858622d 2.50MP44 +d96d77790ca9e132c9c10c06d993626fae1a4f88 2.50MP44.1 diff -r ae4783f13a71 -r 1506f11efe15 src/org/openbravo/erpCommon/modules/ModuleReferenceDataOrgTree_data.xsql --- a/src/org/openbravo/erpCommon/modules/ModuleReferenceDataOrgTree_data.xsql Tue Jul 17 06:02:47 2012 +0000 +++ b/src/org/openbravo/erpCommon/modules/ModuleReferenceDataOrgTree_data.xsql Thu Aug 09 18:45:57 2012 +0000 @@ -12,7 +12,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-2009 Openbravo SLU + * All portions are Copyright (C) 2008-2012 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************ @@ -56,7 +56,8 @@ AND ((EXISTS (SELECT 1 FROM ad_dataset WHERE M.ad_module_id = AD_DATASET.ad_module_id AND AD_DATASET.ACCESSLEVEL IN ('3','1') - AND AD_DATASET.EXPORTALLOWED = 'Y') + AND AD_DATASET.EXPORTALLOWED = 'Y' + AND ISACTIVE = 'Y') AND M.HASREFERENCEDATA = 'Y') OR M.haschartofaccounts = 'Y') AND NOT EXISTS (SELECT 1 FROM AD_CLIENTMODULE CM @@ -81,9 +82,10 @@ CASE WHEN COALESCE(AD_ORGMODULE.VERSION,M.VERSION) <> M.VERSION THEN 'Y' ELSE '' END AS Update_Available, m.seqno FROM AD_Module M left join AD_DATASET on M.ad_module_id = AD_DATASET.ad_module_id - LEFT JOIN AD_ORGMODULE ON M.AD_MODULE_ID = AD_ORGMODULE.AD_MODULE_ID + LEFT JOIN AD_ORGMODULE ON (M.AD_MODULE_ID = AD_ORGMODULE.AD_MODULE_ID AND AD_ORGMODULE.AD_Client_ID = ? AND AD_ORGMODULE.AD_ORG_ID = ? ) WHERE M.TYPE = 'M' AND M.ISACTIVE = 'Y' + AND AD_DATASET.ISACTIVE = 'Y' AND 1=1 AND M.HASREFERENCEDATA = 'Y' AND EXPORTALLOWED = 'Y' @@ -97,17 +99,31 @@ AND OM.AD_CLIENT_ID = ? AND (AD_IsOrgIncluded(?, OM.AD_Org_ID, OM.AD_Client_ID)<>-1 OR AD_IsOrgIncluded(OM.AD_Org_ID, ?, OM.AD_Client_ID)<>-1) - AND OM.VERSION = M.VERSION) - AND (((? <> '0') AND AD_DATASET.ACCESSLEVEL IN ('1')) + AND (OM.CHECKSUM LIKE '%'|| AD_DATASET.CHECKSUM ||'%' + /* it hides the dataset in case both checksum are null (it may happen in datasets created without checksum column) */ + OR COALESCE(OM.VERSION,M.VERSION) = M.VERSION)) + AND NOT EXISTS (SELECT 1 FROM AD_ORGMODULE OM + WHERE OM.ad_module_id = M.ad_module_id + AND OM.AD_CLIENT_ID = ? + AND (AD_IsOrgIncluded(OM.AD_Org_ID, ?, OM.AD_Client_ID)<>-1 + OR AD_IsOrgIncluded(?, OM.AD_Org_ID, OM.AD_Client_ID)<>-1) + AND OM.ad_org_id <> ?) + AND (((? <> '0') AND AD_DATASET.ACCESSLEVEL IN ('1', '3')) OR ((? = '0') AND AD_DATASET.ACCESSLEVEL IN ('3', '6')))) A ORDER BY A.SeqNo ]]> </Sql> <Parameter name="lang"/> <Parameter name="client"/> + <Parameter name="org"/> + <Parameter name="client"/> <Parameter name="client"/> <Parameter name="org"/> <Parameter name="org"/> + <Parameter name="client"/> + <Parameter name="org"/> + <Parameter name="org"/> + <Parameter name="org"/> <Parameter name="org"/> <Parameter name="org"/> </SqlMethod> @@ -130,7 +146,8 @@ AND IsIncluded = 'Y') AND EXISTS (SELECT 1 FROM AD_DATASET WHERE AD_DATASET.AD_MODULE_ID = M.AD_MODULE_ID - AND EXPORTALLOWED = 'Y') + AND EXPORTALLOWED = 'Y' + AND ISACTIVE = 'Y') AND ISACTIVE = 'Y' </Sql> <Parameter name="lang"/> ------------------------------------------------------------------------------ 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
