diff --git a/CRM/Upgrade/Incremental/sql/4.4.1.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.4.1.mysql.tpl index a5615cfdd47198741b807a83e7956111987011b1..f1cc0d3e296449fd381cc61150dd90c4071a77ba 100644 --- a/CRM/Upgrade/Incremental/sql/4.4.1.mysql.tpl +++ b/CRM/Upgrade/Incremental/sql/4.4.1.mysql.tpl @@ -4,3 +4,7 @@ SELECT @option_group_id_name_badge := max(id) from civicrm_option_group where na UPDATE civicrm_option_value SET value = '{literal}{"name":"Avery 5395","paper-size":"a4","metric":"mm","lMargin":15,"tMargin":26,"NX":2,"NY":4,"SpaceX":10,"SpaceY":5,"width":83,"height":57,"font-size":12,"orientation":"portrait","font-name":"helvetica","font-style":"","lPadding":3,"tPadding":3}{/literal}' WHERE option_group_id = @option_group_id_name_badge AND name = 'Avery 5395'; + +-- CRM-13669 +UPDATE civicrm_option_value SET name = 'Dear {contact.household_name}' +WHERE name = 'Dear {contact.househols_name}'; diff --git a/xml/templates/civicrm_data.tpl b/xml/templates/civicrm_data.tpl index b6bd690c1ce75e7e981318781aaa29547970a9f2..ee849b5def8da43564a973b589c520d3c64b2ae1 100644 --- a/xml/templates/civicrm_data.tpl +++ b/xml/templates/civicrm_data.tpl @@ -688,13 +688,13 @@ VALUES (@option_group_id_emailGreeting, '{literal}Dear {contact.individual_prefix} {contact.first_name} {contact.last_name}{/literal}', 2, '{literal}Dear {contact.individual_prefix} {contact.first_name} {contact.last_name}{/literal}', NULL, 1, 0, 2, NULL, 0, 0, 1, NULL, NULL), (@option_group_id_emailGreeting, '{literal}Dear {contact.individual_prefix} {contact.last_name}{/literal}', 3, '{literal}Dear {contact.individual_prefix} {contact.last_name}{/literal}', NULL, 1, 0, 3, NULL, 0, 0, 1, NULL, NULL), (@option_group_id_emailGreeting, '{literal}Customized{/literal}', 4, '{literal}Customized{/literal}', NULL, 0, 0, 4, NULL, 0, 1, 1, NULL, NULL), - (@option_group_id_emailGreeting, '{literal}Dear {contact.household_name}{/literal}', 5, '{literal}Dear {contact.househols_name}{/literal}', NULL, 2, 1, 5, NULL, 0, 0, 1, NULL, NULL), + (@option_group_id_emailGreeting, '{literal}Dear {contact.household_name}{/literal}', 5, '{literal}Dear {contact.household_name}{/literal}', NULL, 2, 1, 5, NULL, 0, 0, 1, NULL, NULL), -- postal greeting. (@option_group_id_postalGreeting, '{literal}Dear {contact.first_name}{/literal}', 1, '{literal}Dear {contact.first_name}{/literal}', NULL, 1, 1, 1, NULL, 0, 0, 1, NULL, NULL), (@option_group_id_postalGreeting, '{literal}Dear {contact.individual_prefix} {contact.first_name} {contact.last_name}{/literal}', 2, '{literal}Dear {contact.individual_prefix} {contact.first_name} {contact.last_name}{/literal}', NULL, 1, 0, 2, NULL, 0, 0, 1, NULL, NULL), (@option_group_id_postalGreeting, '{literal}Dear {contact.individual_prefix} {contact.last_name}{/literal}', 3, '{literal}Dear {contact.individual_prefix} {contact.last_name}{/literal}', NULL, 1, 0, 3, NULL, 0, 0, 1, NULL, NULL), (@option_group_id_postalGreeting, '{literal}Customized{/literal}', 4, '{literal}Customized{/literal}', NULL, 0, 0, 4, NULL, 0, 1, 1, NULL, NULL), - (@option_group_id_postalGreeting, '{literal}Dear {contact.household_name}{/literal}', 5, '{literal}Dear {contact.househols_name}{/literal}', NULL, 2, 1, 5, NULL, 0, 0, 1, NULL, NULL), + (@option_group_id_postalGreeting, '{literal}Dear {contact.household_name}{/literal}', 5, '{literal}Dear {contact.household_name}{/literal}', NULL, 2, 1, 5, NULL, 0, 0, 1, NULL, NULL), -- addressee (@option_group_id_addressee, '{literal}{contact.individual_prefix}{ } {contact.first_name}{ }{contact.middle_name}{ }{contact.last_name}{ }{contact.individual_suffix}{/literal}', '1', '{literal}}{contact.individual_prefix}{ } {contact.first_name}{ }{contact.middle_name}{ }{contact.last_name}{ }{contact.individual_suffix}{/literal}', NULL , '1', '1', '1', NULL , '0', '0', '1', NULL , NULL),