Merge branch 'fronkdev' into 'master'

WIP Billing/Invoice 02.06.2024

See merge request fronk/thetool!414
This commit is contained in:
Frank Schubert
2024-07-02 14:53:46 +00:00
5 changed files with 14 additions and 6 deletions

View File

@@ -93,7 +93,9 @@ $is_credit = $net_total < 0;
<tr class="<?=($i%2 == 0) ? "even" : "odd" ?> one-position">
<td class="name">
<span class="product-name"><?=$p->product_name?></span>
<?php if($start_date->format("d.m.Y") != $end_date->format("d.m.Y")): ?>
<?php if($p->billing_period > 1): ?>
&nbsp;(<?=$start_date->format("m/Y")?> - <?=$end_date->format("m/Y")?>)
<?php elseif($start_date->format("d.m.Y") != $end_date->format("d.m.Y")): ?>
&nbsp;(<?=$start_date->format("d.m.Y")?> - <?=$end_date->format("d.m.Y")?>)
<?php endif; ?>
<?=($p->matchcode) ? "<div class='pl-2'>".$p->matchcode."</div>" : ""?>