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

Feature Request http://sourceforge.net/tracker/index.php?func=detail&aid=1714090&group_id=176962&atid=879335

This commit is contained in:
mjudd 2007-05-07 08:35:34 +00:00
parent 85b34cb4e7
commit cfaa8b1e45
3 changed files with 51 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
base/src/org/compiere/process/InOutGenerate.java
View File

@ -47,6 +47,8 @@ public class InOutGenerate extends SvrProcess
private String p_docAction = DocAction.ACTION_Complete; private String p_docAction = DocAction.ACTION_Complete;
/** Consolidate */ /** Consolidate */
private boolean p_ConsolidateDocument = true; private boolean p_ConsolidateDocument = true;
/** Shipment Date */
private Timestamp p_DateShipped = null;
/** The current Shipment */ /** The current Shipment */
private MInOut m_shipment = null; private MInOut m_shipment = null;
@ -96,13 +98,18 @@ public class InOutGenerate extends SvrProcess
p_ConsolidateDocument = "Y".equals(para[i].getParameter()); p_ConsolidateDocument = "Y".equals(para[i].getParameter());
else if (name.equals("DocAction")) else if (name.equals("DocAction"))
p_docAction = (String)para[i].getParameter(); p_docAction = (String)para[i].getParameter();
else if (name.equals("MovementDate"))
p_DateShipped = (Timestamp)para[i].getParameter();
else else
log.log(Level.SEVERE, "Unknown Parameter: " + name); log.log(Level.SEVERE, "Unknown Parameter: " + name);
// Login Date // juddm - added ability to specify a shipment date from Generate Shipments
if (p_DateShipped == null) {
m_movementDate = Env.getContextAsDate(getCtx(), "#Date"); m_movementDate = Env.getContextAsDate(getCtx(), "#Date");
if (m_movementDate == null) if (m_movementDate == null)
m_movementDate = new Timestamp(System.currentTimeMillis()); m_movementDate = new Timestamp(System.currentTimeMillis());
} else
m_movementDate = p_DateShipped;
// DocAction check // DocAction check
if (!DocAction.ACTION_Complete.equals(p_docAction)) if (!DocAction.ACTION_Complete.equals(p_docAction))
p_docAction = DocAction.ACTION_Prepare; p_docAction = DocAction.ACTION_Prepare;

20
migration/320-trunk/002_add_feature_1714090.sql Normal file
View File

@ -0,0 +1,20 @@
-- Feature Request
-- juddm - add the ability to specific a shipment date (instead of current date) to the shipment generation process
-- http://sourceforge.net/tracker/index.php?func=detail&aid=1714090&group_id=176962&atid=879335
INSERT INTO AD_PROCESS_PARA (ad_process_para_id, ad_client_id, ad_org_id, isactive, created, createdby, updated, updatedby,
name, description, help, ad_process_id, seqno, ad_reference_id, ad_reference_value_id, ad_val_rule_id, columnname, iscentrallymaintained,
fieldlength, ismandatory, isrange, defaultvalue, defaultvalue2, vformat, valuemin, valuemax, ad_element_id, entitytype )
VALUES (50019, 0, 0, 'Y', TO_DATE('2007-03-03','YYYY-MM-DD'), 100, TO_DATE('2007-03-03','YYYY-MM-DD'), 100,
'Shipment Date', 'Date printed on shipment', 'The Shipment Date indicates the date printed on the shipment.', 118, 15, 15,null,null, 'MovementDate', 'Y',
0, 'Y', 'N', '@#Date@', '','','','', 1037, 'D');
COMMIT;
UPDATE AD_SEQUENCE
SET currentnextsys = (SELECT MAX (ad_process_para_id) + 1
FROM AD_PROCESS_PARA
WHERE ad_process_para_id < 1000000)
WHERE NAME = 'AD_Process_Para';
COMMIT;

20
migration/320-trunk/postgresql/002_add_feature_1714090.sql Normal file
View File

@ -0,0 +1,20 @@
-- Feature Request
-- juddm - add the ability to specific a shipment date (instead of current date) to the shipment generation process
-- http://sourceforge.net/tracker/index.php?func=detail&aid=1714090&group_id=176962&atid=879335
INSERT INTO AD_PROCESS_PARA (ad_process_para_id, ad_client_id, ad_org_id, isactive, created, createdby, updated, updatedby,
name, description, help, ad_process_id, seqno, ad_reference_id, ad_reference_value_id, ad_val_rule_id, columnname, iscentrallymaintained,
fieldlength, ismandatory, isrange, defaultvalue, defaultvalue2, vformat, valuemin, valuemax, ad_element_id, entitytype )
VALUES (50019, 0, 0, 'Y', TO_TIMESTAMP('2007-03-03','YYYY-MM-DD'), 100, TO_TIMESTAMP('2007-03-03','YYYY-MM-DD'), 100,
'Shipment Date', 'Date printed on shipment', 'The Shipment Date indicates the date printed on the shipment.', 118, 15, 15,null,null, 'MovementDate', 'Y',
0, 'Y', 'N', '@#Date@', '','','','', 1037, 'D');
COMMIT;
UPDATE AD_SEQUENCE
SET currentnextsys = (SELECT MAX (ad_process_para_id) + 1
FROM AD_PROCESS_PARA
WHERE ad_process_para_id < 1000000)
WHERE NAME = 'AD_Process_Para';
COMMIT;