projects / civicrm-core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d1dace0)
pseudoconstant declaration for financial_type_id missing in some places
authorEileen McNaughton <eileen@fuzion.co.nz>
Tue, 3 Jun 2014 08:52:10 +0000 (20:52 +1200)
committerEileen McNaughton <eileen@fuzion.co.nz>
Tue, 3 Jun 2014 09:37:16 +0000 (21:37 +1200)
xml/schema/Contribute/ContributionProduct.xml patch | blob | blame | history
xml/schema/Contribute/PremiumsProduct.xml patch | blob | blame | history
xml/schema/Contribute/Product.xml patch | blob | blame | history
xml/schema/Grant/Grant.xml patch | blob | blame | history
xml/schema/Member/MembershipType.xml patch | blob | blame | history
xml/schema/Pledge/Pledge.xml patch | blob | blame | history
xml/schema/Price/LineItem.xml patch | blob | blame | history
xml/schema/Price/PriceFieldValue.xml patch | blob | blame | history
xml/schema/Price/PriceSet.xml patch | blob | blame | history

diff --git a/xml/schema/Contribute/ContributionProduct.xml b/xml/schema/Contribute/ContributionProduct.xml
index ec7525061da4b37c1f7939174c26620813902bd3..48b66b1f89106ea619d9828bd8c8ad77c0e21b6d 100644 (file)
--- a/xml/schema/Contribute/ContributionProduct.xml
+++ b/xml/schema/Contribute/ContributionProduct.xml
@@ -97,6 +97,11 @@
     <title>Financial Type</title>
     <type>int unsigned</type>
     <default>NULL</default>
+    <pseudoconstant>
+      <table>civicrm_financial_type</table>
+      <keyColumn>id</keyColumn>
+      <labelColumn>name</labelColumn>
+    </pseudoconstant>
     <comment>FK to Financial Type(for membership price sets only).</comment>
     <add>4.3</add>
   </field>
diff --git a/xml/schema/Contribute/PremiumsProduct.xml b/xml/schema/Contribute/PremiumsProduct.xml
index 255fc29b1b7e4b93596ca23e464345a4073b9a56..b61e4a7d3a154ad990f31fa9c7099ccddb9e686f 100644 (file)
--- a/xml/schema/Contribute/PremiumsProduct.xml
+++ b/xml/schema/Contribute/PremiumsProduct.xml
@@ -64,6 +64,11 @@
     <title>Financial Type</title>
     <type>int unsigned</type>
     <default>NULL</default>
+    <pseudoconstant>
+      <table>civicrm_financial_type</table>
+      <keyColumn>id</keyColumn>
+      <labelColumn>name</labelColumn>
+    </pseudoconstant>
     <comment>FK to Financial Type.</comment>
     <add>4.3</add>
   </field>
diff --git a/xml/schema/Contribute/Product.xml b/xml/schema/Contribute/Product.xml
index f5d689afc868d803b759de94e67d3f591dda8989..93c401305cc30485ca3a39cc7f0573fe5f9c8297 100644 (file)
--- a/xml/schema/Contribute/Product.xml
+++ b/xml/schema/Contribute/Product.xml
@@ -99,6 +99,11 @@
       <title>Financial Type</title>
       <type>int unsigned</type>
       <default>NULL</default>
+      <pseudoconstant>
+        <table>civicrm_financial_type</table>
+        <keyColumn>id</keyColumn>
+        <labelColumn>name</labelColumn>
+      </pseudoconstant>
       <comment>FK to Financial Type.</comment>
       <add>4.3</add>
   </field>
diff --git a/xml/schema/Grant/Grant.xml b/xml/schema/Grant/Grant.xml
index dac3136cacec96bee1ca4eacfd9a60a5b37846e3..29ad10e739fc1175e78ac845cfa12f72853fa192 100644 (file)
--- a/xml/schema/Grant/Grant.xml
+++ b/xml/schema/Grant/Grant.xml
@@ -220,6 +220,11 @@
     <title>Financial Type</title>
     <type>int unsigned</type>
     <default>NULL</default>
+    <pseudoconstant>
+      <table>civicrm_financial_type</table>
+      <keyColumn>id</keyColumn>
+      <labelColumn>name</labelColumn>
+    </pseudoconstant>
     <comment>FK to Financial Type.</comment>
     <add>4.3</add>
   </field>
diff --git a/xml/schema/Member/MembershipType.xml b/xml/schema/Member/MembershipType.xml
index 5a59a92586d071633c4daba0f06a6d0c4a935718..423b43bc86a38922a64f2ef0dad3c673e6eebba8 100644 (file)
--- a/xml/schema/Member/MembershipType.xml
+++ b/xml/schema/Member/MembershipType.xml
@@ -88,6 +88,11 @@
     <name>financial_type_id</name>
     <type>int unsigned</type>
     <required>true</required>
+    <pseudoconstant>
+      <table>civicrm_financial_type</table>
+      <keyColumn>id</keyColumn>
+      <labelColumn>name</labelColumn>
+    </pseudoconstant>
     <comment>If membership is paid by a contribution - what financial type should be used. FK to civicrm_financial_type.id</comment>
     <add>4.3</add>
   </field>
diff --git a/xml/schema/Pledge/Pledge.xml b/xml/schema/Pledge/Pledge.xml
index 2d57f03b920e5ede6d2d2a044609bbddb82f1bad..86ab5b921c31cf08d80b4bd8b84e8a456e3bacb0 100644 (file)
--- a/xml/schema/Pledge/Pledge.xml
+++ b/xml/schema/Pledge/Pledge.xml
@@ -62,6 +62,11 @@
     <uniqueName>pledge_financial_type_id</uniqueName>
     <type>int unsigned</type>
     <comment>FK to Financial Type</comment>
+    <pseudoconstant>
+      <table>civicrm_financial_type</table>
+      <keyColumn>id</keyColumn>
+      <labelColumn>name</labelColumn>
+    </pseudoconstant>
     <add>4.3</add>
     <html>
       <type>Select</type>
diff --git a/xml/schema/Price/LineItem.xml b/xml/schema/Price/LineItem.xml
index ae36a761fd08381f269dbe3f71e819cb232dfbcb..140a1d841ec9f5603826ef1760457727b0c2f38b 100644 (file)
--- a/xml/schema/Price/LineItem.xml
+++ b/xml/schema/Price/LineItem.xml
@@ -118,7 +118,7 @@
       <type>Text</type>
     </html>d</comment>
     <add>3.2</add>
-    
+
   </field>
   <index>
     <name>index_entity</name>
@@ -153,6 +153,11 @@
     <title>Financial Type</title>
     <type>int unsigned</type>
     <default>NULL</default>
+    <pseudoconstant>
+      <table>civicrm_financial_type</table>
+      <keyColumn>id</keyColumn>
+      <labelColumn>name</labelColumn>
+    </pseudoconstant>
     <comment>FK to Financial Type.</comment>
     <add>4.3</add>
     <html>
diff --git a/xml/schema/Price/PriceFieldValue.xml b/xml/schema/Price/PriceFieldValue.xml
index 89111b33f6e15c0bc3e63550d1ca9d015c5c2646..096d6e9b338e3909725d9725182446307acf7a4b 100644 (file)
--- a/xml/schema/Price/PriceFieldValue.xml
+++ b/xml/schema/Price/PriceFieldValue.xml
@@ -49,7 +49,7 @@
     <comment>Price field option label</comment>
     <html>
       <type>Text</type>
-    </html>    
+    </html>
     <add>3.3</add>
   </field>
   <field>
@@ -60,7 +60,7 @@
       <rows>2</rows>
     <cols>60</cols>
     </html>
-    <default>NULL</default>    
+    <default>NULL</default>
     <localizable>true</localizable>
     <comment>>Price field option description.</comment>
     <add>3.3</add>
@@ -157,6 +157,11 @@
     <title>Financial Type</title>
     <type>int unsigned</type>
     <default>NULL</default>
+    <pseudoconstant>
+      <table>civicrm_financial_type</table>
+      <keyColumn>id</keyColumn>
+      <labelColumn>name</labelColumn>
+    </pseudoconstant>
     <comment>FK to Financial Type.</comment>
     <add>4.3</add>
     <html>
diff --git a/xml/schema/Price/PriceSet.xml b/xml/schema/Price/PriceSet.xml
index c9010c75eae84f20637b1054c095525ecd7aecaf..3ada6ae3892d0b4dee4b9fec77424b90e2afa012 100644 (file)
--- a/xml/schema/Price/PriceSet.xml
+++ b/xml/schema/Price/PriceSet.xml
@@ -103,7 +103,7 @@
     <add>1.8</add>
     <html>
       <type>Text</type>
-    </html>    
+    </html>
   </field>
   <field>
     <name>extends</name>
@@ -111,6 +111,11 @@
     <length>255</length>
     <required>true</required>
     <comment>What components are using this price set?</comment>
+    <pseudoconstant>
+      <table>civicrm_component</table>
+      <keyColumn>id</keyColumn>
+      <labelColumn>name</labelColumn>
+    </pseudoconstant>
     <add>3.1</add>
     <html>
       <type>Text</type>
@@ -139,6 +144,11 @@
     <default>NULL</default>
     <comment>FK to Financial Type(for membership price sets only).</comment>
     <add>4.3</add>
+    <pseudoconstant>
+      <table>civicrm_financial_type</table>
+      <keyColumn>id</keyColumn>
+      <labelColumn>name</labelColumn>
+    </pseudoconstant>
     <html>
       <type>Select</type>
     </html>