Skip to content
Snippets Groups Projects
Commit 67a9e034 authored by Johannes Hörmann's avatar Johannes Hörmann
Browse files

fix salesproject

parent 82c2df7b
No related branches found
No related tags found
No related merge requests found
......@@ -5,5 +5,5 @@ import("OfferOrder_lib");
if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
{
result.string( OfferUtils.getNextOfferNumber() );
result.string(OfferUtils.getNextOfferNumber());
}
\ No newline at end of file
......@@ -74,10 +74,11 @@
</entityField>
<entityField>
<name>PROJECTCODE</name>
<documentation>%aditoprj%/entity/Salesproject_entity/entityfields/projectcode/documentation.adoc</documentation>
<title>Project number</title>
<tableName>SALESPROJECT</tableName>
<columnName>PROJECTCODE</columnName>
<state>AUTO</state>
<state>READONLY</state>
<valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/projectcode/valueProcess.js</valueProcess>
<onValidation>%aditoprj%/entity/Salesproject_entity/entityfields/projectcode/onValidation.js</onValidation>
<onValueChange>%aditoprj%/entity/Salesproject_entity/entityfields/projectcode/onValueChange.js</onValueChange>
......
= PROJECTCODE
:hardbreaks:
Unique identification number of the offer.
It's automatically generated from the starting number _1000_.
\ No newline at end of file
......@@ -5,5 +5,5 @@ import("Salesproject_lib");
if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
{
result.string( Salesproject.getNextProjectNumber() );
result.string(Salesproject.getNextProjectNumber());
}
\ No newline at end of file
......@@ -37,7 +37,7 @@ OfferUtils.getNextOfferVersionNumber = function(offerCode) {
*
* @param {String} offerNumber offer number to check
*
* @return {boolean} passed number is valid
* @return {Boolean} passed number is valid
*/
OfferUtils.validateOfferNumber = function(offerNumber) {
return NumberSequencingUtils.validateUniqueNumber(offerNumber, "OFFERCODE", "OFFER");
......
......@@ -20,8 +20,7 @@ function Salesproject() {}
* @result {String} next valid project number
*/
Salesproject.getNextProjectNumber = function() {
var JdUtils = new JDitoUtils();
return JdUtils.getNextUniqueNumber("PROJECTCODE", "SALESPROJECT");
return NumberSequencingUtils.getNextUniqueNumber("PROJECTCODE", "SALESPROJECT");
}
/**
......@@ -32,8 +31,7 @@ Salesproject.getNextProjectNumber = function() {
* @result {Boolean} passed number is valid
*/
Salesproject.validateProjectNumber = function(projectNumber) {
var JdUtils = new JDitoUtils();
return JdUtils.validateUniqueNumber(projectNumber, "PROJECTCODE", "SALESPROJECT");
return NumberSequencingUtils.validateUniqueNumber(projectNumber, "PROJECTCODE", "SALESPROJECT");
}
/**
......@@ -53,12 +51,12 @@ Salesproject.insertMilestone = function(salesprojectId, type, value, notifyForec
["SALESPROJECT_CYCLEID", "SALESPROJECT_ID", "TYPE", "VALUE", "DATE_START", "USER_NEW", "DATE_NEW"],
null,
[util.getNewUUID(), salesprojectId, type, value, vars.get("$sys.date"), vars.get("$sys.user"), vars.get("$sys.date")]);
if (notifyForecast) {
this.notifyToUpdateForecast()
}
return true;
}
return false;
}
......@@ -66,6 +64,6 @@ Salesproject.insertMilestone = function(salesprojectId, type, value, notifyForec
* Notify the user to update the forecast
*/
Salesproject.notifyToUpdateForecast = function() {
// Todo logging.show durch sinnvolle Meldung ersetzen oder ähnlich...
// TODO: logging.show durch sinnvolle Meldung ersetzen oder ähnlich...
logging.show(translate.text("Please update the forecast."));
}
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment