details: https://code.openbravo.com/erp/devel/pi/rev/43bf9f7fca6a changeset: 20523:43bf9f7fca6a user: Pandeeswari Ramakrishnan <pandeeswari.ramakrishnan <at> openbravo.com> date: Mon Jun 03 12:09:33 2013 +0530 summary: Fixes issue 23843: Invalid fields in Element Value tab on Account Tree window
details: https://code.openbravo.com/erp/devel/pi/rev/e529969156c5 changeset: 20524:e529969156c5 user: Pandeeswari Ramakrishnan <pandeeswari.ramakrishnan <at> openbravo.com> date: Mon Jun 03 11:29:35 2013 +0530 summary: Fixes issue 23844: Invalid Record Identifier for Conversion Rates details: https://code.openbravo.com/erp/devel/pi/rev/cff2dc4feef9 changeset: 20525:cff2dc4feef9 user: Pandeeswari Ramakrishnan <pandeeswari.ramakrishnan <at> openbravo.com> date: Thu May 30 12:38:25 2013 +0530 summary: Fixes Issue 23928: Copy from Order in Purchase Order details: https://code.openbravo.com/erp/devel/pi/rev/3d39d5fbf846 changeset: 20526:3d39d5fbf846 user: Pandeeswari Ramakrishnan <pandeeswari.ramakrishnan <at> openbravo.com> date: Mon Jun 03 11:01:15 2013 +0530 summary: Fixes Issue 23947: Recalculate amortization process When searching for existing amortization lines starting date should be ignored details: https://code.openbravo.com/erp/devel/pi/rev/1311be9bca9b changeset: 20527:1311be9bca9b user: Sandra Huguet <sandra.huguet <at> openbravo.com> date: Mon Jun 03 16:41:29 2013 +0200 summary: Fixed bug 23196 add ad_org_id to c_paymentterm_name constraint diffstat: src-db/database/model/tables/C_PAYMENTTERM.xml | 1 + src-db/database/sourcedata/AD_COLUMN.xml | 8 +++--- src-db/database/sourcedata/AD_FIELD.xml | 6 ++-- src/org/openbravo/erpCommon/ad_actionButton/CopyFromPOOrder.java | 4 +- src/org/openbravo/erpCommon/ad_process/assets/AssetLinearDepreciationMethodProcess.java | 12 ++++++--- 5 files changed, 18 insertions(+), 13 deletions(-) diffs (135 lines): diff -r 406cf618b59a -r 1311be9bca9b src-db/database/model/tables/C_PAYMENTTERM.xml --- a/src-db/database/model/tables/C_PAYMENTTERM.xml Thu Jun 06 17:34:38 2013 +0200 +++ b/src-db/database/model/tables/C_PAYMENTTERM.xml Mon Jun 03 16:41:29 2013 +0200 @@ -97,6 +97,7 @@ </foreign-key> <unique name="C_PAYMENTTERM_NAME"> <unique-column name="AD_CLIENT_ID"/> + <unique-column name="AD_ORG_ID"/> <unique-column name="NAME"/> </unique> <check name="C_PAYMENTTERM_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check> diff -r 406cf618b59a -r 1311be9bca9b src-db/database/sourcedata/AD_COLUMN.xml --- a/src-db/database/sourcedata/AD_COLUMN.xml Thu Jun 06 17:34:38 2013 +0200 +++ b/src-db/database/sourcedata/AD_COLUMN.xml Mon Jun 03 16:41:29 2013 +0200 @@ -5949,7 +5949,7 @@ <!--453--> <ISPARENT><![CDATA[N]]></ISPARENT> <!--453--> <ISMANDATORY><![CDATA[Y]]></ISMANDATORY> <!--453--> <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE> -<!--453--> <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER> +<!--453--> <ISIDENTIFIER><![CDATA[Y]]></ISIDENTIFIER> <!--453--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED> <!--453--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> <!--453--> <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN> @@ -11696,7 +11696,7 @@ <!--778--> <ISPARENT><![CDATA[N]]></ISPARENT> <!--778--> <ISMANDATORY><![CDATA[Y]]></ISMANDATORY> <!--778--> <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE> -<!--778--> <ISIDENTIFIER><![CDATA[Y]]></ISIDENTIFIER> +<!--778--> <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER> <!--778--> <SEQNO><![CDATA[1]]></SEQNO> <!--778--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED> <!--778--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> @@ -11977,7 +11977,7 @@ <!--786--> <ISPARENT><![CDATA[Y]]></ISPARENT> <!--786--> <ISMANDATORY><![CDATA[Y]]></ISMANDATORY> <!--786--> <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE> -<!--786--> <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER> +<!--786--> <ISIDENTIFIER><![CDATA[Y]]></ISIDENTIFIER> <!--786--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED> <!--786--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> <!--786--> <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN> @@ -12013,7 +12013,7 @@ <!--787--> <ISPARENT><![CDATA[N]]></ISPARENT> <!--787--> <ISMANDATORY><![CDATA[Y]]></ISMANDATORY> <!--787--> <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE> -<!--787--> <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER> +<!--787--> <ISIDENTIFIER><![CDATA[Y]]></ISIDENTIFIER> <!--787--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED> <!--787--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> <!--787--> <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN> diff -r 406cf618b59a -r 1311be9bca9b src-db/database/sourcedata/AD_FIELD.xml --- a/src-db/database/sourcedata/AD_FIELD.xml Thu Jun 06 17:34:38 2013 +0200 +++ b/src-db/database/sourcedata/AD_FIELD.xml Mon Jun 03 16:41:29 2013 +0200 @@ -23968,7 +23968,7 @@ <!--2076--> <AD_TAB_ID><![CDATA[132]]></AD_TAB_ID> <!--2076--> <AD_COLUMN_ID><![CDATA[3004]]></AD_COLUMN_ID> <!--2076--> <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD> -<!--2076--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED> +<!--2076--> <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED> <!--2076--> <DISPLAYLOGIC><![CDATA[@ElementType@='A' & @IsBankAccount@='Y' & @IsForeignCurrency@='Y']]></DISPLAYLOGIC> <!--2076--> <DISPLAYLENGTH><![CDATA[44]]></DISPLAYLENGTH> <!--2076--> <ISREADONLY><![CDATA[N]]></ISREADONLY> @@ -23997,7 +23997,7 @@ <!--2077--> <AD_TAB_ID><![CDATA[132]]></AD_TAB_ID> <!--2077--> <AD_COLUMN_ID><![CDATA[3003]]></AD_COLUMN_ID> <!--2077--> <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD> -<!--2077--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED> +<!--2077--> <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED> <!--2077--> <DISPLAYLOGIC><![CDATA[@ElementType@='A' & @IsBankAccount@='Y']]></DISPLAYLOGIC> <!--2077--> <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH> <!--2077--> <ISREADONLY><![CDATA[N]]></ISREADONLY> @@ -38495,7 +38495,7 @@ <!--3048--> <AD_TAB_ID><![CDATA[132]]></AD_TAB_ID> <!--3048--> <AD_COLUMN_ID><![CDATA[3898]]></AD_COLUMN_ID> <!--3048--> <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD> -<!--3048--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED> +<!--3048--> <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED> <!--3048--> <DISPLAYLOGIC><![CDATA[@ElementType@='A' & @IsBankAccount@='Y' & @FinancialManagement@='']]></DISPLAYLOGIC> <!--3048--> <DISPLAYLENGTH><![CDATA[44]]></DISPLAYLENGTH> <!--3048--> <ISREADONLY><![CDATA[N]]></ISREADONLY> diff -r 406cf618b59a -r 1311be9bca9b src/org/openbravo/erpCommon/ad_actionButton/CopyFromPOOrder.java --- a/src/org/openbravo/erpCommon/ad_actionButton/CopyFromPOOrder.java Thu Jun 06 17:34:38 2013 +0200 +++ b/src/org/openbravo/erpCommon/ad_actionButton/CopyFromPOOrder.java Mon Jun 03 16:41:29 2013 +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) 2001-2012 Openbravo SLU + * All portions are Copyright (C) 2001-2013 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************ @@ -202,7 +202,7 @@ this, strCOrderlineID, orderData[0].adClientId, - data[i].adOrgId, + orderData[0].adOrgId, vars.getUser(), strKey, Integer.toString(line), diff -r 406cf618b59a -r 1311be9bca9b src/org/openbravo/erpCommon/ad_process/assets/AssetLinearDepreciationMethodProcess.java --- a/src/org/openbravo/erpCommon/ad_process/assets/AssetLinearDepreciationMethodProcess.java Thu Jun 06 17:34:38 2013 +0200 +++ b/src/org/openbravo/erpCommon/ad_process/assets/AssetLinearDepreciationMethodProcess.java Mon Jun 03 16:41:29 2013 +0200 @@ -386,8 +386,8 @@ calLastDayOfPeriod.set(Calendar.MONTH, calAux.getActualMaximum(Calendar.MONTH)); } - AmortizationLine amortizationLine = getAmortizationLine(asset, - calFirstDayOfPeriod.getTime(), calLastDayOfPeriod.getTime()); + AmortizationLine amortizationLine = getAmortizationLine(asset, null, + calLastDayOfPeriod.getTime()); if (amortizationLine != null) { // Recalculate percentage because the amount could have been changed @@ -562,13 +562,17 @@ final List<Object> parameters = new ArrayList<Object>(); whereClause.append(" as aml join aml.amortization as am "); whereClause.append(" where aml.asset.id = ? "); - whereClause.append(" and am.startingDate = ?"); + if (startDate != null) { + whereClause.append(" and am.startingDate = ?"); + } whereClause.append(" and am.endingDate = ?"); final OBQuery<AmortizationLine> obq = OBDal.getInstance().createQuery(AmortizationLine.class, whereClause.toString()); obq.setFilterOnReadableOrganization(false); parameters.add(asset.getId()); - parameters.add(startDate); + if (startDate != null) { + parameters.add(startDate); + } parameters.add(endDate); obq.setParameters(parameters); List<AmortizationLine> amortizationLineList = obq.list(); ------------------------------------------------------------------------------ How ServiceNow helps IT people transform IT departments: 1. A cloud service to automate IT design, transition and operations 2. Dashboards that offer high-level views of enterprise services 3. A single system of record for all IT processes http://p.sf.net/sfu/servicenow-d2d-j _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
