From a6b685aed183138960f10b67b8a84a9cba8e2dac Mon Sep 17 00:00:00 2001
From: =?utf8?q?V=C3=A1s=C3=A1ry=20D=C3=A1niel?= <vasary@elgekko.net>
Date: Thu, 29 Feb 2024 21:31:08 +0100
Subject: [PATCH] Numberbox modification on all form done

---
 .../ui/converter/DoubleToStringConverter.java |  10 +-
 .../hu/user/lis/ui/editor/common/Editors.java |   2 +-
 .../editor/import-invoice-approve-editor.zul  |  44 ++++---
 .../editor/import-invoice-assign-editor.zul   |  16 +--
 .../resources/web/editor/project-attach.zul   |  69 ++++++-----
 .../resources/web/form/attachment-form.zul    |  60 +++++-----
 .../resources/web/form/invoice-data-form.zul  |  25 ++--
 .../main/resources/web/form/invoice-form.zul  | 112 ++----------------
 .../main/resources/web/invoice-payment.zul    |  20 ++--
 .../src/main/resources/web/invoices.zul       |   4 +-
 .../resources/web/static/css/webclient.css    |   4 +
 11 files changed, 141 insertions(+), 225 deletions(-)

diff --git a/sly-crm-ui/src/main/java/hu/user/lis/ui/converter/DoubleToStringConverter.java b/sly-crm-ui/src/main/java/hu/user/lis/ui/converter/DoubleToStringConverter.java
index f534a97..f2af6b2 100644
--- a/sly-crm-ui/src/main/java/hu/user/lis/ui/converter/DoubleToStringConverter.java
+++ b/sly-crm-ui/src/main/java/hu/user/lis/ui/converter/DoubleToStringConverter.java
@@ -1,6 +1,7 @@
 package hu.user.lis.ui.converter;
 
 import lombok.extern.log4j.Log4j2;
+import org.apache.logging.log4j.util.Strings;
 import org.zkoss.bind.BindContext;
 import org.zkoss.bind.Converter;
 import org.zkoss.zk.ui.Component;
@@ -8,7 +9,6 @@ import org.zkoss.zk.ui.Component;
 import java.math.RoundingMode;
 import java.text.NumberFormat;
 import java.util.Locale;
-import java.util.Objects;
 
 @Log4j2
 public class DoubleToStringConverter implements Converter<String, Double, Component> {
@@ -29,8 +29,12 @@ public class DoubleToStringConverter implements Converter<String, Double, Compon
     public Double coerceToBean(String data, Component listCell, BindContext bindContext) {
         Double result = null;
         try {
-            if (Objects.nonNull(data)) {
-                result = (Double) nf.parse(data.replace(" ", ""));
+            if (Strings.isNotBlank(data)) {
+                Number parsed = nf.parse(data.replace(" ", "").replace("-", ""));
+                result = parsed.doubleValue();
+                if (data.startsWith("-")) {
+                    result = -1 * result;
+                }
             }
         } catch (Exception e) {
             log.error("Can't parse {} to double type", data);
diff --git a/sly-crm-ui/src/main/java/hu/user/lis/ui/editor/common/Editors.java b/sly-crm-ui/src/main/java/hu/user/lis/ui/editor/common/Editors.java
index a38e246..36df55a 100644
--- a/sly-crm-ui/src/main/java/hu/user/lis/ui/editor/common/Editors.java
+++ b/sly-crm-ui/src/main/java/hu/user/lis/ui/editor/common/Editors.java
@@ -18,7 +18,7 @@ public class Editors {
     public static final String TREASURY = "~./editor/treasury-editor.zul";
     public static final String ASSOCIATE = "~./editor/associate-editor.zul";
     public static final String PARTNER = "~./editor/partner-editor.zul";
-    public static final String PROJECT_ATTACH = "~./editor/project-executeActions.zul";
+    public static final String PROJECT_ATTACH = "~./editor/project-attach.zul";
     public static final String IMPORT_INVOICE_ASSIGN = "~./editor/import-invoice-assign-editor.zul";
     public static final String IMPORT_INVOICE_APPROVE = "~./editor/import-invoice-approve-editor.zul";
     public static final String PROJECT = "~./editor/project-editor.zul";
diff --git a/sly-crm-ui/src/main/resources/web/editor/import-invoice-approve-editor.zul b/sly-crm-ui/src/main/resources/web/editor/import-invoice-approve-editor.zul
index a40ddfe..fdc1ce3 100644
--- a/sly-crm-ui/src/main/resources/web/editor/import-invoice-approve-editor.zul
+++ b/sly-crm-ui/src/main/resources/web/editor/import-invoice-approve-editor.zul
@@ -1,8 +1,6 @@
 <?import hu.user.lis.workflow.invoice.data.InvoiceImportStatus?>
-<?link rel="stylesheet" type="text/css" href="~./static/css/skeleton.css" ?>
-<?link rel="stylesheet" type="text/css" href="~./static/css/webclient.css" ?>
 <?component name="entity-selector" inline="true" class="hu.user.lis.ui.editor.widget.EntitySelector"?>
-<zk>
+<zk xmlns:c="client/attribute" xmlns:w="client">
     <zscript>
         import hu.user.lis.db.Currency;
         ListModelList currencies = new ListModelList(Currency.values());
@@ -28,13 +26,9 @@
                                 <textbox hflex="true" instant="true"
                                          value="@bind(vm.formDocument.title) @validator(vm)"
                                          forward="onOK=submit.onClick, onCancel=cancel.onClick"/>
-                                <hlayout>
-                                    <label value="Partner"/>
-                                    <entity-selector selector_id="approve_partner" entity="Partner"/>
-                                    <button label="Szerkesztés" iconSclass="z-icon-edit"
-                                            onClick="@command('onEditPartner')"
-                                            disabled="@bind(not vm.canEditPartner)"/>
-                                </hlayout>
+                                
+                                <label value="Partner"/>
+                                <entity-selector selector_id="approve_partner" entity="Partner"/>
 
                                 <hlayout>
                                     <vlayout>
@@ -51,24 +45,28 @@
                                     </vlayout>
                                     <vlayout>
                                         <label value="Nettó összeg"/>
-                                        <doublebox readonly="false"
-                                                   value="@bind(vm.formDocument.netAmount) @validator(vm)"
-                                                   format="#,###.##" locale="hu"
-                                                   forward="onOK=submit.onClick, onCancel=cancel.onClick"/>
+                                        <textbox instant="true" sclass="number-box"
+                                                 value="@bind(vm.formDocument.netAmount) @validator(vm) @converter('hu.user.lis.ui.converter.DoubleToStringConverter')"
+                                                 onChange="@command('onNetAmountChange')"
+                                                 forward="onOK=submit.onClick, onCancel=cancel.onClick"
+                                                 w:onBind="configureFloat(this.$n())"
+                                                 c:onPaste="preventPastingNonDigit(event)"/>
                                     </vlayout>
                                     <vlayout>
                                         <label value="Bruttó összeg"/>
-                                        <doublebox readonly="false"
-                                                   value="@bind(vm.formDocument.grossAmount) @validator(vm)"
-                                                   format="#,###.##" locale="hu"
-                                                   forward="onOK=submit.onClick, onCancel=cancel.onClick"/>
+                                        <textbox instant="true" sclass="number-box"
+                                                 value="@bind(vm.formDocument.grossAmount) @validator(vm) @converter('hu.user.lis.ui.converter.DoubleToStringConverter')"
+                                                 forward="onOK=submit.onClick, onCancel=cancel.onClick"
+                                                 w:onBind="configureFloat(this.$n())"
+                                                 c:onPaste="preventPastingNonDigit(event)"/>
                                     </vlayout>
                                     <vlayout>
-                                        <label value="ÁFA"/>
-                                        <doublebox readonly="false"
-                                                   value="@bind(vm.formDocument.vatAmount) @validator(vm)"
-                                                   format="#,###.##" locale="hu"
-                                                   forward="onOK=submit.onClick, onCancel=cancel.onClick"/>
+                                        <label value="ÁFA (HUF)"/>
+                                        <textbox instant="true" sclass="number-box"
+                                                 value="@bind(vm.formDocument.vatAmount) @validator(vm) @converter('hu.user.lis.ui.converter.DoubleToStringConverter')"
+                                                 forward="onOK=submit.onClick, onCancel=cancel.onClick"
+                                                 w:onBind="configureFloat(this.$n())"
+                                                 c:onPaste="preventPastingNonDigit(event)"/>
                                     </vlayout>
                                 </hlayout>
                                 <hlayout>
diff --git a/sly-crm-ui/src/main/resources/web/editor/import-invoice-assign-editor.zul b/sly-crm-ui/src/main/resources/web/editor/import-invoice-assign-editor.zul
index cb17700..cccd231 100644
--- a/sly-crm-ui/src/main/resources/web/editor/import-invoice-assign-editor.zul
+++ b/sly-crm-ui/src/main/resources/web/editor/import-invoice-assign-editor.zul
@@ -32,13 +32,9 @@
                                 <textbox hflex="true" instant="true"
                                          value="@bind(vm.formDocument.title) @validator(vm)"
                                          forward="onOK=submit.onClick, onCancel=cancel.onClick"/>
-                                <hlayout>
-                                    <label value="Partner"/>
-                                    <entity-selector selector_id="assign_partner" entity="Partner"/>
-                                    <button label="Szerkesztés" iconSclass="z-icon-edit"
-                                            onClick="@command('onEditPartner')"
-                                            disabled="@bind(not vm.canEditPartner)"/>
-                                </hlayout>
+
+                                <label value="Partner"/>
+                                <entity-selector selector_id="assign_partner" entity="Partner"/>
 
                                 <hlayout>
                                     <vlayout>
@@ -55,7 +51,7 @@
                                     </vlayout>
                                     <vlayout>
                                         <label value="Nettó összeg"/>
-                                        <textbox style="text-align: right" instant="true"
+                                        <textbox instant="true" sclass="number-box"
                                                  value="@bind(vm.formDocument.netAmount) @validator(vm) @converter('hu.user.lis.ui.converter.DoubleToStringConverter')"
                                                  onChange="@command('onNetAmountChange')"
                                                  forward="onOK=submit.onClick, onCancel=cancel.onClick"
@@ -64,7 +60,7 @@
                                     </vlayout>
                                     <vlayout>
                                         <label value="Bruttó összeg"/>
-                                        <textbox style="text-align: right" instant="true"
+                                        <textbox instant="true" sclass="number-box"
                                                  value="@bind(vm.formDocument.grossAmount) @validator(vm) @converter('hu.user.lis.ui.converter.DoubleToStringConverter')"
                                                  forward="onOK=submit.onClick, onCancel=cancel.onClick"
                                                  w:onBind="configureFloat(this.$n())"
@@ -72,7 +68,7 @@
                                     </vlayout>
                                     <vlayout>
                                         <label value="ÁFA (HUF)"/>
-                                        <textbox style="text-align: right" instant="true"
+                                        <textbox instant="true" sclass="number-box"
                                                  value="@bind(vm.formDocument.vatAmount) @validator(vm) @converter('hu.user.lis.ui.converter.DoubleToStringConverter')"
                                                  forward="onOK=submit.onClick, onCancel=cancel.onClick"
                                                  w:onBind="configureFloat(this.$n())"
diff --git a/sly-crm-ui/src/main/resources/web/editor/project-attach.zul b/sly-crm-ui/src/main/resources/web/editor/project-attach.zul
index 6e4fb72..0f5b5c2 100644
--- a/sly-crm-ui/src/main/resources/web/editor/project-attach.zul
+++ b/sly-crm-ui/src/main/resources/web/editor/project-attach.zul
@@ -13,38 +13,43 @@
                                    checked="@bind(vm.filterShowBoth)"/>
                 </toolbar>
             </north>
-            <center border="none" flex="true">
-                <listbox vflex="true" model="@load(vm.projectsDataModel)"
-                         autopaging="true" pagingPosition="top" multiple="false"
-                         onSelect="@command('onListSelection')" onDoubleClick="@command('onEdit')">
-                    <listhead sizable="true">
-                        <listheader label="Azonosító" sort="auto(humanId)" align="left"
-                                    sortDirection="@load(vm.cols['humanId'].sortDirection)"/>
-                        <listheader label="Ügyfél" sort="auto(partner.name)" align="left"
-                                    sortDirection="@load(vm.cols['partner.name'].sortDirection)"/>
-                        <listheader label="Státusz" sort="auto(projectStatus.name)" align="left"
-                                    sortDirection="@load(vm.cols['projectStatus.name'].sortDirection)"/>
-                        <listheader label="Megnevezés" sort="auto(name)" align="left"
-                                    sortDirection="@load(vm.cols['name'].sortDirection)"/>
-                        <listheader label="Kapcsolattartó" sort="auto(contactName)" align="left"
-                                    sortDirection="@load(vm.cols['contactName'].sortDirection)"/>
-                        <listheader label="Aktív" sort="auto(active)" align="left"
-                                    sortDirection="@load(vm.cols['active'].sortDirection)"/>
-                    </listhead>
-                    <template name="model">
-                        <listitem>
-                            <listcell label="@load(each.humanId)"/>
-                            <listcell label="@load(each.partner.name)"/>
-                            <listcell label="@load(each.projectStatus.name)"/>
-                            <listcell label="@load(each.name)"/>
-                            <listcell label="@load(each.contactName)"/>
-                            <listcell>
-                                <a iconSclass="z-icon-check" visible="@load(each.active)"/>
-                                <a iconSclass="z-icon-ban" visible="@load(!each.active)"/>
-                            </listcell>
-                        </listitem>
-                    </template>
-                </listbox>
+            <center border="none">
+                <vlayout vflex="true">
+                    <menupopup id="editPopup"
+                               children="@bind(vm.projectsDataModel.renderer.columnSettings) @template('menu-item')">
+                        <template name="menu-item" var="node">
+                            <menuitem label="@load(node.label)" checked="@load(node.visible)"
+                                      onClick="@command('onHeaderMenuClicked', node=node)"/>
+                        </template>
+                    </menupopup>
+                    <listbox vflex="true" model="@load(vm.projectsDataModel)" multiple="false"
+                             itemRenderer="@load(vm.projectsDataModel.renderer)" onSelect="@command('onListSelection')">
+                        <listhead sizable="true" menupopup="editPopup"
+                                  onColSize="@command('onHeaderSizeChanged', node=node)"
+                                  children="@bind(vm.projectsDataModel.renderer.columnSettings) @template('head-item')">
+                            <template name="head-item" var="node">
+                                <listheader label="@load(node.label)" sort="@load(node.sort)" align="@load(node.align)"
+                                            visible="@load(node.visible)" width="@load(node.width)" draggable="head"
+                                            droppable="head" sortDirection="@load(node.sortDirection)"
+                                            onDrop="@command('onHeaderReorder')"/>
+                            </template>
+                        </listhead>
+                        <template name="model">
+                            <listitem onDoubleClick="@command('onEdit')">
+                                <listcell label="@load(each.humanId)"/>
+                                <listcell label="@load(each.partner.name)"/>
+                                <listcell label="@load(each.projectStatus.name)"/>
+                                <listcell label="@load(each.name)"/>
+                                <listcell label="@load(each.contactName)"/>
+                                <listcell>
+                                    <a iconSclass="z-icon-check" visible="@load(each.active)"/>
+                                    <a iconSclass="z-icon-ban" visible="@load(!each.active)"/>
+                                </listcell>
+                            </listitem>
+                        </template>
+                    </listbox>
+                </vlayout>
+
             </center>
             <south border="none" flex="true" style="text-align: right; padding: 10px">
                 <hlayout>
diff --git a/sly-crm-ui/src/main/resources/web/form/attachment-form.zul b/sly-crm-ui/src/main/resources/web/form/attachment-form.zul
index 1a833e6..7b3900a 100644
--- a/sly-crm-ui/src/main/resources/web/form/attachment-form.zul
+++ b/sly-crm-ui/src/main/resources/web/form/attachment-form.zul
@@ -10,39 +10,41 @@
             </toolbar>
         </north>
         <west title="Fájlok" size="160px" flex="true" border="none" splittable="true" collapsible="true">
-            <div id="attachment" hflex="true" vflex="true">
-                <listbox vflex="true" hflex="true" model="@load(vm.entityDocumentDataModel)"
-                         multiple="false"
-                         sizedByContent="true" onSelect="@command(vm.entityDocumentDataModel.onSelectionChanged())">
-                    <listhead visible="false">
-                        <listheader hflex="true" align="center"/>
-                    </listhead>
-                    <template name="model">
-                        <listitem>
-                            <listcell iconSclass="z-icon-file-pdf-o" style="font-size: 1.5em">
-                                <vlayout>
-                                    <label value="@load(each.name)"/>
-                                </vlayout>
-                            </listcell>
-                        </listitem>
-                    </template>
-                </listbox>
-                <!--                anchor="${attachment}"-->
-                <dropupload native="true" detection="none" hflex="true" vflex="true" style="background: red"
-                            onUpload="@command('doUploadFiles', files=event.medias)">
-                    <attribute name="content">
-                        <![CDATA[
-                            <div style="text-align: center; border: 3px solid green;">
-                            <b>Drop here to upload!</b>
-                            </div>
-                        ]]>
-                    </attribute>
-                </dropupload>
-            </div>
+            <listbox vflex="true" hflex="true" model="@load(vm.entityDocumentDataModel)"
+                     multiple="false"
+                     sizedByContent="true" onSelect="@command(vm.entityDocumentDataModel.onSelectionChanged())">
+                <listhead visible="false">
+                    <listheader hflex="true" align="center"/>
+                </listhead>
+                <template name="model">
+                    <listitem>
+                        <listcell iconSclass="z-icon-file-pdf-o" style="font-size: 1.5em">
+                            <vlayout>
+                                <label value="@load(each.name)"/>
+                            </vlayout>
+                        </listcell>
+                    </listitem>
+                </template>
+            </listbox>
         </west>
         <center border="none" hflex="true" vflex="true">
             <iframe hflex="true" vflex="true"
                     content="@load(vm.entityDocumentDataModel.selectedDocument.file) @converter('hu.user.lis.ui.converter.ByteArrayToAMediaConverter')"/>
         </center>
+        <east>
+            <!--            <div id="attachment" hflex="true" vflex="true">-->
+            <!--            </div>-->
+            <!--                anchor="${attachment}"-->
+            <dropupload native="true" detection="none" hflex="true" vflex="true" style="background: red"
+                        onUpload="@command('doUploadFiles', files=event.medias)">
+                <attribute name="content">
+                    <![CDATA[
+                            <div style="text-align: center; border: 3px solid green;">
+                            <b>Drop here to upload!</b>
+                            </div>
+                        ]]>
+                </attribute>
+            </dropupload>
+        </east>
     </borderlayout>
 </zk>
\ No newline at end of file
diff --git a/sly-crm-ui/src/main/resources/web/form/invoice-data-form.zul b/sly-crm-ui/src/main/resources/web/form/invoice-data-form.zul
index d005766..da42dd4 100644
--- a/sly-crm-ui/src/main/resources/web/form/invoice-data-form.zul
+++ b/sly-crm-ui/src/main/resources/web/form/invoice-data-form.zul
@@ -1,6 +1,5 @@
 <?component name="entity-selector" inline="true" class="hu.user.lis.ui.editor.widget.EntitySelector"?>
 <zk xmlns:c="client/attribute" xmlns:w="client">
-    <script src="~./static/js/clipboard.utils.js"/>
     <zscript>
         import hu.user.lis.db.Currency;
         ListModelList currencies = new ListModelList(Currency.values());
@@ -11,8 +10,12 @@
                  value="@bind(vm.formDocument.title) @validator(vm)"
                  forward="onOK=submit.onClick, onCancel=cancel.onClick"
                  disabled="@bind(vm.readonlyForm)"/>
+        
         <label value="Partner"/>
-        <entity-selector selector_id="invoice_partner" entity="Partner" readonly="${vm.readonlyForm}"/>
+        <entity-selector selector_id="invoice_partner" entity="Partner"/>
+        <!--            <button label="Szerkesztés" iconSclass="z-icon-edit"-->
+        <!--                    onClick="@command('onEditPartner')"-->
+        <!--                    disabled="@bind(not vm.canEditPartner)"/>-->
         <hlayout>
             <vlayout>
                 <label value="Sorszám"/>
@@ -31,31 +34,31 @@
             </vlayout>
             <vlayout>
                 <label value="Nettó összeg"/>
-                <textbox style="text-align: right" instant="true"
+                <textbox instant="true" sclass="number-box"
                          value="@bind(vm.formDocument.netAmount) @validator(vm) @converter('hu.user.lis.ui.converter.DoubleToStringConverter')"
                          onChange="@command('onNetAmountChange')"
                          forward="onOK=submit.onClick, onCancel=cancel.onClick"
-                         disabled="@bind(vm.readonlyForm)"
                          w:onBind="configureFloat(this.$n())"
-                         c:onPaste="preventPastingNonDigit(event)"/>
+                         c:onPaste="preventPastingNonDigit(event)"
+                         disabled="@bind(vm.readonlyForm)"/>
             </vlayout>
             <vlayout>
                 <label value="Bruttó összeg"/>
-                <textbox style="text-align: right" instant="true"
+                <textbox instant="true" sclass="number-box"
                          value="@bind(vm.formDocument.grossAmount) @validator(vm) @converter('hu.user.lis.ui.converter.DoubleToStringConverter')"
                          forward="onOK=submit.onClick, onCancel=cancel.onClick"
-                         disabled="@bind(vm.readonlyForm)"
                          w:onBind="configureFloat(this.$n())"
-                         c:onPaste="preventPastingNonDigit(event)"/>
+                         c:onPaste="preventPastingNonDigit(event)"
+                         disabled="@bind(vm.readonlyForm)"/>
             </vlayout>
             <vlayout>
                 <label value="ÁFA (HUF)"/>
-                <textbox style="text-align: right" instant="true"
+                <textbox instant="true" sclass="number-box"
                          value="@bind(vm.formDocument.vatAmount) @validator(vm) @converter('hu.user.lis.ui.converter.DoubleToStringConverter')"
                          forward="onOK=submit.onClick, onCancel=cancel.onClick"
-                         disabled="@bind(vm.readonlyForm)"
                          w:onBind="configureFloat(this.$n())"
-                         c:onPaste="preventPastingNonDigit(event)"/>
+                         c:onPaste="preventPastingNonDigit(event)"
+                         disabled="@bind(vm.readonlyForm)"/>
             </vlayout>
         </hlayout>
         <hlayout>
diff --git a/sly-crm-ui/src/main/resources/web/form/invoice-form.zul b/sly-crm-ui/src/main/resources/web/form/invoice-form.zul
index bedef76..79150b8 100644
--- a/sly-crm-ui/src/main/resources/web/form/invoice-form.zul
+++ b/sly-crm-ui/src/main/resources/web/form/invoice-form.zul
@@ -1,9 +1,5 @@
 <?component name="entity-selector" inline="true" class="hu.user.lis.ui.editor.widget.EntitySelector"?>
-<zk xmlns:c="client/attribute" xmlns:w="client">
-    <zscript>
-        import hu.user.lis.db.Currency;
-        ListModelList currencies = new ListModelList(Currency.values());
-    </zscript>
+<zk>
     <tabbox vflex="true" hflex="true">
         <tabs>
             <tab label="Adatok" selected="true"/>
@@ -12,103 +8,17 @@
         <tabpanels>
             <tabpanel>
                 <vlayout hflex="true">
-                    <hlayout>
-                        <vlayout hflex="min">
-                            <label value="Projekt"/>
-                            <hlayout>
-                                <label value="@bind(vm.formDocument.project.humanId)"/>
-                                <separator/>
-                                <label value="@bind(vm.formDocument.project.name)"/>
-                            </hlayout>
-                        </vlayout>
-                    </hlayout>
-                    <label value="Leírás"/>
-                    <textbox hflex="true" instant="true"
-                             value="@bind(vm.formDocument.title) @validator(vm)"
-                             forward="onOK=submit.onClick, onCancel=cancel.onClick"
-                             disabled="@bind(vm.readonlyForm)"/>
                     <label value="Partner"/>
-                    <entity-selector selector_id="inv_editor_partner" entity="Partner" readonly="${vm.readonlyForm}"/>
-                    <hlayout>
-                        <vlayout>
-                            <label value="Sorszám"/>
-                            <textbox instant="true" value="@bind(vm.formDocument.humanId) @validator(vm)"
-                                     forward="onOK=submit.onClick, onCancel=cancel.onClick"
-                                     disabled="@bind(vm.readonlyForm)"/>
-                        </vlayout>
-                        <vlayout>
-                            <label value="Pénznem"/>
-                            <combobox instant="true" model="${currencies}"
-                                      selectedItem="@bind(vm.formDocument.currency) @validator(vm)"
-                                      onChange="@command('onNetAmountChange')"
-                                      forward="onOK=submit.onClick, onCancel=cancel.onClick"
-                                      disabled="@bind(vm.readonlyForm)"/>
-
-                        </vlayout>
-                        <vlayout>
-                            <label value="Nettó összeg"/>
-                            <textbox style="text-align: right" instant="true"
-                                     value="@bind(vm.formDocument.netAmount) @validator(vm) @converter('hu.user.lis.ui.converter.DoubleToStringConverter')"
-                                     onChange="@command('onNetAmountChange')"
-                                     forward="onOK=submit.onClick, onCancel=cancel.onClick"
-                                     disabled="@bind(vm.readonlyForm)"
-                                     w:onBind="configureFloat(this.$n())"
-                                     c:onPaste="preventPastingNonDigit(event)"/>
-                        </vlayout>
-                        <vlayout>
-                            <label value="Bruttó összeg"/>
-                            <textbox style="text-align: right" instant="true"
-                                     value="@bind(vm.formDocument.grossAmount) @validator(vm) @converter('hu.user.lis.ui.converter.DoubleToStringConverter')"
-                                     forward="onOK=submit.onClick, onCancel=cancel.onClick"
-                                     disabled="@bind(vm.readonlyForm)"
-                                     w:onBind="configureFloat(this.$n())"
-                                     c:onPaste="preventPastingNonDigit(event)"/>
-                        </vlayout>
-                        <vlayout>
-                            <label value="ÁFA (HUF)"/>
-                            <textbox style="text-align: right" instant="true"
-                                     value="@bind(vm.formDocument.vatAmount) @validator(vm) @converter('hu.user.lis.ui.converter.DoubleToStringConverter')"
-                                     forward="onOK=submit.onClick, onCancel=cancel.onClick"
-                                     disabled="@bind(vm.readonlyForm)"
-                                     w:onBind="configureFloat(this.$n())"
-                                     c:onPaste="preventPastingNonDigit(event)"/>
-                        </vlayout>
-                    </hlayout>
-                    <hlayout>
-                        <vlayout>
-                            <label value="Kiállítás dátuma"/>
-                            <datebox instant="true" format="yyyy. MM. dd."
-                                     value="@bind(vm.formDocument.createDate) @validator(vm)"
-                                     forward="onOK=submit.onClick, onCancel=cancel.onClick"
-                                     disabled="@bind(vm.readonlyForm)"/>
-                        </vlayout>
-                        <vlayout>
-                            <label value="Teljesítés dátuma"/>
-                            <datebox instant="true" format="yyyy. MM. dd."
-                                     value="@bind(vm.formDocument.completionDate) @validator(vm)"
-                                     forward="onOK=submit.onClick, onCancel=cancel.onClick"
-                                     disabled="@bind(vm.readonlyForm)"/>
-                        </vlayout>
-                        <vlayout>
-                            <label value="Fizetési határidő"/>
-                            <datebox instant="true" format="yyyy. MM. dd."
-                                     value="@bind(vm.formDocument.paymentDeadline) @validator(vm)"
-                                     forward="onOK=submit.onClick, onCancel=cancel.onClick"
-                                     disabled="@bind(vm.readonlyForm)"/>
-                        </vlayout>
-                    </hlayout>
-                    <hlayout>
-                        <vlayout>
-                            <label value="Tervezett"/>
-                            <checkbox mold="switch" checked="@bind(vm.formDocument.planned)"
-                                      disabled="@bind(vm.readonlyForm)"/>
-                        </vlayout>
-                        <vlayout>
-                            <label value="Fizetve"/>
-                            <checkbox mold="switch" checked="@bind(vm.formDocument.paid)"
-                                      disabled="@bind(vm.readonlyForm)"/>
-                        </vlayout>
-                    </hlayout>
+                    <entity-selector selector_id="invoice_partner" entity="Partner"/>
+                    <!--                    <vlayout hflex="true">-->
+                    <!--                        <label value="Projekt"/>-->
+                    <!--                        <hlayout>-->
+                    <!--                            <label value="@bind(vm.formDocument.project.humanId)"/>-->
+                    <!--                            <separator/>-->
+                    <!--                            <label value="@bind(vm.formDocument.project.name)"/>-->
+                    <!--                        </hlayout>-->
+                    <!--                    </vlayout>-->
+                    <include src="~./form/invoice-data-form.zul"/>
                 </vlayout>
             </tabpanel>
             <tabpanel>
diff --git a/sly-crm-ui/src/main/resources/web/invoice-payment.zul b/sly-crm-ui/src/main/resources/web/invoice-payment.zul
index 9ba66f3..8700fa4 100644
--- a/sly-crm-ui/src/main/resources/web/invoice-payment.zul
+++ b/sly-crm-ui/src/main/resources/web/invoice-payment.zul
@@ -1,4 +1,4 @@
-<zk>
+<zk xmlns:c="client/attribute" xmlns:w="client">
     <style>
         .z-bandbox-input[disabled], .z-combobox-input[disabled], .z-datebox-input[disabled], .z-textbox[disabled],
         .z-decimalbox[disabled], .z-intbox[disabled], .z-longbox[disabled], .z-doublebox[disabled]
@@ -34,7 +34,6 @@
 
                 <hbox hflex="true" vflex="true" visible="@load(vm.formDocument)">
                     <window title="Számla adatok" hflex="true" vflex="true" border="normal" style="margin: 10px">
-                        <!--                        <include src="~./form/invoice-form.zul"/>-->
                         <vlayout hflex="true">
                             <vlayout hflex="true">
                                 <label value="Projekt"/>
@@ -67,9 +66,7 @@
                                          autopaging="true" pagingPosition="top" multiple="false">
                                     <listhead sizable="true">
                                         <listheader label="Dátum" align="left" hflex="true"/>
-                                        <!--                                        <listheader label="Nettó összeg" align="right"/>-->
                                         <listheader label="Bruttó összeg" align="right" hflex="true"/>
-                                        <!--                                        <listheader label="ÁFA összeg" align="right" hflex="true"/>-->
                                         <listheader label="Törlés" align="right" hflex="min"/>
                                     </listhead>
                                     <template name="model">
@@ -79,16 +76,13 @@
                                                          format="yyyy. MM. dd." inplace="true" width="100%"
                                                          onChange="@command('onPaymentChanged', entity=each)"/>
                                             </listcell>
-                                            <!--                                            <listcell>-->
-                                            <!--                                                <doublebox value="@bind(each.netAmount)"-->
-                                            <!--                                                           format="#,###.##" locale="hu" inplace="true" width="100%"-->
-                                            <!--                                                           onChange="@command('onPaymentChanged', entity=each)"/>-->
-                                            <!--                                            </listcell>-->
                                             <listcell>
-                                                <doublebox value="@bind(each.grossAmount)"
-                                                           format="#,###.##" locale="hu" inplace="true" instant="true"
-                                                           width="100%"
-                                                           onChange="@command('onPaymentChanged', entity=each)"/>
+                                                <textbox instant="true" inplace="true" sclass="number-box" width="100%"
+                                                         value="@bind(each.grossAmount) @validator(vm) @converter('hu.user.lis.ui.converter.DoubleToStringConverter')"
+                                                         onChange="@command('onPaymentChanged', entity=each)"
+                                                         w:onBind="configureFloat(this.$n())"
+                                                         c:onPaste="preventPastingNonDigit(event)"
+                                                         disabled="@bind(vm.readonlyForm)"/>
                                             </listcell>
                                             <listcell>
                                                 <button iconSclass="z-icon-remove"
diff --git a/sly-crm-ui/src/main/resources/web/invoices.zul b/sly-crm-ui/src/main/resources/web/invoices.zul
index 7de81fa..fccc695 100644
--- a/sly-crm-ui/src/main/resources/web/invoices.zul
+++ b/sly-crm-ui/src/main/resources/web/invoices.zul
@@ -61,8 +61,8 @@
                     <toolbar>
                         <toolbarbutton label="Szerkesztés" iconSclass="z-icon-edit" onClick="@command('onEdit')"
                                        disabled="@load(empty vm.selectedEntity)"/>
-                        <toolbarbutton label="Projekt módosítás" iconSclass="z-icon-forward"
-                                       onClick="@command('onChangeProject')" disabled="@load(empty vm.selectedEntity)"/>
+                        <!--                        <toolbarbutton label="Projekt módosítás" iconSclass="z-icon-forward"-->
+                        <!--                                       onClick="@command('onChangeProject')" disabled="@load(empty vm.selectedEntity)"/>-->
                         <toolbarbutton label="Számla kiegyenlítés" iconSclass="z-icon-credit-card"
                                        onClick="@command('onInvoicePayment')"
                                        disabled="@load(empty vm.selectedEntity || vm.selectedEntity.planned)"/>
diff --git a/sly-crm-ui/src/main/resources/web/static/css/webclient.css b/sly-crm-ui/src/main/resources/web/static/css/webclient.css
index 5788db8..f0286d6 100644
--- a/sly-crm-ui/src/main/resources/web/static/css/webclient.css
+++ b/sly-crm-ui/src/main/resources/web/static/css/webclient.css
@@ -1,3 +1,7 @@
+.number-box {
+    text-align: right;
+    width: 100px;
+}
 .list-title {
     font-size: 1.5em;
     font-weight: bold;
-- 
2.54.0