[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [16901] Stable: Merge 16893:16900 from trunk
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [16901] Stable: Merge 16893:16900 from trunk |
|
Date: |
Tue, 4 Jul 2017 04:02:39 -0400 (EDT) |
Revision: 16901
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16901
Author: sigurdne
Date: 2017-07-04 04:02:39 -0400 (Tue, 04 Jul 2017)
Log Message:
-----------
Stable: Merge 16893:16900 from trunk
Modified Paths:
--------------
branches/Version-2_0-branch/addressbook/setup/phpgw_no.lang
branches/Version-2_0-branch/admin/setup/phpgw_no.lang
branches/Version-2_0-branch/controller/setup/phpgw_no.lang
branches/Version-2_0-branch/eventplanner/inc/class.bocalendar.inc.php
branches/Version-2_0-branch/eventplanner/inc/class.bocustomer_report.inc.php
branches/Version-2_0-branch/eventplanner/inc/class.bovendor_report.inc.php
branches/Version-2_0-branch/eventplanner/inc/class.uibooking.inc.php
branches/Version-2_0-branch/eventplanner/inc/class.uicustomer_report.inc.php
branches/Version-2_0-branch/eventplanner/inc/class.uivendor_report.inc.php
branches/Version-2_0-branch/eventplanner/inc/model/class.booking.inc.php
branches/Version-2_0-branch/eventplanner/setup/phpgw_no.lang
branches/Version-2_0-branch/eventplanner/templates/base/booking.xsl
branches/Version-2_0-branch/eventplanner/templates/base/config.tpl
branches/Version-2_0-branch/eventplanner/templates/base/report.xsl
branches/Version-2_0-branch/eventplannerfrontend/js/portico/application.edit.js
branches/Version-2_0-branch/eventplannerfrontend/templates/base/application.xsl
branches/Version-2_0-branch/eventplannerfrontend/templates/base/booking.xsl
branches/Version-2_0-branch/eventplannerfrontend/templates/base/report.xsl
branches/Version-2_0-branch/helpdesk/setup/phpgw_no.lang
branches/Version-2_0-branch/phpgwapi/inc/class.bocommon.inc.php
branches/Version-2_0-branch/phpgwapi/inc/class.translation.inc.php
branches/Version-2_0-branch/phpgwapi/setup/phpgw_no.lang
branches/Version-2_0-branch/phpgwapi/templates/base/attributes_form.xsl
branches/Version-2_0-branch/property/inc/class.soentity.inc.php
branches/Version-2_0-branch/property/setup/phpgw_no.lang
branches/Version-2_0-branch/property/templates/base/columns.xsl
branches/Version-2_0-branch/rental/setup/phpgw_no.lang
Property Changed:
----------------
branches/Version-2_0-branch/
Index: branches/Version-2_0-branch
===================================================================
--- branches/Version-2_0-branch 2017-07-04 08:00:24 UTC (rev 16900)
+++ branches/Version-2_0-branch 2017-07-04 08:02:39 UTC (rev 16901)
Property changes on: branches/Version-2_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
## -1,4 +1,4 ##
/branches/dev-syncromind:13653
/branches/dev-syncromind-2:14933-16846
/branches/stavangerkommune:12743-12875,12986
-/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816,14818,14820-14822,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14847,14849-14866,14868-14869,14871,14873-14875,14877-14878,14880-14884,14886-14896,14898,14900-14902,14904,14906-14909,14911-14915,14917-14919,14921-14922,14924-14978,14980-15258,15260-15261,15263-15264,15266-15285,15287-15288,15290-15291,15293,15295,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15356,15358,15360-15541,15543-15566,15568-15569,15571,15573-15581,15583,15585-15617,15619,15621-15630,15632-15635,15637-15639,15641-15643,15645,15647-15665,15667-15668,15670-15671,15673-15693,15695-15712,15714-15764,15766-15767,15769-15787,15789-15802,15804-15811,15813-15814,15816-15818,15820-15849,15851-15887,15889-15900,15902-16046,16048-16051,16053,16055,16057-16063,16065-16071,16073-16077,16079-16081,16083-16099,16101-16130,16132-16140,16142,16144-16212,16214-16219,16221,16223-16224,16226,16228-16229,16231,16233,16235,16237,16239-16240,16242,16244-16246,16248,16250-16251,16253-16255,16257-16259,16261,16263,16265,16267,16269-16276,16278,16280-16283,16285,16287-16288,16290,16292-16295,16297-16305,16307-16314,16316-16318,16320-16322,16324,16326-16330,16332,16334,16336,16338-16339,16341-16342,16344,16346,16348,16350,16352-16353,16355-16358,16360,16362,16364-16369,16371,16373,16375-16378,16380,16382-16383,16385,16387,16389,16391,16393-16395,16397,16399-16402,16404,16406,16408,16410-16415,16417,16419-16420,16422-16425,16427,16429-16440,16442,16444,16446,16448-16449,16451,16453,16455-16463,16465-16472,16474-16475,16477-16484,16486,16488,16490-16497,16499,16501-16503,16505-16512,16514-16517,16519,16521,16523,16525,16527-16532,16534,16536-16541,16543,16545-16554,16556,16558-16565,16567-16575,16577-16584,16586-16588,16590,16592-16593,16595-16596,16598,16600-16601,16603-16608,16610-16614,16616-16618,16620-16621,16623-16624,16626,16628,16630,16632-16638,16640,16642,16644,16646-16651,16653-16663,16665,16667,16669,16671,16673,16675,16677,16679-16680,16682,16684,16686,16688-16692,16694-16695,16697-16699,16701,16703,16705-16706,16708,16710,16712,16714,16716-16718,16720-16728,16730-16732,16734-16739,16741,16743-16746,16748-16750,16752-16755,16757,16759-16761,16763,16765,16767,16769-16774,16776,16778-16783,16785-16788,16790,16792,16794,16796-16802,16804-16807,16809,16811-16817,16819,16821-16825,16827-16831,16833,16835-16836,16838,16840-16844,16846-16847,16849,16851,16853-16854,16856-16859,16861,16863-16865,16867,16869-16871,16873,16875-16876,16878,16880-16881,16883,16885,16887-16888,16890,16892
\ No newline at end of property
+/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816,14818,14820-14822,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14847,14849-14866,14868-14869,14871,14873-14875,14877-14878,14880-14884,14886-14896,14898,14900-14902,14904,14906-14909,14911-14915,14917-14919,14921-14922,14924-14978,14980-15258,15260-15261,15263-15264,15266-15285,15287-15288,15290-15291,15293,15295,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15356,15358,15360-15541,15543-15566,15568-15569,15571,15573-15581,15583,15585-15617,15619,15621-15630,15632-15635,15637-15639,15641-15643,15645,15647-15665,15667-15668,15670-15671,15673-15693,15695-15712,15714-15764,15766-15767,15769-15787,15789-15802,15804-15811,15813-15814,15816-15818,15820-15849,15851-15887,15889-15900,15902-16046,16048-16051,16053,16055,16057-16063,16065-16071,16073-16077,16079-16081,16083-16099,16101-16130,16132-16140,16142,16144-16212,16214-16219,16221,16223-16224,16226,16228-16229,16231,16233,16235,16237,16239-16240,16242,16244-16246,16248,16250-16251,16253-16255,16257-16259,16261,16263,16265,16267,16269-16276,16278,16280-16283,16285,16287-16288,16290,16292-16295,16297-16305,16307-16314,16316-16318,16320-16322,16324,16326-16330,16332,16334,16336,16338-16339,16341-16342,16344,16346,16348,16350,16352-16353,16355-16358,16360,16362,16364-16369,16371,16373,16375-16378,16380,16382-16383,16385,16387,16389,16391,16393-16395,16397,16399-16402,16404,16406,16408,16410-16415,16417,16419-16420,16422-16425,16427,16429-16440,16442,16444,16446,16448-16449,16451,16453,16455-16463,16465-16472,16474-16475,16477-16484,16486,16488,16490-16497,16499,16501-16503,16505-16512,16514-16517,16519,16521,16523,16525,16527-16532,16534,16536-16541,16543,16545-16554,16556,16558-16565,16567-16575,16577-16584,16586-16588,16590,16592-16593,16595-16596,16598,16600-16601,16603-16608,16610-16614,16616-16618,16620-16621,16623-16624,16626,16628,16630,16632-16638,16640,16642,16644,16646-16651,16653-16663,16665,16667,16669,16671,16673,16675,16677,16679-16680,16682,16684,16686,16688-16692,16694-16695,16697-16699,16701,16703,16705-16706,16708,16710,16712,16714,16716-16718,16720-16728,16730-16732,16734-16739,16741,16743-16746,16748-16750,16752-16755,16757,16759-16761,16763,16765,16767,16769-16774,16776,16778-16783,16785-16788,16790,16792,16794,16796-16802,16804-16807,16809,16811-16817,16819,16821-16825,16827-16831,16833,16835-16836,16838,16840-16844,16846-16847,16849,16851,16853-16854,16856-16859,16861,16863-16865,16867,16869-16871,16873,16875-16876,16878,16880-16881,16883,16885,16887-16888,16890,16892,16894-16900
\ No newline at end of property
Modified: branches/Version-2_0-branch/addressbook/setup/phpgw_no.lang
===================================================================
--- branches/Version-2_0-branch/addressbook/setup/phpgw_no.lang 2017-07-04
08:00:24 UTC (rev 16900)
+++ branches/Version-2_0-branch/addressbook/setup/phpgw_no.lang 2017-07-04
08:02:39 UTC (rev 16901)
@@ -1,4 +1,4 @@
-address book common no Addresse Bok
+address book common no Addressebok
addressbook common no Addressebook
birthday addressbook no Fødselsdag
city addressbook no By
@@ -9,7 +9,7 @@
last name addressbook no Etternavn
mobile addressbook no Mobil
notes addressbook no Annet
-other number addressbook no Annet Nummer
+other number addressbook no Annet nummer
pager addressbook no Personsøker
state addressbook no Stat
street addressbook no Gate
Modified: branches/Version-2_0-branch/admin/setup/phpgw_no.lang
===================================================================
--- branches/Version-2_0-branch/admin/setup/phpgw_no.lang 2017-07-04
08:00:24 UTC (rev 16900)
+++ branches/Version-2_0-branch/admin/setup/phpgw_no.lang 2017-07-04
08:02:39 UTC (rev 16901)
@@ -10,7 +10,7 @@
disabled admin no Deaktivert
display admin no Vis
global message admin no Global Melding
-group name admin no Gruppe Navn
+group name admin no Gruppenavn
idle admin no idle
ip admin no IP
kill admin no Avslutt
@@ -21,7 +21,7 @@
loginid admin no LoginID
manager admin no Manager
message admin no Melding
-new group name admin no Nytt gruppe navn
+new group name admin no Nytt gruppenavn
new password [ leave blank for no change ] admin no Nytt passord [
Ingenting hvis ingen forandring ]
percent of users that logged out admin no Prosent av brukere som
logget ut
re-enter password admin no Skriv inn passord igjen
@@ -31,9 +31,9 @@
the two passwords are not the same admin no Passordene er ikke de
sammme
total records admin no Total historie
user accounts admin no Bruker accounts
-user groups admin no Bruker Grupper
-view access log admin no Vis Access Log
-view sessions admin no Vis sessions
+user groups admin no Brukergrupper
+view access log admin no Vis Accesslog
+view sessions admin no Vis sesjoner
you must enter a password admin no Du må skrive inn et passord
you must select a file type admin no Du må velge en filtype
home screen message admin no Melding på hjemmeskjerm
Modified: branches/Version-2_0-branch/controller/setup/phpgw_no.lang
===================================================================
--- branches/Version-2_0-branch/controller/setup/phpgw_no.lang 2017-07-04
08:00:24 UTC (rev 16900)
+++ branches/Version-2_0-branch/controller/setup/phpgw_no.lang 2017-07-04
08:02:39 UTC (rev 16901)
@@ -207,7 +207,7 @@
postal_code_place controller no Postnummer/-sted
previous controller no Forrige
propertyident controller no G.nr. / B.nr. / F.nr. / S.nr.
-property_id controller no BKB Identifikator
+property_id controller no BKB identifikator
property controller no Eiendom
quarterly controller no Kvartalvis
recurrence controller no Gjentakelse
@@ -337,8 +337,8 @@
component_category_internal controller no Internt utstyrsregister
component_category_ifc controller no IFC
invert_checkboxes controller no Inverter merking
-ControlId controller no Kontroll ID
-Bim_id controller no Utstyr ID
+ControlId controller no Kontroll-id
+Bim_id controller no Utstyrs-id
Bim_name controller no Utstyrsnavn
Bim_type controller no Utstyrstype
GUID controller no GUID
@@ -386,10 +386,10 @@
controle time common no Kontrolltid
service time common no Servicetid
total time common no Totaltid
-request ical event controller no Send MøteInnkalling
+request ical event controller no Send møteinnkalling
summary common no Sammendrag
components controller no Komponenter
-report type controller no RapportType
+report type controller no Rapporttype
lang_control_mandatory_location controller no Påkrevd
lokasjonsvalg
Control types controller no Kontrolltyper
location controller no Lokasjon
\ No newline at end of file
Modified: branches/Version-2_0-branch/eventplanner/inc/class.bocalendar.inc.php
===================================================================
--- branches/Version-2_0-branch/eventplanner/inc/class.bocalendar.inc.php
2017-07-04 08:00:24 UTC (rev 16900)
+++ branches/Version-2_0-branch/eventplanner/inc/class.bocalendar.inc.php
2017-07-04 08:02:39 UTC (rev 16901)
@@ -174,9 +174,219 @@
$_ids = $ids;
}
- return
eventplanner_socalendar::get_instance()->update_active_status($_ids, $action);
+ $ret =
eventplanner_socalendar::get_instance()->update_active_status($_ids, $action);
+
+ if($ret && $action == 'disconnect')
+ {
+ $this->send_disconnect_email($_ids);
+ }
+
+ return $ret;
}
+ function send_disconnect_email($ids)
+ {
+ $config = CreateObject('phpgwapi.config',
'eventplanner')->read();
+ $sobooking = createObject('eventplanner.sobooking');
+ foreach ($ids as $calendar_id)
+ {
+ $booking_id =
$sobooking->get_booking_id_from_calendar( $calendar_id );
+ $booking = $sobooking->read_single($booking_id,
true);
+
+ $customer =
createObject('eventplanner.bocustomer')->read_single($booking->customer_id,
true, $relaxe_acl = true);
+ $customer_name =$customer->name;
+
+ $customer_contact_name =
$booking->customer_contact_name;
+ $customer_contact_email =
$booking->customer_contact_email;
+ $customer_contact_phone =
$booking->customer_contact_phone;
+ $location = $booking->location;
+
+ $calendar =
createObject('eventplanner.bocalendar')->read_single($calendar_id, true,
$relaxe_acl = true);
+ $from_ =
$GLOBALS['phpgw']->common->show_date($calendar->from_);
+ $to_ =
$GLOBALS['phpgw']->common->show_date($calendar->to_);
+
+ $application =
createObject('eventplanner.boapplication')->read_single($calendar->application_id,
true, $relaxe_acl = true);
+ // _debug_array($application);
+ // _debug_array($application);
+
+ $vendor_name = $application->vendor_name;
+ $vendor_contact_name =
$application->contact_name;
+ $vendor_contact_email =
$application->contact_email;
+ $vendor_contact_phone =
$application->contact_phone;
+
+ $subject = !empty($config['canceled_subject'])
? $config['canceled_subject'] : $event_title;
+ $event_title = $application->title;
+
+ $send = CreateObject('phpgwapi.send');
+
+ $lang_when = lang('when');
+ $lang_where = lang('where');
+
+ $body = <<<HTML
+ <h2>{$event_title}</h2>
+ <table>
+ <tr>
+ <td>
+ {$lang_when}:
+ </td>
+ <td>
+ {$from_} -
{$to_}
+ </td>
+ </tr>
+ <tr>
+ <td>
+ {$lang_where}:
+ </td>
+ <td>
+ {$location}
+ </td>
+ </tr>
+ </table>
+HTML;
+
+ $lang_vendor = lang('vendor');
+ $lang_customer = lang('customer');
+ $lang_contact_info = lang('contact info');
+
+ $body .= <<<HTML
+ <table border='1' class='pure-table
pure-table-bordered pure-table-striped'>
+ <thead>
+ <tr>
+ <th colspan="2" align =
"left">
+
{$lang_contact_info}
+ </th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td>
+
<b>{$lang_vendor}</b>
+ </td>
+ <td>
+ {$vendor_name}
+ </td>
+ </tr>
+ <tr>
+ <td>
+ </td>
+ <td>
+
{$vendor_contact_name}
+ </td>
+ </tr>
+ <tr>
+ <td>
+ </td>
+ <td>
+
{$vendor_contact_email}
+ </td>
+ </tr>
+ <tr>
+ <td>
+ </td>
+ <td>
+
{$vendor_contact_phone}
+ </td>
+ </tr>
+ <tr>
+ <td>
+ </td>
+ <td>
+
+ </td>
+ </tr>
+ <tr>
+ <td>
+
<b>{$lang_customer}</b>
+ </td>
+ <td>
+ {$customer_name}
+ </td>
+ </tr>
+ <tr>
+ <td>
+ </td>
+ <td>
+
{$customer_contact_name}
+ </td>
+ </tr>
+ <tr>
+ <td>
+ </td>
+ <td>
+
{$customer_contact_email}
+ </td>
+ </tr>
+ <tr>
+ <td>
+ </td>
+ <td>
+
{$customer_contact_phone}
+ </td>
+ </tr>
+
+ </tbody>
+ </table>
+HTML;
+
+ $vendor_receipt_text =
!empty($config['vendor_canceled_text']) ? $config['vendor_canceled_text'] :
null;
+
+ if($vendor_receipt_text)
+ {
+
+ // $lang_vendor_note = lang('vendor note');
+ $body .= <<<HTML
+ {$vendor_receipt_text}
+HTML;
+
+ }
+ $customer_receipt_text =
!empty($config['customer_canceled_text']) ? $config['customer_canceled_text'] :
null;
+
+ if($customer_receipt_text)
+ {
+
+ // $lang_customer_note = lang('customer
note');
+ $body .= <<<HTML
+ {$customer_receipt_text}
+HTML;
+
+ }
+
+ $content = <<<HTML
+<!DOCTYPE HTML>
+<html>
+ <head>
+ <meta charset="utf-8">
+ </head>
+ <body>
+ {$body}
+ </body>
+</html>
+HTML;
+
+//echo $content; die();
+ /**
+ * Vendor
+ */
+ $cc = $customer_contact_email;
+ $bcc = !empty($config['receipt_blind_copy']) ?
$config['receipt_blind_copy'] : '';
+ $to_email = $vendor_contact_email;
+ $from_email =
!empty($config['receipt_blind_copy']) ? $config['receipt_blind_copy'] :
$customer_contact_email;
+ $from_name =
!empty($config['receipt_blind_copy']) ? $config['receipt_blind_copy'] :
$customer_contact_name;
+
+ try
+ {
+ $rcpt = $send->msg('email', $to_email,
$subject, stripslashes($content), '', $cc, $bcc, $from_email, $from_name,
'html');
+ }
+ catch (phpmailerException $e)
+ {
+
phpgwapi_cache::message_set($e->getMessage(), 'error');
+ }
+
+ phpgwapi_cache::message_set("Email: $to_email,
$cc", 'message');
+
+ }
+ }
+
public function update_schedule( $id, $from_ )
{
$calendar =
eventplanner_socalendar::get_instance()->read_single($id, true);
Modified:
branches/Version-2_0-branch/eventplanner/inc/class.bocustomer_report.inc.php
===================================================================
---
branches/Version-2_0-branch/eventplanner/inc/class.bocustomer_report.inc.php
2017-07-04 08:00:24 UTC (rev 16900)
+++
branches/Version-2_0-branch/eventplanner/inc/class.bocustomer_report.inc.php
2017-07-04 08:02:39 UTC (rev 16901)
@@ -86,6 +86,12 @@
$values =
eventplanner_socustomer_report::get_instance()->read($params);
$dateformat =
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
+
+ $custom = createObject('property.custom_fields');
+ $custom_fields = (array)$custom->find('eventplanner',
$this->acl_location, 0, '', '', '', true, false);
+ $selected =
(array)$GLOBALS['phpgw_info']['user']['preferences']['eventplanner']['customer_report_columns'];
+ $location_id =
$GLOBALS['phpgw']->locations->get_id('eventplanner', $this->acl_location);
+
foreach ($values['results'] as &$entry)
{
$entry['created'] =
$GLOBALS['phpgw']->common->show_date($entry['created']);
@@ -92,6 +98,21 @@
$entry['modified'] =
$GLOBALS['phpgw']->common->show_date($entry['modified']);
$entry['date_start'] =
$GLOBALS['phpgw']->common->show_date($entry['date_start'], $dateformat);
$entry['date_end'] =
$GLOBALS['phpgw']->common->show_date($entry['date_end'], $dateformat);
+
+ foreach ($custom_fields as $custom_field)
+ {
+ if( in_array( $custom_field['id'],
$selected) || $custom_field['list'])
+ {
+ $entry[$custom_field['name']] =
$custom->get_translated_value(
+ array(
+ 'value' =>
$entry['json_representation'][$custom_field['name']],
+ 'datatype' =>
$custom_field['datatype'],
+ 'attrib_id' =>
$custom_field['id']
+ ),
+ $location_id
+ );
+ }
+ }
}
return $values;
}
@@ -109,4 +130,20 @@
return $values;
}
+
+ function column_list( $selected = '', $allrows = '' )
+ {
+ if (!$selected)
+ {
+ $selected =
(array)$GLOBALS['phpgw_info']['user']['preferences']['eventplanner']['customer_report_columns'];
+ }
+ $filter = array('list' => ''); // translates to "list
IS NULL"
+ $columns =
createObject('phpgwapi.custom_fields')->find('eventplanner',
$this->acl_location, 0, '', '', '', true, false, $filter);
+ foreach ($columns as &$column)
+ {
+ $column['name'] = $column['descr'] ?
$column['descr'] : $column['input_text'];
+ }
+ $column_list = $this->select_multi_list($selected,
$columns);
+ return $column_list;
+ }
}
\ No newline at end of file
Modified:
branches/Version-2_0-branch/eventplanner/inc/class.bovendor_report.inc.php
===================================================================
--- branches/Version-2_0-branch/eventplanner/inc/class.bovendor_report.inc.php
2017-07-04 08:00:24 UTC (rev 16900)
+++ branches/Version-2_0-branch/eventplanner/inc/class.bovendor_report.inc.php
2017-07-04 08:02:39 UTC (rev 16901)
@@ -86,6 +86,12 @@
$values =
eventplanner_sovendor_report::get_instance()->read($params);
$dateformat =
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
+
+ $custom = createObject('property.custom_fields');
+ $custom_fields = (array)$custom->find('eventplanner',
$this->acl_location, 0, '', '', '', true, false);
+ $selected =
(array)$GLOBALS['phpgw_info']['user']['preferences']['eventplanner']['vendor_report_columns'];
+ $location_id =
$GLOBALS['phpgw']->locations->get_id('eventplanner', $this->acl_location);
+
foreach ($values['results'] as &$entry)
{
$entry['created'] =
$GLOBALS['phpgw']->common->show_date($entry['created']);
@@ -92,6 +98,21 @@
$entry['modified'] =
$GLOBALS['phpgw']->common->show_date($entry['modified']);
$entry['date_start'] =
$GLOBALS['phpgw']->common->show_date($entry['date_start'], $dateformat);
$entry['date_end'] =
$GLOBALS['phpgw']->common->show_date($entry['date_end'], $dateformat);
+
+ foreach ($custom_fields as $custom_field)
+ {
+ if( in_array( $custom_field['id'],
$selected) || $custom_field['list'])
+ {
+ $entry[$custom_field['name']] =
$custom->get_translated_value(
+ array(
+ 'value' =>
$entry['json_representation'][$custom_field['name']],
+ 'datatype' =>
$custom_field['datatype'],
+ 'attrib_id' =>
$custom_field['id']
+ ),
+ $location_id
+ );
+ }
+ }
}
return $values;
}
@@ -109,4 +130,21 @@
return $values;
}
+
+ function column_list( $selected = '', $allrows = '' )
+ {
+ if (!$selected)
+ {
+ $selected =
(array)$GLOBALS['phpgw_info']['user']['preferences']['eventplanner']['vendor_report_columns'];
+ }
+ $filter = array('list' => ''); // translates to "list
IS NULL"
+ $columns =
createObject('phpgwapi.custom_fields')->find('eventplanner',
$this->acl_location, 0, '', '', '', true, false, $filter);
+ foreach ($columns as &$column)
+ {
+ $column['name'] = $column['descr'] ?
$column['descr'] : $column['input_text'];
+ }
+ $column_list = $this->select_multi_list($selected,
$columns);
+ return $column_list;
+ }
+
}
\ No newline at end of file
Modified: branches/Version-2_0-branch/eventplanner/inc/class.uibooking.inc.php
===================================================================
--- branches/Version-2_0-branch/eventplanner/inc/class.uibooking.inc.php
2017-07-04 08:00:24 UTC (rev 16900)
+++ branches/Version-2_0-branch/eventplanner/inc/class.uibooking.inc.php
2017-07-04 08:02:39 UTC (rev 16901)
@@ -249,7 +249,6 @@
'container' => 'datatable-container_1',
'requestUrl' =>
json_encode(self::link(array('menuaction' =>
"{$this->currentapp}.uivendor_report.query",
'filter_booking_id' => $id,
- 'filter_active' => 1,
'phpgw_return_as' => 'json'))),
'ColumnDefs' => $vendor_report_def,
'data' => json_encode($vendor_report),
@@ -278,11 +277,9 @@
);
$datatable_def[] = array(
'container' => 'datatable-container_2',
-// 'requestUrl' =>
json_encode(self::link(array('menuaction' =>
"{$this->currentapp}.uicustomer_report.query",
-// 'filter_booking_id' => $id,
-// 'filter_active' => 1,
-// 'phpgw_return_as' => 'json'))),
- 'requestUrl' => "''",
+ 'requestUrl' =>
json_encode(self::link(array('menuaction' =>
"{$this->currentapp}.uicustomer_report.query",
+ 'filter_booking_id' => $id,
+ 'phpgw_return_as' => 'json'))),
'ColumnDefs' => $customer_report_def,
'data' => json_encode($customer_report),
'tabletools' => $tabletools,
Modified:
branches/Version-2_0-branch/eventplanner/inc/class.uicustomer_report.inc.php
===================================================================
---
branches/Version-2_0-branch/eventplanner/inc/class.uicustomer_report.inc.php
2017-07-04 08:00:24 UTC (rev 16900)
+++
branches/Version-2_0-branch/eventplanner/inc/class.uicustomer_report.inc.php
2017-07-04 08:02:39 UTC (rev 16901)
@@ -35,6 +35,7 @@
{
public $public_functions = array(
+ 'columns' => true,
'add' => true,
'index' => true,
'query' => true,
@@ -60,6 +61,8 @@
$this->custom_fields =
eventplanner_customer_report::get_instance()->get_custom_fields();
$this->currentapp =
$GLOBALS['phpgw_info']['flags']['currentapp'];
self::set_active_menu("{$this->currentapp}::customer_report");
+ $this->account =
$GLOBALS['phpgw_info']['user']['account_id'];
+ $this->acl_location =
eventplanner_customer_report::acl_location;
}
@@ -79,6 +82,76 @@
return $combos;
}
+
+ function columns()
+ {
+ $GLOBALS['phpgw_info']['flags']['xslt_app'] = true;
+ $GLOBALS['phpgw']->xslttpl->add_file(array('columns'),
PHPGW_SERVER_ROOT."/property/templates/base");
+
+ $GLOBALS['phpgw_info']['flags']['noframework'] = true;
+ $GLOBALS['phpgw_info']['flags']['nofooter'] = true;
+
+ $values = phpgw::get_var('values');
+ $receipt = array();
+
+ if (isset($values['save']) && $values['save'])
+ {
+ $GLOBALS['phpgw']->preferences->account_id =
$this->account;
+ $GLOBALS['phpgw']->preferences->read();
+
$GLOBALS['phpgw']->preferences->add('eventplanner', 'customer_report_columns',
(array)$values['columns'], 'user');
+
$GLOBALS['phpgw']->preferences->save_repository();
+
+ $receipt['message'][] = array('msg' =>
lang('columns is updated'));
+ }
+
+ $function_msg = lang('Select Column');
+
+ $link_data = array
+ (
+ 'menuaction' =>
"{$this->currentapp}.uicustomer_report.columns",
+ );
+
+ $msgbox_data = $this->bo->msgbox_data($receipt);
+// self::message_set($receipt);
+
+ $data = array
+ (
+ 'msgbox_data' =>
$GLOBALS['phpgw']->common->msgbox($msgbox_data),
+ 'column_list' =>
$this->bo->column_list($values['columns'], $allrows = true),
+ 'function_msg' => $function_msg,
+ 'form_action' =>
$GLOBALS['phpgw']->link('/index.php', $link_data),
+ 'lang_columns' => lang('columns'),
+ 'lang_none' => lang('None'),
+ 'lang_save' => lang('save'),
+ );
+
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
$function_msg;
+ $GLOBALS['phpgw']->xslttpl->set_var('phpgw',
array('columns' => $data));
+ }
+
+
+ function _get_fields()
+ {
+ $fields = parent::_get_fields();
+ $custom_fields =
(array)createObject('phpgwapi.custom_fields')->find('eventplanner',
$this->acl_location, 0, '', '', '', true, false);
+ $selected =
(array)$GLOBALS['phpgw_info']['user']['preferences']['eventplanner']['customer_report_columns'];
+
+ foreach ($custom_fields as $custom_field)
+ {
+ if( in_array( $custom_field['id'], $selected)
|| $custom_field['list'])
+ {
+ $fields[] = array(
+ 'key' => $custom_field['name'],
+ 'label' =>
$custom_field['input_text'],
+ 'sortable' => true,
+ 'hidden' => false,
+ );
+ }
+ }
+
+ return $fields;
+
+ }
public function index()
{
if (empty($this->permissions[PHPGW_ACL_READ]))
@@ -109,9 +182,9 @@
'phpgw_return_as' => 'json'
)),
'allrows' => true,
- // 'new_item' =>
self::link(array('menuaction' => 'eventplanner.uicustomer_report.add')),
+ "columns" => array('onclick' =>
"JqueryPortico.openPopup({menuaction:'{$this->currentapp}.uicustomer_report.columns'},
{closeAction:'reload'})"),
'editor_action' => '',
- 'field' => parent::_get_fields()
+ 'field' => self::_get_fields()
)
);
Modified:
branches/Version-2_0-branch/eventplanner/inc/class.uivendor_report.inc.php
===================================================================
--- branches/Version-2_0-branch/eventplanner/inc/class.uivendor_report.inc.php
2017-07-04 08:00:24 UTC (rev 16900)
+++ branches/Version-2_0-branch/eventplanner/inc/class.uivendor_report.inc.php
2017-07-04 08:02:39 UTC (rev 16901)
@@ -35,6 +35,7 @@
{
public $public_functions = array(
+ 'columns' => true,
'add' => true,
'index' => true,
'query' => true,
@@ -60,6 +61,8 @@
$this->custom_fields =
eventplanner_vendor_report::get_instance()->get_custom_fields();
$this->currentapp =
$GLOBALS['phpgw_info']['flags']['currentapp'];
self::set_active_menu("{$this->currentapp}::vendor_report");
+ $this->account =
$GLOBALS['phpgw_info']['user']['account_id'];
+ $this->acl_location =
eventplanner_vendor_report::acl_location;
}
@@ -79,6 +82,77 @@
return $combos;
}
+
+ function columns()
+ {
+ $GLOBALS['phpgw_info']['flags']['xslt_app'] = true;
+ $GLOBALS['phpgw']->xslttpl->add_file(array('columns'),
PHPGW_SERVER_ROOT."/property/templates/base");
+
+ $GLOBALS['phpgw_info']['flags']['noframework'] = true;
+ $GLOBALS['phpgw_info']['flags']['nofooter'] = true;
+
+ $values = phpgw::get_var('values');
+ $receipt = array();
+
+ if (isset($values['save']) && $values['save'])
+ {
+ $GLOBALS['phpgw']->preferences->account_id =
$this->account;
+ $GLOBALS['phpgw']->preferences->read();
+
$GLOBALS['phpgw']->preferences->add('eventplanner', 'vendor_report_columns',
(array)$values['columns'], 'user');
+
$GLOBALS['phpgw']->preferences->save_repository();
+
+ $receipt['message'][] = array('msg' =>
lang('columns is updated'));
+ }
+
+ $function_msg = lang('Select Column');
+
+ $link_data = array
+ (
+ 'menuaction' =>
"{$this->currentapp}.uivendor_report.columns",
+ );
+
+ $msgbox_data = $this->bo->msgbox_data($receipt);
+// self::message_set($receipt);
+
+ $data = array
+ (
+ 'msgbox_data' =>
$GLOBALS['phpgw']->common->msgbox($msgbox_data),
+ 'column_list' =>
$this->bo->column_list($values['columns'], $allrows = true),
+ 'function_msg' => $function_msg,
+ 'form_action' =>
$GLOBALS['phpgw']->link('/index.php', $link_data),
+ 'lang_columns' => lang('columns'),
+ 'lang_none' => lang('None'),
+ 'lang_save' => lang('save'),
+ );
+
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
$function_msg;
+ $GLOBALS['phpgw']->xslttpl->set_var('phpgw',
array('columns' => $data));
+ }
+
+
+ function _get_fields()
+ {
+ $fields = parent::_get_fields();
+ $custom_fields =
(array)createObject('phpgwapi.custom_fields')->find('eventplanner',
$this->acl_location, 0, '', '', '', true, false, $filter);
+ $selected =
(array)$GLOBALS['phpgw_info']['user']['preferences']['eventplanner']['vendor_report_columns'];
+
+ foreach ($custom_fields as $custom_field)
+ {
+ if( in_array( $custom_field['id'], $selected)
|| $custom_field['list'])
+ {
+ $fields[] = array(
+ 'key' => $custom_field['name'],
+ 'label' =>
$custom_field['input_text'],
+ 'sortable' => true,
+ 'hidden' => false,
+ );
+ }
+ }
+
+ return $fields;
+
+ }
+
public function index()
{
if (empty($this->permissions[PHPGW_ACL_READ]))
@@ -109,9 +183,9 @@
'phpgw_return_as' => 'json'
)),
'allrows' => true,
- // 'new_item' =>
self::link(array('menuaction' => 'eventplanner.uivendor_report.add')),
+ "columns" => array('onclick' =>
"JqueryPortico.openPopup({menuaction:'{$this->currentapp}.uivendor_report.columns'},
{closeAction:'reload'})"),
'editor_action' => '',
- 'field' => parent::_get_fields()
+ 'field' => self::_get_fields()
)
);
Modified:
branches/Version-2_0-branch/eventplanner/inc/model/class.booking.inc.php
===================================================================
--- branches/Version-2_0-branch/eventplanner/inc/model/class.booking.inc.php
2017-07-04 08:00:24 UTC (rev 16900)
+++ branches/Version-2_0-branch/eventplanner/inc/model/class.booking.inc.php
2017-07-04 08:02:39 UTC (rev 16901)
@@ -129,7 +129,7 @@
'key' => 'id',
'column' => 'to_'
)
- ),
+ ),/*
'active' => array('action' => PHPGW_ACL_READ,
'type' => 'string',
'query' => false,
@@ -141,7 +141,7 @@
'key' => 'id',
'column' => 'active'
)
- ),
+ ),*/
'completed' => array('action' => PHPGW_ACL_EDIT,
'type' => 'int',
'history' => true
Modified: branches/Version-2_0-branch/eventplanner/setup/phpgw_no.lang
===================================================================
--- branches/Version-2_0-branch/eventplanner/setup/phpgw_no.lang
2017-07-04 08:00:24 UTC (rev 16900)
+++ branches/Version-2_0-branch/eventplanner/setup/phpgw_no.lang
2017-07-04 08:02:39 UTC (rev 16901)
@@ -71,7 +71,7 @@
wardrobe eventplanner no Kryss av for behov for utøvergarderobe
audience limit eventplanner no Maksimum antall publikum
raider eventplanner no Andre raiderønsker – (valgfri)
-vendor report eventplanner no Utøverrapport
+vendor report eventplanner no Tilbakemelding fra utøver
calendar eventplanner no Kalender
from eventplanner no Fra
event start eventplanner no Ønsket arrangement dato/tid
@@ -79,12 +79,12 @@
select all eventplanner no Velg alle
enable eventplanner no Aktiver
disable eventplanner no Deaktiver
-reports eventplanner no Rapporter
+reports eventplanner no Tilbakemeldinger
location eventplanner no Lokalisering
who eventplanner no Hvem
note eventplanner no Merknad
customer eventplanner no Mottakersted
-customer report eventplanner no Rapport fra mottakersted
+customer report eventplanner no Tilbakemelding fra mottakersted
organization number eventplanner no Organisasjonsnummer
program type eventplanner no Programtype
program title eventplanner no Programtittel
@@ -100,7 +100,7 @@
did not validate eventplanner no Feil med datasettet
date is outside the scope eventplanner no Dato ligger utenfor
tillat tidsrom
can not delete booking with customer eventplanner no Kan ikke slette
booking som er koplet med mottakersted
-report eventplanner no Rapport
+report eventplanner no Tilbakemelding
events eventplanner no Arrangementer
event eventplanner no Arrangement
please enter a valid organization number eventplanner no Angi et
gyldig organisasjonsnummer
@@ -132,4 +132,5 @@
where eventplanner no Hvor
vendor receipt text eventplanner no utøvernotat ved kvittering
customer receipt text eventplanner no Mottakerstednotat ved kvittering
-receipt subject eventplanner no Kvitteringsoverskrift
\ No newline at end of file
+receipt subject eventplanner no Kvitteringsoverskrift
+datetime event eventplanner no Dato/tid for arrangement
\ No newline at end of file
Modified: branches/Version-2_0-branch/eventplanner/templates/base/booking.xsl
===================================================================
--- branches/Version-2_0-branch/eventplanner/templates/base/booking.xsl
2017-07-04 08:00:24 UTC (rev 16900)
+++ branches/Version-2_0-branch/eventplanner/templates/base/booking.xsl
2017-07-04 08:02:39 UTC (rev 16901)
@@ -199,7 +199,7 @@
<xsl:value-of select="$lang_customer"/>
</xsl:attribute>
</input>
- <input type="text"
id="customer_name" name="customer_name" value="{booking/customer_name}">
+ <input type="text"
id="customer_name" name="customer_name" value="{booking/customer_name}"
class="pure-input-1-2">
<xsl:attribute
name="placeholder">
<xsl:value-of select="$lang_customer"/>
</xsl:attribute>
@@ -218,7 +218,7 @@
<label>
<xsl:value-of
select="php:function('lang', 'contact name')"/>
</label>
- <input type="text"
id="customer_contact_name" name="customer_contact_name"
value="{booking/customer_contact_name}">
+ <input type="text"
id="customer_contact_name" name="customer_contact_name"
value="{booking/customer_contact_name}" class="pure-input-1-2">
<xsl:attribute
name="data-validation">
<xsl:text>required</xsl:text>
</xsl:attribute>
@@ -231,7 +231,7 @@
<label>
<xsl:value-of
select="php:function('lang', 'email')"/>
</label>
- <input type="text"
id="customer_contact_email" name="customer_contact_email"
value="{booking/customer_contact_email}">
+ <input type="text"
id="customer_contact_email" name="customer_contact_email"
value="{booking/customer_contact_email}" class="pure-input-1-2">
<xsl:attribute
name="data-validation">
<xsl:text>email</xsl:text>
</xsl:attribute>
@@ -252,7 +252,7 @@
<label>
<xsl:value-of
select="php:function('lang', 'contact phone')"/>
</label>
- <input type="text"
id="customer_contact_phone" name="customer_contact_phone"
value="{booking/customer_contact_phone}">
+ <input type="text"
id="customer_contact_phone" name="customer_contact_phone"
value="{booking/customer_contact_phone}" class="pure-input-1-2">
<xsl:attribute
name="data-validation">
<xsl:text>required</xsl:text>
</xsl:attribute>
@@ -268,7 +268,7 @@
<legend>
<xsl:value-of
select="php:function('lang', 'booking')"/>
</legend>
-
+<!--
<div class="pure-control-group">
<label>
<xsl:value-of
select="php:function('lang', 'active')"/>
@@ -289,7 +289,7 @@
</xsl:if>
</input>
</div>
-
+-->
<div class="pure-control-group">
<xsl:variable
name="lang_from">
<xsl:value-of
select="php:function('lang', 'from')"/>
@@ -327,9 +327,9 @@
<div class="pure-control-group">
<label>
- <xsl:value-of
select="php:function('lang', 'location')"/>
+ <xsl:value-of
select="php:function('lang', 'address')"/>
</label>
- <textarea cols="47"
rows="7" id="location" name="location">
+ <textarea cols="47"
rows="7" id="location" name="location" class="pure-input-1-2">
<xsl:attribute
name="data-validation">
<xsl:text>required</xsl:text>
</xsl:attribute>
@@ -348,7 +348,7 @@
<label>
<xsl:value-of
select="php:function('lang', 'comment')"/>
</label>
- <textarea cols="47"
rows="7" name="comment">
+ <textarea cols="47"
rows="7" name="comment" class="pure-input-1-2">
<xsl:value-of
select="booking/comment"/>
</textarea>
</div>
Modified: branches/Version-2_0-branch/eventplanner/templates/base/config.tpl
===================================================================
--- branches/Version-2_0-branch/eventplanner/templates/base/config.tpl
2017-07-04 08:00:24 UTC (rev 16900)
+++ branches/Version-2_0-branch/eventplanner/templates/base/config.tpl
2017-07-04 08:02:39 UTC (rev 16901)
@@ -44,6 +44,24 @@
<textarea
name="newsettings[customer_receipt_text]">{value_customer_receipt_text}</textarea>
</td>
</tr>
+ <tr>
+ <td>{lang_canceled_subject}:</td>
+ <td>
+ <input type="text"
name="newsettings[canceled_subject]" value="{value_canceled_subject}">
+ </td>
+ </tr>
+ <tr>
+ <td>{lang_vendor_canceled_text}:</td>
+ <td>
+ <textarea
name="newsettings[vendor_canceled_text]">{value_vendor_canceled_text}</textarea>
+ </td>
+ </tr>
+ <tr>
+ <td>{lang_customer_canceled_text}:</td>
+ <td>
+ <textarea
name="newsettings[customer_canceled_text]">{value_customer_canceled_text}</textarea>
+ </td>
+ </tr>
<!-- END body -->
<!-- BEGIN footer -->
Modified: branches/Version-2_0-branch/eventplanner/templates/base/report.xsl
===================================================================
--- branches/Version-2_0-branch/eventplanner/templates/base/report.xsl
2017-07-04 08:00:24 UTC (rev 16900)
+++ branches/Version-2_0-branch/eventplanner/templates/base/report.xsl
2017-07-04 08:02:39 UTC (rev 16901)
@@ -60,7 +60,7 @@
</xsl:call-template>
<div class="pure-control-group">
<xsl:variable name="lang_from">
- <xsl:value-of
select="php:function('lang', 'from')"/>
+ <xsl:value-of
select="php:function('lang', 'datetime event')"/>
</xsl:variable>
<label>
<xsl:value-of
select="$lang_from"/>
@@ -68,12 +68,12 @@
<xsl:value-of
select="php:function('show_date', number(booking/from_), $date_format)"/>
</div>
- <div class="pure-control-group">
+ <!--div class="pure-control-group">
<label>
<xsl:value-of
select="php:function('lang', 'to')"/>
</label>
<xsl:value-of
select="php:function('show_date', number(booking/to_), $date_format)"/>
- </div>
+ </div-->
<div class="pure-control-group">
<label>
<xsl:value-of
select="php:function('lang', 'customer')"/>
Modified:
branches/Version-2_0-branch/eventplannerfrontend/js/portico/application.edit.js
===================================================================
---
branches/Version-2_0-branch/eventplannerfrontend/js/portico/application.edit.js
2017-07-04 08:00:24 UTC (rev 16900)
+++
branches/Version-2_0-branch/eventplannerfrontend/js/portico/application.edit.js
2017-07-04 08:02:39 UTC (rev 16901)
@@ -66,7 +66,6 @@
return;
}
var id = $("#application_id").val();
- document.getElementById('summary').value =
CKEDITOR.instances['summary'].getData();
if (id > 0)
{
Modified:
branches/Version-2_0-branch/eventplannerfrontend/templates/base/application.xsl
===================================================================
---
branches/Version-2_0-branch/eventplannerfrontend/templates/base/application.xsl
2017-07-04 08:00:24 UTC (rev 16900)
+++
branches/Version-2_0-branch/eventplannerfrontend/templates/base/application.xsl
2017-07-04 08:02:39 UTC (rev 16901)
@@ -376,14 +376,6 @@
<div
class="pure-control-group">
<label>
-
<xsl:value-of select="php:function('lang', 'summary')"/>
- </label>
- <textarea
cols="47" rows="7" id="summary" name="summary" class="pure-input-1-2" >
-
<xsl:value-of disable-output-escaping="yes" select="application/summary"/>
- </textarea>
- </div>
- <div
class="pure-control-group">
- <label>
<xsl:value-of select="php:function('lang', 'remark')"/>
</label>
<textarea
cols="47" rows="7" name="remark" class="pure-input-1-2" >
Modified:
branches/Version-2_0-branch/eventplannerfrontend/templates/base/booking.xsl
===================================================================
--- branches/Version-2_0-branch/eventplannerfrontend/templates/base/booking.xsl
2017-07-04 08:00:24 UTC (rev 16900)
+++ branches/Version-2_0-branch/eventplannerfrontend/templates/base/booking.xsl
2017-07-04 08:02:39 UTC (rev 16901)
@@ -199,7 +199,7 @@
<xsl:value-of select="$lang_customer"/>
</xsl:attribute>
</input>
- <input type="text"
id="customer_name" name="customer_name" value="{booking/customer_name}">
+ <input type="text"
id="customer_name" name="customer_name" value="{booking/customer_name}"
class="pure-input-1-2">
<xsl:attribute
name="placeholder">
<xsl:value-of select="$lang_customer"/>
</xsl:attribute>
@@ -218,7 +218,7 @@
<label>
<xsl:value-of
select="php:function('lang', 'contact name')"/>
</label>
- <input type="text"
id="customer_contact_name" name="customer_contact_name"
value="{booking/customer_contact_name}">
+ <input type="text"
id="customer_contact_name" name="customer_contact_name"
value="{booking/customer_contact_name}" class="pure-input-1-2">
<xsl:attribute
name="data-validation">
<xsl:text>required</xsl:text>
</xsl:attribute>
@@ -231,7 +231,7 @@
<label>
<xsl:value-of
select="php:function('lang', 'email')"/>
</label>
- <input type="text"
id="customer_contact_email" name="customer_contact_email"
value="{booking/customer_contact_email}">
+ <input type="text"
id="customer_contact_email" name="customer_contact_email"
value="{booking/customer_contact_email}" class="pure-input-1-2">
<xsl:attribute
name="data-validation">
<xsl:text>email</xsl:text>
</xsl:attribute>
@@ -239,20 +239,12 @@
<xsl:value-of select="php:function('lang', 'email')"/>
</xsl:attribute>
</input>
- <xsl:choose>
- <xsl:when
test="valid_email = 1">
-
<xsl:text> </xsl:text>
- <a
href="{link_create_user}">
-
<xsl:value-of select="php:function('lang', 'create_user_based_on_email_link')"/>
- </a>
- </xsl:when>
- </xsl:choose>
</div>
<div class="pure-control-group">
<label>
<xsl:value-of
select="php:function('lang', 'contact phone')"/>
</label>
- <input type="text"
id="customer_contact_phone" name="customer_contact_phone"
value="{booking/customer_contact_phone}">
+ <input type="text"
id="customer_contact_phone" name="customer_contact_phone"
value="{booking/customer_contact_phone}" class="pure-input-1-2">
<xsl:attribute
name="data-validation">
<xsl:text>required</xsl:text>
</xsl:attribute>
@@ -270,27 +262,6 @@
</legend>
<div class="pure-control-group">
- <label>
- <xsl:value-of
select="php:function('lang', 'active')"/>
- </label>
- <input type="checkbox"
name="active" id="active" value="1" readonly="readonly">
- <xsl:if
test="calendar/active = 1">
-
<xsl:attribute name="checked" value="checked"/>
- </xsl:if>
- </input>
- </div>
- <div class="pure-control-group">
- <label>
- <xsl:value-of
select="php:function('lang', 'completed')"/>
- </label>
- <input type="checkbox"
name="completed" id="completed" value="1">
- <xsl:if
test="calendar/completed = 1">
-
<xsl:attribute name="checked" value="checked"/>
- </xsl:if>
- </input>
- </div>
-
- <div class="pure-control-group">
<xsl:variable
name="lang_from">
<xsl:value-of
select="php:function('lang', 'from')"/>
</xsl:variable>
@@ -297,19 +268,7 @@
<label>
<xsl:value-of
select="$lang_from"/>
</label>
- <input type="text"
id="from_" name="from_" size="16" readonly="readonly">
- <xsl:if
test="calendar/from_ != 0 and calendar/from_ != ''">
-
<xsl:attribute name="value">
-
<xsl:value-of select="php:function('show_date', number(calendar/from_),
$date_format)"/>
-
</xsl:attribute>
- </xsl:if>
- <xsl:attribute
name="data-validation">
-
<xsl:text>required</xsl:text>
- </xsl:attribute>
- <xsl:attribute
name="data-validation-error-msg">
-
<xsl:value-of select="$lang_from"/>
- </xsl:attribute>
- </input>
+ <xsl:value-of
select="php:function('show_date', number(calendar/from_), $date_format)"/>
</div>
<div class="pure-control-group">
<label>
@@ -317,19 +276,12 @@
</label>
<xsl:value-of
select="application/timespan"/>
</div>
-
- <div class="pure-control-group">
- <label>
- <xsl:value-of
select="php:function('lang', 'to')"/>
- </label>
- <xsl:value-of
select="php:function('show_date', number(calendar/to_), $date_format)"/>
- </div>
<div class="pure-control-group">
<label>
- <xsl:value-of
select="php:function('lang', 'location')"/>
+ <xsl:value-of
select="php:function('lang', 'address')"/>
</label>
- <textarea cols="47"
rows="7" id="location" name="location">
+ <textarea cols="47"
rows="7" id="location" name="location" class="pure-input-1-2">
<xsl:attribute
name="data-validation">
<xsl:text>required</xsl:text>
</xsl:attribute>
@@ -336,40 +288,6 @@
<xsl:value-of
select="booking/location"/>
</textarea>
</div>
- <!--div
class="pure-control-group">
- <label>
- <xsl:value-of
select="php:function('lang', 'remark')"/>
- </label>
- <textarea cols="47"
rows="7" name="remark">
- <xsl:value-of
select="booking/remark"/>
- </textarea>
- </div>
- <div class="pure-control-group">
- <label>
- <xsl:value-of
select="php:function('lang', 'comment')"/>
- </label>
- <textarea cols="47"
rows="7" name="comment">
- <xsl:value-of
select="booking/comment"/>
- </textarea>
- </div>
- <div class="pure-control-group">
- <label>
- <xsl:value-of
select="php:function('lang', 'history')"/>
- </label>
- <div
class="pure-custom">
- <xsl:for-each
select="datatable_def">
- <xsl:if
test="container = 'datatable-container_0'">
-
<xsl:call-template name="table_setup">
-
<xsl:with-param name="container" select ='container'/>
-
<xsl:with-param name="requestUrl" select ='requestUrl'/>
-
<xsl:with-param name="ColumnDefs" select ='ColumnDefs'/>
-
<xsl:with-param name="data" select ='data'/>
-
<xsl:with-param name="config" select ='config'/>
-
</xsl:call-template>
-
</xsl:if>
- </xsl:for-each>
- </div>
- </div-->
</fieldset>
</div>
<div id="reports">
Modified:
branches/Version-2_0-branch/eventplannerfrontend/templates/base/report.xsl
===================================================================
--- branches/Version-2_0-branch/eventplannerfrontend/templates/base/report.xsl
2017-07-04 08:00:24 UTC (rev 16900)
+++ branches/Version-2_0-branch/eventplannerfrontend/templates/base/report.xsl
2017-07-04 08:02:39 UTC (rev 16901)
@@ -60,7 +60,7 @@
</xsl:call-template>
<div class="pure-control-group">
<xsl:variable name="lang_from">
- <xsl:value-of
select="php:function('lang', 'from')"/>
+ <xsl:value-of
select="php:function('lang', 'datetime event')"/>
</xsl:variable>
<label>
<xsl:value-of
select="$lang_from"/>
@@ -68,12 +68,12 @@
<xsl:value-of
select="php:function('show_date', number(booking/from_), $date_format)"/>
</div>
- <div class="pure-control-group">
+ <!--div class="pure-control-group">
<label>
<xsl:value-of
select="php:function('lang', 'to')"/>
</label>
<xsl:value-of
select="php:function('show_date', number(booking/to_), $date_format)"/>
- </div>
+ </div-->
<div class="pure-control-group">
<label>
<xsl:value-of
select="php:function('lang', 'customer')"/>
Modified: branches/Version-2_0-branch/helpdesk/setup/phpgw_no.lang
===================================================================
--- branches/Version-2_0-branch/helpdesk/setup/phpgw_no.lang 2017-07-04
08:00:24 UTC (rev 16900)
+++ branches/Version-2_0-branch/helpdesk/setup/phpgw_no.lang 2017-07-04
08:02:39 UTC (rev 16901)
@@ -55,7 +55,7 @@
id helpdesk no Id
no part of town helpdesk no Ingen bydel
no data helpdesk no Ingen data
-no data available in table helpdesk no Ingen data I tabellen
+no data available in table helpdesk no Ingen data i tabellen
no group helpdesk no Ingen gruppe
no category helpdesk no Ingen kategori
no matching records found helpdesk no Ingen treff
Modified: branches/Version-2_0-branch/phpgwapi/inc/class.bocommon.inc.php
===================================================================
--- branches/Version-2_0-branch/phpgwapi/inc/class.bocommon.inc.php
2017-07-04 08:00:24 UTC (rev 16900)
+++ branches/Version-2_0-branch/phpgwapi/inc/class.bocommon.inc.php
2017-07-04 08:02:39 UTC (rev 16901)
@@ -180,4 +180,42 @@
}
}
}
+
+ function select_multi_list( $selected = array(), $list )
+ {
+ if (isset($list) && is_array($list) && isset($selected)
&& is_array($selected))
+ {
+ foreach ($list as & $entry)
+ {
+ $entry['selected'] = in_array(
$entry['id'], $selected) ? 1 : 0;
+ }
+ }
+ return $list;
+ }
+
+ function msgbox_data( $receipt )
+ {
+ $msgbox_data_error = array();
+ $msgbox_data_message = array();
+ if (isset($receipt['error']) &&
is_array($receipt['error']))
+ {
+ foreach ($receipt['error'] as $dummy => $error)
+ {
+ $msgbox_data_error[$error['msg']] =
false;
+ }
+ }
+
+ if (isset($receipt['message']) &&
is_array($receipt['message']))
+ {
+ foreach ($receipt['message'] as $dummy =>
$message)
+ {
+ $msgbox_data_message[$message['msg']] =
true;
+ }
+ }
+
+ $msgbox_data = array_merge($msgbox_data_error,
$msgbox_data_message);
+
+ return $msgbox_data;
+ }
+
}
\ No newline at end of file
Modified: branches/Version-2_0-branch/phpgwapi/inc/class.translation.inc.php
===================================================================
--- branches/Version-2_0-branch/phpgwapi/inc/class.translation.inc.php
2017-07-04 08:00:24 UTC (rev 16900)
+++ branches/Version-2_0-branch/phpgwapi/inc/class.translation.inc.php
2017-07-04 08:02:39 UTC (rev 16901)
@@ -242,19 +242,19 @@
$ret = "!{$key}"; // save key if we dont
find a translation
//don't look for it again
$this->lang[$app_name][$key] = $ret;
- }
- if ($this->collect_missing)
- {
- $lookup_key =
$GLOBALS['phpgw']->db->db_addslashes($lookup_key);
- $sql = "SELECT message_id FROM phpgw_lang WHERE
lang = '{$userlang}' AND message_id = '{$lookup_key}'"
- . " AND app_name = '##{$app_name}##'";
-
-
$GLOBALS['phpgw']->db->query($sql,__LINE__,__FILE__);
+ if ($this->collect_missing)
+ {
+ $lookup_key =
$GLOBALS['phpgw']->db->db_addslashes($lookup_key);
+ $sql = "SELECT message_id FROM
phpgw_lang WHERE lang = '{$userlang}' AND message_id = '{$lookup_key}'"
+ . " AND app_name =
'##{$app_name}##'";
- if( !$GLOBALS['phpgw']->db->next_record() )
- {
- $GLOBALS['phpgw']->db->query("INSERT
INTO phpgw_lang (message_id,app_name,lang,content)
VALUES('{$lookup_key}','##{$app_name}##','$userlang','missing')",__LINE__,__FILE__);
+
$GLOBALS['phpgw']->db->query($sql,__LINE__,__FILE__);
+
+ if(
!$GLOBALS['phpgw']->db->next_record() )
+ {
+
$GLOBALS['phpgw']->db->query("INSERT INTO phpgw_lang
(message_id,app_name,lang,content)
VALUES('{$lookup_key}','##{$app_name}##','$userlang','missing')",__LINE__,__FILE__);
+ }
}
}
Modified: branches/Version-2_0-branch/phpgwapi/setup/phpgw_no.lang
===================================================================
--- branches/Version-2_0-branch/phpgwapi/setup/phpgw_no.lang 2017-07-04
08:00:24 UTC (rev 16900)
+++ branches/Version-2_0-branch/phpgwapi/setup/phpgw_no.lang 2017-07-04
08:02:39 UTC (rev 16901)
@@ -152,7 +152,7 @@
use cookies login no use cookies
username common no Brukernavn
new user login no Ny bruker
-forgotten password login no Glemt passord eller Brukernavn
+forgotten password login no Glemt passord eller brukernavn
use a valid username and password to gain access to %1 login no Angi et
gyldig brukernavn og passord for få tilgang til %1
version common no versjon
you have been successfully logged out login no Du har nå logget ut
Modified:
branches/Version-2_0-branch/phpgwapi/templates/base/attributes_form.xsl
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/base/attributes_form.xsl
2017-07-04 08:00:24 UTC (rev 16900)
+++ branches/Version-2_0-branch/phpgwapi/templates/base/attributes_form.xsl
2017-07-04 08:02:39 UTC (rev 16901)
@@ -773,14 +773,18 @@
</xsl:variable>
<div class="pure-custom">
<xsl:for-each select="choice">
- <xsl:choose>
- <xsl:when test="selected='1'">
- <input id="id_{$name}_{id}"
type="{$input_type}" name="values_attribute[{$attrib_id}][value][]"
value="{id}" checked="checked"/>
- </xsl:when>
- <xsl:otherwise>
- <input id="id_{$name}_{id}"
type="{$input_type}" name="values_attribute[{$attrib_id}][value][]"
value="{id}"/>
- </xsl:otherwise>
- </xsl:choose>
+ <input id="id_{$name}_{id}"
type="{$input_type}" name="values_attribute[{$attrib_id}][value][]"
value="{id}">
+ <xsl:if test="selected='1'">
+ <xsl:attribute name="checked">
+
<xsl:text>checked</xsl:text>
+ </xsl:attribute>
+ </xsl:if>
+ <xsl:if test="//nullable!='1' and
$input_type = 'radio'">
+ <xsl:attribute name="required">
+
<xsl:text>required</xsl:text>
+ </xsl:attribute>
+ </xsl:if>
+ </input>
<xsl:value-of select="value"/>
<br></br>
</xsl:for-each>
Modified: branches/Version-2_0-branch/property/inc/class.soentity.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.soentity.inc.php
2017-07-04 08:00:24 UTC (rev 16900)
+++ branches/Version-2_0-branch/property/inc/class.soentity.inc.php
2017-07-04 08:02:39 UTC (rev 16901)
@@ -2144,7 +2144,6 @@
{
foreach ($values['attributes'] as
&$attr)
{
-// $attr['value'] =
$xml->getElementsByTagName($attr['column_name'])->item(0)->nodeValue;
$attr['value'] =
$this->db->stripslashes($jsondata[$attr['column_name']]);
}
}
Modified: branches/Version-2_0-branch/property/setup/phpgw_no.lang
===================================================================
--- branches/Version-2_0-branch/property/setup/phpgw_no.lang 2017-07-04
08:00:24 UTC (rev 16900)
+++ branches/Version-2_0-branch/property/setup/phpgw_no.lang 2017-07-04
08:02:39 UTC (rev 16901)
@@ -25,16 +25,16 @@
accounting voucher type property no Regnskap type faktura
accumulated property no Akkumulert
acl_location is missing property no ACL-lokalisering mangler
-acquisition date property no Anskaffelses dato
+acquisition date property no Anskaffelsesdato
action property no Handling
activate tracking of dates in helpdesk main list property no
Aktiver visning av datoer for denne entiteten i hovedliste for helpdesk
active property no Aktiv
activities property no Aktiviteter
activity property no Aktivitet
-activity code property no Aktivitets kode
+activity code property no Aktivitetskode
activity has been edited property no Aktivitet er rettet
activity has been saved property no Aktivitet er lagret
-activity id property no Aktivitet ID
+activity id property no Aktivitet-id
activity num property no Aktivitet num
actor property no Aktør
actual cost property no Betalt
@@ -46,7 +46,7 @@
add a attrib property no Legg til en attibutt
add a budget account property no Legg til en kostnadsart
add a budget query property no Legg til en budsjettspørring
-add a building property no legg til bygning
+add a building property no Legg til bygning
add a category property no Legg til en kategori
add a claim property no Legg til et krav
add activity property no Legg til aktivitet
@@ -53,22 +53,22 @@
add a custom_function property no Legg til en egendefinert
funksjon
add a custom query property no Legg til en egendefinert
spørring
add a deviation property no Legg til et avvik
-add a document property no legg til dokument
+add a document property no Legg til dokument
add a entity property no Legg til en entitet
-add a entrance property no legg til inngang
-add a equipment property no legg til utstyr
-add a gab property no Legg til GrunnEiendom
-add agreement property no legg til avtale
+add a entrance property no Legg til inngang
+add a equipment property no Legg til utstyr
+add a gab property no Legg til grunneiendom
+add agreement property no Legg til avtale
add agreement group property no Legg til en avtalegruppe
-add a hour property no legg til post
+add a hour property no Legg til post
add a hour to this template property no lett til en post til
denne malen
-add a investment property no legg til investering
+add a investment property no Legg til investering
add alarm property no Legg til alarm
add alarm for selected user property no Legg til alarm for
valgt bruker
add a location property no Legg til en lokalisering
-add a meter property no legg til måler
+add a meter property no Legg til måler
add a method property no Legg til en metode
-add an activity property no legg til aktivitet
+add an activity property no Legg til aktivitet
add an actor property no Legg til en aktør
add an agreement property no Legg til en avtale
add an alarm property no Legg til en alarm
@@ -77,71 +77,71 @@
add an invoice property no Legg til en faktura
add an item to the details property no Legg til en post til
detaljer
add another property no Legg til flere
-add apartment property no legg til leilighet
+add apartment property no Legg til leilighet
add a part of town property no Legg til en bydel
add a project property no leg til prosjekt
-add a property property no legg til eiendom
+add a property property no Legg til eiendom
add a rental agreement property no Legg til en utleieavtale
-add a request property no legg til behov
+add a request property no Legg til behov
add a service agreement property no Legg til en service
avtale
-add a standard property no legg til standard
-add a template property no legg til mal
-add a ticket property no legg til melding
-add attribute property no legg til attribute
-add a workorder property no legg til bestilling
-add a workorder to this project property no legg til en
bestilling til dette prosjektet
+add a standard property no Legg til standard
+add a template property no Legg til mal
+add a ticket property no Legg til melding
+add attribute property no Legg til attribute
+add a workorder property no Legg til bestilling
+add a workorder to this project property no Legg til en
bestilling til dette prosjektet
add budget account property no Legg til kostnadsart
-add building property no legg til bygning
+add building property no Legg til bygning
add category property no Legg til kategori
add common property no Legg til felles
-add custom property no legg til tilpasset
+add custom property no Legg til tilpasset
add custom function property no Legg til egendefinert funksjon
add detail property no Legg til detalj
add deviation property no Legg til avvik
-add document property no legg til dokument
+add document property no Legg til dokument
added property no Lagt til
add entity property no Legg til entitet
-add entrance property no legg til inngang
-add equipment property no legg til utstyr
-add first value for this prizing property no legg til første
verdi for denne prisingen
-add from prizebook property no legg til fra prisbok
-add from template property no legg til fra mal
-add gab property no Legg til GrunnEiendom
-add hour property no legg til post
-add investment property no legg til investering
+add entrance property no Legg til inngang
+add equipment property no Legg til utstyr
+add first value for this prizing property no Legg til første
verdi for denne prisingen
+add from prizebook property no Legg til fra prisbok
+add from template property no Legg til fra mal
+add gab property no Legg til grunneiendom
+add hour property no Legg til post
+add investment property no Legg til investering
add invoice property no Legg til faktura
-add items from a predefined template property no legg til poster
fra mal
-add items from this vendors prizebook property no legg til poster
fra leverandørs prisbok
+add items from a predefined template property no Legg til poster
fra mal
+add items from this vendors prizebook property no Legg til poster
fra leverandørs prisbok
additional notes property no Tilleggs kommentarer
-add meter property no legg til måler
+add meter property no Legg til måler
add method property no Legg til metode
-add new comments property no legg til ny kommentar
+add new comments property no Legg til ny kommentar
add new ticket property no Legg til ny melding
add project property no Legg til prosjekt
-add property property no legg til prosjekt
+add property property no Legg til prosjekt
add request property no Legg til behov
add request for this project property no Legg til behov til
dette prosjektet
add to project as order property no Legg bestilling til
prosjekt
add to project as relation property no Kople til prosjekt
-addressmasters common no AddresseMaster
+addressmasters common no Addressemaster
address property no Adresse
address not defined property no Adresse er ikke definert
-adds a new project - then a new workorder property no legger
til nytt prosjekt - så bestilling
-adds a new workorder to an existing project property no legger
til ny bestilling til eksisterende prosjekt
+adds a new project - then a new workorder property no Legger
til nytt prosjekt - så bestilling
+adds a new workorder to an existing project property no Legger
til ny bestilling til eksisterende prosjekt
add selected request to project property no Legg valgte
tiltak til prosjektet
add service property no Legg til service
-add single custom line property no legg til en enkel tilpasset post
+add single custom line property no Legg til en enkel tilpasset post
add space property no Legg til areal
-add standard property no legg til standard
+add standard property no Legg til standard
add status property no Legg til status
-adds this workorders calculation as a template for later use property
no legger kalkulasjonen for denne bestillingen som en mal for senere bruk
-add template property no legg til mal
-add the selected items property no legg til valgte element
+adds this workorders calculation as a template for later use property
no Legger kalkulasjonen for denne bestillingen som en mal for senere bruk
+add template property no Legg til mal
+add the selected items property no Legg til valgte element
add this invoice property no Legg til denne fakturaen
-add this vendor to this activity property no legg til denne
leverandøren til denne aktiviteten
-add ticket property no legg til melding
+add this vendor to this activity property no Legg til denne
leverandøren til denne aktiviteten
+add ticket property no Legg til melding
add to project property no Legg til eksisterende prosjekt
-add workorder property no Legg til Bestilling
+add workorder property no Legg til bestilling
admin async services property no Administrer planlagte oppgaver
admin custom functions property no Administrer tilpassede
funksjoner
admin entity property no Administrer entitet
@@ -150,19 +150,19 @@
again property no igjen
agreement property no Avtale
agreement attributes property no Avtale attributter
-agreement code property no avtale kode
+agreement code property no Avtale kode
agreement group property no Avtale gruppe
agreement group code property no Avtale gruppe kode
agreement group has been edited property no Avtale gruppe
er rettet
agreement group has been saved property no Avtale gruppe er lagret
-agreement group id property no Avtale gruppe ID
+agreement group id property no Avtale gruppe-id
agreement has been edited property no avtale er rettet
agreement has been saved property no avtale er lagret
-agreement id property no avtale ID
-agreement_id property no Avtale ID
+agreement id property no Avtale-id
+agreement_id property no Avtale-id
agreement status property no Avtale status
alarm property no Alarm
-alarm id property no Alarm ID
+alarm id property no Alarm-id
all property no Alle
all users property no Alle brukere
altered property no Endret
@@ -176,7 +176,7 @@
apartment property no Leilighet
apartment has been edited property no Leilighet er rettet
apartment has been saved property no leilighet er lagret
-apartment id property no leilighet ID
+apartment id property no leilighet-id
applications property no Applikasjoner
apply the values property no Bruke verdier
apply property no Mellomlagre
@@ -207,7 +207,7 @@
attach file property no Legg til som vedlegg
attachments property no Vedlegg
attribute property no Verdier
-list entity attribute group property no List Attributt grupper
+list entity attribute group property no List attributtgrupper
attribute group property no Attributt grupper
attribute has been edited property no Attributt er rettet
attribute has been saved property no Attributt er lagret
@@ -214,7 +214,7 @@
attribute has not been deleted property no Attributt er IKKE
slettet
attribute has not been edited property no Attributt er IKKE endret
attribute has not been saved property no Attributt er IKKE lagret
-attribute id property no Attributt ID
+attribute id property no Attributt-id
attributes property no Attributter
attributes for the attrib property no Verdier for atributter
attributes for the entity category property no Attributter for
entitet-kategori
@@ -224,7 +224,7 @@
authorities demands property no Myndighetskrav
auto tax property no Auto MVA
b_account property no Kostnadsart
-back to admin property no Tilbake til Admin
+back to admin property no Tilbake til admin
back to calculation property no Tilbake til kalkulasjon
back to entity property no Returner til entitet
back to investment list property no Tilbake til liste over
investeringer
@@ -261,12 +261,12 @@
building common property no Bygnings felles
building has been edited property no Bygning er endret
building has been saved property no Bygning er lagret
-buildingname property no BygningsNavn
-building id property no bygnings ID
+buildingname property no Bygningsnavn
+building id property no bygnings-id
building part property no Bygningsdel
building_part property no Bygningsdel
-bulk import - contacts common no Mengde import kontakter
-bulk import - csv common no Mengde import CSV
+bulk import - contacts common no Masseimport kontakter
+bulk import - csv common no Masseimport CSV
but your message could not be sent by mail! property no Men din
melding kunne ikke sendes med epost!
calculate property no Kalkulèr
calculate this workorder property no kalkuler bestillingen
@@ -276,7 +276,7 @@
cancel the import property no avbryt import
categories property no Kategorier
categories for the entity type property no Kategori for
entitet-type
-categories for the location type property no Kategori for
lokaliserings type
+categories for the location type property no Kategori for
lokaliseringstype
categorise persons common no Kategoriser personer
category common no Kategori
category changed property no Kategori er endret
@@ -283,11 +283,11 @@
category has been edited property no Kategori er rettet
category has been saved property no Kategori er lagret
category has not been saved property no Kategori er IKKE lagret
-category id property no Kategori ID
+category id property no Kategori-id
change main screen message common no Endre melding - hovedside
change status property no Endre status
change to property no Endre til
-change type property no Endrings type
+change type property no Endringstype
chapter property no Kapittel
char property no Karakter
character property no karakter
@@ -307,7 +307,7 @@
check to show this attribute in entity list property no Merk av
for å vise denne attributten i oversikt
check to show this attribute in list property no Merk av for å
vise denne attributten i oversikt
check to show this attribute in location list property no Merk av
for å vise denne attributten i oversikt
-check to update the email-address for this vendor property no
kryss av for å oppdatere adressa til denne levedrandøren
+check to update the email-address for this vendor property no
kryss av for å oppdatere adressa til denne leverandøren
Check to activate period property no Merk for å aktivere
periode
Check to close period property no Merk for å avslutte periode
Check to delete period property no Merk for å slette periode
@@ -314,7 +314,7 @@
child_date property no Dato for referert element
choice property no Valg
choose a category property no Velg en kategori
-choose an id property no Velg en ID
+choose an id property no Velg en-id
choose charge tenant if the tenant i to pay for this project property
no Kryss av for å belaste leietaker dersom leietakeren skal betale for
arbeidene
choose columns common no Velg kolonner
choose copy hour to copy this hour to a new hour property no
Kryss av for å kopiere denne posten til en ny post
@@ -321,20 +321,20 @@
choose copy project to copy this project to a new project property
no Kryss av for å kopiere dette prosjektet til et nytt prosjekt
choose copy request to copy this request to a new request property
no Kryss av for å kopiere dette behovet til et nytt behov
choose copy workorder to copy this workorder to a new workorder
property no Kryss av for å kopiere denne bestillingen til en ny
bestilling
-choose generate id to automaticly assign new id based on type-prefix
property no Kryss av for generere ny ID basert på type-prefiks
+choose generate id to automaticly assign new id based on type-prefix
property no Kryss av for generere ny-id basert på type-prefiks
choose the end date for the next period property no Velg
slutt-dato for neste periode
choose the start date for the next period property no Velg
start-dato for neste periode
choose to send mailnotification property no Velg å sende
påminnelse på epost
chose if this column is nullable property no Velg om denne
kolonnen kan være uten verdier
claim property no Krav
-claim id property no Krav ID
+claim id property no Krav-id
claim %1 has been saved property no Krav nr %1 er lagret
claim %1 has been edited property no Krav nr %1 er endret
click this button to add a invice property no Klikk på denne
knappen for å legg til en faktura
click this button to add a invoice property no Klikk denne
knappen for å legge til en faktura
-click this button to start the import property no Press denne
knappen for å starte importen
+click this button to start the import property no Klikk denne
knappen for å starte importen
click this link to edit the period property no klikk denne
linken for å rette perioden
-click this link to enter the list of sub-invoices property no
klikk her for å entre liste over underbilag
+click this link to enter the list of sub-invoices property no
Klikk her for å entre liste over underbilag
click this link to select property no Klikk her for å velge
click this link to select apartment property no klikk her for å
velge leilighet
click this link to select budget account property no klikk
her for å velge kostnadsart
@@ -353,7 +353,7 @@
click to view file property no Klikk for vise fil
close property no Avslutt
closed property no Avsluttet
-close order property no Avslutt Ordre
+close order property no Avslutt ordre
close this window property no Steng vindu
code property no Kode
collapse all common no Slå sammen
@@ -364,7 +364,7 @@
columns common no kolonner
columns is updated property no Kolonner er oppdatert
common costs property no Fellsekostnader
-communication descriptions manager property no Kommunikasjons
beskrivelse
+communication descriptions manager property no
Kommunikasjonsbeskrivelse
communication types manager property no Type kommunikasjon
composites property no Leieobjekter
condition property no Tilstand
@@ -386,12 +386,12 @@
contract property no Kontrakt
line property no Linje
sheet property no Ark
-choose file property no Velg Fil
-choose sheet property no Velg Ark
+choose file property no Velg fil
+choose sheet property no Velg ark
choose start line property no Velg startlinje
-choose columns property no Velg Kolonner
+choose columns property no Velg kolonner
table property no Tabell
-condition survey import property no Import av
Tilstandsanalyse
+condition survey import property no Import av
tilstandsanalyse
periodization property no Periodisering
periodization start property no Startperiode
periodization outline property no Periodiseringsfordeling
@@ -411,7 +411,7 @@
content property no innhold
contractual obligations property no regnskap
contracts property no Kontrakter
-contract sum property no Kontrakt sum
+contract sum property no Kontraktsum
conversion property no format
coordination property no Koordinering
coordinator property no Koordinator
@@ -424,7 +424,7 @@
cost property no kostnad
cost estimate property no Kostnadsestimat
total cost estimate property no Totalt kostnadsestimat
-cost - either budget or calculation property no Beløp - enten
budsjett eller kalkulalasjon
+cost - either budget or calculation property no Beløp - enten
budsjett eller kalkulasjon
cost (incl tax): property no Kostnader (inkl mva)
cost per unit property no Enhetspris
could not find any location to save to! property no Kunne
ikke finne lokalisering å lagre til
@@ -436,7 +436,7 @@
custom function file not chosen! property no Fil for
egendefinert funskjon er ikke valgt
custom function has been edited property no Egendefinert
funksjon er rettet
custom function has not been saved property no Egendefinert
funksjon er IKKE lagret
-custom function id property no Egendefinert funksjons ID
+custom function id property no Egendefinert funksjons-id
custom functions property no Egendefinert funksjoner
custom functions for the entity category property no
Egendefinert funksjoner for entitet-kategori
custom queries property no Egendefinerte spørringer
@@ -446,10 +446,10 @@
datatype type not chosen! property no datatype er ikke valgt
date closed property no dato avsluttet
date opened property no Startet
-date search property no Dato søk
-date from property no Fra Dato
+date search property no Datosøk
+date from property no Fra dato
date to property no Til Dato
-alter date property no Endre Dato
+alter date property no Endre dato
datetime property no dato-tid
day property no dag
day of week (0-6, 0=sun) property no Ukedag (0-6, 0=søndag)
@@ -456,18 +456,18 @@
days property no Dager
deadline property no Frist
debug common no Debug
-debug output in browser property no Kontroller data før
import
+debug output in browser property no Kontroller data før
import
decimal property no desimal
default property no Standard
-default vendor category property no Standard leverandør
kategori
-default vendor category is updated property no Standard
leverandør kategori er oppdatert
+default vendor category property no Standard
leverandørkategori
+default vendor category is updated property no Standard
leverandørkategori er oppdatert
delay property no forsinkelse
delete activity property no slett aktivitet
delete agreement and all the activities associated with it! property
no slett avtale og alle aktiviteter assosiert med den
delete agreement group and all the activities associated with it!
property no Slett avtalegruppe og alle aktiviteter som er assosiert
med den
-delete apartment property no seltt leilighjet
+delete apartment property no slett leilighet
delete a single entry by passing the id. property no slett
en enkelt post ved å sende id
-delete async method property no Slett async metode
+delete async method property no Slett async-metode
delete budget account property no Slett kostnadsart
delete building property no slett bygning
delete claim property no Slett krav
@@ -480,11 +480,11 @@
delete equipment property no slett utstyr
delete failed property no Sletting feilet
delete file property no Slett fil
-delete investment history element property no slett historie
post for investering
+delete investment history element property no slett
historiepost for investering
delete last entry property no slett siste post
delete last index property no Slett siste index
delete location property no Slett lokalisering
-delete location standard property no Slett lokaliserings
config verdi
+delete location standard property no Slett
lokaliseringskonfigurasjons verdi
delete meter property no slett måler
delete owner property no Slett eier
delete part of town property no Slett bydel
@@ -506,7 +506,7 @@
delete the entity property no Slett entitet
delete the entrance property no slett inngang
delete the entry property no slett post
-delete the gab property no Slett GrunnEiendom
+delete the gab property no Slett grunneiendom
delete the item property no Slett post
delete the last index property no Slett siste index
delete the location property no Slett lokalisering
@@ -514,12 +514,12 @@
delete the method property no Slett metode
delete the part of town property no Slett bydel
delete the project property no Slett prosjekt
-delete the property property no slett eiendom
+delete the property property no Slett eiendom
delete the r_agreement property no Slett utleieavtale
delete the request property no Slett tiltak
delete the s_agreement property no Slett serviceavtale
-delete the standard property no slett standard
-delete the template property no slett mal
+delete the standard property no Slett standard
+delete the template property no Slett mal
delete the voucher property no Slett bilag
delete this activity property no slett aktivitet
delete this agreement property no slett avtale
@@ -538,9 +538,9 @@
delete this workorder property no slett bestilling
delete ticket property no slett melding
delete value property no Slett verdi
-delete vendor activity property no slett aktivitet
+delete vendor activity property no Slett aktivitet
delete voucher property no Slett bilag
-delete workorder property no slett bestilling
+delete workorder property no Slett bestilling
delivered property no Levert
delivery address property no Leveringsadresse
department common no Avdeling
@@ -553,7 +553,7 @@
deviation property no Avvik
deviation has been added property no Avvik er lagt til
deviation has been edited property no Avvik er rettet
-deviation id property no Avvik ID
+deviation id property no Avvik-id
difference property no Rest
dim a property no Dim A
dim a is missing property no Dim A mangler
@@ -560,11 +560,11 @@
dima is missing from sub invoice in: property no Dim A mangler
fra underbilag i :
dim b property no Ansvarssted
dimb property no Ansvarssted
-dimb roles property no Roller Ansvarssted
-dimb role user property no Bruker/Rolle/Ansvarssted
+dimb roles property no Roller ansvarssted
+dimb role user property no Bruker/rolle/ansvarssted
no authorities demands property no Ingen myndighetskrav
-no dimb property no K Ikke valgt
-Please select dimb! property no Angi Ansvarssted
+no dimb property no Ansvarssted ikke valgt
+Please select dimb! property no Angi ansvarssted
dim d property no Dim 6
dime property no Kategori
directory created property no katalog er opprettet
@@ -571,19 +571,19 @@
disable property no Deaktiver
disabled property no inaktivt
district property no Område
-district_id property no Distrikt ID
+district_id property no Distrikt-id
doc type property no Dokumenttype
document property no Dokument
-document %1 has been edited property no dokument %1 er rettet
-document %1 has been saved property no dokument %1 er lagret
+document %1 has been edited property no Dokument %1 er rettet
+document %1 has been saved property no Dokument %1 er lagret
documentation property no Dokumentasjon
documentation for locations property no Dokumentasjon for
arealer
-document categories property no Dokument kategorier
-document date property no Dokument dato
+document categories property no Dokumentkategorier
+document date property no Dokumentdato
document id property no Dokument id
-document name property no Dokument navn
+document name property no Dokumentnavn
documents property no Dokumenter
-document status property no Dokument status
+document status property no Dokumentstatus
domain name for mail-address, eg. %1 property no Domenenavn for
e-post adresser
do not add this invoice property no Ikke legg til denne
fakturaen
do not import this invoice property no Ikke importer dette
bilaget
@@ -598,81 +598,81 @@
do you want to perform this action property no Vil du
gjennomføre denne handlingen
draft property no UTKAST
economy and progress property no Økonomi og fremdrift
-edit activity property no rette aktivitet
-edit agreement property no rette avtale
+edit activity property no Endre aktivitet
+edit agreement property no Endre avtale
edit agreement group property no Rette avtale gruppe
-edit apartment property no rette leilighet
-edit attribute property no endre attributt
+edit apartment property no Endre leilighet
+edit attribute property no Endre attributt
edit budget account property no Rette kostnadsart
-edit building property no rette bygning
+edit building property no Endre bygning
edit categories property no Endre kategorier
-edit category property no Rette kategori
+edit category property no Endre kategori
edit claim property no Endre klage
-edit custom fields property no Editer egendefinerte felt
+edit custom fields property no Endre egendefinerte felt
edit custom function property no Rette egendefinert funksjon
-edit/customise this hour property no rett eller tilpass
denne posten
-edit deviation property no Rette avvik
-edit document property no rette dokument
-edit entity property no Rette entitet
-edit entrance property no rette inngang
-edit equipment property no rette utstyr
-edit gab property no Editer GrunnEiendom
-edit hour property no rette post
-edit id property no rette ID
-edit info property no Rette informasjon
-edit information about the document property no Rette
informasjon om dokumentet
-edit location config for property no Rette konfigurasjon for
lokalisering
+edit/customise this hour property no Endre eller tilpass
denne posten
+edit deviation property no Endre avvik
+edit document property no Endre dokument
+edit entity property no Endre entitet
+edit entrance property no Endre inngang
+edit equipment property no Endre utstyr
+edit gab property no Endre grunneiendom
+edit hour property no Endre post
+edit id property no Endre-id
+edit info property no Endre informasjon
+edit information about the document property no Endre
informasjon om dokumentet
+edit location config for property no Endre konfigurasjon for
lokalisering
edit log levels common no Endre log nivåer
-edit meter property no rette måler
-edit method property no Rette metode
-edit period property no rette periode
-edit pricing property no rette prising
-edit priority key property no rette prioriterings nøkkel
-edit project property no editer prosjekt
-edit property property no editer eiendom
-edit request property no editer behov
-edit standard property no editer standard
+edit meter property no Endre måler
+edit method property no Endre metode
+edit period property no Endre periode
+edit pricing property no Endre prising
+edit priority key property no Endre prioriteringsnøkkel
+edit project property no Endre prosjekt
+edit property property no Endre eiendom
+edit request property no Endre behov
+edit standard property no Endre standard
edit status property no Endre status
-edit template property no rette mal
+edit template property no Endre mal
edit the account property no Endre kontoen
-edit the actor property no Rette aktør
-edit the agreement property no rette avtale
-edit the agreement_group property no Rette avtalegruppe
-edit the alarm property no Rette alarm
-edit the apartment property no rette leilighet
-edit the attrib property no rette attributt
-edit the budget account property no Rette kostnadsart
-edit the building property no rette bygning
-edit the category property no Rette kategorien
-edit the claim property no Rette kravet
-edit the column relation property no Rette kolonnerelasjonen
-edit the custom_function property no Rette egendefinert
funksjon
-edit the deviation property no Rette avvik
-edit the entity property no Rette entitet
-edit the entrance property no rette inngang
-edit the equipment property no rette utstyr
-edit the gab property no Editer GrunnEiendom
-edit the location property no Rette lokalisering
-edit the meter property no rette måler
-edit the method property no Rette metoden
-edit the part of town property no Rette bydelen
-edit the pricebook property no rette prisbok
-edit the project property no rette prosjekt
-edit the property property no rette eiendom
-edit the r_agreement property no Rette utleieavtalen
-edit the request property no endre behov
-edit the s_agreement property no Rette serviceavtalen
-edit the standard property no rette standard
-edit the template property no rette mal
-edit the workorder property no rette bestilling
-edit this activity property no rette aktivitet
+edit the actor property no Endre aktør
+edit the agreement property no Endre avtale
+edit the agreement_group property no Endre avtalegruppe
+edit the alarm property no Endre alarm
+edit the apartment property no Endre leilighet
+edit the attrib property no Endre attributt
+edit the budget account property no Endre kostnadsart
+edit the building property no Endre bygning
+edit the category property no Endre kategorien
+edit the claim property no Endre kravet
+edit the column relation property no Endre kolonnerelasjonen
+edit the custom_function property no Endre egendefinert
funksjon
+edit the deviation property no Endre avvik
+edit the entity property no Endre entitet
+edit the entrance property no Endre inngang
+edit the equipment property no Endre utstyr
+edit the gab property no Endre grunneiendom
+edit the location property no Endre lokalisering
+edit the meter property no Endre måler
+edit the method property no Endre metoden
+edit the part of town property no Endre bydelen
+edit the pricebook property no Endre prisbok
+edit the project property no Endre prosjekt
+edit the property property no Endre eiendom
+edit the r_agreement property no Endre utleieavtalen
+edit the request property no Endre behov
+edit the s_agreement property no Endre serviceavtalen
+edit the standard property no Endre standard
+edit the template property no Endre mal
+edit the workorder property no Endre bestilling
+edit this activity property no Endre aktivitet
edit this entity property no Endre entiteten
-edit this entry property no rette post
-edit this entry equipment property no rett utstyr
-edit this entry project property no endre prosjekt
-edit this entry request property no endre behov
-edit this entry workorder property no rett bestilling
-edit this meter property no rett måler
+edit this entry property no Endre post
+edit this entry equipment property no Endre utstyr
+edit this entry project property no Endre prosjekt
+edit this entry request property no Endre behov
+edit this entry workorder property no Endre bestilling
+edit this meter property no Endre måler
edit workorder property no Endre bestilling
email-address of the user, eg. %1 property no E-post adresse
for bruker, %1
enable property no Aktiver
@@ -688,30 +688,30 @@
enter a descr for the custom function property no Angi en
beskrivelse av egendefinert funksjon
enter a description for prerequisitions for this activity - if any
property no gi en beskrivelse av nødvendige grunnlagsarbeid - om
noen - for denne aktiviteten
enter a description of the deviation property no Angi en
beskrivelse av avviket
-enter a description of the document property no gi en
beskrivelse av dokumentet
-enter a description of the equipment property no gi en
beskrivelse av utstyret
-enter a description of the project property no gi en
beskrivelse av prosjektet
+enter a description of the document property no Gi en
beskrivelse av dokumentet
+enter a description of the equipment property no Gi en
beskrivelse av utstyret
+enter a description of the project property no Gi en
beskrivelse av prosjektet
enter a description of the request property no Gi en
beskrivelse av tilstanden
-enter a description of the standard property no gi en
beskrivelse av standarden
+enter a description of the standard property no Gi en
beskrivelse av standarden
enter a description of the status property no Angi en
beskrivelse av statusen
-enter a description the attribute property no gi en
beskrivelse av attributten
+enter a description the attribute property no Gi en
beskrivelse av attributten
enter a description the budget account property no Angi en
beskrivelse av kostnadsarten
enter a description the category property no Angi en
beskrivelse av kategorien
enter a description the method property no Angi en beskrivelse av
metoden
-enter a description the standard property no gi en
beskrivelse av standarden
-enter a meter id ! property no Angi måler ID
+enter a description the standard property no Gi en
beskrivelse av standarden
+enter a meter id ! property no Angi måler-id
enter a name for the query property no Angi et navn for
spørringen
enter a name for this part of town property no Angi ett navn
for denne bydelen
enter a name of the standard property no gi standarden et navn
enter a new grouping for this activity if not found in the list
property no skriv inn en ny gruppering for denne posten om den ikke
finnes i listen
-enter a new index property no gi en ny index
-enter a new writeoff period if it is not in the list property no
skriv inn en ny avskrivningsperiode om den ikke finnes i listen
-enter any persentage addition per unit property no angi prosentvis
tillegg pr enhet
-enter any remarks regarding this apartment property no angi
merknader vedrørende denne leiligheten
-enter any remarks regarding this building property no angi
merknader vedrørende denne bygningen
-enter any remarks regarding this entrance property no angi
merknader vedrørende denne inngangen
-enter any round sum addition per order property no angi riggtillegg
-enter apartment id property no angi leilighets ID
+enter a new index property no Gi en ny index
+enter a new writeoff period if it is not in the list property no
Skriv inn en ny avskrivningsperiode om den ikke finnes i listen
+enter any persentage addition per unit property no Angi prosentvis
tillegg pr enhet
+enter any remarks regarding this apartment property no Angi
merknader vedrørende denne leiligheten
+enter any remarks regarding this building property no Angi
merknader vedrørende denne bygningen
+enter any remarks regarding this entrance property no Angi
merknader vedrørende denne inngangen
+enter any round sum addition per order property no Angi riggtillegg
+enter apartment id property no Angi leilighets-id
enter a remark for this claim property no Angi en merknad for
dette kravet
enter a remark for this entity property no Angi en merknad for
denne entiteten
enter a remark - if any property no gi en merknad - om noen
@@ -719,70 +719,70 @@
enter a short description of the workorder property no Gi en
kort beskrivelse av bestillingen
enter a short description of this template property no Gi en
kort beskrivelse av malen
enter a sql query property no Skriv inn en sql-spørring
-enter a standard prefix for the id property no Angi et prefix
for ID
+enter a standard prefix for the id property no Angi et prefix
for-id
enter a standard prefix for the id of the equipments property no
Angi et standard prefix for utstyr av denne typen
enter a statustext for the inputfield in forms property no Angi en
statustekst for inputfeltet
-enter a value for the labour cost property no angi arbeids
kostnader
-enter a value for the material cost property no angi
materialkostnader
+enter a value for the labour cost property no Angi arbeids
kostnader
+enter a value for the material cost property no Angi
materialkostnader
Enter actual cost property no Angi betalt sum
-enter building id property no angi bygnings ID
-enter document name property no angi dokument ID
-enter document title property no angi dokument tittel
-enter document version property no angi dokument versjon
-enter entrance id property no angi inngangs ID
-enter equipment id property no angi utstyrs ID
+enter building id property no Angi bygnings-id
+enter document name property no Angi dokument-id
+enter document title property no Angi dokument tittel
+enter document version property no Angi dokument versjon
+enter entrance id property no Angi inngangs-id
+enter equipment id property no Angi utstyrs-id
enter invoice number property no Angi bilagsnummer
enter kid nr property no Angi KID nr
-enter other branch if not found in the list property no Angi
andre fag om det ikke finnes i listen
-enter project name property no Angi Prosjekt navn
-enter quantity of unit property no angi mengde
+enter other branch if not found in the list property no Angi
andre fag, om det ikke finnes i listen
+enter project name property no Angi prosjektnavn
+enter quantity of unit property no Angi mengde
enter request title property no Angi beskrivende navn for tiltak
-enter the attribute id property no angi attributt ID
-enter the attribute value for this entity property no angi
attributt verdi for denne posten
+enter the attribute id property no Angi attributt-id
+enter the attribute value for this entity property no Angi
attributt verdi for denne posten
enter the billable hour for the task property no Angi egne timer
for oppgaven
enter the budget property no Angi budsjett
enter the budget account property no Angi kostnadsart
-enter the category id property no Angi kategori ID
-enter the cost per unit property no angi kostnad pr enhet
+enter the category id property no Angi kategori-id
+enter the cost per unit property no Angi kostnad pr enhet
enter the date for this reading property no Angi dato for
denne avlesningen
enter the default value property no Angi standard-verdi
-enter the description property no angi beskrivelse
-enter the description for this activity property no angi
beskrivelse av denne aktiviteten
-enter the description for this template property no angi
beskrivelse av denne malen
-enter the details of this ticket property no angi detaljer
for meldingen
+enter the description property no Angi beskrivelse
+enter the description for this activity property no Angi
beskrivelse av denne aktiviteten
+enter the description for this template property no Angi
beskrivelse av denne malen
+enter the details of this ticket property no Angi detaljer
for meldingen
enter the email-address for this user property no Oppgi
epostadressen for denne brukeren
-enter the expected longevity in years property no angi forventet
levetid [år]
-enter the floor property no angi etasje
-enter the floor id property no angi etasje ID
-enter the general address property no angi generell adresse
+enter the expected longevity in years property no Angi forventet
levetid [år]
+enter the floor property no Angi etasje
+enter the floor id property no Angi etasje-id
+enter the general address property no Angi generell adresse
enter the input text for records property no Angi ledetekst
for datafelt
-enter the invoice date property no angi fakturadato
-enter the meter id property no angi måler ID
-enter the method id property no Angi metode ID
+enter the invoice date property no Angi fakturadato
+enter the meter id property no Angi måler-id
+enter the method id property no Angi metode-id
enter the name for the column property no Angi navn for kolonne i
database
enter the name for this location property no Angi navn for
denne lokaliseringen
-enter the name of the apartment property no angi navn for
leiligheten
-enter the name of the building property no angi navn for bygningen
-enter the name of the entrance property no angi navn for inngangen
-enter the name of the meter property no angi navn for måleren
-enter the name of the property property no angi navn for eiendommen
-enter the name the template property no angi navn for malen
-enter the payment date or the payment delay property no angi
betalingsdato eller antall dager til forfall
+enter the name of the apartment property no Angi navn for
leiligheten
+enter the name of the building property no Angi navn for bygningen
+enter the name of the entrance property no Angi navn for inngangen
+enter the name of the meter property no Angi navn for måleren
+enter the name of the property property no Angi navn for eiendommen
+enter the name the template property no Angi navn for malen
+enter the payment date or the payment delay property no Angi
betalingsdato eller antall dager til forfall
enter the power meter property no Legg til måleren
-enter the power_meter property no angi måler
-enter the property id property no angi eiendoms ID
-enter the purchase cost property no angi anskaffelses
kostnad
+enter the power_meter property no Angi måler
+enter the property id property no Angi eiendoms-id
+enter the purchase cost property no Angi anskaffelses
kostnad
enter the record length property no Angi lengde for datafelt
enter the reserve property no Angi reserve
enter the scale if type is decimal property no Angi skala
dersom type er desimal
-enter the search string. to show all entries, empty this field and press the
submit button again property no angi søkestrengen. for å vise
alle poster, tøm dette feltet og søk på nytt
-enter the standard id property no angi standard ID
-enter the status id property no Angi statius ID
-enter the street number property no angi gatenummer
-enter the subject of this ticket property no angi overskrift
for denne meldingen
-enter the total cost of this activity - if not to be calculated from unit-cost
property no angi total kostnad for denne posten - dersom den ikke
skal beregnes fra enhetskostnader
-enter the workorder id to search by workorder - at any date property
no angi bestilling ID for å søke etter bestilling - gjelder alle datoer
-enter workorder title property no angi bestillings tittel
+enter the search string. to show all entries, empty this field and press the
submit button again property no Angi søkestrengen. for å vise
alle poster, tøm dette feltet og søk på nytt
+enter the standard id property no Angi standard-id
+enter the status id property no Angi statius-id
+enter the street number property no Angi gatenummer
+enter the subject of this ticket property no Angi overskrift
for denne meldingen
+enter the total cost of this activity - if not to be calculated from unit-cost
property no Angi total kostnad for denne posten - dersom den ikke
skal beregnes fra enhetskostnader
+enter the workorder id to search by workorder - at any date property
no Angi bestillings-id for å søke etter bestilling - gjelder alle datoer
+enter workorder title property no Angi bestillings tittel
entity property no type
entity has been added property no Post er lagt til
entity has been edited property no Post er oppdatert
@@ -789,23 +789,23 @@
entity %1 has been edited property no Post %1 er oppdatert
entity has not been edited property no Post er IKKE oppdatert
entity has not been saved property no Post er IKKE lagret
-entity id property no entitet ID
-entity name property no entitet navn
+entity id property no entitets-id
+entity name property no entitetsnavn
entity not chosen property no Entitet er ikke valgt
entity num property no Entitet num
-entity type property no entitet type
+entity type property no entitetstype
entity type not chosen! property no Entitet type er ikke
valgt
entrance property no inngang
-entrance has been edited property no inngang er rettet
-entrance has been saved property no inngang er lagret
-entrance id property no inngang ID
+entrance has been edited property no Inngang er rettet
+entrance has been saved property no Inngang er lagret
+entrance id property no Inngangs-id
entry date common no Registrert dato
entry_date common no Registrert dato
equipment property no Utstyr
-equipment %1 has been edited property no utstyr %1 er rettet
+equipment %1 has been edited property no Utstyr %1 er rettet
equipment %1 has been saved property no utstyr %1 er lagret
-equipment id property no utstyr ID
-equipment_id property no utstyr ID
+equipment id property no utstyrs-id
+equipment_id property no utstyrs-id
equipment type property no Type utstyr/anlegg
estimate property no Kostnadsestimat
event property no Hendelse
@@ -824,29 +824,29 @@
extra mail address property no Ekstra adresse
f property no F
failed to copy file ! property no Kopiering av fil feilet!
-failed to create directory property no klarte ikke å lage
katalog
-failed to delete file property no klarte ikke å slette fil
+failed to create directory property no Klarte ikke å lage
katalog
+failed to delete file property no Klarte ikke å slette fil
failed to upload file ! property no Opplasting av fil
feilet!
failure property no Svikt
false property no False
-feste nr property no Feste nr
+feste nr property no Festenr.
fetch the history for this item property no Hent historikk
for dette elementet
file property no fil
-file deleted property no fil er slettet
+file deleted property no Fil er slettet
filename property no Filnavn
fileuploader property no Filopplasting
find and register all application hooks property no Finn og
registrer alle Hooks
finnish date property no Ferdig dato
finnish_date property no Ferdig dato
-finnish date changed property no endret ferdig-dato
-first entry is added! property no fil er lagt til
+finnish date changed property no Endret ferdig-dato
+first entry is added! property no Fil er lagt til
firstname property no Fornavn
first name of the user, eg. %1 property no Fornavn til bruker, %1
-first note added property no første notat er lagt til
+first note added property no Første notat er lagt til
float property no Flyttall
floor property no Etasje
floor common property no Etasje felles
-floor id property no etasje ID
+floor id property no Etasje-id
fm_vendor property no Leverandør
force year for period property no Overstyr år for periode
format type property no Format type
@@ -858,16 +858,16 @@
from property no Fra
from date property no Fra dato
funding property no Finansiering
-gaards nr property no GårdsNr
-gab property no GrunnEiendom
-gabnr property no GrunnEiendom
+gaards nr property no Gårdsnr.
+gab property no Grunneiendom
+gabnr property no Grunneiendom
gallery property no Bildearkiv
general property no Generelt
generic property no Generelt
general address property no Generell adresse
-general info property no generell informasjon
-generate a project from this request property no generer et
prosjekt basert på dette behovet
-generate id ? property no generer ID
+general info property no Generell informasjon
+generate a project from this request property no Generer et
prosjekt basert på dette behovet
+generate id ? property no generer id
generate order property no Lag bestilling
generate project property no Lag nytt prosjekt
generate request property no Registrer behov
@@ -880,7 +880,7 @@
group property no Gruppe
grouping property no Gruppering
helpdesk property no Meldinger
-help message property no hjelpetekst
+help message property no Hjelpetekst
highest property no Høyest
history property no Historikk
history not allowed for this datatype property no Historikk er
ikke tilgjengelig for denne datatypen
@@ -887,14 +887,14 @@
history of this attribute property no Historie for denne
attributten
hits property no Treff
hour property no Time
-hour %1 has been deleted property no post %1 er slettet
-hour %1 has been edited property no post %1 er rettet
-hour %1 is added! property no post %1 er lagt til
-hour category property no Post kategori
-hour id property no Post ID
+hour %1 has been deleted property no Post %1 er slettet
+hour %1 has been edited property no Post %1 er rettet
+hour %1 is added! property no Post %1 er lagt til
+hour category property no Post-kategori
+hour id property no Post-id
html property no HTML
id property no ID
-id control property no ID kontroll
+id control property no ID-kontroll
id is updated property no ID er oppdatert
id not entered! property no ID er ikke valgt
if files can be uploaded for this category property no Om
filer skal kunne lastes opp for denne kategorien
@@ -906,7 +906,7 @@
importance property no Viktighet
import detail property no Importer detalj
import details to this agreement from spreadsheet property no
Import detaljer til denne avtalen fra regneark
-import from csv property no Fil - import til Faktura
+import from csv property no Fil-import til Faktura
import invoice property no Import faktura
import this invoice property no Importer denne fakturaen
import vcard common no Importer visittkort
@@ -915,11 +915,11 @@
include in search property no Inkluder i søk
include the workorder to this claim property no Inkluder
bestillingen i dette kravet
include this entity property no Inkluder denne entiteten
-index property no indeks
+index property no Indeks
index count property no Antall
-index_count property no indeks teller
+index_count property no Indeks teller
index date property no Dato for indeks
-indoor climate property no Innendørs klima
+indoor climate property no Innendørsklima
initial category property no Initiell kategori
initial coordinator property no Initiell koordinator
initials property no Initialer
@@ -926,38 +926,38 @@
initial status property no Initiell status
initial value property no Initiell verdi
in progress property no Påbegynt
-inputdata for the method property no inputdata for metoden
+inputdata for the method property no Inputdata for metoden
input data for the nethod property no Input data til metoden
input text property no ledetekst
input text not entered! property no Input tekst er ikke
angitt!
-input type property no input type
-input name property no input navn
+input type property no Input-type
+input name property no Input-navn
invalid category property no Ugyldig kategori
select value property no Angi verdi
selected mail addresses property no Valgte adresser
-insert the date for the acquisition property no angi dato for
anskaffelsen
-insert the date for the initial value property no angi dato for
initiell verdi
-insert the value at the start-date as a positive amount property
no angi verdie ved startdatoen som en positiv verdi
-integer property no heltall
-interval property no intervall
+insert the date for the acquisition property no Angi dato for
anskaffelsen
+insert the date for the initial value property no Angi dato for
initiell verdi
+insert the value at the start-date as a positive amount property
no Angi verdie ved startdatoen som en positiv verdi
+integer property no Heltall
+interval property no Intervall
inventory common no Beholdning
add inventory common no Legg til beholdning
investment property no Investering
investment added ! property no Investering er lagt til
investment history property no Investerings historie
-investment id property no Investering ID
-investment id: property no Investering ID:
+investment id property no Investerings-id
+investment id: property no Investerings-id:
investment value property no Avskrivning
invoice property no Faktura
invoice address property no Fakturaadresse
invoice date property no Fakturadato
-invoice id property no Faktura ID
+invoice id property no Faktura-id
invoice id already taken for this vendor property no
Fakturanummeret er allerede registrert for denne leverandøren
invoice is not added! property no Fakturaen er IKKE lagt til!
-invoice number property no FakturaNr
-invoice transferred property no bilag er overført
+invoice number property no Fakturanr.
+invoice transferred property no Bilag er overført
invoice line text property no Posteringstekst
-is id property no Er ID
+is id property no Er id
is registered property no er registert
is there a demand from the authorities to correct this condition?
property no Finnes det myndighetskrav for å rette opp tilstanden?
items property no Detaljer
@@ -964,13 +964,13 @@
janitor property no Bestiller
new janitor property no Ny bestiller
jasper reports property no JasperReports
-jasper upload property no opplasting av JasperReports
+jasper upload property no Opplasting av JasperReports
key deliver location property no Sted for å levere nøkkel
key fetch location property no Sted for å hente nøkkel
key location property no Nøkkel lokalisert
key responsible property no Nøkkel ansvarlig
kid nr property no KID nr
-kommune nr property no Kommune nr
+kommune nr property no Kommunenr.
kreditnota property no Kreditnota
labour cost property no Arbeid
large property no Stor
@@ -1002,10 +1002,10 @@
list agreement property no list avtale
list agreement group property no List avtalegruppe
list alarm property no Oversikt alarm
-list apartment property no list leilighet
+list apartment property no List leilighet
list async method property no List async-metode
list attribute property no List attributter
-listbox property no ListBox
+listbox property no Listbox
list budget property no Oversikt budsjett
list budget account property no list kostnadsart
list building property no list bygning
@@ -1017,13 +1017,13 @@
list deviation property no List avvik
list document property no list dokumenter
list documents property no Oversikt dokument
-list entity attribute property no List entitet-attributter
+list entity attribute property no List entitets-attributter
list entity custom function property no List egendefinerte
funskjoner for entiteter
list entity type property no List entitet-type
list entrance property no list inngang
list equipment property no list utstyr
-list gab property no List GrunnEiendom
-list gab detail property no List GrunnEiendom-detaljer
+list gab property no List grunneiendom
+list gab detail property no List grunneiendomsdetaljer
list hours property no List timer
list investment property no List investeringer
list invoice property no List bilag
@@ -1032,11 +1032,11 @@
list meter property no List måler
list obligations property no Oversikt regnskap
list paid invoice property no List betalte bilag
-list pricebook property no list prisbok
+list pricebook property no List prisbok
list pricebook per vendor property no List prisbok pr
leverandør
-list project property no List Prosjekt
+list project property no List prosjekt
list property property no List eiendom
-list request property no List Behov
+list request property no List behov
list standard description property no List standard
beskrivelse
list status property no List status
list street property no List gate
@@ -1061,7 +1061,7 @@
location manager property no Forvalter lokasjon
location name property no Modul
location not chosen! property no Lokalisering er ikke valgt
-location type property no Lokaliserings type
+location type property no Lokaliseringstype
location type not chosen! property no Lokaliseringsnivå ikke
valgt
log property no Logg
longevity property no Levetid
@@ -1085,21 +1085,21 @@
m_cost property no Materialkost
medium consequences property no Middels store konsekvenser
member property no Medlem
-member of property no medlem av
+member of property no Medlem av
memo property no Memo
meter property no Måler
meter %1 has been edited property no Måler %1 er oppdatert
meter %1 has been saved property no Måler %1 er lagret
-meter id property no måler ID
-meter type property no måler type
+meter id property no Måler-id
+meter type property no Målertype
method property no Metode
-method has been edited property no Metode er rettet
-method id property no Metode ID
+method has been edited property no Metode er endret
+method id property no Metode-id
migrate to alternative db property no Migrer til alternativ
database
mine tickets property no Mine meldinger
-mine orders property no Mine Bestillinger
-mine projects property no Mine Prosjekter
-mine vouchers property no Mine Bilag
+mine orders property no Mine bestillinger
+mine projects property no Mine prosjekter
+mine vouchers property no Mine bilag
minor property no Liten
minor consequences property no Små konsekvenser
minute property no Minutt
@@ -1134,26 +1134,26 @@
new person common no Ny person
new_ticket common no Ny melding
new value property no Ny verdi
-new value for multiple choice property no Ny verdi for fler-valg
+new value for multiple choice property no Ny verdi for flervalg
new values property no Nye verdier
-new record property no Ny Post
+new record property no Ny post
next run property no Neste kjøring
no access property no Ingen tilgang
no account property no Ingen konto
no additional notes property no Ingen tilleggskommentarer
-no branch property no fag ikke valgt
+no branch property no Fag ikke valgt
no category property no Kategori ikke valgt
no change type property no Ingen endringstype
-no conversion type could be located. property no Format filter
ble ikke funnet
+no conversion type could be located. property no Formatfilter
ble ikke funnet
no custom function property no Ingen egendfinert funksjon
-no criteria property no kriterie ikke valgt
+no criteria property no Kriterie ikke valgt
no datatype property no Datatype ikke valgt
no dim b property no Ansvarssted ikke valgt
no dim d property no Dim 6 ikke valgt
no district property no Distrikt ikke valgt
no document type property no Ingen dokument-type
-no entity type property no Entitet type ikke valgt
-no equipment type property no Utstyrs type ikke valgt
+no entity type property no Entitetstype ikke valgt
+no equipment type property no Utstyrstype ikke valgt
no file selected property no Fil ikke valgt
no granting group property no Ingen granting gruppe
no group property no ingen gruppe
@@ -1176,7 +1176,7 @@
not allocated property no Ikke disponert
note property no Notat
nothing to do! property no Ingen ting å gjøre
-notify property no varsle
+notify property no Varsle
no type property no Type ikke valgt
no user property no Bruker ikke valgt
no user selected property no Bruker ikke valgt
@@ -1214,16 +1214,16 @@
order %1 approved for amount %2 property no Bestilling %1
er godkjent med beløp %2
order order %1 is not approved property no Bestilling %1 er ikke
godkjent
order_dim1 property no Aktivitet
-order id property no BestillingsNr
-order_id property no BestillingsNr
+order id property no Bestillingsnr.
+order_id property no Bestillingsnr.
order # that initiated the invoice property no Bestillingsnr
som referanse for fakturaen
order template property no Standardtekster
order text property no Bestillingstekst
organisation property no Organisasjon
other branch property no Andre fag
-override fraction property no Overstyrt-faktor
+override fraction property no Overstyrt faktor
override fraction of common costs property no
Overstyringsfaktor for felleskostnader
-overview property no oversikt
+overview property no Oversikt
owner property no eier
owner attributes property no Eier attributter
owner categories property no Eier kategorier
@@ -1237,7 +1237,7 @@
payment property no Betaling
payment date property no Forfallsdato
pdf property no PDF
-per agreement property no pr avtale
+per agreement property no pr. avtale
percent property no Prosent
percentage addition property no prosentvis tillegg
performed property no Utført
@@ -1244,10 +1244,10 @@
period property no Periode
periods property no Perioder
period transition property no Periode overgang
-permission property no rettighet
+permission property no Rettighet
permissions property no Rettigheter
-permissions are updated! property no rettigheter er oppdatert
-per vendor property no pr leverandør
+permissions are updated! property no Rettigheter er oppdatert
+per vendor property no pr. leverandør
phone property no Telefon
php configuration common no php konfigurasjon
phpinfo common no phpinformasjon
@@ -1254,34 +1254,33 @@
picture property no Bilde
plain property no Vanlig
planned cost property no Planlagt
-pleace select a location - or an equipment ! property no velg en
lokalisering - eller et utstyr
+pleace select a location - or an equipment ! property no Velg en
lokalisering - eller et utstyr
Please select a condition! property no Angi tilstand
Please select a building part! property no Angi bygningsdel
please choose a conversion type property no Velg eksport
type
-please choose a conversion type from the list property no velg
eksport type fra listen
+please choose a conversion type from the list property no Velg
eksport type fra listen
please choose a file property no Velg en fil
-please either select generate id or type a equipment id ! property
no enten valg GENERER ID eller angi et utstyrs ID
-please enter a apartment id ! property no angi leilighet ID
-please enter a building id ! property no angi bygg ID
-please enter a invoice num! property no Angi Fakturanummer
+please either select generate id or type a equipment id ! property
no enten velg GENERER-id eller angi et utstyrs-id
+please enter a apartment id ! property no Angi leilighets-id
+please enter a building id ! property no Angi bygg-id
+please enter a invoice num! property no Angi fakturanummer
please enter a description! property no Angi en beskrivelse!
-please enter a entrance id ! property no angi inngang ID
+please enter a entrance id ! property no Angi inngangs-id
please enter a index ! property no Angi en indeks
Please enter a title ! property no Angi en overskrift
-please enter an activity code ! property no angi en
aktivitets kode
-please enter an agreement code ! property no angi en avtale
kode
+please enter an activity code ! property no Angi en
aktivitets kode
+please enter an agreement code ! property no Angi en avtale
kode
please enter an agreement group code ! property no Angi en
avtale-gruppe-kode
please enter a name ! property no Angi et navn
please - enter an amount! property no Angi et beløp!
-please enter a new index for calkulating next value(s)! property
no angi en ny index for beregning av neste verdi(er)!
+please enter a new index for calkulating next value(s)! property
no Angi en ny index for beregning av neste verdi(er)!
please enter an integer ! property no Angi heltall
please enter an integer for order! property no Angi heltall
for bestillingsnr
-Please - enter a invoice number property no Angi FakturaNr
please enter a project name ! property no Angi prosjekt navn
-please enter a property id ! property no Angi eiendoms ID
-please enter a request title ! property no Angi tittel for Behov
+please enter a property id ! property no Angi eiendoms-id
+please enter a request title ! property no Angi tittel for behov
please enter a sql query ! property no Angi en sql-spørring
-please enter a value for either material cost, labour cost or both !
property no angi enten material kostnader, arbeidskostnader eller
begge
+please enter a value for either material cost, labour cost or both !
property no Angi enten material kostnader, arbeidskostnader eller
begge
please enter a workorder title ! property no Angi en
bestillings tittel
please enter either a budget or contrakt sum property no Angi
enten budsjett eller konstraktsum (eller begge)
Please enter value for attribute %1 property no Angi verdi for
felt %1
@@ -1293,43 +1292,43 @@
please select a budget account ! property no Velg en
kostnadsart
please select a valid budget account ! property no Velg en gyldig
kostnadsart
please select a budget reponsible! property no Velg en anviser
-please select a building id ! property no Velg bygnings ID
-please select a category ! property no velg kategori
+please select a building id ! property no Velg bygnings-id
+please select a category ! property no Velg kategori
please select a coordinator ! property no Velg en koordinator
please select a date ! property no Velg dato
please select a district ! property no Velg et distrikt
-please select a entrance id ! property no velg inngangs ID
-please - select a file to import from ! property no velg en
fil å importere fra
+please select a entrance id ! property no Velg inngangs-id
+please - select a file to import from ! property no Velg en
fil å importere fra
please select a file to upload ! property no Velg en fil for
opplasting
-please - select a import format ! property no velg et import
format
-please select a location ! property no velg lokalisering
+please - select a import format ! property no Velg et import
format
+please select a location ! property no Velg lokalisering
please select a location - or an entity! property no Velg en
lokalisering eller en entitet
-please select an agreement ! property no velg en avtale
+please select an agreement ! property no Velg en avtale
please select an agreement_group ! property no Velg en
avtale-gruppe
Please select an end date! property no Angi slutt-dato
-please select a period for write off ! property no velg en
avskrivningsperiode
+please select a period for write off ! property no Velg en
avskrivningsperiode
please select a person or a group to handle the ticket ! property
no Velg en person eller gruppe for tildeling av melding
-please select a person to handle the ticket ! property no velg en
person som saksbehandler for denne meldingen
-please select a property id ! property no velg en eiendoms ID
-please select a status ! property no velg status
-please select a type ! property no velg type
-please select a valid project ! property no velg et gyldig
prosjekt
-please - select a vendor! property no velg en leverandør
-please select a workorder ! property no velg en ordre!
-please - select budget responsible! property no velg en anviser
+please select a person to handle the ticket ! property no Velg en
person som saksbehandler for denne meldingen
+please select a property id ! property no Velg en eiendoms-id
+please select a status ! property no Velg status
+please select a type ! property no Velg type
+please select a valid project ! property no Velg et gyldig
prosjekt
+please - select a vendor! property no Velg en leverandør
+please select a workorder ! property no Velg en ordre!
+please - select budget responsible! property no Velg en anviser
please select change type property no Velg en endringstype
-please - select either payment date or number of days from invoice date !
property no velg enten betalingsdato eller angi antall dager till
forfall fra fakturadato
+please - select either payment date or number of days from invoice date !
property no Velg enten betalingsdato eller angi antall dager till
forfall fra fakturadato
please select entity type ! property no Velg en entitets-type
-please select equipment type ! property no velg utstyrstype
+please select equipment type ! property no Velg utstyrstype
please select type property no Velg type
-please - select type invoice! property no velg type bilag
-please - select type order! property no velg type bestilling
-please - select vendor! property no velg leverandør
-please set a initial value ! property no sett initiell verdi
-please set a new index ! property no angi ny index
+please - select type invoice! property no Velg type bilag
+please - select type order! property no Velg type bestilling
+please - select vendor! property no Velg leverandør
+please set a initial value ! property no Sett initiell verdi
+please set a new index ! property no Angi ny index
Please set default assign to in preferences for user %1! property
no Angi standardverdi for ansvarlig saksbehandler for bruker %1
Please set default category in preferences for user %1! property
no Angi standardverdi for kategori for bruker %1
-please type a subject for this ticket ! property no angi
overskrift for denne meldingen
+please type a subject for this ticket ! property no Angi
overskrift for denne meldingen
popup calendar property no Kalender
post property no post
power meter property no Strømmåler
@@ -1341,12 +1340,12 @@
presumed finnish date property no Antatt ferdig-dato
pricebook property no prisbok
print view property no Vis utskrift
-priority changed property no prioritet er endret
+priority changed property no Prioritet er endret
priority key property no Prioriteringsnøkkel
-priority keys has been updated property no prioriteringsnøkkel er
oppdatert
+priority keys has been updated property no Prioriteringsnøkkel er
oppdatert
prizing property no Priser
probability property no Sannsynlighet
-project property no prosjekt
+project property no Prosjekt
project type property no Prosjekt type
.project property no Prosjekt
project.condition_survey property no Tilstandsanalyse
@@ -1355,11 +1354,11 @@
project %1 has been saved property no Prosjekt %1 er lagret
project %1 needs approval property no Prosjekt %1 venter på
godkjenning
project budget property no Prosjekt budsjett
-project categories property no Prosjekt kategorier
-project coordinator property no Prosjekt ansvarlig
-project end date property no Prosjekt sluttdato
+project categories property no Prosjekt-kategorier
+project coordinator property no Prosjekt-ansvarlig
+project end date property no Prosjekt-sluttdato
project group property no Agresso prosjekt
-project id property no Prosjekt ID
+project id property no Prosjekt-id
project info property no Prosjekt info.
Project is closed property no Prosjektet er avsluttet.
project name property no Prosjekt navn
@@ -1368,13 +1367,13 @@
.project.workorder property no Bestilling
propagate property no Propager
property common no Eiendom
-property has been edited property no eiendom er oppdater
-property has been saved property no eiendom er lagret
-property id property no eiendoms ID
-property name property no Eiendoms Navn
+property has been edited property no Eiendom er oppdatert
+property has been saved property no Eiendom er lagret
+property id property no eiendoms-id
+property name property no Eiendomsnavn
public property no Vises for alle
publish text property no Publiser tekst
-purchase cost property no anskaffelses kostnad
+purchase cost property no Anskaffelseskostnad
quantity property no Mengde
read property no Les
ready for processing claim property no Til fakturering
@@ -1394,16 +1393,16 @@
reminder property no Påminning
rental property no Utleie
rental agreement property no Utleieavtale
-rental agreement attributes property no Leieavtale attributter
-rental agreement categories property no Leieavtale kategorier
+rental agreement attributes property no Leieavtale-attributter
+rental agreement categories property no Leieavtale-kategorier
rental agreement item attributes property no Attributter for
utleie - detaljer
rental type property no Utleietype
re-opened property no Gjenåpnet
-repeat property no serie
-repeat type property no type serie
-repeat day property no gjenta dag
+repeat property no Serie
+repeat type property no Type serie
+repeat day property no Gjenta dag
request property no Behov
-set the status of the request property no Sett status for Behovet
+set the status of the request property no Sett status for behovet
reset approval property no Nullstill
project.request property no Behov
request attributes property no Behov::attributter
@@ -1419,15 +1418,15 @@
request descr property no Beskrivelse av tiltak
request end date property no Behov frist
request entry date property no Registreringsdato for tiltak
-request id property no Behov ID
+request id property no Behov-id
request start date property no Behov startdato
request status property no Status for behov
-request title property no Tiltak tittel
+request title property no Tiltakstittel
request description property no Tilstandbeskrivelse
requirement property no Behov/pålegg
resend workorder property no Send ordre på nytt
reserve property no reserve
-reserve remainder property no rest av reserve
+reserve remainder property no Rest av reserve
reset property no Tilbakestill
residential environment property no Bo-miljø
residual demand property no Rest behov
@@ -1435,7 +1434,7 @@
responsible property no Ansvarlig
responsibility property no Ansvar
responsible matrix property no Ansvarsmatrise
-responsibility role property no Rolle for Ansvarsmatrise
+responsibility role property no Rolle for ansvarsmatrise
responsible unit property no Ansvarlig enhet
result property no Resultat
return back to the list property no Returner til oversikt
@@ -1452,8 +1451,8 @@
save as template property no lagre som mal
save the actor and return back to the list property no Lagre
aktøren og returner til oversikten
save the agreement and return back to the list property no Lagre
avtalen og returner til oversikten
-save the apartment property no lagre leilighet
-save the attribute property no lagre attributt
+save the apartment property no Lagre leilighet
+save the attribute property no Lagre attributt
save the budget account property no Lagre budsjettkotntoen
save the building property no lagre bygning
save the category property no Lagre kategorien
@@ -1463,10 +1462,10 @@
save the deviation property no Lagre avvik
save the document property no lagre dokument
save the entity property no Lagre entitet
-save the entrance property no lagre inngang
-save the entry and return to list property no lagre data og
returner til hovedliste
-save the equipment property no lagre utstyr
-save the gab property no Lagre GrunnEiendom
+save the entrance property no Lagre inngang
+save the entry and return to list property no Lagre data og
returner til hovedliste
+save the equipment property no Lagre utstyr
+save the gab property no Lagre grunneiendom
save the investment property no lagre investering
save the location property no Lagre lokalisering
save the meter property no lagre måler
@@ -1473,77 +1472,77 @@
save the method property no Lagre metoden
save the owner and return back to the list property no Lagre
eier og returner til oversikten
save the part of town and return back to the list property no
Lagre bydel og returner til oversikten
-save the project property no lagre prosjekt
-save the property property no lagre eiendom
+save the project property no Lagre prosjekt
+save the property property no Lagre eiendom
save the rental agreement and return back to the list property no
Lagre utleieavtale og returner til oversikten
-save the request property no lagre Behov
+save the request property no Lagre behov
save the service agreement and return back to the list property no
Lagre serviceavtale og returner til oversikten
-save the standard property no lagre standard
+save the standard property no Lagre standard
save the status property no Lagre status
save the ticket property no Lagre melding og bli stående i
skjema
-save the voucher property no lagre bilag
-save the workorder property no lagre bestilling
-save this workorder as a template for later use property no
lagre denne bestillingen som mal for senere bruk
+save the voucher property no Lagre bilag
+save the workorder property no Lagre bestilling
+save this workorder as a template for later use property no
Lagre denne bestillingen som mal for senere bruk
save values and exit property no Lagre verdier og gå til liste
-save new property no Lagre og Ny
+save new property no Lagre og ny
scale property no Scale
-schedule property no planlegge (tid)
+schedule property no Planlegge (tid)
scheduled events property no Planlagte oppgaver
schedule the method property no Tidsplanlegging
score property no Poengsum
-search by bruk. to show all entries, empty all fields and press the submit
button again property no Søk etter BruksNr
-search by feste. to show all entries, empty all fields and press the submit
button again property no Søk etter FesteNr
-search by gaards nr. to show all entries, empty all fields and press the
submit button again property no Søk etter GårdsNr
+search by bruk. to show all entries, empty all fields and press the submit
button again property no Søk etter bruksnr.
+search by feste. to show all entries, empty all fields and press the submit
button again property no Søk etter festenr.
+search by gaards nr. to show all entries, empty all fields and press the
submit button again property no Søk etter gårdsnr.
search by location_code. to show all entries, empty all fields and press the
submit button again property no Søk etter lokaliseringskode
-search by property property no søk ved eiendom
-search by seksjon. to show all entries, empty all fields and press the submit
button again property no Søk etter Seksjon
+search by property property no Søk ved eiendom
+search by seksjon. to show all entries, empty all fields and press the submit
button again property no Søk etter seksjon
search criteria property no Søkekriterie
-search for history at this location property no søk etter
historikk for denne lokaliseringen
-search for investment entries property no søk etter
investeringsposter
-search for paid invoices property no søk etter betalte bilag
-search for voucher id property no Søk etter bilagsnr
+search for history at this location property no Søk etter
historikk for denne lokaliseringen
+search for investment entries property no Søk etter
investeringsposter
+search for paid invoices property no Søk etter betalte bilag
+search for voucher id property no Søk etter bilagsnr.
see attachment property no Se vedlegg
-seksjons nr property no Seksjons nr
-select property no velg
+seksjons nr property no Seksjonsnr.
+select property no Velg
select a actor type property no Velg en aktør-type
select a agreement type property no Velg en avtale-type
select a custom function property no Velg en egendefinert
funsksjon
-select a datatype property no velg en datatype
-select a entity type property no velg en entitetstype
+select a datatype property no Velg en datatype
+select a entity type property no Velg en entitetstype
select agreement property no Velg avtale
select agreement group property no Velg en avtale-gruppe
select agreement_group property no Velg avtalegruppe
select all property no Velg alle
select none property no Velg ingen
-select a location property no velg en lokalisering
+select a location property no Velg en lokalisering
select a location! property no Velg en lokalisering
-select a value property no velg en verdi
+select a value property no Velg en verdi
select a rental agreement type property no Velg en leieavtale-type
select a service agreement type property no Velg en
serviceavtale-type
-select a standard-code from the norwegian standard property no
velg en standard NS-kode
+select a standard-code from the norwegian standard property no
Velg en standard NS-kode
select a tenant property no Velg en leietaker
-select branch property no velg fag
+select branch property no Velg fag
select b-responsible property no Velg anviser
-select building part property no velg bygningsdel
-select category property no Velg Kategori
-select chapter property no velg kapittel
+select building part property no Velg bygningsdel
+select category property no Velg kategori
+select chapter property no Velg kapittel
select column property no Velg kolonne
-select conversion property no velg filter
-select coordinator property no velg coordinator
+select conversion property no Velg filter
+select coordinator property no Velg koordinator
select date property no Velg dato
-select date for the file to roll back property no velg dato for
fil som skal rulles tibake
-select date the document was created property no velg dat for
opprettelse av dokumentet
+select date for the file to roll back property no Velg dato for
fil som skal rulles tibake
+select date the document was created property no Velg dato for
opprettelse av dokumentet
select default vendor category property no Velg standard
leverandør-kategori
select either a location or an entity property no Velg enten en
lokalisering eller en entitet
-select either a location or an equipment property no velg
enten en lokalisering eller ett utstyr
-select email property no velg e-post
-select file to roll back property no velg fil for
tilbakerulling
+select either a location or an equipment property no Velg
enten en lokalisering eller ett utstyr
+select email property no Velg e-post
+select file to roll back property no Velg fil for
tilbakerulling
select file to upload property no Velg fil for opplasting
select files property no Velg filer
-select grouping property no velg gruppering
-select invoice type property no Velg Art
-select key responsible property no velg nøkkelansvarlig
-select location level property no Velg lokaliserings nivå
+select grouping property no Velg gruppering
+select invoice type property no Velg art
+select key responsible property no Velg nøkkelansvarlig
+select location level property no Velg lokaliseringsnivå
select nullable property no Velg nullable
select owner property no Velg eier
select per button ! property no Velg ved hjelp av knappen !
@@ -1550,127 +1549,127 @@
select rental type property no Velg utleietype
select request property no Velg behov
select responsible property no Velg ansvarlig
-select status property no velg status
-select submodule property no velg submodul
-select the account class the selection belongs to property no
velg kontoklasse
+select status property no Velg status
+select submodule property no Velg submodul
+select the account class the selection belongs to property no
Velg kontoklasse
select the agreement_group the pricebook belongs to. to do not use a category
select no category property no Velg avtalegruppen denne
prisboken tilhører
select the agreement group this activity belongs to. property no
Velg avtalegruppen denne aktiviteten tilhører
-select the agreement the pricebook belongs to. to do not use a category select
no category property no velg avtale denne prisboken tilhører
-select the agreement this activity belongs to. property no velg
avtale denne aktiviteten tilhører
-select the appropriate condition degree property no velg
tilstandsgrad
-select the appropriate consequence by breakdown of this component for this
theme property no velg konsekvens ved sammenbrudd av
dennekomponenten for dette temaet
-select the appropriate propability for worsening of the condition
property no velg sannsynlighet for forverring
-select the appropriate tax code property no velg mva-kode
-select the branches for this project property no velg fag for
dette prosjektet
-select the branches for this request property no velg fag for
dette behovet
-select the branch for this activity. property no velg fag for
denne aktiviteten
-select the branch for this document property no velg fag for
dette dokumentet
+select the agreement the pricebook belongs to. to do not use a category select
no category property no Velg avtale denne prisboken tilhører
+select the agreement this activity belongs to. property no Velg
avtale denne aktiviteten tilhører
+select the appropriate condition degree property no Velg
tilstandsgrad
+select the appropriate consequence by breakdown of this component for this
theme property no Velg konsekvens ved sammenbrudd av
dennekomponenten for dette temaet
+select the appropriate propability for worsening of the condition
property no Velg sannsynlighet for forverring
+select the appropriate tax code property no Velg mva-kode
+select the branches for this project property no Velg fag for
dette prosjektet
+select the branches for this request property no Velg fag for
dette behovet
+select the branch for this activity. property no Velg fag for
denne aktiviteten
+select the branch for this document property no Velg fag for
dette dokumentet
select the budget responsible property no Velg anviser
-select the building part for this activity. property no velg
bygningsdel for denne aktiviteten
+select the building part for this activity. property no Velg
bygningsdel for denne aktiviteten
select the category the actor belongs to. to do not use a category select no
category property no Velg kategorien denne aktøren tilhører
select the category the agreement belongs to. to do not use a category select
no category property no Velg kategorien denne avtalen tilhører
select the category the alarm belongs to. to do not use a category select no
category property no Velg kategorien denne alarmen tilhører
-select the category the apartment belongs to. to do not use a category select
no category property no velg kategori leilighetene tilhører.
For ikke å bruke kategori velg KATEGORI IKKE VALGT
-select the category the building belongs to. to do not use a category select
no category property no velg kategori bygningene tilhører.
For ikke å bruke kategori velg KATEGORI IKKE VALGT
+select the category the apartment belongs to. to do not use a category select
no category property no Velg kategori leilighetene tilhører.
For ikke å bruke kategori velg KATEGORI IKKE VALGT
+select the category the building belongs to. to do not use a category select
no category property no Velg kategori bygningene tilhører.
For ikke å bruke kategori velg KATEGORI IKKE VALGT
select the category the claim belongs to. to do not use a category select no
category property no Velg kategorien dette kravet tilhører
select the category the custom belongs to. to do not use a category select no
category property no Velg kategorien denne egentilpassede tilhører
select the category the data belong to. to do not use a category select no
category property no Velg kategorien posten tilhører
-select the category the document belongs to. to do not use a category select
no category property no velg kategori dokumentene tilhører.
For ikke å bruke kategori velg KATEGORI IKKE VALGT
-select the category the entrance belongs to. to do not use a category select
no category property no velg kategori inngang tilhører. For
ikke å bruke kategori velg KATEGORI IKKE VALGT
-select the category the equipment belongs to. to do not use a category select
no category property no velg kategori utstyr tilhører. For
ikke å bruke kategori velg KATEGORI IKKE VALGT
-select the category the investment belongs to. to do not use a category select
no category property no velg kategori investering tilhører. For
ikke å bruke kategori velg KATEGORI IKKE VALGT
+select the category the document belongs to. to do not use a category select
no category property no Velg kategori dokumentene tilhører.
For ikke å bruke kategori velg KATEGORI IKKE VALGT
+select the category the entrance belongs to. to do not use a category select
no category property no Velg kategori inngang tilhører. For
ikke å bruke kategori velg KATEGORI IKKE VALGT
+select the category the equipment belongs to. to do not use a category select
no category property no Velg kategori utstyr tilhører. For
ikke å bruke kategori velg KATEGORI IKKE VALGT
+select the category the investment belongs to. to do not use a category select
no category property no Velg kategori investering tilhører. For
ikke å bruke kategori velg KATEGORI IKKE VALGT
select the category the location belongs to. to do not use a category select
no category property no Velg kategorien denne lokaliseringen
tilhører
-select the category the meter belongs to. to do not use a category select no
category property no velg kategori måler tilhører. For ikke å
bruke kategori velg KATEGORI IKKE VALGT
+select the category the meter belongs to. to do not use a category select no
category property no Velg kategori måler tilhører. For ikke å
bruke kategori velg KATEGORI IKKE VALGT
select the category the permissions belongs to. to do not use a category
select no category property no Velg kategorien denne rettigheten
tilhører
-select the category the pricebook belongs to. to do not use a category select
no category property no velg kategori prisbok tilhører. For
ikke å bruke kategori velg KATEGORI IKKE VALGT
-select the category the project belongs to. to do not use a category select no
category property no velg kategori prosjekt tilhører. For
ikke å bruke kategori velg KATEGORI IKKE VALGT
-select the category the property belongs to. to do not use a category select
no category property no velg kategori eiendom tilhører. For
ikke å bruke kategori velg KATEGORI IKKE VALGT
+select the category the pricebook belongs to. to do not use a category select
no category property no Velg kategori prisbok tilhører. For
ikke å bruke kategori velg KATEGORI IKKE VALGT
+select the category the project belongs to. to do not use a category select no
category property no Velg kategori prosjekt tilhører. For
ikke å bruke kategori velg KATEGORI IKKE VALGT
+select the category the property belongs to. to do not use a category select
no category property no Velg kategori eiendom tilhører. For
ikke å bruke kategori velg KATEGORI IKKE VALGT
select the category the r_agreement belongs to. to do not use a category
select no category property no Velg kategorien denne
utleieavtalen tilhører
-select the category the request belongs to. to do not use a category select no
category property no velg kategori behovet tilhører. For
ikke å bruke kategori velg KATEGORI IKKE VALGT
+select the category the request belongs to. to do not use a category select no
category property no Velg kategori behovet tilhører. For
ikke å bruke kategori velg KATEGORI IKKE VALGT
select the category the s_agreement belongs to. to do not use a category
select no category property no Velg kategorien denne
serviceavtalen tilhører
-select the category the ticket belongs to. to do not use a category select no
category property no velg kategori melding tilhører. For ikke å
bruke kategori velg KATEGORI IKKE VALGT
-select the category the workorder belongs to. to do not use a category select
no category property no velg kategori bestillingen tilhører.
For ikke å bruke kategori velg KATEGORI IKKE VALGT
+select the category the ticket belongs to. to do not use a category select no
category property no Velg kategori melding tilhører. For ikke å
bruke kategori velg KATEGORI IKKE VALGT
+select the category the workorder belongs to. to do not use a category select
no category property no Velg kategori bestillingen tilhører.
For ikke å bruke kategori velg KATEGORI IKKE VALGT
select the category. to do not use a category select no category
property no Velg kategori
-select the chapter (for tender) for this activity. property no
velg tilbudskapittel for denne posten
-select the coordinator the document belongs to. to do not use a category
select no user property no velg koordinator dokument
tilhører. For ikke å bruke koordinator velg BRUKER IKKE VALG
-select the coordinator the project belongs to. to do not use a category select
no user property no velg koordinator prosjekt tilhører. For ikke å
bruke koordinator velg BRUKER IKKE VALG
-select the coordinator the request belongs to. to do not use a category select
no user property no velg koordinator behovet tilhører. For ikke å
bruke koordinator velg BRUKER IKKE VALG
+select the chapter (for tender) for this activity. property no
Velg tilbudskapittel for denne posten
+select the coordinator the document belongs to. to do not use a category
select no user property no Velg koordinator dokument
tilhører. For ikke å bruke koordinator velg BRUKER IKKE VALG
+select the coordinator the project belongs to. to do not use a category select
no user property no Velg koordinator prosjekt tilhører. For ikke å
bruke koordinator velg BRUKER IKKE VALG
+select the coordinator the request belongs to. to do not use a category select
no user property no Velg koordinator behovet tilhører. For ikke å
bruke koordinator velg BRUKER IKKE VALG
select the customer by clicking this link property no Velg
kunde
-select the date for the first value property no angi dato for
første verdi
-select the date for the update property no angi dato for
oppdatering
-select the dim b for this invoice. to do not use dim b - select no dim b
property no velg Ansvarssted for bilag. For ikke å bruke
Ansvarssted - velg Ansvarssted IKKE VALGT
-select the dim d for this activity. to do not use dim d - select no dim d
property no velg DIM 6 for bilag. For ikke å bruke DIM 6 - velg
DIMD IKKE VALGT
+select the date for the first value property no Angi dato for
første verdi
+select the date for the update property no Angi dato for
oppdatering
+select the dim b for this invoice. to do not use dim b - select no dim b
property no Velg Ansvarssted for bilag. For ikke å bruke
Ansvarssted - velg Ansvarssted IKKE VALGT
+select the dim d for this activity. to do not use dim d - select no dim d
property no Velg DIM 6 for bilag. For ikke å bruke DIM 6 - velg
DIMD IKKE VALGT
select the district the part of town belongs to. property no
Velg hvilke distrikt denne bydelen tilhører
-select the district the selection belongs to. to do not use a district select
no district property no velg distrikt utvalget tilhører. For
ikke å bruke distrikt velg DISTRIKT IKKE VALGT
+select the district the selection belongs to. to do not use a district select
no district property no Velg distrikt utvalget tilhører. For
ikke å bruke distrikt velg DISTRIKT IKKE VALGT
select the document type the document belongs to. property no
Velg dokumenttype for dette dokumentet
-select the equipment type the document belongs to. to do not use a type select
no equipment type property no velg utstyrstype dokumenter
tilhøre.rFor ikke å bruke utstyrstype velg TYPE IKKE VALGT
+select the equipment type the document belongs to. to do not use a type select
no equipment type property no Velg utstyrstype dokumenter
tilhøre.rFor ikke å bruke utstyrstype velg TYPE IKKE VALGT
select the estimated date for closing the task property no Velg
beregnet dato for lukking av oppgave
-select the estimated end date for the agreement property no
Angi estimert slutt-dato for avtalen
+select the estimated end date for the agreement property no
Angi estimert sluttdato for avtalen
select the estimated end date for the project property no Angi
estimert sluttdato for prosjektet
select the estimated end date for the request property no Angi
estimert sluttdato for behovet
select the estimated start date for the request property no
Angi ønsket startdato for behovet
select the estimated termination date property no Angi estimert
terminerings-dato
-select the file to import from property no velg fil å importere
+select the file to import from property no Velg fil å importere
select the filter. to show all entries select show all property no
Velg filter. For å vise alle - velg VIS ALLE
-select the granting group. to do not use a granting group select no granting
group property no Angi tildelings gruppe
-select the grouping for this activity. property no velg gruppering
for denne posten
+select the granting group. to do not use a granting group select no granting
group property no Angi tildelingsgruppe
+select the grouping for this activity. property no Velg gruppering
for denne posten
select the grouping the selection belongs to property no Velg
gruppering utvelgelsen gjelder
-select the janitor responsible for this invoice. to do not use janitor -
select no janitor property no velg bestiller bilaget tilhører.
For ikke å tildele bestiller velg BESTILLER IKKE VALG
-select the key responsible for this project property no velg
nøkkelansvarlig
+select the janitor responsible for this invoice. to do not use janitor -
select no janitor property no Velg bestiller bilaget tilhører.
For ikke å tildele bestiller velg BESTILLER IKKE VALG
+select the key responsible for this project property no Velg
nøkkelansvarlig
select the level for this information property no Velg nivå for
denne informasjonen
select the method for this times service property no Velg
metode
select the owner property no Velg eier
select the owner type. to show all entries select show all property
no Velg eiertype
-select the part of town the building belongs to. to do not use a part of town
- select no part of town property no velg bydel bygg
tilhører. For ikke å bruke bydel velg BYDEL IKKE VALGT
-select the part of town the investment belongs to. to do not use a part of
town - select no part of town property no velg bydel
investeriong tilhører. For ikke å bruke bydel velg BYDEL IKKE VALGT
-select the part of town the property belongs to. to do not use a part of town
- select no part of town property no velg bydel eiendom
tilhører. For ikke å bruke bydel velg BYDEL IKKE VALGT
-select the part of town the selection belongs to. to do not use a part of town
select no part of town property no velg bydel
-select the priority the selection belongs to. property no velg
prioritet
+select the part of town the building belongs to. to do not use a part of town
- select no part of town property no Velg bydel bygg
tilhører. For ikke å bruke bydel velg BYDEL IKKE VALGT
+select the part of town the investment belongs to. to do not use a part of
town - select no part of town property no Velg bydel
investeriong tilhører. For ikke å bruke bydel velg BYDEL IKKE VALGT
+select the part of town the property belongs to. to do not use a part of town
- select no part of town property no Velg bydel eiendom
tilhører. For ikke å bruke bydel velg BYDEL IKKE VALGT
+select the part of town the selection belongs to. to do not use a part of town
select no part of town property no Velg bydel
+select the priority the selection belongs to. property no Velg
prioritet
select the property by clicking this link property no klikk
her for å velge eiendom
select the revision the selection belongs to property no Velg
revisjonen utvelgelsen gjelder
-select the status the agreement belongs to. to do not use a category select no
status property no velg status avtale tilhører. For ikke å bruke
status velg STATUS IKKE VALGT
+select the status the agreement belongs to. to do not use a category select no
status property no Velg status avtale tilhører. For ikke å bruke
status velg STATUS IKKE VALGT
select the status the agreement group belongs to. to do not use a category
select no status property no Velg status
-select the status the document belongs to. to do not use a category select no
status property no velg status dokument tilhører. For ikke å
bruke status velg STATUS IKKE VALGT
+select the status the document belongs to. to do not use a category select no
status property no Velg status dokument tilhører. For ikke å
bruke status velg STATUS IKKE VALGT
select the status. to do not use a status select no status property
no Velg status
-select the street name property no velg gatenavn
-select the supervisor responsible for this invoice. to do not use supervisor -
select no supervisor property no velg attestant bilaget
tilhører. For ikke å tildele bestiller velg ATTESTANT IKKE VALG
-select the template-chapter property no velg kapittel
-select the tolerance for this activity. property no velg
toleranse for denne posten
-select the type invoice. to do not use type - select no type property
no velg type
+select the street name property no Velg gatenavn
+select the supervisor responsible for this invoice. to do not use supervisor -
select no supervisor property no Velg attestant bilaget
tilhører. For ikke å tildele bestiller velg ATTESTANT IKKE VALG
+select the template-chapter property no Velg kapittel
+select the tolerance for this activity. property no Velg
toleranse for denne posten
+select the type invoice. to do not use type - select no type property
no Velg type
select the type of conversion: property no Velg type import:
-select the type of value property no velg type verdi
-select the unit for this activity. property no velg enhet for
post
@@ Diff output truncated at 153600 characters. @@
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [16901] Stable: Merge 16893:16900 from trunk,
sigurdne <=