Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Delete repeated title and fix some labels #19565

Merged
merged 4 commits into from
Feb 11, 2021
Merged

Delete repeated title and fix some labels #19565

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f2c816a
Delete repeated title and fix some labels
ahed-compucorp Feb 8, 2021
1c0d684
Fix titles that contain entity name
ahed-compucorp Feb 8, 2021
fd735f5
Add label for fields without title
ahed-compucorp Feb 9, 2021
1662d42
Add label for fields without title and html tag
ahed-compucorp Feb 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions xml/schema/Activity/Activity.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,6 +405,9 @@
<required>false</required>
<export>true</export>
<default>CURRENT_TIMESTAMP</default>
<html>
<label>Created Date</label>
</html>
<add>4.7</add>
</field>
<field>
Expand All @@ -415,6 +418,9 @@
<required>false</required>
<export>true</export>
<default>CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP</default>
<html>
<label>Modified Date</label>
</html>
<add>4.7</add>
</field>
</table>
1 change: 1 addition & 0 deletions xml/schema/Campaign/Campaign.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,7 @@
<add>3.4</add>
<html>
<type>Text</type>
<label>Goal Revenue</label>
</html>
</field>
</table>
8 changes: 7 additions & 1 deletion xml/schema/Case/Case.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@
<type>TextArea</type>
<rows>8</rows>
<cols>60</cols>
<label>Details</label>
</html>
<comment>Details populated from Open Case. Only used in the CiviCase extension.</comment>
<add>1.8</add>
Expand Down Expand Up @@ -130,7 +131,6 @@
<type>boolean</type>
<default>0</default>
<import>true</import>
<title>Case Deleted</title>
<html>
<type>CheckBox</type>
</html>
Expand All @@ -149,6 +149,9 @@
<required>false</required>
<export>true</export>
<default>NULL</default>
<html>
<label>Created Date</label>
</html>
<add>4.7</add>
</field>
<field>
Expand All @@ -159,6 +162,9 @@
<required>false</required>
<export>true</export>
<default>CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP</default>
<html>
<label>Modified Date</label>
</html>
<add>4.7</add>
</field>
</table>
34 changes: 34 additions & 0 deletions xml/schema/Contact/Contact.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@
<default>0</default>
<html>
<type>CheckBox</type>
<label>Do Not Email</label>
</html>
<add>1.1</add>
</field>
Expand All @@ -106,6 +107,7 @@
<add>1.1</add>
<html>
<type>CheckBox</type>
<label>Do Not Phone</label>
</html>
</field>
<field>
Expand All @@ -118,6 +120,7 @@
<add>1.1</add>
<html>
<type>CheckBox</type>
<label>Do Not Mail</label>
</html>
</field>
<field>
Expand All @@ -130,6 +133,7 @@
<add>3.0</add>
<html>
<type>CheckBox</type>
<label>Do Not Sms</label>
</html>
</field>
<field>
Expand All @@ -142,6 +146,7 @@
<add>1.1</add>
<html>
<type>CheckBox</type>
<label>Do Not Trade</label>
</html>
</field>
<field>
Expand All @@ -155,6 +160,7 @@
<add>1.1</add>
<html>
<type>CheckBox</type>
<label>Is Opt Out</label>
</html>
</field>
<field>
Expand All @@ -168,6 +174,7 @@
<add>1.1</add>
<html>
<type>Text</type>
<label>Legal Identifier</label>
</html>
</field>
<field>
Expand All @@ -177,6 +184,7 @@
<html>
<type>Text</type>
<size>8</size>
<label>External Identifier</label>
</html>

<import>true</import>
Expand Down Expand Up @@ -248,6 +256,7 @@
<html>
<type>Text</type>
<size>30</size>
<label>Legal Name</label>
</html>
<contactType>Organization</contactType>
<import>true</import>
Expand All @@ -265,6 +274,7 @@
<html>
<type>File</type>
<size>30</size>
<label>Image URL</label>
</html>
</field>
<field>
Expand Down Expand Up @@ -322,6 +332,7 @@
</pseudoconstant>
<html>
<type>Select</type>
<label>Preferred Mail Format</label>
</html>
</field>
<field>
Expand All @@ -344,6 +355,9 @@
<type>varchar</type>
<length>32</length>
<comment>API Key for validating requests related to this contact.</comment>
<html>
<label>API KEY</label>
</html>
<add>2.2</add>
<permission>
<or>administer CiviCRM, edit api keys</or>
Expand Down Expand Up @@ -377,6 +391,7 @@
<html>
<type>Text</type>
<size>30</size>
<label>First Name</label>
</html>
<import>true</import>
<headerPattern>/^first|(f(irst\s)?name)$/i</headerPattern>
Expand All @@ -398,6 +413,7 @@
<html>
<type>Text</type>
<size>30</size>
<label>Middle Name</label>
</html>
<import>true</import>
<headerPattern>/^middle|(m(iddle\s)?name)$/i</headerPattern>
Expand All @@ -414,6 +430,7 @@
<html>
<type>Text</type>
<size>30</size>
<label>Last Name</label>
</html>
<import>true</import>
<headerPattern>/^last|(l(ast\s)?name)$/i</headerPattern>
Expand Down Expand Up @@ -479,6 +496,7 @@
<import>true</import>
<html>
<type>Text</type>
<label>Formal Title</label>
</html>
<headerPattern>/^title/i</headerPattern>
<comment>Formal (academic or similar) title in front of name. (Prof., Dr. etc.)</comment>
Expand Down Expand Up @@ -530,6 +548,7 @@
<add>3.0</add>
<html>
<type>Text</type>
<label>Email Greeting Custom</label>
</html>
</field>
<field>
Expand Down Expand Up @@ -564,6 +583,7 @@
<add>3.0</add>
<html>
<type>Text</type>
<label>Postal Greeting Custom</label>
</html>
</field>
<field>
Expand Down Expand Up @@ -598,6 +618,7 @@
<add>3.0</add>
<html>
<type>Text</type>
<label>Addressee Custom</label>
</html>
</field>
<field>
Expand All @@ -615,6 +636,7 @@
<html>
<type>Text</type>
<size>30</size>
<label>Job Title</label>
</html>
<import>true</import>
<headerPattern>/^job|(j(ob\s)?title)$/i</headerPattern>
Expand Down Expand Up @@ -656,6 +678,7 @@
<html>
<type>Select Date</type>
<formatType>birth</formatType>
<label>Birth Date</label>
</html>
<contactType>Individual</contactType>
</field>
Expand All @@ -671,6 +694,7 @@
<required>true</required>
<html>
<type>CheckBox</type>
<label>Is Deceased</label>
</html>
<contactType>Individual</contactType>
</field>
Expand All @@ -690,6 +714,7 @@
<html>
<type>Select Date</type>
<formatType>birth</formatType>
<label>Deceased Date</label>
</html>
<contactType>Individual</contactType>
</field>
Expand All @@ -700,6 +725,7 @@
<html>
<type>Text</type>
<size>30</size>
<label>Household Name</label>
</html>
<import>true</import>
<headerPattern>/^household|(h(ousehold\s)?name)$/i</headerPattern>
Expand Down Expand Up @@ -739,6 +765,7 @@
<html>
<type>Text</type>
<size>30</size>
<label>Organization Name</label>
</html>
<import>true</import>
<headerPattern>/^organization|(o(rganization\s)?name)$/i</headerPattern>
Expand All @@ -763,6 +790,7 @@
<add>1.1</add>
<html>
<type>Text</type>
<label>SIC Code</label>
</html>
<contactType>Organization</contactType>
</field>
Expand Down Expand Up @@ -830,6 +858,9 @@
<required>false</required>
<export>true</export>
<default>NULL</default>
<html>
<label>Created Date</label>
</html>
<add>4.3</add>
</field>
<index>
Expand All @@ -844,6 +875,9 @@
<required>false</required>
<export>true</export>
<default>CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP</default>
<html>
<label>Modified Date</label>
</html>
<add>4.3</add>
</field>
<index>
Expand Down
3 changes: 3 additions & 0 deletions xml/schema/Contact/ContactType.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@
<type>varchar</type>
<length>64</length>
<comment>Internal name of Contact Type (or Subtype).</comment>
<html>
<label>Name</label>
</html>
<add>3.1</add>
<required>true</required>
</field>
Expand Down
6 changes: 6 additions & 0 deletions xml/schema/Contact/DashboardContact.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,9 @@
<type>int</type>
<comment>column no for this widget</comment>
<default>0</default>
<html>
<label>Column Number</label>
</html>
<add>3.1</add>
</field>
<field>
Expand Down Expand Up @@ -108,6 +111,9 @@
<name>content</name>
<type>longtext</type>
<comment>dashlet content</comment>
<html>
<label>Content</label>
</html>
<add>3.3</add>
<drop>4.7</drop>
</field>
Expand Down
20 changes: 13 additions & 7 deletions xml/schema/Contribute/Contribution.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,8 +159,9 @@
<comment>Total amount of this contribution. Use market value for non-monetary gifts.</comment>
<add>1.3</add>
<html>
<type>Text</type>
</html>
<type>Text</type>
<label>Total Amount</label>
</html>
</field>
<index>
<name>index_total_amount_receive_date</name>
Expand All @@ -177,8 +178,9 @@
<comment>actual processor fee if known - may be 0.</comment>
<add>1.3</add>
<html>
<type>Text</type>
</html>
<type>Text</type>
<label>Fee Amount</label>
</html>
</field>
<field>
<name>net_amount</name>
Expand All @@ -189,8 +191,9 @@
<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>
<html>
<type>Text</type>
</html>
<type>Text</type>
<label>Net Amount</label>
</html>
</field>
<field>
<name>trxn_id</name>
Expand Down Expand Up @@ -250,6 +253,7 @@
</pseudoconstant>
<html>
<type>Select</type>
<label>Currency</label>
</html>
</field>
<field>
Expand Down Expand Up @@ -290,6 +294,7 @@
<html>
<type>Select Date</type>
<formatType>activityDateTime</formatType>
<label>Receipt Date</label>
</html>
<add>1.3</add>
</field>
Expand Down Expand Up @@ -510,7 +515,8 @@
<comment>Stores the date when revenue should be recognized.</comment>
<html>
<type>Select Date</type>
<formatType>activityDateTime</formatType>
<formatType>activityDateTime</formatType>
<label>Revenue Recognition Date</label>
</html>
<add>4.7</add>
</field>
Expand Down
Loading