mirror of
https://github.com/rickbarrette/redmine_qbo.git
synced 2026-02-13 09:13:58 -05:00
Merge branch 'redmine-6' into dev-6
This commit is contained in:
@@ -37,8 +37,11 @@
|
|||||||
</tr>
|
</tr>
|
||||||
|
|
||||||
<tr>
|
<tr>
|
||||||
<th><%=t(:field_notes)%></th>
|
<th colspan="2"><h4><%=t(:field_notes)%></hr></th>
|
||||||
<td>
|
</tr>
|
||||||
|
|
||||||
|
<tr>
|
||||||
|
<td colspan="2">
|
||||||
<pre id="note-display" style="text-align: left; white-space: pre-wrap; font-family: inherit;">
|
<pre id="note-display" style="text-align: left; white-space: pre-wrap; font-family: inherit;">
|
||||||
<%= customer.notes %>
|
<%= customer.notes %>
|
||||||
</pre>
|
</pre>
|
||||||
|
|||||||
@@ -11,7 +11,7 @@
|
|||||||
|
|
||||||
<div class="splitcontent">
|
<div class="splitcontent">
|
||||||
<div class="splitcontentleft">
|
<div class="splitcontentleft">
|
||||||
<h4><%=t(:label_customer)%>:</h4>
|
<h4><%=t(:field_customer)%>:</h4>
|
||||||
<%= render :partial => 'customers/details', locals: {customer: @customer} %>
|
<%= render :partial => 'customers/details', locals: {customer: @customer} %>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|||||||
@@ -2,12 +2,14 @@
|
|||||||
|
|
||||||
<%= form_with(url: invoice_path, method: :get) do |form| %>
|
<%= form_with(url: invoice_path, method: :get) do |form| %>
|
||||||
|
|
||||||
|
<% if @customer.invoices.count > 1 %>
|
||||||
<div class="form-check">
|
<div class="form-check">
|
||||||
<%= check_box_tag "select-all-invoices", "1", false, id: "select-all-invoices" %>
|
<%= check_box_tag "select-all-invoices", "1", false, id: "select-all-invoices" %>
|
||||||
<%= label_tag "select-all-invoices", t(:label_select_all) %>
|
<%= label_tag "select-all-invoices", t(:label_select_all) %>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<hr>
|
<hr>
|
||||||
|
<% end %>
|
||||||
|
|
||||||
<% @customer.invoices.order(id: :desc).each do |invoice| %>
|
<% @customer.invoices.order(id: :desc).each do |invoice| %>
|
||||||
<div class="row">
|
<div class="row">
|
||||||
@@ -16,8 +18,10 @@
|
|||||||
</div>
|
</div>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
|
<% if @customer.invoices.count > 1 %>
|
||||||
<%= form.submit t(:button_bulk_pdf) %>
|
<%= form.submit t(:button_bulk_pdf) %>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
<% end %>
|
||||||
|
|
||||||
<% else %>
|
<% else %>
|
||||||
<p><%=t(:label_no_invoices)%>.</p>
|
<p><%=t(:label_no_invoices)%>.</p>
|
||||||
|
|||||||
Reference in New Issue
Block a user