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

Merge branch 'master' of github.com:webnotes/erpnext

Browse Source
This commit is contained in:
Rushabh Mehta 2013-01-25 11:58:45 +05:30
commit 9babf9dbdb
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
accounts/doctype/sales_invoice/sales_invoice.py
View File

@ -756,6 +756,7 @@ def manage_recurring_invoices(next_date=None):
def make_new_invoice(ref_wrapper, posting_date): def make_new_invoice(ref_wrapper, posting_date):
from webnotes.model.wrapper import clone from webnotes.model.wrapper import clone
from accounts.utils import get_fiscal_year
new_invoice = clone(ref_wrapper) new_invoice = clone(ref_wrapper)
mcount = month_map[ref_wrapper.doc.recurring_type] mcount = month_map[ref_wrapper.doc.recurring_type]
@ -772,7 +773,7 @@ def make_new_invoice(ref_wrapper, posting_date):
"invoice_period_to_date": \ "invoice_period_to_date": \
get_next_date(ref_wrapper.doc.invoice_period_to_date, mcount), get_next_date(ref_wrapper.doc.invoice_period_to_date, mcount),
"fiscal_year": get_fiscal_year(posting_date)[0],
"owner": ref_wrapper.doc.owner, "owner": ref_wrapper.doc.owner,
}) })

6
stock/page/stock_ageing/stock_ageing.js
View File

@ -64,7 +64,10 @@ erpnext.StockAgeing = erpnext.StockGridReport.extend({
}, },
filters: [ filters: [
{fieldtype:"Select", label: "Warehouse", link:"Warehouse", {fieldtype:"Select", label: "Warehouse", link:"Warehouse",
default_value: "Select Warehouse..."}, default_value: "Select Warehouse...",
filter: function(val, item, opts, me) {
return me.apply_zero_filter(val, item, opts, me);
}},
{fieldtype:"Select", label: "Brand", link:"Brand", {fieldtype:"Select", label: "Brand", link:"Brand",
default_value: "Select Brand...", filter: function(val, item, opts) { default_value: "Select Brand...", filter: function(val, item, opts) {
return val == opts.default_value || item.brand == val; return val == opts.default_value || item.brand == val;
@ -79,6 +82,7 @@ erpnext.StockAgeing = erpnext.StockGridReport.extend({
var me = this; var me = this;
this._super(); this._super();
this.trigger_refresh_on_change(["warehouse", "plot_by", "brand"]); this.trigger_refresh_on_change(["warehouse", "plot_by", "brand"]);
this.show_zero_check();
}, },
init_filter_values: function() { init_filter_values: function() {
this._super(); this._super();