midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

BF [ 2344776 ] The Manufacturing Order form do not is for print

This commit is contained in:
teo_sarca 2008-12-15 14:53:22 +00:00
parent 5449137a22
commit d224dde0bc
3 changed files with 62 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
base/src/org/compiere/model/MResourceType.java
View File

@ -18,11 +18,13 @@ package org.compiere.model;
import java.sql.ResultSet;
import java.sql.Timestamp;
import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.GregorianCalendar;
import java.util.Properties;
import org.adempiere.exceptions.AdempiereException;
import org.adempiere.exceptions.FillMandatoryException;
import org.compiere.util.CCache;
import org.compiere.util.TimeUtil;
@ -36,6 +38,7 @@ import org.compiere.util.TimeUtil;
* @author Teo Sarca, www.arhipac.ro
* <li>FR [ 2051056 ] MResource[Type] should be cached
* <li>added manufacturing related methods (getDayStart, getDayEnd etc)
* <li>BF [ 2431049 ] If Time Slot then Time Slot Start/End should be mandatory
*/
public class MResourceType extends X_S_ResourceType
{
@ -89,7 +92,13 @@ public class MResourceType extends X_S_ResourceType
{
if (isTimeSlot())
{
if (getTimeSlotStart().compareTo(getTimeSlotEnd()) >= 0)
Timestamp start = getTimeSlotStart();
if (start == null)
throw new FillMandatoryException(COLUMNNAME_TimeSlotStart);
Timestamp end = getTimeSlotEnd();
if (end == null)
throw new FillMandatoryException(COLUMNNAME_TimeSlotEnd);
if (start.compareTo(end) >= 0)
{
throw new AdempiereException("@TimeSlotStart@ > @TimeSlotEnd@");
}
@ -219,4 +228,36 @@ public class MResourceType extends X_S_ResourceType
return isOnMonday() || isOnTuesday() || isOnWednesday() || isOnThursday() || isOnFriday()
|| isOnSaturday() || isOnSunday();
}
@Override
public String toString()
{
StringBuffer sb = new StringBuffer();
sb.append("MResourceType[")
.append(get_ID())
.append(",Value=").append(getValue())
.append(",Name=").append(getName());
if (isTimeSlot())
{
SimpleDateFormat df = new SimpleDateFormat("HH:mm:ss");
sb.append(",TimeSlot=");
Timestamp start = getTimeSlotStart();
Timestamp end = getTimeSlotEnd();
sb.append(start != null ? df.format(start) : " - ");
sb.append("-");
sb.append(end != null ? df.format(end) : " - ");
}
if (isDateSlot())
{
sb.append(",DaySlot=")
.append(isOnMonday() ? "M" : "-")
.append(isOnTuesday() ? "T" : "-")
.append(isOnWednesday() ? "W" : "-")
.append(isOnThursday() ? "T" : "-")
.append(isOnFriday() ? "F" : "-")
.append(isOnSaturday() ? "S" : "-")
.append(isOnSunday() ? "S" : "-");
}
return sb.append("]").toString();
}
} // MResourceType

10
migration/352a-trunk/360_BF2431049.sql Normal file
View File

@ -0,0 +1,10 @@
-- 15.12.2008 16:46:02 EET
--
UPDATE AD_Field SET IsMandatory='Y',Updated=TO_DATE('2008-12-15 16:46:02','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=5584
;
-- 15.12.2008 16:46:08 EET
--
UPDATE AD_Field SET IsMandatory='Y',Updated=TO_DATE('2008-12-15 16:46:08','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=5579
;

10
migration/352a-trunk/postgresql/360_BF2431049.sql Normal file
View File

@ -0,0 +1,10 @@
-- 15.12.2008 16:46:02 EET
--
UPDATE AD_Field SET IsMandatory='Y',Updated=TO_TIMESTAMP('2008-12-15 16:46:02','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=5584
;
-- 15.12.2008 16:46:08 EET
--
UPDATE AD_Field SET IsMandatory='Y',Updated=TO_TIMESTAMP('2008-12-15 16:46:08','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=5579
;