continuing fix of faulty merge

xml/dtd/invoice.xsd

@@ -92,7 +92,6 @@
             <xs:element name="company_poc1"/>
             <xs:element name="t_app"/>
             <xs:element name="t_app_producer"/>
-            <xs:element name="p_duration"/>
         </xs:choice>
     </xs:group>
 </xs:schema>

xml/dtd/offerte.xsd

@@ -48,7 +48,6 @@
   <xs:element name="activityinfo">
     <xs:complexType>
       <xs:all>
-        <xs:element ref="duration" minOccurs="1"/>
         <xs:element ref="persondays" minOccurs="1"/>
         <xs:element ref="planning" minOccurs="1"/>
         <xs:element ref="report_due" minOccurs="1"/>
@@ -188,7 +187,7 @@
           <xs:element ref="contact"/>
           <xs:element ref="generate_targets"/>
           <xs:element name="generate_teammembers"/>
-          <xs:element ref="signature_box"/>
+          <xs:element name="generate_service_breakdown">
             <xs:complexType>
               <xs:attribute name="format" use="required">
                 <xs:simpleType>
@@ -200,7 +199,7 @@
               </xs:attribute>
             </xs:complexType>
           </xs:element>
-          <xs:element ref="generate_offer_signature_box"/>
+          <xs:element ref="signature_box"/>
         </xs:choice>
       </xs:sequence>
       <xs:attribute name="id" use="optional" type="xs:ID"/>
@@ -213,11 +212,11 @@
 
   <xs:element name="contact">
     <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="name"/>
-        <xs:element ref="address"/>
-        <xs:element ref="email"/>
-      </xs:sequence>
+      <xs:all>
+        <xs:element ref="name" minOccurs="0"/>
+        <xs:element ref="address" minOccurs="0"/>
+        <xs:element ref="email" minOccurs="0"/>
+      </xs:all>
     </xs:complexType>
   </xs:element>
   <xs:element name="generate_permission_parties"/>

xml/dtd/pentestreport.xsd

@@ -6,6 +6,7 @@
     schemaLocation="http://www.w3.org/2001/xml.xsd"/>
   <xs:import namespace="http://www.w3.org/2001/XInclude"
     schemaLocation="http://www.w3.org/2001/XInclude/XInclude.xsd"/>
+  <xs:include schemaLocation="servicebreakdown.xsd"/>
   <xs:include schemaLocation="common.xsd"/>
 
   <xs:element name="pentest_report">
@@ -59,7 +60,6 @@
   <xs:element name="activityinfo">
     <xs:complexType>
       <xs:all>
-        <xs:element ref="duration"/>
         <xs:element ref="persondays"/>
         <xs:element ref="planning"/>
         <xs:element ref="report_due"/>
@@ -67,6 +67,7 @@
         <xs:element ref="type"/>
         <xs:element minOccurs="0" ref="target_application"/>
         <xs:element minOccurs="0" ref="target_application_producer"/>
+        <xs:element ref="breakdown" minOccurs="0"/>
       </xs:all>
     </xs:complexType>
   </xs:element>
@@ -174,6 +175,7 @@
           <xs:element minOccurs="0" maxOccurs="unbounded" ref="generate_findings"/>
           <xs:element minOccurs="0" maxOccurs="unbounded" ref="finding"/>
           <xs:element minOccurs="0" maxOccurs="unbounded" ref="non-finding"/>
+          <xs:element minOccurs="0" name="generate_service_breakdown"/>
         </xs:choice>
       </xs:sequence>
       <xs:attribute name="id" use="required" type="xs:ID"/>

xml/dtd/quickscope.xsd

@@ -42,7 +42,6 @@
     <xs:complexType>
       <xs:sequence>
         <xs:element ref="targets"/>
-        <xs:element ref="days"/>
         <xs:element ref="persondays"/>
         <xs:element ref="nature"/>
         <xs:element ref="type"/>

xml/dtd/servicebreakdown.xsd

@@ -16,7 +16,7 @@
   <xs:element name="service">
     <xs:complexType>
       <xs:sequence>
-        <xs:element ref="description"/>
+        <xs:element ref="specification"/>
         <xs:element minOccurs="0" ref="effort"/>
         <xs:element minOccurs="0" ref="hourly_rate"/>
         <xs:element ref="fee"/>
@@ -47,14 +47,14 @@
   <xs:element name="extra">
     <xs:complexType>
       <xs:sequence>
-        <xs:element ref="description"/>
+        <xs:element ref="specification"/>
         <xs:element minOccurs="0" ref="effort"/>
         <xs:element minOccurs="0" ref="hourly_rate"/>
         <xs:element ref="fee"/>
       </xs:sequence>
     </xs:complexType>
   </xs:element>
-  <xs:element name="description" type="xs:string"/>
+  <xs:element name="specification" type="xs:string"/>
   <xs:element name="effort">
     <xs:complexType mixed="true">
       <xs:all minOccurs="0">