details: https://code.openbravo.com/erp/devel/pi/rev/4d7988468158 changeset: 14769:4d7988468158 user: Ioritz Cia <ioritz.cia <at> openbravo.com> date: Fri Nov 25 12:37:42 2011 +0100 summary: Fixes issue 19143: Material Receipts Dimensional Report must be renamed as Goods Receipts Dimensional Report.
details: https://code.openbravo.com/erp/devel/pi/rev/a2f4f9c97dac changeset: 14770:a2f4f9c97dac user: Ioritz Cia <ioritz.cia <at> openbravo.com> date: Thu Nov 24 12:35:48 2011 +0100 summary: Fixes issue 19077: Makes sense to move Payment Run window from Receivables & Payables // Transactions to Analysis Tools. details: https://code.openbravo.com/erp/devel/pi/rev/c6091e1c1bf1 changeset: 14771:c6091e1c1bf1 user: Ioritz Cia <ioritz.cia <at> openbravo.com> date: Fri Nov 25 09:24:08 2011 +0100 summary: Fixes issue 18707: Assets - create amortization process failing when Start Date is the last day of the month (Monthly depreciation type). details: https://code.openbravo.com/erp/devel/pi/rev/cea448dfffc3 changeset: 14772:cea448dfffc3 user: Ioritz Cia <ioritz.cia <at> openbravo.com> date: Mon Nov 28 11:07:49 2011 +0100 summary: Fixes issue 19063: Error when opening year with several organizations and same calendar. details: https://code.openbravo.com/erp/devel/pi/rev/ff6f43f60ade changeset: 14773:ff6f43f60ade user: Ioritz Cia <ioritz.cia <at> openbravo.com> date: Wed Nov 30 14:07:42 2011 +0100 summary: Fixes issue 18794: Procurement Management menu needs to be changed. diffstat: modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TREENODE.xml | 4 +- src-db/database/model/functions/A_ASSET_POST.xml | 6 +- src-db/database/model/functions/C_PERIOD_PROCESS.xml | 31 ++++++++- src-db/database/sourcedata/AD_MENU.xml | 4 +- src-db/database/sourcedata/AD_PROCESS.xml | 5 +- src-db/database/sourcedata/AD_TREENODE.xml | 26 ++++---- 6 files changed, 48 insertions(+), 28 deletions(-) diffs (238 lines): diff -r 75d0f48b9623 -r ff6f43f60ade modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TREENODE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TREENODE.xml Wed Nov 30 14:29:38 2011 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TREENODE.xml Wed Nov 30 14:07:42 2011 +0100 @@ -18,8 +18,8 @@ <!--3FD746883F8840E1BED768193D141802--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> <!--3FD746883F8840E1BED768193D141802--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--3FD746883F8840E1BED768193D141802--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> -<!--3FD746883F8840E1BED768193D141802--> <PARENT_ID><![CDATA[800253]]></PARENT_ID> -<!--3FD746883F8840E1BED768193D141802--> <SEQNO><![CDATA[26]]></SEQNO> +<!--3FD746883F8840E1BED768193D141802--> <PARENT_ID><![CDATA[800077]]></PARENT_ID> +<!--3FD746883F8840E1BED768193D141802--> <SEQNO><![CDATA[140]]></SEQNO> <!--3FD746883F8840E1BED768193D141802--></AD_TREENODE> <!--5E9BF82654A14831A72FD96432F48791--><AD_TREENODE> diff -r 75d0f48b9623 -r ff6f43f60ade src-db/database/model/functions/A_ASSET_POST.xml --- a/src-db/database/model/functions/A_ASSET_POST.xml Wed Nov 30 14:29:38 2011 +0100 +++ b/src-db/database/model/functions/A_ASSET_POST.xml Wed Nov 30 14:07:42 2011 +0100 @@ -167,7 +167,7 @@ WHERE C_CURRENCY_ID = v_C_CURRENCY_ID; IF(v_AMORTIZATIONTYPE='LI') THEN IF(v_ASSETSCHEDULE='YE' OR v_AMORTIZATIONCALCTYPE='PE') THEN - if v_USELIFEYEARS=v_DepreciatedLines then + if ((v_USELIFEYEARS=v_DepreciatedLines) or (v_USELIFEYEARS=v_DepreciatedLines-1)) then FINISH_PROCESS:=true; end if; IF(NOT FINISH_PROCESS) THEN @@ -282,7 +282,7 @@ END IF; IF(NOT FINISH_PROCESS) THEN IF(v_ASSETSCHEDULE='MO') THEN - if v_USELIFEMonths=v_DepreciatedLines then + if ((v_USELIFEMonths=v_DepreciatedLines) or (v_USELIFEMonths=v_DepreciatedLines - 1)) then FINISH_PROCESS:=true; end if; END IF; --FINISH_PROCESS @@ -329,7 +329,7 @@ while not finish loop IF(v_COUNT=1 AND to_number(v_BEGINING_DATE-v_FIRST_DAY_DATE)<>0) THEN - v_Percentage:=to_number(to_number(last_day(v_BEGINING_DATE) -v_BEGINING_DATE)) / (trunc((last_day(v_BEGINING_DATE) -(TO_DATE('01-'||to_char(TO_DATE(v_BEGINING_DATE), 'MM-YYYY'), 'DD-MM-YYYY')))) +1) * v_PercentageGeneral; + v_Percentage:=(to_number(to_number(last_day(v_BEGINING_DATE) -v_BEGINING_DATE)) + 1) / (trunc((last_day(v_BEGINING_DATE) -(TO_DATE('01-'||to_char(TO_DATE(v_BEGINING_DATE), 'MM-YYYY'), 'DD-MM-YYYY')))) +1) * v_PercentageGeneral; v_USELIFEMONTHS:=v_USELIFEMONTHS+1; ELSE v_Percentage:=v_PercentageGeneral; diff -r 75d0f48b9623 -r ff6f43f60ade src-db/database/model/functions/C_PERIOD_PROCESS.xml --- a/src-db/database/model/functions/C_PERIOD_PROCESS.xml Wed Nov 30 14:29:38 2011 +0100 +++ b/src-db/database/model/functions/C_PERIOD_PROCESS.xml Wed Nov 30 14:07:42 2011 +0100 @@ -77,16 +77,35 @@ WHERE C_PeriodControl_Log_ID=v_Record_ID_Log; -- Action: Open if not permanently closed IF(p_PeriodAction='O') THEN - - SELECT COUNT(DISTINCT C_YEAR.YEAR) INTO v_Count2 FROM C_PERIOD, C_PERIODCONTROL, C_YEAR WHERE - C_PERIODCONTROL.C_PERIOD_ID=C_PERIOD.C_PERIOD_ID AND C_PERIOD.C_YEAR_ID=C_YEAR.C_YEAR_ID AND C_PERIODCONTROL.PERIODSTATUS IN ('C') AND C_YEAR.YEAR>p_YearName - AND C_PERIODCONTROL.AD_CLIENT_ID = v_AD_Client_ID AND C_YEAR.C_CALENDAR_ID = p_Calendar; + SELECT COUNT(DISTINCT C_YEAR.YEAR) INTO v_Count2 + FROM C_PERIOD, C_PERIODCONTROL, C_YEAR + WHERE C_PERIODCONTROL.C_PERIOD_ID=C_PERIOD.C_PERIOD_ID + AND C_PERIOD.C_YEAR_ID=C_YEAR.C_YEAR_ID + AND C_PERIODCONTROL.AD_Org_ID IN (SELECT AD_Org_ID + FROM AD_Org + WHERE AD_ISORGINCLUDED(ad_org.ad_org_id, p_Organization, ad_org.ad_client_id)<>-1) + AND C_PERIODCONTROL.PERIODSTATUS IN ('C') + AND C_YEAR.YEAR>p_YearName + AND C_PERIODCONTROL.AD_CLIENT_ID = v_AD_Client_ID + AND C_YEAR.C_CALENDAR_ID = p_Calendar; IF (v_Count2>=1) THEN RAISE_APPLICATION_ERROR(-20000, '@FeatureYearClosed@'); END IF; - - + IF (p_IsRecursive='N') THEN + SELECT COUNT(DISTINCT C_YEAR.YEAR) INTO v_Count2 + FROM C_PERIOD, C_PERIODCONTROL, C_YEAR + WHERE C_PERIODCONTROL.C_PERIOD_ID=C_PERIOD.C_PERIOD_ID + AND C_PERIOD.C_YEAR_ID=C_YEAR.C_YEAR_ID + AND C_PERIODCONTROL.AD_Org_ID=p_Organization + AND C_PERIODCONTROL.PERIODSTATUS IN ('C') + AND C_YEAR.YEAR>p_YearName + AND C_PERIODCONTROL.AD_CLIENT_ID = v_AD_Client_ID + AND C_YEAR.C_CALENDAR_ID = p_Calendar; + IF (v_Count2>=1) THEN + RAISE_APPLICATION_ERROR(-20000, '@FeatureYearClosed@'); + END IF; + FOR Cur_Document IN (SELECT C_PERIODCONTROL_ID FROM C_PERIODCONTROL, C_PERIOD diff -r 75d0f48b9623 -r ff6f43f60ade src-db/database/sourcedata/AD_MENU.xml --- a/src-db/database/sourcedata/AD_MENU.xml Wed Nov 30 14:29:38 2011 +0100 +++ b/src-db/database/sourcedata/AD_MENU.xml Wed Nov 30 14:07:42 2011 +0100 @@ -3917,8 +3917,8 @@ <!--800267--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> <!--800267--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--800267--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> -<!--800267--> <NAME><![CDATA[Material Receipts Dimensional Report]]></NAME> -<!--800267--> <DESCRIPTION><![CDATA[Material receipt dimensional analyses]]></DESCRIPTION> +<!--800267--> <NAME><![CDATA[Goods Receipts Dimensional Report]]></NAME> +<!--800267--> <DESCRIPTION><![CDATA[Goods receipt dimensional analyses]]></DESCRIPTION> <!--800267--> <ISSUMMARY><![CDATA[N]]></ISSUMMARY> <!--800267--> <ACTION><![CDATA[R]]></ACTION> <!--800267--> <AD_PROCESS_ID><![CDATA[800182]]></AD_PROCESS_ID> diff -r 75d0f48b9623 -r ff6f43f60ade src-db/database/sourcedata/AD_PROCESS.xml --- a/src-db/database/sourcedata/AD_PROCESS.xml Wed Nov 30 14:29:38 2011 +0100 +++ b/src-db/database/sourcedata/AD_PROCESS.xml Wed Nov 30 14:07:42 2011 +0100 @@ -4508,8 +4508,8 @@ <!--800182--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--800182--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--800182--> <VALUE><![CDATA[ReportMaterialDimensionalAnalysesJR]]></VALUE> -<!--800182--> <NAME><![CDATA[Material Receipts Dimensional Report]]></NAME> -<!--800182--> <DESCRIPTION><![CDATA[Material receipt dimensional analyses]]></DESCRIPTION> +<!--800182--> <NAME><![CDATA[Goods Receipts Dimensional Report]]></NAME> +<!--800182--> <DESCRIPTION><![CDATA[Goods receipt dimensional analyses]]></DESCRIPTION> <!--800182--> <HELP><![CDATA[Material receipt dimensional analyses JR]]></HELP> <!--800182--> <ACCESSLEVEL><![CDATA[3]]></ACCESSLEVEL> <!--800182--> <ISUSERSTARTABLE><![CDATA[N]]></ISUSERSTARTABLE> @@ -4517,6 +4517,7 @@ <!--800182--> <ISDIRECTPRINT><![CDATA[N]]></ISDIRECTPRINT> <!--800182--> <ISBACKGROUND><![CDATA[N]]></ISBACKGROUND> <!--800182--> <ISJASPER><![CDATA[N]]></ISJASPER> +<!--800182--> <ISEXTERNALSERVICE><![CDATA[N]]></ISEXTERNALSERVICE> <!--800182--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> <!--800182--> <UIPATTERN><![CDATA[M]]></UIPATTERN> <!--800182--> <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE> diff -r 75d0f48b9623 -r ff6f43f60ade src-db/database/sourcedata/AD_TREENODE.xml --- a/src-db/database/sourcedata/AD_TREENODE.xml Wed Nov 30 14:29:38 2011 +0100 +++ b/src-db/database/sourcedata/AD_TREENODE.xml Wed Nov 30 14:07:42 2011 +0100 @@ -854,7 +854,7 @@ <!--52118BF1A23F4D84E040007F01005FEC--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--52118BF1A23F4D84E040007F01005FEC--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--52118BF1A23F4D84E040007F01005FEC--> <PARENT_ID><![CDATA[800242]]></PARENT_ID> -<!--52118BF1A23F4D84E040007F01005FEC--> <SEQNO><![CDATA[80]]></SEQNO> +<!--52118BF1A23F4D84E040007F01005FEC--> <SEQNO><![CDATA[70]]></SEQNO> <!--52118BF1A23F4D84E040007F01005FEC--></AD_TREENODE> <!--52118BF1A2404D84E040007F01005FEC--><AD_TREENODE> @@ -975,7 +975,7 @@ <!--52118BF1A24F4D84E040007F01005FEC--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--52118BF1A24F4D84E040007F01005FEC--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--52118BF1A24F4D84E040007F01005FEC--> <PARENT_ID><![CDATA[800076]]></PARENT_ID> -<!--52118BF1A24F4D84E040007F01005FEC--> <SEQNO><![CDATA[90]]></SEQNO> +<!--52118BF1A24F4D84E040007F01005FEC--> <SEQNO><![CDATA[70]]></SEQNO> <!--52118BF1A24F4D84E040007F01005FEC--></AD_TREENODE> <!--52118BF1A2504D84E040007F01005FEC--><AD_TREENODE> @@ -1184,7 +1184,7 @@ <!--52118BF1A2714D84E040007F01005FEC--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--52118BF1A2714D84E040007F01005FEC--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--52118BF1A2714D84E040007F01005FEC--> <PARENT_ID><![CDATA[800242]]></PARENT_ID> -<!--52118BF1A2714D84E040007F01005FEC--> <SEQNO><![CDATA[100]]></SEQNO> +<!--52118BF1A2714D84E040007F01005FEC--> <SEQNO><![CDATA[80]]></SEQNO> <!--52118BF1A2714D84E040007F01005FEC--></AD_TREENODE> <!--52118BF1A2724D84E040007F01005FEC--><AD_TREENODE> @@ -1194,8 +1194,8 @@ <!--52118BF1A2724D84E040007F01005FEC--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> <!--52118BF1A2724D84E040007F01005FEC--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--52118BF1A2724D84E040007F01005FEC--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> -<!--52118BF1A2724D84E040007F01005FEC--> <PARENT_ID><![CDATA[800242]]></PARENT_ID> -<!--52118BF1A2724D84E040007F01005FEC--> <SEQNO><![CDATA[90]]></SEQNO> +<!--52118BF1A2724D84E040007F01005FEC--> <PARENT_ID><![CDATA[800076]]></PARENT_ID> +<!--52118BF1A2724D84E040007F01005FEC--> <SEQNO><![CDATA[50]]></SEQNO> <!--52118BF1A2724D84E040007F01005FEC--></AD_TREENODE> <!--52118BF1A2734D84E040007F01005FEC--><AD_TREENODE> @@ -2141,7 +2141,7 @@ <!--52118BF1A2EB4D84E040007F01005FEC--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--52118BF1A2EB4D84E040007F01005FEC--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--52118BF1A2EB4D84E040007F01005FEC--> <PARENT_ID><![CDATA[800242]]></PARENT_ID> -<!--52118BF1A2EB4D84E040007F01005FEC--> <SEQNO><![CDATA[110]]></SEQNO> +<!--52118BF1A2EB4D84E040007F01005FEC--> <SEQNO><![CDATA[90]]></SEQNO> <!--52118BF1A2EB4D84E040007F01005FEC--></AD_TREENODE> <!--52118BF1A2EC4D84E040007F01005FEC--><AD_TREENODE> @@ -2229,7 +2229,7 @@ <!--52118BF1A2F64D84E040007F01005FEC--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--52118BF1A2F64D84E040007F01005FEC--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--52118BF1A2F64D84E040007F01005FEC--> <PARENT_ID><![CDATA[800242]]></PARENT_ID> -<!--52118BF1A2F64D84E040007F01005FEC--> <SEQNO><![CDATA[120]]></SEQNO> +<!--52118BF1A2F64D84E040007F01005FEC--> <SEQNO><![CDATA[60]]></SEQNO> <!--52118BF1A2F64D84E040007F01005FEC--></AD_TREENODE> <!--52118BF1A2F74D84E040007F01005FEC--><AD_TREENODE> @@ -3021,7 +3021,7 @@ <!--52118BF1A34A4D84E040007F01005FEC--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--52118BF1A34A4D84E040007F01005FEC--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--52118BF1A34A4D84E040007F01005FEC--> <PARENT_ID><![CDATA[800076]]></PARENT_ID> -<!--52118BF1A34A4D84E040007F01005FEC--> <SEQNO><![CDATA[70]]></SEQNO> +<!--52118BF1A34A4D84E040007F01005FEC--> <SEQNO><![CDATA[10]]></SEQNO> <!--52118BF1A34A4D84E040007F01005FEC--></AD_TREENODE> <!--52118BF1A34B4D84E040007F01005FEC--><AD_TREENODE> @@ -3362,7 +3362,7 @@ <!--52118BF1A3694D84E040007F01005FEC--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--52118BF1A3694D84E040007F01005FEC--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--52118BF1A3694D84E040007F01005FEC--> <PARENT_ID><![CDATA[800076]]></PARENT_ID> -<!--52118BF1A3694D84E040007F01005FEC--> <SEQNO><![CDATA[80]]></SEQNO> +<!--52118BF1A3694D84E040007F01005FEC--> <SEQNO><![CDATA[60]]></SEQNO> <!--52118BF1A3694D84E040007F01005FEC--></AD_TREENODE> <!--52118BF1A36A4D84E040007F01005FEC--><AD_TREENODE> @@ -3384,7 +3384,7 @@ <!--52118BF1A36B4D84E040007F01005FEC--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--52118BF1A36B4D84E040007F01005FEC--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--52118BF1A36B4D84E040007F01005FEC--> <PARENT_ID><![CDATA[800076]]></PARENT_ID> -<!--52118BF1A36B4D84E040007F01005FEC--> <SEQNO><![CDATA[40]]></SEQNO> +<!--52118BF1A36B4D84E040007F01005FEC--> <SEQNO><![CDATA[30]]></SEQNO> <!--52118BF1A36B4D84E040007F01005FEC--></AD_TREENODE> <!--52118BF1A36C4D84E040007F01005FEC--><AD_TREENODE> @@ -3395,7 +3395,7 @@ <!--52118BF1A36C4D84E040007F01005FEC--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--52118BF1A36C4D84E040007F01005FEC--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--52118BF1A36C4D84E040007F01005FEC--> <PARENT_ID><![CDATA[800076]]></PARENT_ID> -<!--52118BF1A36C4D84E040007F01005FEC--> <SEQNO><![CDATA[60]]></SEQNO> +<!--52118BF1A36C4D84E040007F01005FEC--> <SEQNO><![CDATA[40]]></SEQNO> <!--52118BF1A36C4D84E040007F01005FEC--></AD_TREENODE> <!--52118BF1A36D4D84E040007F01005FEC--><AD_TREENODE> @@ -3922,7 +3922,7 @@ <!--80C68CDB5E77494C95DDBBDC8805713F--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--80C68CDB5E77494C95DDBBDC8805713F--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--80C68CDB5E77494C95DDBBDC8805713F--> <PARENT_ID><![CDATA[800242]]></PARENT_ID> -<!--80C68CDB5E77494C95DDBBDC8805713F--> <SEQNO><![CDATA[70]]></SEQNO> +<!--80C68CDB5E77494C95DDBBDC8805713F--> <SEQNO><![CDATA[110]]></SEQNO> <!--80C68CDB5E77494C95DDBBDC8805713F--></AD_TREENODE> <!--831DD90FBAF44F79B1124959BCAC5A46--><AD_TREENODE> @@ -3933,7 +3933,7 @@ <!--831DD90FBAF44F79B1124959BCAC5A46--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--831DD90FBAF44F79B1124959BCAC5A46--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--831DD90FBAF44F79B1124959BCAC5A46--> <PARENT_ID><![CDATA[800242]]></PARENT_ID> -<!--831DD90FBAF44F79B1124959BCAC5A46--> <SEQNO><![CDATA[60]]></SEQNO> +<!--831DD90FBAF44F79B1124959BCAC5A46--> <SEQNO><![CDATA[100]]></SEQNO> <!--831DD90FBAF44F79B1124959BCAC5A46--></AD_TREENODE> <!--8CB53124C58211DDB9A9001D09C4A2FE--><AD_TREENODE> ------------------------------------------------------------------------------ All the data continuously generated in your IT infrastructure contains a definitive record of customers, application performance, security threats, fraudulent activity, and more. Splunk takes this data and makes sense of it. IT sense. And common sense. http://p.sf.net/sfu/splunk-novd2d _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
