[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [13024] Update contract
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [13024] Update contract |
|
Date: |
Thu, 16 Apr 2015 13:16:49 +0000 |
Revision: 13024
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=13024
Author: sigurdne
Date: 2015-04-16 13:16:48 +0000 (Thu, 16 Apr 2015)
Log Message:
-----------
Update contract
Modified Paths:
--------------
thirdparty/PE_custom/NLSH/rental/templates/base/pdf/rental_contract_form_hybler.php
thirdparty/PE_custom/NLSH/rental/templates/base/pdf/rental_contract_form_personalbolig2.php
Modified:
thirdparty/PE_custom/NLSH/rental/templates/base/pdf/rental_contract_form_hybler.php
===================================================================
---
thirdparty/PE_custom/NLSH/rental/templates/base/pdf/rental_contract_form_hybler.php
2015-04-16 11:21:19 UTC (rev 13023)
+++
thirdparty/PE_custom/NLSH/rental/templates/base/pdf/rental_contract_form_hybler.php
2015-04-16 13:16:48 UTC (rev 13024)
@@ -17,9 +17,10 @@
</style>
<div class="contract">
<img
src="http://www.nordlandssykehuset.no/getfile.php/NLSH_bilde%20og%20filarkiv/Internett/NLSH_logo_siste.jpg%20%28352x58%29.jpg";
alt="Nordlanssykehuset logo" />
-<h1>Korttidskontrakt</h1>
+<h1>Melding om inn/utflytting - Hybler</h1>
+<h3>Kontraktsnummer: <?php echo $contract->get_old_contract_id();?></h3>
+<h3>Type: <?php echo lang($contract->get_contract_type_title()).' /
'.lang(rental_socontract::get_instance()->get_contract_type_label($contract->get_contract_type_id()));?></h3>
-
<form action="" method="post">
<?php
$disabled="";
@@ -51,20 +52,62 @@
<dt><input type="checkbox" name="checkb_in" <?php echo $disabled;
if(isset($_POST['checkb_in']) || isset($_POST['checkb_in_hidden'])) {echo
'checked="checked"';}?> />  Innflytting</dt>
<dd> </dd>
<dt>Navn:</dt>
- <dd><?php echo $contract_party->get_first_name()." ".
$contract_party->get_last_name();?> </dd>
+ <dd><?php // echo $contract_party->get_first_name()." ".
$contract_party->get_last_name();?>
+ <?php echo $contract->get_party_name();?>
+ </dd>
<dt>Fnr.:</dt>
<dd><?php echo $contract_party->get_identifier();?> </dd>
<dt>Adresse:</dt>
- <dd><?php echo $contract_party->get_address_1().", ";
+ <dd><?php echo $contract_party->get_address_1();
if($contract_party->get_address_2())
{
- echo $contract_party->get_address_2().", ";
+ echo ", " .$contract_party->get_address_2().", ";
}
echo $contract_party->get_postal_code(). "
".$contract_party->get_place() ;
?>
</dd>
<dt>Tildelt bolig:</dt>
- <dd><?php echo $composite->get_name();?> </dd>
+ <dd>
+ <?php
+ $unit = $units[0];
+ $location_code =
$unit->get_location()->get_location_code();
+ $location = explode('-', $location_code);
+ $loc1 = (int) $location[0];
+
+ if($loc1 > 8006 && $loc1 < 8100)
+ {
+ $municipal = "Bodø";
+ }
+ else if($loc1 > 8499 && $loc1 < 8600)
+ {
+ $municipal = "Hadsel";
+ }
+ else if($loc1 > 8599 && $loc1 < 8700)
+ {
+ $municipal = "Gravdal";
+ }
+
+ echo $unit->get_location()->get_location_code() . '
Adresse:' . $unit->get_location()->get_address_1() . "i {$municipal} kommune.";
+ ?> </dd>
+ <dt>E-post.:</dt>
+ <dd>
+ <?php
+ $parties = rental_soparty::get_instance()->get(null,
null, null, null, null, null, array('contract_id' => $contract->get_id()));
+ $party_email = array();
+ foreach($parties as $party)
+ {
+ if($party->get_email())
+ {
+ $party_email[] = $party->get_email();
+ }
+ }
+ if($party_email)
+ {
+ echo implode(", ", $party_email);
+ }
+ ?>
+ </dd>
+
</dl>
@@ -205,4 +248,4 @@
</div>
-<?php }
\ No newline at end of file
+<?php }
Modified:
thirdparty/PE_custom/NLSH/rental/templates/base/pdf/rental_contract_form_personalbolig2.php
===================================================================
---
thirdparty/PE_custom/NLSH/rental/templates/base/pdf/rental_contract_form_personalbolig2.php
2015-04-16 11:21:19 UTC (rev 13023)
+++
thirdparty/PE_custom/NLSH/rental/templates/base/pdf/rental_contract_form_personalbolig2.php
2015-04-16 13:16:48 UTC (rev 13024)
@@ -27,9 +27,15 @@
</tr>
<tr>
<td colspan="2">
+ <h3>Type: <?php echo
lang($contract->get_contract_type_title()).' /
'.lang(rental_socontract::get_instance()->get_contract_type_label($contract->get_contract_type_id()));?></h3>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2">
<h3>Kontraktsnummer: <?php echo
$contract->get_old_contract_id();?></h3>
</td>
</tr>
+
</table>
<form action="" method="post">
<?php
@@ -77,7 +83,9 @@
<tr>
<td>Nordlandssykehuset HF</td>
<td bgcolor="#C0C0C0" width="120px">Navn:</td>
- <td><?php echo $contract_party->get_first_name()." ".
$contract_party->get_last_name();?></td>
+ <!--<td><?php // echo $contract_party->get_first_name()." ".
$contract_party->get_last_name();?></td>-->
+ <td><?php echo $contract->get_party_name();?></td>
+
</tr>
<tr>
<td>v/ Boligforvalter <?php echo
$GLOBALS['phpgw']->accounts->get($contract->get_executive_officer_id())->
__toString();?></td>
@@ -135,7 +143,9 @@
echo $_POST['address']?>
<input type="hidden" name="address"
value="<?php echo $_POST['address']?>" />
<?php
- }else{
+ }
+ else
+ {
?>
<input type="text" name="address"
value="<?php echo $contract_party->get_address_1().",
".$contract_party->get_address_2();?>" />
<?php
@@ -160,6 +170,26 @@
?>
</td>
</tr>
+ <?php
+ $parties = rental_soparty::get_instance()->get(null, null,
null, null, null, null, array('contract_id' => $contract->get_id()));
+ $party_email = array();
+ foreach($parties as $party)
+ {
+ if($party->get_email())
+ {
+ $party_email[] = $party->get_email();
+ }
+ }
+ if($party_email)
+ {
+ echo "<tr>
+ <td></td>
+ <td bgcolor='#C0C0C0'>E-post:</td>
+ <td>";
+ echo implode(", ", $party_email) . '</td></tr>';
+ }
+ ?>
+
</table>
<div class="section">
@@ -177,9 +207,27 @@
foreach ($units as $unit){
$gb = preg_split('/ /', $unit->get_location()->get_gab_id(), -1);
+ $location_code = $unit->get_location()->get_location_code();
+ $location = explode('-', $location_code);
+ $loc1 = (int) $location[0];
+
+ if($loc1 > 8006 && $loc1 < 8100)
+ {
+ $municipal = "Bodø";
+ }
+ else if($loc1 > 8499 && $loc1 < 8600)
+ {
+ $municipal = "Hadsel";
+ }
+ else if($loc1 > 8599 && $loc1 < 8700)
+ {
+ $municipal = "Vestvågøy";
+ }
+
+
if(!($gb[0]=="")){
?><dt></dt>
- <dd>Leieforholdet gjelder for eiendom: G.nr. <?php echo $gb[0];?>
B.nr. <?php echo $gb[2];?> i Bodø kommune.</dd>
+ <dd>Leieforholdet gjelder for leieobjekt: <?php echo
$unit->get_location()->get_location_code();?> , Adresse: <?php echo
$unit->get_location()->get_address_1() . "i {$municipal}";?> kommune.</dd>
<?php }}?>
</dl>
</div>
@@ -247,6 +295,7 @@
}
}?>
<p>Leiesummen skal betales forskuddsvis hver mnd.<br/>
+ Ved kontraktsinngåelse betales innværende og påfølgende
mnd.<br/>
Ved forsinket betaling skal det betales forsinkelsesrente etter
lov om forsinket betaling av 17.des. 1976 nr. 100.<br/>
Ved mislighold av leiebetaling samtykker leietaker i at utleier
kan foreta direkte trekk av tilgodehavende husleie direkte av leietakers
lønn.<br/>
Husleie skal reguleres i takt med konsumprisindeksen hvert år.
I tillegg kan utleier justere leie til enhver tid markedsleie for denne type
bolig.</p>
@@ -256,7 +305,7 @@
<div class="section">
<dl class="section_header">
<dt>5.</dt>
- <dd>trøm og brensel</dd>
+ <dd>Strøm og brensel</dd>
</dl>
<dl class="checkbox_list">
@@ -412,7 +461,7 @@
$lokasjon = 'Bodø';
break;
}
- echo "{$lokasjon} den" . date($date_format,
time());?></i></td>
+ echo "{$municipal} den" . date($date_format,
time());?></i></td>
</tr>
<tr>
<th>Utleier</th>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [13024] Update contract,
Sigurd Nes <=