diff --git a/CRM/Batch/DAO/Batch.php b/CRM/Batch/DAO/Batch.php index 500d32941cdb..26340d54ad15 100644 --- a/CRM/Batch/DAO/Batch.php +++ b/CRM/Batch/DAO/Batch.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Batch/Batch.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:88c016b0141ed596ac6fdbbef3e27a1e) + * (GenCodeChecksum:3e98e0127d48dfc44b2e6db904cd556f) */ /** @@ -364,7 +364,7 @@ public static function &fields() { 'description' => ts('Total amount for this batch.'), 'precision' => [ 20, - 2 + 2, ], 'where' => 'civicrm_batch.total', 'table_name' => 'civicrm_batch', diff --git a/CRM/Campaign/DAO/Campaign.php b/CRM/Campaign/DAO/Campaign.php index 2b9d02709512..a3c496b315db 100644 --- a/CRM/Campaign/DAO/Campaign.php +++ b/CRM/Campaign/DAO/Campaign.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Campaign/Campaign.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:6df4e0d5c3320d87183db79f551d8c86) + * (GenCodeChecksum:5f32f92aafb04b54f15a47d07a2fe105) */ /** @@ -446,7 +446,7 @@ public static function &fields() { 'description' => ts('The target revenue for this campaign.'), 'precision' => [ 20, - 2 + 2, ], 'where' => 'civicrm_campaign.goal_revenue', 'table_name' => 'civicrm_campaign', diff --git a/CRM/Contact/DAO/Contact.php b/CRM/Contact/DAO/Contact.php index 42d53e908a54..139e0e71c02a 100644 --- a/CRM/Contact/DAO/Contact.php +++ b/CRM/Contact/DAO/Contact.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Contact/Contact.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:8c2ea7bf40921f9f29eef33d717fd760) + * (GenCodeChecksum:e2181ea97a3e309b7e74b636757b6aac) */ /** @@ -586,8 +586,7 @@ public static function &fields() { 'name' => 'legal_identifier', 'type' => CRM_Utils_Type::T_STRING, 'title' => ts('Legal Identifier'), - 'description' => ts('May be used for SSN, EIN/TIN, Household ID (census) or other applicable unique legal/government ID. - '), + 'description' => ts('May be used for SSN, EIN/TIN, Household ID (census) or other applicable unique legal/government ID.'), 'maxlength' => 32, 'size' => CRM_Utils_Type::MEDIUM, 'import' => TRUE, diff --git a/CRM/Contact/DAO/RelationshipType.php b/CRM/Contact/DAO/RelationshipType.php index 7b956aa92324..edb59a6b76d1 100644 --- a/CRM/Contact/DAO/RelationshipType.php +++ b/CRM/Contact/DAO/RelationshipType.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Contact/RelationshipType.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:4c5acf774814091e403962a994b6c78e) + * (GenCodeChecksum:78a8cea89e73b1a409f7908ad08cf99e) */ /** @@ -262,8 +262,7 @@ public static function &fields() { 'name' => 'contact_sub_type_a', 'type' => CRM_Utils_Type::T_STRING, 'title' => ts('Contact Subtype A'), - 'description' => ts('If defined, contact_sub_type_a in a relationship of this type must be a specific contact_sub_type. - '), + 'description' => ts('If defined, contact_sub_type_a in a relationship of this type must be a specific contact_sub_type.'), 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, 'where' => 'civicrm_relationship_type.contact_sub_type_a', @@ -285,8 +284,7 @@ public static function &fields() { 'name' => 'contact_sub_type_b', 'type' => CRM_Utils_Type::T_STRING, 'title' => ts('Contact Subtype B'), - 'description' => ts('If defined, contact_sub_type_b in a relationship of this type must be a specific contact_sub_type. - '), + 'description' => ts('If defined, contact_sub_type_b in a relationship of this type must be a specific contact_sub_type.'), 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, 'where' => 'civicrm_relationship_type.contact_sub_type_b', @@ -322,8 +320,7 @@ public static function &fields() { 'name' => 'is_active', 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Relationship Type is Active'), - 'description' => ts('Is this relationship type currently active (i.e. can be used when creating or editing relationships)? - '), + 'description' => ts('Is this relationship type currently active (i.e. can be used when creating or editing relationships)?'), 'where' => 'civicrm_relationship_type.is_active', 'default' => '1', 'table_name' => 'civicrm_relationship_type', diff --git a/CRM/Contribute/DAO/Contribution.php b/CRM/Contribute/DAO/Contribution.php index 54b70dd9066b..b628edef8cc6 100644 --- a/CRM/Contribute/DAO/Contribution.php +++ b/CRM/Contribute/DAO/Contribution.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Contribute/Contribution.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:67d7c56983261917119041820da97eb8) + * (GenCodeChecksum:7a81b495b5661ae881321938d4ee38c9) */ /** @@ -385,7 +385,7 @@ public static function &fields() { 'description' => ts('Portion of total amount which is NOT tax deductible. Equal to total_amount for non-deductible financial types.'), 'precision' => [ 20, - 2 + 2, ], 'import' => TRUE, 'where' => 'civicrm_contribution.non_deductible_amount', @@ -409,7 +409,7 @@ public static function &fields() { 'required' => TRUE, 'precision' => [ 20, - 2 + 2, ], 'import' => TRUE, 'where' => 'civicrm_contribution.total_amount', @@ -431,7 +431,7 @@ public static function &fields() { 'description' => ts('actual processor fee if known - may be 0.'), 'precision' => [ 20, - 2 + 2, ], 'import' => TRUE, 'where' => 'civicrm_contribution.fee_amount', @@ -453,7 +453,7 @@ public static function &fields() { 'description' => ts('actual funds transfer amount. total less fees. if processor does not report actual fee during transaction, this is set to total_amount.'), 'precision' => [ 20, - 2 + 2, ], 'import' => TRUE, 'where' => 'civicrm_contribution.net_amount', @@ -804,7 +804,7 @@ public static function &fields() { 'description' => ts('Total tax amount of this contribution.'), 'precision' => [ 20, - 2 + 2, ], 'import' => TRUE, 'where' => 'civicrm_contribution.tax_amount', diff --git a/CRM/Contribute/DAO/ContributionPage.php b/CRM/Contribute/DAO/ContributionPage.php index c1b45382c739..e7d37109d370 100644 --- a/CRM/Contribute/DAO/ContributionPage.php +++ b/CRM/Contribute/DAO/ContributionPage.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Contribute/ContributionPage.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:c7122b219c06cf7e22ca2d5dfe8fd77c) + * (GenCodeChecksum:c6e11bf69550f2253d2a287e8ebeae3d) */ /** @@ -641,7 +641,7 @@ public static function &fields() { 'description' => ts('Minimum initial amount for partial payment'), 'precision' => [ 20, - 2 + 2, ], 'where' => 'civicrm_contribution_page.min_initial_amount', 'table_name' => 'civicrm_contribution_page', @@ -679,7 +679,7 @@ public static function &fields() { 'description' => ts('if other amounts allowed, user can configure minimum allowed.'), 'precision' => [ 20, - 2 + 2, ], 'where' => 'civicrm_contribution_page.min_amount', 'table_name' => 'civicrm_contribution_page', @@ -694,7 +694,7 @@ public static function &fields() { 'description' => ts('if other amounts allowed, user can configure maximum allowed.'), 'precision' => [ 20, - 2 + 2, ], 'where' => 'civicrm_contribution_page.max_amount', 'table_name' => 'civicrm_contribution_page', @@ -709,7 +709,7 @@ public static function &fields() { 'description' => ts('The target goal for this page, allows people to build a goal meter'), 'precision' => [ 20, - 2 + 2, ], 'where' => 'civicrm_contribution_page.goal_amount', 'table_name' => 'civicrm_contribution_page', diff --git a/CRM/Contribute/DAO/ContributionRecur.php b/CRM/Contribute/DAO/ContributionRecur.php index dbbbb137f022..3b5fcb2f6635 100644 --- a/CRM/Contribute/DAO/ContributionRecur.php +++ b/CRM/Contribute/DAO/ContributionRecur.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Contribute/ContributionRecur.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:4af8fee211119c1b0184dd09932c546e) + * (GenCodeChecksum:02897f2c575bc43e915d0b7e8ee68fbb) */ /** @@ -298,7 +298,7 @@ public static function &fields() { 'required' => TRUE, 'precision' => [ 20, - 2 + 2, ], 'where' => 'civicrm_contribution_recur.amount', 'table_name' => 'civicrm_contribution_recur', diff --git a/CRM/Contribute/DAO/ContributionSoft.php b/CRM/Contribute/DAO/ContributionSoft.php index 812701f4e7c4..129b3a32ada6 100644 --- a/CRM/Contribute/DAO/ContributionSoft.php +++ b/CRM/Contribute/DAO/ContributionSoft.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Contribute/ContributionSoft.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:e14061776c0e1add8462e32454a01fe1) + * (GenCodeChecksum:12f49d75296e9500e850dd63741372ea) */ /** @@ -177,7 +177,7 @@ public static function &fields() { 'required' => TRUE, 'precision' => [ 20, - 2 + 2, ], 'import' => TRUE, 'where' => 'civicrm_contribution_soft.amount', diff --git a/CRM/Contribute/DAO/Product.php b/CRM/Contribute/DAO/Product.php index a5fdc7f728c6..ad147b0646de 100644 --- a/CRM/Contribute/DAO/Product.php +++ b/CRM/Contribute/DAO/Product.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Contribute/Product.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:6bebe01d00d19465a5536aa561934fbc) + * (GenCodeChecksum:27002591d220b4bc2498b367bef17367) */ /** @@ -119,7 +119,7 @@ class CRM_Contribute_DAO_Product extends CRM_Core_DAO { /** * Rolling means we set start/end based on current day, fixed means we set start/end for current year or month - (e.g. 1 year + fixed -> we would set start/end for 1/1/06 thru 12/31/06 for any premium chosen in 2006) + * (e.g. 1 year + fixed -> we would set start/end for 1/1/06 thru 12/31/06 for any premium chosen in 2006) * * @var string */ @@ -284,7 +284,7 @@ public static function &fields() { 'description' => ts('Sell price or market value for premiums. For tax-deductible contributions, this will be stored as non_deductible_amount in the contribution record.'), 'precision' => [ 20, - 2 + 2, ], 'where' => 'civicrm_product.price', 'table_name' => 'civicrm_product', @@ -340,7 +340,7 @@ public static function &fields() { 'description' => ts('Minimum contribution required to be eligible to select this premium.'), 'precision' => [ 20, - 2 + 2, ], 'where' => 'civicrm_product.min_contribution', 'table_name' => 'civicrm_product', @@ -355,7 +355,7 @@ public static function &fields() { 'description' => ts('Actual cost of this product. Useful to determine net return from sale or using this as an incentive.'), 'precision' => [ 20, - 2 + 2, ], 'where' => 'civicrm_product.cost', 'table_name' => 'civicrm_product', diff --git a/CRM/Core/CodeGen/Specification.php b/CRM/Core/CodeGen/Specification.php index 101b3426b412..805cc733c461 100644 --- a/CRM/Core/CodeGen/Specification.php +++ b/CRM/Core/CodeGen/Specification.php @@ -327,7 +327,7 @@ public function getField(&$fieldXML, &$fields) { $field['sqlType'] = 'decimal(' . $length . ')'; $field['phpType'] = 'float'; $field['crmType'] = 'CRM_Utils_Type::T_MONEY'; - $field['precision'] = $length; + $field['precision'] = $length . ','; break; case 'float': diff --git a/CRM/Core/DAO/Address.php b/CRM/Core/DAO/Address.php index c7affaf7ffc4..50841dbee553 100644 --- a/CRM/Core/DAO/Address.php +++ b/CRM/Core/DAO/Address.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Core/Address.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:2487d5f7de34dffd729bba2d3ea65ed6) + * (GenCodeChecksum:4999e79688aae8d0958e46cbd320ae3a) */ /** @@ -65,8 +65,8 @@ class CRM_Core_DAO_Address extends CRM_Core_DAO { /** * Concatenation of all routable street address components (prefix, street number, street name, suffix, unit - number OR P.O. Box). Apps should be able to determine physical location with this data (for mapping, mail - delivery, etc.). + * number OR P.O. Box). Apps should be able to determine physical location with this data (for mapping, mail + * delivery, etc.). * * @var string */ @@ -345,8 +345,7 @@ public static function &fields() { 'title' => ts('Street Address'), 'description' => ts('Concatenation of all routable street address components (prefix, street number, street name, suffix, unit number OR P.O. Box). Apps should be able to determine physical location with this data (for mapping, mail - delivery, etc.). - '), + delivery, etc.).'), 'maxlength' => 96, 'size' => CRM_Utils_Type::HUGE, 'import' => TRUE, @@ -381,8 +380,7 @@ public static function &fields() { 'name' => 'street_number_suffix', 'type' => CRM_Utils_Type::T_STRING, 'title' => ts('Street Number Suffix'), - 'description' => ts('Non-numeric portion of address number on the street, e.g. For 112A Main St, the street_number_suffix = A - '), + 'description' => ts('Non-numeric portion of address number on the street, e.g. For 112A Main St, the street_number_suffix = A'), 'maxlength' => 8, 'size' => CRM_Utils_Type::EIGHT, 'where' => 'civicrm_address.street_number_suffix', diff --git a/CRM/Core/DAO/Component.php b/CRM/Core/DAO/Component.php index 22cbb9af7c09..77def7da1083 100644 --- a/CRM/Core/DAO/Component.php +++ b/CRM/Core/DAO/Component.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Core/Component.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:71dfa95215b9ca0bdf22286815e2dae2) + * (GenCodeChecksum:3259789de86a7fb333ce0b11d35fe6aa) */ /** @@ -43,8 +43,7 @@ class CRM_Core_DAO_Component extends CRM_Core_DAO { public $name; /** - * Path to components main directory in a form of a class - namespace. + * Path to components main directory in a form of a class namespace. * * @var string */ @@ -96,9 +95,7 @@ public static function &fields() { 'name' => 'namespace', 'type' => CRM_Utils_Type::T_STRING, 'title' => ts('Namespace reserved for component.'), - 'description' => ts('Path to components main directory in a form of a class - namespace. - '), + 'description' => ts('Path to components main directory in a form of a class namespace.'), 'maxlength' => 128, 'size' => CRM_Utils_Type::HUGE, 'where' => 'civicrm_component.namespace', diff --git a/CRM/Core/DAO/MappingField.php b/CRM/Core/DAO/MappingField.php index 947eced88209..afa1179d87f2 100644 --- a/CRM/Core/DAO/MappingField.php +++ b/CRM/Core/DAO/MappingField.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Core/MappingField.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:d331bef376a07c449d95639eb42f7c31) + * (GenCodeChecksum:e18a4d7c43e3fded3e10bed98437577e) */ /** @@ -105,7 +105,7 @@ class CRM_Core_DAO_MappingField extends CRM_Core_DAO { /** * Used to group mapping_field records into related sets (e.g. for criteria sets in search builder - mappings). + * mappings). * * @var int */ @@ -312,8 +312,7 @@ public static function &fields() { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Grouping'), 'description' => ts('Used to group mapping_field records into related sets (e.g. for criteria sets in search builder - mappings). - '), + mappings).'), 'where' => 'civicrm_mapping_field.grouping', 'default' => '1', 'table_name' => 'civicrm_mapping_field', diff --git a/CRM/Event/DAO/Event.php b/CRM/Event/DAO/Event.php index 4688a7919f6d..e5471649f0ab 100644 --- a/CRM/Event/DAO/Event.php +++ b/CRM/Event/DAO/Event.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Event/Event.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:02024f3f33a71a88e3206f5a48b3d14f) + * (GenCodeChecksum:887208d4102061a0f26eda2a6f84ea09) */ /** @@ -1281,7 +1281,7 @@ public static function &fields() { 'description' => ts('Minimum initial amount for partial payment'), 'precision' => [ 20, - 2 + 2, ], 'where' => 'civicrm_event.min_initial_amount', 'table_name' => 'civicrm_event', diff --git a/CRM/Event/DAO/Participant.php b/CRM/Event/DAO/Participant.php index 946f2171e003..cba5311348d0 100644 --- a/CRM/Event/DAO/Participant.php +++ b/CRM/Event/DAO/Participant.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Event/Participant.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:fd601efb92a34d5c30814c5ea34b323f) + * (GenCodeChecksum:2c9fa9a933df6d5c4ec745b8031f9297) */ /** @@ -79,7 +79,7 @@ class CRM_Event_DAO_Participant extends CRM_Core_DAO { /** * Populate with the label (text) associated with a fee level for paid events with multiple levels. Note that - we store the label value and not the key + * we store the label value and not the key * * @var text */ @@ -335,8 +335,7 @@ public static function &fields() { 'type' => CRM_Utils_Type::T_TEXT, 'title' => ts('Fee level'), 'description' => ts('Populate with the label (text) associated with a fee level for paid events with multiple levels. Note that - we store the label value and not the key - '), + we store the label value and not the key'), 'import' => TRUE, 'where' => 'civicrm_participant.fee_level', 'headerPattern' => '/^(f(ee\s)?level)$/i', @@ -381,7 +380,7 @@ public static function &fields() { 'description' => ts('actual processor fee if known - may be 0.'), 'precision' => [ 20, - 2 + 2, ], 'import' => TRUE, 'where' => 'civicrm_participant.fee_amount', diff --git a/CRM/Financial/DAO/EntityFinancialTrxn.php b/CRM/Financial/DAO/EntityFinancialTrxn.php index 2b014faa6f80..5387669dafac 100644 --- a/CRM/Financial/DAO/EntityFinancialTrxn.php +++ b/CRM/Financial/DAO/EntityFinancialTrxn.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Financial/EntityFinancialTrxn.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:c2c6d4183954c62f7119e9cf1eaa451b) + * (GenCodeChecksum:14582d82c08fe5e2c4242e4bafc146d4) */ /** @@ -149,7 +149,7 @@ public static function &fields() { 'required' => TRUE, 'precision' => [ 20, - 2 + 2, ], 'import' => TRUE, 'where' => 'civicrm_entity_financial_trxn.amount', diff --git a/CRM/Financial/DAO/FinancialAccount.php b/CRM/Financial/DAO/FinancialAccount.php index 8251e66e2fa3..5f0f5f1dc4e3 100644 --- a/CRM/Financial/DAO/FinancialAccount.php +++ b/CRM/Financial/DAO/FinancialAccount.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Financial/FinancialAccount.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:eb74c4e8ee5b44cb65080b2b15f7e9c2) + * (GenCodeChecksum:be1c13919aa1ff84b28ef61832132842) */ /** @@ -319,7 +319,7 @@ public static function &fields() { 'description' => ts('The percentage of the total_amount that is due for this tax.'), 'precision' => [ 10, - 8 + 8, ], 'where' => 'civicrm_financial_account.tax_rate', 'table_name' => 'civicrm_financial_account', diff --git a/CRM/Financial/DAO/FinancialItem.php b/CRM/Financial/DAO/FinancialItem.php index 980651845d9a..d3fdc69d1d76 100644 --- a/CRM/Financial/DAO/FinancialItem.php +++ b/CRM/Financial/DAO/FinancialItem.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Financial/FinancialItem.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:48ab3768197dff98c1af1e337059f085) + * (GenCodeChecksum:49a455dafedd73005f06e17dcc99c365) */ /** @@ -207,7 +207,7 @@ public static function &fields() { 'required' => TRUE, 'precision' => [ 20, - 2 + 2, ], 'where' => 'civicrm_financial_item.amount', 'headerPattern' => '/unit?.?amoun/i', diff --git a/CRM/Financial/DAO/FinancialTrxn.php b/CRM/Financial/DAO/FinancialTrxn.php index f18ca991b15d..fefd72cbdbaf 100644 --- a/CRM/Financial/DAO/FinancialTrxn.php +++ b/CRM/Financial/DAO/FinancialTrxn.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Financial/FinancialTrxn.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:11ae7954d4576a19382e63fffd31cdac) + * (GenCodeChecksum:e130935b88e96b99dc58cb9003666e18) */ /** @@ -253,7 +253,7 @@ public static function &fields() { 'required' => TRUE, 'precision' => [ 20, - 2 + 2, ], 'where' => 'civicrm_financial_trxn.total_amount', 'table_name' => 'civicrm_financial_trxn', @@ -268,7 +268,7 @@ public static function &fields() { 'description' => ts('actual processor fee if known - may be 0.'), 'precision' => [ 20, - 2 + 2, ], 'where' => 'civicrm_financial_trxn.fee_amount', 'table_name' => 'civicrm_financial_trxn', @@ -283,7 +283,7 @@ public static function &fields() { 'description' => ts('actual funds transfer amount. total less fees. if processor does not report actual fee during transaction, this is set to total_amount.'), 'precision' => [ 20, - 2 + 2, ], 'where' => 'civicrm_financial_trxn.net_amount', 'table_name' => 'civicrm_financial_trxn', diff --git a/CRM/Grant/DAO/Grant.php b/CRM/Grant/DAO/Grant.php index 6ced3f894522..d889f2ad6f48 100644 --- a/CRM/Grant/DAO/Grant.php +++ b/CRM/Grant/DAO/Grant.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Grant/Grant.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:fd288094da473bd77ff23051ae826a72) + * (GenCodeChecksum:46934eeb5b7cc864460135cbbf1679ca) */ /** @@ -308,7 +308,7 @@ public static function &fields() { 'required' => TRUE, 'precision' => [ 20, - 2 + 2, ], 'import' => TRUE, 'where' => 'civicrm_grant.amount_total', @@ -329,7 +329,7 @@ public static function &fields() { 'description' => ts('Requested grant amount, in original currency (optional).'), 'precision' => [ 20, - 2 + 2, ], 'where' => 'civicrm_grant.amount_requested', 'dataPattern' => '/^\d+(\.\d{2})?$/', @@ -348,7 +348,7 @@ public static function &fields() { 'description' => ts('Granted amount, in default currency.'), 'precision' => [ 20, - 2 + 2, ], 'import' => TRUE, 'where' => 'civicrm_grant.amount_granted', diff --git a/CRM/Member/DAO/MembershipType.php b/CRM/Member/DAO/MembershipType.php index 8a30d029e05c..fb3cddba56e6 100644 --- a/CRM/Member/DAO/MembershipType.php +++ b/CRM/Member/DAO/MembershipType.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Member/MembershipType.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:fae17cb0df3f214ff3b3c1412771d53e) + * (GenCodeChecksum:371e68c0fca2803c9b273bb25991a060) */ /** @@ -306,7 +306,7 @@ public static function &fields() { 'description' => ts('Minimum fee for this membership (0 for free/complimentary memberships).'), 'precision' => [ 18, - 9 + 9, ], 'where' => 'civicrm_membership_type.minimum_fee', 'default' => '0', diff --git a/CRM/PCP/DAO/PCP.php b/CRM/PCP/DAO/PCP.php index 6229747297fe..f6dc90a8d8d6 100644 --- a/CRM/PCP/DAO/PCP.php +++ b/CRM/PCP/DAO/PCP.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/PCP/PCP.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:1e559645205e2e345feb591b14f7693c) + * (GenCodeChecksum:e130d04d9fad8bcec628fac504ff9da7) */ /** @@ -339,7 +339,7 @@ public static function &fields() { 'description' => ts('Goal amount of this Personal Campaign Page.'), 'precision' => [ 20, - 2 + 2, ], 'where' => 'civicrm_pcp.goal_amount', 'table_name' => 'civicrm_pcp', diff --git a/CRM/Pledge/DAO/Pledge.php b/CRM/Pledge/DAO/Pledge.php index db8f334b16e2..b18050474a2b 100644 --- a/CRM/Pledge/DAO/Pledge.php +++ b/CRM/Pledge/DAO/Pledge.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Pledge/Pledge.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:8abf6ce03bebecdbd175b48fd6177b54) + * (GenCodeChecksum:877e6098c175e69f385b22f61958b70c) */ /** @@ -293,7 +293,7 @@ public static function &fields() { 'required' => TRUE, 'precision' => [ 20, - 2 + 2, ], 'import' => TRUE, 'where' => 'civicrm_pledge.amount', @@ -314,7 +314,7 @@ public static function &fields() { 'required' => TRUE, 'precision' => [ 20, - 2 + 2, ], 'where' => 'civicrm_pledge.original_installment_amount', 'export' => TRUE, diff --git a/CRM/Pledge/DAO/PledgePayment.php b/CRM/Pledge/DAO/PledgePayment.php index 3beaeb072609..a43fade0541f 100644 --- a/CRM/Pledge/DAO/PledgePayment.php +++ b/CRM/Pledge/DAO/PledgePayment.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Pledge/PledgePayment.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:549f97b304511abaf03fd8f4378dd123) + * (GenCodeChecksum:afb095a766df0f45f3aed1ff3b24e852) */ /** @@ -172,7 +172,7 @@ public static function &fields() { 'required' => TRUE, 'precision' => [ 20, - 2 + 2, ], 'import' => TRUE, 'where' => 'civicrm_pledge_payment.scheduled_amount', @@ -189,7 +189,7 @@ public static function &fields() { 'description' => ts('Actual amount that is paid as the Pledged installment amount.'), 'precision' => [ 20, - 2 + 2, ], 'import' => TRUE, 'where' => 'civicrm_pledge_payment.actual_amount', diff --git a/CRM/Price/DAO/LineItem.php b/CRM/Price/DAO/LineItem.php index 0308c354b4e9..ea4e67719a26 100644 --- a/CRM/Price/DAO/LineItem.php +++ b/CRM/Price/DAO/LineItem.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Price/LineItem.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:4d5b3e1656a90fd394f80dad0da0f57b) + * (GenCodeChecksum:6345c550c1c0605c0c25be1cc0382183) */ /** @@ -248,7 +248,7 @@ public static function &fields() { 'required' => TRUE, 'precision' => [ 20, - 2 + 2, ], 'where' => 'civicrm_line_item.qty', 'table_name' => 'civicrm_line_item', @@ -267,7 +267,7 @@ public static function &fields() { 'required' => TRUE, 'precision' => [ 20, - 2 + 2, ], 'where' => 'civicrm_line_item.unit_price', 'table_name' => 'civicrm_line_item', @@ -286,7 +286,7 @@ public static function &fields() { 'required' => TRUE, 'precision' => [ 20, - 2 + 2, ], 'where' => 'civicrm_line_item.line_total', 'table_name' => 'civicrm_line_item', @@ -351,7 +351,7 @@ public static function &fields() { 'required' => TRUE, 'precision' => [ 20, - 2 + 2, ], 'where' => 'civicrm_line_item.non_deductible_amount', 'headerPattern' => '/non?.?deduct/i', @@ -372,7 +372,7 @@ public static function &fields() { 'description' => ts('tax of each item'), 'precision' => [ 20, - 2 + 2, ], 'import' => TRUE, 'where' => 'civicrm_line_item.tax_amount', diff --git a/CRM/Price/DAO/PriceFieldValue.php b/CRM/Price/DAO/PriceFieldValue.php index 98776cb511f7..0543497f1f10 100644 --- a/CRM/Price/DAO/PriceFieldValue.php +++ b/CRM/Price/DAO/PriceFieldValue.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Price/PriceFieldValue.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:fe5a14d18ba9a89882e7bc8008f7be54) + * (GenCodeChecksum:6c2bd575335eeb9915683296952b2c3e) */ /** @@ -303,7 +303,7 @@ public static function &fields() { 'required' => TRUE, 'precision' => [ 18, - 9 + 9, ], 'where' => 'civicrm_price_field_value.amount', 'table_name' => 'civicrm_price_field_value', @@ -446,7 +446,7 @@ public static function &fields() { 'required' => TRUE, 'precision' => [ 20, - 2 + 2, ], 'where' => 'civicrm_price_field_value.non_deductible_amount', 'headerPattern' => '/non?.?deduct/i', diff --git a/xml/schema/Contact/Contact.xml b/xml/schema/Contact/Contact.xml index b74654f4d50d..d197f6bf0838 100644 --- a/xml/schema/Contact/Contact.xml +++ b/xml/schema/Contact/Contact.xml @@ -152,8 +152,7 @@ true /legal\s?id/i /\w+?\d{5,}/ - May be used for SSN, EIN/TIN, Household ID (census) or other applicable unique legal/government ID. - + May be used for SSN, EIN/TIN, Household ID (census) or other applicable unique legal/government ID. 1.1 Text diff --git a/xml/schema/Contact/RelationshipType.xml b/xml/schema/Contact/RelationshipType.xml index 6fa4b12709cb..183c3594c799 100644 --- a/xml/schema/Contact/RelationshipType.xml +++ b/xml/schema/Contact/RelationshipType.xml @@ -110,8 +110,7 @@ Contact Subtype A varchar 64 - If defined, contact_sub_type_a in a relationship of this type must be a specific contact_sub_type. - + If defined, contact_sub_type_a in a relationship of this type must be a specific contact_sub_type. 3.1 Select @@ -128,8 +127,7 @@ Contact Subtype B varchar 64 - If defined, contact_sub_type_b in a relationship of this type must be a specific contact_sub_type. - + If defined, contact_sub_type_b in a relationship of this type must be a specific contact_sub_type. 3.1 Select @@ -156,8 +154,7 @@ Relationship Type is Active boolean 1 - Is this relationship type currently active (i.e. can be used when creating or editing relationships)? - + Is this relationship type currently active (i.e. can be used when creating or editing relationships)? CheckBox diff --git a/xml/schema/Core/Address.xml b/xml/schema/Core/Address.xml index c67aa09b0053..ba522711e2d1 100644 --- a/xml/schema/Core/Address.xml +++ b/xml/schema/Core/Address.xml @@ -95,8 +95,7 @@ /^(\d{1,5}( [0-9A-Za-z]+)+)$|^(P\.?O\.\? Box \d{1,5})$/i Concatenation of all routable street address components (prefix, street number, street name, suffix, unit number OR P.O. Box). Apps should be able to determine physical location with this data (for mapping, mail - delivery, etc.). - + delivery, etc.). 1.1 Text @@ -119,8 +118,7 @@ varchar 8 true - Non-numeric portion of address number on the street, e.g. For 112A Main St, the street_number_suffix = A - + Non-numeric portion of address number on the street, e.g. For 112A Main St, the street_number_suffix = A 1.1 Text diff --git a/xml/schema/Core/Component.xml b/xml/schema/Core/Component.xml index c5ceff329d92..8ccce97d865d 100644 --- a/xml/schema/Core/Component.xml +++ b/xml/schema/Core/Component.xml @@ -31,9 +31,7 @@ Namespace reserved for component. varchar 128 - Path to components main directory in a form of a class - namespace. - + Path to components main directory in a form of a class namespace. 2.0 diff --git a/xml/schema/Core/MappingField.xml b/xml/schema/Core/MappingField.xml index 30f58d69c907..cfc0eb09c3b3 100644 --- a/xml/schema/Core/MappingField.xml +++ b/xml/schema/Core/MappingField.xml @@ -135,8 +135,7 @@ int unsigned 1 Used to group mapping_field records into related sets (e.g. for criteria sets in search builder - mappings). - + mappings). 1.5 diff --git a/xml/schema/Event/Participant.xml b/xml/schema/Event/Participant.xml index 30f9a3172068..8b267c84ebfc 100644 --- a/xml/schema/Event/Participant.xml +++ b/xml/schema/Event/Participant.xml @@ -149,8 +149,7 @@ true SEPARATOR_BOOKEND Populate with the label (text) associated with a fee level for paid events with multiple levels. Note that - we store the label value and not the key - + we store the label value and not the key 1.7 diff --git a/xml/templates/dao.tpl b/xml/templates/dao.tpl index 8e634226a353..14f15735dea1 100644 --- a/xml/templates/dao.tpl +++ b/xml/templates/dao.tpl @@ -30,7 +30,7 @@ class {$table.className} extends CRM_Core_DAO {ldelim} {foreach from=$table.fields item=field} /** {if $field.comment} - * {$field.comment} + * {$field.comment|regex_replace:"/\n[ ]*/":"\n* "} * {/if} * @var {$field.phpType}