Menu
▾
▴
[Adempiere-cvslog] SF.net SVN: adempiere: [5544] trunk
|
From: <ph...@us...> - 2008-06-30 00:36:36
|
Revision: 5544
http://adempiere.svn.sourceforge.net/adempiere/?rev=5544&view=rev
Author: phib
Date: 2008-06-29 17:36:44 -0700 (Sun, 29 Jun 2008)
Log Message:
-----------
FR [ 2006255 ] Configurable "Create Periods" process.
Modified Paths:
--------------
trunk/base/src/org/compiere/model/MYear.java
trunk/base/src/org/compiere/process/YearCreatePeriods.java
Added Paths:
-----------
trunk/migration/351b-trunk/214_FR2006255.sql
trunk/migration/351b-trunk/postgresql/214_FR2006255.sql
Modified: trunk/base/src/org/compiere/model/MYear.java
===================================================================
--- trunk/base/src/org/compiere/model/MYear.java 2008-06-29 07:35:23 UTC (rev 5543)
+++ trunk/base/src/org/compiere/model/MYear.java 2008-06-30 00:36:44 UTC (rev 5544)
@@ -161,7 +161,7 @@
return true;
} // beforeSave
- /**
+ /**
* Create 12 Standard (Jan-Dec) Periods.
* Creates also Period Control from DocType.
* @see DocumentTypeVerify#createPeriodControls(Properties, int, SvrProcess, String)
@@ -170,6 +170,20 @@
*/
public boolean createStdPeriods(Locale locale)
{
+ return createStdPeriods(locale, null, null);
+ } // createStdPeriods
+
+ /**
+ * Create 12 Standard Periods from the specified start date.
+ * Creates also Period Control from DocType.
+ * @see DocumentTypeVerify#createPeriodControls(Properties, int, SvrProcess, String)
+ * @param locale locale
+ * @param startDate first day of the calendar year
+ * @param dateFormat SimpleDateFormat pattern for generating the period names.
+ * @return true if created
+ */
+ public boolean createStdPeriods(Locale locale, Timestamp startDate, String dateFormat)
+ {
if (locale == null)
{
MClient client = MClient.get(getCtx());
@@ -181,34 +195,33 @@
if (locale == null)
locale = Env.getLanguage(getCtx()).getLocale();
//
- String[] months = null;
- try
- {
- DateFormatSymbols symbols = new DateFormatSymbols(locale);
- months = symbols.getShortMonths();
- }
- catch (Exception e)
- {
- months = new String[]{"Jan", "Feb", "Nar",
- "Apr", "May", "Jun",
- "Jul", "Aug", "Sep",
- "Oct", "Nov", "Dec"};
- }
+ SimpleDateFormat formatter;
+ if ( dateFormat == null || dateFormat.equals("") )
+ dateFormat = "MMM-yy";
+ formatter = new SimpleDateFormat(dateFormat, locale);
+
//
int year = getYearAsInt();
GregorianCalendar cal = new GregorianCalendar(locale);
+ if ( startDate != null )
+ cal.setTime(startDate);
+ else
+ {
+ cal.set(Calendar.YEAR, year);
+ cal.set(Calendar.MONTH, 0);
+ cal.set(Calendar.DAY_OF_MONTH, 1);
+ }
cal.set(Calendar.HOUR_OF_DAY, 0);
cal.set(Calendar.MINUTE, 0);
cal.set(Calendar.SECOND, 0);
cal.set(Calendar.MILLISECOND, 0);
+
//
for (int month = 0; month < 12; month++)
{
- cal.set(Calendar.YEAR, year);
- cal.set(Calendar.MONTH, month);
- cal.set(Calendar.DAY_OF_MONTH, 1);
+
Timestamp start = new Timestamp(cal.getTimeInMillis());
- String name = months[month] + "-" + getYY();
+ String name = formatter.format(start);
//
cal.add(Calendar.MONTH, 1);
cal.add(Calendar.DAY_OF_YEAR, -1);
@@ -217,6 +230,8 @@
MPeriod period = new MPeriod (this, month+1, name, start, end);
if (!period.save(get_TrxName())) // Creates Period Control
return false;
+
+ cal.add(Calendar.DAY_OF_YEAR, 1);
}
return true;
} // createStdPeriods
Modified: trunk/base/src/org/compiere/process/YearCreatePeriods.java
===================================================================
--- trunk/base/src/org/compiere/process/YearCreatePeriods.java 2008-06-29 07:35:23 UTC (rev 5543)
+++ trunk/base/src/org/compiere/process/YearCreatePeriods.java 2008-06-30 00:36:44 UTC (rev 5544)
@@ -16,9 +16,12 @@
*****************************************************************************/
package org.compiere.process;
-import org.compiere.model.*;
-import org.compiere.util.*;
+import java.sql.Timestamp;
+import java.util.logging.Level;
+import org.compiere.model.MYear;
+import org.compiere.util.AdempiereUserError;
+
/**
* Create Periods of year
*
@@ -28,12 +31,28 @@
public class YearCreatePeriods extends SvrProcess
{
private int p_C_Year_ID = 0;
+ private Timestamp p_StartDate;
+ private String p_DateFormat;
/**
* Prepare
*/
protected void prepare ()
{
+
+ ProcessInfoParameter[] para = getParameter();
+ for (int i = 0; i < para.length; i++)
+ {
+ String name = para[i].getParameterName();
+ if (para[i].getParameter() == null)
+ ;
+ else if (name.equals("StartDate"))
+ p_StartDate = (Timestamp) para[i].getParameter();
+ else if (name.equals("DateFormat"))
+ p_DateFormat = (String) para[i].getParameter();
+ else
+ log.log(Level.SEVERE, "Unknown Parameter: " + name);
+ }
p_C_Year_ID = getRecord_ID();
} // prepare
@@ -50,7 +69,7 @@
throw new AdempiereUserError ("@NotFound@: @C_Year_ID@ - " + p_C_Year_ID);
log.info(year.toString());
//
- if (year.createStdPeriods(null))
+ if (year.createStdPeriods(null, p_StartDate, p_DateFormat))
return "@OK@";
return "@Error@";
} // doIt
Added: trunk/migration/351b-trunk/214_FR2006255.sql
===================================================================
--- trunk/migration/351b-trunk/214_FR2006255.sql (rev 0)
+++ trunk/migration/351b-trunk/214_FR2006255.sql 2008-06-30 00:36:44 UTC (rev 5544)
@@ -0,0 +1,42 @@
+
+-- 26/06/2008 16:29:22
+-- Period creation improvements
+INSERT INTO AD_Process_Para (AD_Client_ID,AD_Element_ID,AD_Org_ID,AD_Process_ID,AD_Process_Para_ID,AD_Reference_ID,ColumnName,Created,CreatedBy,EntityType,FieldLength,IsActive,IsCentrallyMaintained,IsMandatory,IsRange,Name,SeqNo,Updated,UpdatedBy) VALUES (0,574,0,100,53203,15,'StartDate',TO_DATE('2008-06-26 16:29:19','YYYY-MM-DD HH24:MI:SS'),100,'D',0,'Y','Y','N','N','Start Date',10,TO_DATE('2008-06-26 16:29:19','YYYY-MM-DD HH24:MI:SS'),100)
+;
+
+-- 26/06/2008 16:29:22
+-- Period creation improvements
+INSERT INTO AD_Process_Para_Trl (AD_Language,AD_Process_Para_ID, Description,Help,Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy) SELECT l.AD_Language,t.AD_Process_Para_ID, t.Description,t.Help,t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Process_Para t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Process_Para_ID=53203 AND EXISTS (SELECT * FROM AD_Process_Para_Trl tt WHERE tt.AD_Language!=l.AD_Language OR tt.AD_Process_Para_ID!=t.AD_Process_Para_ID)
+;
+
+-- 26/06/2008 16:32:25
+-- Period creation improvements
+UPDATE AD_Process SET Description='Create 12 standard calendar periods.', Help='Creates 12 calendar month long standard periods from the specified start date. If no start date is specified, 1st of Jan will be used.',Updated=TO_DATE('2008-06-26 16:32:25','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Process_ID=100
+;
+
+-- 26/06/2008 16:32:25
+-- Period creation improvements
+UPDATE AD_Process_Trl SET IsTranslated='N' WHERE AD_Process_ID=100
+;
+
+
+-- 26/06/2008 17:18:13
+-- Period creation improvements
+INSERT INTO AD_Process_Para (AD_Client_ID,AD_Org_ID,AD_Process_ID,AD_Process_Para_ID,AD_Reference_ID,ColumnName,Created,CreatedBy,DefaultValue,EntityType,FieldLength,IsActive,IsCentrallyMaintained,IsMandatory,IsRange,Name,SeqNo,Updated,UpdatedBy) VALUES (0,0,100,53205,10,'DateFormat',TO_DATE('2008-06-26 17:18:12','YYYY-MM-DD HH24:MI:SS'),100,'MMM-yy','D',0,'Y','Y','N','N','Period Name Format',20,TO_DATE('2008-06-26 17:18:12','YYYY-MM-DD HH24:MI:SS'),100)
+;
+
+-- 26/06/2008 17:18:13
+-- Period creation improvements
+INSERT INTO AD_Process_Para_Trl (AD_Language,AD_Process_Para_ID, Description,Help,Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy) SELECT l.AD_Language,t.AD_Process_Para_ID, t.Description,t.Help,t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Process_Para t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Process_Para_ID=53205 AND EXISTS (SELECT * FROM AD_Process_Para_Trl tt WHERE tt.AD_Language!=l.AD_Language OR tt.AD_Process_Para_ID!=t.AD_Process_Para_ID)
+;
+
+-- 26/06/2008 17:19:53
+-- Period creation improvements
+UPDATE AD_Process SET Help='Creates 12 calendar month long standard periods from the specified start date. If no start date is specified, 1st of Jan will be used. The period name will be generated from the start date of each period using the java SimpleDateFormat pattern provided. ',Updated=TO_DATE('2008-06-26 17:19:53','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Process_ID=100
+;
+
+-- 26/06/2008 17:19:53
+-- Period creation improvements
+UPDATE AD_Process_Trl SET IsTranslated='N' WHERE AD_Process_ID=100
+;
+
Added: trunk/migration/351b-trunk/postgresql/214_FR2006255.sql
===================================================================
--- trunk/migration/351b-trunk/postgresql/214_FR2006255.sql (rev 0)
+++ trunk/migration/351b-trunk/postgresql/214_FR2006255.sql 2008-06-30 00:36:44 UTC (rev 5544)
@@ -0,0 +1,41 @@
+
+-- 26/06/2008 16:29:22
+-- Period creation improvements
+INSERT INTO AD_Process_Para (AD_Client_ID,AD_Element_ID,AD_Org_ID,AD_Process_ID,AD_Process_Para_ID,AD_Reference_ID,ColumnName,Created,CreatedBy,EntityType,FieldLength,IsActive,IsCentrallyMaintained,IsMandatory,IsRange,Name,SeqNo,Updated,UpdatedBy) VALUES (0,574,0,100,53203,15,'StartDate',TO_TIMESTAMP('2008-06-26 16:29:19','YYYY-MM-DD HH24:MI:SS'),100,'D',0,'Y','Y','N','N','Start Date',10,TO_TIMESTAMP('2008-06-26 16:29:19','YYYY-MM-DD HH24:MI:SS'),100)
+;
+
+-- 26/06/2008 16:29:22
+-- Period creation improvements
+INSERT INTO AD_Process_Para_Trl (AD_Language,AD_Process_Para_ID, Description,Help,Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy) SELECT l.AD_Language,t.AD_Process_Para_ID, t.Description,t.Help,t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Process_Para t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Process_Para_ID=53203 AND EXISTS (SELECT * FROM AD_Process_Para_Trl tt WHERE tt.AD_Language!=l.AD_Language OR tt.AD_Process_Para_ID!=t.AD_Process_Para_ID)
+;
+
+-- 26/06/2008 16:32:25
+-- Period creation improvements
+UPDATE AD_Process SET Description='Create 12 standard calendar periods.', Help='Creates 12 calendar month long standard periods from the specified start date. If no start date is specified, 1st of Jan will be used.',Updated=TO_TIMESTAMP('2008-06-26 16:32:25','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Process_ID=100
+;
+
+-- 26/06/2008 16:32:25
+-- Period creation improvements
+UPDATE AD_Process_Trl SET IsTranslated='N' WHERE AD_Process_ID=100
+;
+
+-- 26/06/2008 17:18:13
+-- Period creation improvements
+INSERT INTO AD_Process_Para (AD_Client_ID,AD_Org_ID,AD_Process_ID,AD_Process_Para_ID,AD_Reference_ID,ColumnName,Created,CreatedBy,DefaultValue,EntityType,FieldLength,IsActive,IsCentrallyMaintained,IsMandatory,IsRange,Name,SeqNo,Updated,UpdatedBy) VALUES (0,0,100,53205,10,'DateFormat',TO_TIMESTAMP('2008-06-26 17:18:12','YYYY-MM-DD HH24:MI:SS'),100,'MMM-yy','D',0,'Y','Y','N','N','Period Name Format',20,TO_TIMESTAMP('2008-06-26 17:18:12','YYYY-MM-DD HH24:MI:SS'),100)
+;
+
+-- 26/06/2008 17:18:13
+-- Period creation improvements
+INSERT INTO AD_Process_Para_Trl (AD_Language,AD_Process_Para_ID, Description,Help,Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy) SELECT l.AD_Language,t.AD_Process_Para_ID, t.Description,t.Help,t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Process_Para t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Process_Para_ID=53205 AND EXISTS (SELECT * FROM AD_Process_Para_Trl tt WHERE tt.AD_Language!=l.AD_Language OR tt.AD_Process_Para_ID!=t.AD_Process_Para_ID)
+;
+
+-- 26/06/2008 17:19:53
+-- Period creation improvements
+UPDATE AD_Process SET Help='Creates 12 calendar month long standard periods from the specified start date. If no start date is specified, 1st of Jan will be used. The period name will be generated from the start date of each period using the java SimpleDateFormat pattern provided. ',Updated=TO_TIMESTAMP('2008-06-26 17:19:53','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Process_ID=100
+;
+
+-- 26/06/2008 17:19:53
+-- Period creation improvements
+UPDATE AD_Process_Trl SET IsTranslated='N' WHERE AD_Process_ID=100
+;
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|