Merge branch 'Verze_1.0'

Conflicts: src/main/webapp/WEB-INF/locales/zk-label.properties
2015-01-20 15:21:55 +01:00
parent ea64e5a888 4e2b00a957
commit 024f1321ad
11 changed files with 126 additions and 3 deletions
@@ -40,6 +40,8 @@ RequirementItemUnitPrice=Jedn. cena
 RequirementItemTotal=Celkem
 RequirementItemDescription=Poznámka

+RequirementInvoicedAmount=Fakturovaná částka:
+

 AgendaMyOrders=Aktuální
 AgendaOrdersHistory=Ukončené