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

Merge branch 'develop' into inactive_items

Browse Source
This commit is contained in:
Nabin Hait 2019-04-23 18:38:44 +05:30 committed by GitHub
commit 8bbc0a0c3b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/public/js/templates/address_list.html
View File

@ -9,7 +9,7 @@
<span class="text-muted">({%= __("Shipping") %})</span>{% } %} <span class="text-muted">({%= __("Shipping") %})</span>{% } %}
<a href="#Form/Address/{%= encodeURIComponent(addr_list[i].name) %}" <a href="#Form/Address/{%= encodeURIComponent(addr_list[i].name) %}"
class="btn btn-light btn-xs pull-right" class="btn btn-default btn-xs pull-right"
style="margin-top:-3px; margin-right: -5px;"> style="margin-top:-3px; margin-right: -5px;">
{%= __("Edit") %}</a> {%= __("Edit") %}</a>
</p> </p>
@ -19,5 +19,5 @@
{% if(!addr_list.length) { %} {% if(!addr_list.length) { %}
<p class="text-muted small">{%= __("No address added yet.") %}</p> <p class="text-muted small">{%= __("No address added yet.") %}</p>
{% } %} {% } %}
<p><button class="btn btn-xs btn-light btn-address">{{ __("New Address") }}</button></p> <p><button class="btn btn-xs btn-default btn-address">{{ __("New Address") }}</button></p>

4
erpnext/public/js/templates/contact_list.html
View File

@ -10,7 +10,7 @@
<span class="text-muted">&ndash; {%= contact_list[i].designation %}</span> <span class="text-muted">&ndash; {%= contact_list[i].designation %}</span>
{% } %} {% } %}
<a href="#Form/Contact/{%= encodeURIComponent(contact_list[i].name) %}" <a href="#Form/Contact/{%= encodeURIComponent(contact_list[i].name) %}"
class="btn btn-xs btn-light pull-right" class="btn btn-xs btn-default pull-right"
style="margin-top:-3px; margin-right: -5px;"> style="margin-top:-3px; margin-right: -5px;">
{%= __("Edit") %}</a> {%= __("Edit") %}</a>
</p> </p>
@ -33,6 +33,6 @@
{% if(!contact_list.length) { %} {% if(!contact_list.length) { %}
<p class="text-muted small">{%= __("No contacts added yet.") %}</p> <p class="text-muted small">{%= __("No contacts added yet.") %}</p>
{% } %} {% } %}
<p><button class="btn btn-xs btn-light btn-contact"> <p><button class="btn btn-xs btn-default btn-contact">
{{ __("New Contact") }}</button> {{ __("New Contact") }}</button>
</p> </p>

8
erpnext/stock/report/stock_ledger/stock_ledger.py
View File

@ -154,10 +154,10 @@ def get_opening_balance(filters, columns):
"posting_date": filters.from_date, "posting_date": filters.from_date,
"posting_time": "00:00:00" "posting_time": "00:00:00"
}) })
row = [""]*len(columns) row = {}
row[1] = _("'Opening'") row["item_code"] = _("'Opening'")
for i, v in ((9, 'qty_after_transaction'), (11, 'valuation_rate'), (12, 'stock_value')): for dummy, v in ((9, 'qty_after_transaction'), (11, 'valuation_rate'), (12, 'stock_value')):
row[i] = last_entry.get(v, 0) row[v] = last_entry.get(v, 0)
return row return row