Author: bpoussin Date: 2013-02-24 04:00:47 +0100 (Sun, 24 Feb 2013) New Revision: 318 Url: http://chorem.org/projects/chorem/repository/revisions/318 Log: simplification migration suite modif wikitty Modified: trunk/chorem-entities/src/main/java/org/chorem/entities/InvoiceMigration.java Modified: trunk/chorem-entities/src/main/java/org/chorem/entities/InvoiceMigration.java =================================================================== --- trunk/chorem-entities/src/main/java/org/chorem/entities/InvoiceMigration.java 2013-02-24 03:00:17 UTC (rev 317) +++ trunk/chorem-entities/src/main/java/org/chorem/entities/InvoiceMigration.java 2013-02-24 03:00:47 UTC (rev 318) @@ -74,7 +74,7 @@ old.getFieldAsObject("Invoice", "amount")); // VAT peut etre null si on avait un tres vieux objet avec 'VTA' - if (null != old.getFieldAsObject("Invoice", "VAT")) { + if (old.hasField("Invoice", "VAT")) { result.setFqField(FinancialTransaction.FQ_FIELD_FINANCIALTRANSACTION_VAT, old.getFieldAsObject("Invoice", "VAT")); } @@ -90,7 +90,7 @@ result.setFqField(FinancialTransaction.FQ_FIELD_FINANCIALTRANSACTION_BENEFICIARY, old.getFieldAsObject("Invoice", "supplier")); result.setFqField(FinancialTransaction.FQ_FIELD_FINANCIALTRANSACTION_CATEGORY, - old.getFieldAsObject("Invoice", "category")); + old.getFieldAsObject("Invoiceable", "category")); result.setFqField(FinancialTransaction.FQ_FIELD_FINANCIALTRANSACTION_TARGET, old.getFieldAsObject("Invoiceable", "target")); } @@ -102,14 +102,11 @@ if (Invoice.EXT_INVOICE.equals(newExt.getName())) { String oldVersion = oldExt.getVersion(); - String newVersion = newExt.getVersion(); - if (!VersionUtil.greaterThan("14.0", oldVersion) - && !VersionUtil.smallerThan(newVersion, "15.0")) { - + if (VersionUtil.smallerThan(oldVersion, "16.0")) { migrateFieldVTA(wikitty, result); - } else if (!VersionUtil.greaterThan("15.0", oldVersion) - && !VersionUtil.smallerThan(newVersion, "16.0")) { + } + if (VersionUtil.smallerThan(oldVersion, "17.0")) { migrateToFinancialTransactional(wikitty, result); } }