diff --git a/erpnext/accounts/doctype/payable_voucher/payable_voucher.js b/erpnext/accounts/doctype/payable_voucher/payable_voucher.js index dee95109127..2c9841df429 100644 --- a/erpnext/accounts/doctype/payable_voucher/payable_voucher.js +++ b/erpnext/accounts/doctype/payable_voucher/payable_voucher.js @@ -42,6 +42,9 @@ cur_frm.cscript.refresh = function(doc, dt, dn) { cur_frm.clear_custom_buttons(); + cur_frm.cscript.dynamic_label(doc, cdt, cdn); + + // Show / Hide button if(doc.docstatus==1 && doc.outstanding_amount > 0) cur_frm.add_custom_button('Make Payment Entry', cur_frm.cscript['Make Bank Voucher']); diff --git a/erpnext/accounts/doctype/payable_voucher/payable_voucher.py b/erpnext/accounts/doctype/payable_voucher/payable_voucher.py index 14d5e5e8636..8902f52175a 100644 --- a/erpnext/accounts/doctype/payable_voucher/payable_voucher.py +++ b/erpnext/accounts/doctype/payable_voucher/payable_voucher.py @@ -150,6 +150,10 @@ class DocType(TransactionBase): rate = sql("select tax_rate from `tabAccount` where name='%s'"%(acc)) ret={'add_tax_rate' :rate and flt(rate[0][0]) or 0 } return ret + + + def get_comp_base_currency(self): + return get_obj('Purchase Common').get_comp_base_currency(self.doc.company) # *************************** Server Utility Functions ***************************** diff --git a/erpnext/accounts/doctype/payable_voucher/payable_voucher.txt b/erpnext/accounts/doctype/payable_voucher/payable_voucher.txt index 93014ec2b8e..53466e12e3f 100755 --- a/erpnext/accounts/doctype/payable_voucher/payable_voucher.txt +++ b/erpnext/accounts/doctype/payable_voucher/payable_voucher.txt @@ -5,51 +5,51 @@ { 'creation': '2010-08-08 17:09:11', 'docstatus': 0, - 'modified': '2011-11-24 15:17:14', - 'modified_by': 'Administrator', - 'owner': 'Administrator' + 'modified': '2012-02-27 18:25:38', + 'modified_by': u'Administrator', + 'owner': u'Administrator' }, # These values are common for all DocType { - '_last_update': '1321601347', - 'colour': 'White:FFF', - 'default_print_format': 'Standard', + '_last_update': u'1330345793', + 'colour': u'White:FFF', + 'default_print_format': u'Standard', 'doctype': 'DocType', - 'module': 'Accounts', + 'module': u'Accounts', 'name': '__common__', 'read_only_onload': 1, - 'search_fields': 'posting_date, credit_to, fiscal_year, bill_no, grand_total, outstanding_amount', - 'section_style': 'Tabbed', - 'server_code_error': ' ', + 'search_fields': u'posting_date, credit_to, fiscal_year, bill_no, grand_total, outstanding_amount', + 'section_style': u'Tabbed', + 'server_code_error': u' ', 'show_in_menu': 0, - 'subject': 'From %(supplier_name)s worth %(grand_total)s due on %(due_date)s | %(outstanding_amount)s outstanding', - 'version': 522 + 'subject': u'From %(supplier_name)s worth %(grand_total)s due on %(due_date)s | %(outstanding_amount)s outstanding', + 'version': 520 }, # These values are common for all DocField { - 'doctype': 'DocField', + 'doctype': u'DocField', 'name': '__common__', - 'parent': 'Payable Voucher', - 'parentfield': 'fields', - 'parenttype': 'DocType' + 'parent': u'Payable Voucher', + 'parentfield': u'fields', + 'parenttype': u'DocType' }, # These values are common for all DocPerm { - 'doctype': 'DocPerm', + 'doctype': u'DocPerm', 'name': '__common__', - 'parent': 'Payable Voucher', - 'parentfield': 'permissions', - 'parenttype': 'DocType', + 'parent': u'Payable Voucher', + 'parentfield': u'permissions', + 'parenttype': u'DocType', 'read': 1 }, # DocType, Payable Voucher { 'doctype': 'DocType', - 'name': 'Payable Voucher' + 'name': u'Payable Voucher' }, # DocPerm @@ -57,9 +57,9 @@ 'amend': 0, 'cancel': 0, 'create': 0, - 'doctype': 'DocPerm', + 'doctype': u'DocPerm', 'permlevel': 1, - 'role': 'Accounts Manager', + 'role': u'Accounts Manager', 'submit': 0, 'write': 0 }, @@ -69,9 +69,9 @@ 'amend': 1, 'cancel': 1, 'create': 1, - 'doctype': 'DocPerm', + 'doctype': u'DocPerm', 'permlevel': 0, - 'role': 'Accounts Manager', + 'role': u'Accounts Manager', 'submit': 1, 'write': 1 }, @@ -81,18 +81,18 @@ 'amend': 0, 'cancel': 0, 'create': 0, - 'doctype': 'DocPerm', + 'doctype': u'DocPerm', 'permlevel': 1, - 'role': 'Accounts User', + 'role': u'Accounts User', 'submit': 0, 'write': 0 }, # DocPerm { - 'doctype': 'DocPerm', + 'doctype': u'DocPerm', 'permlevel': 1, - 'role': 'Purchase User' + 'role': u'Purchase User' }, # DocPerm @@ -100,9 +100,9 @@ 'amend': 0, 'cancel': 0, 'create': 1, - 'doctype': 'DocPerm', + 'doctype': u'DocPerm', 'permlevel': 0, - 'role': 'Purchase User', + 'role': u'Purchase User', 'submit': 0, 'write': 1 }, @@ -112,52 +112,52 @@ 'amend': 1, 'cancel': 1, 'create': 1, - 'doctype': 'DocPerm', + 'doctype': u'DocPerm', 'permlevel': 0, - 'role': 'Accounts User', + 'role': u'Accounts User', 'submit': 1, 'write': 1 }, # DocPerm { - 'doctype': 'DocPerm', - 'match': 'supplier', + 'doctype': u'DocPerm', + 'match': u'supplier', 'permlevel': 0, - 'role': 'Supplier' + 'role': u'Supplier' }, # DocField { 'allow_on_submit': 0, - 'doctype': 'DocField', - 'fieldtype': 'Section Break', - 'label': 'Basic Info', - 'oldfieldtype': 'Section Break', + 'doctype': u'DocField', + 'fieldtype': u'Section Break', + 'label': u'Basic Info', + 'oldfieldtype': u'Section Break', 'permlevel': 0 }, # DocField { - 'doctype': 'DocField', - 'fieldtype': 'Column Break', - 'oldfieldtype': 'Column Break', + 'doctype': u'DocField', + 'fieldtype': u'Column Break', + 'oldfieldtype': u'Column Break', 'permlevel': 0, - 'width': '50%' + 'width': u'50%' }, # DocField { - 'colour': 'White:FFF', - 'description': 'To manage multiple series please go to Setup > Manage Series', - 'doctype': 'DocField', - 'fieldname': 'naming_series', - 'fieldtype': 'Select', - 'label': 'Series', + 'colour': u'White:FFF', + 'description': u'To manage multiple series please go to Setup > Manage Series', + 'doctype': u'DocField', + 'fieldname': u'naming_series', + 'fieldtype': u'Select', + 'label': u'Series', 'no_copy': 1, - 'oldfieldname': 'naming_series', - 'oldfieldtype': 'Select', - 'options': 'BILL\nBILLJ', + 'oldfieldname': u'naming_series', + 'oldfieldtype': u'Select', + 'options': u'BILL\nBILLJ', 'permlevel': 0, 'print_hide': 1, 'report_hide': 0, @@ -166,141 +166,159 @@ # DocField { - 'description': 'The account to which you will pay (have paid) the money to.', - 'doctype': 'DocField', - 'fieldname': 'credit_to', - 'fieldtype': 'Link', + 'description': u'The account to which you will pay (have paid) the money to.', + 'doctype': u'DocField', + 'fieldname': u'credit_to', + 'fieldtype': u'Link', 'in_filter': 1, - 'label': 'Credit To', - 'oldfieldname': 'credit_to', - 'oldfieldtype': 'Link', - 'options': 'Account', + 'label': u'Credit To', + 'oldfieldname': u'credit_to', + 'oldfieldtype': u'Link', + 'options': u'Account', 'permlevel': 0, 'print_hide': 1, 'reqd': 1, 'search_index': 1, - 'trigger': 'Client' + 'trigger': u'Client' }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'amended_from', - 'fieldtype': 'Link', - 'label': 'Amended From', + 'doctype': u'DocField', + 'fieldname': u'amended_from', + 'fieldtype': u'Link', + 'label': u'Amended From', 'no_copy': 1, - 'oldfieldname': 'amended_from', - 'oldfieldtype': 'Link', - 'options': 'Payable Voucher', + 'oldfieldname': u'amended_from', + 'oldfieldtype': u'Link', + 'options': u'Payable Voucher', 'permlevel': 1, 'print_hide': 1 }, # DocField { - 'colour': 'White:FFF', - 'doctype': 'DocField', - 'fieldname': 'supplier', - 'fieldtype': 'Link', + 'colour': u'White:FFF', + 'doctype': u'DocField', + 'fieldname': u'supplier', + 'fieldtype': u'Link', 'hidden': 0, - 'label': 'Supplier', - 'oldfieldname': 'supplier', - 'oldfieldtype': 'Link', - 'options': 'Supplier', + 'label': u'Supplier', + 'oldfieldname': u'supplier', + 'oldfieldtype': u'Link', + 'options': u'Supplier', 'permlevel': 0, 'print_hide': 1, - 'trigger': 'Client' + 'trigger': u'Client' }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'supplier_address', - 'fieldtype': 'Link', - 'label': 'Supplier Address', + 'doctype': u'DocField', + 'fieldname': u'supplier_address', + 'fieldtype': u'Link', + 'label': u'Supplier Address', 'permlevel': 0 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'contact_person', - 'fieldtype': 'Link', - 'label': 'Contact Person', - 'options': 'Contact', + 'doctype': u'DocField', + 'fieldname': u'contact_person', + 'fieldtype': u'Link', + 'label': u'Contact Person', + 'options': u'Contact', 'permlevel': 0, 'print_hide': 1 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'supplier_name', - 'fieldtype': 'Text', - 'label': 'Name', - 'oldfieldname': 'supplier_name', - 'oldfieldtype': 'Data', + 'doctype': u'DocField', + 'fieldname': u'supplier_name', + 'fieldtype': u'Text', + 'label': u'Name', + 'oldfieldname': u'supplier_name', + 'oldfieldtype': u'Data', 'permlevel': 1 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'address_display', - 'fieldtype': 'Small Text', - 'label': 'Address', + 'doctype': u'DocField', + 'fieldname': u'address_display', + 'fieldtype': u'Small Text', + 'label': u'Address', 'permlevel': 1 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'contact_display', - 'fieldtype': 'Small Text', - 'label': 'Contact', + 'doctype': u'DocField', + 'fieldname': u'contact_display', + 'fieldtype': u'Small Text', + 'label': u'Contact', 'permlevel': 1 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'contact_mobile', - 'fieldtype': 'Text', - 'label': 'Mobile No', + 'doctype': u'DocField', + 'fieldname': u'contact_mobile', + 'fieldtype': u'Text', + 'label': u'Mobile No', 'permlevel': 1 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'contact_email', - 'fieldtype': 'Text', - 'label': 'Contact Email', + 'doctype': u'DocField', + 'fieldname': u'contact_email', + 'fieldtype': u'Text', + 'label': u'Contact Email', 'permlevel': 1, 'print_hide': 1 }, # DocField { - 'doctype': 'DocField', - 'fieldtype': 'Column Break', - 'oldfieldtype': 'Column Break', + 'doctype': u'DocField', + 'fieldtype': u'Column Break', + 'oldfieldtype': u'Column Break', 'permlevel': 0, 'reqd': 0, - 'width': '50%' + 'width': u'50%' }, # DocField { - 'default': 'Today', - 'doctype': 'DocField', - 'fieldname': 'voucher_date', - 'fieldtype': 'Date', + 'default': u'Today', + 'description': u'The date at which current entry will get or has actually executed.', + 'doctype': u'DocField', + 'fieldname': u'posting_date', + 'fieldtype': u'Date', 'in_filter': 1, - 'label': 'Voucher Date', + 'label': u'Posting Date', 'no_copy': 0, - 'oldfieldname': 'voucher_date', - 'oldfieldtype': 'Date', + 'oldfieldname': u'posting_date', + 'oldfieldtype': u'Date', + 'permlevel': 0, + 'print_hide': 1, + 'reqd': 1, + 'search_index': 1 + }, + + # DocField + { + 'default': u'Today', + 'doctype': u'DocField', + 'fieldname': u'voucher_date', + 'fieldtype': u'Date', + 'in_filter': 1, + 'label': u'Voucher Date', + 'no_copy': 0, + 'oldfieldname': u'voucher_date', + 'oldfieldtype': u'Date', 'permlevel': 0, 'reqd': 1, 'search_index': 1 @@ -308,14 +326,14 @@ # DocField { - 'doctype': 'DocField', - 'fieldname': 'due_date', - 'fieldtype': 'Date', + 'doctype': u'DocField', + 'fieldname': u'due_date', + 'fieldtype': u'Date', 'in_filter': 1, - 'label': 'Due Date', + 'label': u'Due Date', 'no_copy': 0, - 'oldfieldname': 'due_date', - 'oldfieldtype': 'Date', + 'oldfieldname': u'due_date', + 'oldfieldtype': u'Date', 'permlevel': 0, 'print_hide': 0, 'search_index': 1 @@ -323,16 +341,14 @@ # DocField { - 'default': 'Today', - 'description': 'The date at which current entry will get or has actually executed.', - 'doctype': 'DocField', - 'fieldname': 'posting_date', - 'fieldtype': 'Date', + 'description': u'If not applicable please enter: NA', + 'doctype': u'DocField', + 'fieldname': u'bill_no', + 'fieldtype': u'Data', 'in_filter': 1, - 'label': 'Posting Date', - 'no_copy': 0, - 'oldfieldname': 'posting_date', - 'oldfieldtype': 'Date', + 'label': u'Bill No', + 'oldfieldname': u'bill_no', + 'oldfieldtype': u'Data', 'permlevel': 0, 'print_hide': 1, 'reqd': 1, @@ -341,29 +357,13 @@ # DocField { - 'description': 'If not applicable please enter: NA', - 'doctype': 'DocField', - 'fieldname': 'bill_no', - 'fieldtype': 'Data', + 'doctype': u'DocField', + 'fieldname': u'bill_date', + 'fieldtype': u'Date', 'in_filter': 1, - 'label': 'Bill No', - 'oldfieldname': 'bill_no', - 'oldfieldtype': 'Data', - 'permlevel': 0, - 'print_hide': 1, - 'reqd': 1, - 'search_index': 1 - }, - - # DocField - { - 'doctype': 'DocField', - 'fieldname': 'bill_date', - 'fieldtype': 'Date', - 'in_filter': 1, - 'label': 'Bill Date', - 'oldfieldname': 'bill_date', - 'oldfieldtype': 'Date', + 'label': u'Bill Date', + 'oldfieldname': u'bill_date', + 'oldfieldtype': u'Date', 'permlevel': 0, 'print_hide': 1, 'reqd': 0, @@ -372,285 +372,286 @@ # DocField { - 'description': 'The date at which current entry is corrected in the system.', - 'doctype': 'DocField', - 'fieldname': 'amendment_date', - 'fieldtype': 'Date', - 'label': 'Amendment Date', + 'description': u'The date at which current entry is corrected in the system.', + 'doctype': u'DocField', + 'fieldname': u'amendment_date', + 'fieldtype': u'Date', + 'label': u'Amendment Date', 'no_copy': 1, - 'oldfieldname': 'amendment_date', - 'oldfieldtype': 'Date', + 'oldfieldname': u'amendment_date', + 'oldfieldtype': u'Date', 'permlevel': 0, 'print_hide': 1 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'mode_of_payment', - 'fieldtype': 'Select', - 'label': 'Mode of Payment', - 'oldfieldname': 'mode_of_payment', - 'oldfieldtype': 'Select', - 'options': 'link:Mode of Payment', + 'doctype': u'DocField', + 'fieldname': u'mode_of_payment', + 'fieldtype': u'Select', + 'label': u'Mode of Payment', + 'oldfieldname': u'mode_of_payment', + 'oldfieldtype': u'Select', + 'options': u'link:Mode of Payment', 'permlevel': 0 }, # DocField { - 'doctype': 'DocField', - 'fieldtype': 'Section Break', - 'label': 'Items', - 'oldfieldtype': 'Section Break', + 'doctype': u'DocField', + 'fieldtype': u'Section Break', + 'label': u'Items', + 'oldfieldtype': u'Section Break', 'permlevel': 0 }, # DocField { - 'colour': 'White:FFF', - 'description': 'Select Items from Purchase Order', - 'doctype': 'DocField', - 'fieldname': 'purchase_order_main', - 'fieldtype': 'Link', - 'label': 'Purchase Order', - 'oldfieldname': 'purchase_order_main', - 'oldfieldtype': 'Link', - 'options': 'Purchase Order', + 'doctype': u'DocField', + 'fieldname': u'currency', + 'fieldtype': u'Select', + 'label': u'Bill Currency', + 'oldfieldname': u'currency', + 'oldfieldtype': u'Select', + 'options': u'link:Currency', + 'permlevel': 0, + 'print_hide': 1 + }, + + # DocField + { + 'colour': u'White:FFF', + 'default': u'1', + 'description': u"The rate at which Bill Currency is converted into company's base currency", + 'doctype': u'DocField', + 'fieldname': u'conversion_rate', + 'fieldtype': u'Currency', + 'label': u'Bill Conversion Rate', + 'oldfieldname': u'conversion_rate', + 'oldfieldtype': u'Currency', + 'permlevel': 0, + 'print_hide': 1 + }, + + # DocField + { + 'doctype': u'DocField', + 'fieldtype': u'Column Break', + 'permlevel': 0 + }, + + # DocField + { + 'colour': u'White:FFF', + 'description': u'Select Items from Purchase Order', + 'doctype': u'DocField', + 'fieldname': u'purchase_order_main', + 'fieldtype': u'Link', + 'label': u'Purchase Order', + 'oldfieldname': u'purchase_order_main', + 'oldfieldtype': u'Link', + 'options': u'Purchase Order', 'permlevel': 0, 'print_hide': 1, - 'trigger': 'Client' + 'trigger': u'Client' }, # DocField { - 'colour': 'White:FFF', - 'description': 'Select Items from Purchase Receipt', - 'doctype': 'DocField', - 'fieldname': 'purchase_receipt_main', - 'fieldtype': 'Link', - 'label': 'Purchase Receipt', - 'oldfieldname': 'purchase_receipt_main', - 'oldfieldtype': 'Link', - 'options': 'Purchase Receipt', + 'colour': u'White:FFF', + 'description': u'Select Items from Purchase Receipt', + 'doctype': u'DocField', + 'fieldname': u'purchase_receipt_main', + 'fieldtype': u'Link', + 'label': u'Purchase Receipt', + 'oldfieldname': u'purchase_receipt_main', + 'oldfieldtype': u'Link', + 'options': u'Purchase Receipt', 'permlevel': 0, 'print_hide': 1, - 'trigger': 'Client' + 'trigger': u'Client' }, # DocField { - 'colour': 'White:FFF', - 'doctype': 'DocField', - 'fieldtype': 'Button', - 'label': 'Get Items', - 'oldfieldtype': 'Button', - 'options': 'pull_details', + 'colour': u'White:FFF', + 'doctype': u'DocField', + 'fieldtype': u'Button', + 'label': u'Get Items', + 'oldfieldtype': u'Button', + 'options': u'pull_details', 'permlevel': 0 }, # DocField { - 'doctype': 'DocField', - 'fieldtype': 'Column Break', - 'permlevel': 0 - }, - - # DocField - { - 'doctype': 'DocField', - 'fieldname': 'currency', - 'fieldtype': 'Select', - 'label': 'Bill Currency', - 'oldfieldname': 'currency', - 'oldfieldtype': 'Select', - 'options': 'link:Currency', - 'permlevel': 0, - 'print_hide': 1 - }, - - # DocField - { - 'colour': 'White:FFF', - 'default': '1', - 'doctype': 'DocField', - 'fieldname': 'conversion_rate', - 'fieldtype': 'Currency', - 'label': 'Bill Conversion Rate', - 'oldfieldname': 'conversion_rate', - 'oldfieldtype': 'Currency', - 'permlevel': 0, - 'print_hide': 1 - }, - - # DocField - { - 'doctype': 'DocField', - 'fieldtype': 'Section Break', + 'doctype': u'DocField', + 'fieldtype': u'Section Break', 'permlevel': 0 }, # DocField { 'allow_on_submit': 1, - 'doctype': 'DocField', - 'fieldname': 'entries', - 'fieldtype': 'Table', - 'label': 'Entries', - 'oldfieldname': 'entries', - 'oldfieldtype': 'Table', - 'options': 'PV Detail', + 'doctype': u'DocField', + 'fieldname': u'entries', + 'fieldtype': u'Table', + 'label': u'Entries', + 'oldfieldname': u'entries', + 'oldfieldtype': u'Table', + 'options': u'PV Detail', 'permlevel': 0 }, # DocField { - 'doctype': 'DocField', - 'fieldtype': 'Button', - 'label': 'Recalculate', - 'oldfieldtype': 'Button', + 'doctype': u'DocField', + 'fieldtype': u'Button', + 'label': u'Recalculate', + 'oldfieldtype': u'Button', 'permlevel': 0, - 'trigger': 'Client' + 'trigger': u'Client' }, # DocField { - 'description': 'Will be calculated automatically when you enter the details', - 'doctype': 'DocField', - 'fieldname': 'net_total', - 'fieldtype': 'Currency', - 'label': 'Net Total', - 'oldfieldname': 'net_total', - 'oldfieldtype': 'Currency', + 'description': u'Will be calculated automatically when you enter the details', + 'doctype': u'DocField', + 'fieldname': u'net_total', + 'fieldtype': u'Currency', + 'label': u'Net Total', + 'oldfieldname': u'net_total', + 'oldfieldtype': u'Currency', 'permlevel': 1, 'print_hide': 1 }, # DocField { - 'colour': 'White:FFF', - 'description': 'Add / Edit taxes and other charges', - 'doctype': 'DocField', - 'fieldtype': 'Section Break', - 'label': 'Taxes', - 'oldfieldtype': 'Section Break', + 'colour': u'White:FFF', + 'description': u'Add / Edit taxes and other charges', + 'doctype': u'DocField', + 'fieldtype': u'Section Break', + 'label': u'Taxes', + 'oldfieldtype': u'Section Break', 'permlevel': 0 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'purchase_other_charges', - 'fieldtype': 'Link', - 'label': 'Purchase Other Charges', - 'oldfieldname': 'purchase_other_charges', - 'oldfieldtype': 'Link', - 'options': 'Purchase Other Charges', + 'doctype': u'DocField', + 'fieldname': u'purchase_other_charges', + 'fieldtype': u'Link', + 'label': u'Purchase Other Charges', + 'oldfieldname': u'purchase_other_charges', + 'oldfieldtype': u'Link', + 'options': u'Purchase Other Charges', 'permlevel': 0, 'print_hide': 1 }, # DocField { - 'doctype': 'DocField', - 'fieldtype': 'Button', - 'label': 'Get Tax Detail', - 'oldfieldtype': 'Button', - 'options': 'get_purchase_tax_details', + 'doctype': u'DocField', + 'fieldtype': u'Button', + 'label': u'Get Tax Detail', + 'oldfieldtype': u'Button', + 'options': u'get_purchase_tax_details', 'permlevel': 0, 'print_hide': 1 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'purchase_tax_details', - 'fieldtype': 'Table', - 'label': 'Purchase Tax Details', - 'oldfieldname': 'purchase_tax_details', - 'oldfieldtype': 'Table', - 'options': 'Purchase Tax Detail', + 'doctype': u'DocField', + 'fieldname': u'purchase_tax_details', + 'fieldtype': u'Table', + 'label': u'Purchase Tax Details', + 'oldfieldname': u'purchase_tax_details', + 'oldfieldtype': u'Table', + 'options': u'Purchase Tax Detail', 'permlevel': 0 }, # DocField { - 'doctype': 'DocField', - 'fieldtype': 'Button', - 'label': 'Calculate Tax', - 'oldfieldtype': 'Button', + 'doctype': u'DocField', + 'fieldtype': u'Button', + 'label': u'Calculate Tax', + 'oldfieldtype': u'Button', 'permlevel': 0, 'print_hide': 1, - 'trigger': 'Client' + 'trigger': u'Client' }, # DocField { - 'doctype': 'DocField', - 'fieldtype': 'HTML', - 'label': 'Tax Calculation', - 'oldfieldtype': 'HTML', + 'doctype': u'DocField', + 'fieldtype': u'HTML', + 'label': u'Tax Calculation', + 'oldfieldtype': u'HTML', 'permlevel': 0, 'print_hide': 1 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'total_tax', - 'fieldtype': 'Currency', - 'label': 'Total Tax', - 'oldfieldname': 'total_tax', - 'oldfieldtype': 'Currency', + 'doctype': u'DocField', + 'fieldname': u'total_tax', + 'fieldtype': u'Currency', + 'label': u'Total Tax', + 'oldfieldname': u'total_tax', + 'oldfieldtype': u'Currency', 'permlevel': 1, 'print_hide': 1 }, # DocField { - 'doctype': 'DocField', - 'fieldtype': 'Section Break', - 'label': 'More Info', - 'oldfieldtype': 'Section Break', + 'doctype': u'DocField', + 'fieldtype': u'Section Break', + 'label': u'More Info', + 'oldfieldtype': u'Section Break', 'permlevel': 0, 'print_hide': 0 }, # DocField { - 'doctype': 'DocField', - 'fieldtype': 'Column Break', - 'oldfieldtype': 'Column Break', + 'doctype': u'DocField', + 'fieldtype': u'Column Break', + 'oldfieldtype': u'Column Break', 'permlevel': 0, 'print_hide': 0, - 'width': '50%' + 'width': u'50%' }, # DocField { - 'colour': 'White:FFF', - 'default': 'No', - 'doctype': 'DocField', - 'fieldname': 'is_opening', - 'fieldtype': 'Select', + 'colour': u'White:FFF', + 'default': u'No', + 'doctype': u'DocField', + 'fieldname': u'is_opening', + 'fieldtype': u'Select', 'in_filter': 1, - 'label': 'Is Opening', - 'oldfieldname': 'is_opening', - 'oldfieldtype': 'Select', - 'options': 'No\nYes', + 'label': u'Is Opening', + 'oldfieldname': u'is_opening', + 'oldfieldtype': u'Select', + 'options': u'No\nYes', 'permlevel': 0, 'print_hide': 1, 'search_index': 1, - 'trigger': 'Client' + 'trigger': u'Client' }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'aging_date', - 'fieldtype': 'Date', - 'label': 'Aging Date', - 'oldfieldname': 'aging_date', - 'oldfieldtype': 'Date', + 'doctype': u'DocField', + 'fieldname': u'aging_date', + 'fieldtype': u'Date', + 'label': u'Aging Date', + 'oldfieldname': u'aging_date', + 'oldfieldtype': u'Date', 'permlevel': 0, 'print_hide': 1, 'search_index': 0 @@ -659,40 +660,40 @@ # DocField { 'allow_on_submit': 1, - 'colour': 'White:FFF', - 'doctype': 'DocField', - 'fieldname': 'select_print_heading', - 'fieldtype': 'Link', - 'label': 'Select Print Heading', + 'colour': u'White:FFF', + 'doctype': u'DocField', + 'fieldname': u'select_print_heading', + 'fieldtype': u'Link', + 'label': u'Select Print Heading', 'no_copy': 1, - 'oldfieldname': 'select_print_heading', - 'oldfieldtype': 'Link', - 'options': 'Print Heading', + 'oldfieldname': u'select_print_heading', + 'oldfieldtype': u'Link', + 'options': u'Print Heading', 'permlevel': 0, 'print_hide': 1, 'report_hide': 1, - 'trigger': 'Client' + 'trigger': u'Client' }, # DocField { - 'doctype': 'DocField', - 'fieldtype': 'Column Break', - 'oldfieldtype': 'Column Break', + 'doctype': u'DocField', + 'fieldtype': u'Column Break', + 'oldfieldtype': u'Column Break', 'permlevel': 0, - 'width': '50%' + 'width': u'50%' }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'company', - 'fieldtype': 'Link', + 'doctype': u'DocField', + 'fieldname': u'company', + 'fieldtype': u'Link', 'in_filter': 1, - 'label': 'Company', - 'oldfieldname': 'company', - 'oldfieldtype': 'Link', - 'options': 'Company', + 'label': u'Company', + 'oldfieldname': u'company', + 'oldfieldtype': u'Link', + 'options': u'Company', 'permlevel': 0, 'print_hide': 1, 'search_index': 1 @@ -700,14 +701,14 @@ # DocField { - 'doctype': 'DocField', - 'fieldname': 'fiscal_year', - 'fieldtype': 'Select', + 'doctype': u'DocField', + 'fieldname': u'fiscal_year', + 'fieldtype': u'Select', 'in_filter': 1, - 'label': 'Fiscal Year', - 'oldfieldname': 'fiscal_year', - 'oldfieldtype': 'Select', - 'options': 'link:Fiscal Year', + 'label': u'Fiscal Year', + 'oldfieldname': u'fiscal_year', + 'oldfieldtype': u'Select', + 'options': u'link:Fiscal Year', 'permlevel': 0, 'print_hide': 1, 'search_index': 1 @@ -715,28 +716,28 @@ # DocField { - 'colour': 'White:FFF', - 'depends_on': 'eval:!doc.__islocal', - 'doctype': 'DocField', - 'fieldname': 'cancel_reason', - 'fieldtype': 'Data', - 'label': 'Cancel Reason', + 'colour': u'White:FFF', + 'depends_on': u'eval:!doc.__islocal', + 'doctype': u'DocField', + 'fieldname': u'cancel_reason', + 'fieldtype': u'Data', + 'label': u'Cancel Reason', 'no_copy': 1, - 'oldfieldname': 'cancel_reason', - 'oldfieldtype': 'Data', + 'oldfieldname': u'cancel_reason', + 'oldfieldtype': u'Data', 'permlevel': 1, 'print_hide': 1 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'remarks', - 'fieldtype': 'Small Text', - 'label': 'Remarks', + 'doctype': u'DocField', + 'fieldname': u'remarks', + 'fieldtype': u'Small Text', + 'label': u'Remarks', 'no_copy': 1, - 'oldfieldname': 'remarks', - 'oldfieldtype': 'Text', + 'oldfieldname': u'remarks', + 'oldfieldtype': u'Text', 'permlevel': 0, 'print_hide': 1, 'reqd': 0 @@ -744,246 +745,246 @@ # DocField { - 'doctype': 'DocField', - 'fieldtype': 'Section Break', - 'label': 'Advances', - 'oldfieldtype': 'Section Break', + 'doctype': u'DocField', + 'fieldtype': u'Section Break', + 'label': u'Advances', + 'oldfieldtype': u'Section Break', 'permlevel': 0, 'print_hide': 0 }, # DocField { - 'doctype': 'DocField', - 'fieldtype': 'Button', - 'label': 'Get Advances Paid', - 'oldfieldtype': 'Button', - 'options': 'get_advances', + 'doctype': u'DocField', + 'fieldtype': u'Button', + 'label': u'Get Advances Paid', + 'oldfieldtype': u'Button', + 'options': u'get_advances', 'permlevel': 0, 'print_hide': 1 }, # DocField { - 'colour': 'White:FFF', - 'doctype': 'DocField', - 'fieldname': 'advance_allocation_details', - 'fieldtype': 'Table', - 'label': 'Advance Allocation Details', + 'colour': u'White:FFF', + 'doctype': u'DocField', + 'fieldname': u'advance_allocation_details', + 'fieldtype': u'Table', + 'label': u'Advance Allocation Details', 'no_copy': 1, - 'oldfieldname': 'advance_allocation_details', - 'oldfieldtype': 'Table', - 'options': 'Advance Allocation Detail', + 'oldfieldname': u'advance_allocation_details', + 'oldfieldtype': u'Table', + 'options': u'Advance Allocation Detail', 'permlevel': 0, 'print_hide': 1 }, # DocField { - 'doctype': 'DocField', - 'fieldtype': 'Section Break', - 'label': 'TDS', - 'oldfieldtype': 'Section Break', + 'doctype': u'DocField', + 'fieldtype': u'Section Break', + 'label': u'TDS', + 'oldfieldtype': u'Section Break', 'permlevel': 0 }, # DocField { - 'doctype': 'DocField', - 'fieldtype': 'Column Break', + 'doctype': u'DocField', + 'fieldtype': u'Column Break', 'permlevel': 0, - 'width': '50%' + 'width': u'50%' }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'tds_applicable', - 'fieldtype': 'Select', - 'label': 'TDS Applicable', - 'oldfieldname': 'tds_applicable', - 'oldfieldtype': 'Select', - 'options': '\nYes\nNo', + 'doctype': u'DocField', + 'fieldname': u'tds_applicable', + 'fieldtype': u'Select', + 'label': u'TDS Applicable', + 'oldfieldname': u'tds_applicable', + 'oldfieldtype': u'Select', + 'options': u'\nYes\nNo', 'permlevel': 0, 'print_hide': 1 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'tds_category', - 'fieldtype': 'Select', - 'label': 'TDS Category', - 'oldfieldname': 'tds_category', - 'oldfieldtype': 'Select', - 'options': 'link:TDS Category', + 'doctype': u'DocField', + 'fieldname': u'tds_category', + 'fieldtype': u'Select', + 'label': u'TDS Category', + 'oldfieldname': u'tds_category', + 'oldfieldtype': u'Select', + 'options': u'link:TDS Category', 'permlevel': 0, 'print_hide': 1 }, # DocField { - 'colour': 'White:FFF', - 'doctype': 'DocField', - 'fieldtype': 'Button', - 'label': 'Get TDS', - 'oldfieldtype': 'Button', + 'colour': u'White:FFF', + 'doctype': u'DocField', + 'fieldtype': u'Button', + 'label': u'Get TDS', + 'oldfieldtype': u'Button', 'permlevel': 0, 'print_hide': 1, - 'trigger': 'Client' + 'trigger': u'Client' }, # DocField { - 'doctype': 'DocField', - 'fieldtype': 'Column Break', + 'doctype': u'DocField', + 'fieldtype': u'Column Break', 'permlevel': 0, - 'width': '50%' + 'width': u'50%' }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'tax_code', - 'fieldtype': 'Link', - 'label': 'TDS Account Head', - 'oldfieldname': 'tax_code', - 'oldfieldtype': 'Link', - 'options': 'Account', + 'doctype': u'DocField', + 'fieldname': u'tax_code', + 'fieldtype': u'Link', + 'label': u'TDS Account Head', + 'oldfieldname': u'tax_code', + 'oldfieldtype': u'Link', + 'options': u'Account', 'permlevel': 0, 'print_hide': 1 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'rate', - 'fieldtype': 'Currency', - 'label': 'Rate', - 'oldfieldname': 'rate', - 'oldfieldtype': 'Currency', + 'doctype': u'DocField', + 'fieldname': u'rate', + 'fieldtype': u'Currency', + 'label': u'Rate', + 'oldfieldname': u'rate', + 'oldfieldtype': u'Currency', 'permlevel': 0, 'print_hide': 1 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'ded_amount', - 'fieldtype': 'Currency', - 'label': 'TDS Amount', - 'oldfieldname': 'ded_amount', - 'oldfieldtype': 'Currency', + 'doctype': u'DocField', + 'fieldname': u'ded_amount', + 'fieldtype': u'Currency', + 'label': u'TDS Amount', + 'oldfieldname': u'ded_amount', + 'oldfieldtype': u'Currency', 'permlevel': 0, 'print_hide': 1 }, # DocField { - 'doctype': 'DocField', - 'fieldtype': 'Section Break', - 'label': 'Totals', - 'oldfieldtype': 'Section Break', + 'doctype': u'DocField', + 'fieldtype': u'Section Break', + 'label': u'Totals', + 'oldfieldtype': u'Section Break', 'permlevel': 0 }, # DocField { - 'doctype': 'DocField', - 'fieldtype': 'Column Break', - 'oldfieldtype': 'Column Break', + 'doctype': u'DocField', + 'fieldtype': u'Column Break', + 'oldfieldtype': u'Column Break', 'permlevel': 0, - 'width': '50%' + 'width': u'50%' }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'other_charges_added', - 'fieldtype': 'Currency', - 'label': 'Other Charges Added', - 'oldfieldname': 'other_charges_added', - 'oldfieldtype': 'Currency', + 'doctype': u'DocField', + 'fieldname': u'other_charges_added', + 'fieldtype': u'Currency', + 'label': u'Other Charges Added', + 'oldfieldname': u'other_charges_added', + 'oldfieldtype': u'Currency', 'permlevel': 1, 'print_hide': 1 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'other_charges_deducted', - 'fieldtype': 'Currency', - 'label': 'Other Charges Deducted', - 'oldfieldname': 'other_charges_deducted', - 'oldfieldtype': 'Currency', + 'doctype': u'DocField', + 'fieldname': u'other_charges_deducted', + 'fieldtype': u'Currency', + 'label': u'Other Charges Deducted', + 'oldfieldname': u'other_charges_deducted', + 'oldfieldtype': u'Currency', 'permlevel': 1, 'print_hide': 1 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'total_tds_on_voucher', - 'fieldtype': 'Currency', - 'label': 'Total TDS On Voucher', + 'doctype': u'DocField', + 'fieldname': u'total_tds_on_voucher', + 'fieldtype': u'Currency', + 'label': u'Total TDS On Voucher', 'no_copy': 1, - 'oldfieldname': 'total_tds_on_voucher', - 'oldfieldtype': 'Currency', + 'oldfieldname': u'total_tds_on_voucher', + 'oldfieldtype': u'Currency', 'permlevel': 1, 'print_hide': 1 }, # DocField { - 'colour': 'White:FFF', - 'doctype': 'DocField', - 'fieldname': 'tds_amount_on_advance', - 'fieldtype': 'Currency', - 'label': 'TDS Amount On Advance', + 'colour': u'White:FFF', + 'doctype': u'DocField', + 'fieldname': u'tds_amount_on_advance', + 'fieldtype': u'Currency', + 'label': u'TDS Amount On Advance', 'no_copy': 1, - 'oldfieldname': 'tds_amount_on_advance', - 'oldfieldtype': 'Currency', + 'oldfieldname': u'tds_amount_on_advance', + 'oldfieldtype': u'Currency', 'permlevel': 1, 'print_hide': 1 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'total_advance', - 'fieldtype': 'Currency', - 'label': 'Total Advance (Incl. TDS)', + 'doctype': u'DocField', + 'fieldname': u'total_advance', + 'fieldtype': u'Currency', + 'label': u'Total Advance (Incl. TDS)', 'no_copy': 1, - 'oldfieldname': 'total_advance', - 'oldfieldtype': 'Currency', + 'oldfieldname': u'total_advance', + 'oldfieldtype': u'Currency', 'permlevel': 1, 'print_hide': 1 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'total_amount_to_pay', - 'fieldtype': 'Currency', + 'doctype': u'DocField', + 'fieldname': u'total_amount_to_pay', + 'fieldtype': u'Currency', 'hidden': 0, - 'label': 'Total Amount To Pay', + 'label': u'Total Amount To Pay', 'no_copy': 1, - 'oldfieldname': 'total_amount_to_pay', - 'oldfieldtype': 'Currency', + 'oldfieldname': u'total_amount_to_pay', + 'oldfieldtype': u'Currency', 'permlevel': 1, 'print_hide': 1 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'outstanding_amount', - 'fieldtype': 'Currency', + 'doctype': u'DocField', + 'fieldname': u'outstanding_amount', + 'fieldtype': u'Currency', 'in_filter': 1, - 'label': 'Outstanding Amount', + 'label': u'Outstanding Amount', 'no_copy': 1, - 'oldfieldname': 'outstanding_amount', - 'oldfieldtype': 'Currency', + 'oldfieldname': u'outstanding_amount', + 'oldfieldtype': u'Currency', 'permlevel': 1, 'print_hide': 1, 'search_index': 1 @@ -991,110 +992,109 @@ # DocField { - 'doctype': 'DocField', - 'fieldtype': 'Column Break', - 'oldfieldtype': 'Column Break', + 'doctype': u'DocField', + 'fieldtype': u'Column Break', + 'oldfieldtype': u'Column Break', 'permlevel': 0, 'print_hide': 1, - 'width': '50%' + 'width': u'50%' }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'grand_total', - 'fieldtype': 'Currency', - 'label': 'Grand Total', - 'oldfieldname': 'grand_total', - 'oldfieldtype': 'Currency', + 'doctype': u'DocField', + 'fieldname': u'grand_total', + 'fieldtype': u'Currency', + 'label': u'Grand Total', + 'oldfieldname': u'grand_total', + 'oldfieldtype': u'Currency', 'permlevel': 1, 'print_hide': 1 }, # DocField { - 'colour': 'White:FFF', - 'description': 'In Words will be visible once you save the Purchase Invoice.', - 'doctype': 'DocField', - 'fieldname': 'in_words', - 'fieldtype': 'Data', - 'label': 'In Words', - 'oldfieldname': 'in_words', - 'oldfieldtype': 'Data', + 'colour': u'White:FFF', + 'description': u'In Words will be visible once you save the Purchase Invoice.', + 'doctype': u'DocField', + 'fieldname': u'in_words', + 'fieldtype': u'Data', + 'label': u'In Words', + 'oldfieldname': u'in_words', + 'oldfieldtype': u'Data', 'permlevel': 1, 'print_hide': 1 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'net_total_import', - 'fieldtype': 'Currency', - 'label': 'Net Total (Import)', - 'oldfieldname': 'net_total_import', - 'oldfieldtype': 'Currency', + 'doctype': u'DocField', + 'fieldname': u'net_total_import', + 'fieldtype': u'Currency', + 'label': u'Net Total (Import)', + 'oldfieldname': u'net_total_import', + 'oldfieldtype': u'Currency', 'permlevel': 1, 'print_hide': 1 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'other_charges_added_import', - 'fieldtype': 'Currency', - 'label': 'Other Charges Added (Import)', - 'oldfieldname': 'other_charges_added_import', - 'oldfieldtype': 'Currency', + 'doctype': u'DocField', + 'fieldname': u'other_charges_added_import', + 'fieldtype': u'Currency', + 'label': u'Other Charges Added (Import)', + 'oldfieldname': u'other_charges_added_import', + 'oldfieldtype': u'Currency', 'permlevel': 1, 'print_hide': 1 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'other_charges_deducted_import', - 'fieldtype': 'Currency', - 'label': 'Other Charges Deducted (Import)', - 'oldfieldname': 'other_charges_deducted_import', - 'oldfieldtype': 'Currency', + 'doctype': u'DocField', + 'fieldname': u'other_charges_deducted_import', + 'fieldtype': u'Currency', + 'label': u'Other Charges Deducted (Import)', + 'oldfieldname': u'other_charges_deducted_import', + 'oldfieldtype': u'Currency', 'permlevel': 1, 'print_hide': 1 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'grand_total_import', - 'fieldtype': 'Currency', - 'label': 'Grand Total (Import)', - 'oldfieldname': 'grand_total_import', - 'oldfieldtype': 'Currency', + 'doctype': u'DocField', + 'fieldname': u'grand_total_import', + 'fieldtype': u'Currency', + 'label': u'Grand Total (Import)', + 'oldfieldname': u'grand_total_import', + 'oldfieldtype': u'Currency', 'permlevel': 1, 'print_hide': 1 }, # DocField { - 'colour': 'White:FFF', - 'description': 'In Words (Import) will be visible once you save the Purchase Invoice.', - 'doctype': 'DocField', - 'fieldname': 'in_words_import', - 'fieldtype': 'Data', - 'label': 'In Words (Import)', - 'oldfieldname': 'in_words_import', - 'oldfieldtype': 'Data', + 'colour': u'White:FFF', + 'doctype': u'DocField', + 'fieldname': u'in_words_import', + 'fieldtype': u'Data', + 'label': u'In Words (Import)', + 'oldfieldname': u'in_words_import', + 'oldfieldtype': u'Data', 'permlevel': 1, 'print_hide': 1 }, # DocField { - 'colour': 'White:FFF', - 'depends_on': 'eval:!doc.__islocal', - 'doctype': 'DocField', - 'fieldtype': 'Section Break', - 'label': 'Actions', - 'oldfieldtype': 'Section Break', + 'colour': u'White:FFF', + 'depends_on': u'eval:!doc.__islocal', + 'doctype': u'DocField', + 'fieldtype': u'Section Break', + 'label': u'Actions', + 'oldfieldtype': u'Section Break', 'permlevel': 0, 'print_hide': 1 }, @@ -1102,25 +1102,25 @@ # DocField { 'allow_on_submit': 1, - 'doctype': 'DocField', - 'fieldtype': 'Button', - 'label': 'Repair Outstanding Amt', - 'oldfieldtype': 'Button', - 'options': 'repair_pv_outstanding', + 'doctype': u'DocField', + 'fieldtype': u'Button', + 'label': u'Repair Outstanding Amt', + 'oldfieldtype': u'Button', + 'options': u'repair_pv_outstanding', 'permlevel': 0, 'print_hide': 1 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'against_expense_account', - 'fieldtype': 'Small Text', + 'doctype': u'DocField', + 'fieldname': u'against_expense_account', + 'fieldtype': u'Small Text', 'hidden': 1, - 'label': 'Against Expense Account', + 'label': u'Against Expense Account', 'no_copy': 1, - 'oldfieldname': 'against_expense_account', - 'oldfieldtype': 'Small Text', + 'oldfieldname': u'against_expense_account', + 'oldfieldtype': u'Small Text', 'permlevel': 0, 'print_hide': 1, 'report_hide': 0 diff --git a/erpnext/accounts/doctype/purchase_tax_detail/purchase_tax_detail.txt b/erpnext/accounts/doctype/purchase_tax_detail/purchase_tax_detail.txt index 58f66c7f6ba..2c5dc075db8 100644 --- a/erpnext/accounts/doctype/purchase_tax_detail/purchase_tax_detail.txt +++ b/erpnext/accounts/doctype/purchase_tax_detail/purchase_tax_detail.txt @@ -5,195 +5,199 @@ { 'creation': '2010-08-08 17:09:16', 'docstatus': 0, - 'modified': '2011-11-16 15:41:42', - 'modified_by': 'Administrator', - 'owner': 'wasim@webnotestech.com' + 'modified': '2012-02-27 18:28:24', + 'modified_by': u'Administrator', + 'owner': u'wasim@webnotestech.com' }, # These values are common for all DocType { - 'autoname': 'PVTD.######', - 'colour': 'White:FFF', - 'default_print_format': 'Standard', + '_last_update': u'1322549700', + 'autoname': u'PVTD.######', + 'colour': u'White:FFF', + 'default_print_format': u'Standard', 'doctype': 'DocType', 'hide_heading': 1, 'istable': 1, - 'module': 'Accounts', + 'module': u'Accounts', 'name': '__common__', - 'section_style': 'Tray', - 'server_code_error': ' ', + 'section_style': u'Tray', + 'server_code_error': u' ', 'show_in_menu': 0, - 'version': 12 + 'version': 13 }, # These values are common for all DocField { - 'doctype': 'DocField', + 'doctype': u'DocField', 'name': '__common__', - 'parent': 'Purchase Tax Detail', - 'parentfield': 'fields', - 'parenttype': 'DocType' + 'parent': u'Purchase Tax Detail', + 'parentfield': u'fields', + 'parenttype': u'DocType' }, # DocType, Purchase Tax Detail { 'doctype': 'DocType', - 'name': 'Purchase Tax Detail' + 'name': u'Purchase Tax Detail' }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'category', - 'fieldtype': 'Select', - 'label': 'Category', - 'oldfieldname': 'category', - 'oldfieldtype': 'Select', - 'options': '\nFor Total\nFor Valuation\nFor Both', + 'doctype': u'DocField', + 'fieldname': u'category', + 'fieldtype': u'Select', + 'label': u'Category', + 'oldfieldname': u'category', + 'oldfieldtype': u'Select', + 'options': u'\nFor Total\nFor Valuation\nFor Both', 'permlevel': 0, 'reqd': 1 }, # DocField { - 'default': 'Add', - 'doctype': 'DocField', - 'fieldname': 'add_deduct_tax', - 'fieldtype': 'Select', - 'label': 'Add or Deduct', - 'oldfieldname': 'add_deduct_tax', - 'oldfieldtype': 'Select', - 'options': '\nAdd\nDeduct', + 'default': u'Add', + 'doctype': u'DocField', + 'fieldname': u'add_deduct_tax', + 'fieldtype': u'Select', + 'label': u'Add or Deduct', + 'oldfieldname': u'add_deduct_tax', + 'oldfieldtype': u'Select', + 'options': u'\nAdd\nDeduct', 'permlevel': 0, 'reqd': 1, - 'trigger': 'Client' + 'trigger': u'Client' }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'charge_type', - 'fieldtype': 'Select', - 'label': 'Type', - 'oldfieldname': 'charge_type', - 'oldfieldtype': 'Select', - 'options': '\nActual\nOn Net Total\nOn Previous Row Amount\nOn Previous Row Total', + 'doctype': u'DocField', + 'fieldname': u'charge_type', + 'fieldtype': u'Select', + 'label': u'Type', + 'oldfieldname': u'charge_type', + 'oldfieldtype': u'Select', + 'options': u'\nActual\nOn Net Total\nOn Previous Row Amount\nOn Previous Row Total', 'permlevel': 0, 'reqd': 1, - 'trigger': 'Client' + 'trigger': u'Client' }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'row_id', - 'fieldtype': 'Data', + 'doctype': u'DocField', + 'fieldname': u'row_id', + 'fieldtype': u'Data', 'hidden': 0, - 'label': 'Enter Row', - 'oldfieldname': 'row_id', - 'oldfieldtype': 'Data', + 'label': u'Enter Row', + 'oldfieldname': u'row_id', + 'oldfieldtype': u'Data', 'permlevel': 0, - 'trigger': 'Client' + 'trigger': u'Client' }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'item_wise_tax_detail', - 'fieldtype': 'Small Text', - 'label': 'Item Wise Tax Detail ', - 'oldfieldname': 'item_wise_tax_detail', - 'oldfieldtype': 'Small Text', + 'colour': u'White:FFF', + 'doctype': u'DocField', + 'fieldname': u'item_wise_tax_detail', + 'fieldtype': u'Small Text', + 'hidden': 1, + 'label': u'Item Wise Tax Detail ', + 'oldfieldname': u'item_wise_tax_detail', + 'oldfieldtype': u'Small Text', + 'permlevel': 1, + 'print_hide': 1 + }, + + # DocField + { + 'doctype': u'DocField', + 'fieldname': u'description', + 'fieldtype': u'Small Text', + 'label': u'Description', + 'oldfieldname': u'description', + 'oldfieldtype': u'Small Text', + 'permlevel': 0, + 'reqd': 1, + 'width': u'300px' + }, + + # DocField + { + 'doctype': u'DocField', + 'fieldname': u'account_head', + 'fieldtype': u'Link', + 'label': u'Account Head', + 'oldfieldname': u'account_head', + 'oldfieldtype': u'Link', + 'options': u'Account', + 'permlevel': 0, + 'reqd': 1, + 'trigger': u'Client' + }, + + # DocField + { + 'doctype': u'DocField', + 'fieldname': u'cost_center', + 'fieldtype': u'Link', + 'label': u'Cost Center', + 'oldfieldname': u'cost_center', + 'oldfieldtype': u'Link', + 'options': u'Cost Center', + 'permlevel': 0, + 'trigger': u'Client' + }, + + # DocField + { + 'doctype': u'DocField', + 'fieldname': u'rate', + 'fieldtype': u'Currency', + 'label': u'Rate', + 'oldfieldname': u'rate', + 'oldfieldtype': u'Currency', + 'permlevel': 0, + 'reqd': 0, + 'trigger': u'Client' + }, + + # DocField + { + 'doctype': u'DocField', + 'fieldname': u'tax_amount', + 'fieldtype': u'Currency', + 'label': u'Amount', + 'oldfieldname': u'tax_amount', + 'oldfieldtype': u'Currency', + 'permlevel': 0, + 'reqd': 0, + 'trigger': u'Client' + }, + + # DocField + { + 'doctype': u'DocField', + 'fieldname': u'total', + 'fieldtype': u'Currency', + 'label': u'Aggregate Total', + 'oldfieldname': u'total', + 'oldfieldtype': u'Currency', 'permlevel': 1 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'description', - 'fieldtype': 'Small Text', - 'label': 'Description', - 'oldfieldname': 'description', - 'oldfieldtype': 'Small Text', - 'permlevel': 0, - 'reqd': 1, - 'width': '300px' - }, - - # DocField - { - 'doctype': 'DocField', - 'fieldname': 'account_head', - 'fieldtype': 'Link', - 'label': 'Account Head', - 'oldfieldname': 'account_head', - 'oldfieldtype': 'Link', - 'options': 'Account', - 'permlevel': 0, - 'reqd': 1, - 'trigger': 'Client' - }, - - # DocField - { - 'doctype': 'DocField', - 'fieldname': 'cost_center', - 'fieldtype': 'Link', - 'label': 'Cost Center', - 'oldfieldname': 'cost_center', - 'oldfieldtype': 'Link', - 'options': 'Cost Center', - 'permlevel': 0, - 'trigger': 'Client' - }, - - # DocField - { - 'doctype': 'DocField', - 'fieldname': 'rate', - 'fieldtype': 'Currency', - 'label': 'Rate', - 'oldfieldname': 'rate', - 'oldfieldtype': 'Currency', - 'permlevel': 0, - 'reqd': 0, - 'trigger': 'Client' - }, - - # DocField - { - 'doctype': 'DocField', - 'fieldname': 'tax_amount', - 'fieldtype': 'Currency', - 'label': 'Amount', - 'oldfieldname': 'tax_amount', - 'oldfieldtype': 'Currency', - 'permlevel': 0, - 'reqd': 0, - 'trigger': 'Client' - }, - - # DocField - { - 'doctype': 'DocField', - 'fieldname': 'total', - 'fieldtype': 'Currency', - 'label': 'Aggregate Total', - 'oldfieldname': 'total', - 'oldfieldtype': 'Currency', - 'permlevel': 1 - }, - - # DocField - { - 'doctype': 'DocField', - 'fieldname': 'parenttype', - 'fieldtype': 'Data', + 'doctype': u'DocField', + 'fieldname': u'parenttype', + 'fieldtype': u'Data', 'hidden': 1, 'in_filter': 1, - 'label': 'Parenttype', - 'oldfieldname': 'parenttype', - 'oldfieldtype': 'Data', + 'label': u'Parenttype', + 'oldfieldname': u'parenttype', + 'oldfieldtype': u'Data', 'permlevel': 0, 'print_hide': 1, 'search_index': 0 @@ -201,15 +205,15 @@ # DocField { - 'description': 'Cheating Field\nPlease do not delete ', - 'doctype': 'DocField', - 'fieldname': 'total_tax_amount', - 'fieldtype': 'Currency', + 'description': u'Cheating Field\nPlease do not delete ', + 'doctype': u'DocField', + 'fieldname': u'total_tax_amount', + 'fieldtype': u'Currency', 'hidden': 1, - 'label': 'Total +Tax', + 'label': u'Total +Tax', 'no_copy': 1, - 'oldfieldname': 'total_tax_amount', - 'oldfieldtype': 'Currency', + 'oldfieldname': u'total_tax_amount', + 'oldfieldtype': u'Currency', 'permlevel': 0, 'print_hide': 1, 'report_hide': 1 @@ -217,15 +221,15 @@ # DocField { - 'description': 'Cheating Field\nPlease do not delete ', - 'doctype': 'DocField', - 'fieldname': 'total_amount', - 'fieldtype': 'Currency', + 'description': u'Cheating Field\nPlease do not delete ', + 'doctype': u'DocField', + 'fieldname': u'total_amount', + 'fieldtype': u'Currency', 'hidden': 1, - 'label': 'Tax Amount', + 'label': u'Tax Amount', 'no_copy': 1, - 'oldfieldname': 'total_amount', - 'oldfieldtype': 'Currency', + 'oldfieldname': u'total_amount', + 'oldfieldtype': u'Currency', 'permlevel': 0, 'print_hide': 1, 'report_hide': 1 diff --git a/erpnext/accounts/doctype/pv_detail/pv_detail.txt b/erpnext/accounts/doctype/pv_detail/pv_detail.txt index e1181b0bb32..826ad8e2dbe 100755 --- a/erpnext/accounts/doctype/pv_detail/pv_detail.txt +++ b/erpnext/accounts/doctype/pv_detail/pv_detail.txt @@ -5,67 +5,67 @@ { 'creation': '2010-08-08 17:09:17', 'docstatus': 0, - 'modified': '2011-12-14 10:44:21', - 'modified_by': 'Administrator', - 'owner': 'Administrator' + 'modified': '2012-02-27 18:42:06', + 'modified_by': u'Administrator', + 'owner': u'Administrator' }, # These values are common for all DocType { - 'autoname': 'EVD.######', - 'colour': 'White:FFF', - 'default_print_format': 'Standard', + 'autoname': u'EVD.######', + 'colour': u'White:FFF', + 'default_print_format': u'Standard', 'doctype': 'DocType', 'istable': 1, - 'module': 'Accounts', + 'module': u'Accounts', 'name': '__common__', - 'section_style': 'Tray', - 'server_code_error': ' ', + 'section_style': u'Tray', + 'server_code_error': u' ', 'show_in_menu': 0, - 'version': 42 + 'version': 43 }, # These values are common for all DocField { - 'doctype': 'DocField', + 'doctype': u'DocField', 'name': '__common__', - 'parent': 'PV Detail', - 'parentfield': 'fields', - 'parenttype': 'DocType' + 'parent': u'PV Detail', + 'parentfield': u'fields', + 'parenttype': u'DocType' }, # DocType, PV Detail { 'doctype': 'DocType', - 'name': 'PV Detail' + 'name': u'PV Detail' }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'item_code', - 'fieldtype': 'Link', + 'doctype': u'DocField', + 'fieldname': u'item_code', + 'fieldtype': u'Link', 'in_filter': 1, - 'label': 'Item', - 'oldfieldname': 'item_code', - 'oldfieldtype': 'Link', - 'options': 'Item', + 'label': u'Item', + 'oldfieldname': u'item_code', + 'oldfieldtype': u'Link', + 'options': u'Item', 'permlevel': 0, 'print_hide': 1, 'reqd': 0, 'search_index': 1, - 'trigger': 'Client' + 'trigger': u'Client' }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'item_name', - 'fieldtype': 'Data', + 'doctype': u'DocField', + 'fieldname': u'item_name', + 'fieldtype': u'Data', 'in_filter': 0, - 'label': 'Item Name', - 'oldfieldname': 'item_name', - 'oldfieldtype': 'Data', + 'label': u'Item Name', + 'oldfieldname': u'item_name', + 'oldfieldtype': u'Data', 'permlevel': 0, 'reqd': 1, 'search_index': 0 @@ -73,108 +73,108 @@ # DocField { - 'doctype': 'DocField', - 'fieldname': 'description', - 'fieldtype': 'Text', - 'label': 'Description', - 'oldfieldname': 'description', - 'oldfieldtype': 'Text', + 'doctype': u'DocField', + 'fieldname': u'description', + 'fieldtype': u'Text', + 'label': u'Description', + 'oldfieldname': u'description', + 'oldfieldtype': u'Text', 'permlevel': 0, - 'width': '300px' + 'width': u'300px' }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'qty', - 'fieldtype': 'Currency', - 'label': 'Qty', - 'oldfieldname': 'qty', - 'oldfieldtype': 'Currency', + 'doctype': u'DocField', + 'fieldname': u'qty', + 'fieldtype': u'Currency', + 'label': u'Qty', + 'oldfieldname': u'qty', + 'oldfieldtype': u'Currency', 'permlevel': 0, 'print_hide': 0, 'reqd': 1, - 'trigger': 'Client' + 'trigger': u'Client' }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'import_ref_rate', - 'fieldtype': 'Currency', - 'label': 'Ref Rate ', + 'doctype': u'DocField', + 'fieldname': u'import_ref_rate', + 'fieldtype': u'Currency', + 'label': u'Ref Rate ', 'permlevel': 0, - 'trigger': 'Client' + 'trigger': u'Client' }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'discount_rate', - 'fieldtype': 'Currency', - 'label': 'Discount %', + 'doctype': u'DocField', + 'fieldname': u'discount_rate', + 'fieldtype': u'Currency', + 'label': u'Discount %', 'permlevel': 0, - 'trigger': 'Client' + 'trigger': u'Client' }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'import_rate', - 'fieldtype': 'Currency', - 'label': 'Rate ', - 'oldfieldname': 'import_rate', - 'oldfieldtype': 'Currency', + 'doctype': u'DocField', + 'fieldname': u'import_rate', + 'fieldtype': u'Currency', + 'label': u'Rate ', + 'oldfieldname': u'import_rate', + 'oldfieldtype': u'Currency', 'permlevel': 0, 'print_hide': 0, 'reqd': 1, - 'trigger': 'Client' + 'trigger': u'Client' }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'import_amount', - 'fieldtype': 'Currency', - 'label': 'Amount', - 'oldfieldname': 'import_amount', - 'oldfieldtype': 'Currency', + 'doctype': u'DocField', + 'fieldname': u'import_amount', + 'fieldtype': u'Currency', + 'label': u'Amount', + 'oldfieldname': u'import_amount', + 'oldfieldtype': u'Currency', 'permlevel': 1, 'reqd': 1 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'purchase_ref_rate', - 'fieldtype': 'Currency', - 'label': 'Ref Rate *', + 'doctype': u'DocField', + 'fieldname': u'purchase_ref_rate', + 'fieldtype': u'Currency', + 'label': u'Ref Rate *', 'permlevel': 0, - 'trigger': 'Client' + 'trigger': u'Client' }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'rate', - 'fieldtype': 'Currency', - 'label': 'Rate *(Default Curr.)', - 'oldfieldname': 'rate', - 'oldfieldtype': 'Currency', + 'doctype': u'DocField', + 'fieldname': u'rate', + 'fieldtype': u'Currency', + 'label': u'Rate *(Default Curr.)', + 'oldfieldname': u'rate', + 'oldfieldtype': u'Currency', 'permlevel': 0, 'print_hide': 1, 'reqd': 1, - 'trigger': 'Client' + 'trigger': u'Client' }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'amount', - 'fieldtype': 'Currency', - 'label': 'Amount (Default Curr.)', - 'oldfieldname': 'amount', - 'oldfieldtype': 'Currency', + 'doctype': u'DocField', + 'fieldname': u'amount', + 'fieldtype': u'Currency', + 'label': u'Amount (Default Curr.)', + 'oldfieldname': u'amount', + 'oldfieldtype': u'Currency', 'permlevel': 1, 'print_hide': 1, 'reqd': 1 @@ -182,102 +182,74 @@ # DocField { - 'colour': 'White:FFF', - 'doctype': 'DocField', - 'fieldname': 'expense_head', - 'fieldtype': 'Link', - 'label': 'Expense Head', - 'oldfieldname': 'expense_head', - 'oldfieldtype': 'Link', - 'options': 'Account', + 'colour': u'White:FFF', + 'doctype': u'DocField', + 'fieldname': u'expense_head', + 'fieldtype': u'Link', + 'label': u'Expense Head', + 'oldfieldname': u'expense_head', + 'oldfieldtype': u'Link', + 'options': u'Account', 'permlevel': 0, 'print_hide': 1, 'reqd': 1, - 'trigger': 'Client', - 'width': '120px' + 'trigger': u'Client', + 'width': u'120px' }, # DocField { - 'colour': 'White:FFF', - 'doctype': 'DocField', - 'fieldname': 'cost_center', - 'fieldtype': 'Link', - 'label': 'Cost Center', - 'oldfieldname': 'cost_center', - 'oldfieldtype': 'Link', - 'options': 'Cost Center', + 'colour': u'White:FFF', + 'doctype': u'DocField', + 'fieldname': u'cost_center', + 'fieldtype': u'Link', + 'label': u'Cost Center', + 'oldfieldname': u'cost_center', + 'oldfieldtype': u'Link', + 'options': u'Cost Center', 'permlevel': 0, 'print_hide': 1, - 'trigger': 'Client', - 'width': '120px' + 'trigger': u'Client', + 'width': u'120px' }, # DocField { - 'colour': 'White:FFF', - 'doctype': 'DocField', - 'fieldname': 'project_name', - 'fieldtype': 'Link', + 'colour': u'White:FFF', + 'doctype': u'DocField', + 'fieldname': u'project_name', + 'fieldtype': u'Link', 'in_filter': 1, - 'label': 'Project Name', - 'options': 'Project', + 'label': u'Project Name', + 'options': u'Project', 'permlevel': 0, 'print_hide': 1 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'brand', - 'fieldtype': 'Data', - 'label': 'Brand', - 'oldfieldname': 'brand', - 'oldfieldtype': 'Data', + 'doctype': u'DocField', + 'fieldname': u'brand', + 'fieldtype': u'Data', + 'hidden': 1, + 'label': u'Brand', + 'oldfieldname': u'brand', + 'oldfieldtype': u'Data', 'permlevel': 0, 'print_hide': 1 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'item_group', - 'fieldtype': 'Link', - 'in_filter': 1, - 'label': 'Item Group', - 'oldfieldname': 'item_group', - 'oldfieldtype': 'Link', - 'options': 'Item Group', - 'permlevel': 1, - 'print_hide': 1, - 'search_index': 1 - }, - - # DocField - { - 'doctype': 'DocField', - 'fieldname': 'purchase_order', - 'fieldtype': 'Link', - 'in_filter': 1, - 'label': 'Pur Order', - 'oldfieldname': 'purchase_order', - 'oldfieldtype': 'Link', - 'options': 'Purchase Order', - 'permlevel': 1, - 'print_hide': 1, - 'search_index': 1 - }, - - # DocField - { - 'doctype': 'DocField', - 'fieldname': 'po_detail', - 'fieldtype': 'Data', + 'doctype': u'DocField', + 'fieldname': u'item_group', + 'fieldtype': u'Link', 'hidden': 1, 'in_filter': 1, - 'label': 'PO Detail', - 'oldfieldname': 'po_detail', - 'oldfieldtype': 'Data', + 'label': u'Item Group', + 'oldfieldname': u'item_group', + 'oldfieldtype': u'Link', + 'options': u'Item Group', 'permlevel': 1, 'print_hide': 1, 'search_index': 1 @@ -285,14 +257,14 @@ # DocField { - 'doctype': 'DocField', - 'fieldname': 'purchase_receipt', - 'fieldtype': 'Link', + 'doctype': u'DocField', + 'fieldname': u'purchase_order', + 'fieldtype': u'Link', 'in_filter': 1, - 'label': 'Pur Receipt', - 'oldfieldname': 'purchase_receipt', - 'oldfieldtype': 'Link', - 'options': 'Purchase Receipt', + 'label': u'Pur Order', + 'oldfieldname': u'purchase_order', + 'oldfieldtype': u'Link', + 'options': u'Purchase Order', 'permlevel': 1, 'print_hide': 1, 'search_index': 1 @@ -300,14 +272,14 @@ # DocField { - 'doctype': 'DocField', - 'fieldname': 'pr_detail', - 'fieldtype': 'Data', + 'doctype': u'DocField', + 'fieldname': u'po_detail', + 'fieldtype': u'Data', 'hidden': 1, 'in_filter': 1, - 'label': 'PR Detail', - 'oldfieldname': 'pr_detail', - 'oldfieldtype': 'Data', + 'label': u'PO Detail', + 'oldfieldname': u'po_detail', + 'oldfieldtype': u'Data', 'permlevel': 1, 'print_hide': 1, 'search_index': 1 @@ -315,13 +287,44 @@ # DocField { - 'description': 'Tax detail table fetched from item master as a string and stored in this field.\nUsed for Purchase Other Charges', - 'doctype': 'DocField', - 'fieldname': 'item_tax_rate', - 'fieldtype': 'Small Text', - 'label': 'Item Tax Rate', - 'oldfieldname': 'item_tax_rate', - 'oldfieldtype': 'Small Text', + 'doctype': u'DocField', + 'fieldname': u'purchase_receipt', + 'fieldtype': u'Link', + 'in_filter': 1, + 'label': u'Pur Receipt', + 'oldfieldname': u'purchase_receipt', + 'oldfieldtype': u'Link', + 'options': u'Purchase Receipt', + 'permlevel': 1, + 'print_hide': 1, + 'search_index': 1 + }, + + # DocField + { + 'doctype': u'DocField', + 'fieldname': u'pr_detail', + 'fieldtype': u'Data', + 'hidden': 1, + 'in_filter': 1, + 'label': u'PR Detail', + 'oldfieldname': u'pr_detail', + 'oldfieldtype': u'Data', + 'permlevel': 1, + 'print_hide': 1, + 'search_index': 1 + }, + + # DocField + { + 'description': u'Tax detail table fetched from item master as a string and stored in this field.\nUsed for Purchase Other Charges', + 'doctype': u'DocField', + 'fieldname': u'item_tax_rate', + 'fieldtype': u'Small Text', + 'hidden': 1, + 'label': u'Item Tax Rate', + 'oldfieldname': u'item_tax_rate', + 'oldfieldtype': u'Small Text', 'permlevel': 1, 'print_hide': 1, 'report_hide': 1 @@ -330,10 +333,10 @@ # DocField { 'allow_on_submit': 1, - 'doctype': 'DocField', - 'fieldname': 'page_break', - 'fieldtype': 'Check', - 'label': 'Page Break', + 'doctype': u'DocField', + 'fieldname': u'page_break', + 'fieldtype': u'Check', + 'label': u'Page Break', 'no_copy': 1, 'permlevel': 0, 'print_hide': 1, diff --git a/erpnext/accounts/doctype/receivable_voucher/receivable_voucher.txt b/erpnext/accounts/doctype/receivable_voucher/receivable_voucher.txt index 24514bc981e..b2777e37f23 100644 --- a/erpnext/accounts/doctype/receivable_voucher/receivable_voucher.txt +++ b/erpnext/accounts/doctype/receivable_voucher/receivable_voucher.txt @@ -5,7 +5,7 @@ { 'creation': '2010-08-08 17:09:18', 'docstatus': 0, - 'modified': '2012-02-24 14:32:22', + 'modified': '2012-02-27 17:34:46', 'modified_by': u'Administrator', 'owner': u'Administrator' }, @@ -21,7 +21,7 @@ # These values are common for all DocType { - '_last_update': u'1330074081', + '_last_update': u'1330344021', 'change_log': u'1. Change in pull_details method dt.-26-06-2009', 'colour': u'White:FFF', 'default_print_format': u'Standard', @@ -34,7 +34,7 @@ 'server_code_error': u' ', 'show_in_menu': 0, 'subject': u'To %(customer_name)s worth %(currency)s %(grand_total_export)s due on %(due_date)s | %(outstanding_amount)s outstanding', - 'version': 408 + 'version': 414 }, # These values are common for all DocFormat @@ -276,6 +276,54 @@ 'print_hide': 1 }, + # DocField + { + 'doctype': u'DocField', + 'fieldname': u'customer_name', + 'fieldtype': u'Data', + 'label': u'Name', + 'oldfieldname': u'customer_name', + 'oldfieldtype': u'Data', + 'permlevel': 1 + }, + + # DocField + { + 'doctype': u'DocField', + 'fieldname': u'address_display', + 'fieldtype': u'Small Text', + 'label': u'Address', + 'permlevel': 1 + }, + + # DocField + { + 'doctype': u'DocField', + 'fieldname': u'contact_display', + 'fieldtype': u'Small Text', + 'label': u'Contact', + 'permlevel': 1 + }, + + # DocField + { + 'doctype': u'DocField', + 'fieldname': u'contact_mobile', + 'fieldtype': u'Text', + 'label': u'Mobile No', + 'permlevel': 1 + }, + + # DocField + { + 'doctype': u'DocField', + 'fieldname': u'contact_email', + 'fieldtype': u'Text', + 'label': u'Contact Email', + 'permlevel': 1, + 'print_hide': 1 + }, + # DocField { 'colour': u'White:FFF', @@ -299,7 +347,7 @@ 'oldfieldname': u'posting_date', 'oldfieldtype': u'Date', 'permlevel': 0, - 'print_hide': 1, + 'print_hide': 0, 'reqd': 1, 'search_index': 1 }, @@ -375,6 +423,33 @@ 'permlevel': 0 }, + # DocField + { + 'doctype': u'DocField', + 'fieldname': u'territory', + 'fieldtype': u'Link', + 'in_filter': 1, + 'label': u'Territory', + 'options': u'Territory', + 'permlevel': 0, + 'print_hide': 1, + 'reqd': 1, + 'search_index': 0 + }, + + # DocField + { + 'doctype': u'DocField', + 'fieldname': u'customer_group', + 'fieldtype': u'Link', + 'in_filter': 1, + 'label': u'Customer Group', + 'options': u'Customer Group', + 'permlevel': 0, + 'print_hide': 1, + 'search_index': 0 + }, + # DocField { 'colour': u'White:FFF', @@ -1236,107 +1311,6 @@ 'print_hide': 1 }, - # DocField - { - 'colour': u'White:FFF', - 'depends_on': u'eval:doc.customer', - 'doctype': u'DocField', - 'fieldtype': u'Section Break', - 'label': u'Customer Details', - 'permlevel': 0 - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldtype': u'Column Break', - 'permlevel': 0, - 'width': u'50%' - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'customer_name', - 'fieldtype': u'Data', - 'label': u'Name', - 'oldfieldname': u'customer_name', - 'oldfieldtype': u'Data', - 'permlevel': 1 - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'address_display', - 'fieldtype': u'Small Text', - 'label': u'Address', - 'permlevel': 1 - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'customer_group', - 'fieldtype': u'Link', - 'in_filter': 1, - 'label': u'Customer Group', - 'options': u'Customer Group', - 'permlevel': 0, - 'print_hide': 1, - 'search_index': 0 - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldtype': u'Column Break', - 'permlevel': 0, - 'width': u'50%' - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'contact_display', - 'fieldtype': u'Small Text', - 'label': u'Contact', - 'permlevel': 1 - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'contact_mobile', - 'fieldtype': u'Text', - 'label': u'Mobile No', - 'permlevel': 1 - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'contact_email', - 'fieldtype': u'Text', - 'label': u'Contact Email', - 'permlevel': 1, - 'print_hide': 1 - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'territory', - 'fieldtype': u'Link', - 'in_filter': 1, - 'label': u'Territory', - 'options': u'Territory', - 'permlevel': 0, - 'print_hide': 1, - 'reqd': 1, - 'search_index': 0 - }, - # DocField { 'doctype': u'DocField', diff --git a/erpnext/buying/doctype/po_detail/po_detail.txt b/erpnext/buying/doctype/po_detail/po_detail.txt index 4e17c222ded..49bed15c228 100755 --- a/erpnext/buying/doctype/po_detail/po_detail.txt +++ b/erpnext/buying/doctype/po_detail/po_detail.txt @@ -5,52 +5,52 @@ { 'creation': '2010-08-08 17:09:12', 'docstatus': 0, - 'modified': '2012-01-10 16:38:21', - 'modified_by': 'Administrator', - 'owner': 'Administrator' + 'modified': '2012-02-27 14:47:48', + 'modified_by': u'Administrator', + 'owner': u'Administrator' }, # These values are common for all DocType { - 'autoname': 'POD/.#####', - 'colour': 'White:FFF', - 'default_print_format': 'Standard', + 'autoname': u'POD/.#####', + 'colour': u'White:FFF', + 'default_print_format': u'Standard', 'doctype': 'DocType', 'istable': 1, - 'module': 'Buying', + 'module': u'Buying', 'name': '__common__', - 'section_style': 'Tray', - 'server_code_error': ' ', + 'section_style': u'Tray', + 'server_code_error': u' ', 'show_in_menu': 0, - 'version': 61 + 'version': 62 }, # These values are common for all DocField { - 'doctype': 'DocField', + 'doctype': u'DocField', 'name': '__common__', - 'parent': 'PO Detail', - 'parentfield': 'fields', - 'parenttype': 'DocType' + 'parent': u'PO Detail', + 'parentfield': u'fields', + 'parenttype': u'DocType' }, # DocType, PO Detail { 'doctype': 'DocType', - 'name': 'PO Detail' + 'name': u'PO Detail' }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'schedule_date', - 'fieldtype': 'Date', + 'doctype': u'DocField', + 'fieldname': u'schedule_date', + 'fieldtype': u'Date', 'hidden': 0, 'in_filter': 1, - 'label': 'Reqd By Date', + 'label': u'Reqd By Date', 'no_copy': 1, - 'oldfieldname': 'schedule_date', - 'oldfieldtype': 'Date', + 'oldfieldname': u'schedule_date', + 'oldfieldtype': u'Date', 'permlevel': 0, 'print_hide': 1, 'reqd': 1, @@ -59,31 +59,31 @@ # DocField { - 'doctype': 'DocField', - 'fieldname': 'item_code', - 'fieldtype': 'Link', + 'doctype': u'DocField', + 'fieldname': u'item_code', + 'fieldtype': u'Link', 'in_filter': 1, - 'label': 'Item Code', - 'oldfieldname': 'item_code', - 'oldfieldtype': 'Link', - 'options': 'Item', + 'label': u'Item Code', + 'oldfieldname': u'item_code', + 'oldfieldtype': u'Link', + 'options': u'Item', 'permlevel': 0, 'print_hide': 0, 'reqd': 1, 'search_index': 1, - 'trigger': 'Client' + 'trigger': u'Client' }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'item_name', - 'fieldtype': 'Data', + 'doctype': u'DocField', + 'fieldname': u'item_name', + 'fieldtype': u'Data', 'hidden': 0, 'in_filter': 1, - 'label': 'Item Name', - 'oldfieldname': 'item_name', - 'oldfieldtype': 'Data', + 'label': u'Item Name', + 'oldfieldname': u'item_name', + 'oldfieldtype': u'Data', 'permlevel': 0, 'print_hide': 1, 'reqd': 1, @@ -92,110 +92,110 @@ # DocField { - 'doctype': 'DocField', - 'fieldname': 'description', - 'fieldtype': 'Small Text', - 'label': 'Description', - 'oldfieldname': 'description', - 'oldfieldtype': 'Small Text', + 'doctype': u'DocField', + 'fieldname': u'description', + 'fieldtype': u'Small Text', + 'label': u'Description', + 'oldfieldname': u'description', + 'oldfieldtype': u'Small Text', 'permlevel': 0, 'reqd': 1, - 'width': '300px' + 'width': u'300px' }, # DocField { - 'default': '0.00', - 'doctype': 'DocField', - 'fieldname': 'qty', - 'fieldtype': 'Currency', - 'label': 'Quantity', - 'oldfieldname': 'qty', - 'oldfieldtype': 'Currency', + 'default': u'0.00', + 'doctype': u'DocField', + 'fieldname': u'qty', + 'fieldtype': u'Currency', + 'label': u'Quantity', + 'oldfieldname': u'qty', + 'oldfieldtype': u'Currency', 'permlevel': 0, 'reqd': 1, - 'trigger': 'Client', - 'width': '60px' + 'trigger': u'Client', + 'width': u'60px' }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'import_ref_rate', - 'fieldtype': 'Currency', - 'label': 'Ref Rate ', + 'doctype': u'DocField', + 'fieldname': u'import_ref_rate', + 'fieldtype': u'Currency', + 'label': u'Ref Rate ', 'permlevel': 0 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'discount_rate', - 'fieldtype': 'Currency', - 'label': 'Discount %', + 'doctype': u'DocField', + 'fieldname': u'discount_rate', + 'fieldtype': u'Currency', + 'label': u'Discount %', 'permlevel': 0, - 'trigger': 'Client' + 'trigger': u'Client' }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'import_rate', - 'fieldtype': 'Currency', + 'doctype': u'DocField', + 'fieldname': u'import_rate', + 'fieldtype': u'Currency', 'hidden': 0, - 'label': 'Rate ', - 'oldfieldname': 'import_rate', - 'oldfieldtype': 'Currency', + 'label': u'Rate ', + 'oldfieldname': u'import_rate', + 'oldfieldtype': u'Currency', 'permlevel': 0, 'print_hide': 0, - 'trigger': 'Client' + 'trigger': u'Client' }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'import_amount', - 'fieldtype': 'Currency', - 'label': 'Amount', - 'oldfieldname': 'import_amount', - 'oldfieldtype': 'Currency', + 'doctype': u'DocField', + 'fieldname': u'import_amount', + 'fieldtype': u'Currency', + 'label': u'Amount', + 'oldfieldname': u'import_amount', + 'oldfieldtype': u'Currency', 'permlevel': 1 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'purchase_ref_rate', - 'fieldtype': 'Currency', - 'label': 'Ref Rate *', + 'doctype': u'DocField', + 'fieldname': u'purchase_ref_rate', + 'fieldtype': u'Currency', + 'label': u'Ref Rate *', 'permlevel': 0 }, # DocField { - 'default': '0.00', - 'doctype': 'DocField', - 'fieldname': 'purchase_rate', - 'fieldtype': 'Currency', - 'label': 'Rate (Default Curr.) *', - 'oldfieldname': 'purchase_rate', - 'oldfieldtype': 'Currency', + 'default': u'0.00', + 'doctype': u'DocField', + 'fieldname': u'purchase_rate', + 'fieldtype': u'Currency', + 'label': u'Rate (Default Curr.) *', + 'oldfieldname': u'purchase_rate', + 'oldfieldtype': u'Currency', 'permlevel': 0, 'print_hide': 1, 'reqd': 1, - 'trigger': 'Client', - 'width': '100px' + 'trigger': u'Client', + 'width': u'100px' }, # DocField { - 'default': '0.00', - 'doctype': 'DocField', - 'fieldname': 'amount', - 'fieldtype': 'Currency', - 'label': 'Amount (Default Curr.)', - 'oldfieldname': 'amount', - 'oldfieldtype': 'Currency', + 'default': u'0.00', + 'doctype': u'DocField', + 'fieldname': u'amount', + 'fieldtype': u'Currency', + 'label': u'Amount (Default Curr.)', + 'oldfieldname': u'amount', + 'oldfieldtype': u'Currency', 'permlevel': 1, 'print_hide': 1, 'reqd': 1 @@ -203,28 +203,28 @@ # DocField { - 'doctype': 'DocField', - 'fieldname': 'warehouse', - 'fieldtype': 'Link', + 'doctype': u'DocField', + 'fieldname': u'warehouse', + 'fieldtype': u'Link', 'hidden': 0, - 'label': 'Warehouse', - 'oldfieldname': 'warehouse', - 'oldfieldtype': 'Link', - 'options': 'Warehouse', + 'label': u'Warehouse', + 'oldfieldname': u'warehouse', + 'oldfieldtype': u'Link', + 'options': u'Warehouse', 'permlevel': 0, 'print_hide': 1, 'reqd': 0, - 'trigger': 'Client' + 'trigger': u'Client' }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'project_name', - 'fieldtype': 'Link', + 'doctype': u'DocField', + 'fieldname': u'project_name', + 'fieldtype': u'Link', 'in_filter': 1, - 'label': 'Project Name', - 'options': 'Project', + 'label': u'Project Name', + 'options': u'Project', 'permlevel': 0, 'print_hide': 1, 'report_hide': 0 @@ -232,96 +232,96 @@ # DocField { - 'doctype': 'DocField', - 'fieldname': 'uom', - 'fieldtype': 'Link', - 'label': 'UOM', - 'oldfieldname': 'uom', - 'oldfieldtype': 'Link', - 'options': 'UOM', + 'doctype': u'DocField', + 'fieldname': u'uom', + 'fieldtype': u'Link', + 'label': u'UOM', + 'oldfieldname': u'uom', + 'oldfieldtype': u'Link', + 'options': u'UOM', 'permlevel': 0, 'print_hide': 0, 'reqd': 1, - 'trigger': 'Client', - 'width': '100px' + 'trigger': u'Client', + 'width': u'100px' }, # DocField { - 'colour': 'White:FFF', - 'doctype': 'DocField', - 'fieldname': 'conversion_factor', - 'fieldtype': 'Currency', + 'colour': u'White:FFF', + 'doctype': u'DocField', + 'fieldname': u'conversion_factor', + 'fieldtype': u'Currency', 'hidden': 0, - 'label': 'Conversion Factor', - 'oldfieldname': 'conversion_factor', - 'oldfieldtype': 'Currency', + 'label': u'UOM Conversion Factor', + 'oldfieldname': u'conversion_factor', + 'oldfieldtype': u'Currency', 'permlevel': 0, 'print_hide': 1, 'reqd': 1, - 'trigger': 'Client', - 'width': '100px' + 'trigger': u'Client', + 'width': u'100px' }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'stock_uom', - 'fieldtype': 'Data', + 'doctype': u'DocField', + 'fieldname': u'stock_uom', + 'fieldtype': u'Data', 'hidden': 0, - 'label': 'Stock UOM', - 'oldfieldname': 'stock_uom', - 'oldfieldtype': 'Data', + 'label': u'Stock UOM', + 'oldfieldname': u'stock_uom', + 'oldfieldtype': u'Data', 'permlevel': 1, 'print_hide': 1, 'reqd': 1, - 'width': '100px' + 'width': u'100px' }, # DocField { - 'colour': 'White:FFF', - 'doctype': 'DocField', - 'fieldname': 'prevdoc_doctype', - 'fieldtype': 'Data', + 'colour': u'White:FFF', + 'doctype': u'DocField', + 'fieldname': u'prevdoc_doctype', + 'fieldtype': u'Data', 'hidden': 1, - 'label': 'Prevdoc DocType', + 'label': u'Prevdoc DocType', 'no_copy': 0, - 'oldfieldname': 'prevdoc_doctype', - 'oldfieldtype': 'Data', + 'oldfieldname': u'prevdoc_doctype', + 'oldfieldtype': u'Data', 'permlevel': 1, 'print_hide': 1 }, # DocField { - 'colour': 'White:FFF', - 'doctype': 'DocField', - 'fieldname': 'prevdoc_docname', - 'fieldtype': 'Link', + 'colour': u'White:FFF', + 'doctype': u'DocField', + 'fieldname': u'prevdoc_docname', + 'fieldtype': u'Link', 'hidden': 0, 'in_filter': 1, - 'label': 'Purchase Requisition No', + 'label': u'Purchase Requisition No', 'no_copy': 0, - 'oldfieldname': 'prevdoc_docname', - 'oldfieldtype': 'Link', - 'options': 'Indent', + 'oldfieldname': u'prevdoc_docname', + 'oldfieldtype': u'Link', + 'options': u'Indent', 'permlevel': 1, 'print_hide': 1, 'search_index': 1, - 'width': '120px' + 'width': u'120px' }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'prevdoc_date', - 'fieldtype': 'Date', - 'hidden': 0, + 'doctype': u'DocField', + 'fieldname': u'prevdoc_date', + 'fieldtype': u'Date', + 'hidden': 1, 'in_filter': 1, - 'label': 'Purchase Requisition Date', - 'oldfieldname': 'prevdoc_date', - 'oldfieldtype': 'Date', + 'label': u'Purchase Requisition Date', + 'oldfieldname': u'prevdoc_date', + 'oldfieldtype': u'Date', 'permlevel': 1, 'print_hide': 1, 'search_index': 0 @@ -329,16 +329,16 @@ # DocField { - 'colour': 'White:FFF', - 'doctype': 'DocField', - 'fieldname': 'prevdoc_detail_docname', - 'fieldtype': 'Data', + 'colour': u'White:FFF', + 'doctype': u'DocField', + 'fieldname': u'prevdoc_detail_docname', + 'fieldtype': u'Data', 'hidden': 1, 'in_filter': 1, - 'label': 'Purchase Requisition Detail No', + 'label': u'Purchase Requisition Detail No', 'no_copy': 0, - 'oldfieldname': 'prevdoc_detail_docname', - 'oldfieldtype': 'Data', + 'oldfieldname': u'prevdoc_detail_docname', + 'oldfieldtype': u'Data', 'permlevel': 1, 'print_hide': 1, 'search_index': 1 @@ -346,91 +346,91 @@ # DocField { - 'doctype': 'DocField', - 'fieldname': 'brand', - 'fieldtype': 'Link', - 'hidden': 0, - 'label': 'Brand', - 'oldfieldname': 'brand', - 'oldfieldtype': 'Link', - 'options': 'Brand', - 'permlevel': 1, - 'print_hide': 1 - }, - - # DocField - { - 'doctype': 'DocField', - 'fieldname': 'item_group', - 'fieldtype': 'Link', - 'hidden': 0, - 'in_filter': 1, - 'label': 'Item Group', - 'oldfieldname': 'item_group', - 'oldfieldtype': 'Link', - 'options': 'Item Group', - 'permlevel': 1, - 'print_hide': 1, - 'search_index': 1 - }, - - # DocField - { - 'colour': 'White:FFF', - 'doctype': 'DocField', - 'fieldname': 'stock_qty', - 'fieldtype': 'Currency', - 'hidden': 0, - 'label': 'Stock Qty', - 'no_copy': 1, - 'oldfieldname': 'stock_qty', - 'oldfieldtype': 'Currency', - 'permlevel': 1, - 'print_hide': 1, - 'trigger': 'Client', - 'width': '100px' - }, - - # DocField - { - 'doctype': 'DocField', - 'fieldname': 'received_qty', - 'fieldtype': 'Currency', - 'hidden': 0, - 'label': 'Received Qty', - 'no_copy': 1, - 'oldfieldname': 'received_qty', - 'oldfieldtype': 'Currency', - 'permlevel': 1, - 'print_hide': 1 - }, - - # DocField - { - 'default': '0.00', - 'doctype': 'DocField', - 'fieldname': 'billed_qty', - 'fieldtype': 'Currency', - 'hidden': 0, - 'label': 'Billed Quantity', - 'no_copy': 1, - 'oldfieldname': 'billed_qty', - 'oldfieldtype': 'Currency', - 'permlevel': 1, - 'print_hide': 1 - }, - - # DocField - { - 'colour': 'White:FFF', - 'description': 'Tax detail table fetched from item master as a string and stored in this field.\nUsed for Purchase Other Charges', - 'doctype': 'DocField', - 'fieldname': 'item_tax_rate', - 'fieldtype': 'Small Text', + 'doctype': u'DocField', + 'fieldname': u'brand', + 'fieldtype': u'Link', 'hidden': 1, - 'label': 'Item Tax Rate', - 'oldfieldname': 'item_tax_rate', - 'oldfieldtype': 'Small Text', + 'label': u'Brand', + 'oldfieldname': u'brand', + 'oldfieldtype': u'Link', + 'options': u'Brand', + 'permlevel': 1, + 'print_hide': 1 + }, + + # DocField + { + 'doctype': u'DocField', + 'fieldname': u'item_group', + 'fieldtype': u'Link', + 'hidden': 1, + 'in_filter': 1, + 'label': u'Item Group', + 'oldfieldname': u'item_group', + 'oldfieldtype': u'Link', + 'options': u'Item Group', + 'permlevel': 1, + 'print_hide': 1, + 'search_index': 0 + }, + + # DocField + { + 'colour': u'White:FFF', + 'doctype': u'DocField', + 'fieldname': u'stock_qty', + 'fieldtype': u'Currency', + 'hidden': 0, + 'label': u'Stock Qty', + 'no_copy': 1, + 'oldfieldname': u'stock_qty', + 'oldfieldtype': u'Currency', + 'permlevel': 1, + 'print_hide': 1, + 'trigger': u'Client', + 'width': u'100px' + }, + + # DocField + { + 'doctype': u'DocField', + 'fieldname': u'received_qty', + 'fieldtype': u'Currency', + 'hidden': 0, + 'label': u'Received Qty', + 'no_copy': 1, + 'oldfieldname': u'received_qty', + 'oldfieldtype': u'Currency', + 'permlevel': 1, + 'print_hide': 1 + }, + + # DocField + { + 'default': u'0.00', + 'doctype': u'DocField', + 'fieldname': u'billed_qty', + 'fieldtype': u'Currency', + 'hidden': 0, + 'label': u'Billed Quantity', + 'no_copy': 1, + 'oldfieldname': u'billed_qty', + 'oldfieldtype': u'Currency', + 'permlevel': 1, + 'print_hide': 1 + }, + + # DocField + { + 'colour': u'White:FFF', + 'description': u'Tax detail table fetched from item master as a string and stored in this field.\nUsed for Purchase Other Charges', + 'doctype': u'DocField', + 'fieldname': u'item_tax_rate', + 'fieldtype': u'Small Text', + 'hidden': 1, + 'label': u'Item Tax Rate', + 'oldfieldname': u'item_tax_rate', + 'oldfieldtype': u'Small Text', 'permlevel': 1, 'print_hide': 1, 'report_hide': 1 @@ -439,14 +439,14 @@ # DocField { 'allow_on_submit': 1, - 'doctype': 'DocField', - 'fieldname': 'page_break', - 'fieldtype': 'Check', + 'doctype': u'DocField', + 'fieldname': u'page_break', + 'fieldtype': u'Check', 'hidden': 0, - 'label': 'Page Break', + 'label': u'Page Break', 'no_copy': 1, - 'oldfieldname': 'page_break', - 'oldfieldtype': 'Check', + 'oldfieldname': u'page_break', + 'oldfieldtype': u'Check', 'permlevel': 0, 'print_hide': 1 } diff --git a/erpnext/buying/doctype/purchase_common/purchase_common.js b/erpnext/buying/doctype/purchase_common/purchase_common.js index 323d9565810..b55cd8f757b 100644 --- a/erpnext/buying/doctype/purchase_common/purchase_common.js +++ b/erpnext/buying/doctype/purchase_common/purchase_common.js @@ -50,6 +50,89 @@ cur_frm.cscript.update_item_details = function(doc, dt, dn, callback) { } + + +var set_dynamic_label_par = function(doc, cdt, cdn, base_curr) { + //parent flds + par_cols_base = {'net_total': 'Net Total', 'total_tax': 'Total Tax', 'grand_total': 'Grand Total', /*'rounded_total': 'Rounded Total',*/ + 'in_words': 'In Words', 'other_charges_added': 'Other Charges Added', 'other_charges_deducted': 'Other Charges Deducted'} + par_cols_import = {'net_total_import': 'Net Total', 'grand_total_import': 'Grand Total', 'in_words_import': 'In Words', + 'other_charges_added_import': 'Other Charges Added', 'other_charges_deducted_import': 'Other Charges Deducted'}; + + for (d in par_cols_base) cur_frm.fields_dict[d].label_area.innerHTML = par_cols_base[d]+' (' + base_curr + ')'; + for (d in par_cols_import) cur_frm.fields_dict[d].label_area.innerHTML = par_cols_import[d]+' (' + doc.currency + ')'; + cur_frm.fields_dict['conversion_rate'].label_area.innerHTML = "Conversion Rate (" + doc.currency +' -> '+ base_curr + ')'; + + if (doc.doctype == 'Payable Voucher') { + cur_frm.fields_dict['total_tds_on_voucher'].label_area.innerHTML = 'Total TDS On Voucher (' + base_curr + ')'; + cur_frm.fields_dict['outstanding_amount'].label_area.innerHTML = 'Outstanding Amount (' + base_curr + ')'; + cur_frm.fields_dict['tds_amount_on_advance'].label_area.innerHTML = 'TDS Amount On Advance (' + base_curr + ')'; + cur_frm.fields_dict['total_advance'].label_area.innerHTML = 'Total Advance (Incl. TDS) (' + base_curr + ')'; + cur_frm.fields_dict['total_amount_to_pay'].label_area.innerHTML = 'Total Amount To Pay (' + base_curr + ')'; + cur_frm.fields_dict['ded_amount'].label_area.innerHTML = 'TDS Amount (' + base_curr + ')'; + } else cur_frm.fields_dict['rounded_total'].label_area.innerHTML = 'Rounded Total (' + base_curr + ')'; + +} + + +var set_dynamic_label_child = function(doc, cdt, cdn, base_curr) { + // item table flds + item_cols_base = {'purchase_ref_rate': 'Ref Rate', 'amount': 'Amount'}; + item_cols_import = {'import_rate': 'Rate', 'import_ref_rate': 'Ref Rate', 'import_amount': 'Amount'}; + + for (d in item_cols_base) $('[data-grid-fieldname="'+cur_frm.cscript.tname+'-'+d+'"]').html(item_cols_base[d]+' ('+base_curr+')'); + for (d in item_cols_import) $('[data-grid-fieldname="'+cur_frm.cscript.tname+'-'+d+'"]').html(item_cols_import[d]+' ('+doc.currency+')'); + + var hide = (doc.currency == sys_defaults['currency']) ? false : true; + for (f in item_cols_base) cur_frm.fields_dict[cur_frm.cscript.fname].grid.set_column_disp(f, hide); + + if (doc.doctype == 'Payable Voucher') { + $('[data-grid-fieldname="'+cur_frm.cscript.tname+'-rate"]').html('Rate ('+base_curr+')'); + cur_frm.fields_dict[cur_frm.cscript.fname].grid.set_column_disp('rate', hide); + // advance table flds + adv_cols = {'advance_amount': 'Advance Amount', 'allocated_amount': 'Allocated Amount', 'tds_amount': 'TDS Amount', 'tds_allocated': 'TDS Allocated'} + for (d in adv_cols) $('[data-grid-fieldname="Advance Allocation Detail-'+d+'"]').html(adv_cols[d]+' ('+base_curr+')'); + } + else { + $('[data-grid-fieldname="'+cur_frm.cscript.tname+'-purchase_rate"]').html('Rate ('+base_curr+')'); + cur_frm.fields_dict[cur_frm.cscript.fname].grid.set_column_disp('purchase_rate', hide); + } + + //tax table flds + tax_cols = {'tax_amount': 'Amount', 'total': 'Aggregate Total'}; + for (d in tax_cols) $('[data-grid-fieldname="Purchase Tax Detail-'+d+'"]').html(tax_cols[d]+' ('+base_curr+')'); + + +} + +// Change label dynamically based on currency +//------------------------------------------------------------------ + +cur_frm.cscript.dynamic_label = function(doc, cdt, cdn) { + var callback = function(r, rt) { + if (r.message) base_curr = r.message; + else base_curr = sys_defaults['currency']; + + if (base_curr == doc.currency) { + set_multiple(cdt, cdn, {conversion_rate:1}); + hide_field(['conversion_rate', 'net_total_import','grand_total_import', 'in_words_import', 'other_charges_added_import', 'other_charges_deducted_import']); + } else unhide_field(['conversion_rate', 'net_total_import','grand_total_import', 'in_words_import', 'other_charges_added_import', 'other_charges_deducted_import']); + + set_dynamic_label_par(doc, cdt, cdn, base_curr); + set_dynamic_label_child(doc, cdt, cdn, base_curr); + } + + if (doc.company == sys_defaults['company']) callback('', ''); + else $c_obj(make_doclist(doc.doctype, doc.name), 'get_comp_base_currency', '', callback); +} + +cur_frm.cscript.currency = function(doc, cdt, cdn) { + cur_frm.cscript.dynamic_label(doc, cdt, cdn); +} + +cur_frm.cscript.company = cur_frm.cscript.currency; + + // ======================== Conversion Rate ========================================== cur_frm.cscript.conversion_rate = function(doc,cdt,cdn) { cur_frm.cscript.calc_amount( doc, 1); diff --git a/erpnext/buying/doctype/purchase_common/purchase_common.py b/erpnext/buying/doctype/purchase_common/purchase_common.py index 4a493734251..0f272ce2afb 100644 --- a/erpnext/buying/doctype/purchase_common/purchase_common.py +++ b/erpnext/buying/doctype/purchase_common/purchase_common.py @@ -180,6 +180,13 @@ class DocType(TransactionBase): if not rate[0]['last_purchase_rate']: msgprint("%s has no Last Purchase Rate."% d.item_code) + + def get_comp_base_currency(self, comp): + """ get default currency of company""" + return webnotes.conn.sql("select default_currency from `tabCompany` where name = %s", comp)[0][0] + + + # validation # ------------------------------------------------------------------------------------------------------- diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.js b/erpnext/buying/doctype/purchase_order/purchase_order.js index 8435c0260e1..1721a7a24ec 100644 --- a/erpnext/buying/doctype/purchase_order/purchase_order.js +++ b/erpnext/buying/doctype/purchase_order/purchase_order.js @@ -32,10 +32,12 @@ cur_frm.cscript.onload_post_render = function(doc, cdt, cdn) { // ================================== Refresh ========================================== cur_frm.cscript.refresh = function(doc, cdt, cdn) { - // Show buttons // --------------------------------- cur_frm.clear_custom_buttons(); + + cur_frm.cscript.dynamic_label(doc, cdt, cdn); + if(doc.docstatus == 1 && doc.status != 'Stopped'){ var ch = getchildren('PO Detail',doc.name,'po_details'); var allow_billing = 0; var allow_receipt = 0; diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.py b/erpnext/buying/doctype/purchase_order/purchase_order.py index d4c308d8d40..0429d1ba6ac 100644 --- a/erpnext/buying/doctype/purchase_order/purchase_order.py +++ b/erpnext/buying/doctype/purchase_order/purchase_order.py @@ -83,6 +83,12 @@ class DocType(TransactionBase): def get_tc_details(self): return get_obj('Purchase Common').get_tc_details(self) + + def get_comp_base_currency(self): + return get_obj('Purchase Common').get_comp_base_currency(self.doc.company) + + + # validate if indent has been pulled twice def validate_prev_docname(self): for d in getlist(self.doclist, 'po_details'): diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.txt b/erpnext/buying/doctype/purchase_order/purchase_order.txt index c367a3b6801..c73683ea9b5 100644 --- a/erpnext/buying/doctype/purchase_order/purchase_order.txt +++ b/erpnext/buying/doctype/purchase_order/purchase_order.txt @@ -5,62 +5,62 @@ { 'creation': '2010-08-08 17:09:15', 'docstatus': 0, - 'modified': '2012-01-10 16:19:19', - 'modified_by': 'Administrator', - 'owner': 'Administrator' + 'modified': '2012-02-27 17:51:53', + 'modified_by': u'Administrator', + 'owner': u'Administrator' }, # These values are common for all DocField { - 'doctype': 'DocField', + 'doctype': u'DocField', 'name': '__common__', - 'parent': 'Purchase Order', - 'parentfield': 'fields', - 'parenttype': 'DocType' + 'parent': u'Purchase Order', + 'parentfield': u'fields', + 'parenttype': u'DocType' }, # These values are common for all DocType { - '_last_update': '1306471022', - 'colour': 'White:FFF', - 'default_print_format': 'Standard', + '_last_update': u'1330339817', + 'colour': u'White:FFF', + 'default_print_format': u'Standard', 'doctype': 'DocType', - 'document_type': 'Transaction', + 'document_type': u'Transaction', 'is_transaction_doc': 1, - 'module': 'Buying', + 'module': u'Buying', 'name': '__common__', 'read_only_onload': 1, - 'search_fields': 'status, transaction_date, supplier,grand_total', - 'section_style': 'Tabbed', - 'server_code_error': ' ', + 'search_fields': u'status, transaction_date, supplier,grand_total', + 'section_style': u'Tabbed', + 'server_code_error': u' ', 'show_in_menu': 0, - 'subject': 'To %(supplier_name)s on %(transaction_date)s | %(per_received)s% delivered', - 'version': 495 + 'subject': u'To %(supplier_name)s on %(transaction_date)s | %(per_received)s% delivered', + 'version': 500 }, # These values are common for all DocFormat { - 'doctype': 'DocFormat', + 'doctype': u'DocFormat', 'name': '__common__', - 'parent': 'Purchase Order', - 'parentfield': 'formats', - 'parenttype': 'DocType' + 'parent': u'Purchase Order', + 'parentfield': u'formats', + 'parenttype': u'DocType' }, # These values are common for all DocPerm { - 'doctype': 'DocPerm', + 'doctype': u'DocPerm', 'name': '__common__', - 'parent': 'Purchase Order', - 'parentfield': 'permissions', - 'parenttype': 'DocType', + 'parent': u'Purchase Order', + 'parentfield': u'permissions', + 'parenttype': u'DocType', 'read': 1 }, # DocType, Purchase Order { 'doctype': 'DocType', - 'name': 'Purchase Order' + 'name': u'Purchase Order' }, # DocPerm @@ -68,9 +68,9 @@ 'amend': 1, 'cancel': 1, 'create': 1, - 'doctype': 'DocPerm', + 'doctype': u'DocPerm', 'permlevel': 0, - 'role': 'Production Manager', + 'role': u'Production Manager', 'submit': 0, 'write': 1 }, @@ -80,9 +80,9 @@ 'amend': 0, 'cancel': 0, 'create': 0, - 'doctype': 'DocPerm', + 'doctype': u'DocPerm', 'permlevel': 1, - 'role': 'Material User', + 'role': u'Material User', 'submit': 0, 'write': 0 }, @@ -92,9 +92,9 @@ 'amend': 0, 'cancel': 0, 'create': 0, - 'doctype': 'DocPerm', + 'doctype': u'DocPerm', 'permlevel': 0, - 'role': 'Material User', + 'role': u'Material User', 'submit': 0, 'write': 0 }, @@ -104,9 +104,9 @@ 'amend': 0, 'cancel': 0, 'create': 0, - 'doctype': 'DocPerm', + 'doctype': u'DocPerm', 'permlevel': 1, - 'role': 'Purchase Manager', + 'role': u'Purchase Manager', 'submit': 0, 'write': 0 }, @@ -116,9 +116,9 @@ 'amend': 1, 'cancel': 1, 'create': 1, - 'doctype': 'DocPerm', + 'doctype': u'DocPerm', 'permlevel': 0, - 'role': 'Purchase Manager', + 'role': u'Purchase Manager', 'submit': 1, 'write': 1 }, @@ -128,9 +128,9 @@ 'amend': 1, 'cancel': 0, 'create': 1, - 'doctype': 'DocPerm', + 'doctype': u'DocPerm', 'permlevel': 0, - 'role': 'Purchase User', + 'role': u'Purchase User', 'submit': 0, 'write': 1 }, @@ -140,9 +140,9 @@ 'amend': 0, 'cancel': 0, 'create': 0, - 'doctype': 'DocPerm', + 'doctype': u'DocPerm', 'permlevel': 1, - 'role': 'All', + 'role': u'All', 'submit': 0, 'write': 0 }, @@ -152,9 +152,9 @@ 'amend': 0, 'cancel': 0, 'create': 0, - 'doctype': 'DocPerm', + 'doctype': u'DocPerm', 'permlevel': 0, - 'role': 'Supplier', + 'role': u'Supplier', 'submit': 0, 'write': 0 }, @@ -164,64 +164,64 @@ 'amend': 0, 'cancel': 0, 'create': 0, - 'doctype': 'DocPerm', + 'doctype': u'DocPerm', 'permlevel': 2, - 'role': 'All', + 'role': u'All', 'submit': 0, 'write': 1 }, # DocFormat { - 'doctype': 'DocFormat', - 'format': 'Purchase Order Classic' + 'doctype': u'DocFormat', + 'format': u'Purchase Order Classic' }, # DocFormat { - 'doctype': 'DocFormat', - 'format': 'Purchase Order Modern' + 'doctype': u'DocFormat', + 'format': u'Purchase Order Modern' }, # DocFormat { - 'doctype': 'DocFormat', - 'format': 'Purchase Order Spartan' + 'doctype': u'DocFormat', + 'format': u'Purchase Order Spartan' }, # DocField { - 'colour': 'White:FFF', - 'description': 'Enter rates and quantity of items you want to purchase and send the purchase order to your supplier.', - 'doctype': 'DocField', - 'fieldtype': 'Section Break', - 'label': 'Basic Info', - 'oldfieldtype': 'Section Break', + 'colour': u'White:FFF', + 'description': u'Enter rates and quantity of items you want to purchase and send the purchase order to your supplier.', + 'doctype': u'DocField', + 'fieldtype': u'Section Break', + 'label': u'Basic Info', + 'oldfieldtype': u'Section Break', 'permlevel': 0, 'print_hide': 0 }, # DocField { - 'doctype': 'DocField', - 'fieldtype': 'Column Break', - 'oldfieldtype': 'Column Break', + 'doctype': u'DocField', + 'fieldtype': u'Column Break', + 'oldfieldtype': u'Column Break', 'permlevel': 0, - 'width': '50%' + 'width': u'50%' }, # DocField { - 'colour': 'White:FFF', - 'description': 'To manage multiple series please go to Setup > Manage Series', - 'doctype': 'DocField', - 'fieldname': 'naming_series', - 'fieldtype': 'Select', - 'label': 'Series', + 'colour': u'White:FFF', + 'description': u'To manage multiple series please go to Setup > Manage Series', + 'doctype': u'DocField', + 'fieldname': u'naming_series', + 'fieldtype': u'Select', + 'label': u'Series', 'no_copy': 1, - 'oldfieldname': 'naming_series', - 'oldfieldtype': 'Select', - 'options': '\nPO', + 'oldfieldname': u'naming_series', + 'oldfieldtype': u'Select', + 'options': u'\nPO', 'permlevel': 0, 'print_hide': 1, 'reqd': 1 @@ -229,132 +229,132 @@ # DocField { - 'colour': 'White:FFF', - 'description': 'Supplier (vendor) name as entered in supplier master', - 'doctype': 'DocField', - 'fieldname': 'supplier', - 'fieldtype': 'Link', + 'colour': u'White:FFF', + 'description': u'Supplier (vendor) name as entered in supplier master', + 'doctype': u'DocField', + 'fieldname': u'supplier', + 'fieldtype': u'Link', 'in_filter': 1, - 'label': 'Supplier', - 'oldfieldname': 'supplier', - 'oldfieldtype': 'Link', - 'options': 'Supplier', + 'label': u'Supplier', + 'oldfieldname': u'supplier', + 'oldfieldtype': u'Link', + 'options': u'Supplier', 'permlevel': 0, 'print_hide': 1, 'reqd': 1, 'search_index': 1, - 'trigger': 'Client' + 'trigger': u'Client' }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'supplier_address', - 'fieldtype': 'Link', + 'doctype': u'DocField', + 'fieldname': u'supplier_address', + 'fieldtype': u'Link', 'in_filter': 1, - 'label': 'Supplier Address', - 'options': 'Address', + 'label': u'Supplier Address', + 'options': u'Address', 'permlevel': 0, 'print_hide': 1 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'contact_person', - 'fieldtype': 'Link', + 'doctype': u'DocField', + 'fieldname': u'contact_person', + 'fieldtype': u'Link', 'in_filter': 1, - 'label': 'Contact Person', - 'options': 'Contact', + 'label': u'Contact Person', + 'options': u'Contact', 'permlevel': 0, 'print_hide': 1 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'supplier_name', - 'fieldtype': 'Data', - 'label': 'Name', + 'doctype': u'DocField', + 'fieldname': u'supplier_name', + 'fieldtype': u'Data', + 'label': u'Name', 'permlevel': 1 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'address_display', - 'fieldtype': 'Small Text', - 'label': 'Address', + 'doctype': u'DocField', + 'fieldname': u'address_display', + 'fieldtype': u'Small Text', + 'label': u'Address', 'permlevel': 1 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'contact_display', - 'fieldtype': 'Small Text', - 'label': 'Contact', + 'doctype': u'DocField', + 'fieldname': u'contact_display', + 'fieldtype': u'Small Text', + 'label': u'Contact', 'permlevel': 1 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'contact_mobile', - 'fieldtype': 'Text', - 'label': 'Mobile No', + 'doctype': u'DocField', + 'fieldname': u'contact_mobile', + 'fieldtype': u'Text', + 'label': u'Mobile No', 'permlevel': 1 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'contact_email', - 'fieldtype': 'Text', - 'label': 'Contact Email', + 'doctype': u'DocField', + 'fieldname': u'contact_email', + 'fieldtype': u'Text', + 'label': u'Contact Email', 'permlevel': 1, 'print_hide': 1 }, # DocField { - 'doctype': 'DocField', - 'fieldtype': 'Column Break', - 'oldfieldtype': 'Column Break', + 'doctype': u'DocField', + 'fieldtype': u'Column Break', + 'oldfieldtype': u'Column Break', 'permlevel': 0, 'print_hide': 0, - 'width': '50%' + 'width': u'50%' }, # DocField { - 'colour': 'White:FFF', - 'description': 'The date at which current entry is made in system.', - 'doctype': 'DocField', - 'fieldname': 'transaction_date', - 'fieldtype': 'Date', + 'colour': u'White:FFF', + 'description': u'The date at which current entry is made in system.', + 'doctype': u'DocField', + 'fieldname': u'transaction_date', + 'fieldtype': u'Date', 'in_filter': 1, - 'label': 'Purchase Order Date', - 'oldfieldname': 'transaction_date', - 'oldfieldtype': 'Date', + 'label': u'Purchase Order Date', + 'oldfieldname': u'transaction_date', + 'oldfieldtype': u'Date', 'permlevel': 0, 'reqd': 1, 'search_index': 1, - 'trigger': 'Client' + 'trigger': u'Client' }, # DocField { - 'colour': 'White:FFF', - 'doctype': 'DocField', - 'fieldname': 'status', - 'fieldtype': 'Select', + 'colour': u'White:FFF', + 'doctype': u'DocField', + 'fieldname': u'status', + 'fieldtype': u'Select', 'in_filter': 1, - 'label': 'Status', + 'label': u'Status', 'no_copy': 1, - 'oldfieldname': 'status', - 'oldfieldtype': 'Select', - 'options': '\nDraft\nSubmitted\nStopped\nCancelled', + 'oldfieldname': u'status', + 'oldfieldtype': u'Select', + 'options': u'\nDraft\nSubmitted\nStopped\nCancelled', 'permlevel': 1, 'print_hide': 1, 'reqd': 1, @@ -363,122 +363,95 @@ # DocField { - 'colour': 'White:FFF', - 'description': 'Track this Purchase Order against any Project', - 'doctype': 'DocField', - 'fieldname': 'project_name', - 'fieldtype': 'Link', + 'colour': u'White:FFF', + 'description': u'Track this Purchase Order against any Project', + 'doctype': u'DocField', + 'fieldname': u'project_name', + 'fieldtype': u'Link', 'in_filter': 1, - 'label': 'Project Name', - 'oldfieldname': 'project_name', - 'oldfieldtype': 'Link', - 'options': 'Project', + 'label': u'Project Name', + 'oldfieldname': u'project_name', + 'oldfieldtype': u'Link', + 'options': u'Project', 'permlevel': 0, 'search_index': 1, - 'trigger': 'Client' + 'trigger': u'Client' }, # DocField { - 'colour': 'White:FFF', - 'depends_on': 'eval:!doc.__islocal', - 'description': '% of materials received against this Purchase Order', - 'doctype': 'DocField', - 'fieldname': 'per_received', - 'fieldtype': 'Currency', - 'label': '% Received', + 'colour': u'White:FFF', + 'depends_on': u'eval:!doc.__islocal', + 'description': u'% of materials received against this Purchase Order', + 'doctype': u'DocField', + 'fieldname': u'per_received', + 'fieldtype': u'Currency', + 'label': u'% Received', 'no_copy': 1, - 'oldfieldname': 'per_received', - 'oldfieldtype': 'Currency', + 'oldfieldname': u'per_received', + 'oldfieldtype': u'Currency', 'permlevel': 1, 'print_hide': 1 }, # DocField { - 'colour': 'White:FFF', - 'depends_on': 'eval:!doc.__islocal', - 'description': '% of materials billed against this Purchase Order.', - 'doctype': 'DocField', - 'fieldname': 'per_billed', - 'fieldtype': 'Currency', - 'label': '% Billed', + 'colour': u'White:FFF', + 'depends_on': u'eval:!doc.__islocal', + 'description': u'% of materials billed against this Purchase Order.', + 'doctype': u'DocField', + 'fieldname': u'per_billed', + 'fieldtype': u'Currency', + 'label': u'% Billed', 'no_copy': 1, - 'oldfieldname': 'per_billed', - 'oldfieldtype': 'Currency', + 'oldfieldname': u'per_billed', + 'oldfieldtype': u'Currency', 'permlevel': 1, 'print_hide': 1 }, # DocField { - 'colour': 'White:FFF', - 'doctype': 'DocField', - 'fieldtype': 'Section Break', - 'label': 'Items', - 'oldfieldtype': 'Section Break', - 'permlevel': 0 - }, - - # DocField - { - 'colour': 'White:FFF', - 'description': 'You can make a purchase order from multiple Purchase Requisitions. Select Purchase Requisitions one by one and click on the button below.', - 'doctype': 'DocField', - 'fieldname': 'indent_no', - 'fieldtype': 'Link', - 'hidden': 0, - 'label': 'Select Purchase Requisition', - 'no_copy': 1, - 'oldfieldname': 'indent_no', - 'oldfieldtype': 'Link', - 'options': 'Indent', + 'default': u'No', + 'doctype': u'DocField', + 'fieldname': u'is_subcontracted', + 'fieldtype': u'Select', + 'label': u'Is Subcontracted', + 'options': u'\nYes\nNo', 'permlevel': 0, 'print_hide': 1 }, # DocField { - 'doctype': 'DocField', - 'fieldtype': 'Button', - 'hidden': 0, - 'label': 'Get Items', - 'oldfieldtype': 'Button', - 'options': 'get_indent_details', + 'colour': u'White:FFF', + 'doctype': u'DocField', + 'fieldtype': u'Section Break', + 'label': u'Items', + 'oldfieldtype': u'Section Break', 'permlevel': 0 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'is_subcontracted', - 'fieldtype': 'Select', - 'label': 'Is Subcontracted', - 'options': '\nYes\nNo', + 'doctype': u'DocField', + 'fieldtype': u'Column Break', 'permlevel': 0, - 'print_hide': 1 + 'width': u'50%' }, # DocField { - 'doctype': 'DocField', - 'fieldtype': 'Column Break', - 'permlevel': 0, - 'width': '50%' - }, - - # DocField - { - 'colour': 'White:FFF', - 'description': "Supplier's currency", - 'doctype': 'DocField', - 'fieldname': 'currency', - 'fieldtype': 'Select', - 'label': 'Currency', + 'colour': u'White:FFF', + 'description': u"Supplier's currency", + 'doctype': u'DocField', + 'fieldname': u'currency', + 'fieldtype': u'Select', + 'label': u'Currency', 'no_copy': 0, - 'oldfieldname': 'currency', - 'oldfieldtype': 'Select', - 'options': 'link:Currency', + 'oldfieldname': u'currency', + 'oldfieldtype': u'Select', + 'options': u'link:Currency', 'permlevel': 0, 'print_hide': 1, 'reqd': 1 @@ -486,65 +459,101 @@ # DocField { - 'colour': 'White:FFF', - 'default': '1', - 'description': "Rate at which supplier's currency is converted to your currency", - 'doctype': 'DocField', - 'fieldname': 'conversion_rate', - 'fieldtype': 'Currency', + 'colour': u'White:FFF', + 'default': u'1', + 'description': u"Rate at which supplier's currency is converted to company's base currency", + 'doctype': u'DocField', + 'fieldname': u'conversion_rate', + 'fieldtype': u'Currency', 'hidden': 0, - 'label': 'Conversion Rate', + 'label': u'Conversion Rate', 'no_copy': 1, - 'oldfieldname': 'conversion_rate', - 'oldfieldtype': 'Currency', + 'oldfieldname': u'conversion_rate', + 'oldfieldtype': u'Currency', 'permlevel': 0, 'print_hide': 1, 'reqd': 1, - 'trigger': 'Client' + 'trigger': u'Client' }, # DocField { - 'doctype': 'DocField', - 'fieldtype': 'Section Break', + 'doctype': u'DocField', + 'fieldtype': u'Column Break', + 'permlevel': 0, + 'width': u'50%' + }, + + # DocField + { + 'colour': u'White:FFF', + 'description': u'You can make a purchase order from multiple Purchase Requisitions. Select Purchase Requisitions one by one and click on the button below.', + 'doctype': u'DocField', + 'fieldname': u'indent_no', + 'fieldtype': u'Link', + 'hidden': 0, + 'label': u'Select Purchase Requisition', + 'no_copy': 1, + 'oldfieldname': u'indent_no', + 'oldfieldtype': u'Link', + 'options': u'Indent', + 'permlevel': 0, + 'print_hide': 1 + }, + + # DocField + { + 'doctype': u'DocField', + 'fieldtype': u'Button', + 'hidden': 0, + 'label': u'Get Items', + 'oldfieldtype': u'Button', + 'options': u'get_indent_details', + 'permlevel': 0 + }, + + # DocField + { + 'doctype': u'DocField', + 'fieldtype': u'Section Break', 'permlevel': 0 }, # DocField { 'allow_on_submit': 1, - 'doctype': 'DocField', - 'fieldname': 'po_details', - 'fieldtype': 'Table', - 'label': 'PO Details', + 'doctype': u'DocField', + 'fieldname': u'po_details', + 'fieldtype': u'Table', + 'label': u'PO Details', 'no_copy': 0, - 'oldfieldname': 'po_details', - 'oldfieldtype': 'Table', - 'options': 'PO Detail', + 'oldfieldname': u'po_details', + 'oldfieldtype': u'Table', + 'options': u'PO Detail', 'permlevel': 0 }, # DocField { - 'colour': 'White:FFF', - 'doctype': 'DocField', - 'fieldtype': 'Button', - 'label': 'Get Last Purchase Rate', - 'oldfieldtype': 'Button', + 'colour': u'White:FFF', + 'doctype': u'DocField', + 'fieldtype': u'Button', + 'label': u'Get Last Purchase Rate', + 'oldfieldtype': u'Button', 'permlevel': 0, 'print_hide': 0, - 'trigger': 'Client' + 'trigger': u'Client' }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'net_total', - 'fieldtype': 'Currency', - 'label': 'Net Total*', + 'doctype': u'DocField', + 'fieldname': u'net_total', + 'fieldtype': u'Currency', + 'label': u'Net Total*', 'no_copy': 1, - 'oldfieldname': 'net_total', - 'oldfieldtype': 'Currency', + 'oldfieldname': u'net_total', + 'oldfieldtype': u'Currency', 'permlevel': 1, 'print_hide': 1, 'reqd': 0 @@ -552,227 +561,227 @@ # DocField { - 'doctype': 'DocField', - 'fieldtype': 'Button', - 'label': 'Re-Calculate Values', - 'oldfieldtype': 'Button', + 'doctype': u'DocField', + 'fieldtype': u'Button', + 'label': u'Re-Calculate Values', + 'oldfieldtype': u'Button', 'permlevel': 0, - 'trigger': 'Client' + 'trigger': u'Client' }, # DocField { - 'colour': 'White:FFF', - 'doctype': 'DocField', - 'fieldtype': 'HTML', - 'label': 'Note HTML', - 'options': '
Note : * In Base Currency\n
', + 'colour': u'White:FFF', + 'doctype': u'DocField', + 'fieldtype': u'HTML', + 'label': u'Note HTML', + 'options': u'
Note : * In Base Currency\n
', 'permlevel': 1, 'print_hide': 1 }, # DocField { - 'colour': 'White:FFF', - 'doctype': 'DocField', - 'fieldtype': 'Section Break', - 'label': 'Taxes', - 'oldfieldtype': 'Section Break', + 'colour': u'White:FFF', + 'doctype': u'DocField', + 'fieldtype': u'Section Break', + 'label': u'Taxes', + 'oldfieldtype': u'Section Break', 'permlevel': 0 }, # DocField { - 'colour': 'White:FFF', - 'description': 'If you have created a standard template in Other Charges master, select one and click on the button below.', - 'doctype': 'DocField', - 'fieldname': 'purchase_other_charges', - 'fieldtype': 'Link', - 'label': 'Purchase Other Charges', + 'colour': u'White:FFF', + 'description': u'If you have created a standard template in Other Charges master, select one and click on the button below.', + 'doctype': u'DocField', + 'fieldname': u'purchase_other_charges', + 'fieldtype': u'Link', + 'label': u'Purchase Other Charges', 'no_copy': 1, - 'oldfieldname': 'purchase_other_charges', - 'oldfieldtype': 'Link', - 'options': 'Purchase Other Charges', + 'oldfieldname': u'purchase_other_charges', + 'oldfieldtype': u'Link', + 'options': u'Purchase Other Charges', 'permlevel': 0, 'print_hide': 1 }, # DocField { - 'doctype': 'DocField', - 'fieldtype': 'Button', - 'label': 'Get Tax Detail', - 'oldfieldtype': 'Button', - 'options': 'get_purchase_tax_details', + 'doctype': u'DocField', + 'fieldtype': u'Button', + 'label': u'Get Tax Detail', + 'oldfieldtype': u'Button', + 'options': u'get_purchase_tax_details', 'permlevel': 0, 'print_hide': 1 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'purchase_tax_details', - 'fieldtype': 'Table', - 'label': 'Purchase Tax Details', + 'doctype': u'DocField', + 'fieldname': u'purchase_tax_details', + 'fieldtype': u'Table', + 'label': u'Purchase Tax Details', 'no_copy': 0, - 'oldfieldname': 'purchase_tax_details', - 'oldfieldtype': 'Table', - 'options': 'Purchase Tax Detail', + 'oldfieldname': u'purchase_tax_details', + 'oldfieldtype': u'Table', + 'options': u'Purchase Tax Detail', 'permlevel': 0 }, # DocField { - 'doctype': 'DocField', - 'fieldtype': 'Button', - 'label': 'Calculate Tax', - 'oldfieldtype': 'Button', + 'doctype': u'DocField', + 'fieldtype': u'Button', + 'label': u'Calculate Tax', + 'oldfieldtype': u'Button', 'permlevel': 0, 'print_hide': 1, - 'trigger': 'Client' + 'trigger': u'Client' }, # DocField { - 'doctype': 'DocField', - 'fieldtype': 'HTML', - 'label': 'Tax Calculation', + 'doctype': u'DocField', + 'fieldtype': u'HTML', + 'label': u'Tax Calculation', 'no_copy': 1, - 'oldfieldtype': 'HTML', + 'oldfieldtype': u'HTML', 'permlevel': 0, 'print_hide': 1 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'total_tax', - 'fieldtype': 'Currency', - 'label': 'Total Tax*', + 'doctype': u'DocField', + 'fieldname': u'total_tax', + 'fieldtype': u'Currency', + 'label': u'Total Tax*', 'no_copy': 1, - 'oldfieldname': 'total_tax', - 'oldfieldtype': 'Currency', + 'oldfieldname': u'total_tax', + 'oldfieldtype': u'Currency', 'permlevel': 1, 'print_hide': 1 }, # DocField { - 'colour': 'White:FFF', - 'doctype': 'DocField', - 'fieldtype': 'HTML', - 'label': 'Note HTML', - 'options': '
Note : * In Base Currency\n
', + 'colour': u'White:FFF', + 'doctype': u'DocField', + 'fieldtype': u'HTML', + 'label': u'Note HTML', + 'options': u'
Note : * In Base Currency\n
', 'permlevel': 1, 'print_hide': 1 }, # DocField { - 'colour': 'White:FFF', - 'doctype': 'DocField', - 'fieldtype': 'Section Break', - 'label': 'Totals', - 'oldfieldtype': 'Section Break', + 'colour': u'White:FFF', + 'doctype': u'DocField', + 'fieldtype': u'Section Break', + 'label': u'Totals', + 'oldfieldtype': u'Section Break', 'permlevel': 0 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'grand_total', - 'fieldtype': 'Currency', - 'label': 'Grand Total', + 'doctype': u'DocField', + 'fieldname': u'grand_total', + 'fieldtype': u'Currency', + 'label': u'Grand Total', 'no_copy': 1, - 'oldfieldname': 'grand_total', - 'oldfieldtype': 'Currency', + 'oldfieldname': u'grand_total', + 'oldfieldtype': u'Currency', 'permlevel': 1, 'print_hide': 1 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'rounded_total', - 'fieldtype': 'Currency', - 'label': 'Rounded Total', - 'oldfieldname': 'rounded_total', - 'oldfieldtype': 'Currency', + 'doctype': u'DocField', + 'fieldname': u'rounded_total', + 'fieldtype': u'Currency', + 'label': u'Rounded Total', + 'oldfieldname': u'rounded_total', + 'oldfieldtype': u'Currency', 'permlevel': 1, 'print_hide': 1 }, # DocField { - 'colour': 'White:FFF', - 'description': 'In Words will be visible once you save the Purchase Order.', - 'doctype': 'DocField', - 'fieldname': 'in_words', - 'fieldtype': 'Data', - 'label': 'In Words', - 'oldfieldname': 'in_words', - 'oldfieldtype': 'Data', + 'colour': u'White:FFF', + 'description': u'In Words will be visible once you save the Purchase Order.', + 'doctype': u'DocField', + 'fieldname': u'in_words', + 'fieldtype': u'Data', + 'label': u'In Words', + 'oldfieldname': u'in_words', + 'oldfieldtype': u'Data', 'permlevel': 1, 'print_hide': 1 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'other_charges_added', - 'fieldtype': 'Currency', - 'label': 'Other Charges Added', + 'doctype': u'DocField', + 'fieldname': u'other_charges_added', + 'fieldtype': u'Currency', + 'label': u'Other Charges Added', 'no_copy': 0, - 'oldfieldname': 'other_charges_added', - 'oldfieldtype': 'Currency', + 'oldfieldname': u'other_charges_added', + 'oldfieldtype': u'Currency', 'permlevel': 1, 'print_hide': 1 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'other_charges_deducted', - 'fieldtype': 'Currency', - 'label': 'Other Charges Deducted', + 'doctype': u'DocField', + 'fieldname': u'other_charges_deducted', + 'fieldtype': u'Currency', + 'label': u'Other Charges Deducted', 'no_copy': 0, - 'oldfieldname': 'other_charges_deducted', - 'oldfieldtype': 'Currency', + 'oldfieldname': u'other_charges_deducted', + 'oldfieldtype': u'Currency', 'permlevel': 1, 'print_hide': 1 }, # DocField { - 'doctype': 'DocField', - 'fieldtype': 'Column Break', - 'oldfieldtype': 'Column Break', + 'doctype': u'DocField', + 'fieldtype': u'Column Break', + 'oldfieldtype': u'Column Break', 'permlevel': 0, 'print_hide': 0 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'net_total_import', - 'fieldtype': 'Currency', - 'label': 'Net Total (Import)', + 'doctype': u'DocField', + 'fieldname': u'net_total_import', + 'fieldtype': u'Currency', + 'label': u'Net Total (Import)', 'no_copy': 0, - 'oldfieldname': 'net_total_import', - 'oldfieldtype': 'Currency', + 'oldfieldname': u'net_total_import', + 'oldfieldtype': u'Currency', 'permlevel': 1, 'print_hide': 1 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'grand_total_import', - 'fieldtype': 'Currency', - 'label': 'Grand Total (Import)', + 'doctype': u'DocField', + 'fieldname': u'grand_total_import', + 'fieldtype': u'Currency', + 'label': u'Grand Total (Import)', 'no_copy': 0, - 'oldfieldname': 'grand_total_import', - 'oldfieldtype': 'Currency', + 'oldfieldname': u'grand_total_import', + 'oldfieldtype': u'Currency', 'permlevel': 1, 'print_hide': 1, 'report_hide': 0 @@ -780,27 +789,26 @@ # DocField { - 'colour': 'White:FFF', - 'description': 'In Words(Import) will be visible once you save the Purchase Order.', - 'doctype': 'DocField', - 'fieldname': 'in_words_import', - 'fieldtype': 'Data', - 'label': 'In Words(Import)', - 'oldfieldname': 'in_words_import', - 'oldfieldtype': 'Data', + 'colour': u'White:FFF', + 'doctype': u'DocField', + 'fieldname': u'in_words_import', + 'fieldtype': u'Data', + 'label': u'In Words(Import)', + 'oldfieldname': u'in_words_import', + 'oldfieldtype': u'Data', 'permlevel': 1, 'print_hide': 1 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'other_charges_added_import', - 'fieldtype': 'Currency', - 'label': 'Other Charges Added (Import)', + 'doctype': u'DocField', + 'fieldname': u'other_charges_added_import', + 'fieldtype': u'Currency', + 'label': u'Other Charges Added (Import)', 'no_copy': 0, - 'oldfieldname': 'other_charges_added_import', - 'oldfieldtype': 'Currency', + 'oldfieldname': u'other_charges_added_import', + 'oldfieldtype': u'Currency', 'permlevel': 1, 'print_hide': 1, 'report_hide': 0 @@ -808,13 +816,13 @@ # DocField { - 'doctype': 'DocField', - 'fieldname': 'other_charges_deducted_import', - 'fieldtype': 'Currency', - 'label': 'Other Charges Deducted (Import)', + 'doctype': u'DocField', + 'fieldname': u'other_charges_deducted_import', + 'fieldtype': u'Currency', + 'label': u'Other Charges Deducted (Import)', 'no_copy': 0, - 'oldfieldname': 'other_charges_deducted_import', - 'oldfieldtype': 'Currency', + 'oldfieldname': u'other_charges_deducted_import', + 'oldfieldtype': u'Currency', 'permlevel': 1, 'print_hide': 1, 'report_hide': 0 @@ -822,105 +830,105 @@ # DocField { - 'doctype': 'DocField', - 'fieldtype': 'Section Break', - 'label': 'Terms', - 'oldfieldtype': 'Section Break', + 'doctype': u'DocField', + 'fieldtype': u'Section Break', + 'label': u'Terms', + 'oldfieldtype': u'Section Break', 'permlevel': 0 }, # DocField { 'allow_on_submit': 1, - 'doctype': 'DocField', - 'fieldname': 'letter_head', - 'fieldtype': 'Select', - 'label': 'Letter Head', - 'oldfieldname': 'letter_head', - 'oldfieldtype': 'Select', - 'options': 'link:Letter Head', + 'doctype': u'DocField', + 'fieldname': u'letter_head', + 'fieldtype': u'Select', + 'label': u'Letter Head', + 'oldfieldname': u'letter_head', + 'oldfieldtype': u'Select', + 'options': u'link:Letter Head', 'permlevel': 0, 'print_hide': 1 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'tc_name', - 'fieldtype': 'Link', - 'label': 'Select Terms', - 'oldfieldname': 'tc_name', - 'oldfieldtype': 'Link', - 'options': 'Term', + 'doctype': u'DocField', + 'fieldname': u'tc_name', + 'fieldtype': u'Link', + 'label': u'Select Terms', + 'oldfieldname': u'tc_name', + 'oldfieldtype': u'Link', + 'options': u'Term', 'permlevel': 0, 'print_hide': 1 }, # DocField { - 'doctype': 'DocField', - 'fieldtype': 'Button', - 'label': 'Get Terms', - 'oldfieldtype': 'Button', - 'options': 'get_tc_details', + 'doctype': u'DocField', + 'fieldtype': u'Button', + 'label': u'Get Terms', + 'oldfieldtype': u'Button', + 'options': u'get_tc_details', 'permlevel': 0 }, # DocField { - 'doctype': 'DocField', - 'fieldtype': 'HTML', - 'label': 'Terms HTML', - 'oldfieldtype': 'HTML', - 'options': 'You can add Terms and Notes that will be printed in the Transaction', + 'doctype': u'DocField', + 'fieldtype': u'HTML', + 'label': u'Terms HTML', + 'oldfieldtype': u'HTML', + 'options': u'You can add Terms and Notes that will be printed in the Transaction', 'permlevel': 0, 'print_hide': 1 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'terms', - 'fieldtype': 'Text Editor', - 'label': 'Terms1', - 'oldfieldname': 'terms', - 'oldfieldtype': 'Text Editor', + 'doctype': u'DocField', + 'fieldname': u'terms', + 'fieldtype': u'Text Editor', + 'label': u'Terms1', + 'oldfieldname': u'terms', + 'oldfieldtype': u'Text Editor', 'permlevel': 0 }, # DocField { - 'doctype': 'DocField', - 'fieldtype': 'Section Break', - 'label': 'More Info', - 'oldfieldtype': 'Section Break', + 'doctype': u'DocField', + 'fieldtype': u'Section Break', + 'label': u'More Info', + 'oldfieldtype': u'Section Break', 'permlevel': 0 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'ref_sq', - 'fieldtype': 'Data', + 'doctype': u'DocField', + 'fieldname': u'ref_sq', + 'fieldtype': u'Data', 'hidden': 1, - 'label': 'Ref SQ', + 'label': u'Ref SQ', 'no_copy': 1, - 'oldfieldname': 'ref_sq', - 'oldfieldtype': 'Data', + 'oldfieldname': u'ref_sq', + 'oldfieldtype': u'Data', 'permlevel': 1, 'print_hide': 1 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'amended_from', - 'fieldtype': 'Data', + 'doctype': u'DocField', + 'fieldname': u'amended_from', + 'fieldtype': u'Data', 'hidden': 0, - 'label': 'Amended From', + 'label': u'Amended From', 'no_copy': 1, - 'oldfieldname': 'amended_from', - 'oldfieldtype': 'Data', + 'oldfieldname': u'amended_from', + 'oldfieldtype': u'Data', 'permlevel': 1, 'print_hide': 1, 'report_hide': 0 @@ -928,32 +936,32 @@ # DocField { - 'description': 'The date at which current entry is corrected in the system.', - 'doctype': 'DocField', - 'fieldname': 'amendment_date', - 'fieldtype': 'Date', + 'description': u'The date at which current entry is corrected in the system.', + 'doctype': u'DocField', + 'fieldname': u'amendment_date', + 'fieldtype': u'Date', 'hidden': 0, - 'label': 'Amendment Date', + 'label': u'Amendment Date', 'no_copy': 1, - 'oldfieldname': 'amendment_date', - 'oldfieldtype': 'Date', + 'oldfieldname': u'amendment_date', + 'oldfieldtype': u'Date', 'permlevel': 0, 'print_hide': 1 }, # DocField { - 'colour': 'White:FFF', - 'description': 'Select the relevant company name if you have multiple companies', - 'doctype': 'DocField', - 'fieldname': 'company', - 'fieldtype': 'Link', + 'colour': u'White:FFF', + 'description': u'Select the relevant company name if you have multiple companies', + 'doctype': u'DocField', + 'fieldname': u'company', + 'fieldtype': u'Link', 'in_filter': 1, - 'label': 'Company', + 'label': u'Company', 'no_copy': 0, - 'oldfieldname': 'company', - 'oldfieldtype': 'Link', - 'options': 'Company', + 'oldfieldname': u'company', + 'oldfieldtype': u'Link', + 'options': u'Company', 'permlevel': 0, 'print_hide': 1, 'reqd': 1, @@ -962,15 +970,15 @@ # DocField { - 'doctype': 'DocField', - 'fieldname': 'fiscal_year', - 'fieldtype': 'Select', + 'doctype': u'DocField', + 'fieldname': u'fiscal_year', + 'fieldtype': u'Select', 'in_filter': 1, - 'label': 'Fiscal Year', + 'label': u'Fiscal Year', 'no_copy': 0, - 'oldfieldname': 'fiscal_year', - 'oldfieldtype': 'Select', - 'options': 'link:Fiscal Year', + 'oldfieldname': u'fiscal_year', + 'oldfieldtype': u'Select', + 'options': u'link:Fiscal Year', 'permlevel': 0, 'print_hide': 1, 'reqd': 1, @@ -980,15 +988,15 @@ # DocField { 'allow_on_submit': 1, - 'colour': 'White:FFF', - 'doctype': 'DocField', - 'fieldname': 'select_print_heading', - 'fieldtype': 'Link', - 'label': 'Select Print Heading', + 'colour': u'White:FFF', + 'doctype': u'DocField', + 'fieldname': u'select_print_heading', + 'fieldtype': u'Link', + 'label': u'Select Print Heading', 'no_copy': 1, - 'oldfieldname': 'select_print_heading', - 'oldfieldtype': 'Link', - 'options': 'Print Heading', + 'oldfieldname': u'select_print_heading', + 'oldfieldtype': u'Link', + 'options': u'Print Heading', 'permlevel': 0, 'print_hide': 1, 'report_hide': 1 @@ -996,89 +1004,89 @@ # DocField { - 'doctype': 'DocField', - 'fieldname': 'instructions', - 'fieldtype': 'Text', - 'label': 'Instructions', - 'oldfieldname': 'instructions', - 'oldfieldtype': 'Text', + 'doctype': u'DocField', + 'fieldname': u'instructions', + 'fieldtype': u'Text', + 'label': u'Instructions', + 'oldfieldname': u'instructions', + 'oldfieldtype': u'Text', 'permlevel': 0 }, # DocField { - 'doctype': 'DocField', - 'fieldtype': 'Column Break', - 'oldfieldtype': 'Column Break', + 'doctype': u'DocField', + 'fieldtype': u'Column Break', + 'oldfieldtype': u'Column Break', 'permlevel': 0, - 'width': '50%' + 'width': u'50%' }, # DocField { - 'colour': 'White:FFF', - 'doctype': 'DocField', - 'fieldname': 'payment_terms', - 'fieldtype': 'Text', - 'label': 'Payment Terms', + 'colour': u'White:FFF', + 'doctype': u'DocField', + 'fieldname': u'payment_terms', + 'fieldtype': u'Text', + 'label': u'Payment Terms', 'no_copy': 1, - 'oldfieldname': 'payment_terms', - 'oldfieldtype': 'Text', + 'oldfieldname': u'payment_terms', + 'oldfieldtype': u'Text', 'permlevel': 0, 'print_hide': 0 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'remarks', - 'fieldtype': 'Text', - 'label': 'Remarks', + 'doctype': u'DocField', + 'fieldname': u'remarks', + 'fieldtype': u'Text', + 'label': u'Remarks', 'no_copy': 1, - 'oldfieldname': 'remarks', - 'oldfieldtype': 'Text', + 'oldfieldname': u'remarks', + 'oldfieldtype': u'Text', 'permlevel': 0, 'print_hide': 1 }, # DocField { - 'colour': 'White:FFF', - 'depends_on': 'eval:!doc.__islocal', - 'doctype': 'DocField', - 'fieldname': 'cancel_reason', - 'fieldtype': 'Data', + 'colour': u'White:FFF', + 'depends_on': u'eval:!doc.__islocal', + 'doctype': u'DocField', + 'fieldname': u'cancel_reason', + 'fieldtype': u'Data', 'hidden': 0, - 'label': 'Cancel Reason', + 'label': u'Cancel Reason', 'no_copy': 1, - 'oldfieldname': 'cancel_reason', - 'oldfieldtype': 'Data', + 'oldfieldname': u'cancel_reason', + 'oldfieldtype': u'Data', 'permlevel': 1, 'print_hide': 1 }, # DocField { - 'colour': 'White:FFF', - 'description': 'Required raw materials issued to the supplier for producing a sub - contracted item.', - 'doctype': 'DocField', - 'fieldtype': 'Section Break', - 'label': 'Raw Material Details', - 'oldfieldtype': 'Section Break', + 'colour': u'White:FFF', + 'description': u'Required raw materials issued to the supplier for producing a sub - contracted item.', + 'doctype': u'DocField', + 'fieldtype': u'Section Break', + 'label': u'Raw Material Details', + 'oldfieldtype': u'Section Break', 'permlevel': 0 }, # DocField { 'allow_on_submit': 1, - 'doctype': 'DocField', - 'fieldname': 'po_raw_material_details', - 'fieldtype': 'Table', - 'label': 'PO Raw Material Details', + 'doctype': u'DocField', + 'fieldname': u'po_raw_material_details', + 'fieldtype': u'Table', + 'label': u'PO Raw Material Details', 'no_copy': 0, - 'oldfieldname': 'po_raw_material_details', - 'oldfieldtype': 'Table', - 'options': 'PO Raw Material Detail', + 'oldfieldname': u'po_raw_material_details', + 'oldfieldtype': u'Table', + 'options': u'PO Raw Material Detail', 'permlevel': 1, 'print_hide': 1 }, @@ -1086,11 +1094,11 @@ # DocField { 'allow_on_submit': 1, - 'doctype': 'DocField', - 'fieldtype': 'Button', - 'label': 'Repair Purchase Order', - 'oldfieldtype': 'Button', - 'options': 'repair_purchase_order', + 'doctype': u'DocField', + 'fieldtype': u'Button', + 'label': u'Repair Purchase Order', + 'oldfieldtype': u'Button', + 'options': u'repair_purchase_order', 'permlevel': 0, 'print_hide': 1 } diff --git a/erpnext/patches/jan_mar_2012/label_cleanup.py b/erpnext/patches/jan_mar_2012/label_cleanup.py index df60bbb71aa..885c83f94bd 100644 --- a/erpnext/patches/jan_mar_2012/label_cleanup.py +++ b/erpnext/patches/jan_mar_2012/label_cleanup.py @@ -3,20 +3,33 @@ def execute(): from webnotes.model import delete_doc from webnotes.modules.module_manager import reload_doc - reload_doc('selling', 'doctype', 'sales_order') + dt = [ + 'selling': ['quotation', 'sales_order', 'quotation_detail', 'sales_order_detail'], + 'stock': ['delivery_note', 'delivery_note_detail', 'purchase_receipt', 'purchase_receipt_detail'], + 'accounts': ['receivable_voucher', 'payable_voucher', 'rv_detail', 'pv_detail', 'rv_tax_detail', 'purchase_tax_detail'], + 'buying': ['purchase_order', 'po_detail'] + ] + for m in dt: + for d in m: + reload_doc(m, 'doctype', d) + webnotes.conn.sql("""delete from `tabDocField` where label in ('Note1', 'OT Notes', 'Note', 'Note HTML', 'Rates HTML') - and parent in ('Quotation', 'Sales Order', 'Delivery Note', 'Receivable Voucher')""") + and parent in ('Quotation', 'Sales Order', 'Delivery Note', 'Receivable Voucher', 'Purchase Order')""") + del_flds = { 'Sales Order Detail': "'delivery_date', 'confirmation_date'", - 'Delivery Note': "'supplier', 'supplier_address', 'purchase_receipt_no', 'purchase_order_no'" - 'Receivable Voucher': "'voucher_date'" + 'Delivery Note': "'supplier', 'supplier_address', 'purchase_receipt_no', 'purchase_order_no', 'transaction_date'" + 'Receivable Voucher': "'voucher_date'", + 'Payable Voucher': "'voucher_date'", + 'Purchase Receipt': "'transaction_date'" } del_labels = { - 'Delivery Note': "'Supplier Details'" + 'Delivery Note': "'Supplier Details'", + 'Purchase Receipt': "'Get Currrent Stock'" } for d in del_flds: diff --git a/erpnext/selling/doctype/quotation/quotation.txt b/erpnext/selling/doctype/quotation/quotation.txt index dc5dabaa3b7..07642e8a235 100644 --- a/erpnext/selling/doctype/quotation/quotation.txt +++ b/erpnext/selling/doctype/quotation/quotation.txt @@ -5,7 +5,7 @@ { 'creation': '2010-08-08 17:09:17', 'docstatus': 0, - 'modified': '2012-02-24 13:19:09', + 'modified': '2012-02-27 17:14:54', 'modified_by': u'Administrator', 'owner': u'Administrator' }, @@ -21,7 +21,7 @@ # These values are common for all DocType { - '_last_update': u'1330069591', + '_last_update': u'1330069750', 'allow_attach': 1, 'allow_email': 0, 'allow_trash': 1, @@ -41,7 +41,7 @@ 'show_in_menu': 0, 'subject': u'To %(customer_name)s on %(transaction_date)s worth %(currency)s %(grand_total_export)s', 'tag_fields': u'status', - 'version': 616 + 'version': 617 }, # These values are common for all DocFormat @@ -283,6 +283,67 @@ 'permlevel': 1 }, + # DocField + { + 'doctype': u'DocField', + 'fieldname': u'customer_name', + 'fieldtype': u'Data', + 'label': u'Name', + 'permlevel': 1 + }, + + # DocField + { + 'colour': u'White:FFF', + 'doctype': u'DocField', + 'fieldname': u'address_display', + 'fieldtype': u'Small Text', + 'hidden': 0, + 'in_filter': 0, + 'label': u'Address', + 'oldfieldname': u'customer_address', + 'oldfieldtype': u'Small Text', + 'permlevel': 1, + 'print_hide': 0, + 'reqd': 0, + 'search_index': 0 + }, + + # DocField + { + 'colour': u'White:FFF', + 'doctype': u'DocField', + 'fieldname': u'contact_display', + 'fieldtype': u'Small Text', + 'in_filter': 0, + 'label': u'Contact', + 'permlevel': 1, + 'print_hide': 0 + }, + + # DocField + { + 'colour': u'White:FFF', + 'doctype': u'DocField', + 'fieldname': u'contact_mobile', + 'fieldtype': u'Text', + 'hidden': 0, + 'label': u'Mobile No', + 'permlevel': 1, + 'print_hide': 0 + }, + + # DocField + { + 'colour': u'White:FFF', + 'doctype': u'DocField', + 'fieldname': u'contact_email', + 'fieldtype': u'Text', + 'label': u'Contact Email', + 'permlevel': 1, + 'print_hide': 1 + }, + # DocField { 'colour': u'White:FFF', @@ -378,6 +439,42 @@ 'width': u'100px' }, + # DocField + { + 'colour': u'White:FFF', + 'description': u'Will be fetched from Customer', + 'doctype': u'DocField', + 'fieldname': u'territory', + 'fieldtype': u'Link', + 'hidden': 0, + 'in_filter': 1, + 'label': u'Territory', + 'options': u'Territory', + 'permlevel': 0, + 'print_hide': 1, + 'reqd': 1, + 'search_index': 0, + 'trigger': u'Client' + }, + + # DocField + { + 'colour': u'White:FFF', + 'doctype': u'DocField', + 'fieldname': u'customer_group', + 'fieldtype': u'Link', + 'in_filter': 1, + 'label': u'Customer Group', + 'oldfieldname': u'customer_group', + 'oldfieldtype': u'Link', + 'options': u'Customer Group', + 'permlevel': 0, + 'print_hide': 1, + 'reqd': 0, + 'search_index': 0, + 'trigger': u'Client' + }, + # DocField { 'colour': u'White:FFF', @@ -1065,129 +1162,6 @@ 'print_hide': 1 }, - # DocField - { - 'colour': u'White:FFF', - 'depends_on': u'eval:doc.customer || doc.lead', - 'doctype': u'DocField', - 'fieldtype': u'Section Break', - 'label': u'Lead/Customer Details', - 'permlevel': 0 - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldtype': u'Column Break', - 'permlevel': 0, - 'width': u'50%' - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'customer_name', - 'fieldtype': u'Data', - 'label': u'Name', - 'permlevel': 1 - }, - - # DocField - { - 'colour': u'White:FFF', - 'doctype': u'DocField', - 'fieldname': u'address_display', - 'fieldtype': u'Small Text', - 'hidden': 0, - 'in_filter': 0, - 'label': u'Address', - 'oldfieldname': u'customer_address', - 'oldfieldtype': u'Small Text', - 'permlevel': 1, - 'print_hide': 0, - 'reqd': 0, - 'search_index': 0 - }, - - # DocField - { - 'colour': u'White:FFF', - 'description': u'Will be fetched from Customer', - 'doctype': u'DocField', - 'fieldname': u'territory', - 'fieldtype': u'Link', - 'hidden': 0, - 'in_filter': 1, - 'label': u'Territory', - 'options': u'Territory', - 'permlevel': 0, - 'print_hide': 1, - 'reqd': 1, - 'search_index': 0, - 'trigger': u'Client' - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldtype': u'Column Break', - 'permlevel': 0, - 'width': u'50%' - }, - - # DocField - { - 'colour': u'White:FFF', - 'doctype': u'DocField', - 'fieldname': u'customer_group', - 'fieldtype': u'Link', - 'in_filter': 1, - 'label': u'Customer Group', - 'oldfieldname': u'customer_group', - 'oldfieldtype': u'Link', - 'options': u'Customer Group', - 'permlevel': 0, - 'print_hide': 1, - 'reqd': 0, - 'search_index': 0, - 'trigger': u'Client' - }, - - # DocField - { - 'colour': u'White:FFF', - 'doctype': u'DocField', - 'fieldname': u'contact_display', - 'fieldtype': u'Small Text', - 'in_filter': 0, - 'label': u'Contact', - 'permlevel': 1, - 'print_hide': 0 - }, - - # DocField - { - 'colour': u'White:FFF', - 'doctype': u'DocField', - 'fieldname': u'contact_mobile', - 'fieldtype': u'Text', - 'hidden': 0, - 'label': u'Mobile No', - 'permlevel': 1, - 'print_hide': 0 - }, - - # DocField - { - 'colour': u'White:FFF', - 'doctype': u'DocField', - 'fieldname': u'contact_email', - 'fieldtype': u'Text', - 'label': u'Contact Email', - 'permlevel': 1, - 'print_hide': 1 - }, - # DocField { 'colour': u'White:FFF', diff --git a/erpnext/selling/doctype/sales_common/sales_common.js b/erpnext/selling/doctype/sales_common/sales_common.js index 7747738935d..98e571240eb 100644 --- a/erpnext/selling/doctype/sales_common/sales_common.js +++ b/erpnext/selling/doctype/sales_common/sales_common.js @@ -96,19 +96,25 @@ var set_dynamic_label_par = function(doc, cdt, cdn, base_curr) { var set_dynamic_label_child = function(doc, cdt, cdn, base_curr) { - // item table flds - item_cols_base = {'basic_rate': 'Basic Rate', 'base_ref_rate': 'Price List Rate', 'amount': 'Amount'}; - item_cols_export = {'export_rate': 'Basic Rate', 'ref_rate': 'Price List Rate', 'export_amount': 'Amount'}; + // item table flds + item_cols_base = {'basic_rate': 'Basic Rate', 'base_ref_rate': 'Price List Rate', 'amount': 'Amount'}; + item_cols_export = {'export_rate': 'Basic Rate', 'ref_rate': 'Price List Rate', 'export_amount': 'Amount'}; - for (d in item_cols_base) $('[data-grid-fieldname="'+cur_frm.cscript.tname+'-'+d+'"]').html(item_cols_base[d]+' ('+base_curr+')'); - for (d in item_cols_export) $('[data-grid-fieldname="'+cur_frm.cscript.tname+'-'+d+'"]').html(item_cols_export[d]+' ('+doc.currency+')'); + for (d in item_cols_base) $('[data-grid-fieldname="'+cur_frm.cscript.tname+'-'+d+'"]').html(item_cols_base[d]+' ('+base_curr+')'); + for (d in item_cols_export) $('[data-grid-fieldname="'+cur_frm.cscript.tname+'-'+d+'"]').html(item_cols_export[d]+' ('+doc.currency+')'); - var hide = (doc.currency == sys_defaults['currency']) ? false : true; - for (f in item_cols_base) cur_frm.fields_dict[cur_frm.cscript.fname].grid.set_column_disp(f, hide); + var hide = (doc.currency == sys_defaults['currency']) ? false : true; + for (f in item_cols_base) cur_frm.fields_dict[cur_frm.cscript.fname].grid.set_column_disp(f, hide); - //tax table flds - tax_cols = {'tax_amount': 'Amount', 'total': 'Total'}; - for (d in tax_cols) $('[data-grid-fieldname="RV Tax Detail-'+d+'"]').html(tax_cols[d]+' ('+base_curr+')'); + //tax table flds + tax_cols = {'tax_amount': 'Amount', 'total': 'Total'}; + for (d in tax_cols) $('[data-grid-fieldname="RV Tax Detail-'+d+'"]').html(tax_cols[d]+' ('+base_curr+')'); + + if (doc.doctype == 'Receivable Voucher') { + // advance table flds + adv_cols = {'advance_amount': 'Advance Amount', 'allocated_amount': 'Allocated Amount'} + for (d in adv_cols) $('[data-grid-fieldname="Advance Adjustment Detail-'+d+'"]').html(adv_cols[d]+' ('+base_curr+')'); + } } // Change label dynamically based on currency diff --git a/erpnext/selling/doctype/sales_order/sales_order.txt b/erpnext/selling/doctype/sales_order/sales_order.txt index cd6b7bdeb30..a72b8df532b 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.txt +++ b/erpnext/selling/doctype/sales_order/sales_order.txt @@ -5,7 +5,7 @@ { 'creation': '2010-08-08 17:09:21', 'docstatus': 0, - 'modified': '2012-02-24 16:51:54', + 'modified': '2012-02-27 17:07:40', 'modified_by': u'Administrator', 'owner': u'Administrator' }, @@ -21,7 +21,7 @@ # These values are common for all DocType { - '_last_update': u'1330082356', + '_last_update': u'1330082514', 'allow_attach': 0, 'colour': u'White:FFF', 'default_print_format': u'Standard', @@ -38,7 +38,7 @@ 'show_in_menu': 0, 'subject': u'From %(customer_name)s on %(transaction_date)s worth %(currency)s %(grand_total_export)s | %(per_delivered)s% delivered | %(per_billed)s% billed', 'tag_fields': u'delivery_status,billing_status', - 'version': 628 + 'version': 629 }, # These values are common for all DocFormat @@ -278,19 +278,48 @@ # DocField { - 'colour': u'White:FFF', - 'description': u'Track this Sales Order against any Project', 'doctype': u'DocField', - 'fieldname': u'project_name', - 'fieldtype': u'Link', - 'in_filter': 1, - 'label': u'Project Name', - 'oldfieldname': u'project_name', - 'oldfieldtype': u'Link', - 'options': u'Project', - 'permlevel': 0, - 'search_index': 1, - 'trigger': u'Client' + 'fieldname': u'customer_name', + 'fieldtype': u'Data', + 'label': u'Name', + 'permlevel': 1 + }, + + # DocField + { + 'doctype': u'DocField', + 'fieldname': u'address_display', + 'fieldtype': u'Small Text', + 'label': u'Address', + 'permlevel': 1 + }, + + # DocField + { + 'doctype': u'DocField', + 'fieldname': u'contact_display', + 'fieldtype': u'Small Text', + 'label': u'Contact', + 'permlevel': 1 + }, + + # DocField + { + 'doctype': u'DocField', + 'fieldname': u'contact_mobile', + 'fieldtype': u'Text', + 'label': u'Mobile No', + 'permlevel': 1 + }, + + # DocField + { + 'doctype': u'DocField', + 'fieldname': u'contact_email', + 'fieldtype': u'Text', + 'label': u'Contact Email', + 'permlevel': 1, + 'print_hide': 1 }, # DocField @@ -336,6 +365,25 @@ 'reqd': 1 }, + # DocField + { + 'colour': u'White:FFF', + 'depends_on': u"eval:doc.order_type == 'Sales'", + 'doctype': u'DocField', + 'fieldname': u'delivery_date', + 'fieldtype': u'Date', + 'hidden': 0, + 'in_filter': 1, + 'label': u'Expected Delivery Date', + 'oldfieldname': u'delivery_date', + 'oldfieldtype': u'Date', + 'permlevel': 0, + 'print_hide': 1, + 'reqd': 0, + 'search_index': 1, + 'width': u'160px' + }, + # DocField { 'default': u'Draft', @@ -358,20 +406,18 @@ # DocField { 'colour': u'White:FFF', - 'depends_on': u"eval:doc.order_type == 'Sales'", + 'description': u'Track this Sales Order against any Project', 'doctype': u'DocField', - 'fieldname': u'delivery_date', - 'fieldtype': u'Date', - 'hidden': 0, + 'fieldname': u'project_name', + 'fieldtype': u'Link', 'in_filter': 1, - 'label': u'Expected Delivery Date', - 'oldfieldname': u'delivery_date', - 'oldfieldtype': u'Date', + 'label': u'Project Name', + 'oldfieldname': u'project_name', + 'oldfieldtype': u'Link', + 'options': u'Project', 'permlevel': 0, - 'print_hide': 1, - 'reqd': 0, 'search_index': 1, - 'width': u'160px' + 'trigger': u'Client' }, # DocField @@ -442,6 +488,60 @@ 'width': u'100px' }, + # DocField + { + 'doctype': u'DocField', + 'fieldname': u'territory', + 'fieldtype': u'Link', + 'in_filter': 1, + 'label': u'Territory', + 'options': u'Territory', + 'permlevel': 0, + 'print_hide': 1, + 'reqd': 1, + 'search_index': 1 + }, + + # DocField + { + 'colour': u'White:FFF', + 'description': u'Category of customer as entered in Customer master', + 'doctype': u'DocField', + 'fieldname': u'customer_group', + 'fieldtype': u'Link', + 'in_filter': 1, + 'label': u'Customer Group', + 'options': u'Customer Group', + 'permlevel': 0, + 'print_hide': 1, + 'reqd': 1, + 'search_index': 1 + }, + + # DocField + { + 'doctype': u'DocField', + 'fieldname': u'shipping_address', + 'fieldtype': u'Small Text', + 'in_filter': 0, + 'label': u'Shipping Address', + 'permlevel': 1, + 'print_hide': 1 + }, + + # DocField + { + 'doctype': u'DocField', + 'fieldname': u'shipping_address_name', + 'fieldtype': u'Data', + 'hidden': 1, + 'in_filter': 1, + 'label': u'Shipping Address Name', + 'options': u'Address', + 'permlevel': 1, + 'print_hide': 1 + }, + # DocField { 'colour': u'White:FFF', @@ -1098,132 +1198,6 @@ 'print_hide': 1 }, - # DocField - { - 'colour': u'White:FFF', - 'depends_on': u'eval:doc.customer', - 'doctype': u'DocField', - 'fieldtype': u'Section Break', - 'label': u'Customer Details', - 'permlevel': 0 - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldtype': u'Column Break', - 'permlevel': 0, - 'width': u'50%' - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'customer_name', - 'fieldtype': u'Data', - 'label': u'Name', - 'permlevel': 1 - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'address_display', - 'fieldtype': u'Small Text', - 'label': u'Address', - 'permlevel': 1 - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'territory', - 'fieldtype': u'Link', - 'in_filter': 1, - 'label': u'Territory', - 'options': u'Territory', - 'permlevel': 0, - 'print_hide': 1, - 'reqd': 1, - 'search_index': 1 - }, - - # DocField - { - 'colour': u'White:FFF', - 'description': u'Category of customer as entered in Customer master', - 'doctype': u'DocField', - 'fieldname': u'customer_group', - 'fieldtype': u'Link', - 'in_filter': 1, - 'label': u'Customer Group', - 'options': u'Customer Group', - 'permlevel': 0, - 'print_hide': 1, - 'reqd': 1, - 'search_index': 1 - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldtype': u'Column Break', - 'permlevel': 0, - 'width': u'50%' - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'contact_display', - 'fieldtype': u'Small Text', - 'label': u'Contact', - 'permlevel': 1 - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'contact_mobile', - 'fieldtype': u'Text', - 'label': u'Mobile No', - 'permlevel': 1 - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'contact_email', - 'fieldtype': u'Text', - 'label': u'Contact Email', - 'permlevel': 1, - 'print_hide': 1 - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'shipping_address', - 'fieldtype': u'Small Text', - 'in_filter': 0, - 'label': u'Shipping Address', - 'permlevel': 1, - 'print_hide': 1 - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'shipping_address_name', - 'fieldtype': u'Data', - 'hidden': 1, - 'in_filter': 1, - 'label': u'Shipping Address Name', - 'options': u'Address', - 'permlevel': 1, - 'print_hide': 1 - }, - # DocField { 'colour': u'White:FFF', diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.txt b/erpnext/stock/doctype/delivery_note/delivery_note.txt index e9bc0e8cf8b..6570b0c80d8 100644 --- a/erpnext/stock/doctype/delivery_note/delivery_note.txt +++ b/erpnext/stock/doctype/delivery_note/delivery_note.txt @@ -5,7 +5,7 @@ { 'creation': '2011-04-18 15:58:20', 'docstatus': 0, - 'modified': '2012-02-24 13:27:18', + 'modified': '2012-02-27 17:35:31', 'modified_by': u'Administrator', 'owner': u'Administrator' }, @@ -21,7 +21,7 @@ # These values are common for all DocType { - '_last_update': u'1330070148', + '_last_update': u'1330343754', 'colour': u'White:FFF', 'default_print_format': u'Standard', 'doctype': 'DocType', @@ -37,7 +37,7 @@ 'show_in_menu': 0, 'subject': u'To %(customer_name)s on %(transaction_date)s | %(per_billed)s% billed', 'tag_fields': u'billing_status', - 'version': 470 + 'version': 474 }, # These values are common for all DocFormat @@ -236,6 +236,52 @@ 'print_hide': 1 }, + # DocField + { + 'doctype': u'DocField', + 'fieldname': u'customer_name', + 'fieldtype': u'Data', + 'label': u'Customer Name', + 'permlevel': 1 + }, + + # DocField + { + 'doctype': u'DocField', + 'fieldname': u'address_display', + 'fieldtype': u'Small Text', + 'label': u'Shipping Address', + 'permlevel': 1 + }, + + # DocField + { + 'doctype': u'DocField', + 'fieldname': u'contact_display', + 'fieldtype': u'Small Text', + 'label': u'Contact', + 'permlevel': 1 + }, + + # DocField + { + 'doctype': u'DocField', + 'fieldname': u'contact_mobile', + 'fieldtype': u'Text', + 'label': u'Mobile No', + 'permlevel': 1 + }, + + # DocField + { + 'doctype': u'DocField', + 'fieldname': u'contact_email', + 'fieldtype': u'Text', + 'label': u'Contact Email', + 'permlevel': 1, + 'print_hide': 1 + }, + # DocField { 'doctype': u'DocField', @@ -258,12 +304,50 @@ 'oldfieldname': u'transaction_date', 'oldfieldtype': u'Date', 'permlevel': 0, + 'print_hide': 1, + 'reqd': 1, + 'search_index': 1, + 'width': u'100px' + }, + + # DocField + { + 'colour': u'White:FFF', + 'default': u'Today', + 'description': u'The date at which current entry will get or has actually executed.', + 'doctype': u'DocField', + 'fieldname': u'posting_date', + 'fieldtype': u'Date', + 'in_filter': 1, + 'label': u'Posting Date', + 'no_copy': 1, + 'oldfieldname': u'posting_date', + 'oldfieldtype': u'Date', + 'permlevel': 0, 'print_hide': 0, 'reqd': 1, 'search_index': 1, 'width': u'100px' }, + # DocField + { + 'colour': u'White:FFF', + 'description': u'Time at which items were delivered from warehouse', + 'doctype': u'DocField', + 'fieldname': u'posting_time', + 'fieldtype': u'Time', + 'in_filter': 0, + 'label': u'Posting Time', + 'oldfieldname': u'posting_time', + 'oldfieldtype': u'Time', + 'permlevel': 0, + 'print_hide': 1, + 'reqd': 1, + 'search_index': 0, + 'width': u'100px' + }, + # DocField { 'default': u'Draft', @@ -381,6 +465,34 @@ 'width': u'100px' }, + # DocField + { + 'doctype': u'DocField', + 'fieldname': u'territory', + 'fieldtype': u'Link', + 'hidden': 0, + 'in_filter': 1, + 'label': u'Territory', + 'options': u'Territory', + 'permlevel': 0, + 'print_hide': 1, + 'reqd': 1, + 'search_index': 1 + }, + + # DocField + { + 'doctype': u'DocField', + 'fieldname': u'customer_group', + 'fieldtype': u'Link', + 'in_filter': 1, + 'label': u'Customer Group', + 'options': u'Customer Group', + 'permlevel': 0, + 'print_hide': 1, + 'search_index': 1 + }, + # DocField { 'colour': u'White:FFF', @@ -944,44 +1056,6 @@ 'width': u'150px' }, - # DocField - { - 'colour': u'White:FFF', - 'default': u'Today', - 'description': u'The date at which current entry will get or has actually executed.', - 'doctype': u'DocField', - 'fieldname': u'posting_date', - 'fieldtype': u'Date', - 'in_filter': 1, - 'label': u'Posting Date', - 'no_copy': 1, - 'oldfieldname': u'posting_date', - 'oldfieldtype': u'Date', - 'permlevel': 0, - 'print_hide': 1, - 'reqd': 1, - 'search_index': 1, - 'width': u'100px' - }, - - # DocField - { - 'colour': u'White:FFF', - 'description': u'Time at which items were delivered from warehouse', - 'doctype': u'DocField', - 'fieldname': u'posting_time', - 'fieldtype': u'Time', - 'in_filter': 0, - 'label': u'Posting Time', - 'oldfieldname': u'posting_time', - 'oldfieldtype': u'Time', - 'permlevel': 0, - 'print_hide': 1, - 'reqd': 1, - 'search_index': 0, - 'width': u'100px' - }, - # DocField { 'colour': u'White:FFF', @@ -1164,105 +1238,6 @@ 'print_hide': 1 }, - # DocField - { - 'colour': u'White:FFF', - 'depends_on': u'eval:doc.customer', - 'doctype': u'DocField', - 'fieldtype': u'Section Break', - 'label': u'Customer Details', - 'permlevel': 0 - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldtype': u'Column Break', - 'permlevel': 0 - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'customer_name', - 'fieldtype': u'Data', - 'label': u'Customer Name', - 'permlevel': 1 - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'address_display', - 'fieldtype': u'Small Text', - 'label': u'Shipping Address', - 'permlevel': 1 - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'customer_group', - 'fieldtype': u'Link', - 'in_filter': 1, - 'label': u'Customer Group', - 'options': u'Customer Group', - 'permlevel': 0, - 'print_hide': 1, - 'search_index': 1 - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldtype': u'Column Break', - 'permlevel': 0, - 'width': u'50%' - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'contact_display', - 'fieldtype': u'Small Text', - 'label': u'Contact', - 'permlevel': 1 - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'contact_mobile', - 'fieldtype': u'Text', - 'label': u'Mobile No', - 'permlevel': 1 - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'contact_email', - 'fieldtype': u'Text', - 'label': u'Contact Email', - 'permlevel': 1, - 'print_hide': 1 - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'territory', - 'fieldtype': u'Link', - 'hidden': 0, - 'in_filter': 1, - 'label': u'Territory', - 'options': u'Territory', - 'permlevel': 0, - 'print_hide': 1, - 'reqd': 1, - 'search_index': 1 - }, - # DocField { 'doctype': u'DocField', diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js index 272f3049fc2..5a5db04fede 100644 --- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js @@ -38,6 +38,9 @@ cur_frm.cscript.refresh = function(doc, cdt, cdn) { // Unhide Fields in Next Steps // --------------------------------- cur_frm.clear_custom_buttons(); + + cur_frm.cscript.dynamic_label(doc, cdt, cdn); + if(doc.docstatus == 1){ var ch = getchildren('Purchase Receipt Detail',doc.name,'purchase_receipt_details'); allow_billing = 0; diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py index ccc420119c5..01933529cd7 100644 --- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py @@ -72,6 +72,11 @@ class DocType(TransactionBase): def get_tc_details(self): return get_obj('Purchase Common').get_tc_details(self) + def get_comp_base_currency(self): + return get_obj('Purchase Common').get_comp_base_currency(self.doc.company) + + + # get available qty at warehouse def get_bin_details(self, arg = ''): return get_obj(dt='Purchase Common').get_bin_details(arg) diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.txt b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.txt index 31f6cd60056..2666f086c28 100755 --- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.txt +++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.txt @@ -5,52 +5,53 @@ { 'creation': '2010-08-08 17:09:15', 'docstatus': 0, - 'modified': '2011-05-17 16:33:17', - 'modified_by': 'Administrator', - 'owner': 'Administrator' + 'modified': '2012-02-27 17:54:59', + 'modified_by': u'Administrator', + 'owner': u'Administrator' }, # These values are common for all DocType { - '_last_update': '1305630198', - 'colour': 'White:FFF', + '_last_update': u'1330345245', + 'colour': u'White:FFF', + 'default_print_format': u'Standard', 'doctype': 'DocType', - 'document_type': 'Transaction', + 'document_type': u'Transaction', 'is_transaction_doc': 1, - 'module': 'Stock', + 'module': u'Stock', 'name': '__common__', 'read_only_onload': 1, - 'search_fields': 'status, transaction_date, supplier', - 'section_style': 'Tabbed', - 'server_code_error': ' ', + 'search_fields': u'status, transaction_date, supplier', + 'section_style': u'Tabbed', + 'server_code_error': u' ', 'show_in_menu': 0, - 'subject': 'From %(supplier_name)s against %(purchase_order)s on %(transaction_date)s', - 'version': 318 + 'subject': u'From %(supplier_name)s against %(purchase_order)s on %(transaction_date)s', + 'version': 324 }, # These values are common for all DocField { - 'doctype': 'DocField', + 'doctype': u'DocField', 'name': '__common__', - 'parent': 'Purchase Receipt', - 'parentfield': 'fields', - 'parenttype': 'DocType' + 'parent': u'Purchase Receipt', + 'parentfield': u'fields', + 'parenttype': u'DocType' }, # These values are common for all DocPerm { - 'doctype': 'DocPerm', + 'doctype': u'DocPerm', 'name': '__common__', - 'parent': 'Purchase Receipt', - 'parentfield': 'permissions', - 'parenttype': 'DocType', + 'parent': u'Purchase Receipt', + 'parentfield': u'permissions', + 'parenttype': u'DocType', 'read': 1 }, # DocType, Purchase Receipt { 'doctype': 'DocType', - 'name': 'Purchase Receipt' + 'name': u'Purchase Receipt' }, # DocPerm @@ -58,10 +59,9 @@ 'amend': 0, 'cancel': 0, 'create': 0, - 'doctype': 'DocPerm', - 'idx': 1, + 'doctype': u'DocPerm', 'permlevel': 1, - 'role': 'Material Manager', + 'role': u'Material Manager', 'submit': 0, 'write': 0 }, @@ -71,10 +71,9 @@ 'amend': 1, 'cancel': 1, 'create': 1, - 'doctype': 'DocPerm', - 'idx': 2, + 'doctype': u'DocPerm', 'permlevel': 0, - 'role': 'Material Manager', + 'role': u'Material Manager', 'submit': 1, 'write': 1 }, @@ -84,10 +83,9 @@ 'amend': 0, 'cancel': 0, 'create': 0, - 'doctype': 'DocPerm', - 'idx': 3, + 'doctype': u'DocPerm', 'permlevel': 1, - 'role': 'Material User', + 'role': u'Material User', 'submit': 0, 'write': 0 }, @@ -97,10 +95,9 @@ 'amend': 1, 'cancel': 1, 'create': 1, - 'doctype': 'DocPerm', - 'idx': 4, + 'doctype': u'DocPerm', 'permlevel': 0, - 'role': 'Material User', + 'role': u'Material User', 'submit': 1, 'write': 1 }, @@ -110,75 +107,68 @@ 'amend': 1, 'cancel': 1, 'create': 1, - 'doctype': 'DocPerm', - 'idx': 5, + 'doctype': u'DocPerm', 'permlevel': 0, - 'role': 'Purchase User', + 'role': u'Purchase User', 'submit': 1, 'write': 1 }, # DocPerm { - 'doctype': 'DocPerm', - 'idx': 6, + 'doctype': u'DocPerm', 'permlevel': 1, - 'role': 'Purchase User' + 'role': u'Purchase User' }, # DocPerm { - 'doctype': 'DocPerm', - 'idx': 7, - 'match': 'supplier', + 'doctype': u'DocPerm', + 'match': u'supplier', 'permlevel': 0, - 'role': 'Supplier' + 'role': u'Supplier' }, # DocPerm { - 'doctype': 'DocPerm', - 'idx': 8, + 'doctype': u'DocPerm', 'permlevel': 2, - 'role': 'All', + 'role': u'All', 'write': 1 }, # DocField { - 'colour': 'White:FFF', - 'description': 'Enter Basic Information about the Purchase Receipt', - 'doctype': 'DocField', - 'fieldtype': 'Section Break', - 'idx': 1, - 'label': 'Basic Info', - 'oldfieldtype': 'Section Break', + 'colour': u'White:FFF', + 'description': u'Enter Basic Information about the Purchase Receipt', + 'doctype': u'DocField', + 'fieldtype': u'Section Break', + 'label': u'Basic Info', + 'oldfieldtype': u'Section Break', 'permlevel': 0 }, # DocField { - 'doctype': 'DocField', - 'fieldtype': 'Column Break', - 'idx': 2, - 'oldfieldtype': 'Column Break', + 'doctype': u'DocField', + 'fieldtype': u'Column Break', + 'oldfieldtype': u'Column Break', 'permlevel': 0, - 'width': '50%' + 'width': u'50%' }, # DocField { - 'colour': 'White:FFF', - 'description': 'To manage multiple series please go to Setup > Manage Series', - 'doctype': 'DocField', - 'fieldname': 'naming_series', - 'fieldtype': 'Select', - 'idx': 3, - 'label': 'Series', + 'colour': u'White:FFF', + 'description': u'To manage multiple series please go to Setup > Manage Series', + 'doctype': u'DocField', + 'fieldname': u'naming_series', + 'fieldtype': u'Select', + 'label': u'Series', 'no_copy': 1, - 'oldfieldname': 'naming_series', - 'oldfieldtype': 'Select', - 'options': '\nGRN', + 'oldfieldname': u'naming_series', + 'oldfieldtype': u'Select', + 'options': u'\nGRN', 'permlevel': 0, 'print_hide': 1, 'reqd': 1 @@ -187,391 +177,300 @@ # DocField { 'allow_on_submit': 0, - 'colour': 'White:FFF', - 'doctype': 'DocField', - 'fieldname': 'supplier', - 'fieldtype': 'Link', - 'idx': 4, + 'colour': u'White:FFF', + 'doctype': u'DocField', + 'fieldname': u'supplier', + 'fieldtype': u'Link', 'in_filter': 1, - 'label': 'Supplier', - 'oldfieldname': 'supplier', - 'oldfieldtype': 'Link', - 'options': 'Supplier', + 'label': u'Supplier', + 'oldfieldname': u'supplier', + 'oldfieldtype': u'Link', + 'options': u'Supplier', 'permlevel': 0, 'print_hide': 1, 'reqd': 1, 'search_index': 1, - 'trigger': 'Client', - 'width': '150px' + 'trigger': u'Client', + 'width': u'150px' }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'supplier_address', - 'fieldtype': 'Link', - 'idx': 5, - 'label': 'Supplier Address', - 'options': 'Address', + 'doctype': u'DocField', + 'fieldname': u'supplier_address', + 'fieldtype': u'Link', + 'label': u'Supplier Address', + 'options': u'Address', 'permlevel': 0, 'print_hide': 1 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'contact_person', - 'fieldtype': 'Link', - 'idx': 6, - 'label': 'Contact Person', - 'options': 'Contact', + 'doctype': u'DocField', + 'fieldname': u'contact_person', + 'fieldtype': u'Link', + 'label': u'Contact Person', + 'options': u'Contact', 'permlevel': 0, 'print_hide': 1 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'supplier_name', - 'fieldtype': 'Data', - 'idx': 7, - 'label': 'Name', + 'doctype': u'DocField', + 'fieldname': u'supplier_name', + 'fieldtype': u'Data', + 'label': u'Name', 'permlevel': 1 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'address_display', - 'fieldtype': 'Small Text', - 'idx': 8, - 'label': 'Address', + 'doctype': u'DocField', + 'fieldname': u'address_display', + 'fieldtype': u'Small Text', + 'label': u'Address', 'permlevel': 1 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'contact_display', - 'fieldtype': 'Small Text', - 'idx': 9, - 'label': 'Contact', + 'doctype': u'DocField', + 'fieldname': u'contact_display', + 'fieldtype': u'Small Text', + 'label': u'Contact', 'permlevel': 1 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'contact_mobile', - 'fieldtype': 'Text', - 'idx': 10, - 'label': 'Mobile No', + 'doctype': u'DocField', + 'fieldname': u'contact_mobile', + 'fieldtype': u'Text', + 'label': u'Mobile No', 'permlevel': 1 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'contact_email', - 'fieldtype': 'Text', - 'idx': 11, - 'label': 'Contact Email', + 'doctype': u'DocField', + 'fieldname': u'contact_email', + 'fieldtype': u'Text', + 'label': u'Contact Email', 'permlevel': 1, 'print_hide': 1 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'amended_from', - 'fieldtype': 'Data', + 'doctype': u'DocField', + 'fieldname': u'amended_from', + 'fieldtype': u'Data', 'hidden': 1, - 'idx': 12, - 'label': 'Amended From', + 'label': u'Amended From', 'no_copy': 1, - 'oldfieldname': 'amended_from', - 'oldfieldtype': 'Data', + 'oldfieldname': u'amended_from', + 'oldfieldtype': u'Data', 'permlevel': 1, 'print_hide': 1, - 'width': '150px' + 'width': u'150px' }, # DocField { - 'description': 'The date at which current entry is corrected in the system.', - 'doctype': 'DocField', - 'fieldname': 'amendment_date', - 'fieldtype': 'Date', + 'description': u'The date at which current entry is corrected in the system.', + 'doctype': u'DocField', + 'fieldname': u'amendment_date', + 'fieldtype': u'Date', 'hidden': 1, - 'idx': 13, - 'label': 'Amendment Date', + 'label': u'Amendment Date', 'no_copy': 1, - 'oldfieldname': 'amendment_date', - 'oldfieldtype': 'Date', + 'oldfieldname': u'amendment_date', + 'oldfieldtype': u'Date', 'permlevel': 0, 'print_hide': 1, - 'width': '100px' + 'width': u'100px' }, # DocField { - 'doctype': 'DocField', - 'fieldtype': 'Column Break', - 'idx': 14, - 'oldfieldtype': 'Column Break', + 'doctype': u'DocField', + 'fieldtype': u'Column Break', + 'oldfieldtype': u'Column Break', 'permlevel': 0, - 'width': '50%' + 'width': u'50%' }, # DocField { - 'colour': 'White:FFF', - 'description': 'The date at which current entry is made in system.', - 'doctype': 'DocField', - 'fieldname': 'transaction_date', - 'fieldtype': 'Date', - 'idx': 15, + 'colour': u'White:FFF', + 'description': u'The date at which current entry is made in system.', + 'doctype': u'DocField', + 'fieldname': u'transaction_date', + 'fieldtype': u'Date', 'in_filter': 1, - 'label': 'Transaction Date', + 'label': u'Transaction Date', 'no_copy': 1, - 'oldfieldname': 'transaction_date', - 'oldfieldtype': 'Date', + 'oldfieldname': u'transaction_date', + 'oldfieldtype': u'Date', 'permlevel': 0, 'reqd': 1, - 'search_index': 0, - 'trigger': 'Client', - 'width': '100px' + 'search_index': 1, + 'trigger': u'Client', + 'width': u'100px' }, # DocField { - 'colour': 'White:FFF', - 'doctype': 'DocField', - 'fieldname': 'status', - 'fieldtype': 'Select', - 'idx': 16, + 'colour': u'White:FFF', + 'description': u'The date at which current entry will get or has actually executed.', + 'doctype': u'DocField', + 'fieldname': u'posting_date', + 'fieldtype': u'Date', 'in_filter': 1, - 'label': 'Status', + 'label': u'Posting Date', 'no_copy': 1, - 'oldfieldname': 'status', - 'oldfieldtype': 'Select', - 'options': '\nDraft\nSubmitted\nCancelled', - 'permlevel': 1, + 'oldfieldname': u'posting_date', + 'oldfieldtype': u'Date', + 'permlevel': 0, + 'print_hide': 1, + 'reqd': 1, + 'search_index': 1, + 'width': u'100px' + }, + + # DocField + { + 'colour': u'White:FFF', + 'description': u'Time at which materials were received', + 'doctype': u'DocField', + 'fieldname': u'posting_time', + 'fieldtype': u'Time', + 'in_filter': 0, + 'label': u'Posting Time', + 'no_copy': 1, + 'oldfieldname': u'posting_time', + 'oldfieldtype': u'Time', + 'permlevel': 0, 'print_hide': 1, 'reqd': 1, 'search_index': 0, - 'width': '150px' + 'width': u'100px' }, # DocField { - 'colour': 'White:FFF', - 'description': '% of materials billed against this Purchase Receipt', - 'doctype': 'DocField', - 'fieldname': 'per_billed', - 'fieldtype': 'Currency', - 'idx': 17, - 'label': '% Billed', + 'colour': u'White:FFF', + 'doctype': u'DocField', + 'fieldname': u'status', + 'fieldtype': u'Select', + 'in_filter': 1, + 'label': u'Status', 'no_copy': 1, - 'oldfieldname': 'per_billed', - 'oldfieldtype': 'Currency', + 'oldfieldname': u'status', + 'oldfieldtype': u'Select', + 'options': u'\nDraft\nSubmitted\nCancelled', + 'permlevel': 1, + 'print_hide': 1, + 'reqd': 1, + 'search_index': 1, + 'width': u'150px' + }, + + # DocField + { + 'colour': u'White:FFF', + 'depends_on': u'eval:!doc.__islocal', + 'description': u'% of materials billed against this Purchase Receipt', + 'doctype': u'DocField', + 'fieldname': u'per_billed', + 'fieldtype': u'Currency', + 'label': u'% Billed', + 'no_copy': 1, + 'oldfieldname': u'per_billed', + 'oldfieldtype': u'Currency', 'permlevel': 1, 'print_hide': 1 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'bill_no', - 'fieldtype': 'Data', + 'doctype': u'DocField', + 'fieldname': u'bill_no', + 'fieldtype': u'Data', 'hidden': 1, - 'idx': 18, - 'label': 'Bill No', - 'oldfieldname': 'bill_no', - 'oldfieldtype': 'Data', + 'label': u'Bill No', + 'oldfieldname': u'bill_no', + 'oldfieldtype': u'Data', 'permlevel': 0, 'print_hide': 1 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'bill_date', - 'fieldtype': 'Date', + 'doctype': u'DocField', + 'fieldname': u'bill_date', + 'fieldtype': u'Date', 'hidden': 1, - 'idx': 19, - 'label': 'Bill Date', - 'oldfieldname': 'bill_date', - 'oldfieldtype': 'Date', + 'label': u'Bill Date', + 'oldfieldname': u'bill_date', + 'oldfieldtype': u'Date', 'permlevel': 0, 'print_hide': 1 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'range', - 'fieldtype': 'Data', + 'colour': u'White:FFF', + 'doctype': u'DocField', + 'fieldname': u'range', + 'fieldtype': u'Data', 'hidden': 1, - 'idx': 20, - 'label': 'Range', - 'oldfieldname': 'range', - 'oldfieldtype': 'Data', + 'label': u'Range', + 'oldfieldname': u'range', + 'oldfieldtype': u'Data', 'permlevel': 0, 'print_hide': 1 }, # DocField { - 'doctype': 'DocField', - 'fieldtype': 'Section Break', - 'idx': 21, - 'label': 'Transporter Info', + 'colour': u'White:FFF', + 'default': u'No', + 'description': u'Select "Yes" for sub - contracting items', + 'doctype': u'DocField', + 'fieldname': u'is_subcontracted', + 'fieldtype': u'Select', + 'label': u'Is Subcontracted', + 'oldfieldname': u'is_subcontracted', + 'oldfieldtype': u'Select', + 'options': u'\nYes\nNo', + 'permlevel': 0, + 'print_hide': 1 + }, + + # DocField + { + 'colour': u'White:FFF', + 'doctype': u'DocField', + 'fieldtype': u'Section Break', + 'label': u'Items', + 'oldfieldtype': u'Section Break', 'permlevel': 0 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'transporter_name', - 'fieldtype': 'Data', - 'idx': 22, - 'label': 'Transporter Name', - 'oldfieldname': 'transporter_name', - 'oldfieldtype': 'Data', - 'permlevel': 0 - }, - - # DocField - { - 'colour': 'White:FFF', - 'description': 'Transporter lorry number', - 'doctype': 'DocField', - 'fieldname': 'lr_no', - 'fieldtype': 'Data', - 'idx': 23, - 'label': 'LR No', - 'no_copy': 1, - 'oldfieldname': 'lr_no', - 'oldfieldtype': 'Data', - 'permlevel': 0, - 'print_hide': 0, - 'width': '100px' - }, - - # DocField - { - 'colour': 'White:FFF', - 'description': 'Date on which lorry started from supplier warehouse', - 'doctype': 'DocField', - 'fieldname': 'lr_date', - 'fieldtype': 'Date', - 'idx': 24, - 'label': 'LR Date', - 'no_copy': 1, - 'oldfieldname': 'lr_date', - 'oldfieldtype': 'Date', - 'permlevel': 0, - 'print_hide': 0, - 'width': '100px' - }, - - # DocField - { - 'doctype': 'DocField', - 'fieldtype': 'Column Break', - 'idx': 25, - 'permlevel': 0, - 'width': '50%' - }, - - # DocField - { - 'colour': 'White:FFF', - 'doctype': 'DocField', - 'fieldname': 'challan_no', - 'fieldtype': 'Data', - 'idx': 26, - 'label': 'Challan No', - 'no_copy': 1, - 'oldfieldname': 'challan_no', - 'oldfieldtype': 'Data', - 'permlevel': 0, - 'print_hide': 0, - 'reqd': 0, - 'width': '100px' - }, - - # DocField - { - 'colour': 'White:FFF', - 'doctype': 'DocField', - 'fieldname': 'challan_date', - 'fieldtype': 'Date', - 'idx': 27, - 'label': 'Challan Date', - 'no_copy': 1, - 'oldfieldname': 'challan_date', - 'oldfieldtype': 'Date', - 'permlevel': 0, - 'print_hide': 0, - 'reqd': 0, - 'width': '100px' - }, - - # DocField - { - 'colour': 'White:FFF', - 'doctype': 'DocField', - 'fieldtype': 'Section Break', - 'idx': 28, - 'label': 'Items', - 'oldfieldtype': 'Section Break', - 'permlevel': 0 - }, - - # DocField - { - 'colour': 'White:FFF', - 'description': 'You can make a purchase receipt from multiple purchase orders. Select purchase orders one by one and click on the button below.', - 'doctype': 'DocField', - 'fieldname': 'purchase_order_no', - 'fieldtype': 'Link', - 'idx': 29, - 'label': 'Purchase Order', - 'no_copy': 1, - 'oldfieldname': 'purchase_order_no', - 'oldfieldtype': 'Link', - 'options': 'Purchase Order', - 'permlevel': 0, - 'print_hide': 0 - }, - - # DocField - { - 'colour': 'White:FFF', - 'doctype': 'DocField', - 'fieldtype': 'Button', - 'idx': 30, - 'label': 'Pull Purchase Order Details', - 'oldfieldtype': 'Button', - 'options': 'get_po_details', - 'permlevel': 0, - 'print_hide': 1 - }, - - # DocField - { - 'colour': 'White:FFF', - 'description': "Supplier's currency", - 'doctype': 'DocField', - 'fieldname': 'currency', - 'fieldtype': 'Select', - 'idx': 31, - 'label': 'Currency', - 'oldfieldname': 'currency', - 'oldfieldtype': 'Select', - 'options': 'link:Currency', + 'colour': u'White:FFF', + 'description': u"Supplier's currency", + 'doctype': u'DocField', + 'fieldname': u'currency', + 'fieldtype': u'Select', + 'label': u'Currency', + 'oldfieldname': u'currency', + 'oldfieldtype': u'Select', + 'options': u'link:Currency', 'permlevel': 0, 'print_hide': 1, 'reqd': 1 @@ -579,60 +478,33 @@ # DocField { - 'colour': 'White:FFF', - 'default': '1.00', - 'description': "Rate at which supplier's currency is converted to your currency", - 'doctype': 'DocField', - 'fieldname': 'conversion_rate', - 'fieldtype': 'Currency', - 'idx': 32, - 'label': 'Conversion Rate', - 'oldfieldname': 'conversion_rate', - 'oldfieldtype': 'Currency', + 'colour': u'White:FFF', + 'default': u'1.00', + 'description': u"Rate at which supplier's currency is converted to company's base currency", + 'doctype': u'DocField', + 'fieldname': u'conversion_rate', + 'fieldtype': u'Currency', + 'label': u'Conversion Rate', + 'oldfieldname': u'conversion_rate', + 'oldfieldtype': u'Currency', 'permlevel': 0, 'print_hide': 1, 'reqd': 1, - 'trigger': 'Client' + 'trigger': u'Client' }, # DocField { - 'doctype': 'DocField', - 'fieldtype': 'Column Break', - 'idx': 33, - 'oldfieldtype': 'Column Break', - 'permlevel': 0 - }, - - # DocField - { - 'colour': 'White:FFF', - 'description': 'Select "Yes" for sub - contracting items', - 'doctype': 'DocField', - 'fieldname': 'is_subcontracted', - 'fieldtype': 'Select', - 'idx': 34, - 'label': 'Is Subcontracted', - 'oldfieldname': 'is_subcontracted', - 'oldfieldtype': 'Select', - 'options': '\nYes\nNo', - 'permlevel': 0, - 'print_hide': 1 - }, - - # DocField - { - 'colour': 'White:FFF', - 'description': 'Warehouse where you are maintaining stock of rejected items', - 'doctype': 'DocField', - 'fieldname': 'rejected_warehouse', - 'fieldtype': 'Link', - 'idx': 35, - 'label': 'Rejected Warehouse', + 'colour': u'White:FFF', + 'description': u'Warehouse where you are maintaining stock of rejected items', + 'doctype': u'DocField', + 'fieldname': u'rejected_warehouse', + 'fieldtype': u'Link', + 'label': u'Rejected Warehouse', 'no_copy': 1, - 'oldfieldname': 'rejected_warehouse', - 'oldfieldtype': 'Link', - 'options': 'Warehouse', + 'oldfieldname': u'rejected_warehouse', + 'oldfieldtype': u'Link', + 'options': u'Warehouse', 'permlevel': 0, 'print_hide': 1, 'reqd': 0 @@ -640,43 +512,77 @@ # DocField { - 'colour': 'White:FFF', - 'description': 'Supplier warehouse where you have issued raw materials for sub - contracting', - 'doctype': 'DocField', - 'fieldname': 'supplier_warehouse', - 'fieldtype': 'Link', - 'idx': 36, - 'label': 'Supplier Warehouse', + 'colour': u'White:FFF', + 'description': u'Supplier warehouse where you have issued raw materials for sub - contracting', + 'doctype': u'DocField', + 'fieldname': u'supplier_warehouse', + 'fieldtype': u'Link', + 'label': u'Supplier Warehouse', 'no_copy': 1, - 'oldfieldname': 'supplier_warehouse', - 'oldfieldtype': 'Link', - 'options': 'Warehouse', + 'oldfieldname': u'supplier_warehouse', + 'oldfieldtype': u'Link', + 'options': u'Warehouse', 'permlevel': 0, 'print_hide': 1, - 'width': '50px' + 'width': u'50px' }, # DocField { - 'colour': 'White:FFF', - 'doctype': 'DocField', - 'fieldtype': 'Section Break', - 'idx': 37, - 'oldfieldtype': 'Section Break', - 'options': 'Simple', + 'doctype': u'DocField', + 'fieldtype': u'Column Break', + 'oldfieldtype': u'Column Break', 'permlevel': 0 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'purchase_receipt_details', - 'fieldtype': 'Table', - 'idx': 38, - 'label': 'Purchase Receipt Details', - 'oldfieldname': 'purchase_receipt_details', - 'oldfieldtype': 'Table', - 'options': 'Purchase Receipt Detail', + 'colour': u'White:FFF', + 'description': u'You can make a purchase receipt from multiple purchase orders. Select purchase orders one by one and click on the button below.', + 'doctype': u'DocField', + 'fieldname': u'purchase_order_no', + 'fieldtype': u'Link', + 'label': u'Purchase Order', + 'no_copy': 1, + 'oldfieldname': u'purchase_order_no', + 'oldfieldtype': u'Link', + 'options': u'Purchase Order', + 'permlevel': 0, + 'print_hide': 0 + }, + + # DocField + { + 'colour': u'White:FFF', + 'doctype': u'DocField', + 'fieldtype': u'Button', + 'label': u'Pull Purchase Order Details', + 'oldfieldtype': u'Button', + 'options': u'get_po_details', + 'permlevel': 0, + 'print_hide': 1 + }, + + # DocField + { + 'colour': u'White:FFF', + 'doctype': u'DocField', + 'fieldtype': u'Section Break', + 'oldfieldtype': u'Section Break', + 'options': u'Simple', + 'permlevel': 0 + }, + + # DocField + { + 'allow_on_submit': 1, + 'doctype': u'DocField', + 'fieldname': u'purchase_receipt_details', + 'fieldtype': u'Table', + 'label': u'Purchase Receipt Details', + 'oldfieldname': u'purchase_receipt_details', + 'oldfieldtype': u'Table', + 'options': u'Purchase Receipt Detail', 'permlevel': 0, 'print_hide': 0, 'reqd': 0 @@ -684,564 +590,559 @@ # DocField { - 'doctype': 'DocField', - 'fieldname': 'net_total', - 'fieldtype': 'Currency', - 'idx': 39, - 'label': 'Net Total', - 'oldfieldname': 'net_total', - 'oldfieldtype': 'Currency', + 'doctype': u'DocField', + 'fieldname': u'net_total', + 'fieldtype': u'Currency', + 'label': u'Net Total', + 'oldfieldname': u'net_total', + 'oldfieldtype': u'Currency', 'permlevel': 1, 'print_hide': 1, 'reqd': 1, - 'width': '150px' + 'width': u'150px' }, # DocField { - 'doctype': 'DocField', - 'fieldtype': 'Button', - 'idx': 40, - 'label': 'Re-Calculate Values', - 'oldfieldtype': 'Button', + 'doctype': u'DocField', + 'fieldtype': u'Button', + 'label': u'Re-Calculate Values', + 'oldfieldtype': u'Button', 'permlevel': 0, - 'trigger': 'Client' + 'trigger': u'Client' }, # DocField { - 'colour': 'White:FFF', - 'description': 'Add / Edit taxes and other charges', - 'doctype': 'DocField', - 'fieldtype': 'Section Break', - 'idx': 41, - 'label': 'Taxes', - 'oldfieldtype': 'Section Break', + 'colour': u'White:FFF', + 'description': u'Add / Edit taxes and other charges', + 'doctype': u'DocField', + 'fieldtype': u'Section Break', + 'label': u'Taxes', + 'oldfieldtype': u'Section Break', 'permlevel': 0 }, # DocField { - 'colour': 'White:FFF', - 'description': 'If you have created a standard template in Other Charges master, select one and click on the button below.', - 'doctype': 'DocField', - 'fieldname': 'purchase_other_charges', - 'fieldtype': 'Link', - 'idx': 42, - 'label': 'Purchase Other Charges', - 'oldfieldname': 'purchase_other_charges', - 'oldfieldtype': 'Link', - 'options': 'Purchase Other Charges', + 'colour': u'White:FFF', + 'description': u'If you have created a standard template in Other Charges master, select one and click on the button below.', + 'doctype': u'DocField', + 'fieldname': u'purchase_other_charges', + 'fieldtype': u'Link', + 'label': u'Purchase Other Charges', + 'oldfieldname': u'purchase_other_charges', + 'oldfieldtype': u'Link', + 'options': u'Purchase Other Charges', 'permlevel': 0, 'print_hide': 1 }, # DocField { - 'doctype': 'DocField', - 'fieldtype': 'Button', - 'idx': 43, - 'label': 'Get Tax Detail', - 'oldfieldtype': 'Button', - 'options': 'get_purchase_tax_details', + 'doctype': u'DocField', + 'fieldtype': u'Button', + 'label': u'Get Tax Detail', + 'oldfieldtype': u'Button', + 'options': u'get_purchase_tax_details', 'permlevel': 0, 'print_hide': 1 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'purchase_tax_details', - 'fieldtype': 'Table', - 'idx': 44, - 'label': 'Purchase Tax Details', - 'oldfieldname': 'purchase_tax_details', - 'oldfieldtype': 'Table', - 'options': 'Purchase Tax Detail', + 'doctype': u'DocField', + 'fieldname': u'purchase_tax_details', + 'fieldtype': u'Table', + 'label': u'Purchase Tax Details', + 'oldfieldname': u'purchase_tax_details', + 'oldfieldtype': u'Table', + 'options': u'Purchase Tax Detail', 'permlevel': 0 }, # DocField { - 'doctype': 'DocField', - 'fieldtype': 'Button', - 'idx': 45, - 'label': 'Calculate Tax', - 'oldfieldtype': 'Button', + 'doctype': u'DocField', + 'fieldtype': u'Button', + 'label': u'Calculate Tax', + 'oldfieldtype': u'Button', 'permlevel': 0, 'print_hide': 1, - 'trigger': 'Client' + 'trigger': u'Client' }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'total_tax', - 'fieldtype': 'Currency', - 'idx': 46, - 'label': 'Total Tax', - 'oldfieldname': 'total_tax', - 'oldfieldtype': 'Currency', + 'doctype': u'DocField', + 'fieldname': u'total_tax', + 'fieldtype': u'Currency', + 'label': u'Total Tax', + 'oldfieldname': u'total_tax', + 'oldfieldtype': u'Currency', 'permlevel': 1, 'print_hide': 1 }, # DocField { - 'doctype': 'DocField', - 'fieldtype': 'HTML', - 'idx': 47, - 'label': 'Tax Calculation', - 'oldfieldtype': 'HTML', + 'doctype': u'DocField', + 'fieldtype': u'HTML', + 'label': u'Tax Calculation', + 'oldfieldtype': u'HTML', 'permlevel': 0, 'print_hide': 1 }, # DocField { - 'colour': 'White:FFF', - 'description': 'Add Terms and Conditions for the Purchase Receipt. You can also prepare a master Term Sheet and use the Template.', - 'doctype': 'DocField', - 'fieldtype': 'Section Break', - 'idx': 48, - 'label': 'Terms', - 'oldfieldtype': 'Section Break', + 'colour': u'White:FFF', + 'description': u'Detailed Breakup of the totals', + 'doctype': u'DocField', + 'fieldtype': u'Section Break', + 'label': u'Totals', + 'oldfieldtype': u'Section Break', 'permlevel': 0 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'tc_name', - 'fieldtype': 'Link', - 'idx': 49, - 'label': 'Select Terms', - 'oldfieldname': 'tc_name', - 'oldfieldtype': 'Link', - 'options': 'Term', + 'doctype': u'DocField', + 'fieldname': u'grand_total', + 'fieldtype': u'Currency', + 'label': u'Grand Total', + 'oldfieldname': u'grand_total', + 'oldfieldtype': u'Currency', + 'permlevel': 1, + 'print_hide': 1 + }, + + # DocField + { + 'colour': u'White:FFF', + 'doctype': u'DocField', + 'fieldname': u'rounded_total', + 'fieldtype': u'Currency', + 'label': u'Rounded Total', + 'oldfieldname': u'rounded_total', + 'oldfieldtype': u'Currency', + 'permlevel': 1, + 'print_hide': 1 + }, + + # DocField + { + 'colour': u'White:FFF', + 'description': u'In Words will be visible once you save the Purchase Receipt.', + 'doctype': u'DocField', + 'fieldname': u'in_words', + 'fieldtype': u'Data', + 'label': u'In Words', + 'oldfieldname': u'in_words', + 'oldfieldtype': u'Data', + 'permlevel': 1, + 'print_hide': 1 + }, + + # DocField + { + 'doctype': u'DocField', + 'fieldname': u'other_charges_added', + 'fieldtype': u'Currency', + 'label': u'Other Charges Added', + 'oldfieldname': u'other_charges_added', + 'oldfieldtype': u'Currency', + 'permlevel': 1, + 'print_hide': 1 + }, + + # DocField + { + 'doctype': u'DocField', + 'fieldname': u'other_charges_deducted', + 'fieldtype': u'Currency', + 'label': u'Other Charges Deducted', + 'oldfieldname': u'other_charges_deducted', + 'oldfieldtype': u'Currency', + 'permlevel': 1, + 'print_hide': 1 + }, + + # DocField + { + 'doctype': u'DocField', + 'fieldtype': u'Column Break', + 'permlevel': 0, + 'width': u'50%' + }, + + # DocField + { + 'doctype': u'DocField', + 'fieldname': u'net_total_import', + 'fieldtype': u'Currency', + 'label': u'Net Total (Import)', + 'oldfieldname': u'net_total_import', + 'oldfieldtype': u'Currency', + 'permlevel': 1, + 'print_hide': 1 + }, + + # DocField + { + 'doctype': u'DocField', + 'fieldname': u'grand_total_import', + 'fieldtype': u'Currency', + 'label': u'Grand Total (Import)', + 'oldfieldname': u'grand_total_import', + 'oldfieldtype': u'Currency', + 'permlevel': 1, + 'print_hide': 1 + }, + + # DocField + { + 'colour': u'White:FFF', + 'doctype': u'DocField', + 'fieldname': u'in_words_import', + 'fieldtype': u'Data', + 'label': u'In Words (Import)', + 'oldfieldname': u'in_words_import', + 'oldfieldtype': u'Data', + 'permlevel': 1, + 'print_hide': 1 + }, + + # DocField + { + 'doctype': u'DocField', + 'fieldname': u'other_charges_added_import', + 'fieldtype': u'Currency', + 'label': u'Other Charges Added (Import)', + 'oldfieldname': u'other_charges_added_import', + 'oldfieldtype': u'Currency', + 'permlevel': 1, + 'print_hide': 1 + }, + + # DocField + { + 'doctype': u'DocField', + 'fieldname': u'other_charges_deducted_import', + 'fieldtype': u'Currency', + 'label': u'Other Charges Deducted (Import)', + 'oldfieldname': u'other_charges_deducted_import', + 'oldfieldtype': u'Currency', + 'permlevel': 1, + 'print_hide': 1 + }, + + # DocField + { + 'colour': u'White:FFF', + 'description': u'Add Terms and Conditions for the Purchase Receipt. You can also prepare a master Term Sheet and use the Template.', + 'doctype': u'DocField', + 'fieldtype': u'Section Break', + 'label': u'Terms', + 'oldfieldtype': u'Section Break', + 'permlevel': 0 + }, + + # DocField + { + 'doctype': u'DocField', + 'fieldname': u'tc_name', + 'fieldtype': u'Link', + 'label': u'Select Terms', + 'oldfieldname': u'tc_name', + 'oldfieldtype': u'Link', + 'options': u'Term', 'permlevel': 0, 'print_hide': 1 }, # DocField { - 'doctype': 'DocField', - 'fieldtype': 'Button', - 'idx': 50, - 'label': 'Get Terms', - 'oldfieldtype': 'Button', - 'options': 'get_tc_details', + 'doctype': u'DocField', + 'fieldtype': u'Button', + 'label': u'Get Terms', + 'oldfieldtype': u'Button', + 'options': u'get_tc_details', 'permlevel': 0 }, # DocField { - 'doctype': 'DocField', - 'fieldtype': 'HTML', - 'idx': 51, - 'label': 'Terms HTML', - 'oldfieldtype': 'HTML', - 'options': 'You can add Terms and Notes that will be printed in the Transaction', + 'doctype': u'DocField', + 'fieldtype': u'HTML', + 'label': u'Terms HTML', + 'oldfieldtype': u'HTML', + 'options': u'You can add Terms and Notes that will be printed in the Transaction', 'permlevel': 0, 'print_hide': 1 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'terms', - 'fieldtype': 'Text Editor', - 'idx': 52, - 'label': 'Terms1', - 'oldfieldname': 'terms', - 'oldfieldtype': 'Text Editor', + 'doctype': u'DocField', + 'fieldname': u'terms', + 'fieldtype': u'Text Editor', + 'label': u'Terms1', + 'oldfieldname': u'terms', + 'oldfieldtype': u'Text Editor', 'permlevel': 0 }, # DocField { - 'colour': 'White:FFF', - 'description': 'Filing in Additional Information about the Purchase Receipt will help you analyze your data better.', - 'doctype': 'DocField', - 'fieldtype': 'Section Break', - 'idx': 53, - 'label': 'More Info', - 'oldfieldtype': 'Section Break', + 'colour': u'White:FFF', + 'description': u'Filing in Additional Information about the Purchase Receipt will help you analyze your data better.', + 'doctype': u'DocField', + 'fieldtype': u'Section Break', + 'label': u'More Info', + 'oldfieldtype': u'Section Break', 'permlevel': 0 }, # DocField { - 'colour': 'White:FFF', - 'description': 'Select the relevant company name if you have multiple companies', - 'doctype': 'DocField', - 'fieldname': 'company', - 'fieldtype': 'Link', + 'colour': u'White:FFF', + 'description': u'Select the relevant company name if you have multiple companies', + 'doctype': u'DocField', + 'fieldname': u'company', + 'fieldtype': u'Link', 'hidden': 0, - 'idx': 54, 'in_filter': 1, - 'label': 'Company', + 'label': u'Company', 'no_copy': 0, - 'oldfieldname': 'company', - 'oldfieldtype': 'Link', - 'options': 'Company', - 'permlevel': 0, - 'print_hide': 1, - 'reqd': 1, - 'search_index': 0, - 'width': '150px' - }, - - # DocField - { - 'doctype': 'DocField', - 'fieldname': 'fiscal_year', - 'fieldtype': 'Select', - 'idx': 55, - 'in_filter': 1, - 'label': 'Fiscal Year', - 'oldfieldname': 'fiscal_year', - 'oldfieldtype': 'Select', - 'options': 'link:Fiscal Year', - 'permlevel': 0, - 'print_hide': 1, - 'reqd': 1, - 'search_index': 0, - 'width': '150px' - }, - - # DocField - { - 'colour': 'White:FFF', - 'description': 'The date at which current entry will get or has actually executed.', - 'doctype': 'DocField', - 'fieldname': 'posting_date', - 'fieldtype': 'Date', - 'idx': 56, - 'in_filter': 1, - 'label': 'Posting Date', - 'no_copy': 1, - 'oldfieldname': 'posting_date', - 'oldfieldtype': 'Date', + 'oldfieldname': u'company', + 'oldfieldtype': u'Link', + 'options': u'Company', 'permlevel': 0, 'print_hide': 1, 'reqd': 1, 'search_index': 1, - 'width': '100px' + 'width': u'150px' }, # DocField { - 'colour': 'White:FFF', - 'description': 'Time at which materials were received', - 'doctype': 'DocField', - 'fieldname': 'posting_time', - 'fieldtype': 'Time', - 'idx': 57, - 'in_filter': 0, - 'label': 'Posting Time', - 'no_copy': 1, - 'oldfieldname': 'posting_time', - 'oldfieldtype': 'Time', + 'doctype': u'DocField', + 'fieldname': u'fiscal_year', + 'fieldtype': u'Select', + 'in_filter': 1, + 'label': u'Fiscal Year', + 'oldfieldname': u'fiscal_year', + 'oldfieldtype': u'Select', + 'options': u'link:Fiscal Year', 'permlevel': 0, 'print_hide': 1, 'reqd': 1, - 'search_index': 0, - 'width': '100px' + 'search_index': 1, + 'width': u'150px' }, # DocField { - 'colour': 'White:FFF', - 'description': 'Track this Purchase Receipt against any Project', - 'doctype': 'DocField', - 'fieldname': 'project_name', - 'fieldtype': 'Link', - 'idx': 58, - 'in_filter': 1, - 'label': 'Project Name', - 'oldfieldname': 'project_name', - 'oldfieldtype': 'Link', - 'options': 'Project', + 'doctype': u'DocField', + 'fieldtype': u'Column Break', + 'oldfieldtype': u'Column Break', 'permlevel': 0, - 'search_index': 1 + 'width': u'50%' }, # DocField { - 'doctype': 'DocField', - 'fieldtype': 'Column Break', - 'idx': 59, - 'oldfieldtype': 'Column Break', - 'permlevel': 0, - 'width': '50%' - }, - - # DocField - { - 'colour': 'White:FFF', - 'doctype': 'DocField', - 'fieldtype': 'HTML', + 'colour': u'White:FFF', + 'doctype': u'DocField', + 'fieldtype': u'HTML', 'hidden': 1, - 'idx': 60, - 'label': 'Other Details', - 'oldfieldtype': 'HTML', - 'options': "
Other Details
", + 'label': u'Other Details', + 'oldfieldtype': u'HTML', + 'options': u"
Other Details
", 'permlevel': 0, 'print_hide': 1, 'reqd': 0, - 'width': '30%' + 'width': u'30%' }, # DocField { 'allow_on_submit': 1, - 'colour': 'White:FFF', - 'doctype': 'DocField', - 'fieldname': 'select_print_heading', - 'fieldtype': 'Link', - 'idx': 61, - 'label': 'Select Print Heading', + 'colour': u'White:FFF', + 'doctype': u'DocField', + 'fieldname': u'select_print_heading', + 'fieldtype': u'Link', + 'label': u'Select Print Heading', 'no_copy': 1, - 'oldfieldname': 'select_print_heading', - 'oldfieldtype': 'Link', - 'options': 'Print Heading', + 'oldfieldname': u'select_print_heading', + 'oldfieldtype': u'Link', + 'options': u'Print Heading', 'permlevel': 0, 'print_hide': 1, 'report_hide': 1, - 'trigger': 'Client' + 'trigger': u'Client' }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'instructions', - 'fieldtype': 'Small Text', - 'idx': 62, - 'label': 'Instructions', - 'oldfieldname': 'instructions', - 'oldfieldtype': 'Text', + 'doctype': u'DocField', + 'fieldname': u'instructions', + 'fieldtype': u'Small Text', + 'label': u'Instructions', + 'oldfieldname': u'instructions', + 'oldfieldtype': u'Text', 'permlevel': 0 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'remarks', - 'fieldtype': 'Small Text', - 'idx': 63, - 'label': 'Remarks', + 'doctype': u'DocField', + 'fieldname': u'remarks', + 'fieldtype': u'Small Text', + 'label': u'Remarks', 'permlevel': 0, 'print_hide': 1 }, # DocField { - 'colour': 'White:FFF', - 'depends_on': 'eval:!doc.__islocal', - 'doctype': 'DocField', - 'fieldname': 'cancel_reason', - 'fieldtype': 'Data', + 'colour': u'White:FFF', + 'depends_on': u'eval:!doc.__islocal', + 'doctype': u'DocField', + 'fieldname': u'cancel_reason', + 'fieldtype': u'Data', 'hidden': 0, - 'idx': 64, - 'label': 'Cancel Reason', + 'label': u'Cancel Reason', 'no_copy': 1, - 'oldfieldname': 'cancel_reason', - 'oldfieldtype': 'Data', + 'oldfieldname': u'cancel_reason', + 'oldfieldtype': u'Data', 'permlevel': 1, 'print_hide': 1 }, # DocField { - 'colour': 'White:FFF', - 'description': 'Detailed Breakup of the totals', - 'doctype': 'DocField', - 'fieldtype': 'Section Break', - 'idx': 65, - 'label': 'Totals', - 'oldfieldtype': 'Section Break', + 'doctype': u'DocField', + 'fieldtype': u'Section Break', + 'label': u'Transporter Info', 'permlevel': 0 }, # DocField { - 'colour': 'White:FFF', - 'doctype': 'DocField', - 'fieldname': 'rounded_total', - 'fieldtype': 'Currency', - 'idx': 66, - 'label': 'Rounded Total', - 'oldfieldname': 'rounded_total', - 'oldfieldtype': 'Currency', - 'permlevel': 1, - 'print_hide': 1 + 'doctype': u'DocField', + 'fieldname': u'transporter_name', + 'fieldtype': u'Data', + 'label': u'Transporter Name', + 'oldfieldname': u'transporter_name', + 'oldfieldtype': u'Data', + 'permlevel': 0 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'grand_total', - 'fieldtype': 'Currency', - 'idx': 67, - 'label': 'Grand Total', - 'oldfieldname': 'grand_total', - 'oldfieldtype': 'Currency', - 'permlevel': 1, - 'print_hide': 1 - }, - - # DocField - { - 'doctype': 'DocField', - 'fieldname': 'other_charges_added', - 'fieldtype': 'Currency', - 'idx': 68, - 'label': 'Other Charges Added', - 'oldfieldname': 'other_charges_added', - 'oldfieldtype': 'Currency', - 'permlevel': 1, - 'print_hide': 1 - }, - - # DocField - { - 'doctype': 'DocField', - 'fieldname': 'other_charges_deducted', - 'fieldtype': 'Currency', - 'idx': 69, - 'label': 'Other Charges Deducted', - 'oldfieldname': 'other_charges_deducted', - 'oldfieldtype': 'Currency', - 'permlevel': 1, - 'print_hide': 1 - }, - - # DocField - { - 'colour': 'White:FFF', - 'description': 'In Words will be visible once you save the Purchase Receipt.', - 'doctype': 'DocField', - 'fieldname': 'in_words', - 'fieldtype': 'Data', - 'idx': 70, - 'label': 'In Words', - 'oldfieldname': 'in_words', - 'oldfieldtype': 'Data', - 'permlevel': 1, - 'print_hide': 1 - }, - - # DocField - { - 'doctype': 'DocField', - 'fieldtype': 'Column Break', - 'idx': 71, + 'colour': u'White:FFF', + 'description': u'Transporter lorry number', + 'doctype': u'DocField', + 'fieldname': u'lr_no', + 'fieldtype': u'Data', + 'label': u'LR No', + 'no_copy': 1, + 'oldfieldname': u'lr_no', + 'oldfieldtype': u'Data', 'permlevel': 0, - 'width': '50%' + 'print_hide': 0, + 'width': u'100px' }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'net_total_import', - 'fieldtype': 'Currency', - 'idx': 72, - 'label': 'Net Total (Import)', - 'oldfieldname': 'net_total_import', - 'oldfieldtype': 'Currency', - 'permlevel': 1, - 'print_hide': 1 + 'colour': u'White:FFF', + 'description': u'Date on which lorry started from supplier warehouse', + 'doctype': u'DocField', + 'fieldname': u'lr_date', + 'fieldtype': u'Date', + 'label': u'LR Date', + 'no_copy': 1, + 'oldfieldname': u'lr_date', + 'oldfieldtype': u'Date', + 'permlevel': 0, + 'print_hide': 0, + 'width': u'100px' }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'grand_total_import', - 'fieldtype': 'Currency', - 'idx': 73, - 'label': 'Grand Total (Import)', - 'oldfieldname': 'grand_total_import', - 'oldfieldtype': 'Currency', - 'permlevel': 1, - 'print_hide': 1 + 'doctype': u'DocField', + 'fieldtype': u'Column Break', + 'permlevel': 0, + 'width': u'50%' }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'other_charges_added_import', - 'fieldtype': 'Currency', - 'idx': 74, - 'label': 'Other Charges Added (Import)', - 'oldfieldname': 'other_charges_added_import', - 'oldfieldtype': 'Currency', - 'permlevel': 1, - 'print_hide': 1 + 'colour': u'White:FFF', + 'doctype': u'DocField', + 'fieldname': u'challan_no', + 'fieldtype': u'Data', + 'label': u'Challan No', + 'no_copy': 1, + 'oldfieldname': u'challan_no', + 'oldfieldtype': u'Data', + 'permlevel': 0, + 'print_hide': 0, + 'reqd': 0, + 'width': u'100px' }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'other_charges_deducted_import', - 'fieldtype': 'Currency', - 'idx': 75, - 'label': 'Other Charges Deducted (Import)', - 'oldfieldname': 'other_charges_deducted_import', - 'oldfieldtype': 'Currency', - 'permlevel': 1, - 'print_hide': 1 + 'colour': u'White:FFF', + 'doctype': u'DocField', + 'fieldname': u'challan_date', + 'fieldtype': u'Date', + 'label': u'Challan Date', + 'no_copy': 1, + 'oldfieldname': u'challan_date', + 'oldfieldtype': u'Date', + 'permlevel': 0, + 'print_hide': 0, + 'reqd': 0, + 'width': u'100px' }, # DocField { - 'colour': 'White:FFF', - 'description': 'In Words (Import) will be visible once you save the Purchase Receipt.', - 'doctype': 'DocField', - 'fieldname': 'in_words_import', - 'fieldtype': 'Data', - 'idx': 76, - 'label': 'In Words (Import)', - 'oldfieldname': 'in_words_import', - 'oldfieldtype': 'Data', - 'permlevel': 1, - 'print_hide': 1 - }, - - # DocField - { - 'colour': 'White:FFF', - 'description': 'Following table will show values if items are sub - contracted. These values will be fetched from the master of "Bill of Materials" of sub - contracted items.', - 'doctype': 'DocField', - 'fieldtype': 'Section Break', - 'idx': 77, - 'label': 'Raw Material Details', - 'oldfieldtype': 'Section Break', + 'colour': u'White:FFF', + 'description': u'Following table will show values if items are sub - contracted. These values will be fetched from the master of "Bill of Materials" of sub - contracted items.', + 'doctype': u'DocField', + 'fieldtype': u'Section Break', + 'label': u'Raw Material Details', + 'oldfieldtype': u'Section Break', 'permlevel': 1 }, # DocField { - 'doctype': 'DocField', - 'fieldtype': 'Button', - 'idx': 78, - 'label': 'Get Current Stock', - 'oldfieldtype': 'Button', - 'options': 'get_current_stock', + 'doctype': u'DocField', + 'fieldtype': u'Button', + 'label': u'Get Current Stock', + 'oldfieldtype': u'Button', + 'options': u'get_current_stock', 'permlevel': 0 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'pr_raw_material_details', - 'fieldtype': 'Table', - 'idx': 79, - 'label': 'PR Raw Material Details', + 'doctype': u'DocField', + 'fieldname': u'pr_raw_material_details', + 'fieldtype': u'Table', + 'label': u'PR Raw Material Details', 'no_copy': 1, - 'oldfieldname': 'pr_raw_material_details', - 'oldfieldtype': 'Table', - 'options': 'PR Raw Material Detail', + 'oldfieldname': u'pr_raw_material_details', + 'oldfieldtype': u'Table', + 'options': u'PR Raw Material Detail', 'permlevel': 1, 'print_hide': 1 }, @@ -1249,13 +1150,12 @@ # DocField { 'allow_on_submit': 1, - 'colour': 'White:FFF', - 'doctype': 'DocField', - 'fieldtype': 'Button', - 'idx': 80, - 'label': 'Repair Purchase Receipt', - 'oldfieldtype': 'Button', - 'options': 'repair_purchase_receipt', + 'colour': u'White:FFF', + 'doctype': u'DocField', + 'fieldtype': u'Button', + 'label': u'Repair Purchase Receipt', + 'oldfieldtype': u'Button', + 'options': u'repair_purchase_receipt', 'permlevel': 0, 'print_hide': 1 } diff --git a/erpnext/stock/doctype/purchase_receipt_detail/purchase_receipt_detail.txt b/erpnext/stock/doctype/purchase_receipt_detail/purchase_receipt_detail.txt index 9aacefdb24d..7f636442ea3 100755 --- a/erpnext/stock/doctype/purchase_receipt_detail/purchase_receipt_detail.txt +++ b/erpnext/stock/doctype/purchase_receipt_detail/purchase_receipt_detail.txt @@ -5,67 +5,67 @@ { 'creation': '2010-08-08 17:09:16', 'docstatus': 0, - 'modified': '2011-12-14 10:50:00', - 'modified_by': 'Administrator', - 'owner': 'Administrator' + 'modified': '2012-02-27 18:43:39', + 'modified_by': u'Administrator', + 'owner': u'Administrator' }, # These values are common for all DocType { - 'autoname': 'GRND/.#######', - 'colour': 'White:FFF', - 'default_print_format': 'Standard', + 'autoname': u'GRND/.#######', + 'colour': u'White:FFF', + 'default_print_format': u'Standard', 'doctype': 'DocType', 'istable': 1, - 'module': 'Stock', + 'module': u'Stock', 'name': '__common__', - 'section_style': 'Tray', - 'server_code_error': ' ', + 'section_style': u'Tray', + 'server_code_error': u' ', 'show_in_menu': 0, - 'version': 73 + 'version': 74 }, # These values are common for all DocField { - 'doctype': 'DocField', + 'doctype': u'DocField', 'name': '__common__', - 'parent': 'Purchase Receipt Detail', - 'parentfield': 'fields', - 'parenttype': 'DocType' + 'parent': u'Purchase Receipt Detail', + 'parentfield': u'fields', + 'parenttype': u'DocType' }, # DocType, Purchase Receipt Detail { 'doctype': 'DocType', - 'name': 'Purchase Receipt Detail' + 'name': u'Purchase Receipt Detail' }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'item_code', - 'fieldtype': 'Link', + 'doctype': u'DocField', + 'fieldname': u'item_code', + 'fieldtype': u'Link', 'in_filter': 1, - 'label': 'Item Code', - 'oldfieldname': 'item_code', - 'oldfieldtype': 'Link', - 'options': 'Item', + 'label': u'Item Code', + 'oldfieldname': u'item_code', + 'oldfieldtype': u'Link', + 'options': u'Item', 'permlevel': 0, 'reqd': 1, 'search_index': 1, - 'trigger': 'Client', - 'width': '100px' + 'trigger': u'Client', + 'width': u'100px' }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'item_name', - 'fieldtype': 'Data', + 'doctype': u'DocField', + 'fieldname': u'item_name', + 'fieldtype': u'Data', 'in_filter': 0, - 'label': 'Item Name', - 'oldfieldname': 'item_name', - 'oldfieldtype': 'Data', + 'label': u'Item Name', + 'oldfieldname': u'item_name', + 'oldfieldtype': u'Data', 'permlevel': 0, 'print_hide': 1, 'reqd': 1, @@ -74,236 +74,267 @@ # DocField { - 'doctype': 'DocField', - 'fieldname': 'description', - 'fieldtype': 'Text', - 'label': 'Description', - 'oldfieldname': 'description', - 'oldfieldtype': 'Text', + 'doctype': u'DocField', + 'fieldname': u'description', + 'fieldtype': u'Text', + 'label': u'Description', + 'oldfieldname': u'description', + 'oldfieldtype': u'Text', 'permlevel': 0, 'reqd': 1, - 'width': '300px' + 'width': u'300px' }, # DocField { - 'default': '0.00', - 'doctype': 'DocField', - 'fieldname': 'received_qty', - 'fieldtype': 'Currency', - 'label': 'Recd Quantity', - 'oldfieldname': 'received_qty', - 'oldfieldtype': 'Currency', + 'default': u'0.00', + 'doctype': u'DocField', + 'fieldname': u'received_qty', + 'fieldtype': u'Currency', + 'label': u'Recd Quantity', + 'oldfieldname': u'received_qty', + 'oldfieldtype': u'Currency', 'permlevel': 0, 'reqd': 1, - 'trigger': 'Client', - 'width': '100px' + 'trigger': u'Client', + 'width': u'100px' }, # DocField { - 'default': '0.00', - 'doctype': 'DocField', - 'fieldname': 'qty', - 'fieldtype': 'Currency', - 'label': 'Accepted Quantity', - 'oldfieldname': 'qty', - 'oldfieldtype': 'Currency', + 'default': u'0.00', + 'doctype': u'DocField', + 'fieldname': u'qty', + 'fieldtype': u'Currency', + 'label': u'Accepted Quantity', + 'oldfieldname': u'qty', + 'oldfieldtype': u'Currency', 'permlevel': 0, - 'trigger': 'Client', - 'width': '100px' + 'trigger': u'Client', + 'width': u'100px' }, # DocField { - 'default': '0.00', - 'doctype': 'DocField', - 'fieldname': 'rejected_qty', - 'fieldtype': 'Currency', + 'default': u'0.00', + 'doctype': u'DocField', + 'fieldname': u'rejected_qty', + 'fieldtype': u'Currency', 'in_filter': 0, - 'label': 'Rejected Quantity', - 'oldfieldname': 'rejected_qty', - 'oldfieldtype': 'Currency', + 'label': u'Rejected Quantity', + 'oldfieldname': u'rejected_qty', + 'oldfieldtype': u'Currency', 'permlevel': 0, 'search_index': 0, - 'trigger': 'Client', - 'width': '100px' + 'trigger': u'Client', + 'width': u'100px' }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'import_ref_rate', - 'fieldtype': 'Currency', - 'label': 'Ref Rate ', + 'doctype': u'DocField', + 'fieldname': u'import_ref_rate', + 'fieldtype': u'Currency', + 'label': u'Ref Rate ', 'permlevel': 0 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'discount_rate', - 'fieldtype': 'Currency', - 'label': 'Discount %', + 'doctype': u'DocField', + 'fieldname': u'discount_rate', + 'fieldtype': u'Currency', + 'label': u'Discount %', 'permlevel': 0 }, # DocField { - 'colour': 'White:FFF', - 'default': '0.00', - 'doctype': 'DocField', - 'fieldname': 'import_rate', - 'fieldtype': 'Currency', - 'label': 'Rate', - 'oldfieldname': 'import_rate', - 'oldfieldtype': 'Currency', + 'colour': u'White:FFF', + 'default': u'0.00', + 'doctype': u'DocField', + 'fieldname': u'import_rate', + 'fieldtype': u'Currency', + 'label': u'Rate', + 'oldfieldname': u'import_rate', + 'oldfieldtype': u'Currency', 'permlevel': 0, 'print_hide': 0, - 'trigger': 'Client', - 'width': '100px' + 'trigger': u'Client', + 'width': u'100px' }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'import_amount', - 'fieldtype': 'Currency', - 'label': 'Amount', - 'oldfieldname': 'import_amount', - 'oldfieldtype': 'Currency', + 'doctype': u'DocField', + 'fieldname': u'import_amount', + 'fieldtype': u'Currency', + 'label': u'Amount', + 'oldfieldname': u'import_amount', + 'oldfieldtype': u'Currency', 'permlevel': 1 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'purchase_ref_rate', - 'fieldtype': 'Currency', - 'label': 'Ref Rate *', + 'doctype': u'DocField', + 'fieldname': u'purchase_ref_rate', + 'fieldtype': u'Currency', + 'label': u'Ref Rate *', 'permlevel': 0 }, # DocField { - 'colour': 'White:FFF', - 'default': '0.00', - 'doctype': 'DocField', - 'fieldname': 'purchase_rate', - 'fieldtype': 'Currency', - 'label': 'Rate *(Default Curr.)', - 'oldfieldname': 'purchase_rate', - 'oldfieldtype': 'Currency', + 'colour': u'White:FFF', + 'default': u'0.00', + 'doctype': u'DocField', + 'fieldname': u'purchase_rate', + 'fieldtype': u'Currency', + 'label': u'Rate *(Default Curr.)', + 'oldfieldname': u'purchase_rate', + 'oldfieldtype': u'Currency', 'permlevel': 0, 'print_hide': 1, 'reqd': 1, - 'trigger': 'Client', - 'width': '100px' + 'trigger': u'Client', + 'width': u'100px' }, # DocField { - 'default': '0.00', - 'doctype': 'DocField', - 'fieldname': 'amount', - 'fieldtype': 'Currency', - 'label': 'Amount (Default Curr.)', - 'oldfieldname': 'amount', - 'oldfieldtype': 'Currency', + 'default': u'0.00', + 'doctype': u'DocField', + 'fieldname': u'amount', + 'fieldtype': u'Currency', + 'label': u'Amount (Default Curr.)', + 'oldfieldname': u'amount', + 'oldfieldtype': u'Currency', 'permlevel': 0, 'print_hide': 1, 'reqd': 0, - 'trigger': 'Client', - 'width': '100px' + 'trigger': u'Client', + 'width': u'100px' }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'warehouse', - 'fieldtype': 'Link', + 'doctype': u'DocField', + 'fieldname': u'warehouse', + 'fieldtype': u'Link', 'hidden': 0, - 'label': 'Accepted Warehouse', - 'oldfieldname': 'warehouse', - 'oldfieldtype': 'Link', - 'options': 'Warehouse', + 'label': u'Accepted Warehouse', + 'oldfieldname': u'warehouse', + 'oldfieldtype': u'Link', + 'options': u'Warehouse', 'permlevel': 0, 'print_hide': 0, - 'width': '100px' + 'width': u'100px' }, # DocField { - 'colour': 'White:FFF', - 'doctype': 'DocField', - 'fieldname': 'uom', - 'fieldtype': 'Link', - 'label': 'UOM', - 'oldfieldname': 'uom', - 'oldfieldtype': 'Link', - 'options': 'UOM', + 'colour': u'White:FFF', + 'doctype': u'DocField', + 'fieldname': u'uom', + 'fieldtype': u'Link', + 'label': u'UOM', + 'oldfieldname': u'uom', + 'oldfieldtype': u'Link', + 'options': u'UOM', 'permlevel': 0, 'reqd': 1, - 'trigger': 'Client', - 'width': '100px' + 'trigger': u'Client', + 'width': u'100px' }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'conversion_factor', - 'fieldtype': 'Currency', - 'label': 'Conversion Factor', - 'oldfieldname': 'conversion_factor', - 'oldfieldtype': 'Currency', + 'doctype': u'DocField', + 'fieldname': u'conversion_factor', + 'fieldtype': u'Currency', + 'label': u'Conversion Factor', + 'oldfieldname': u'conversion_factor', + 'oldfieldtype': u'Currency', 'permlevel': 0, 'print_hide': 1, 'reqd': 1, - 'trigger': 'Client', - 'width': '100px' + 'trigger': u'Client', + 'width': u'100px' }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'stock_uom', - 'fieldtype': 'Data', - 'label': 'Stock UOM', - 'oldfieldname': 'stock_uom', - 'oldfieldtype': 'Data', + 'doctype': u'DocField', + 'fieldname': u'stock_uom', + 'fieldtype': u'Data', + 'label': u'Stock UOM', + 'oldfieldname': u'stock_uom', + 'oldfieldtype': u'Data', 'permlevel': 1, 'print_hide': 1, 'reqd': 1, - 'width': '100px' + 'width': u'100px' }, # DocField { - 'colour': 'White:FFF', - 'doctype': 'DocField', - 'fieldname': 'rejected_warehouse', - 'fieldtype': 'Link', + 'colour': u'White:FFF', + 'doctype': u'DocField', + 'fieldname': u'serial_no', + 'fieldtype': u'Text', + 'in_filter': 1, + 'label': u'Serial No', + 'no_copy': 1, + 'oldfieldname': u'serial_no', + 'oldfieldtype': u'Text', + 'permlevel': 0, + 'print_hide': 1, + 'report_hide': 0 + }, + + # DocField + { + 'colour': u'White:FFF', + 'doctype': u'DocField', + 'fieldname': u'batch_no', + 'fieldtype': u'Link', + 'label': u'Batch No', + 'oldfieldname': u'batch_no', + 'oldfieldtype': u'Link', + 'options': u'Batch', + 'permlevel': 0, + 'print_hide': 1, + 'trigger': u'Client' + }, + + # DocField + { + 'colour': u'White:FFF', + 'doctype': u'DocField', + 'fieldname': u'rejected_warehouse', + 'fieldtype': u'Link', 'hidden': 1, - 'label': 'Rejected Warehouse', + 'label': u'Rejected Warehouse', 'no_copy': 1, - 'oldfieldname': 'rejected_warehouse', - 'oldfieldtype': 'Link', - 'options': 'Warehouse', + 'oldfieldname': u'rejected_warehouse', + 'oldfieldtype': u'Link', + 'options': u'Warehouse', 'permlevel': 1, 'print_hide': 1, - 'width': '100px' + 'width': u'100px' }, # DocField { - 'colour': 'White:FFF', - 'doctype': 'DocField', - 'fieldname': 'schedule_date', - 'fieldtype': 'Date', - 'label': 'Schedule date', + 'colour': u'White:FFF', + 'doctype': u'DocField', + 'fieldname': u'schedule_date', + 'fieldtype': u'Date', + 'label': u'Schedule date', 'no_copy': 1, - 'oldfieldname': 'schedule_date', - 'oldfieldtype': 'Date', + 'oldfieldname': u'schedule_date', + 'oldfieldtype': u'Date', 'permlevel': 0, 'print_hide': 1, 'report_hide': 0, @@ -312,57 +343,57 @@ # DocField { - 'colour': 'White:FFF', - 'doctype': 'DocField', - 'fieldname': 'project_name', - 'fieldtype': 'Link', + 'colour': u'White:FFF', + 'doctype': u'DocField', + 'fieldname': u'project_name', + 'fieldtype': u'Link', 'in_filter': 1, - 'label': 'Project Name', - 'options': 'Project', + 'label': u'Project Name', + 'options': u'Project', 'permlevel': 0, 'print_hide': 1 }, # DocField { - 'colour': 'White:FFF', - 'doctype': 'DocField', - 'fieldname': 'qa_no', - 'fieldtype': 'Link', - 'label': 'QA No', + 'colour': u'White:FFF', + 'doctype': u'DocField', + 'fieldname': u'qa_no', + 'fieldtype': u'Link', + 'label': u'QA No', 'no_copy': 1, - 'oldfieldname': 'qa_no', - 'oldfieldtype': 'Link', - 'options': 'QA Inspection Report', + 'oldfieldname': u'qa_no', + 'oldfieldtype': u'Link', + 'options': u'QA Inspection Report', 'permlevel': 0, 'print_hide': 1 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'brand', - 'fieldtype': 'Link', + 'doctype': u'DocField', + 'fieldname': u'brand', + 'fieldtype': u'Link', 'hidden': 1, - 'label': 'Brand', - 'oldfieldname': 'brand', - 'oldfieldtype': 'Link', - 'options': 'Brand', + 'label': u'Brand', + 'oldfieldname': u'brand', + 'oldfieldtype': u'Link', + 'options': u'Brand', 'permlevel': 1, 'print_hide': 1 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'item_group', - 'fieldtype': 'Link', + 'doctype': u'DocField', + 'fieldname': u'item_group', + 'fieldtype': u'Link', 'hidden': 1, 'in_filter': 1, - 'label': 'Item Group', - 'oldfieldname': 'item_group', - 'oldfieldtype': 'Link', - 'options': 'Item Group', + 'label': u'Item Group', + 'oldfieldname': u'item_group', + 'oldfieldtype': u'Link', + 'options': u'Item Group', 'permlevel': 1, 'print_hide': 1, 'search_index': 1 @@ -370,192 +401,161 @@ # DocField { - 'colour': 'White:FFF', - 'doctype': 'DocField', - 'fieldname': 'serial_no', - 'fieldtype': 'Text', - 'in_filter': 1, - 'label': 'Serial No', - 'no_copy': 1, - 'oldfieldname': 'serial_no', - 'oldfieldtype': 'Text', + 'doctype': u'DocField', + 'fieldname': u'stock_qty', + 'fieldtype': u'Currency', + 'label': u'Stock Qty', + 'oldfieldname': u'stock_qty', + 'oldfieldtype': u'Currency', 'permlevel': 0, 'print_hide': 1, - 'report_hide': 0 + 'trigger': u'Client', + 'width': u'100px' }, # DocField { - 'colour': 'White:FFF', - 'doctype': 'DocField', - 'fieldname': 'batch_no', - 'fieldtype': 'Link', - 'label': 'Batch No', - 'oldfieldname': 'batch_no', - 'oldfieldtype': 'Link', - 'options': 'Batch', - 'permlevel': 0, - 'print_hide': 1, - 'trigger': 'Client' - }, - - # DocField - { - 'doctype': 'DocField', - 'fieldname': 'stock_qty', - 'fieldtype': 'Currency', - 'label': 'Stock Qty', - 'oldfieldname': 'stock_qty', - 'oldfieldtype': 'Currency', - 'permlevel': 0, - 'print_hide': 1, - 'trigger': 'Client', - 'width': '100px' - }, - - # DocField - { - 'colour': 'White:FFF', - 'doctype': 'DocField', - 'fieldname': 'prevdoc_doctype', - 'fieldtype': 'Data', + 'colour': u'White:FFF', + 'doctype': u'DocField', + 'fieldname': u'prevdoc_doctype', + 'fieldtype': u'Data', 'hidden': 1, - 'label': 'Prevdoc Doctype', - 'oldfieldname': 'prevdoc_doctype', - 'oldfieldtype': 'Data', + 'label': u'Prevdoc Doctype', + 'oldfieldname': u'prevdoc_doctype', + 'oldfieldtype': u'Data', 'permlevel': 0, 'print_hide': 1 }, # DocField { - 'colour': 'White:FFF', - 'doctype': 'DocField', - 'fieldname': 'prevdoc_docname', - 'fieldtype': 'Link', + 'colour': u'White:FFF', + 'doctype': u'DocField', + 'fieldname': u'prevdoc_docname', + 'fieldtype': u'Link', 'hidden': 0, 'in_filter': 1, - 'label': 'PO No', + 'label': u'PO No', 'no_copy': 0, - 'oldfieldname': 'prevdoc_docname', - 'oldfieldtype': 'Link', - 'options': 'Purchase Order', + 'oldfieldname': u'prevdoc_docname', + 'oldfieldtype': u'Link', + 'options': u'Purchase Order', 'permlevel': 1, 'print_hide': 0, 'reqd': 0, 'search_index': 1, - 'width': '150px' + 'width': u'150px' }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'prevdoc_date', - 'fieldtype': 'Date', + 'doctype': u'DocField', + 'fieldname': u'prevdoc_date', + 'fieldtype': u'Date', 'hidden': 1, 'in_filter': 1, - 'label': 'PO Date', - 'oldfieldname': 'prevdoc_date', - 'oldfieldtype': 'Date', + 'label': u'PO Date', + 'oldfieldname': u'prevdoc_date', + 'oldfieldtype': u'Date', 'permlevel': 1, 'print_hide': 1 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'rm_supp_cost', - 'fieldtype': 'Currency', + 'doctype': u'DocField', + 'fieldname': u'rm_supp_cost', + 'fieldtype': u'Currency', 'hidden': 1, 'in_filter': 0, - 'label': 'Raw Materials Supplied Cost', - 'oldfieldname': 'rm_supp_cost', - 'oldfieldtype': 'Currency', + 'label': u'Raw Materials Supplied Cost', + 'oldfieldname': u'rm_supp_cost', + 'oldfieldtype': u'Currency', 'permlevel': 2, 'print_hide': 1, - 'width': '150px' + 'width': u'150px' }, # DocField { - 'colour': 'White:FFF', - 'doctype': 'DocField', - 'fieldname': 'item_tax_amount', - 'fieldtype': 'Currency', + 'colour': u'White:FFF', + 'doctype': u'DocField', + 'fieldname': u'item_tax_amount', + 'fieldtype': u'Currency', 'hidden': 1, - 'label': 'Item Tax Amount', + 'label': u'Item Tax Amount', 'no_copy': 1, - 'oldfieldname': 'item_tax_amount', - 'oldfieldtype': 'Currency', + 'oldfieldname': u'item_tax_amount', + 'oldfieldtype': u'Currency', 'permlevel': 1, 'print_hide': 1, 'reqd': 0, 'search_index': 1, - 'width': '150px' + 'width': u'150px' }, # DocField { - 'colour': 'White:FFF', - 'doctype': 'DocField', - 'fieldname': 'prevdoc_detail_docname', - 'fieldtype': 'Data', + 'colour': u'White:FFF', + 'doctype': u'DocField', + 'fieldname': u'prevdoc_detail_docname', + 'fieldtype': u'Data', 'hidden': 1, 'in_filter': 1, - 'label': 'PO Detail No', + 'label': u'PO Detail No', 'no_copy': 0, - 'oldfieldname': 'prevdoc_detail_docname', - 'oldfieldtype': 'Data', + 'oldfieldname': u'prevdoc_detail_docname', + 'oldfieldtype': u'Data', 'permlevel': 1, 'print_hide': 1, 'search_index': 1, - 'width': '150px' + 'width': u'150px' }, # DocField { - 'default': '0.00', - 'doctype': 'DocField', - 'fieldname': 'billed_qty', - 'fieldtype': 'Currency', - 'label': 'Billed Quantity', + 'default': u'0.00', + 'doctype': u'DocField', + 'fieldname': u'billed_qty', + 'fieldtype': u'Currency', + 'label': u'Billed Quantity', 'no_copy': 1, - 'oldfieldname': 'billed_qty', - 'oldfieldtype': 'Currency', + 'oldfieldname': u'billed_qty', + 'oldfieldtype': u'Currency', 'permlevel': 1, 'print_hide': 1, - 'width': '100px' + 'width': u'100px' }, # DocField { - 'colour': 'White:FFF', - 'doctype': 'DocField', - 'fieldname': 'valuation_rate', - 'fieldtype': 'Currency', + 'colour': u'White:FFF', + 'doctype': u'DocField', + 'fieldname': u'valuation_rate', + 'fieldtype': u'Currency', 'hidden': 1, 'in_filter': 0, - 'label': 'Valuation Rate', + 'label': u'Valuation Rate', 'no_copy': 1, - 'oldfieldname': 'valuation_rate', - 'oldfieldtype': 'Currency', + 'oldfieldname': u'valuation_rate', + 'oldfieldtype': u'Currency', 'permlevel': 1, 'print_hide': 1, - 'width': '80px' + 'width': u'80px' }, # DocField { - 'colour': 'White:FFF', - 'description': 'Tax detail table fetched from item master as a string and stored in this field.\nUsed for Purchase Other Charges', - 'doctype': 'DocField', - 'fieldname': 'item_tax_rate', - 'fieldtype': 'Small Text', + 'colour': u'White:FFF', + 'description': u'Tax detail table fetched from item master as a string and stored in this field.\nUsed for Purchase Other Charges', + 'doctype': u'DocField', + 'fieldname': u'item_tax_rate', + 'fieldtype': u'Small Text', 'hidden': 1, 'in_filter': 0, - 'label': 'Item Tax Rate', - 'oldfieldname': 'item_tax_rate', - 'oldfieldtype': 'Small Text', + 'label': u'Item Tax Rate', + 'oldfieldname': u'item_tax_rate', + 'oldfieldtype': u'Small Text', 'permlevel': 1, 'print_hide': 1, 'report_hide': 1 @@ -564,12 +564,12 @@ # DocField { 'allow_on_submit': 1, - 'doctype': 'DocField', - 'fieldname': 'page_break', - 'fieldtype': 'Check', - 'label': 'Page Break', - 'oldfieldname': 'page_break', - 'oldfieldtype': 'Check', + 'doctype': u'DocField', + 'fieldname': u'page_break', + 'fieldtype': u'Check', + 'label': u'Page Break', + 'oldfieldname': u'page_break', + 'oldfieldtype': u'Check', 'permlevel': 0, 'print_hide': 1 }