diff --git a/vtdirektmarketing.php b/vtdirektmarketing.php index 51180bd..0271a83 100755 --- a/vtdirektmarketing.php +++ b/vtdirektmarketing.php @@ -3,257 +3,260 @@ <?php _trans('invoice'); ?> - - + + -
- - - - - -
-
-
-

:

-


- client_name; ?>
- client_address_1) { - echo $invoice->client_address_1 . '
'; - } ?> - client_address_2) { - echo $invoice->client_address_2 . '
'; - } ?> - client_zip) { - echo $invoice->client_zip . ' '; - } ?> - client_city) { - echo $invoice->client_city . '

'; - } ?> - client_phone) { ?> - Tel: client_phone; ?>
- -

-
- 		-
- - user_name; ?> -

- user_address_1) { - echo $invoice->user_address_1 . '
'; - }?> - user_address_2) { - echo $invoice->user_address_2 . '
'; - } ?> - user_zip) { - echo $invoice->user_zip . ' '; - } ?> +

- user_city) { - echo $invoice->user_city . '

'; - } ?> - - user_tax_code) { - echo '
' . trans('tax_code_short') . ': ' . $invoice->user_tax_code . '
'; + + +
+ : + ' . $custom_fields['client']['anrede'] . '
'; + } ?> +
+ +
+ client_vat_id) { + echo '
' . trans('vat_id_short') . ': ' . $invoice->client_vat_id . '
'; + } + if ($invoice->client_tax_code) { + echo '
' . trans('tax_code_short') . ': ' . $invoice->client_tax_code . '
'; + } + if ($invoice->client_address_1) { + echo '
' . htmlsc($invoice->client_address_1) . '
'; + } + if ($invoice->client_address_2) { + echo '
' . htmlsc($invoice->client_address_2) . '
'; + } + if ($invoice->client_city || $invoice->client_state || $invoice->client_zip) { + echo '
'; + if ($invoice->client_city) { + echo htmlsc($invoice->client_city) . ' '; + } + if ($invoice->client_state) { + echo htmlsc($invoice->client_state) . ' '; + } + if ($invoice->client_zip) { + echo htmlsc($invoice->client_zip); + } + echo '
'; + } + if ($invoice->client_country) { + echo '
' . get_country_name(trans('cldr'), $invoice->client_country) . '
'; + } + + echo '
'; + + if ($invoice->client_phone) { + echo '
' . trans('phone_abbr') . ': ' . htmlsc($invoice->client_phone) . '
'; } ?> - user_phone) { - ?>Tel: user_phone; ?>
-

-
-
-
- - - - - - - - - - - - - - - -
- : - - invoice_date_created, TRUE); ?> -
- : - - invoice_date_due, TRUE); ?> -
- : - - invoice_balance); ?> -
-
+ +
+
user_name); ?>
+ user_address_1) { + echo '
' . htmlsc($invoice->user_address_1) . '
'; + } + if ($invoice->user_address_2) { + echo '
' . htmlsc($invoice->user_address_2) . '
'; + } + if ($invoice->user_city || $invoice->user_state || $invoice->user_zip) { + echo '
'; + if ($invoice->user_city) { + echo htmlsc($invoice->user_city) . ' '; + } + if ($invoice->user_state) { + echo htmlsc($invoice->user_state) . ' '; + } + if ($invoice->user_zip) { + echo htmlsc($invoice->user_zip); + } + echo '
'; + } + if ($invoice->user_country) { + echo '
' . get_country_name(trans('cldr'), $invoice->user_country) . '
'; + } + + echo '
'; + + if ($invoice->user_vat_id) { + echo '
' . trans('vat_id_short') . ': ' . $invoice->user_vat_id . '
'; + } + if ($invoice->user_tax_code) { + echo '
' . trans('tax_code_short') . ': ' . $invoice->user_tax_code . '
'; + } + + echo '
'; + + if ($invoice->user_phone) { + echo '
' . trans('phone_abbr') . ': ' . htmlsc($invoice->user_phone) . '
'; + } + if ($invoice->user_fax) { + echo '
' . trans('fax_abbr') . ': ' . htmlsc($invoice->user_fax) . '
'; + } + ?> +
-
+
-
-

Nr. invoice_number; ?>

- Leistungszeitraum: bis
- Leistungsort:
-
- -
- - - - - - - - - - - - - - - - - - - - - - -
MengeEPGesamt
item_name; ?>item_description); ?> - item_quantity); ?> - item_product_unit) : ?> - item_product_unit); ?> - - - item_price); ?> - - item_subtotal); ?> -
-
+
- + + + + + + + + + + + + + + + +
- - - - - - - - - - - - - -
- Nettosumme: - - invoice_item_subtotal); ?> -
- 0% MwSt: - - 0,00 € -
- Gesamtbetrag: - - invoice_balance) ?> -
- 		invoice_date_created, true); ?>
invoice_date_due, true); ?>
invoice_balance); ?>
payment_method_name); ?>
+ +

invoice_number; ?>

+ + Leistungszeitraum: ' . $leistung_von . ' bis ' . $leistung_bis . '
'; + } + if ($leistungsort) { + echo '
Leistungsort: ' . $leistungsort . '
'; + } + ?> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + invoice_item_tax_total > 0) { ?> + + + + + + + + + + + + + + invoice_discount_percent != '0.00') : ?> + + + + + + invoice_discount_amount != '0.00') : ?> + + + + + + + + + + + + + + + +
item_name); ?>item_description)); ?> + item_quantity); ?> + item_product_unit) : ?> +
+ item_product_unit); ?> + + 		+ item_price); ?> + + item_discount); ?> + + item_total); ?> +
class="text-right"> + Nettosumme + invoice_item_subtotal); ?>
class="text-right"> + + + invoice_item_tax_total); ?> +
class="text-right"> + invoice_tax_rate_name) . ' (' . format_amount($invoice_tax_rate->invoice_tax_rate_percent) . '%)'; ?> + + invoice_tax_rate_amount); ?> +
class="text-right"> + + + invoice_discount_percent); ?>% +
class="text-right"> + + + invoice_discount_amount); ?> +
class="text-right"> + 0% MwSt + + 0,00€ +
class="text-right"> + Gesamtbetrag + + invoice_balance); ?> +
+