From de7f5c381632c6bcec82be5b80c6f7e9d93e4e17 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Wed, 6 Jan 2016 00:06:33 +1300
Subject: [PATCH] Backport metadata titles

Change-Id: Id10f05c8f890ba35a9b2f225a57b6de65f26269b
---
 xml/schema/Financial/EntityFinancialTrxn.xml |  5 +++++
 xml/schema/Financial/FinancialTrxn.xml       | 14 +++++++++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/xml/schema/Financial/EntityFinancialTrxn.xml b/xml/schema/Financial/EntityFinancialTrxn.xml
index d0ef7f6fd7..653fc792d5 100755
--- a/xml/schema/Financial/EntityFinancialTrxn.xml
+++ b/xml/schema/Financial/EntityFinancialTrxn.xml
@@ -7,6 +7,7 @@
   <add>3.2</add>
   <field>
     <name>id</name>
+    <title>Entity Financial Transaction ID</title>
     <type>int unsigned</type>
     <required>true</required>
     <comment>ID</comment>
@@ -18,6 +19,7 @@
   </primaryKey>
   <field>
     <name>entity_table</name>
+    <title>Entity Table</title>
     <type>varchar</type>
     <length>64</length>
     <required>true</required>
@@ -27,6 +29,7 @@
   </field>
   <field>
     <name>entity_id</name>
+    <title>Entity ID</title>
     <type>int unsigned</type>
     <required>true</required>
     <add>3.2</add>
@@ -38,6 +41,7 @@
   </dynamicForeignKey>
   <field>
     <name>financial_trxn_id</name>
+    <title>Financial Transaction Id</title>
     <type>int unsigned</type>
     <add>3.2</add>
   </field>
@@ -50,6 +54,7 @@
   </foreignKey>
   <field>
     <name>amount</name>
+    <title>Amount</title>
     <type>decimal</type>
     <required>true</required>
     <import>true</import>
diff --git a/xml/schema/Financial/FinancialTrxn.xml b/xml/schema/Financial/FinancialTrxn.xml
index 8aee581831..968961fe8d 100755
--- a/xml/schema/Financial/FinancialTrxn.xml
+++ b/xml/schema/Financial/FinancialTrxn.xml
@@ -8,6 +8,7 @@
   <log>true</log>
   <field>
     <name>id</name>
+    <title>Financial Transaction ID</title>
     <type>int unsigned</type>
     <required>true</required>
     <add>1.3</add>
@@ -47,6 +48,7 @@
   <field>
     <name>from_financial_account_id</name>
     <type>int unsigned</type>
+    <title>Financial Transaction From Account</title>
     <comment>FK to financial_account table.</comment>
     <add>4.3</add>
     <pseudoconstant>
@@ -66,6 +68,7 @@
   </foreignKey>
   <field>
     <name>to_financial_account_id</name>
+    <title>Financial Transaction To Account</title>
     <type>int unsigned</type>
     <comment>FK to financial_financial_account table.</comment>
     <add>4.3</add>
@@ -86,6 +89,7 @@
   </foreignKey>
   <field>
     <name>trxn_date</name>
+    <title>Financial Transaction Date</title>
     <type>datetime</type>
     <default>NULL</default>
     <comment>date transaction occurred</comment>
@@ -93,6 +97,7 @@
   </field>
   <field>
     <name>trxn_type</name>
+    <title>Financial Transaction Type</title>
     <type>enum</type>
     <values>Debit,Credit</values>
     <required>true</required>
@@ -101,6 +106,7 @@
   </field>
   <field>
     <name>total_amount</name>
+    <title>Financial Total Amount</title>
     <type>decimal</type>
     <required>true</required>
     <comment>amount of transaction</comment>
@@ -108,18 +114,21 @@
   </field>
   <field>
     <name>fee_amount</name>
+    <title>Financial Fee Amount</title>
     <type>decimal</type>
     <comment>actual processor fee if known - may be 0.</comment>
     <add>1.3</add>
   </field>
   <field>
     <name>net_amount</name>
+    <title>Financial Net Amount</title>
     <type>decimal</type>
     <comment>actual funds transfer amount. total less fees. if processor does not report actual fee during transaction, this is set to total_amount.</comment>
     <add>1.3</add>
   </field>
   <field>
     <name>currency</name>
+    <title>Financial Currency</title>
     <type>varchar</type>
     <length>3</length>
     <default>NULL</default>
@@ -149,6 +158,7 @@
   </field>
   <field>
     <name>trxn_id</name>
+    <title>Transaction ID</title>
     <type>varchar</type>
     <length>255</length>
     <comment>user-specified unique processor transaction id, bank id + trans id,... depending on payment_method</comment>
@@ -156,6 +166,7 @@
   </field>
   <field>
     <name>trxn_result_code</name>
+    <title>Transaction result Code</title>
     <type>varchar</type>
     <length>255</length>
     <comment>processor result code</comment>
@@ -173,6 +184,7 @@
   </field>
   <field>
     <name>payment_processor_id</name>
+    <title>Payment Processor</title>
     <type>int unsigned</type>
     <comment>Payment Processor for this financial transaction</comment>
     <add>4.3</add>
@@ -187,7 +199,7 @@
   <field>
     <name>payment_instrument_id</name>
     <uniqueName>financial_trxn_payment_instrument_id</uniqueName>
-    <title>Payment Instrument</title>
+    <title>Payment Method</title>
     <type>int unsigned</type>
     <comment>FK to payment_instrument option group values</comment>
     <pseudoconstant>
-- 
2.25.1