Invoice sort bug solved

diff --git a/lis-ui/src/main/java/hu/user/lis/ui/view/InvoicesViewModel.java b/lis-ui/src/main/java/hu/user/lis/ui/view/InvoicesViewModel.java
index 292ec3c6cc5bdcf9a2c25279255d88a805e23a34..5d0dbdc34ad80005f801a43631954a86ed82cd85 100644 (file)
--- a/lis-ui/src/main/java/hu/user/lis/ui/view/InvoicesViewModel.java
+++ b/lis-ui/src/main/java/hu/user/lis/ui/view/InvoicesViewModel.java
@@ -59,7 +59,7 @@ public class InvoicesViewModel extends EntityViewModel<Invoice> implements Event
         eventBus.registerForBinding(this);
         addColumns(ImmutableMap.of(
                 "planned", NATURAL,
-                "partner.humanId", NATURAL,
+                "humanId", NATURAL,
                 "partner.name", NATURAL,
                 "project.humanId", NATURAL,
                 "project.name", NATURAL,

diff --git a/lis-ui/src/main/resources/web/invoices.zul b/lis-ui/src/main/resources/web/invoices.zul
index 7c6cedb80886635ea9539b26c284cc2cfefaaf84..db81ddb4e925d5ed70cf59ddc0822ac08adaa066 100644 (file)
--- a/lis-ui/src/main/resources/web/invoices.zul
+++ b/lis-ui/src/main/resources/web/invoices.zul
@@ -83,8 +83,8 @@
                     <listhead sizable="true">
                         <listheader width="30px" label="Terv" sort="auto(planned)" align="left"
                                     sortDirection="@load(vm.cols['planned'].sortDirection)"/>
-                        <listheader label="Sorszám" sort="auto(partner.humanId)" align="left"
-                                    sortDirection="@load(vm.cols['partner.humanId'].sortDirection)"/>
+                        <listheader label="Sorszám" sort="auto(humanId)" align="left"
+                                    sortDirection="@load(vm.cols['humanId'].sortDirection)"/>
                         <listheader label="Partner név" sort="auto(partner.name)" align="left"
                                     sortDirection="@load(vm.cols['partner.name'].sortDirection)"/>
                         <listheader label="Projekt azonosító" sort="auto(project.humanId)" align="left"