Skip to content
Snippets Groups Projects
Commit 9f6d0bf2 authored by Benjamin Ulrich's avatar Benjamin Ulrich :speech_balloon: Committed by Sebastian Listl
Browse files

1073718_1073720 Fix Presetting Values when creating Orders/Offers and added...

1073718_1073720 Fix Presetting Values when creating Orders/Offers and added databaseAuditProcessUser to the liquibase file
parent 16cca108
No related branches found
No related tags found
No related merge requests found
......@@ -6,6 +6,7 @@
<aliasConfigSub>
<aliasSubInstanceConfiguration>
<databaseAuditEnabled v="true" />
<databaseAuditProcessUser v="Admin" />
<indexsearchEnabled v="true" />
<loggingConsoleEnabled v="true" />
<loggingFileEnabled v="true" />
......
......@@ -46,7 +46,6 @@ if(contactid != "")
var salesProjectId = newSelect("SALESPROJECT.SALESPROJECTID")
.from("SALESPROJECT")
.where("SALESPROJECT.CONTACT_ID", contactid)
.and(newWhere("SALESPROJECT.STARTDATE", today, SqlBuilder.GREATER_OR_EQUAL()).or("SALESPROJECT.STARTDATE is null"))
.cell();
if(salesProjectId)
{
......
......@@ -35,7 +35,6 @@ if(contactId != "")
var salesProjectId = newSelect("SALESPROJECT.SALESPROJECTID")
.from("SALESPROJECT")
.where("SALESPROJECT.CONTACT_ID", contactId)
.and(newWhere("SALESPROJECT.STARTDATE", today, SqlBuilder.GREATER_OR_EQUAL()).or("SALESPROJECT.STARTDATE is null"))
.cell();
if(salesProjectId)
neon.setFieldValue("$field.OBJECT_ROWID", salesProjectId);
......
......@@ -90,7 +90,7 @@ CopyModuleUtils.copyModule = function(pInputMapping)
var ModulesMapping = {};
var statements = [];
if(pInputMapping["OFFERITEM"] != undefined && pInputMapping["OFFERITEM"]["destinationModuleName"] == "SALESORDERITEM") //SalesOrder and Offer don't have the exact smae structure anymore: Order don't have the field "optional"
if(pInputMapping["OFFERITEM"] != undefined && pInputMapping["OFFERITEM"]["destinationModuleName"] == "SALESORDERITEM") //SalesOrder and Offer don't have the exact smae structure anymore: Order doesn't have the field "optional"
{
delete AliasDefinitionStructure["tables"]["OFFERITEM"]["columns"]["OPTIONAL"];
}
......
......@@ -454,6 +454,7 @@ OfferUtils.copyToOrder = function (pOfferId, pContextId, pRowId, pContactId, pLa
"$field.OFFER_ID" : pOfferId,
"$field.CURRENCY" : pCurrency || "",
"$field.PAYMENTADDRESS" : pAddress || "",
"$field.DELIVERYADDRESS" : pAddress || "",
"$field.OBJECT_TYPE" : pContextId || "",
"$field.OBJECT_ROWID" : pRowId || "",
"$field.DISCOUNT" : pDiscount || ""
......
......@@ -185,7 +185,7 @@ OrderUtils.copyOfferItemsToOrder = function (pSourceOfferId, pOrderId, pDiscount
var discountedVals = OfferItemUtils.getDiscountedNet(null, pSourceOfferId, pDiscount);
if(discountedVals){
newWhere("SALESORDER.SALESORDERID", pTargetOfferId)
newWhere("SALESORDER.SALESORDERID", pOrderId)
.updateFields({
"NET": netPrice,
"VAT": vat,
......
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