blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-18 15:32:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bestellnummer und Lieferfirma auf Übernahmebestätigung

Browse Source
This commit is contained in:
Manfred Kindl
2018-02-26 17:45:07 +01:00
parent bf005a54a7
commit 3e92378922
3 changed files with 36 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
locale/en-US/lvaliste.php
+1 -1
View File
@@ -6,7 +6,7 @@ $this->phrasen['lvaliste/hilfeText']='Legend\n\nDP-Sem: Degree-Program - Semeste
$this->phrasen['lvaliste/hilfeAnzeigen']='Show Legend';
$this->phrasen['lvaliste/lehrfach']='Subject';
$this->phrasen['lvaliste/lehrform']='Lehrform';
$this->phrasen['lvaliste/lehrform']='Course Type';
$this->phrasen['lvaliste/lvBezeichnung']='Course Title';
$this->phrasen['lvaliste/lehrfachBezeichnung']='Subject Title';
$this->phrasen['lvaliste/lektor']='Lector';
rdf/betriebsmittelperson.rdf.php
+8 -1
View File
@@ -35,6 +35,8 @@ require_once('../include/organisationseinheit.class.php');
require_once('../include/person.class.php');
require_once('../include/betriebsmitteltyp.class.php');
require_once('../include/betriebsmittel.class.php');
require_once('../include/wawi_bestellung.class.php');
require_once('../include/firma.class.php');
if(isset($_GET['person_id']))
$person_id = $_GET['person_id'];
@@ -112,6 +114,9 @@ else
$typ = $bmt->result[0]->beschreibung;
$bm = new betriebsmittel($bmp->betriebsmittel_id);
$bestellung = new wawi_bestellung($bm->bestellung_id);
$firma = new firma($bestellung->firma_id);
echo '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>';
echo '
@@ -133,8 +138,10 @@ else
<nummer><![CDATA['.$bmp->nummer.']]></nummer>
<nummer2><![CDATA['.$bmp->nummer2.']]></nummer2>
<betriebsmitteltyp><![CDATA['.$bmp->betriebsmitteltyp.']]></betriebsmitteltyp>
<bestellnummer><![CDATA['.$bm->bestellung_id.']]></bestellnummer>
<bestellnummer><![CDATA['.$bestellung->bestell_nr.']]></bestellnummer>
<hersteller><![CDATA['.$bm->hersteller.']]></hersteller>
<bestellung_id><![CDATA['.$bm->bestellung_id.']]></bestellung_id>
<lieferfirma><![CDATA['.$firma->name.']]></lieferfirma>
<typ><![CDATA['.$typ.']]></typ>
<datum><![CDATA['.date("d.m.Y").']]></datum>
</betriebsmittelperson>
system/xsl/uebernahmebestaetigung_0.xsl
+27 -12
View File
@@ -222,20 +222,35 @@ xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
<text:p text:style-name="P18">Bestellnummer</text:p>
</table:table-cell>
<table:table-cell table:style-name="Tabelle2.B1" office:value-type="string">
<text:p text:style-name="P17"><xsl:value-of select="bestellnummer" /></text:p>
<text:p text:style-name="P17">
<xsl:choose>
<xsl:when test="bestellnummer=''">
<xsl:text>-</xsl:text>
</xsl:when>
<xsl:otherwise>
<xsl:value-of select="bestellnummer" />
</xsl:otherwise>
</xsl:choose>
</text:p>
</table:table-cell>
</table:table-row>
<table:table-row>
<table:table-cell table:style-name="Tabelle2.A1" office:value-type="string">
<text:p text:style-name="P18">Firma</text:p>
</table:table-cell>
<table:table-cell table:style-name="Tabelle2.B1" office:value-type="string">
<text:p text:style-name="P17">
<xsl:choose>
<xsl:when test="lieferfirma=''">
<xsl:text>-</xsl:text>
</xsl:when>
<xsl:otherwise>
<xsl:value-of select="lieferfirma" />
</xsl:otherwise>
</xsl:choose>
</text:p>
</table:table-cell>
</table:table-row>
<!--add line "firma" only if hersteller is not null-->
<xsl:if test="hersteller != ''">
<table:table-row>
<table:table-cell table:style-name="Tabelle2.A1" office:value-type="string">
<text:p text:style-name="P18">Firma</text:p>
</table:table-cell>
<table:table-cell table:style-name="Tabelle2.B1" office:value-type="string">
<text:p text:style-name="P17"><xsl:value-of select="hersteller" /></text:p>
</table:table-cell>
</table:table-row>
</xsl:if>
<table:table-row>
<table:table-cell table:style-name="Tabelle2.A2" office:value-type="string">
<text:p text:style-name="P18">Inventarnummer</text:p>