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

Merge branch 'minor' into 'master'

[Projekt: xRM-Sales][TicketNr.: 2045375][Rechnungssumme in xRechnung XML stimmt nicht mit Beleg überein]

See merge request !19
parents 5a332f50 5073059a
Branches
Tags 0.1.4
1 merge request!19[Projekt: xRM-Sales][TicketNr.: 2045375][Rechnungssumme in xRechnung XML stimmt nicht mit Beleg überein]
Pipeline #47125 passed with stage
in 28 seconds
Showing
with 59 additions and 30 deletions
......@@ -4,6 +4,19 @@
],
"rules": {
"no-unused-vars": ["error", { "argsIgnorePattern": "^_", "varsIgnorePattern": "^_" }],
"no-redeclare": "error",
"no-shadow": ["error", { "builtinGlobals": true }],
"no-restricted-syntax": [
"error",
{
"selector": "VariableDeclarator[id.name=/^(ALIAS|auth|calendars|clustervars|cti|datetime|db|device|eMath|entities|fileIO|IEntityRecordsRecipeBuilder|IGetTaggedObjectConfig|IGetTaggedObjectsConfig|IGetTagsConfig|indexsearch|INotificationUpdateStrategy|IUntagConfig|JScriptSqlModeWrapper|lexorank|logging|mail|manager|modules|neon|neonFilter|neonTools|net|notification|pack|plugin|previewImage|process|project|question|report|result|SQLTYPES|tag|teams|text|tools|translate|util|vars|workflow|xmlUtility|xml|xmllist)$/]",
"message": "Avoid declaring variables/functions with names used in '@aditosoftware/jdito-types'"
},
{
"selector": "FunctionDeclaration[id.name=/^(ALIAS|auth|calendars|clustervars|cti|datetime|db|device|eMath|entities|fileIO|IEntityRecordsRecipeBuilder|IGetTaggedObjectConfig|IGetTaggedObjectsConfig|IGetTagsConfig|indexsearch|INotificationUpdateStrategy|IUntagConfig|JScriptSqlModeWrapper|lexorank|logging|mail|manager|modules|neon|neonFilter|neonTools|net|notification|pack|plugin|previewImage|process|project|question|report|result|SQLTYPES|tag|teams|text|tools|translate|util|vars|workflow|xmlUtility|xml|xmllist)$/]",
"message": "Avoid declaring variables/functions with names used in '@aditosoftware/jdito-types'"
}
],
"jsdoc/no-undefined-types": 1,
"jsdoc/require-param": 1,
"jsdoc/require-param-type": 1
......
......@@ -3422,24 +3422,6 @@
<column name="DESCRIPTION"/>
</insert>
</changeSet>
<changeSet author="(generated)" id="db8c1ba2-f94d-46b9-ba10-bbc310502413">
<preConditions onFail="MARK_RAN">
<sqlCheck expectedResult="0">
SELECT COUNT(1) FROM AB_KEYWORD_ENTRY WHERE AB_KEYWORD_ENTRY.AB_KEYWORD_ENTRYID = 'ed1b3d39-9cab-4c3c-84c5-438a8b67be53';
</sqlCheck>
</preConditions>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="ed1b3d39-9cab-4c3c-84c5-438a8b67be53"/>
<column name="KEYID" value="PAYTERMDISCOUNT"/>
<column name="TITLE" value="8 days 2% discount, 30 days net"/>
<column name="CONTAINER" value="PaymentTerm"/>
<column name="SORTING" valueNumeric="2"/>
<column name="ISACTIVE" valueNumeric="1"/>
<column name="ISESSENTIAL" valueNumeric="0"/>
<column name="AB_KEYWORD_CATEGORY_ID" value="ab8d06bb-18eb-4fbe-9e00-ecb34bd38c8f"/>
<column name="DESCRIPTION"/>
</insert>
</changeSet>
<changeSet author="(generated)" id="26054ef2-b18f-4efa-97b5-f91b4210c0ed">
<preConditions onFail="MARK_RAN">
<sqlCheck expectedResult="0">
......
......@@ -5,6 +5,16 @@ 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).
## [0.1.4] - 2024-11-25
### Changed
- Cash discounts and payment terms are now only shown on orders of type invoice and order confirmation (#2044171)
### Fixed
- Resolved a bug where the VAT/Net/Gross totals could be incorrect when using items with sub-items (#2045375)
## [0.1.3] - 2024-11-07
### Fixed
......
import { eMath, neon, result, vars } from "@aditosoftware/jdito-types";
import { eMath, result, vars } from "@aditosoftware/jdito-types";
import { ContactUtils } from "Contact_lib";
import { PriceType, ProductPriceUtils } from "Product_lib";
......@@ -24,4 +24,3 @@ let price = ProductPriceUtils.getMostSuitablePrices(["PRICE"], priceType, [produ
foreignPrice = eMath.mulDec(eMath.divDec(price, currencyRate), quantity);
result.string(foreignPrice);
import { translate, vars, result } from "@aditosoftware/jdito-types";
import { result, translate, vars } from "@aditosoftware/jdito-types";
result.string(vars.get("$this.value") + " " + translate.text(vars.get("$this.value") == "1" ? "Day" : "Days"));
import { translate, vars, result, text } from "@aditosoftware/jdito-types";
import { result, text, translate, vars } from "@aditosoftware/jdito-types";
result.string(text.formatDouble(vars.get("$this.value") || 0, "#,##0.##", true) + "% " + translate.text("Sales_cashDiscount"));
import { result } from "@aditosoftware/jdito-types";
result.object({"CASHDISCOUNT.DISCOUNTDAYS": false});
result.object({ "CASHDISCOUNT.DISCOUNTDAYS": false });
......@@ -14,6 +14,8 @@ if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW && vars.get("$thi
//helper function to check if the pString is included in pArray
/**
*
* @param pArray
* @param pString
*/
function _checkIfInArrays(pArray, pString)
{
......@@ -35,6 +37,8 @@ if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW && vars.get("$thi
//helper function to check if the pString is included in pArray
/**
*
* @param pArray
* @param pString
*/
function _checkIfInAttributeArray(pArray, pString)
{
......
......@@ -56,6 +56,7 @@ function _delete()
//private helper function for better code readability
/**
*
* @param pClassificationGroup
*/
function _deleteGroup(pClassificationGroup)
{
......
......@@ -30,6 +30,10 @@ if(fieldType == $ClassificationFieldTypes.DROPDOWN()
/**
*
* @param pFilter
* @param pField
* @param pValidationString
* @param pIndicatorType
*/
function _getValidationString(pFilter, pField, pValidationString, pIndicatorType)
{
......
......@@ -16,6 +16,7 @@ result.string(orgDistrictIds);
/**
*
* @param pOrgUid
*/
function _getDistrictIdsByOrgUid(pOrgUid)
{
......
import { db, question, util, vars } from "@aditosoftware/jdito-types";
import { db, util, vars } from "@aditosoftware/jdito-types";
import { newSelect, newWhere } from "@aditosoftware/utility/process/SqlBuilder_lib/process";
import { UserUtils } from "@aditosoftware/utility/process/UserUtils_lib/process";
import { $SalesKeywords } from "SalesKeywords_registry";
......
import { neon, neonFilter, vars } from "@aditosoftware/jdito-types";
import { EntityUtils } from "EntityUtils_lib";
import { DistrictChangeField } from "District_lib";
import { EntityUtils } from "EntityUtils_lib";
let arrDistrictIds = EntityUtils.recordsRecipeToArray(vars.get("$sys.selectionsRecordsRecipe"));
neon.openContextWithRecipe(
......
......@@ -135,6 +135,10 @@ function _applyFilterToData(pData)
var filterFns = {
/**
*
* @param pRecordValue
* @param pFilterValue
* @param pOperator
* @param pRow
*/
"$$$LOOKUPFIELD$$$": function(pRecordValue, pFilterValue, pOperator, pRow)
{
......
......@@ -5,6 +5,8 @@ var searchValue = null;
RecordFilterUtils.filterRecords(["$$$LOOKUPFIELD$$$"], [["dummy"]], vars.get("$local.filter").filter, {
/**
*
* @param recordValue
* @param filterValue
*/
"$$$LOOKUPFIELD$$$": function(recordValue, filterValue)
{
......
import { vars, result } from "@aditosoftware/jdito-types";
import { result, vars } from "@aditosoftware/jdito-types";
result.string(vars.get("$field.OFFERID"));
......@@ -8,7 +8,10 @@ let cashDiscounts = newSelect(["CASHDISCOUNT.DISCOUNTDAYS", "CASHDISCOUNT.DISCOU
.where("CASHDISCOUNT.OBJECT_TYPE = 'Offer'")
.and("CASHDISCOUNT.OBJECT_ROWID", offerId)
.table()
.map(([days, discount]) => {return {"discountDays": days, "discountPercent": discount}});
.map(([days, discount]) =>
{
return { "discountDays": days, "discountPercent": discount };
});
let fieldValues = {
contactId: vars.get("$field.CONTACT_ID"),
......
......@@ -7,7 +7,10 @@ let cashDiscounts = newSelect(["CASHDISCOUNT.DISCOUNTDAYS", "CASHDISCOUNT.DISCOU
.where("CASHDISCOUNT.OBJECT_TYPE = 'Offer'")
.and("CASHDISCOUNT.OBJECT_ROWID", vars.get("$field.OFFERID"))
.table()
.map(([days, discount]) => {return {"discountDays": days, "discountPercent": discount}});
.map(([days, discount]) =>
{
return { "discountDays": days, "discountPercent": discount };
});
let params = {
"ContactId_param": vars.get("$field.CONTACT_ID"),
......
......@@ -7,7 +7,10 @@ let cashDiscounts = newSelect(["CASHDISCOUNT.DISCOUNTDAYS", "CASHDISCOUNT.DISCOU
.where("CASHDISCOUNT.OBJECT_TYPE = 'Offer'")
.and("CASHDISCOUNT.OBJECT_ROWID", vars.get("$field.OFFERID"))
.table()
.map(([days, discount]) => {return {"discountDays": days, "discountPercent": discount}});
.map(([days, discount]) =>
{
return { "discountDays": days, "discountPercent": discount };
});
let contactId = vars.get("$field.CONTACT_ID");
let pRowId = vars.get("$field.OBJECT_ROWID");
......
import { eMath, translate, vars } from "@aditosoftware/jdito-types";
import { ContextUtils } from "ContextUtils_lib";
import { CurrencyRateUtils, CurrencyUtils } from "Currency_lib";
import { CurrencyRateUtils } from "Currency_lib";
import { OfferItemUtils } from "Offer_lib";
let title = vars.get("$field.OfferCode_VersNr_fieldgroup") + " | " + vars.get("$field.STATUS.displayValue");
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment