projects / civicrm-core.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge pull request #9170 from tschuettler/CRM-19454
[civicrm-core.git] / xml / schema / Price / LineItem.xml
diff --git a/xml/schema/Price/LineItem.xml b/xml/schema/Price/LineItem.xml
index ab78d870b985d2ea4ab8bfa70df5c17fd712ea15..a1f006c9b53520ffa1e9024dab2b95344cdcd61c 100644 (file)
--- a/xml/schema/Price/LineItem.xml
+++ b/xml/schema/Price/LineItem.xml
@@ -92,7 +92,7 @@
   <field>
     <name>qty</name>
     <title>Line Item Quantity</title>
-    <type>int unsigned</type>
+    <type>decimal</type>
     <required>true</required>
     <comment>How many items ordered</comment>
     <add>1.7</add>
@@ -186,18 +186,31 @@
     <add>4.3</add>
   </foreignKey>
   <field>
-    <name>deductible_amount</name>
-    <title>Deductible Amount</title>
+    <name>non_deductible_amount</name>
+    <title>Non-deductible Amount</title>
     <type>decimal</type>
     <default>0.0</default>
-    <headerPattern>/unit?.?amoun/i</headerPattern>
+    <headerPattern>/non?.?deduct/i</headerPattern>
     <dataPattern>/^\d+(\.\d{2})?$/</dataPattern>
     <required>true</required>
-    <comment>Tax-deductible portion of the amount</comment>
-    <add>4.3</add>
+    <comment>Portion of total amount which is NOT tax deductible.</comment>
+    <add>4.7</add>
     <html>
       <type>Text</type>
     </html>
   </field>
+  <field>
+    <name>tax_amount</name>
+    <title>Tax Amount</title>
+    <type>decimal</type>
+    <import>true</import>
+    <headerPattern>/tax(.?am(ou)?nt)?/i</headerPattern>
+    <dataPattern>/^\d+(\.\d{2})?$/</dataPattern>
+    <comment>tax of each item</comment>
+    <add>4.6</add>
+    <html>
+     <type>Text</type>
+   </html>
+  </field>
 </table>