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

rounding issue fixed in gross profit

Browse Source
This commit is contained in:
Nabin Hait 2012-09-24 15:59:26 +05:30
parent de7fcc66df
commit acd39fd957
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/selling/search_criteria/gross_profit/gross_profit.js
View File

@ -15,7 +15,7 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>. // along with this program. If not, see <http://www.gnu.org/licenses/>.
report.customize_filters = function() { report.customize_filters = function() {
//this.mytabs.items['Select Columns'].hide(); this.mytabs.items['Select Columns'].hide();
this.mytabs.tabs['More Filters'].hide(); this.mytabs.tabs['More Filters'].hide();
this.hide_all_filters(); this.hide_all_filters();
this.filter_fields_dict['Delivery Note'+FILTER_SEP +'ID'].df.filter_hide = 0; this.filter_fields_dict['Delivery Note'+FILTER_SEP +'ID'].df.filter_hide = 0;

2
erpnext/selling/search_criteria/gross_profit/gross_profit.py
View File

@ -67,7 +67,7 @@ for r in res:
r.append(purchase_cost) r.append(purchase_cost)
gp = flt(r[col_idx['Amount']]) - flt(purchase_cost) gp = flt(r[col_idx['Amount']]) - flt(purchase_cost)
gp_percent = purchase_cost and gp*100/purchase_cost or 0 gp_percent = purchase_cost and round((gp*100/purchase_cost), 2) or 0
r.append(fmt_money(gp)) r.append(fmt_money(gp))
r.append(fmt_money(gp_percent)) r.append(fmt_money(gp_percent))
out.append(r) out.append(r)