Fakturovaná částka na objednávkách se nyní počítá z položek.

closes #152, #154

src/main/webapp/WEB-INF/lang-addons/CzechSortListheader.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-
+<!DOCTYPE xml>
 <language-addon>
 	<addon-name>CzechSortListheader</addon-name>
 	<language-name>xul/html</language-name>

src/main/webapp/WEB-INF/lang-addons/ckez-bind-lang-addon.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE xml>
 <language-addon>
     <!-- The name of this addon. It must be unique -->
     <addon-name>ckezbind</addon-name>

src/main/webapp/WEB-INF/lang-addons/mapa-lang-addon.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE xml>
 <language-addon>
     <addon-name>mapa</addon-name>
     <language-name>xul/html</language-name>

src/main/webapp/WEB-INF/security.tld

@@ -1,3 +1,4 @@
+<!DOCTYPE xml>
 <taglib>
     <uri>http://www.zkoss.org/demo/integration/security</uri>
     <description>

src/main/webapp/css/page.css

@@ -66,7 +66,7 @@ html, body {
 	overflow: hidden;
 }
 
-.form-caption {
+.form-caption, .form-caption-highlight {
 	overflow: hidden;
 	font-weight: bold;
 	font-size: 20px;
@@ -82,6 +82,14 @@ html, body {
 	padding-right: 5px;
 }
 
+.form-caption-highlight {
+	background-color: red;
+}
+.form-caption-highlight-content {
+	float: left;
+}
+
+
 /*
 html, body	{	background-color: red;	}
 #screen		{	background-color: lightgreen;	}

src/main/webapp/main/orders/created/grid.zul

@@ -326,6 +326,11 @@
 								hflex="15"
 								sort="czech(description)"
 								label="${labels.RequirementItemDescription}" />
+							<listheader
+								hflex="7"
+								align="right"
+								sort="auto(totalInvoice)"
+								label="${labels.OrderFormInvoiceTotal}" />
 							<listheader
 								hflex="5"
 								sort="auto(reqItem.orderNum)"
@@ -341,6 +346,7 @@
 								<listcell label="@load(each.unitPrice) @converter(vm.standardBigDecimalConverter)" />
 								<listcell label="@load(each.total) @converter(vm.standardBigDecimalConverter)" />
 								<listcell label="@load(each.description)" />
+								<listcell label="@load(each.totalInvoice) @converter(vm.standardBigDecimalConverter)" />
 								<listcell label="@load(each.reqItem.orderNum)" />
 							</listitem>
 						</template>

src/main/webapp/main/orders/created/orderForm.zul

@@ -120,6 +120,7 @@
 										<cell>
 											<textbox
 												id="idOrderInvoiceTotal"
+												readonly="true"
 												width="150px"
 												value="@bind(fx.invoiceTotal) @converter(vm.standardBigDecimalConverter)" />
 										</cell>
@@ -542,6 +543,11 @@
 						hflex="15"
 						sort="czech(description)"
 						label="${labels.RequirementItemDescription}" />
+					<listheader
+						hflex="7"
+						align="right"
+						sort="auto(totalInvoice)"
+						label="${labels.OrderFormInvoiceTotal}" />
 					<listheader
 						hflex="5"
 						sort="auto(reqItem.orderNum)"
@@ -581,6 +587,15 @@
 								value="@bind(each.total) @converter(vm.standardBigDecimalConverter)" />
 						</listcell>
 						<listcell label="@load(each.description)" />
+						<listcell>
+							<textbox
+								inplace="true"
+								sclass="grid-textbox-max-right"
+								readonly="false"
+								onFocus="@command('onFocusItem', item=each, ctrl=self)"
+								onChange="@command('recalculateTotalInvoice', form=fx, changed='totalInvoice')"
+								value="@bind(each.totalInvoice) @converter(vm.standardBigDecimalConverter)" />
+						</listcell>
 						<listcell label="@load(each.reqItem.orderNum)" />
 					</listitem>
 				</template>