Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed version conflict

Browse Source
This commit is contained in:
Nabin Hait 2016-10-03 18:05:34 +05:30
commit 7fb79d175f
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
View File

@ -372,7 +372,7 @@ class PurchaseInvoice(BuyingController):
if flt(item.base_net_amount): if flt(item.base_net_amount):
account_currency = get_account_currency(item.expense_account) account_currency = get_account_currency(item.expense_account)
if self.update_stock and self.auto_accounting_for_stock: if self.update_stock and self.auto_accounting_for_stock and item.item_code in stock_items:
val_rate_db_precision = 6 if cint(item.precision("valuation_rate")) <= 6 else 9 val_rate_db_precision = 6 if cint(item.precision("valuation_rate")) <= 6 else 9
# warehouse account # warehouse account

3
erpnext/templates/print_formats/includes/item_table_description.html
View File

@ -3,8 +3,7 @@
{% if doc.in_format_data("image") and doc.get("image") and not doc.is_print_hide("image")-%} {% if doc.in_format_data("image") and doc.get("image") and not doc.is_print_hide("image")-%}
<div class="pull-left" style="width: 20%; margin-right: 10px;"> <div class="pull-left" style="width: 20%; margin-right: 10px;">
<div class="square-image" style="background-image: url('{{ doc.image }}')"> <img class="print-item-image" src="{{ doc.image }}" alt="">
</div>
</div> </div>
{%- endif %} {%- endif %}