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

[fix] [minor] validate converion rate

Browse Source
This commit is contained in:
Nabin Hait 2013-10-15 16:55:24 +05:30
parent 5101098020
commit b338b6ed24
6 changed files with 3 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -52,7 +52,6 @@ class DocType(SellingController):
sales_com_obj = get_obj('Sales Common') sales_com_obj = get_obj('Sales Common')
sales_com_obj.check_stop_sales_order(self) sales_com_obj.check_stop_sales_order(self)
sales_com_obj.check_active_sales_items(self) sales_com_obj.check_active_sales_items(self)
sales_com_obj.check_conversion_rate(self)
sales_com_obj.validate_max_discount(self, 'entries') sales_com_obj.validate_max_discount(self, 'entries')
self.validate_customer_account() self.validate_customer_account()
self.validate_debit_acc() self.validate_debit_acc()

3
public/js/transaction.js
View File

@ -173,8 +173,7 @@ erpnext.TransactionController = erpnext.stock.StockController.extend({
this.frm.doc.plc_conversion_rate !== this.frm.doc.conversion_rate) { this.frm.doc.plc_conversion_rate !== this.frm.doc.conversion_rate) {
this.frm.set_value("plc_conversion_rate", this.frm.doc.conversion_rate); this.frm.set_value("plc_conversion_rate", this.frm.doc.conversion_rate);
} }
if(flt(this.frm.doc.conversion_rate)>0.0) this.calculate_taxes_and_totals();
this.calculate_taxes_and_totals();
}, },
get_price_list_currency: function(buying_or_selling) { get_price_list_currency: function(buying_or_selling) {

2
selling/doctype/quotation/quotation.py
View File

@ -111,8 +111,6 @@ class DocType(SellingController):
sales_com_obj = get_obj('Sales Common') sales_com_obj = get_obj('Sales Common')
sales_com_obj.check_active_sales_items(self) sales_com_obj.check_active_sales_items(self)
sales_com_obj.validate_max_discount(self,'quotation_details') sales_com_obj.validate_max_discount(self,'quotation_details')
sales_com_obj.check_conversion_rate(self)
def on_update(self): def on_update(self):
# Set Quotation Status # Set Quotation Status

15
selling/doctype/sales_common/sales_common.py
View File

@ -74,21 +74,6 @@ class DocType(TransactionBase):
msgprint("You cannot give more than " + cstr(discount[0]['max_discount']) + " % discount on Item Code : "+cstr(d.item_code)) msgprint("You cannot give more than " + cstr(discount[0]['max_discount']) + " % discount on Item Code : "+cstr(d.item_code))
raise Exception raise Exception
# Check Conversion Rate (i.e. it will not allow conversion rate to be 1 for Currency other than default currency set in Global Defaults)
# ===========================================================================
def check_conversion_rate(self, obj):
default_currency = get_company_currency(obj.doc.company)
if not default_currency:
msgprint('Message: Please enter default currency in Company Master')
raise Exception
if (obj.doc.currency == default_currency and flt(obj.doc.conversion_rate) != 1.00) or not obj.doc.conversion_rate or (obj.doc.currency != default_currency and flt(obj.doc.conversion_rate) == 1.00):
msgprint("Please Enter Appropriate Conversion Rate for Customer's Currency to Base Currency (%s --> %s)" % (obj.doc.currency, default_currency), raise_exception = 1)
if (obj.doc.price_list_currency == default_currency and flt(obj.doc.plc_conversion_rate) != 1.00) or not obj.doc.plc_conversion_rate or (obj.doc.price_list_currency != default_currency and flt(obj.doc.plc_conversion_rate) == 1.00):
msgprint("Please Enter Appropriate Conversion Rate for Price List Currency to Base Currency (%s --> %s)" % (obj.doc.price_list_currency, default_currency), raise_exception = 1)
# Get Tax rate if account type is TAX # Get Tax rate if account type is TAX
# ========================================================================= # =========================================================================
def get_rate(self, arg): def get_rate(self, arg):

2
selling/doctype/sales_order/sales_order.py
View File

@ -130,7 +130,7 @@ class DocType(SellingController):
self.validate_warehouse() self.validate_warehouse()
sales_com_obj = get_obj(dt = 'Sales Common') sales_com_obj = get_obj(dt = 'Sales Common')
sales_com_obj.check_active_sales_items(self) sales_com_obj.check_active_sales_items(self)
sales_com_obj.check_conversion_rate(self)
sales_com_obj.validate_max_discount(self,'sales_order_details') sales_com_obj.validate_max_discount(self,'sales_order_details')
self.doclist = sales_com_obj.make_packing_list(self,'sales_order_details') self.doclist = sales_com_obj.make_packing_list(self,'sales_order_details')

2
stock/doctype/delivery_note/delivery_note.py
View File

@ -95,7 +95,7 @@ class DocType(SellingController):
self.validate_uom_is_integer("stock_uom", "qty") self.validate_uom_is_integer("stock_uom", "qty")
sales_com_obj.validate_max_discount(self, 'delivery_note_details') sales_com_obj.validate_max_discount(self, 'delivery_note_details')
sales_com_obj.check_conversion_rate(self)
# Set actual qty for each item in selected warehouse # Set actual qty for each item in selected warehouse
self.update_current_stock() self.update_current_stock()