diff options
| author | Ivan Kohler <ivan@freeside.biz> | 2015-02-03 07:18:45 -0800 |
|---|---|---|
| committer | Ivan Kohler <ivan@freeside.biz> | 2015-02-03 07:18:45 -0800 |
| commit | aeb90ade381fc3d5477db0334048c2af623fccfe (patch) | |
| tree | d1540f5ccef513d10193c124fa6aeaae743ba107 /httemplate/edit | |
| parent | 167dbdad01e2c1b62fd9be43cc05212e8c874a02 (diff) | |
| parent | d9edf24e9d3e1fd87a23359a7679ef6d6637c00d (diff) | |
contacts can be shared among customers / "duplicate contact emails", RT#27943
Diffstat (limited to 'httemplate/edit')
| -rw-r--r-- | httemplate/edit/cust_main-contacts.html | 1 | ||||
| -rw-r--r-- | httemplate/edit/elements/part_svc_column.html | 3 | ||||
| -rw-r--r-- | httemplate/edit/quick-charge.html | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/httemplate/edit/cust_main-contacts.html b/httemplate/edit/cust_main-contacts.html index 9f0654608..3b7eb07d3 100644 --- a/httemplate/edit/cust_main-contacts.html +++ b/httemplate/edit/cust_main-contacts.html @@ -11,6 +11,7 @@ { 'field' => 'contactnum', 'type' => 'contact', 'colspan' => 6, + 'custnum' => $custnum, 'm2m_method' => 'cust_contact', 'm2m_dstcol' => 'contactnum', 'm2_label' => ' ', #'Contact', diff --git a/httemplate/edit/elements/part_svc_column.html b/httemplate/edit/elements/part_svc_column.html index 53cda859e..2bb4f5e41 100644 --- a/httemplate/edit/elements/part_svc_column.html +++ b/httemplate/edit/elements/part_svc_column.html @@ -140,7 +140,8 @@ that field. 'value_col' => $def->{'select_key'}, 'order_by' => dbdef->table($def->{'select_table'})->primary_key, 'multiple' => $def->{'multiple'}, - 'disable_empty' => 1, + 'disable_empty' => $def->{'select_allow_empty'} ? undef : 1, + 'empty_label' => $def->{'select_allow_empty'} ? ' ' : undef, 'curr_value' => $value, # these can be switched between multiple and singular, # so put the complete curr_value in an attribute diff --git a/httemplate/edit/quick-charge.html b/httemplate/edit/quick-charge.html index 83620a973..58c1b0a82 100644 --- a/httemplate/edit/quick-charge.html +++ b/httemplate/edit/quick-charge.html @@ -171,6 +171,7 @@ function bill_now_changed (what) { &> % } +% unless ($billed) { <TR> <TD ALIGN="right"><% mt('Tax exempt') |h %> </TD> <TD><INPUT TYPE="checkbox" NAME="setuptax" VALUE="Y" <% $cgi->param('setuptax') ? 'CHECKED' : '' %>></TD> @@ -179,6 +180,7 @@ function bill_now_changed (what) { <& /elements/tr-select-taxclass.html, 'curr_value' => $part_pkg->get('taxclass') &> <& /elements/tr-select-taxproduct.html, 'label' => emt('Tax product'), 'onclick' => 'parent.taxproductmagic(this);', 'curr_value' => $part_pkg->get('taxproductnum') &> +% } % } else { # new one-time charge |