Invoice payment bug solved

diff --git a/lis-ui/src/main/java/hu/user/lis/ui/view/InvoicePaymentViewModel.java b/lis-ui/src/main/java/hu/user/lis/ui/view/InvoicePaymentViewModel.java
index 3b84372b09cb5c888c1e047e65bd7fb798d974b5..751d512d23581d835edd88715c002d3a47cfd0d4 100644 (file)
--- a/lis-ui/src/main/java/hu/user/lis/ui/view/InvoicePaymentViewModel.java
+++ b/lis-ui/src/main/java/hu/user/lis/ui/view/InvoicePaymentViewModel.java
@@ -80,7 +80,7 @@ public class InvoicePaymentViewModel extends EntityViewModel<Payment> implements
     public void init() {
         super.init();
         eventBus.register(this);
-        //setReadonlyForm(false);
+        setReadonlyForm(true);
     }
 
     @AfterCompose

diff --git a/lis-ui/src/main/resources/web/form/invoice-data-form.zul b/lis-ui/src/main/resources/web/form/invoice-data-form.zul
new file mode 100644 (file)
index 0000000..b0434af
--- /dev/null
+++ b/lis-ui/src/main/resources/web/form/invoice-data-form.zul
@@ -0,0 +1,95 @@
+<?component name="entity-selector" inline="true" class="hu.user.lis.ui.editor.widget.EntitySelector"?>
+<zk xmlns:c="client/attribute">
+    <script src="~./static/js/clipboard.utils.js"/>
+    <zscript>
+        import hu.user.lis.db.Currency;
+        ListModelList currencies = new ListModelList(Currency.values());
+    </zscript>
+    <vlayout hflex="true">
+        <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="invoice_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"/>
+                <doublebox value="@bind(vm.formDocument.netAmount) @validator(vm)"
+                           format="#,###.##" locale="hu" instant="true"
+                           onChange="@command('onNetAmountChange')"
+                           forward="onOK=submit.onClick, onCancel=cancel.onClick"
+                           disabled="@bind(vm.readonlyForm)"
+                           c:onPaste="preventPastingNonDigit(event)"/>
+            </vlayout>
+            <vlayout>
+                <label value="Bruttó összeg"/>
+                <doublebox value="@bind(vm.formDocument.grossAmount) @validator(vm)"
+                           format="#,###.##" locale="hu" instant="true"
+                           forward="onOK=submit.onClick, onCancel=cancel.onClick"
+                           disabled="@bind(vm.readonlyForm)"
+                           c:onPaste="preventPastingNonDigit(event)"/>
+            </vlayout>
+            <vlayout>
+                <label value="ÁFA (HUF)"/>
+                <doublebox value="@bind(vm.formDocument.vatAmount) @validator(vm)"
+                           format="#,###.##" locale="hu" instant="true"
+                           forward="onOK=submit.onClick, onCancel=cancel.onClick"
+                           disabled="@bind(vm.readonlyForm)"
+                           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>
+    </vlayout>
+
+</zk>
\ No newline at end of file

diff --git a/lis-ui/src/main/resources/web/invoice-payment.zul b/lis-ui/src/main/resources/web/invoice-payment.zul
index ab433d3de1c8ea5dfb0b06c580fb05fbc8478101..9ba66f312273d35fdfa0790f1b8f9cae6457abdd 100644 (file)
--- a/lis-ui/src/main/resources/web/invoice-payment.zul
+++ b/lis-ui/src/main/resources/web/invoice-payment.zul
@@ -1,4 +1,13 @@
 <zk>
+    <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]
+        {
+        color: #000000 !important;
+        background: #FFFFFF !important;
+        opacity: 1;
+        }
+    </style>
     <window vflex="true" viewModel="@id('vm') @init('hu.user.lis.ui.view.InvoicePaymentViewModel')">
         <caption sclass="list-title" label="Számla kiegyenlítés"/>
         <borderlayout>
@@ -25,7 +34,18 @@
 
                 <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"/>
+                        <!--                        <include src="~./form/invoice-form.zul"/>-->
+                        <vlayout hflex="true">
+                            <vlayout hflex="true">
+                                <label value="Projekt"/>
+                                <hlayout hflex="true">
+                                    <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>
                     </window>
 
                     <splitter/>

diff --git a/runConfigurations/server-dev.run.xml b/runConfigurations/server-dev.run.xml
index 70b22573c0c2001491ff618cec66fee28565d4c7..0fea43c708312519becb5352c971aeefe6fa9b39 100644 (file)
--- a/runConfigurations/server-dev.run.xml
+++ b/runConfigurations/server-dev.run.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="server-dev" type="Application" factoryName="Application">
+  <configuration default="false" name="server-dev" type="Application" factoryName="Application" show_console_on_std_out="true">
     <option name="ALTERNATIVE_JRE_PATH" value="1.8" />
     <envs>
       <env name="spring.profiles.active" value="dev" />