Nightmare revert commit

This reverts commit ddab472883.

# Conflicts:
#	xml/dtd/offerte.xsd
#	xml/source/snippets/offerte/en/conditions.xml
#	xml/xslt/block.xslt
#	xml/xslt/styles_off.xslt
This commit is contained in:
skyanth
2019-06-21 16:04:24 +02:00
parent dd5a1749ba
commit 8be03c5b34
6 changed files with 163 additions and 142 deletions
+21 -2
View File
@@ -188,7 +188,7 @@
<xs:element ref="contact"/>
<xs:element ref="generate_targets"/>
<xs:element name="generate_teammembers"/>
<xs:element name="generate_service_breakdown">
<xs:element ref="signature_box"/>
<xs:complexType>
<xs:attribute name="format" use="required">
<xs:simpleType>
@@ -220,13 +220,32 @@
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="generate_offer_signature_box"/>
<xs:element name="generate_permission_parties"/>
<xs:element name="signature_box">
<xs:complexType>
<xs:all>
<xs:element ref="client_side"/>
<xs:element ref="company_side"/>
</xs:all>
</xs:complexType>
</xs:element>
<xs:element name="client_side" type="signature_box_column"/>
<xs:element name="company_side" type="signature_box_column"/>
<xs:complexType name="signature_box_column">
<xs:sequence>
<xs:element name="signee" minOccurs="1" maxOccurs="unbounded"/>
<xs:element name="date"/>
<xs:element name="place"/>
</xs:sequence>
</xs:complexType>
<!-- Placeholders -->
<xs:group name="placeholders">
<xs:choice>
<xs:element name="latest_version_date"/>
<xs:element name="client_long"/>
<xs:element name="client_short"/>
<xs:element name="client_street"/>
+1
View File
@@ -385,6 +385,7 @@
<!-- Placeholders -->
<xs:group name="placeholders">
<xs:choice>
<xs:element name="latest_version_date"/>
<xs:element name="client_long"/>
<xs:element name="client_short"/>
<xs:element name="client_street"/>