Imixs/office-alexander-logistics
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of ssh://git@git.imixs.com/git/office-alexander-logistics

Browse source
This commit is contained in:
Ralph Soika 2020-12-02 13:54:23 +01:00
commit f0fc537a8f
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/sub_positionen.xhtml
View file

@ -34,7 +34,16 @@
<td><h:inputText value="#{orderitem.item['period']}" style="width:100%;" /></td>
<!-- Steuer -->
<td><h:inputText value="#{orderitem.item['tax']}" style="width:100%;" /></td>
<td><h:selectOneMenu value="#{orderitem.item['_tax']}" >
<f:selectItem itemLabel="" itemValue="" />
<f:selectItem itemLabel="Steuerfrei Ausfuhr" itemValue="0"></f:selectItem>
<f:selectItem itemLabel="Steuerfrei EU" itemValue="0EU"></f:selectItem>
<f:selectItem itemLabel="Steuerfrei Inland" itemValue="0IN"></f:selectItem>
<f:selectItem itemLabel="Steuerpflichtig 16%" itemValue="16"></f:selectItem>
<f:selectItem itemLabel="Steuerpflichtig 19%" itemValue="19"></f:selectItem>
<f:selectItem itemLabel="Reverse-Charge" itemValue="RC"></f:selectItem>
<f:selectItem itemLabel="Reverse-Charge-EU" itemValue="RCE"></f:selectItem>
</h:selectOneMenu></td>
<!-- Betrag -->
<td style="text-align:right;"><h:inputText value="#{orderitem.item['amount']}"

2
workflow/rechnungseingang-de-1.0.1.bpmn
View file

@ -631,7 +631,7 @@ result.isValid=true;
<imixs-form-section columns="2">
<item name="invoice.total" type="currency" required="true" label="Rechnungsbetrag:" />
<item name="invoice.currency" type="selectOneMenu" required="true" options="EUR;USD" label="Währung:" />
<item name="invoice.currency" type="selectOneMenu" required="true" options="EUR;CHF;SEK;RUB;NOK;GBP;USD;CAD" label="Währung:" />
<item name="cdtr.iban" type="text" label="IBAN:" />
<item name="cdtr.bic" type="text" label="BIC:" />
</imixs-form-section>