From 2dba271ee96b130f28806e31188318ecc75401f1 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Mon, 8 Oct 2012 08:45:07 -0500 Subject: [PATCH] reapply b4342c844a23 / IDEMPIERE-332 Document sequence organization level and restart monthly / NPE when not org selected --- org.adempiere.base/src/org/compiere/model/MSequence.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/org.adempiere.base/src/org/compiere/model/MSequence.java b/org.adempiere.base/src/org/compiere/model/MSequence.java index 51786e8a19..873a9855a4 100644 --- a/org.adempiere.base/src/org/compiere/model/MSequence.java +++ b/org.adempiere.base/src/org/compiere/model/MSequence.java @@ -1181,7 +1181,10 @@ public class MSequence extends X_AD_Sequence cym = sdf.format(d); } if (orgLevelSeq) { - org = (Integer)tab.getValue(seq.getOrgColumn()); + String orgColumn = seq.getOrgColumn(); + Object orgObj = tab.getValue(orgColumn); + if (orgObj != null) + org = (Integer)orgObj; } String sql = "SELECT CurrentNext FROM AD_Sequence_No WHERE AD_Sequence_ID=? AND CalendarYearMonth=? AND AD_Org_ID=?"; currentNext = DB.getSQLValue(null, sql, AD_Sequence_ID, cym, org);