Stefan/Fuchs_Intranet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update submodule references for OCORE, OCORE_Charting, OCORE_web, and OCORE_web_pdf to latest commits
Playwright Tests / test (push) Has been cancelled
Details

Browse Source
This commit is contained in:
Stefan
2026-07-10 11:47:12 +02:00
parent 59a2b86c09
commit e53d8962ad
10 changed files with 87 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Fuchs/wwwroot/web/fis.inv.de.js
+22 -7
View File
@@ -1027,14 +1027,22 @@ $inv.cSt = function (data) {
});
};
$inv.eHtml = function (ev) {
let t = $(this), frmct = ev.data instanceof jQuery ? ev.data : ev.data.t, flds = [
{ name: 'txt', label: 'Text', type: 'html', value: frmct.html(), tinymce: true, attr: { style: 'height: 300px' } }
];
let t = $(this), frmct = ev.data instanceof jQuery ? ev.data : ev.data.t;
/* invoiceemail must stay plain text — using the TinyMCE/html editor here used to wrap the
address in <p> tags, which then got posted and persisted verbatim into SendToEmail. */
let isPlainText = ev.data.nme === 'invoiceemail';
let flds = isPlainText
? [{ name: 'txt', label: 'Text', type: 'text', value: frmct.text() }]
: [{ name: 'txt', label: 'Text', type: 'html', value: frmct.html(), tinymce: true, attr: { style: 'height: 300px' } }];
let change = ev.data.change || null;
let sets = {
title: t.data('dialog') || '',
success: function (response) {
frmct.html(response.txt);
if (isPlainText) {
frmct.text(response.txt || '');
} else {
frmct.html(response.txt);
}
if (typeof change === 'function') {
change(response.txt);
}
@@ -1414,9 +1422,16 @@ $inv.itemToContract = function (rrx) {
ci.desc = rrx.htmltext || ((((rrx.NameOrNumber || '').substr(0, 1) !== '#') ? oHtml($$[0]('p').text(rrx.NameOrNumber || '')) : '') + (rrx.Note || ''));
ci.total_net = '';
} else {
/* normal priced item (incl. set headers, which carry their own set price or 0) */
ci.title = rrx.NameOrNumber || '';
ci.desc = rrx.Note || '';
/* normal priced item (incl. set headers, which carry their own set price or 0).
Mirrors the "itm"/co.t fallback above: when the row only carries pre-built
htmltext (no separate NameOrNumber/Note), use it as desc so the PDF isn't left
without a description for these rows. */
if (rrx.htmltext) {
ci.desc = rrx.htmltext;
} else {
ci.title = rrx.NameOrNumber || '';
ci.desc = rrx.Note || '';
}
ci.qty = rrx.quantity || ((rrx.quantityhours || 0) !== 0 ? (fnum(rrx.quantityhours) + (rrx.UnitString ? ' ' + rrx.UnitString : '')) : '');
ci.price_net = (rrx.net || 0);
ci.total_net = (rrx.net_val || 0);