1
0
mirror of https://github.com/devcode-it/openstamanager.git synced 2025-06-05 22:09:38 +02:00

Merge branch 'master' into 2.4

This commit is contained in:
Thomas Zilio
2018-02-24 11:23:20 +01:00
23 changed files with 13 additions and 12 deletions

View File

@ -213,6 +213,8 @@ if (!empty($result_query) && $result_query != 'menu' && $result_query != 'custom
$attributes[] = $key.'="'.$val.'"';
}
// Replace rootdir per le query
$value = str_replace('ROOTDIR', ROOTDIR, $value);
$result[] = str_replace('|attr|', implode(' ', $attributes), '<div |attr|>'.$value.'</div>');
}

View File

@ -1,14 +1,13 @@
{
"name": "devcode/openstamanager",
"description": "Gestionale open-source per assistenza tecnica e fatturazione",
"version": "2.4.0",
"license": "GPL-3.0",
"keywords": [
"gestionale",
"assistenza tecnica",
"fatturazione"
],
"homepage": "http://openstamanager.com/",
"homepage": "https://www.openstamanager.com/",
"authors": [{
"name": "Fabio Lovato",
"email": "info@openstamanager.com"

View File

@ -261,7 +261,7 @@ if ($fornitore) {
</div>
<div class="col-md-3">
{[ "type": "number", "label": "<?php echo tr('Capitale sociale'); ?>", "name": "capitale_sociale", "decimals": 0, "value": "$capitale_sociale$", "icon-after":"&euro;" ]}
{[ "type": "text", "label": "<?php echo tr('Capitale sociale'); ?>", "name": "capitale_sociale", "value": "$capitale_sociale$" ]}
</div>
</div>
<div class="row">

View File

@ -17,8 +17,9 @@ $idsede = filter('idsede');
$impianti = [];
if (!empty($idanagrafica)) {
$rs = $dbo->fetchArray('SELECT idtipointervento_default FROM an_anagrafiche WHERE idanagrafica='.prepare($idanagrafica));
$rs = $dbo->fetchArray('SELECT idtipointervento_default, idzona FROM an_anagrafiche WHERE idanagrafica='.prepare($idanagrafica));
$idtipointervento = $rs[0]['idtipointervento_default'];
$idzona = $rs[0]['idzona'];
$idstatointervento = 'WIP';
$richiesta = filter('richiesta');
}
@ -38,8 +39,9 @@ $idordineservizio = filter('idordineservizio');
$idcontratto_riga = filter('idcontratto_riga');
if (!empty($idcontratto) && !empty($idordineservizio)) {
$rs = $dbo->fetchArray('SELECT * FROM co_contratti WHERE id='.prepare($idcontratto));
$rs = $dbo->fetchArray('SELECT *, (SELECT idzona FROM an_anagrafiche WHERE idanagrafica = co_contratti.idanagrafica) AS idzona FROM co_contratti WHERE id='.prepare($idcontratto));
$idanagrafica = $rs[0]['idanagrafica'];
$idzona = $rs[0]['idzona'];
// Info riga pianificata
$rs = $dbo->fetchArray('SELECT * FROM co_ordiniservizio WHERE idcontratto='.prepare($idcontratto).' AND id='.prepare($idordineservizio));
@ -57,8 +59,9 @@ if (!empty($idcontratto) && !empty($idordineservizio)) {
// Se sto pianificando un contratto, leggo tutti i dati del contratto per predisporre l'aggiunta intervento
elseif (!empty($idcontratto) && !empty($idcontratto_riga)) {
$rs = $dbo->fetchArray('SELECT * FROM co_contratti WHERE id='.prepare($idcontratto));
$rs = $dbo->fetchArray('SELECT *, (SELECT idzona FROM an_anagrafiche WHERE idanagrafica = co_contratti.idanagrafica) AS idzona FROM co_contratti WHERE id='.prepare($idcontratto));
$idanagrafica = $rs[0]['idanagrafica'];
$idzona = $rs[0]['idzona'];
// Info riga pianificata
$rs = $dbo->fetchArray('SELECT * FROM co_righe_contratti WHERE idcontratto='.prepare($idcontratto).' AND id='.prepare($idcontratto_riga));

View File

@ -1,7 +1,6 @@
{
"name": "openstamanager",
"description": "Gestionale open-source per assistenza tecnica e fatturazione",
"version": "2.3.0",
"license": "GPL-3.0",
"keywords": [
"open-source",
@ -9,7 +8,7 @@
"assistenza tecnica",
"fatturazione"
],
"homepage": "http://openstamanager.com/",
"homepage": "https://www.openstamanager.com/",
"author": {
"name": "Fabio Lovato",
"email": "info@openstamanager.com"

View File

@ -27,7 +27,7 @@ return '
<p>'.$f_citta_full.'</p>
<p>'.(!empty($f_piva) ? tr('P.Iva').': '.$f_piva : '').'</p>
<p>'.(!empty($f_codicefiscale) ? tr('C.F.').': '.$f_codicefiscale : '').'</p>
<p>'.(!empty($f_capsoc) ? tr('Cap.Soc.').': '.$f_capsoc.' &euro;' : '').'</p>
<p>'.(!empty($f_capsoc) ? tr('Cap.Soc.').': '.$f_capsoc : '').'</p>
<p>'.(!empty($f_telefono) ? tr('Tel').': '.$f_telefono : '').'</p>
</div>
</div>';

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.2 KiB

View File

@ -119,8 +119,6 @@ $files = [
'templates/contratti/contratto.html',
'templates/preventivo/preventivo_body.html',
'templates/preventivo/preventivo.html',
'locale/it/it.po',
'locale/it/it.mo',
];
foreach ($files as $key => $value) {