Commits

Tay Ray Chuan committed d049956 Merge with conflicts

Merge in html fix for billing contact form

Conflicts:
satchmo/apps/satchmo_store/contact/templates/contact/_ContactInfoForm_billing.html

  • Participants
  • Parent commits f14dbd3, ee5d16d

Comments (0)

Files changed (1)

satchmo/apps/satchmo_store/contact/templates/contact/_ContactInfoForm_billing.html

 {% block billing-info %}
     <tr><td colspan="2"><h4>{% trans "Billing Information" %}</h4></td></tr>
 
-    <tr><td><label for="id_addressee">{% trans "Bill To" %}</label><p class="help">{% trans "If different from the first and last names above" %}</td><td> {{ form.addressee }}</td></tr>
+    <tr><td><label for="id_addressee">{% trans "Bill To" %}</label><p class="help">{% trans "If different from the first and last names above" %}</p></td><td> {{ form.addressee }}</td></tr>
     {% if form.addressee.errors %}<tr><td class="error" colspan="2">*** {{ form.addressee.errors|join:", "}}</td></tr>{% endif %}
 
     <tr><td><label for="id_street1">{% trans "Street" %}{% if form.street1.field.required %}*{% endif %}</label></td><td> {{ form.street1 }}</td></tr>