Ripristinato campo nazione xml FE

This commit is contained in:
Luca 2019-01-15 13:52:28 +01:00
parent f9c02a2182
commit 417b024bfe
3 changed files with 10 additions and 9 deletions

View File

@ -142,7 +142,7 @@ if ($record['stato'] == 'Emessa') {
<div class="panel-body">
<div class="row">
<div class="col-md-4">
{[ "type": "text", "label": "<?php echo tr('Identificatore Documento'); ?>", "name": "id_documento_fe", "required": 0, "value": "$id_documento_fe$", "maxlength": 20 ]}
{[ "type": "text", "label": "<?php echo tr('Identificatore Documento'); ?>", "help": "<?php echo tr("<span>Obbligatorio per valorizzare CIG/CUP. &Egrave; possible inserire: </span><ul><li>N. determina</li><li>RDO</li><li>Ordine MEPA</li></ul>"); ?>","name": "id_documento_fe", "required": 0, "value": "$id_documento_fe$", "maxlength": 20 ]}
</div>
<div class="col-md-4">

View File

@ -23,13 +23,13 @@ if (!empty($tecnici)) {
<tr>
<th>'.$tecnico['ragione_sociale'].'</th>
<th>'.tr('Attività').'</th>
<th>'.tr('Addebito orario').'</th>
<th>'.tr('Addebito km').'</th>
<th>'.tr('Addebito diritto ch.').'</th>
<th>'.tr('Addebito orario').' <span class="tip" title="'.tr("Addebito al cliente").'"><i class="fa fa-question-circle-o"></i></span></th>
<th>'.tr('Addebito km').' <span class="tip" title="'.tr("Addebito al cliente").'"><i class="fa fa-question-circle-o"></i></span></th>
<th>'.tr('Addebito diritto ch.').' <span class="tip" title="'.tr("Addebito al cliente").'"><i class="fa fa-question-circle-o"></i></span></th>
<th>'.tr('Costo orario').'</th>
<th>'.tr('Costo km').'</th>
<th>'.tr('Costo diritto ch.').'</th>
<th>'.tr('Costo orario').' <span class="tip" title="'.tr("Costo interno").'"><i class="fa fa-question-circle-o"></i></span></th>
<th>'.tr('Costo km').' <span class="tip" title="'.tr("Costo interno").'"><i class="fa fa-question-circle-o"></i></span></th>
<th>'.tr('Costo diritto ch.').' <span class="tip" title="'.tr("Costo interno").'"><i class="fa fa-question-circle-o"></i></span></th>
<th width="40"></th>
</tr>';

View File

@ -466,7 +466,8 @@ class FatturaElettronica
$result['Provincia'] = strtoupper($anagrafica['provincia']);
}
$result->nazione->iso2 = $anagrafica->nazione->iso2;
if (!empty($anagrafica->nazione->iso2))
$result['Nazione'] = $anagrafica->nazione->iso2;
return $result;
}