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

[fix] [minor] removed default from conversion_rate

Browse Source
This commit is contained in:
Anand Doshi 2013-08-01 16:54:28 +05:30
parent 17350b899f
commit 078129f58f
5 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
accounts/doctype/pos_setting/pos_setting.txt
View File

@ -2,7 +2,7 @@
{ {
"creation": "2013-05-24 12:15:51", "creation": "2013-05-24 12:15:51",
"docstatus": 0, "docstatus": 0,
"modified": "2013-07-26 11:16:53", "modified": "2013-08-01 16:50:05",
"modified_by": "Administrator", "modified_by": "Administrator",
"owner": "Administrator" "owner": "Administrator"
}, },
@ -81,7 +81,6 @@
"reqd": 1 "reqd": 1
}, },
{ {
"default": "1",
"doctype": "DocField", "doctype": "DocField",
"fieldname": "conversion_rate", "fieldname": "conversion_rate",
"fieldtype": "Float", "fieldtype": "Float",

3
accounts/doctype/purchase_invoice/purchase_invoice.txt
View File

@ -2,7 +2,7 @@
{ {
"creation": "2013-05-21 16:16:39", "creation": "2013-05-21 16:16:39",
"docstatus": 0, "docstatus": 0,
"modified": "2013-07-25 16:08:44", "modified": "2013-08-01 16:49:49",
"modified_by": "Administrator", "modified_by": "Administrator",
"owner": "Administrator" "owner": "Administrator"
}, },
@ -223,7 +223,6 @@
"read_only": 0 "read_only": 0
}, },
{ {
"default": "1",
"description": "The rate at which Bill Currency is converted into company's base currency", "description": "The rate at which Bill Currency is converted into company's base currency",
"doctype": "DocField", "doctype": "DocField",
"fieldname": "conversion_rate", "fieldname": "conversion_rate",

3
buying/doctype/purchase_order/purchase_order.txt
View File

@ -2,7 +2,7 @@
{ {
"creation": "2013-05-21 16:16:39", "creation": "2013-05-21 16:16:39",
"docstatus": 0, "docstatus": 0,
"modified": "2013-08-01 12:27:13", "modified": "2013-08-01 16:49:16",
"modified_by": "Administrator", "modified_by": "Administrator",
"owner": "Administrator" "owner": "Administrator"
}, },
@ -191,7 +191,6 @@
"reqd": 1 "reqd": 1
}, },
{ {
"default": "1",
"description": "Rate at which supplier's currency is converted to company's base currency", "description": "Rate at which supplier's currency is converted to company's base currency",
"doctype": "DocField", "doctype": "DocField",
"fieldname": "conversion_rate", "fieldname": "conversion_rate",

3
buying/doctype/supplier_quotation/supplier_quotation.txt
View File

@ -2,7 +2,7 @@
{ {
"creation": "2013-05-21 16:16:45", "creation": "2013-05-21 16:16:45",
"docstatus": 0, "docstatus": 0,
"modified": "2013-07-23 15:27:23", "modified": "2013-08-01 16:49:33",
"modified_by": "Administrator", "modified_by": "Administrator",
"owner": "Administrator" "owner": "Administrator"
}, },
@ -186,7 +186,6 @@
"reqd": 1 "reqd": 1
}, },
{ {
"default": "1",
"description": "Rate at which supplier's currency is converted to company's base currency", "description": "Rate at which supplier's currency is converted to company's base currency",
"doctype": "DocField", "doctype": "DocField",
"fieldname": "conversion_rate", "fieldname": "conversion_rate",

8
controllers/accounts_controller.py
View File

@ -67,6 +67,7 @@ class AccountsController(TransactionBase):
self.doc.doctype + _(" can not be made."), raise_exception=1) self.doc.doctype + _(" can not be made."), raise_exception=1)
def set_price_list_currency(self, buying_or_selling): def set_price_list_currency(self, buying_or_selling):
company_currency = get_company_currency(self.doc.company)
# TODO - change this, since price list now has only one currency allowed # TODO - change this, since price list now has only one currency allowed
if self.meta.get_field("price_list_name") and self.doc.price_list_name and \ if self.meta.get_field("price_list_name") and self.doc.price_list_name and \
not self.doc.price_list_currency: not self.doc.price_list_currency:
@ -74,7 +75,6 @@ class AccountsController(TransactionBase):
if self.doc.price_list_currency: if self.doc.price_list_currency:
if not self.doc.plc_conversion_rate: if not self.doc.plc_conversion_rate:
company_currency = get_company_currency(self.doc.company)
if self.doc.price_list_currency == company_currency: if self.doc.price_list_currency == company_currency:
self.doc.plc_conversion_rate = 1.0 self.doc.plc_conversion_rate = 1.0
else: else:
@ -86,6 +86,12 @@ class AccountsController(TransactionBase):
self.doc.currency = self.doc.price_list_currency self.doc.currency = self.doc.price_list_currency
self.doc.conversion_rate = self.doc.plc_conversion_rate self.doc.conversion_rate = self.doc.plc_conversion_rate
if self.meta.get_field("currency") and self.doc.currency != company_currency and \
not self.doc.conversion_rate:
exchange = self.doc.currency + "-" + company_currency
self.doc.conversion_rate = flt(webnotes.conn.get_value("Currency Exchange",
exchange, "exchange_rate"))
def set_missing_item_details(self, get_item_details): def set_missing_item_details(self, get_item_details):
"""set missing item values""" """set missing item values"""
for item in self.doclist.get({"parentfield": self.fname}): for item in self.doclist.get({"parentfield": self.fname}):