Merge branch 'hotfix'
This commit is contained in:
commit
112827ee86
@ -2,7 +2,7 @@
|
||||
from __future__ import unicode_literals
|
||||
import frappe
|
||||
|
||||
__version__ = '7.0.52'
|
||||
__version__ = '7.0.53'
|
||||
|
||||
def get_default_company(user=None):
|
||||
'''Get default company for user'''
|
||||
|
@ -372,7 +372,7 @@ class PurchaseInvoice(BuyingController):
|
||||
if flt(item.base_net_amount):
|
||||
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
|
||||
|
||||
# warehouse account
|
||||
|
@ -3,8 +3,7 @@
|
||||
|
||||
{% 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="square-image" style="background-image: url('{{ doc.image }}')">
|
||||
</div>
|
||||
<img class="print-item-image" src="{{ doc.image }}" alt="">
|
||||
</div>
|
||||
{%- endif %}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user