1
0
mirror of https://github.com/devcode-it/openstamanager.git synced 2024-12-23 05:54:03 +01:00

Merge branch 'master' into 2.4.11

This commit is contained in:
Thomas Zilio 2019-07-12 09:25:41 +02:00
commit 939ba2dea0
2 changed files with 7 additions and 6 deletions

View File

@ -1,11 +1,12 @@
{ {
"name": "devcode-it/openstamanager", "name": "devcode-it/openstamanager",
"description": "Gestionale open-source per assistenza tecnica e fatturazione", "description": "Gestionale open-source per assistenza tecnica e fatturazione elettronica",
"license": "GPL-3.0", "license": "GPL-3.0",
"keywords": [ "keywords": [
"gestionale", "gestionale",
"assistenza tecnica", "assistenza tecnica",
"fatturazione" "fatturazione elettronica",
"open-source"
], ],
"homepage": "https://www.openstamanager.com/", "homepage": "https://www.openstamanager.com/",
"authors": [{ "authors": [{

View File

@ -16,15 +16,15 @@ if ($options['hide_header']) {
} }
echo ' echo '
<br>
<div class="row"> <div class="row">
<!-- Dati Fattura --> <!-- Dati Fattura -->
<div class="col-xs-6"> <div class="col-xs-6">
<div class="text-center" style="height:5mm;"> <div class="text-left" style="height:5mm;">
<b>$tipo_doc$</b> <b>$tipo_doc$</b>
</div> </div>
<table class="table" style="overflow: visible"> <table class="table" style="overflow: visible;">
<tr> <tr>
<td valign="top" class="border-full text-center"> <td valign="top" class="border-full text-center">
<p class="small-bold">'.tr('Nr. documento', [], ['upper' => true]).'</p> <p class="small-bold">'.tr('Nr. documento', [], ['upper' => true]).'</p>
@ -71,7 +71,7 @@ echo '
</table> </table>
</div> </div>
<div class="col-xs-5 col-xs-offset-1"> <div class="col-xs-6">
<table class="table" style="width:100%;margin-top:5mm;"> <table class="table" style="width:100%;margin-top:5mm;">
<tr> <tr>
<td colspan=2 class="border-full"'.(!$fattura_accompagnatoria ? ' style="height:20mm;"' : '').'> <td colspan=2 class="border-full"'.(!$fattura_accompagnatoria ? ' style="height:20mm;"' : '').'>