Skip to content
Snippets Groups Projects
Commit 3d68f067 authored by Lukas Werner's avatar Lukas Werner
Browse files

resolved conflicts

parent c2582460
No related branches found
No related tags found
1 merge request!33Sales 2028229 init sales module
......@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## [6.0.0] - Unreleased
### Removed
- Temporary sales implementations
## [5.0.3] - 2024-08-29
### Fixed
......
import { result } from "@aditosoftware/jdito-types";
result.object(["Salesproject", "Offer"]);
......@@ -81,13 +81,6 @@
<name>#PROVIDER_AGGREGATES</name>
<useAggregates v="true" />
</entityProvider>
<entityField>
<name>userCurrency</name>
<title>User Currency</title>
<consumer></consumer>
<dropDownProcess>%aditoprj%/entity/Usersettings_entity/entityfields/usercurrency/dropDownProcess.js</dropDownProcess>
<displayValueProcess>%aditoprj%/entity/Usersettings_entity/entityfields/usercurrency/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>incomingCallContext</name>
<title>Call context</title>
......@@ -171,9 +164,6 @@
<jDitoRecordFieldMapping>
<name>UID.value</name>
</jDitoRecordFieldMapping>
<jDitoRecordFieldMapping>
<name>userCurrency.value</name>
</jDitoRecordFieldMapping>
<jDitoRecordFieldMapping>
<name>incomingCallContext.value</name>
</jDitoRecordFieldMapping>
......
import { result, vars } from "@aditosoftware/jdito-types";
import { CurrencyUtils } from "Currency_lib";
var currencyIso = vars.get("$field.userCurrency");
var title = CurrencyUtils.getTranslatedNameForAlpha3(currencyIso);
result.string(title + " (" + currencyIso + ")");
\ No newline at end of file
import { entities, result } from "@aditosoftware/jdito-types";
import { CurrencyUtils } from "Currency_lib";
import { SqlBuilder } from "SqlBuilder_lib";
//dropDownProcess isntead of consumer so we can add the local currency
var currenciesWithRateSet = new SqlBuilder("Data_alias")
.selectDistinct("CURRENCYRATE.SOURCECURRENCYISO")
.from("CURRENCYRATE")
.arrayColumn();
currenciesWithRateSet.unshift(CurrencyUtils.getLocalCurrency());//add local Currency
var loadingConfig = entities.createConfigForLoadingRows()
.fields(["ALPHA3", "#CONTENTTITLE"])
.entity("Currency_entity")
.provider("Currencies")
.addParameter("DisplayLongTitle_param", true)
.addParameter("InvertBlacklist_param", true)
.addParameter("Blacklist_param", JSON.stringify(currenciesWithRateSet));
var currencies = entities.getRows(loadingConfig);
var res = [];
for (var currency in currencies)
{
res.push([currencies[currency]["ALPHA3"], currencies[currency]["#CONTENTTITLE"]]);
}
result.object(res);
\ No newline at end of file
......@@ -33,26 +33,6 @@
</entityFieldLink>
</fields>
</genericViewTemplate>
<genericViewTemplate>
<name>CurrencyEdit</name>
<editMode v="true" />
<showDrawer v="true" />
<drawerCaption>Currency</drawerCaption>
<fixedDrawer v="true" />
<hideLabels v="false" />
<hideEmptyFields v="false" />
<title>Settings</title>
<fields>
<entityFieldLink>
<name>06e4af54-9604-4139-9be1-ba7a7025d231</name>
<entityField>userCurrency</entityField>
</entityFieldLink>
<entityFieldLink>
<name>ce460e64-dc1e-4951-b590-c3834e35393f</name>
<entityField>prefferredApprover</entityField>
</entityFieldLink>
</fields>
</genericViewTemplate>
<genericViewTemplate>
<name>PhoneEdit</name>
<editMode v="true" />
......
......@@ -206,32 +206,19 @@ Dependency.excludedFields = function()
//"CampaignStep_entity": null,
//"Campaign_entity": null,
//"Communication_entity": ["OBJECT_ROWID", "OBJECT_TYPE"],
//"Competition_entity": ["OBJECT_ROWID", "OBJECT_TYPE"],
//"Contact_entity": ["ADDRESS_ID", "PERSON_ID"],
//"Contract_entity": null,
//"DocumentTemplate_entity": null,
//"Document_entity": null,
//"Employee_entity": ["UID", "SHORT_UID", "CONFIRM_PASSWORD", "PASSWORD"],
//"ExportTemplate_entity": null,
//"Favorite_entity": ["UID", "GROUP_ID", "USER_ID", "GROUP_TYPE", "PICTURE"],
//"Forecast_entity": null,
//"KnowledgeManagement_entity": null,
//"Lead_entity": ["LEAD_PERSON", "LEAD_ORGANISATIONID"],
//"Leadimport_entity": null,
//"Member_entity": ["OBJECT_ROWID", "OBJECT_TYPE"],
//"ObjectTree_entity": ["UID", "PARENT_ID", "ICON", "EXPANDED", "TARGET_CONTEXT", "OBJECTRELATIONID"],
//"Offer_entity": ["OFFER_ID"],
//"Offeritem_entity": ["ASSIGNEDTO", "ITEMSORT", "OFFER_ID"],
//"Order_entity": null,
//"Orderitem_entity": ["ASSIGNEDTO", "ITEMSORT", "SALESORDER_ID"],
//"Organisation_entity": ["ORGANISATION_ID"],
//"Person_entity": ["TITLESUFFIX", "PERSON_ID", "ADDRESS_ID"],
//"PrivatePerson_entity": null,
//"Prod2prod_entity": ["UID", "PRODUCTID", "PROD2PRODID", "DEST_ID"],
//"Product_entity": ["PICTURE"],
//"Productprice_entity": null,
//"SalesprojectSource_entity": ["SALESPROJECT_ID"],
//"Salesproject_entity": null,
//"SupportTicket_entity": ["TASK_ID", "TASK_PARRENT_ID", "TASK_PARENT_CONTEXT"],
//"Task_entity": ["PARENT_ID", "PARENT_CONTEXT", "PROTECTIONLEVEL", "TYPE"],
//"WorkflowDefinition_entity": ["UID"]
......
......@@ -16,7 +16,6 @@ export function UserSettingUtil()
];
// settings stored in the parameters of a usermodel, that alsways have a value (not empty able)
var mandatoryParamSettings = [
"userCurrency",
"incomingCallContext",
"prefferredApprover",
"sendNotificationAsMail"
......@@ -113,12 +112,7 @@ export function UserSettingUtil()
{
return settingValueFn();
}
}
//if(pKey == "userCurrency")//preset currency
//{
//return CurrencyUtils.getLocalCurrency();
//}
//
}
//if(pKey == "incomingCallContext")//preset incomingCallContext
//{
//return $KeywordRegistry.incomingCallContext$contact();
......
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