Merge branch 'master' into sync
Conflicts:
version.num
diff --git a/erpnext/accounts/doctype/pv_detail/pv_detail.txt b/erpnext/accounts/doctype/pv_detail/pv_detail.txt
index 54f77bd..423f667 100755
--- a/erpnext/accounts/doctype/pv_detail/pv_detail.txt
+++ b/erpnext/accounts/doctype/pv_detail/pv_detail.txt
@@ -5,7 +5,7 @@
{
'creation': '2010-08-08 17:09:17',
'docstatus': 0,
- 'modified': '2012-03-05 10:54:12',
+ 'modified': '2012-03-05 15:02:25',
'modified_by': u'Administrator',
'owner': u'Administrator'
},
@@ -22,7 +22,7 @@
'section_style': u'Tray',
'server_code_error': u' ',
'show_in_menu': 0,
- 'version': 45
+ 'version': 46
},
# These values are common for all DocField
@@ -100,9 +100,9 @@
# DocField
{
'doctype': u'DocField',
- 'fieldname': u'purchase_ref_rate',
+ 'fieldname': u'import_ref_rate',
'fieldtype': u'Currency',
- 'label': u'Ref Rate *',
+ 'label': u'Ref Rate ',
'permlevel': 0,
'print_hide': 1,
'trigger': u'Client'
@@ -122,6 +122,43 @@
# DocField
{
'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': u'Client'
+ },
+
+ # DocField
+ {
+ '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': u'DocField',
+ 'fieldname': u'purchase_ref_rate',
+ 'fieldtype': u'Currency',
+ 'label': u'Ref Rate *',
+ 'permlevel': 0,
+ 'print_hide': 1,
+ 'trigger': u'Client'
+ },
+
+ # DocField
+ {
+ 'doctype': u'DocField',
'fieldname': u'rate',
'fieldtype': u'Currency',
'label': u'Rate *(Default Curr.)',
@@ -148,43 +185,6 @@
# DocField
{
- 'doctype': u'DocField',
- 'fieldname': u'import_ref_rate',
- 'fieldtype': u'Currency',
- 'label': u'Ref Rate ',
- 'permlevel': 0,
- 'print_hide': 1,
- 'trigger': u'Client'
- },
-
- # DocField
- {
- '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': u'Client'
- },
-
- # DocField
- {
- '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
- {
'colour': u'White:FFF',
'doctype': u'DocField',
'fieldname': u'expense_head',
diff --git a/erpnext/accounts/doctype/receivable_voucher/receivable_voucher.txt b/erpnext/accounts/doctype/receivable_voucher/receivable_voucher.txt
index 54794cf..546d997 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-03-02 12:22:21',
+ 'modified': '2012-03-06 11:05:53',
'modified_by': u'Administrator',
'owner': u'Administrator'
},
@@ -21,7 +21,7 @@
# These values are common for all DocType
{
- '_last_update': u'1330593645',
+ '_last_update': u'1330671142',
'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': 415
+ 'version': 416
},
# These values are common for all DocFormat
@@ -176,7 +176,6 @@
# DocField
{
'colour': u'White:FFF',
- 'default': u'INV',
'depends_on': u'eval:doc.retail_transaction!="Yes"',
'description': u'To manage multiple series please go to Setup > Manage Series',
'doctype': u'DocField',
diff --git a/erpnext/accounts/doctype/rv_detail/rv_detail.txt b/erpnext/accounts/doctype/rv_detail/rv_detail.txt
index 7c599d1..314dcd7 100644
--- a/erpnext/accounts/doctype/rv_detail/rv_detail.txt
+++ b/erpnext/accounts/doctype/rv_detail/rv_detail.txt
@@ -5,7 +5,7 @@
{
'creation': '2010-08-08 17:09:20',
'docstatus': 0,
- 'modified': '2012-03-05 10:50:03',
+ 'modified': '2012-03-05 15:01:04',
'modified_by': u'Administrator',
'owner': u'Administrator'
},
@@ -22,7 +22,7 @@
'section_style': u'Tray',
'server_code_error': u' ',
'show_in_menu': 0,
- 'version': 28
+ 'version': 29
},
# These values are common for all DocField
@@ -109,14 +109,17 @@
# DocField
{
+ 'colour': u'White:FFF',
'doctype': u'DocField',
- 'fieldname': u'base_ref_rate',
+ 'fieldname': u'ref_rate',
'fieldtype': u'Currency',
- 'label': u'Price List Rate*',
- 'oldfieldname': u'base_ref_rate',
+ 'label': u'Price List Rate',
+ 'oldfieldname': u'ref_rate',
'oldfieldtype': u'Currency',
- 'permlevel': 1,
- 'print_hide': 1
+ 'permlevel': 0,
+ 'print_hide': 1,
+ 'reqd': 0,
+ 'trigger': u'Client'
},
# DocField
@@ -135,6 +138,43 @@
# DocField
{
+ 'doctype': u'DocField',
+ 'fieldname': u'export_rate',
+ 'fieldtype': u'Currency',
+ 'label': u'Basic Rate',
+ 'oldfieldname': u'export_rate',
+ 'oldfieldtype': u'Currency',
+ 'permlevel': 0,
+ 'reqd': 1,
+ 'trigger': u'Client'
+ },
+
+ # DocField
+ {
+ 'doctype': u'DocField',
+ 'fieldname': u'export_amount',
+ 'fieldtype': u'Currency',
+ 'label': u'Amount',
+ 'oldfieldname': u'export_amount',
+ 'oldfieldtype': u'Currency',
+ 'permlevel': 1,
+ 'reqd': 1
+ },
+
+ # DocField
+ {
+ 'doctype': u'DocField',
+ 'fieldname': u'base_ref_rate',
+ 'fieldtype': u'Currency',
+ 'label': u'Price List Rate*',
+ 'oldfieldname': u'base_ref_rate',
+ 'oldfieldtype': u'Currency',
+ 'permlevel': 1,
+ 'print_hide': 1
+ },
+
+ # DocField
+ {
'colour': u'White:FFF',
'doctype': u'DocField',
'fieldname': u'basic_rate',
@@ -165,46 +205,6 @@
# DocField
{
- 'colour': u'White:FFF',
- 'doctype': u'DocField',
- 'fieldname': u'ref_rate',
- 'fieldtype': u'Currency',
- 'label': u'Price List Rate',
- 'oldfieldname': u'ref_rate',
- 'oldfieldtype': u'Currency',
- 'permlevel': 0,
- 'print_hide': 1,
- 'reqd': 0,
- 'trigger': u'Client'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'export_rate',
- 'fieldtype': u'Currency',
- 'label': u'Basic Rate',
- 'oldfieldname': u'export_rate',
- 'oldfieldtype': u'Currency',
- 'permlevel': 0,
- 'reqd': 1,
- 'trigger': u'Client'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'export_amount',
- 'fieldtype': u'Currency',
- 'label': u'Amount',
- 'oldfieldname': u'export_amount',
- 'oldfieldtype': u'Currency',
- 'permlevel': 1,
- 'reqd': 1
- },
-
- # DocField
- {
'doctype': u'DocField',
'fieldname': u'warehouse',
'fieldtype': u'Link',
diff --git a/erpnext/buying/doctype/po_detail/po_detail.txt b/erpnext/buying/doctype/po_detail/po_detail.txt
index d903ef1..b625e4e 100755
--- a/erpnext/buying/doctype/po_detail/po_detail.txt
+++ b/erpnext/buying/doctype/po_detail/po_detail.txt
@@ -5,7 +5,7 @@
{
'creation': '2010-08-08 17:09:12',
'docstatus': 0,
- 'modified': '2012-03-05 10:50:51',
+ 'modified': '2012-03-05 15:01:31',
'modified_by': u'Administrator',
'owner': u'Administrator'
},
@@ -22,7 +22,7 @@
'section_style': u'Tray',
'server_code_error': u' ',
'show_in_menu': 0,
- 'version': 64
+ 'version': 65
},
# These values are common for all DocField
@@ -121,9 +121,9 @@
# DocField
{
'doctype': u'DocField',
- 'fieldname': u'purchase_ref_rate',
+ 'fieldname': u'import_ref_rate',
'fieldtype': u'Currency',
- 'label': u'Ref Rate *',
+ 'label': u'Ref Rate ',
'permlevel': 0,
'print_hide': 1
},
@@ -141,6 +141,41 @@
# DocField
{
+ 'doctype': u'DocField',
+ 'fieldname': u'import_rate',
+ 'fieldtype': u'Currency',
+ 'hidden': 0,
+ 'label': u'Rate ',
+ 'oldfieldname': u'import_rate',
+ 'oldfieldtype': u'Currency',
+ 'permlevel': 0,
+ 'print_hide': 0,
+ 'trigger': u'Client'
+ },
+
+ # DocField
+ {
+ 'doctype': u'DocField',
+ 'fieldname': u'import_amount',
+ 'fieldtype': u'Currency',
+ 'label': u'Amount',
+ 'oldfieldname': u'import_amount',
+ 'oldfieldtype': u'Currency',
+ 'permlevel': 1
+ },
+
+ # DocField
+ {
+ 'doctype': u'DocField',
+ 'fieldname': u'purchase_ref_rate',
+ 'fieldtype': u'Currency',
+ 'label': u'Ref Rate *',
+ 'permlevel': 0,
+ 'print_hide': 1
+ },
+
+ # DocField
+ {
'default': u'0.00',
'doctype': u'DocField',
'fieldname': u'purchase_rate',
@@ -172,41 +207,6 @@
# DocField
{
'doctype': u'DocField',
- 'fieldname': u'import_ref_rate',
- 'fieldtype': u'Currency',
- 'label': u'Ref Rate ',
- 'permlevel': 0,
- 'print_hide': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'import_rate',
- 'fieldtype': u'Currency',
- 'hidden': 0,
- 'label': u'Rate ',
- 'oldfieldname': u'import_rate',
- 'oldfieldtype': u'Currency',
- 'permlevel': 0,
- 'print_hide': 0,
- 'trigger': u'Client'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'import_amount',
- 'fieldtype': u'Currency',
- 'label': u'Amount',
- 'oldfieldname': u'import_amount',
- 'oldfieldtype': u'Currency',
- 'permlevel': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
'fieldname': u'warehouse',
'fieldtype': u'Link',
'hidden': 0,
diff --git a/erpnext/buying/doctype/purchase_common/purchase_common.js b/erpnext/buying/doctype/purchase_common/purchase_common.js
index 88fba5c..9a414a3 100644
--- a/erpnext/buying/doctype/purchase_common/purchase_common.js
+++ b/erpnext/buying/doctype/purchase_common/purchase_common.js
@@ -100,19 +100,19 @@
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_import) {
+ 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);
+ 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);
+ cur_frm.fields_dict[cur_frm.cscript.fname].grid.set_column_disp('purchase_rate', hide);
}
//tax table flds
diff --git a/erpnext/home/__init__.py b/erpnext/home/__init__.py
index 2cca85a..8118ea6 100644
--- a/erpnext/home/__init__.py
+++ b/erpnext/home/__init__.py
@@ -47,7 +47,7 @@
# Support
'Customer Issue': ['[%(status)s] %(description)s by %(customer_name)s', '#000080'],
'Maintenance Visit':['To %(customer_name)s', '#4169E1'],
- 'Support Ticket': ['[%(status)s] %(subject)s', '#000080'],
+ 'Support Ticket': ["[%(status)s] %(subject)s", '#000080'],
# Website
'Web Page': ['%(title)s', '#000080'],
diff --git a/erpnext/home/page/my_company/my_company.py b/erpnext/home/page/my_company/my_company.py
index f35f475..d3a7bc7 100644
--- a/erpnext/home/page/my_company/my_company.py
+++ b/erpnext/home/page/my_company/my_company.py
@@ -67,7 +67,7 @@
# erpnext-saas
if cint(webnotes.conn.get_value('Control Panel', None, 'sync_with_gateway')):
from server_tools.gateway_utils import add_user_gateway
- add_user_gateway(args['user'])
+ add_user_gateway(args)
add_profile(args)
diff --git a/erpnext/patches/jan_mar_2012/reload_table.py b/erpnext/patches/jan_mar_2012/reload_table.py
index 14b8864..481b46f 100644
--- a/erpnext/patches/jan_mar_2012/reload_table.py
+++ b/erpnext/patches/jan_mar_2012/reload_table.py
@@ -2,8 +2,10 @@
import webnotes
from webnotes.modules.module_manager import reload_doc
reload_doc('selling', 'doctype', 'quotation_detail')
+ reload_doc('selling', 'doctype', 'sales_order_detail')
reload_doc('stock', 'doctype', 'delivery_note_detail')
reload_doc('stock', 'doctype', 'purchase_receipt_detail')
reload_doc('buying', 'doctype', 'po_detail')
reload_doc('accounts', 'doctype', 'rv_detail')
reload_doc('accounts', 'doctype', 'pv_detail')
+
diff --git a/erpnext/patches/jan_mar_2012/remove_series_defval.py b/erpnext/patches/jan_mar_2012/remove_series_defval.py
new file mode 100644
index 0000000..123cc41
--- /dev/null
+++ b/erpnext/patches/jan_mar_2012/remove_series_defval.py
@@ -0,0 +1,3 @@
+def execute():
+ import webnotes
+ webnotes.conn.sql("update `tabDocField` set `default`='' where parent = 'Receivable Voucher' and fieldname = 'naming_series' and `default` = 'INV'")
diff --git a/erpnext/patches/patch_list.py b/erpnext/patches/patch_list.py
index 7750962..85a11a5 100644
--- a/erpnext/patches/patch_list.py
+++ b/erpnext/patches/patch_list.py
@@ -177,5 +177,10 @@
'patch_file': 'reload_table',
'description': 'Relaod all item table: fld order changes'
},
+ {
+ 'patch_module': 'patches.jan_mar_2012',
+ 'patch_file': 'remove_series_defval',
+ 'description': 'Remove rv series default value'
+ },
]
diff --git a/erpnext/selling/doctype/quotation_detail/quotation_detail.txt b/erpnext/selling/doctype/quotation_detail/quotation_detail.txt
index 81bf64d..1b55879 100644
--- a/erpnext/selling/doctype/quotation_detail/quotation_detail.txt
+++ b/erpnext/selling/doctype/quotation_detail/quotation_detail.txt
@@ -5,7 +5,7 @@
{
'creation': '2010-08-08 17:09:18',
'docstatus': 0,
- 'modified': '2012-03-05 10:48:27',
+ 'modified': '2012-03-05 15:00:10',
'modified_by': u'Administrator',
'owner': u'Administrator'
},
@@ -23,7 +23,7 @@
'section_style': u'Tray',
'server_code_error': u' ',
'show_in_menu': 0,
- 'version': 32
+ 'version': 33
},
# These values are common for all DocField
@@ -110,14 +110,17 @@
# DocField
{
+ 'default': u'0.00',
'doctype': u'DocField',
- 'fieldname': u'base_ref_rate',
+ 'fieldname': u'ref_rate',
'fieldtype': u'Currency',
- 'label': u'Price List Rate*',
- 'oldfieldname': u'base_ref_rate',
+ 'label': u'Price List Rate',
+ 'oldfieldname': u'ref_rate',
'oldfieldtype': u'Currency',
- 'permlevel': 1,
+ 'permlevel': 0,
'print_hide': 1,
+ 'reqd': 0,
+ 'trigger': u'Client',
'width': u'100px'
},
@@ -140,58 +143,6 @@
{
'default': u'0.00',
'doctype': u'DocField',
- 'fieldname': u'basic_rate',
- 'fieldtype': u'Currency',
- 'in_filter': 0,
- 'label': u'Basic Rate*',
- 'oldfieldname': u'basic_rate',
- 'oldfieldtype': u'Currency',
- 'permlevel': 0,
- 'print_hide': 1,
- 'reqd': 0,
- 'search_index': 0,
- 'trigger': u'Client',
- 'width': u'100px'
- },
-
- # DocField
- {
- 'default': u'0.00',
- 'doctype': u'DocField',
- 'fieldname': u'amount',
- 'fieldtype': u'Currency',
- 'in_filter': 0,
- 'label': u'Amount*',
- 'oldfieldname': u'amount',
- 'oldfieldtype': u'Currency',
- 'permlevel': 1,
- 'print_hide': 1,
- 'reqd': 0,
- 'search_index': 0,
- 'trigger': u'Client',
- 'width': u'100px'
- },
-
- # DocField
- {
- 'default': u'0.00',
- 'doctype': u'DocField',
- 'fieldname': u'ref_rate',
- 'fieldtype': u'Currency',
- 'label': u'Price List Rate',
- 'oldfieldname': u'ref_rate',
- 'oldfieldtype': u'Currency',
- 'permlevel': 0,
- 'print_hide': 1,
- 'reqd': 0,
- 'trigger': u'Client',
- 'width': u'100px'
- },
-
- # DocField
- {
- 'default': u'0.00',
- 'doctype': u'DocField',
'fieldname': u'export_rate',
'fieldtype': u'Currency',
'in_filter': 0,
@@ -225,6 +176,55 @@
# DocField
{
+ 'doctype': u'DocField',
+ 'fieldname': u'base_ref_rate',
+ 'fieldtype': u'Currency',
+ 'label': u'Price List Rate*',
+ 'oldfieldname': u'base_ref_rate',
+ 'oldfieldtype': u'Currency',
+ 'permlevel': 1,
+ 'print_hide': 1,
+ 'width': u'100px'
+ },
+
+ # DocField
+ {
+ 'default': u'0.00',
+ 'doctype': u'DocField',
+ 'fieldname': u'basic_rate',
+ 'fieldtype': u'Currency',
+ 'in_filter': 0,
+ 'label': u'Basic Rate*',
+ 'oldfieldname': u'basic_rate',
+ 'oldfieldtype': u'Currency',
+ 'permlevel': 0,
+ 'print_hide': 1,
+ 'reqd': 0,
+ 'search_index': 0,
+ 'trigger': u'Client',
+ 'width': u'100px'
+ },
+
+ # DocField
+ {
+ 'default': u'0.00',
+ 'doctype': u'DocField',
+ 'fieldname': u'amount',
+ 'fieldtype': u'Currency',
+ 'in_filter': 0,
+ 'label': u'Amount*',
+ 'oldfieldname': u'amount',
+ 'oldfieldtype': u'Currency',
+ 'permlevel': 1,
+ 'print_hide': 1,
+ 'reqd': 0,
+ 'search_index': 0,
+ 'trigger': u'Client',
+ 'width': u'100px'
+ },
+
+ # DocField
+ {
'colour': u'White:FFF',
'doctype': u'DocField',
'fieldname': u'stock_uom',
diff --git a/erpnext/selling/doctype/sales_common/sales_common.js b/erpnext/selling/doctype/sales_common/sales_common.js
index 97b20eb..cad8ec1 100644
--- a/erpnext/selling/doctype/sales_common/sales_common.js
+++ b/erpnext/selling/doctype/sales_common/sales_common.js
@@ -121,7 +121,7 @@
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_export) {
+ for (f in item_cols_base) {
cur_frm.fields_dict[cur_frm.cscript.fname].grid.set_column_disp(f, hide);
}
@@ -658,10 +658,10 @@
'basic_rate': flt(flt(cl[i].export_rate) * flt(doc.conversion_rate)),
'amount': roundNumber(flt((flt(cl[i].export_rate) * flt(doc.conversion_rate)) * flt(cl[i].qty)), 2)
}, fname);
- var base_ref_rate = flt(cl[i].basic_rate) + flt(flt(cl[i].basic_rate) * flt(cl[i].adj_rate) / 100);
- set_multiple(tname, cl[i].name, {
- 'base_ref_rate': flt(base_ref_rate)
- }, fname);
+ //var base_ref_rate = flt(cl[i].basic_rate) + flt(flt(cl[i].basic_rate) * flt(cl[i].adj_rate) / 100);
+ //set_multiple(tname, cl[i].name, {
+ // 'base_ref_rate': flt(base_ref_rate)
+ //}, fname);
} else if(consider_incl_rate) {
if(flt(cl[i].export_rate) > 0) {
diff --git a/erpnext/selling/doctype/sales_order_detail/sales_order_detail.txt b/erpnext/selling/doctype/sales_order_detail/sales_order_detail.txt
index 3205d6e..c0a01f1 100644
--- a/erpnext/selling/doctype/sales_order_detail/sales_order_detail.txt
+++ b/erpnext/selling/doctype/sales_order_detail/sales_order_detail.txt
@@ -5,7 +5,7 @@
{
'creation': '2010-08-08 17:09:22',
'docstatus': 0,
- 'modified': '2012-03-02 15:49:26',
+ 'modified': '2012-03-05 14:59:43',
'modified_by': u'Administrator',
'owner': u'Administrator'
},
@@ -22,7 +22,7 @@
'section_style': u'Tray',
'server_code_error': u' ',
'show_in_menu': 0,
- 'version': 53
+ 'version': 54
},
# These values are common for all DocField
@@ -117,15 +117,18 @@
# DocField
{
+ 'default': u'0.00',
'doctype': u'DocField',
- 'fieldname': u'base_ref_rate',
+ 'fieldname': u'ref_rate',
'fieldtype': u'Currency',
- 'label': u'Price List Rate*',
- 'oldfieldname': u'base_ref_rate',
+ 'label': u'Price List Rate',
+ 'oldfieldname': u'ref_rate',
'oldfieldtype': u'Currency',
- 'permlevel': 1,
+ 'permlevel': 0,
'print_hide': 1,
- 'width': u'100px'
+ 'reqd': 0,
+ 'trigger': u'Client',
+ 'width': u'70px'
},
# DocField
@@ -147,54 +150,6 @@
{
'default': u'0.00',
'doctype': u'DocField',
- 'fieldname': u'basic_rate',
- 'fieldtype': u'Currency',
- 'label': u'Basic Rate*',
- 'oldfieldname': u'basic_rate',
- 'oldfieldtype': u'Currency',
- 'permlevel': 0,
- 'print_hide': 1,
- 'reqd': 0,
- 'trigger': u'Client',
- 'width': u'100px'
- },
-
- # DocField
- {
- 'default': u'0.00',
- 'doctype': u'DocField',
- 'fieldname': u'amount',
- 'fieldtype': u'Currency',
- 'label': u'Amount*',
- 'no_copy': 0,
- 'oldfieldname': u'amount',
- 'oldfieldtype': u'Currency',
- 'permlevel': 1,
- 'print_hide': 1,
- 'reqd': 0,
- 'width': u'100px'
- },
-
- # DocField
- {
- 'default': u'0.00',
- 'doctype': u'DocField',
- 'fieldname': u'ref_rate',
- 'fieldtype': u'Currency',
- 'label': u'Price List Rate',
- 'oldfieldname': u'ref_rate',
- 'oldfieldtype': u'Currency',
- 'permlevel': 0,
- 'print_hide': 1,
- 'reqd': 0,
- 'trigger': u'Client',
- 'width': u'70px'
- },
-
- # DocField
- {
- 'default': u'0.00',
- 'doctype': u'DocField',
'fieldname': u'export_rate',
'fieldtype': u'Currency',
'label': u'Rate',
@@ -224,6 +179,51 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'base_ref_rate',
+ 'fieldtype': u'Currency',
+ 'label': u'Price List Rate*',
+ 'oldfieldname': u'base_ref_rate',
+ 'oldfieldtype': u'Currency',
+ 'permlevel': 1,
+ 'print_hide': 1,
+ 'width': u'100px'
+ },
+
+ # DocField
+ {
+ 'default': u'0.00',
+ 'doctype': u'DocField',
+ 'fieldname': u'basic_rate',
+ 'fieldtype': u'Currency',
+ 'label': u'Basic Rate*',
+ 'oldfieldname': u'basic_rate',
+ 'oldfieldtype': u'Currency',
+ 'permlevel': 0,
+ 'print_hide': 1,
+ 'reqd': 0,
+ 'trigger': u'Client',
+ 'width': u'100px'
+ },
+
+ # DocField
+ {
+ 'default': u'0.00',
+ 'doctype': u'DocField',
+ 'fieldname': u'amount',
+ 'fieldtype': u'Currency',
+ 'label': u'Amount*',
+ 'no_copy': 0,
+ 'oldfieldname': u'amount',
+ 'oldfieldtype': u'Currency',
+ 'permlevel': 1,
+ 'print_hide': 1,
+ 'reqd': 0,
+ 'width': u'100px'
+ },
+
+ # DocField
+ {
+ 'doctype': u'DocField',
'fieldname': u'reserved_warehouse',
'fieldtype': u'Link',
'label': u'Reserved Warehouse',
diff --git a/erpnext/setup/doctype/email_digest/email_digest.py b/erpnext/setup/doctype/email_digest/email_digest.py
index c5989bb..ff9bf68 100644
--- a/erpnext/setup/doctype/email_digest/email_digest.py
+++ b/erpnext/setup/doctype/email_digest/email_digest.py
@@ -282,7 +282,8 @@
Returns start and end date depending on the frequency of email digest
"""
from datetime import datetime, date, timedelta
- today = datetime.now().date()
+ from webnotes.utils import now_datetime
+ today = now_datetime().date()
year, month, day = today.year, today.month, today.day
if self.doc.frequency == 'Daily':
@@ -409,6 +410,7 @@
from webnotes.utils.email_lib import sendmail
try:
+ #webnotes.msgprint('in send')
sendmail(
recipients=recipient_list,
sender='notifications+email_digest@erpnext.com',
@@ -419,64 +421,22 @@
)
except Exception, e:
webnotes.msgprint('There was a problem in sending your email. Please contact support@erpnext.com')
- #webnotes.errprint(webnotes.getTraceback())
+ webnotes.errprint(webnotes.getTraceback())
def get_next_sending(self):
- """
-
- """
- # Get TimeZone
- # Get System TimeZone
- import time
- from pytz import timezone
import datetime
- import webnotes.defs
- cp = webnotes.model.doc.Document('Control Panel','Control Panel')
- app_tz = timezone(cp.time_zone)
- server_tz = timezone(getattr(webnotes.defs, 'system_timezone'))
start_date, end_date = self.get_start_end_dates()
- new_date = end_date + datetime.timedelta(days=1)
- new_time = datetime.time(hour=6)
-
- naive_dt = datetime.datetime.combine(new_date, new_time)
- app_dt = app_tz.localize(naive_dt)
- server_dt = server_tz.normalize(app_dt.astimezone(server_tz))
-
- res = {
- 'app_dt': app_dt.replace(tzinfo=None),
- 'app_tz': app_tz,
- 'server_dt': server_dt.replace(tzinfo=None),
- 'server_tz': server_tz
- }
-
+ send_date = end_date + datetime.timedelta(days=1)
+
from webnotes.utils import formatdate
- str_date = formatdate(str(res['app_dt'].date()))
- str_time = res['app_dt'].time().strftime('%I:%M')
+ str_date = formatdate(str(send_date))
- self.doc.next_send = str_date + " at about " + str_time
+ self.doc.next_send = str_date + " at midnight"
- return res
-
-
- def get_next_execution(self):
- """
-
- """
- from datetime import datetime, timedelta
- dt_args = self.get_next_sending()
- server_dt = dt_args['server_dt']
- now_dt = datetime.now(dt_args['server_tz'])
- if now_dt.time() <= server_dt.time():
- next_date = now_dt.date()
- else:
- next_date = now_dt.date() + timedelta(days=1)
-
- next_time = server_dt.time()
-
- return datetime.combine(next_date, next_time)
+ return send_date
def onload(self):
@@ -743,21 +703,16 @@
""", as_list=1)
from webnotes.model.code import get_obj
- from datetime import datetime, timedelta
- now = datetime.now()
- now_date = now.date()
- now_time = (now + timedelta(hours=2)).time()
+ from webnotes.utils import now_datetime
+ now_date = now_datetime().date()
+
for ed in edigest_list:
if ed[0]:
ed_obj = get_obj('Email Digest', ed[0])
ed_obj.sending = True
- dt_dict = ed_obj.get_next_sending()
- send_date = dt_dict['server_dt'].date()
- send_time = dt_dict['server_dt'].time()
+ send_date = ed_obj.get_next_sending()
+ #webnotes.msgprint([ed[0], now_date, send_date])
if (now_date == send_date):
- #webnotes.msgprint('sending ' + ed_obj.doc.name)
ed_obj.send()
- #else:
- # webnotes.msgprint('not sending ' + ed_obj.doc.name)
diff --git a/erpnext/setup/doctype/email_settings/email_settings.py b/erpnext/setup/doctype/email_settings/email_settings.py
index 0f930bc..c670b31 100644
--- a/erpnext/setup/doctype/email_settings/email_settings.py
+++ b/erpnext/setup/doctype/email_settings/email_settings.py
@@ -35,8 +35,8 @@
"""
Update value in control panel
"""
- if self.doc.fields.get(key):
- webnotes.conn.set_value('Control Panel', None, key, self.doc.fields[key])
+ webnotes.conn.set_value('Control Panel', None, key,
+ self.doc.fields.get(key))
def validate(self):
"""
@@ -117,19 +117,7 @@
def on_update(self):
"""
- Sets or cancels the event in the scheduler
+ update control panel
"""
- # update control panel
for f in ('outgoing_mail_server', 'mail_login', 'mail_password', 'auto_email_id', 'mail_port', 'use_ssl'):
self.set_cp_value(f)
-
- # setup scheduler for support emails
- if cint(self.doc.sync_support_mails):
- if not (self.doc.support_host and self.doc.support_username and self.doc.support_password):
- webnotes.msgprint("You must give the incoming POP3 settings for support emails to activiate mailbox integration", raise_exception=1)
-
- from webnotes.utils.scheduler import set_event
- set_event('support.doctype.support_ticket.get_support_mails', 60*5, 1)
- else:
- from webnotes.utils.scheduler import cancel_event
- cancel_event('support.doctype.support_ticket.get_support_mails')
diff --git a/erpnext/startup/js/feature_setup.js b/erpnext/startup/js/feature_setup.js
index c5518ab..8006dca 100644
--- a/erpnext/startup/js/feature_setup.js
+++ b/erpnext/startup/js/feature_setup.js
@@ -122,18 +122,18 @@
'Sales Order': {'sales_order_details':['page_break']}
},
'fs_exports': {
- 'Delivery Note': {'fields':['Note','conversion_rate','currency','grand_total_export','in_words_export','rounded_total_export'],'delivery_note_details':['ref_rate','export_amount','export_rate']},
+ 'Delivery Note': {'fields':['Note','conversion_rate','currency','grand_total_export','in_words_export','rounded_total_export'],'delivery_note_details':['base_ref_rate','amount','basic_rate']},
'POS Setting': {'fields':['conversion_rate','currency']},
- 'Quotation': {'fields':['Note HTML','OT Notes','conversion_rate','currency','grand_total_export','in_words_export','rounded_total_export'],'quotation_details':['ref_rate','export_amount','export_rate']},
- 'Receivable Voucher': {'fields':['conversion_rate','currency','grand_total_export','in_words_export','rounded_total_export'],'entries':['ref_rate','export_amount','export_rate']},
+ 'Quotation': {'fields':['Note HTML','OT Notes','conversion_rate','currency','grand_total_export','in_words_export','rounded_total_export'],'quotation_details':['base_ref_rate','amount','basic_rate']},
+ 'Receivable Voucher': {'fields':['conversion_rate','currency','grand_total_export','in_words_export','rounded_total_export'],'entries':['base_ref_rate','amount','basic_rate']},
'Item': {'ref_rate_details':['ref_currency']},
'Sales BOM': {'fields':['currency']},
- 'Sales Order': {'fields':['Note1','OT Notes','conversion_rate','currency','grand_total_export','in_words_export','rounded_total_export'],'sales_order_details':['ref_rate','export_amount','export_rate']}
+ 'Sales Order': {'fields':['Note1','OT Notes','conversion_rate','currency','grand_total_export','in_words_export','rounded_total_export'],'sales_order_details':['base_ref_rate','amount','basic_rate']}
},
'fs_imports': {
- 'Payable Voucher': {'fields':['conversion_rate','currency','grand_total_import','in_words_import','net_total_import','other_charges_added_import','other_charges_deducted_import'],'entries':['import_amount','import_rate']},
- 'Purchase Order': {'fields':['Note HTML','conversion_rate','currency','grand_total_import','in_words_import','net_total_import','other_charges_added_import','other_charges_deducted_import'],'po_details':['import_amount','import_rate']},
- 'Purchase Receipt': {'fields':['conversion_rate','currency','grand_total_import','in_words_import','net_total_import','other_charges_added_import','other_charges_deducted_import'],'purchase_receipt_details':['import_amount','import_rate']},
+ 'Payable Voucher': {'fields':['conversion_rate','currency','grand_total_import','in_words_import','net_total_import','other_charges_added_import','other_charges_deducted_import'],'entries':['purchase_ref_rate', 'amount','rate']},
+ 'Purchase Order': {'fields':['Note HTML','conversion_rate','currency','grand_total_import','in_words_import','net_total_import','other_charges_added_import','other_charges_deducted_import'],'po_details':['purchase_ref_rate', 'amount','purchase_rate']},
+ 'Purchase Receipt': {'fields':['conversion_rate','currency','grand_total_import','in_words_import','net_total_import','other_charges_added_import','other_charges_deducted_import'],'purchase_receipt_details':['purchase_ref_rate','amount','purchase_rate']},
'Supplier Quotation': {'fields':['conversion_rate','currency']}
},
'fs_item_advanced': {
diff --git a/erpnext/stock/doctype/delivery_note_detail/delivery_note_detail.txt b/erpnext/stock/doctype/delivery_note_detail/delivery_note_detail.txt
index a5f82f4..c4bacb3 100644
--- a/erpnext/stock/doctype/delivery_note_detail/delivery_note_detail.txt
+++ b/erpnext/stock/doctype/delivery_note_detail/delivery_note_detail.txt
@@ -5,7 +5,7 @@
{
'creation': '2010-08-08 17:08:58',
'docstatus': 0,
- 'modified': '2012-03-05 10:49:39',
+ 'modified': '2012-03-05 15:00:39',
'modified_by': u'Administrator',
'owner': u'Administrator'
},
@@ -23,7 +23,7 @@
'section_style': u'Tray',
'server_code_error': u' ',
'show_in_menu': 0,
- 'version': 55
+ 'version': 56
},
# These values are common for all DocField
@@ -117,14 +117,18 @@
# DocField
{
+ 'default': u'0.00',
'doctype': u'DocField',
- 'fieldname': u'base_ref_rate',
+ 'fieldname': u'ref_rate',
'fieldtype': u'Currency',
- 'label': u'Price List Rate*',
- 'oldfieldname': u'base_ref_rate',
+ 'label': u'Price List Rate',
+ 'no_copy': 0,
+ 'oldfieldname': u'ref_rate',
'oldfieldtype': u'Currency',
- 'permlevel': 1,
+ 'permlevel': 0,
'print_hide': 1,
+ 'reqd': 0,
+ 'trigger': u'Client',
'width': u'100px'
},
@@ -145,53 +149,6 @@
# DocField
{
- 'default': u'0.00',
- 'doctype': u'DocField',
- 'fieldname': u'basic_rate',
- 'fieldtype': u'Currency',
- 'label': u'Rate*',
- 'oldfieldname': u'basic_rate',
- 'oldfieldtype': u'Currency',
- 'permlevel': 0,
- 'print_hide': 1,
- 'reqd': 0,
- 'trigger': u'Client',
- 'width': u'150px'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'amount',
- 'fieldtype': u'Currency',
- 'label': u'Amount*',
- 'oldfieldname': u'amount',
- 'oldfieldtype': u'Currency',
- 'permlevel': 1,
- 'print_hide': 1,
- 'reqd': 0,
- 'width': u'100px'
- },
-
- # DocField
- {
- 'default': u'0.00',
- 'doctype': u'DocField',
- 'fieldname': u'ref_rate',
- 'fieldtype': u'Currency',
- 'label': u'Price List Rate',
- 'no_copy': 0,
- 'oldfieldname': u'ref_rate',
- 'oldfieldtype': u'Currency',
- 'permlevel': 0,
- 'print_hide': 1,
- 'reqd': 0,
- 'trigger': u'Client',
- 'width': u'100px'
- },
-
- # DocField
- {
'doctype': u'DocField',
'fieldname': u'export_rate',
'fieldtype': u'Currency',
@@ -222,6 +179,49 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'base_ref_rate',
+ 'fieldtype': u'Currency',
+ 'label': u'Price List Rate*',
+ 'oldfieldname': u'base_ref_rate',
+ 'oldfieldtype': u'Currency',
+ 'permlevel': 1,
+ 'print_hide': 1,
+ 'width': u'100px'
+ },
+
+ # DocField
+ {
+ 'default': u'0.00',
+ 'doctype': u'DocField',
+ 'fieldname': u'basic_rate',
+ 'fieldtype': u'Currency',
+ 'label': u'Rate*',
+ 'oldfieldname': u'basic_rate',
+ 'oldfieldtype': u'Currency',
+ 'permlevel': 0,
+ 'print_hide': 1,
+ 'reqd': 0,
+ 'trigger': u'Client',
+ 'width': u'150px'
+ },
+
+ # DocField
+ {
+ 'doctype': u'DocField',
+ 'fieldname': u'amount',
+ 'fieldtype': u'Currency',
+ 'label': u'Amount*',
+ 'oldfieldname': u'amount',
+ 'oldfieldtype': u'Currency',
+ 'permlevel': 1,
+ 'print_hide': 1,
+ 'reqd': 0,
+ 'width': u'100px'
+ },
+
+ # DocField
+ {
+ 'doctype': u'DocField',
'fieldname': u'warehouse',
'fieldtype': u'Link',
'label': u'Warehouse',
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 4ebd28c..815864f 100755
--- a/erpnext/stock/doctype/purchase_receipt_detail/purchase_receipt_detail.txt
+++ b/erpnext/stock/doctype/purchase_receipt_detail/purchase_receipt_detail.txt
@@ -5,7 +5,7 @@
{
'creation': '2010-08-08 17:09:16',
'docstatus': 0,
- 'modified': '2012-03-05 10:51:18',
+ 'modified': '2012-03-05 17:44:23',
'modified_by': u'Administrator',
'owner': u'Administrator'
},
@@ -22,7 +22,7 @@
'section_style': u'Tray',
'server_code_error': u' ',
'show_in_menu': 0,
- 'version': 76
+ 'version': 78
},
# These values are common for all DocField
@@ -135,9 +135,9 @@
# DocField
{
'doctype': u'DocField',
- 'fieldname': u'purchase_ref_rate',
+ 'fieldname': u'import_ref_rate',
'fieldtype': u'Currency',
- 'label': u'Ref Rate *',
+ 'label': u'Ref Rate ',
'permlevel': 0,
'print_hide': 1
},
@@ -157,6 +157,43 @@
'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': u'Client',
+ 'width': u'100px'
+ },
+
+ # DocField
+ {
+ 'doctype': u'DocField',
+ 'fieldname': u'import_amount',
+ 'fieldtype': u'Currency',
+ 'label': u'Amount',
+ 'oldfieldname': u'import_amount',
+ 'oldfieldtype': u'Currency',
+ 'permlevel': 1
+ },
+
+ # DocField
+ {
+ 'doctype': u'DocField',
+ 'fieldname': u'purchase_ref_rate',
+ 'fieldtype': u'Currency',
+ 'label': u'Ref Rate *',
+ 'permlevel': 0,
+ 'print_hide': 1
+ },
+
+ # DocField
+ {
+ 'colour': u'White:FFF',
+ 'default': u'0.00',
+ 'doctype': u'DocField',
'fieldname': u'purchase_rate',
'fieldtype': u'Currency',
'label': u'Rate *(Default Curr.)',
@@ -188,43 +225,6 @@
# DocField
{
'doctype': u'DocField',
- 'fieldname': u'import_ref_rate',
- 'fieldtype': u'Currency',
- 'label': u'Ref Rate ',
- 'permlevel': 0,
- 'print_hide': 1
- },
-
- # DocField
- {
- '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': u'Client',
- 'width': u'100px'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'import_amount',
- 'fieldtype': u'Currency',
- 'label': u'Amount',
- 'oldfieldname': u'import_amount',
- 'oldfieldtype': u'Currency',
- 'permlevel': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
'fieldname': u'warehouse',
'fieldtype': u'Link',
'hidden': 0,
@@ -295,7 +295,7 @@
'oldfieldname': u'serial_no',
'oldfieldtype': u'Text',
'permlevel': 0,
- 'print_hide': 1,
+ 'print_hide': 0,
'report_hide': 0
},
diff --git a/erpnext/stock/page/stock_home/stock_home.html b/erpnext/stock/page/stock_home/stock_home.html
index bab93dc..ae677de 100644
--- a/erpnext/stock/page/stock_home/stock_home.html
+++ b/erpnext/stock/page/stock_home/stock_home.html
@@ -18,7 +18,7 @@
<p class="help">Single unit of an Item</p>
<h4><a href="#!List/Batch">Batch</a></h4>
<p class="help">Batch of units of an Item</p>
- <h4><a href="#!List/Item">Warehouse</a></h4>
+ <h4><a href="#!List/Warehouse">Warehouse</a></h4>
<p class="help">Warehouse is where items are stored</p>
</div>
<div style="clear: both"></div>
@@ -102,4 +102,4 @@
</div>
</div>
<div style="clear: both;"></div>
-</div>
\ No newline at end of file
+</div>
diff --git a/erpnext/support/doctype/support_ticket/__init__.py b/erpnext/support/doctype/support_ticket/__init__.py
index ca27a61..eebb6cf 100644
--- a/erpnext/support/doctype/support_ticket/__init__.py
+++ b/erpnext/support/doctype/support_ticket/__init__.py
@@ -81,6 +81,7 @@
st.make_response_record(content, mail.mail['From'], content_type)
webnotes.conn.set(st.doc, 'status', 'Open')
update_feed(st.doc, 'on_update')
+ webnotes.conn.commit()
# extract attachments
self.save_attachments(st.doc, mail.attachments)
return
@@ -99,21 +100,22 @@
d.naming_series = (opts and opts[0] and opts[0][0] and opts[0][0].split("\n")[0]) or 'SUP'
try:
d.save(1)
+ except:
+ d.description = 'Unable to extract message'
+ d.save(1)
+ else:
# update feed
update_feed(d, 'on_update')
# send auto reply
self.send_auto_reply(d)
- except:
- d.description = 'Unable to extract message'
- d.save(1)
-
- else:
+ webnotes.conn.commit()
+
# extract attachments
self.save_attachments(d, mail.attachments)
-
+
def save_attachments(self, doc, attachment_list=[]):
"""
@@ -138,9 +140,10 @@
"""
Send auto reply to emails
"""
- signature = self.email_settings.support_signature
+ from webnotes.utils import cstr
+ signature = self.email_settings.fields.get('support_signature') or ''
- response = self.email_settings.support_autoreply or ("""
+ response = self.email_settings.fields.get('support_autoreply') or ("""
A new Ticket has been raised for your query. If you have any additional information, please
reply back to this mail.
@@ -148,15 +151,15 @@
[This is an automatic response]
- """ + (signature or ''))
+ """ + cstr(signature))
from webnotes.utils.email_lib import sendmail
sendmail(\
- recipients = [d.raised_by], \
- sender = self.email_settings.support_email, \
- subject = '['+d.name+'] ' + cstr(d.subject), \
- msg = response)
+ recipients = [cstr(d.raised_by)], \
+ sender = cstr(self.email_settings.fields.get('support_email')), \
+ subject = '['+cstr(d.name)+'] ' + cstr(d.subject), \
+ msg = cstr(response))
def auto_close_tickets(self):
"""
diff --git a/js/all-app.js b/js/all-app.js
index aa26778..686b0b8 100644
--- a/js/all-app.js
+++ b/js/all-app.js
Binary files differ
diff --git a/version.num b/version.num
index b3fa96d..60d194b 100644
--- a/version.num
+++ b/version.num
@@ -1 +1 @@
-819
+821