[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [6757] Merge 6747:6756 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [6757] Merge 6747:6756 from trunk |
|
Date: |
Wed, 12 Jan 2011 12:49:58 +0000 |
Revision: 6757
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6757
Author: sigurdne
Date: 2011-01-12 12:49:58 +0000 (Wed, 12 Jan 2011)
Log Message:
-----------
Merge 6747:6756 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/booking/jasper/templates/application.jrxml
branches/Version-1_0-branch/bookingfrontend/inc/class.uiapplication.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.pdf.inc.php
branches/Version-1_0-branch/phpgwapi/inc/combine.php
branches/Version-1_0-branch/phpgwapi/inc/pdf/class.pdf.php
branches/Version-1_0-branch/property/inc/class.boentity.inc.php
branches/Version-1_0-branch/property/inc/class.boworkorder.inc.php
branches/Version-1_0-branch/property/inc/class.soentity.inc.php
branches/Version-1_0-branch/property/inc/class.solocation.inc.php
branches/Version-1_0-branch/property/inc/class.sotts.inc.php
branches/Version-1_0-branch/property/inc/class.uiinvoice.inc.php
branches/Version-1_0-branch/property/inc/class.uijasper.inc.php
branches/Version-1_0-branch/property/setup/phpgw_no.lang
Added Paths:
-----------
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/groovy-all-1.7.5.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/jasperreports-4.0.0.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/jasperreports-applet-4.0.0.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/jasperreports-fonts-4.0.0.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/jasperreports-javaflow-4.0.0.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/jxl-2.6.10.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/poi-3.6.jar
Removed Paths:
-------------
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/groovy-all-1.5.5.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/jasperreports-3.7.4.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/jasperreports-fonts-3.7.4.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/jxl-2.6.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/poi-3.5-FINAL-20090928.jar
Property Changed:
----------------
branches/Version-1_0-branch/
Property changes on: branches/Version-1_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746
+
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756
Modified: branches/Version-1_0-branch/booking/jasper/templates/application.jrxml
===================================================================
--- branches/Version-1_0-branch/booking/jasper/templates/application.jrxml
2011-01-12 12:46:41 UTC (rev 6756)
+++ branches/Version-1_0-branch/booking/jasper/templates/application.jrxml
2011-01-12 12:49:58 UTC (rev 6757)
@@ -2,7 +2,7 @@
<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports
http://jasperreports.sourceforge.net/xsd/jasperreport.xsd"; name="report1"
language="groovy" pageWidth="595" pageHeight="842" columnWidth="555"
leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20">
<property name="ireport.zoom" value="0.9090909090909091"/>
<property name="ireport.x" value="0"/>
- <property name="ireport.y" value="120"/>
+ <property name="ireport.y" value="478"/>
<property name="net.sf.jasperreports.export.pdf.tagged" value="true"/>
<property name="net.sf.jasperreports.export.pdf.tag.language"
value="EN-US"/>
<style name="table">
@@ -25,8 +25,43 @@
<style name="Sans_Bold" fontName="FreeSerif" fontSize="10"
isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false"/>
<style name="Sans_Italic" fontName="FreeSerif" fontSize="10"
isBold="false" isItalic="true" isUnderline="false" isStrikeThrough="false"/>
<style name="Sans_Bold_Italic" fontName="FreeSerif" fontSize="10"
isBold="true" isItalic="true" isUnderline="false" isStrikeThrough="false"/>
+ <subDataset name="resources">
+ <parameter name="APPLICATION_ID" class="java.lang.Integer"/>
+ <queryString>
+ <![CDATA[SELECT bb_resource.name AS resource_name,
bb_resource.type AS resource_type FROM
bb_application,bb_application_resource,bb_resource WHERE bb_application.id =
$P!{APPLICATION_ID} AND bb_application.id =
bb_application_resource.application_id AND bb_application_resource.resource_id
= bb_resource.id]]>
+ </queryString>
+ <field name="resource_name" class="java.lang.String"/>
+ <field name="resource_type" class="java.lang.String"/>
+ </subDataset>
+ <subDataset name="targetaudience">
+ <parameter name="APPLICATION_ID" class="java.lang.Integer"/>
+ <queryString>
+ <![CDATA[SELECT bb_targetaudience.name AS
targetaudience FROM bb_application_targetaudience,bb_targetaudience WHERE
bb_application_targetaudience.application_id = $P!{APPLICATION_ID} AND
bb_application_targetaudience.targetaudience_id = bb_targetaudience.id]]>
+ </queryString>
+ <field name="targetaudience" class="java.lang.String"/>
+ </subDataset>
+ <subDataset name="agegroup">
+ <parameter name="APPLICATION_ID" class="java.lang.Integer"/>
+ <queryString>
+ <![CDATA[SELECT bb_agegroup.name AS agegroup ,
bb_application_agegroup.male, bb_application_agegroup.female FROM
bb_agegroup,bb_application_agegroup WHERE
bb_application_agegroup.application_id = $P!{APPLICATION_ID} AND
bb_application_agegroup.agegroup_id = bb_agegroup.id AND bb_agegroup.active = 1
ORDER BY bb_agegroup.sort]]>
+ </queryString>
+ <field name="agegroup" class="java.lang.String"/>
+ <field name="male" class="java.lang.Integer"/>
+ <field name="female" class="java.lang.Integer"/>
+ </subDataset>
+ <subDataset name="comment">
+ <parameter name="APPLICATION_ID" class="java.lang.Integer"/>
+ <queryString language="SQL">
+ <![CDATA[SELECT
+ to_char(time,'DD/MM/YYYY HH24:MI') AS date, author, comment FROM
"bb_application_comment" bb_application_comment WHERE
bb_application_comment.application_id = $P!{APPLICATION_ID} AND
bb_application_comment.type = 'comment']]>
+ </queryString>
+ <field name="date" class="java.lang.String"/>
+ <field name="author" class="java.lang.String"/>
+ <field name="comment" class="java.lang.String"/>
+ </subDataset>
<parameter name="BK_APPLICATION_ID" class="java.lang.String"/>
<parameter name="BK_BUILDING_NAME" class="java.lang.String"/>
+ <parameter name="BK_PATH" class="java.lang.String"/>
<queryString>
<![CDATA[SELECT bb_application.id AS application_id,
bb_application.status AS application_status, to_char(bb_application.created,
'DD/MM/YYYY HH24:MI') AS application_created, to_char(bb_application.modified,
'DD/MM/YYYY HH24:MI') AS application_modified,bb_application.contact_name,
bb_application.contact_email,
bb_application.contact_phone,bb_application.description,
to_char(bb_application_date.from_, 'DD/MM/YYYY HH24:MI') AS from,
to_char(bb_application_date.to_, 'DD/MM/YYYY HH24:MI') AS to, bb_activity.name
AS activity_name, bb_event.cost AS price,bb_application_comment.comment AS
comment FROM bb_application, bb_application_date,bb_activity, bb_event,
bb_application_comment WHERE bb_application.id = ANY
(string_to_array($P{BK_APPLICATION_ID}, ',')::int4[]) AND bb_application.id =
bb_application_date.application_id AND bb_application.activity_id =
bb_activity.id AND bb_application.id = bb_event.application_id AND
bb_application.id = bb_application_comment.application_id LIMIT 1]]>
</queryString>
@@ -50,11 +85,11 @@
<band height="107" splitType="Stretch">
<image>
<reportElement x="0" y="11" width="102"
height="74"/>
- <imageExpression
class="java.lang.String"><![CDATA["/srv/portico/webapp/booking/jasper/templates/logo.png"]]></imageExpression>
+ <imageExpression
class="java.lang.String"><![CDATA[$P{BK_PATH} +
"/booking/jasper/templates/logo.png"]]></imageExpression>
</image>
<image>
<reportElement x="405" y="0" width="150"
height="100"/>
- <imageExpression
class="java.lang.String"><![CDATA["/srv/portico/webapp/booking/jasper/templates/aktivby.png"]]></imageExpression>
+ <imageExpression
class="java.lang.String"><![CDATA[$P{BK_PATH} +
"/booking/jasper/templates/aktivby.png"]]></imageExpression>
</image>
</band>
</title>
@@ -84,6 +119,26 @@
</textElement>
<text><![CDATA[Leie av kommunale bygg, anlegg
og byrom.]]></text>
</staticText>
+ <componentElement>
+ <reportElement x="227" y="131" width="312"
height="13"/>
+ <jr:list
xmlns:jr="http://jasperreports.sourceforge.net/jasperreports/components";
xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports/components
http://jasperreports.sourceforge.net/xsd/components.xsd";
printOrder="Horizontal">
+ <datasetRun subDataset="resources">
+ <datasetParameter
name="APPLICATION_ID">
+
<datasetParameterExpression><![CDATA[$F{application_id}]]></datasetParameterExpression>
+ </datasetParameter>
+
<connectionExpression><![CDATA[$P{REPORT_CONNECTION}]]></connectionExpression>
+ </datasetRun>
+ <jr:listContents height="13"
width="312">
+ <textField>
+ <reportElement
style="Sans_Bold" x="0" y="0" width="312" height="13"/>
+ <textElement>
+ <font
isUnderline="false" pdfFontName="Helvetica" isPdfEmbedded="true"/>
+ </textElement>
+ <textFieldExpression
class="java.lang.String"><![CDATA[$F{resource_name}]]></textFieldExpression>
+ </textField>
+ </jr:listContents>
+ </jr:list>
+ </componentElement>
<staticText>
<reportElement style="headers" x="6" y="105"
width="546" height="20"/>
<textElement/>
@@ -95,12 +150,45 @@
<text><![CDATA[Formål]]></text>
</staticText>
<staticText>
+ <reportElement style="headers" x="6" y="443"
width="546" height="20"/>
+ <textElement/>
+ <text><![CDATA[Målgruppe og estimert antall
deltakerte]]></text>
+ </staticText>
+ <break>
+ <reportElement x="0" y="612" width="100"
height="1"/>
+ </break>
+ <staticText>
<reportElement style="Sans_Bold" x="58" y="184"
width="286" height="13"/>
<textElement>
<font isBold="true"
isPdfEmbedded="true"/>
</textElement>
<text><![CDATA[Søker har lest og akseptert
følgende dokument:]]></text>
</staticText>
+ <componentElement>
+ <reportElement x="58" y="482" width="195"
height="13"/>
+ <jr:list
xmlns:jr="http://jasperreports.sourceforge.net/jasperreports/components";
xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports/components
http://jasperreports.sourceforge.net/xsd/components.xsd"; printOrder="Vertical">
+ <datasetRun subDataset="targetaudience">
+ <datasetParameter
name="APPLICATION_ID">
+
<datasetParameterExpression><![CDATA[$F{application_id}]]></datasetParameterExpression>
+ </datasetParameter>
+
<connectionExpression><![CDATA[$P{REPORT_CONNECTION}]]></connectionExpression>
+ </datasetRun>
+ <jr:listContents height="13"
width="195">
+ <textField>
+ <reportElement x="0"
y="0" width="195" height="13"/>
+ <textElement/>
+ <textFieldExpression
class="java.lang.String"><![CDATA[$F{targetaudience}]]></textFieldExpression>
+ </textField>
+ </jr:listContents>
+ </jr:list>
+ </componentElement>
+ <staticText>
+ <reportElement x="58" y="469" width="100"
height="13"/>
+ <textElement>
+ <font isBold="true"
isPdfEmbedded="true"/>
+ </textElement>
+ <text><![CDATA[Målgruppe:]]></text>
+ </staticText>
<textField pattern="###0.00">
<reportElement x="58" y="261" width="126"
height="13"/>
<textElement/>
@@ -117,6 +205,9 @@
<line>
<reportElement x="6" y="304" width="546"
height="1" forecolor="#C0C0C0"/>
</line>
+ <line>
+ <reportElement x="6" y="461" width="546"
height="1" forecolor="#C0C0C0"/>
+ </line>
<textField>
<reportElement style="Sans_Bold" x="58" y="53"
width="156" height="13"/>
<textElement>
@@ -165,12 +256,124 @@
<textElement/>
<textFieldExpression
class="java.lang.String"><![CDATA["Til: " + $F{to}]]></textFieldExpression>
</textField>
+ <componentElement>
+ <reportElement key="table" style="table"
x="292" y="469" width="191" height="143"/>
+ <jr:table
xmlns:jr="http://jasperreports.sourceforge.net/jasperreports/components";
xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports/components
http://jasperreports.sourceforge.net/xsd/components.xsd";>
+ <datasetRun subDataset="agegroup">
+ <datasetParameter
name="APPLICATION_ID">
+
<datasetParameterExpression><![CDATA[$F{application_id}]]></datasetParameterExpression>
+ </datasetParameter>
+
<connectionExpression><![CDATA[$P{REPORT_CONNECTION}]]></connectionExpression>
+ </datasetRun>
+ <jr:column width="128">
+ <jr:columnHeader height="19"
rowSpan="1">
+ <staticText>
+ <reportElement
style="table_CELL_DARK" x="0" y="0" width="128" height="19"/>
+ <textElement>
+ <font
isBold="true" isItalic="true"/>
+ </textElement>
+
<text><![CDATA[Antall deltakere]]></text>
+ </staticText>
+ </jr:columnHeader>
+ <jr:detailCell height="20"
rowSpan="1">
+ <textField>
+ <reportElement
style="table_CELL_DARK" x="0" y="0" width="128" height="19"/>
+ <textElement>
+ <font
isBold="true"/>
+ </textElement>
+
<textFieldExpression
class="java.lang.String"><![CDATA[$F{agegroup}]]></textFieldExpression>
+ </textField>
+ </jr:detailCell>
+ </jr:column>
+ <jr:column width="47">
+ <jr:columnHeader height="19"
rowSpan="1">
+ <staticText>
+ <reportElement
style="table_CELL_DARK" x="0" y="0" width="47" height="19"/>
+ <textElement>
+ <font
isBold="true"/>
+ </textElement>
+
<text><![CDATA[Mann]]></text>
+ </staticText>
+ </jr:columnHeader>
+ <jr:detailCell height="20"
rowSpan="1">
+ <textField>
+ <reportElement
style="table_CELL_LIGHT" x="0" y="0" width="47" height="19"/>
+ <textElement/>
+
<textFieldExpression
class="java.lang.Integer"><![CDATA[$F{male}]]></textFieldExpression>
+ </textField>
+ </jr:detailCell>
+ </jr:column>
+ <jr:column width="48">
+ <jr:columnHeader height="19"
rowSpan="1">
+ <staticText>
+ <reportElement
style="table_CELL_DARK" x="0" y="0" width="47" height="19"/>
+ <textElement>
+ <font
isBold="true"/>
+ </textElement>
+
<text><![CDATA[Kvinne]]></text>
+ </staticText>
+ </jr:columnHeader>
+ <jr:detailCell height="20"
rowSpan="1">
+ <textField>
+ <reportElement
style="table_CELL_LIGHT" x="0" y="0" width="47" height="19"/>
+ <textElement/>
+
<textFieldExpression
class="java.lang.Integer"><![CDATA[$F{female}]]></textFieldExpression>
+ </textField>
+ </jr:detailCell>
+ </jr:column>
+ </jr:table>
+ </componentElement>
<textField>
<reportElement style="Sans_Normal" x="244"
y="79" width="197" height="13"/>
<textElement/>
<textFieldExpression
class="java.lang.String"><![CDATA["E-post: " +
$F{contact_email}]]></textFieldExpression>
</textField>
</band>
+ <band height="306">
+ <elementGroup>
+ <componentElement>
+ <reportElement x="6" y="32" width="546"
height="52"/>
+ <jr:list
xmlns:jr="http://jasperreports.sourceforge.net/jasperreports/components";
xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports/components
http://jasperreports.sourceforge.net/xsd/components.xsd"; printOrder="Vertical">
+ <datasetRun
subDataset="comment">
+ <datasetParameter
name="APPLICATION_ID">
+
<datasetParameterExpression><![CDATA[$F{application_id}]]></datasetParameterExpression>
+ </datasetParameter>
+
<connectionExpression><![CDATA[$P{REPORT_CONNECTION}]]></connectionExpression>
+ </datasetRun>
+ <jr:listContents height="52"
width="546">
+ <textField>
+ <reportElement
x="0" y="0" width="104" height="13"/>
+ <textElement>
+ <font
isBold="true"/>
+ </textElement>
+
<textFieldExpression
class="java.lang.String"><![CDATA[$F{date}]]></textFieldExpression>
+ </textField>
+ <textField>
+ <reportElement
x="104" y="0" width="117" height="13"/>
+ <textElement>
+ <font
isBold="true"/>
+ </textElement>
+
<textFieldExpression
class="java.lang.String"><![CDATA[$F{author}]]></textFieldExpression>
+ </textField>
+ <textField>
+ <reportElement
x="0" y="13" width="546" height="39"/>
+ <textElement/>
+
<textFieldExpression
class="java.lang.String"><![CDATA[$F{comment}]]></textFieldExpression>
+ </textField>
+ </jr:listContents>
+ </jr:list>
+ </componentElement>
+ </elementGroup>
+ <elementGroup/>
+ <staticText>
+ <reportElement style="headers" x="6" y="6"
width="546" height="20"/>
+ <textElement/>
+ <text><![CDATA[Merknader]]></text>
+ </staticText>
+ <line>
+ <reportElement x="6" y="21" width="546"
height="1" forecolor="#C0C0C0"/>
+ </line>
+ </band>
</detail>
<pageFooter>
<band height="28">
Modified:
branches/Version-1_0-branch/bookingfrontend/inc/class.uiapplication.inc.php
===================================================================
--- branches/Version-1_0-branch/bookingfrontend/inc/class.uiapplication.inc.php
2011-01-12 12:46:41 UTC (rev 6756)
+++ branches/Version-1_0-branch/bookingfrontend/inc/class.uiapplication.inc.php
2011-01-12 12:49:58 UTC (rev 6757)
@@ -37,12 +37,13 @@
if ($_SERVER['REQUEST_METHOD'] == 'POST' &&
$_POST['print'])
{
$output_type = 'PDF';
- $jasper_parameters =
sprintf("\"BK_BUILDING_NAME|%s;BK_APPLICATION_ID|%s\"",
+ $jasper_parameters =
sprintf("\"BK_BUILDING_NAME|%s;BK_APPLICATION_ID|%s;BK_PATH|%s\"",
$application['building_name'],
- $id);
+ $id,
+ $GLOBALS['_SERVER']['DOCUMENT_ROOT']);
// DEBUG
- //print_r($jasper_parameters);
- //exit(0);
+ // print_r($jasper_parameters);
+ // exit(0);
$jasper_wrapper =
CreateObject('phpgwapi.jasper_wrapper');
$report_source =
PHPGW_SERVER_ROOT.'/booking/jasper/templates/application.jrxml';
@@ -53,7 +54,7 @@
catch(Exception $e)
{
$errors[] = $e->getMessage();
- echo
"<pre>\nErrors:";print_r($errors);exit;
+ echo "<pre>\nError:
";print_r($errors[0]);exit;
}
}
Modified: branches/Version-1_0-branch/phpgwapi/inc/class.pdf.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.pdf.inc.php 2011-01-12
12:46:41 UTC (rev 6756)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.pdf.inc.php 2011-01-12
12:49:58 UTC (rev 6757)
@@ -51,7 +51,8 @@
{
$browser = createObject('phpgwapi.browser');
- if($browser->BROWSER_AGENT != 'IE')
+// if($browser->BROWSER_AGENT != 'IE')
+ if(true)
{
$size = strlen($document);
$browser->content_header($document_name
.'.pdf','application/pdf', $size);
@@ -104,14 +105,14 @@
*/
protected function _clear_cache($dir)
{
- $min_ctime = 60 * 60;
+ $min_ctime = time() - (60*60);
$dir = new DirectoryIterator($dir);
- foreach ( $dir as $file )
+ foreach ( $dir as $fileinfo )
{
- if ( preg_match('/^PDF_/', $file)
- && $file->getCTime() < $min_ctime )
+ if ( preg_match('/^PDF_/',
$fileinfo->getFilename())
+ && $fileinfo->getCTime() < $min_ctime )
{
- unlink($file);
+ unlink($fileinfo->getPathname());
}
}
}
Modified: branches/Version-1_0-branch/phpgwapi/inc/combine.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/combine.php 2011-01-12
12:46:41 UTC (rev 6756)
+++ branches/Version-1_0-branch/phpgwapi/inc/combine.php 2011-01-12
12:49:58 UTC (rev 6757)
@@ -162,6 +162,20 @@
{
fwrite($fp, $contents);
fclose($fp);
+
+ /**
+ * Remove files that are older than a day
+ */
+ $min_ctime = time() - (60*60*24);
+ $dir = new DirectoryIterator($cachedir);
+ foreach ( $dir as $fileinfo )
+ {
+ if ( preg_match('/^cache-/',
$fileinfo->getFilename())
+ && $fileinfo->getCTime() <
$min_ctime )
+ {
+
unlink($fileinfo->getPathname());
+ }
+ }
}
}
}
Deleted:
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/groovy-all-1.5.5.jar
===================================================================
(Binary files differ)
Copied:
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/groovy-all-1.7.5.jar (from
rev 6756, trunk/phpgwapi/inc/jasper/lib/groovy-all-1.7.5.jar)
===================================================================
(Binary files differ)
Deleted:
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/jasperreports-3.7.4.jar
===================================================================
(Binary files differ)
Copied:
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/jasperreports-4.0.0.jar
(from rev 6756, trunk/phpgwapi/inc/jasper/lib/jasperreports-4.0.0.jar)
===================================================================
(Binary files differ)
Copied:
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/jasperreports-applet-4.0.0.jar
(from rev 6756, trunk/phpgwapi/inc/jasper/lib/jasperreports-applet-4.0.0.jar)
===================================================================
(Binary files differ)
Deleted:
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/jasperreports-fonts-3.7.4.jar
===================================================================
(Binary files differ)
Copied:
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/jasperreports-fonts-4.0.0.jar
(from rev 6756, trunk/phpgwapi/inc/jasper/lib/jasperreports-fonts-4.0.0.jar)
===================================================================
(Binary files differ)
Copied:
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/jasperreports-javaflow-4.0.0.jar
(from rev 6756, trunk/phpgwapi/inc/jasper/lib/jasperreports-javaflow-4.0.0.jar)
===================================================================
(Binary files differ)
Copied: branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/jxl-2.6.10.jar
(from rev 6756, trunk/phpgwapi/inc/jasper/lib/jxl-2.6.10.jar)
===================================================================
(Binary files differ)
Deleted: branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/jxl-2.6.jar
===================================================================
(Binary files differ)
Deleted:
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/poi-3.5-FINAL-20090928.jar
===================================================================
(Binary files differ)
Copied: branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/poi-3.6.jar (from
rev 6756, trunk/phpgwapi/inc/jasper/lib/poi-3.6.jar)
===================================================================
(Binary files differ)
Modified: branches/Version-1_0-branch/phpgwapi/inc/pdf/class.pdf.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/pdf/class.pdf.php 2011-01-12
12:46:41 UTC (rev 6756)
+++ branches/Version-1_0-branch/phpgwapi/inc/pdf/class.pdf.php 2011-01-12
12:49:58 UTC (rev 6757)
@@ -1238,7 +1238,7 @@
$this->checkAllHere();
$xref=array();
- $content="%PDF-1.3\n%\xE2\xE3\xCF\xD3\n";
+ $content="%PDF-1.3\n%âãÏÓ\n";
// $content="%PDF-1.3\n";
$pos=strlen($content);
foreach($this->objects as $k=>$v){
Modified: branches/Version-1_0-branch/property/inc/class.boentity.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.boentity.inc.php
2011-01-12 12:46:41 UTC (rev 6756)
+++ branches/Version-1_0-branch/property/inc/class.boentity.inc.php
2011-01-12 12:49:58 UTC (rev 6757)
@@ -112,6 +112,11 @@
{
$this->query = $query;
}
+ else if($location_code)
+ {
+ $this->query = $location_code;
+ }
+
if(isset($_POST['filter']) || isset($_GET['filter']))
{
$this->filter = $filter;
Modified: branches/Version-1_0-branch/property/inc/class.boworkorder.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.boworkorder.inc.php
2011-01-12 12:46:41 UTC (rev 6756)
+++ branches/Version-1_0-branch/property/inc/class.boworkorder.inc.php
2011-01-12 12:49:58 UTC (rev 6757)
@@ -45,10 +45,10 @@
var $public_functions = array
(
'read' => true,
- 'read_single' => true,
+ 'read_single' => true,
'save' => true,
'delete' => true,
- 'check_perms' => true
+ 'check_perms' => true
);
function property_boworkorder($session=false)
@@ -190,23 +190,27 @@
$columns['entry_date'] = array
(
'id' => 'entry_date',
- 'name'=> lang('entry date')
+ 'name'=> lang('entry date'),
+ 'sortable' => true
);
$columns['start_date'] = array
(
'id' => 'start_date',
- 'name'=> lang('start date')
+ 'name'=> lang('start date'),
+ 'sortable' => true
);
$columns['end_date'] = array
(
'id' => 'end_date',
- 'name'=> lang('end date')
+ 'name'=> lang('end date'),
+ 'sortable' => true
);
$columns['billable_hours'] = array
(
'id' => 'billable_hours',
- 'name'=> lang('billable hours')
+ 'name'=> lang('billable hours'),
+ 'sortable' => true
);
return $columns;
Modified: branches/Version-1_0-branch/property/inc/class.soentity.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.soentity.inc.php
2011-01-12 12:46:41 UTC (rev 6756)
+++ branches/Version-1_0-branch/property/inc/class.soentity.inc.php
2011-01-12 12:49:58 UTC (rev 6757)
@@ -412,7 +412,7 @@
case 'CH':
if(!$criteria_id)
{
-
$_querymethod[]= "$entity_table." . $this->db->f('column_name') . "
{$this->like} '%{$query}%'";
+
$_querymethod[]= "$entity_table." . $this->db->f('column_name') . "
{$this->like} '%,{$query},%'";
$__querymethod = array(); // remove block
}
break;
Modified: branches/Version-1_0-branch/property/inc/class.solocation.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.solocation.inc.php
2011-01-12 12:46:41 UTC (rev 6756)
+++ branches/Version-1_0-branch/property/inc/class.solocation.inc.php
2011-01-12 12:49:58 UTC (rev 6757)
@@ -123,7 +123,7 @@
$hits = $this->db->f('hits');
$entity['related'][] = array
(
- 'entity_link' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
'property.uitts.index', 'query'=> $location_code)),
+ 'entity_link' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
'property.uitts.index', 'query'=> $location_code, 'status_id' => 'all')),
'name' =>
lang('Helpdesk') . " [{$hits}]",
'descr' =>
lang('Helpdesk')
);
Modified: branches/Version-1_0-branch/property/inc/class.sotts.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.sotts.inc.php
2011-01-12 12:46:41 UTC (rev 6756)
+++ branches/Version-1_0-branch/property/inc/class.sotts.inc.php
2011-01-12 12:49:58 UTC (rev 6757)
@@ -359,7 +359,8 @@
. " OR address $this->like
'%$query%' "
. " OR fm_location1.loc1_name
$this->like '%$query%'"
. " OR
fm_tts_tickets.location_code $this->like '%$query%'"
- . " OR fm_tts_tickets.order_id
=" . (int)$query . ')';
+ . " OR fm_tts_tickets.order_id
=" . (int)$query
+ . " OR fm_tts_tickets.id =" .
(int)$query . ')';
}
}
Modified: branches/Version-1_0-branch/property/inc/class.uiinvoice.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uiinvoice.inc.php
2011-01-12 12:46:41 UTC (rev 6756)
+++ branches/Version-1_0-branch/property/inc/class.uiinvoice.inc.php
2011-01-12 12:49:58 UTC (rev 6757)
@@ -896,7 +896,8 @@
'text' =>
lang('F'),
'action' =>
$GLOBALS['phpgw']->link('/index.php',array
(
- 'menuaction' =>
'property.uiinvoice.receipt'
+ 'menuaction' =>
'property.uiinvoice.receipt',
+ 'target'
=> '_blank'
)),
'parameters' => $parameters
);
Modified: branches/Version-1_0-branch/property/inc/class.uijasper.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uijasper.inc.php
2011-01-12 12:46:41 UTC (rev 6756)
+++ branches/Version-1_0-branch/property/inc/class.uijasper.inc.php
2011-01-12 12:49:58 UTC (rev 6757)
@@ -48,7 +48,8 @@
'edit' => true,
'delete' => true,
'download' => true,
- 'view' => true
+ 'view' => true,
+ 'get_file' => true
);
function __construct()
@@ -117,6 +118,21 @@
$this->bocommon->download($list,$uicols['name'],$uicols['descr'],$uicols['input_type']);
}
+ function get_file()
+ {
+ if(!$this->acl_read)
+ {
+
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
'property.uilocation.stop', 'perm'=>1, 'acl_location'=> $this->acl_location));
+ }
+
+ $jasper_id =
phpgw::get_var('jasper_id', 'int');
+ $values =
$this->bo->read_single($jasper_id);
+
+ $bofiles = CreateObject('property.bofiles');
+ $file =
"{$bofiles->fakebase}/jasper/{$jasper_id}/{$values['file_name']}";
+ $bofiles->view_file('', $file);
+ }
+
function index()
{
if(!$this->acl_read)
@@ -307,6 +323,17 @@
)),
'parameters'
=> $parameters_view
);
+ $datatable['rowactions']['action'][] = array
+ (
+ 'my_name' =>
'edit',
+ 'text' =>
lang('download JasperReport %1 definition', $report['title']),
+ 'action' =>
$GLOBALS['phpgw']->link('/index.php',array
+ (
+ 'menuaction' =>
'property.uijasper.get_file',
+ 'target'
=> '_blank'
+ )),
+ 'parameters'
=> $parameters_view
+ );
}
if($this->acl_delete)
@@ -753,6 +780,8 @@
}
if(!$user_input)
{
+ $GLOBALS['phpgw_info']['flags']['noheader'] =
true;
+ $GLOBALS['phpgw_info']['flags']['nofooter'] =
true;
$GLOBALS['phpgw_info']['flags']['xslt_app'] =
false;
$jasper_parameters = '';
Modified: branches/Version-1_0-branch/property/setup/phpgw_no.lang
===================================================================
--- branches/Version-1_0-branch/property/setup/phpgw_no.lang 2011-01-12
12:46:41 UTC (rev 6756)
+++ branches/Version-1_0-branch/property/setup/phpgw_no.lang 2011-01-12
12:49:58 UTC (rev 6757)
@@ -76,8 +76,8 @@
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 arbeidsordre
-add a workorder to this project property no legg til en
arbeidsordre til dette prosjektet
+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 budsjettkonto
add building property no legg til bygning
add category property no Legg til kategori
@@ -111,22 +111,22 @@
add request for this project property no Legg til behov til
dette prosjektet
addressmasters common no AddresseMaster
address property no Adresse
-adds a new project - then a new workorder property no legger
til nytt prosjekt - så arbeidsordre
-adds a new workorder to an existing project property no legger
til ny arbeidsordre 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 space property no Legg til areal
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 arbeidsordren som en mal for senere bruk
+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 to project property no Legg til eksisterende prosjekt
-add workorder property no Legg til Arbeidsordre
+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
@@ -208,7 +208,7 @@
back to list property no Tilbake til liste
back to the list property no Tilbake til liste
back to the ticket list property no Tilbake til meldings
liste uten å lagre
-back to the workorder list property no Tilbake til
arbeidsordre liste
+back to the workorder list property no Tilbake til bestilling
liste
base property no Grunnlag
base description property no Beskrivelse av grunnlag
basis property no Basis
@@ -242,9 +242,9 @@
bulk import - csv common no Mengde import 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 arbeidsordren
-calculate workorder property no kalkuler arbeidsordren
-calculate workorder by adding items from vendors prizebook or adding general
hours property no kalkuler arbeidsordren ved å legge til poster
fra prisbok - eller egne tilpassede poster
+calculate this workorder property no kalkuler bestillingen
+calculate workorder property no kalkuler bestillingen
+calculate workorder by adding items from vendors prizebook or adding general
hours property no kalkuler bestillingen ved å legge til poster
fra prisbok - eller egne tilpassede poster
calculation property no Kalkulasjon
cancel the import property no avbryt import
categories property no Kategorier
@@ -290,7 +290,7 @@
choose copy hour to copy this hour to a new hour property no
Kryss av for å kopiere denne posten til en ny post
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 denne anmodningen til en ny anmodning
-choose copy workorder to copy this workorder to a new workorder
property no Kryss av for å kopiere denne arbeidsordren til en ny
arbeidsordre
+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 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
@@ -357,7 +357,7 @@
copy hour ? property no kopier post ?
copy project ? property no kopier prosjekt ?
copy request ? property no kopier anmodning ?
-copy workorder ? property no Kopier arbeidsordre ?
+copy workorder ? property no Kopier bestilling ?
correct error property no Rett opp feil
cost property no kostnad
cost estimate property no Kostnadsestimat
@@ -469,12 +469,12 @@
delete this request property no slett anmodning
delete this value from the list of multiple choice property no
Slett denne verdien fra listen over fler-valg
delete this vendor from this activity property no slett denne
leverandøren fra denne aktiviteten
-delete this workorder property no slett arbeidsordre
+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 voucher property no Slett bilag
-delete workorder property no slett arbeidsordre
+delete workorder property no slett bestilling
delivered property no Levert
delivery address property no Leveringsadresse
deposit claim property no Krav mot depositum
@@ -590,16 +590,16 @@
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 arbeidsordre
+edit the workorder property no rette bestilling
edit this activity property no rette 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 rette prosjekt
edit this entry request property no rett anmodning
-edit this entry workorder property no rett arbeidsordre
+edit this entry workorder property no rett bestilling
edit this meter property no rett måler
-edit workorder property no Endre arbeidsordre
+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
enabled property no Aktiv
@@ -642,7 +642,7 @@
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
enter a remark to add to the history of the project property no
Legg til en merknad til historikken for prosjektet
-enter a short description of the workorder property no Gi en
kort beskrivelse av arbeidsordren
+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
@@ -707,8 +707,8 @@
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 arbeidsordre ID for å søke etter arbeidsordre - gjelder alle datoer
-enter workorder title property no angi arbeidsordre tittel
+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
entity property no type
entity has been added property no Entitet er lagt til
entity has been edited property no Entitet er rettet
@@ -830,7 +830,7 @@
incl tax property no inkl mva
include in location form property no Inkluder i
lokaliseringsskjema
include in search property no Inkluder i søk
-include the workorder to this claim property no Inkluder
arbeidsordren i dette kravet
+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 count property no Antall
@@ -956,7 +956,7 @@
list vendors property no List leverandør
list vendors per activity property no List leverandør pr
aktivitet
list voucher property no list underbilag
-list workorder property no List arbeidsordre
+list workorder property no List bestillinger
location property no Lokalisering
loc1 name property no Navn
local files property no Lokale filer
@@ -1077,8 +1077,8 @@
no user property no Bruker ikke valgt
no user selected property no Bruker ikke valgt
no vendor property no Leverandør ikke valgt
-no workorder budget property no Ingen budsjett
arbeidsordre/bestilling
-no workorder bugdet property no Ingen arbeidsordrer er
budsjettert
+no workorder budget property no Ingen budsjett bestilling
+no workorder bugdet property no Ingen bestillinger er
budsjettert
no year property no Ingen årstall
notify client by sms property no Varsle kunde via SMS
ns3420 property no NS3420
@@ -1102,8 +1102,8 @@
open view in new window property no Åpne visning i nytt
vindu
order property no Bestilling
order_dim1 property no Aktivitet
-order id property no OrdreNr
-order_id property no OrdreNr
+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
@@ -1154,14 +1154,14 @@
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 an integer ! property no Angi heltall
-please enter an integer for order! property no Angi heltall
for ordrenr
+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
anmodning
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 workorder title ! property no angi en
arbeidsordre tittel
+please enter a workorder title ! property no angi en
bestillings tittel
please enter precision as integer ! property no Angi heltall
for presisjon
please enter scale as integer ! property no Angi heltall
for skalering
please give som details ! property no angi detaljer
@@ -1236,7 +1236,7 @@
project name property no Prosjekt navn
.project.request property no Behov
project start date property no prosjekt startdato
-.project.workorder property no Arbeidsordre
+.project.workorder property no Bestilling
propagate property no Propager
property common no Eiendom
property has been edited property no eiendom er oppdater
@@ -1333,8 +1333,8 @@
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 arbeidsordre
-save this workorder as a template for later use property no
lagre denne arbeidsordren som mal for senere bruk
+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
scale property no Scale
schedule property no planlegge (tid)
scheduled events property no Planlagte oppgaver
@@ -1434,7 +1434,7 @@
select the category the request belongs to. to do not use a category select no
category property no velg kategori anmodning 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 arbeidsordre 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
@@ -1491,7 +1491,7 @@
select the user the request belongs to. to do not use a category select no
user property no velg bruker anmodning tilhører. For ikke å
bruke bruker velg BRUKER IKKE VALG
select the user the selection belongs to. to do not use a user select no user
property no velg bruker utvalg tilhører. For ikke å bruke bruker
velg BRUKER IKKE VALG
select the user the template belongs to. to do not use a category select no
user property no velg bruker mal tilhører. For ikke å bruke
bruker velg BRUKER IKKE VALG
-select the user the workorder belongs to. to do not use a category select no
user property no velg bruker arbeidsordre tilhører. For ikke å
bruke bruker velg BRUKER IKKE VALG
+select the user the workorder belongs to. to do not use a category select no
user property no velg bruker bestillingen tilhører. For ikke å
bruke bruker velg BRUKER IKKE VALG
select the user. to do not use a category select no user property
no Velg bruker
select the user to edit email property no Velg bruker for å rette
epost
select the vendor by clicking the button property no velg
leverandør
@@ -1640,7 +1640,7 @@
the property is public. if the property should be private, check this box
property no Eiendommen er merket public. Dersom den skulle være
privat - kryss av denne boksen
the recipient did not get the email: property no Addressaten
fikk ikke epost:
the total amount to claim property no Total sum for krav
-the workorder has not been saved property no Arbeidsordren
er ikke lagret
+the workorder has not been saved property no Bestillingen er
ikke lagret
this account is not valid: property no Denne kontoen er ikke
gyldig:
this activity code is already registered! property no denne
aktivitetskoden er allrerede registert
this agreement code is already registered! property no denne
avtalekoden er allrerede registert
@@ -1759,8 +1759,8 @@
view the building property no vis bygning
view the category property no Vis kategorien
view the claim property no Vis kravet
-view the complete workorder property no vis komplett
arbeidsordre
-view the complete workorder as a tender for bidding property no
vis komplett arbeidsordre som beskrivelse
+view the complete workorder property no vis komplett bestilling
+view the complete workorder as a tender for bidding property no
vis komplett bestilling som beskrivelse
view the document property no vis dokument
view the entity property no Vis entiteten
view the entrance property no vis inngang
@@ -1780,7 +1780,7 @@
view the workorder property no vis arberidsordre
view this entity property no Vis denne entiteten
view ticket detail property no vis meldingsdetalj
-view workorder property no Vis arbeidsordre
+view workorder property no Vis bestilling
voucher property no Bilag
voucher date property no Bilags dato
voucher id property no Bilags nr
@@ -1798,26 +1798,26 @@
what is the current status of this equipment ? property no hva er
status for dette utstyret ?
what is the current status of this project ? property no hva er
status for dette prosjektet ?
what is the current status of this request ? property no hva er
status for denne anmodningen ?
-what is the current status of this workorder ? property no hva er
status for denne arbeidsordren ?
+what is the current status of this workorder ? property no hva er
status for denne bestillingen ?
where to deliver the key property no Nøkler leveres
where to fetch the key property no Nøkler hentes
where to pick up the key property no Nøkler hentes
which entity type is to show up in location forms property no
Hvilke Entitet-type skal vises i lokaliseringsskjema
work:____________ property no Arbeid:____________
-workorder property no Arbeidsordre
-workorder %1 has been edited property no Arbeidsordre %1 er
oppdatert
-workorder %1 has been saved property no Arbeidsordre %1 er
lagret
+workorder property no Bestilling
+workorder %1 has been edited property no Bestilling %1 er
oppdatert
+workorder %1 has been saved property no Bestilling %1 er lagret
workorder %1 needs approval property no Bestilling %1 venter på
godkjenning
-workorder detail categories property no Detaljering av
arbeidsordre/bestilling
-workorder end date property no Arbeidsordre frist
+workorder detail categories property no Detaljering av
bestilling
+workorder end date property no Frist for bestilling
workorder entry date property no Registreringsdato
-workorder id property no Arbeidsordre
-workorder is sent by email! property no Arbeidsordre er sendt
pr e-post!
-workorders status property no Status arbeidsordre/bestilling
-workorder start date property no Arbeidsordre start dato
+workorder id property no Bestilling
+workorder is sent by email! property no Bestilling er sendt pr
e-post!
+workorders status property no Status bestilling
+workorder start date property no Start dato for bestilling
workorder status property no Status
-workorder template property no Arbeidsordre mal
-workorder title property no Arbeidsordre tittel
+workorder template property no Bestillings mal
+workorder title property no Bestillings tittel
workorder user property no Bruker
write off property no avskrivning
write off period property no avskrivningsperiode
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [6757] Merge 6747:6756 from trunk,
Sigurd Nes <=