+2013-3-21 Matsumoto Yasuhito <ymatsumoto _at_ appirits.com>
+
+ * 2.1.6 Release
+ * [管理画面] 受注管理画面の検索内容に「受注日」を追加
+ * [管理画面] 納品書・ピッキングリストの作成機能追加
+ * [管理画面] 納品書・ピッキングリストのPDF出力機能追加
+ * [bugfix] 商品別集計が正しく集計されない不具合修正
+ * [bugfix] 商品マスタ管理、在庫切れ一覧、顧客マスタで日付で絞り込むとCSV DOWNLOADできないバグ修正
+
2012-12-27 YOSHIDA Hiroki <hyoshida _at_ appirits.com>
* 2.1.5 Release
:shop_name => @shop.try(:corp_name))
@order_delivery.order_details.each do | detail |
- r.page.list(:product).add_row(:quantity => detail.quantity,
+ r.page.list(:product).add_row(:quantity => number_with_delimiter(detail.quantity),
:product_name => detail.product_name,
:category_name1 => detail.style_category_name1,
:category_name2 => detail.style_category_name2,
:product_name => detail.product_name,
:category_name1 => detail.style_category_name1,
:category_name2 => detail.style_category_name2,
- :quantity => detail.quantity)
+ :quantity => number_with_delimiter(detail.quantity))
end
end
<td><%=h detail.product_code %></td>
<td><%=h detail.product_name %>/<br /><%=h detail.style_category_name1 %>/<br /><%=h detail.style_category_name2 %></td>
<td><%=h number_with_delimiter(detail.price) %>円</td>
- <td><%=h detail.quantity %></td>
+ <td><%=h number_with_delimiter(detail.quantity) %></td>
<td><%= number_with_delimiter(detail.price_with_tax) %>円</td>
<td><%= number_with_delimiter(detail.subtotal) %>円</td>
</tr>
</tr>
<tr>
<th colspan="5">値引</th>
- <td><%=h @order_delivery.discount %>円</td>
+ <td><%=h number_with_delimiter(@order_delivery.discount) || 0 %>円</td>
</tr>
<tr>
<th colspan="5">送料</th>
- <td><%=h @order_delivery.deliv_fee %>円</td>
+ <td><%=h number_with_delimiter(@order_delivery.deliv_fee) %>円</td>
</tr>
<tr>
<th colspan="5">手数料</th>
- <td><%=h @order_delivery.charge %>円</td>
+ <td><%=h number_with_delimiter(@order_delivery.charge) %>円</td>
</tr>
<tr>
<th colspan="5">合計</th>
</tr>
<tr>
<th colspan="5">値引</th>
- <td><%= number_with_delimiter @order_delivery.discount %>円</td>
+ <td><%= number_with_delimiter @order_delivery.discount || 0 %>円</td>
</tr>
<tr>
<th colspan="5">送料</th>
<%=h detail.style_category_name2 %>
</td>
<td><%=h number_with_delimiter(detail.price) %>円</td>
- <td><%=h detail.quantity %></td>
+ <td><%=h number_with_delimiter(detail.quantity) %></td>
<td><%= number_with_delimiter(detail.price_with_tax) %>円</td>
<td><%= number_with_delimiter(detail.subtotal) %>円</td>
</tr>
<% unless @order_delivery.discount.blank? %>
<tr>
<th colspan="5">値引</th>
- <td><%=h @order_delivery.discount %>円</td>
+ <td><%=h number_with_delimiter(@order_delivery.discount) || 0 %>円</td>
</tr>
<% end %>
<tr>
<th colspan="5">送料</th>
- <td><%=h @order_delivery.deliv_fee %>円</td>
+ <td><%=h number_with_delimiter(@order_delivery.deliv_fee) %>円</td>
</tr>
<tr>
<th colspan="5">手数料</th>
- <td><%=h @order_delivery.charge %>円</td>
+ <td><%=h number_with_delimiter(@order_delivery.charge) %>円</td>
</tr>
<tr>
<th colspan="5">合計</th>