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

fix in purchase order validate currency's error messages, production order's produced qty field marked as no copy

Browse Source
This commit is contained in:
Anand Doshi 2012-05-28 19:05:52 +05:30
parent 3b091418ec
commit e012f06452
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
erpnext/buying/doctype/purchase_common/purchase_common.py
View File

@ -407,9 +407,21 @@ class DocType(TransactionBase):
if not default_currency: if not default_currency:
msgprint('Message: Please enter default currency in Company Master') msgprint('Message: Please enter default currency in Company Master')
raise Exception 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("Message: Please Enter Appropriate Conversion Rate.") if obj.doc.conversion_rate == 0:
raise Exception msgprint('Conversion Rate cannot be 0', raise_exception=1)
elif not obj.doc.conversion_rate:
msgprint('Please specify Conversion Rate', raise_exception=1)
elif obj.doc.currency == default_currency and \
flt(obj.doc.conversion_rate) != 1.00:
msgprint("""Conversion Rate should be equal to 1.00, \
since the specified Currency and the company's currency \
are same""", raise_exception=1)
elif obj.doc.currency != default_currency and \
flt(obj.doc.conversion_rate) == 1.00:
msgprint("""Conversion Rate should not be equal to 1.00, \
since the specified Currency and the company's currency \
are different""", raise_exception=1)
def validate_doc(self, obj, prevdoc_doctype, prevdoc_docname): def validate_doc(self, obj, prevdoc_doctype, prevdoc_docname):
if prevdoc_docname : if prevdoc_docname :

7
erpnext/production/doctype/production_order/production_order.txt
View File

@ -3,9 +3,9 @@
# These values are common in all dictionaries # These values are common in all dictionaries
{ {
'creation': '2012-03-27 14:36:05', 'creation': '2012-05-15 12:14:48',
'docstatus': 0, 'docstatus': 0,
'modified': '2012-03-27 14:45:50', 'modified': '2012-05-28 19:03:56',
'modified_by': u'Administrator', 'modified_by': u'Administrator',
'owner': u'Administrator' 'owner': u'Administrator'
}, },
@ -23,7 +23,7 @@
'section_style': u'Tabbed', 'section_style': u'Tabbed',
'server_code_error': u' ', 'server_code_error': u' ',
'show_in_menu': 0, 'show_in_menu': 0,
'version': 190 'version': 1
}, },
# These values are common for all DocField # These values are common for all DocField
@ -323,6 +323,7 @@
'fieldname': u'produced_qty', 'fieldname': u'produced_qty',
'fieldtype': u'Currency', 'fieldtype': u'Currency',
'label': u'Produced Qty', 'label': u'Produced Qty',
'no_copy': 1,
'oldfieldname': u'produced_qty', 'oldfieldname': u'produced_qty',
'oldfieldtype': u'Currency', 'oldfieldtype': u'Currency',
'permlevel': 1 'permlevel': 1