details: https://code.openbravo.com/erp/stable/2.50/rev/773966254d4b changeset: 9756:773966254d4b user: Ioritz Cia <ioritz.cia <at> openbravo.com> date: Tue Nov 22 13:01:44 2011 +0100 summary: Fixes issue 19136: Assets - create amortization process failing when Start Date is the last day of the month (Monthly depreciation type.
details: https://code.openbravo.com/erp/stable/2.50/rev/62d26f486d4b changeset: 9757:62d26f486d4b user: Ioritz Cia <ioritz.cia <at> openbravo.com> date: Wed Nov 23 13:58:16 2011 +0100 summary: Fixes issue 19150: Asset: The currency can be updated in the main tab while the Asset Amortization is already created. details: https://code.openbravo.com/erp/stable/2.50/rev/3182d031d414 changeset: 9758:3182d031d414 user: Ioritz Cia <ioritz.cia <at> openbravo.com> date: Wed Nov 23 14:04:55 2011 +0100 summary: Fixes issue 19151: Business partner selector in Purchasing Plan is filtering by customers by default. details: https://code.openbravo.com/erp/stable/2.50/rev/b07a083e909a changeset: 9759:b07a083e909a user: Ioritz Cia <ioritz.cia <at> openbravo.com> date: Thu Nov 24 10:46:27 2011 +0100 summary: Fixes issue 19170: Procurement Management menu needs to be changed. details: https://code.openbravo.com/erp/stable/2.50/rev/445d78534dae changeset: 9760:445d78534dae user: Ioritz Cia <ioritz.cia <at> openbravo.com> date: Fri Nov 25 14:08:38 2011 +0100 summary: Fixes issue 19172: Material Receipts Dimensional Report must be renamed as Goods Receipts Dimensional Report. details: https://code.openbravo.com/erp/stable/2.50/rev/e621214afca2 changeset: 9761:e621214afca2 user: Ioritz Cia <ioritz.cia <at> openbravo.com> date: Thu Dec 01 10:26:22 2011 +0100 summary: Fixes issue 19136: Assets - create amortization process failing when Start Date is the last day of the month (Monthly depreciation type). diffstat: src-db/database/model/functions/A_ASSET_POST.xml | 8 ++++---- src-db/database/sourcedata/AD_AUXILIARINPUT.xml | 11 +++++++++++ src-db/database/sourcedata/AD_COLUMN.xml | 1 + src-db/database/sourcedata/AD_MENU.xml | 4 ++-- src-db/database/sourcedata/AD_PROCESS.xml | 7 ++++--- src-db/database/sourcedata/AD_TREENODE.xml | 22 +++++++++++----------- src-db/database/sourcedata/AD_WINDOW.xml | 2 +- 7 files changed, 34 insertions(+), 21 deletions(-) diffs (215 lines): diff -r 9099367e847a -r e621214afca2 src-db/database/model/functions/A_ASSET_POST.xml --- a/src-db/database/model/functions/A_ASSET_POST.xml Fri Nov 25 14:26:09 2011 +0100 +++ b/src-db/database/model/functions/A_ASSET_POST.xml Thu Dec 01 10:26:22 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 @@ -212,7 +212,7 @@ FROM A_AMORTIZATIONLINE WHERE A_AMORTIZATIONLINE.A_ASSET_ID = v_Record_ID; IF(v_COUNT=1 AND to_number(v_BEGINING_DATE-v_FIRST_DAY_DATE)<>0) THEN - v_Percentage:=to_number(to_number(TO_DATE('31-12-'||to_char(v_AMORTIZATIONSTARTDATE, 'YYYY'), 'DD-MM-YYYY') -v_AMORTIZATIONSTARTDATE) /(TO_DATE('31-12-'||to_char(v_AMORTIZATIONSTARTDATE, 'YYYY'), 'DD-MM-YYYY') -TO_DATE('01-01-'||to_char(v_AMORTIZATIONSTARTDATE, 'YYYY'), 'DD-MM-YYYY'))) * v_PercentageGeneral; + v_Percentage:=to_number(to_number(TO_DATE('31-12-'||to_char(v_AMORTIZATIONSTARTDATE, 'YYYY'), 'DD-MM-YYYY') -v_AMORTIZATIONSTARTDATE) / (TO_DATE('01-01-'||to_char(to_number(to_char(v_AMORTIZATIONSTARTDATE, 'YYYY')) + 1), 'DD-MM-YYYY') -TO_DATE('01-01-'||to_char(v_AMORTIZATIONSTARTDATE, 'YYYY'), 'DD-MM-YYYY'))) * v_PercentageGeneral; v_USELIFEYEARS:=v_USELIFEYEARS+1; ELSE v_Percentage:=v_PercentageGeneral; @@ -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 9099367e847a -r e621214afca2 src-db/database/sourcedata/AD_AUXILIARINPUT.xml --- a/src-db/database/sourcedata/AD_AUXILIARINPUT.xml Fri Nov 25 14:26:09 2011 +0100 +++ b/src-db/database/sourcedata/AD_AUXILIARINPUT.xml Thu Dec 01 10:26:22 2011 +0100 @@ -1608,6 +1608,17 @@ <!--ACA00D8708854C3E80E50FE99724C4E8--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> <!--ACA00D8708854C3E80E50FE99724C4E8--></AD_AUXILIARINPUT> +<!--AD306651FEC841DF9D01E831482C6A09--><AD_AUXILIARINPUT> +<!--AD306651FEC841DF9D01E831482C6A09--> <AD_AUXILIARINPUT_ID><![CDATA[AD306651FEC841DF9D01E831482C6A09]]></AD_AUXILIARINPUT_ID> +<!--AD306651FEC841DF9D01E831482C6A09--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--AD306651FEC841DF9D01E831482C6A09--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--AD306651FEC841DF9D01E831482C6A09--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--AD306651FEC841DF9D01E831482C6A09--> <AD_TAB_ID><![CDATA[800078]]></AD_TAB_ID> +<!--AD306651FEC841DF9D01E831482C6A09--> <NAME><![CDATA[existAmortizationLines]]></NAME> +<!--AD306651FEC841DF9D01E831482C6A09--> <CODE><![CDATA[@SQL=select 'Y' from dual where exists (select 1 from a_amortizationline where a_amortizationline.a_asset_id = @A_Asset_ID@)]]></CODE> +<!--AD306651FEC841DF9D01E831482C6A09--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> +<!--AD306651FEC841DF9D01E831482C6A09--></AD_AUXILIARINPUT> + <!--AF9E12E94CE24A958FCE3609A8B976AF--><AD_AUXILIARINPUT> <!--AF9E12E94CE24A958FCE3609A8B976AF--> <AD_AUXILIARINPUT_ID><![CDATA[AF9E12E94CE24A958FCE3609A8B976AF]]></AD_AUXILIARINPUT_ID> <!--AF9E12E94CE24A958FCE3609A8B976AF--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r 9099367e847a -r e621214afca2 src-db/database/sourcedata/AD_COLUMN.xml --- a/src-db/database/sourcedata/AD_COLUMN.xml Fri Nov 25 14:26:09 2011 +0100 +++ b/src-db/database/sourcedata/AD_COLUMN.xml Thu Dec 01 10:26:22 2011 +0100 @@ -188786,6 +188786,7 @@ <!--801065--> <ISPARENT><![CDATA[N]]></ISPARENT> <!--801065--> <ISMANDATORY><![CDATA[N]]></ISMANDATORY> <!--801065--> <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE> +<!--801065--> <READONLYLOGIC><![CDATA[@existAmortizationLines@ = 'Y']]></READONLYLOGIC> <!--801065--> <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER> <!--801065--> <SEQNO><![CDATA[61]]></SEQNO> <!--801065--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED> diff -r 9099367e847a -r e621214afca2 src-db/database/sourcedata/AD_MENU.xml --- a/src-db/database/sourcedata/AD_MENU.xml Fri Nov 25 14:26:09 2011 +0100 +++ b/src-db/database/sourcedata/AD_MENU.xml Thu Dec 01 10:26:22 2011 +0100 @@ -4990,8 +4990,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 9099367e847a -r e621214afca2 src-db/database/sourcedata/AD_PROCESS.xml --- a/src-db/database/sourcedata/AD_PROCESS.xml Fri Nov 25 14:26:09 2011 +0100 +++ b/src-db/database/sourcedata/AD_PROCESS.xml Thu Dec 01 10:26:22 2011 +0100 @@ -4944,15 +4944,16 @@ <!--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--> <HELP><![CDATA[Material receipt dimensional analyses JR]]></HELP> +<!--800182--> <NAME><![CDATA[Goods Receipts Dimensional Report]]></NAME> +<!--800182--> <DESCRIPTION><![CDATA[Goods receipt dimensional analyses]]></DESCRIPTION> +<!--800182--> <HELP><![CDATA[Goods receipt dimensional analyses JR]]></HELP> <!--800182--> <ACCESSLEVEL><![CDATA[3]]></ACCESSLEVEL> <!--800182--> <ISUSERSTARTABLE><![CDATA[N]]></ISUSERSTARTABLE> <!--800182--> <ISREPORT><![CDATA[Y]]></ISREPORT> <!--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--></AD_PROCESS> diff -r 9099367e847a -r e621214afca2 src-db/database/sourcedata/AD_TREENODE.xml --- a/src-db/database/sourcedata/AD_TREENODE.xml Fri Nov 25 14:26:09 2011 +0100 +++ b/src-db/database/sourcedata/AD_TREENODE.xml Thu Dec 01 10:26:22 2011 +0100 @@ -997,7 +997,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[60]]></SEQNO> +<!--52118BF1A23F4D84E040007F01005FEC--> <SEQNO><![CDATA[70]]></SEQNO> <!--52118BF1A23F4D84E040007F01005FEC--></AD_TREENODE> <!--52118BF1A2404D84E040007F01005FEC--><AD_TREENODE> @@ -1173,7 +1173,7 @@ <!--52118BF1A24F4D84E040007F01005FEC--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--52118BF1A24F4D84E040007F01005FEC--> <ISACTIVE><![CDATA[N]]></ISACTIVE> <!--52118BF1A24F4D84E040007F01005FEC--> <PARENT_ID><![CDATA[800076]]></PARENT_ID> -<!--52118BF1A24F4D84E040007F01005FEC--> <SEQNO><![CDATA[90]]></SEQNO> +<!--52118BF1A24F4D84E040007F01005FEC--> <SEQNO><![CDATA[70]]></SEQNO> <!--52118BF1A24F4D84E040007F01005FEC--></AD_TREENODE> <!--52118BF1A2504D84E040007F01005FEC--><AD_TREENODE> @@ -1536,7 +1536,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[110]]></SEQNO> +<!--52118BF1A2714D84E040007F01005FEC--> <SEQNO><![CDATA[90]]></SEQNO> <!--52118BF1A2714D84E040007F01005FEC--></AD_TREENODE> <!--52118BF1A2724D84E040007F01005FEC--><AD_TREENODE> @@ -1546,8 +1546,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[100]]></SEQNO> +<!--52118BF1A2724D84E040007F01005FEC--> <PARENT_ID><![CDATA[800076]]></PARENT_ID> +<!--52118BF1A2724D84E040007F01005FEC--> <SEQNO><![CDATA[50]]></SEQNO> <!--52118BF1A2724D84E040007F01005FEC--></AD_TREENODE> <!--52118BF1A2734D84E040007F01005FEC--><AD_TREENODE> @@ -2845,7 +2845,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[120]]></SEQNO> +<!--52118BF1A2EB4D84E040007F01005FEC--> <SEQNO><![CDATA[80]]></SEQNO> <!--52118BF1A2EB4D84E040007F01005FEC--></AD_TREENODE> <!--52118BF1A2EC4D84E040007F01005FEC--><AD_TREENODE> @@ -2966,7 +2966,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[130]]></SEQNO> +<!--52118BF1A2F64D84E040007F01005FEC--> <SEQNO><![CDATA[60]]></SEQNO> <!--52118BF1A2F64D84E040007F01005FEC--></AD_TREENODE> <!--52118BF1A2F74D84E040007F01005FEC--><AD_TREENODE> @@ -3879,7 +3879,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> @@ -4220,7 +4220,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> @@ -4242,7 +4242,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> @@ -4253,7 +4253,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> diff -r 9099367e847a -r e621214afca2 src-db/database/sourcedata/AD_WINDOW.xml --- a/src-db/database/sourcedata/AD_WINDOW.xml Fri Nov 25 14:26:09 2011 +0100 +++ b/src-db/database/sourcedata/AD_WINDOW.xml Thu Dec 01 10:26:22 2011 +0100 @@ -2765,7 +2765,7 @@ <!--800097--> <DESCRIPTION><![CDATA[Create a comprehensive and organized plan to request purchases over a specified time period.]]></DESCRIPTION> <!--800097--> <HELP><![CDATA[Create a comprehensive and organized plan to request purchases over a specified time period.]]></HELP> <!--800097--> <WINDOWTYPE><![CDATA[M]]></WINDOWTYPE> -<!--800097--> <ISSOTRX><![CDATA[Y]]></ISSOTRX> +<!--800097--> <ISSOTRX><![CDATA[N]]></ISSOTRX> <!--800097--> <PROCESSING><![CDATA[N]]></PROCESSING> <!--800097--> <ISDEFAULT><![CDATA[N]]></ISDEFAULT> <!--800097--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> ------------------------------------------------------------------------------ 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
