details: https://code.openbravo.com/erp/devel/pi/rev/f37f45e328e4 changeset: 28562:f37f45e328e4 user: Martin Taal <martin.taal <at> openbravo.com> date: Sun Jan 31 12:57:47 2016 +0100 summary: Updated copyright year to 2016
details: https://code.openbravo.com/erp/devel/pi/rev/d37debbe555d changeset: 28563:d37debbe555d user: Martin Taal <martin.taal <at> openbravo.com> date: Sun Jan 31 12:59:02 2016 +0100 summary: Merged heads diffstat: src/org/openbravo/materialmgmt/actionhandler/ManageVariants.java | 5 ++++- src/org/openbravo/service/importprocess/ImportEntryArchiveManager.java | 2 +- src/org/openbravo/service/importprocess/ImportEntryManager.java | 2 +- src/org/openbravo/service/importprocess/ImportEntryProcessor.java | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diffs (58 lines): diff -r b4ee0d43b8e1 -r d37debbe555d src/org/openbravo/materialmgmt/actionhandler/ManageVariants.java --- a/src/org/openbravo/materialmgmt/actionhandler/ManageVariants.java Thu Jan 28 01:01:58 2016 +0530 +++ b/src/org/openbravo/materialmgmt/actionhandler/ManageVariants.java Sun Jan 31 12:59:02 2016 +0100 @@ -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) 2013 Openbravo SLU + * All portions are Copyright (C) 2013-2016 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************* @@ -106,6 +106,9 @@ private void createVariant(JSONObject variantProperties, Product generic) throws JSONException { Product variant = (Product) DalUtil.copy(generic); + if (generic.getClient().isMultilingualDocuments()) { + variant.getProductTrlList().clear(); + } variant.setGenericProduct(generic); variant.setProductAccountsList(Collections.<ProductAccounts> emptyList()); diff -r b4ee0d43b8e1 -r d37debbe555d src/org/openbravo/service/importprocess/ImportEntryArchiveManager.java --- a/src/org/openbravo/service/importprocess/ImportEntryArchiveManager.java Thu Jan 28 01:01:58 2016 +0530 +++ b/src/org/openbravo/service/importprocess/ImportEntryArchiveManager.java Sun Jan 31 12:59:02 2016 +0100 @@ -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) 2015 Openbravo SLU + * All portions are Copyright (C) 2015-2016 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************ diff -r b4ee0d43b8e1 -r d37debbe555d src/org/openbravo/service/importprocess/ImportEntryManager.java --- a/src/org/openbravo/service/importprocess/ImportEntryManager.java Thu Jan 28 01:01:58 2016 +0530 +++ b/src/org/openbravo/service/importprocess/ImportEntryManager.java Sun Jan 31 12:59:02 2016 +0100 @@ -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) 2015 Openbravo SLU + * All portions are Copyright (C) 2015-2016 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************ diff -r b4ee0d43b8e1 -r d37debbe555d src/org/openbravo/service/importprocess/ImportEntryProcessor.java --- a/src/org/openbravo/service/importprocess/ImportEntryProcessor.java Thu Jan 28 01:01:58 2016 +0530 +++ b/src/org/openbravo/service/importprocess/ImportEntryProcessor.java Sun Jan 31 12:59:02 2016 +0100 @@ -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) 2015 Openbravo SLU + * All portions are Copyright (C) 2015-2016 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************ ------------------------------------------------------------------------------ Site24x7 APM Insight: Get Deep Visibility into Application Performance APM + Mobile APM + RUM: Monitor 3 App instances at just $35/Month Monitor end-to-end web transactions and take corrective actions now Troubleshoot faster and improve end-user experience. Signup Now! http://pubads.g.doubleclick.net/gampad/clk?id=267308311&iu=/4140 _______________________________________________ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
