Merge branch 'master' of github.com:webnotes/erpnext
Conflicts:
patches/patch.py
diff --git a/accounts/doctype/fiscal_year/fiscal_year.py b/accounts/doctype/fiscal_year/fiscal_year.py
index 7afb037..fe0f205 100644
--- a/accounts/doctype/fiscal_year/fiscal_year.py
+++ b/accounts/doctype/fiscal_year/fiscal_year.py
@@ -100,7 +100,9 @@
def post_entries(self):
sql("LOCK TABLE `tabGL Entry` WRITE")
# post each gl entry (batch or complete)
- gle = sql("select name, account, debit, credit, is_opening, posting_date from `tabGL Entry` where fiscal_year=%s and ifnull(is_cancelled,'No')='No' and company=%s", (self.doc.name, self.doc.company))
+ gle = sql("select name, account, debit, credit, is_opening, posting_date from `tabGL Entry` where fiscal_year=%s and ifnull(is_cancelled,'No')='No' and company=%s
+
+ ", (self.doc.name, self.doc.company))
account_details = {}
cnt = 0
@@ -163,7 +165,7 @@
# Clear outstanding
self.clear_outstanding()
sql("LOCK TABLE `tabGL Entry` WRITE")
- against_voucher = sql("select against_voucher, against_voucher_type from `tabGL Entry` where fiscal_year=%s and is_cancelled='No' and company=%s group by against_voucher, against_voucher_type for update", (self.doc.name, self.doc.company))
+ against_voucher = sql("select against_voucher, against_voucher_type from `tabGL Entry` where fiscal_year=%s and is_cancelled='No' and company=%s and ifnull(against_voucher, '') != '' and ifnull(against_voucher_type, '') != '' group by against_voucher, against_voucher_type", (self.doc.name, self.doc.company))
for d in against_voucher:
# get voucher balance
bal = sql("select sum(debit)-sum(credit) from `tabGL Entry` where against_voucher=%s and against_voucher_type=%s", (d[0], d[1]))
diff --git a/accounts/doctype/payable_voucher/payable_voucher.txt b/accounts/doctype/payable_voucher/payable_voucher.txt
index f1a8dc9..95d5a47 100644
--- a/accounts/doctype/payable_voucher/payable_voucher.txt
+++ b/accounts/doctype/payable_voucher/payable_voucher.txt
@@ -1,7 +1,6 @@
[
{
- '_last_update': '1306307726',
- '_user_tags': None,
+ '_last_update': '1307707462',
'allow_attach': None,
'allow_copy': None,
'allow_email': None,
@@ -30,7 +29,7 @@
'istable': None,
'max_attachments': None,
'menu_index': None,
- 'modified': '2011-05-25 13:57:27',
+ 'modified': '2011-06-21 17:01:01',
'modified_by': 'Administrator',
'module': 'Accounts',
'name': 'Payable Voucher',
@@ -51,10 +50,10 @@
'server_code_error': ' ',
'show_in_menu': 0,
'smallicon': None,
- 'subject': 'From %(supplier_name)s due on %(due_date)s | %(outstanding_amount)s outstanding',
+ 'subject': 'From %(supplier_name)s worth %(grand_total)s due on %(due_date)s | %(outstanding_amount)s outstanding',
'tag_fields': None,
'use_template': None,
- 'version': 517
+ 'version': 518
},
{
'amend': 0,
@@ -66,8 +65,8 @@
'execute': None,
'idx': 1,
'match': None,
- 'modified': '2011-02-17 14:34:39',
- 'modified_by': 'umair@iwebnotes.com',
+ 'modified': '2011-06-21 17:01:01',
+ 'modified_by': 'Administrator',
'name': 'PERM00374',
'owner': 'Administrator',
'parent': 'Payable Voucher',
@@ -89,8 +88,8 @@
'execute': None,
'idx': 2,
'match': None,
- 'modified': '2011-02-17 14:34:39',
- 'modified_by': 'umair@iwebnotes.com',
+ 'modified': '2011-06-21 17:01:01',
+ 'modified_by': 'Administrator',
'name': 'PERM00375',
'owner': 'Administrator',
'parent': 'Payable Voucher',
@@ -112,8 +111,8 @@
'execute': None,
'idx': 3,
'match': None,
- 'modified': '2011-02-17 14:34:39',
- 'modified_by': 'umair@iwebnotes.com',
+ 'modified': '2011-06-21 17:01:01',
+ 'modified_by': 'Administrator',
'name': 'PERM00376',
'owner': 'Administrator',
'parent': 'Payable Voucher',
@@ -135,8 +134,8 @@
'execute': None,
'idx': 4,
'match': None,
- 'modified': '2011-02-17 14:34:39',
- 'modified_by': 'umair@iwebnotes.com',
+ 'modified': '2011-06-21 17:01:01',
+ 'modified_by': 'Administrator',
'name': 'PERM00377',
'owner': 'Administrator',
'parent': 'Payable Voucher',
@@ -158,8 +157,8 @@
'execute': None,
'idx': 5,
'match': None,
- 'modified': '2011-02-17 14:34:39',
- 'modified_by': 'umair@iwebnotes.com',
+ 'modified': '2011-06-21 17:01:01',
+ 'modified_by': 'Administrator',
'name': 'PERM00378',
'owner': 'Administrator',
'parent': 'Payable Voucher',
@@ -181,8 +180,8 @@
'execute': None,
'idx': 6,
'match': None,
- 'modified': '2011-02-17 14:34:39',
- 'modified_by': 'umair@iwebnotes.com',
+ 'modified': '2011-06-21 17:01:01',
+ 'modified_by': 'Administrator',
'name': 'PERM00379',
'owner': 'Administrator',
'parent': 'Payable Voucher',
@@ -204,8 +203,8 @@
'execute': None,
'idx': 7,
'match': 'supplier',
- 'modified': '2011-02-17 14:34:39',
- 'modified_by': 'umair@iwebnotes.com',
+ 'modified': '2011-06-21 17:01:01',
+ 'modified_by': 'Administrator',
'name': 'PERM00380',
'owner': 'Administrator',
'parent': 'Payable Voucher',
@@ -220,7 +219,7 @@
{
'allow_on_submit': 0,
'colour': None,
- 'creation': '2011-05-25 13:59:15',
+ 'creation': '2011-05-28 10:26:05',
'default': None,
'depends_on': None,
'description': None,
@@ -233,9 +232,9 @@
'idx': 1,
'in_filter': None,
'label': 'Basic Info',
- 'modified': '2011-05-25 13:59:15',
+ 'modified': '2011-06-21 17:01:01',
'modified_by': 'Administrator',
- 'name': 'FL05523',
+ 'name': 'FL05509',
'no_column': None,
'no_copy': None,
'oldfieldname': None,
@@ -256,7 +255,7 @@
{
'allow_on_submit': None,
'colour': None,
- 'creation': '2011-05-25 13:59:15',
+ 'creation': '2011-05-28 10:26:05',
'default': None,
'depends_on': None,
'description': None,
@@ -269,9 +268,9 @@
'idx': 2,
'in_filter': None,
'label': None,
- 'modified': '2011-05-25 13:59:15',
+ 'modified': '2011-06-21 17:01:01',
'modified_by': 'Administrator',
- 'name': 'FL05524',
+ 'name': 'FL05510',
'no_column': None,
'no_copy': None,
'oldfieldname': None,
@@ -293,7 +292,7 @@
'allow_on_submit': None,
'colour': 'White:FFF',
'creation': '2010-08-08 17:09:11',
- 'default': 'BILL',
+ 'default': None,
'depends_on': None,
'description': 'To manage multiple series please go to Setup > Manage Series',
'docstatus': 0,
@@ -305,7 +304,7 @@
'idx': 3,
'in_filter': None,
'label': 'Series',
- 'modified': '2011-05-25 13:59:14',
+ 'modified': '2011-06-21 17:01:01',
'modified_by': 'Administrator',
'name': 'FL02063',
'no_column': None,
@@ -341,7 +340,7 @@
'idx': 4,
'in_filter': 1,
'label': 'Credit To',
- 'modified': '2011-05-25 13:59:14',
+ 'modified': '2011-06-21 17:01:01',
'modified_by': 'Administrator',
'name': 'FL02058',
'no_column': None,
@@ -377,7 +376,7 @@
'idx': 5,
'in_filter': None,
'label': 'Amended From',
- 'modified': '2011-05-25 13:59:14',
+ 'modified': '2011-06-21 17:01:01',
'modified_by': 'Administrator',
'name': 'FL02061',
'no_column': None,
@@ -413,7 +412,7 @@
'idx': 6,
'in_filter': None,
'label': 'Supplier',
- 'modified': '2011-05-25 13:59:15',
+ 'modified': '2011-06-21 17:01:01',
'modified_by': 'Administrator',
'name': 'FL02059',
'no_column': None,
@@ -449,7 +448,7 @@
'idx': 7,
'in_filter': None,
'label': 'Supplier Address',
- 'modified': '2011-05-25 13:59:15',
+ 'modified': '2011-06-21 17:01:01',
'modified_by': 'Administrator',
'name': 'FL02060',
'no_column': None,
@@ -472,7 +471,7 @@
{
'allow_on_submit': None,
'colour': None,
- 'creation': '2011-05-25 13:00:24',
+ 'creation': '2011-05-28 10:26:03',
'default': None,
'depends_on': None,
'description': None,
@@ -485,9 +484,9 @@
'idx': 8,
'in_filter': None,
'label': 'Contact Person',
- 'modified': '2011-05-25 13:59:15',
+ 'modified': '2011-06-21 17:01:01',
'modified_by': 'Administrator',
- 'name': 'FL05370',
+ 'name': 'FL05495',
'no_column': None,
'no_copy': None,
'oldfieldname': None,
@@ -521,7 +520,7 @@
'idx': 9,
'in_filter': None,
'label': 'Name',
- 'modified': '2011-05-25 13:59:15',
+ 'modified': '2011-06-21 17:01:01',
'modified_by': 'Administrator',
'name': 'FL03777',
'no_column': None,
@@ -544,7 +543,7 @@
{
'allow_on_submit': None,
'colour': None,
- 'creation': '2011-05-25 13:00:24',
+ 'creation': '2011-05-28 10:26:03',
'default': None,
'depends_on': None,
'description': None,
@@ -557,9 +556,9 @@
'idx': 10,
'in_filter': None,
'label': 'Address',
- 'modified': '2011-05-25 13:59:15',
+ 'modified': '2011-06-21 17:01:01',
'modified_by': 'Administrator',
- 'name': 'FL05371',
+ 'name': 'FL05496',
'no_column': None,
'no_copy': None,
'oldfieldname': None,
@@ -580,7 +579,7 @@
{
'allow_on_submit': None,
'colour': None,
- 'creation': '2011-05-25 13:00:24',
+ 'creation': '2011-05-28 10:26:03',
'default': None,
'depends_on': None,
'description': None,
@@ -593,9 +592,9 @@
'idx': 11,
'in_filter': None,
'label': 'Contact',
- 'modified': '2011-05-25 13:59:15',
+ 'modified': '2011-06-21 17:01:01',
'modified_by': 'Administrator',
- 'name': 'FL05372',
+ 'name': 'FL05497',
'no_column': None,
'no_copy': None,
'oldfieldname': None,
@@ -616,7 +615,7 @@
{
'allow_on_submit': None,
'colour': None,
- 'creation': '2011-05-25 13:59:15',
+ 'creation': '2011-05-28 10:26:03',
'default': None,
'depends_on': None,
'description': None,
@@ -629,9 +628,9 @@
'idx': 12,
'in_filter': None,
'label': 'Mobile No',
- 'modified': '2011-05-25 13:59:15',
+ 'modified': '2011-06-21 17:01:01',
'modified_by': 'Administrator',
- 'name': 'FL05513',
+ 'name': 'FL05498',
'no_column': None,
'no_copy': None,
'oldfieldname': None,
@@ -652,7 +651,7 @@
{
'allow_on_submit': None,
'colour': None,
- 'creation': '2011-05-25 13:00:24',
+ 'creation': '2011-05-28 10:26:03',
'default': None,
'depends_on': None,
'description': None,
@@ -665,9 +664,9 @@
'idx': 13,
'in_filter': None,
'label': 'Contact Email',
- 'modified': '2011-05-25 13:59:15',
+ 'modified': '2011-06-21 17:01:01',
'modified_by': 'Administrator',
- 'name': 'FL05374',
+ 'name': 'FL05499',
'no_column': None,
'no_copy': None,
'oldfieldname': None,
@@ -688,7 +687,7 @@
{
'allow_on_submit': None,
'colour': None,
- 'creation': '2011-05-25 13:59:15',
+ 'creation': '2011-05-28 10:26:05',
'default': None,
'depends_on': None,
'description': None,
@@ -701,9 +700,9 @@
'idx': 14,
'in_filter': None,
'label': None,
- 'modified': '2011-05-25 13:59:15',
+ 'modified': '2011-06-21 17:01:01',
'modified_by': 'Administrator',
- 'name': 'FL05525',
+ 'name': 'FL05511',
'no_column': None,
'no_copy': None,
'oldfieldname': None,
@@ -737,7 +736,7 @@
'idx': 15,
'in_filter': 1,
'label': 'Voucher Date',
- 'modified': '2011-05-25 13:59:15',
+ 'modified': '2011-06-21 17:01:01',
'modified_by': 'Administrator',
'name': 'FL02064',
'no_column': None,
@@ -773,7 +772,7 @@
'idx': 16,
'in_filter': 1,
'label': 'Due Date',
- 'modified': '2011-05-25 13:59:15',
+ 'modified': '2011-06-21 17:01:01',
'modified_by': 'Administrator',
'name': 'FL02065',
'no_column': None,
@@ -809,7 +808,7 @@
'idx': 17,
'in_filter': 1,
'label': 'Posting Date',
- 'modified': '2011-05-25 13:59:15',
+ 'modified': '2011-06-21 17:01:01',
'modified_by': 'Administrator',
'name': 'FL02066',
'no_column': None,
@@ -845,7 +844,7 @@
'idx': 18,
'in_filter': 1,
'label': 'Bill No',
- 'modified': '2011-05-25 13:59:15',
+ 'modified': '2011-06-21 17:01:01',
'modified_by': 'Administrator',
'name': 'FL02086',
'no_column': None,
@@ -881,7 +880,7 @@
'idx': 19,
'in_filter': 1,
'label': 'Bill Date',
- 'modified': '2011-05-25 13:59:15',
+ 'modified': '2011-06-21 17:01:01',
'modified_by': 'Administrator',
'name': 'FL02087',
'no_column': None,
@@ -917,7 +916,7 @@
'idx': 20,
'in_filter': None,
'label': 'Amendment Date',
- 'modified': '2011-05-25 13:59:15',
+ 'modified': '2011-06-21 17:01:01',
'modified_by': 'Administrator',
'name': 'FL02067',
'no_column': None,
@@ -953,7 +952,7 @@
'idx': 21,
'in_filter': None,
'label': 'Mode of Payment',
- 'modified': '2011-05-25 13:59:15',
+ 'modified': '2011-06-21 17:01:01',
'modified_by': 'Administrator',
'name': 'FL02097',
'no_column': None,
@@ -976,7 +975,7 @@
{
'allow_on_submit': None,
'colour': None,
- 'creation': '2011-05-25 13:59:16',
+ 'creation': '2011-05-28 10:26:05',
'default': None,
'depends_on': None,
'description': None,
@@ -989,9 +988,9 @@
'idx': 22,
'in_filter': None,
'label': 'Items',
- 'modified': '2011-05-25 13:59:16',
+ 'modified': '2011-06-21 17:01:01',
'modified_by': 'Administrator',
- 'name': 'FL05526',
+ 'name': 'FL05512',
'no_column': None,
'no_copy': None,
'oldfieldname': None,
@@ -1025,7 +1024,7 @@
'idx': 23,
'in_filter': None,
'label': 'Purchase Order',
- 'modified': '2011-05-25 13:59:15',
+ 'modified': '2011-06-21 17:01:01',
'modified_by': 'Administrator',
'name': 'FL02069',
'no_column': None,
@@ -1061,7 +1060,7 @@
'idx': 24,
'in_filter': None,
'label': 'Purchase Receipt',
- 'modified': '2011-05-25 13:59:15',
+ 'modified': '2011-06-21 17:01:01',
'modified_by': 'Administrator',
'name': 'FL02070',
'no_column': None,
@@ -1097,7 +1096,7 @@
'idx': 25,
'in_filter': None,
'label': 'Get Items',
- 'modified': '2011-05-25 13:59:15',
+ 'modified': '2011-06-21 17:01:01',
'modified_by': 'Administrator',
'name': 'FL02071',
'no_column': None,
@@ -1120,7 +1119,7 @@
{
'allow_on_submit': None,
'colour': None,
- 'creation': '2011-05-25 13:59:16',
+ 'creation': '2011-05-28 10:26:05',
'default': None,
'depends_on': None,
'description': None,
@@ -1133,9 +1132,9 @@
'idx': 26,
'in_filter': None,
'label': None,
- 'modified': '2011-05-25 13:59:16',
+ 'modified': '2011-06-21 17:01:01',
'modified_by': 'Administrator',
- 'name': 'FL05527',
+ 'name': 'FL05513',
'no_column': None,
'no_copy': None,
'oldfieldname': None,
@@ -1169,7 +1168,7 @@
'idx': 27,
'in_filter': None,
'label': 'Bill Currency',
- 'modified': '2011-05-25 13:59:15',
+ 'modified': '2011-06-21 17:01:01',
'modified_by': 'Administrator',
'name': 'FL02088',
'no_column': None,
@@ -1205,7 +1204,7 @@
'idx': 28,
'in_filter': None,
'label': 'Bill Conversion Rate',
- 'modified': '2011-05-25 13:59:15',
+ 'modified': '2011-06-21 17:01:01',
'modified_by': 'Administrator',
'name': 'FL02089',
'no_column': None,
@@ -1228,7 +1227,7 @@
{
'allow_on_submit': None,
'colour': None,
- 'creation': '2011-05-25 13:59:16',
+ 'creation': '2011-05-28 10:26:05',
'default': None,
'depends_on': None,
'description': None,
@@ -1241,9 +1240,9 @@
'idx': 29,
'in_filter': None,
'label': None,
- 'modified': '2011-05-25 13:59:16',
+ 'modified': '2011-06-21 17:01:01',
'modified_by': 'Administrator',
- 'name': 'FL05528',
+ 'name': 'FL05514',
'no_column': None,
'no_copy': None,
'oldfieldname': None,
@@ -1277,7 +1276,7 @@
'idx': 30,
'in_filter': None,
'label': 'Entries',
- 'modified': '2011-05-25 13:59:15',
+ 'modified': '2011-06-21 17:01:01',
'modified_by': 'Administrator',
'name': 'FL02072',
'no_column': None,
@@ -1313,7 +1312,7 @@
'idx': 31,
'in_filter': None,
'label': 'Recalculate',
- 'modified': '2011-05-25 13:59:15',
+ 'modified': '2011-06-21 17:01:01',
'modified_by': 'Administrator',
'name': 'FL02073',
'no_column': None,
@@ -1349,7 +1348,7 @@
'idx': 32,
'in_filter': None,
'label': 'Net Total',
- 'modified': '2011-05-25 13:59:15',
+ 'modified': '2011-06-21 17:01:01',
'modified_by': 'Administrator',
'name': 'FL02074',
'no_column': None,
@@ -1372,7 +1371,7 @@
{
'allow_on_submit': None,
'colour': 'White:FFF',
- 'creation': '2011-05-25 13:59:16',
+ 'creation': '2011-05-28 10:26:05',
'default': None,
'depends_on': None,
'description': 'Add / Edit taxes and other charges',
@@ -1385,9 +1384,9 @@
'idx': 33,
'in_filter': None,
'label': 'Taxes',
- 'modified': '2011-05-25 13:59:16',
+ 'modified': '2011-06-21 17:01:01',
'modified_by': 'Administrator',
- 'name': 'FL05529',
+ 'name': 'FL05515',
'no_column': None,
'no_copy': None,
'oldfieldname': None,
@@ -1421,7 +1420,7 @@
'idx': 34,
'in_filter': None,
'label': 'Purchase Other Charges',
- 'modified': '2011-05-25 13:59:15',
+ 'modified': '2011-06-21 17:01:01',
'modified_by': 'Administrator',
'name': 'FL02078',
'no_column': None,
@@ -1457,7 +1456,7 @@
'idx': 35,
'in_filter': None,
'label': 'Get Tax Detail',
- 'modified': '2011-05-25 13:59:15',
+ 'modified': '2011-06-21 17:01:01',
'modified_by': 'Administrator',
'name': 'FL02079',
'no_column': None,
@@ -1493,7 +1492,7 @@
'idx': 36,
'in_filter': None,
'label': 'Purchase Tax Details',
- 'modified': '2011-05-25 13:59:15',
+ 'modified': '2011-06-21 17:01:01',
'modified_by': 'Administrator',
'name': 'FL02080',
'no_column': None,
@@ -1529,7 +1528,7 @@
'idx': 37,
'in_filter': None,
'label': 'Calculate Tax',
- 'modified': '2011-05-25 13:59:15',
+ 'modified': '2011-06-21 17:01:01',
'modified_by': 'Administrator',
'name': 'FL02081',
'no_column': None,
@@ -1552,7 +1551,7 @@
{
'allow_on_submit': None,
'colour': None,
- 'creation': '2011-05-25 13:59:16',
+ 'creation': '2011-05-28 10:26:05',
'default': None,
'depends_on': None,
'description': None,
@@ -1565,9 +1564,9 @@
'idx': 38,
'in_filter': None,
'label': 'Tax Calculation',
- 'modified': '2011-05-25 13:59:16',
+ 'modified': '2011-06-21 17:01:01',
'modified_by': 'Administrator',
- 'name': 'FL05530',
+ 'name': 'FL05516',
'no_column': None,
'no_copy': None,
'oldfieldname': None,
@@ -1601,7 +1600,7 @@
'idx': 39,
'in_filter': None,
'label': 'Total Tax',
- 'modified': '2011-05-25 13:59:15',
+ 'modified': '2011-06-21 17:01:01',
'modified_by': 'Administrator',
'name': 'FL02083',
'no_column': None,
@@ -1624,7 +1623,7 @@
{
'allow_on_submit': None,
'colour': None,
- 'creation': '2011-05-25 13:59:16',
+ 'creation': '2011-05-28 10:26:05',
'default': None,
'depends_on': None,
'description': None,
@@ -1637,9 +1636,9 @@
'idx': 40,
'in_filter': None,
'label': 'More Info',
- 'modified': '2011-05-25 13:59:16',
+ 'modified': '2011-06-21 17:01:01',
'modified_by': 'Administrator',
- 'name': 'FL05531',
+ 'name': 'FL05517',
'no_column': None,
'no_copy': None,
'oldfieldname': None,
@@ -1660,7 +1659,7 @@
{
'allow_on_submit': None,
'colour': None,
- 'creation': '2011-05-25 13:59:16',
+ 'creation': '2011-05-28 10:26:05',
'default': None,
'depends_on': None,
'description': None,
@@ -1673,9 +1672,9 @@
'idx': 41,
'in_filter': None,
'label': None,
- 'modified': '2011-05-25 13:59:16',
+ 'modified': '2011-06-21 17:01:01',
'modified_by': 'Administrator',
- 'name': 'FL05532',
+ 'name': 'FL05518',
'no_column': None,
'no_copy': None,
'oldfieldname': None,
@@ -1709,7 +1708,7 @@
'idx': 42,
'in_filter': 1,
'label': 'Is Opening',
- 'modified': '2011-05-25 13:59:15',
+ 'modified': '2011-06-21 17:01:01',
'modified_by': 'Administrator',
'name': 'FL02092',
'no_column': None,
@@ -1745,7 +1744,7 @@
'idx': 43,
'in_filter': 1,
'label': 'Project Name',
- 'modified': '2011-05-25 13:59:15',
+ 'modified': '2011-06-21 17:01:01',
'modified_by': 'Administrator',
'name': 'FL03778',
'no_column': None,
@@ -1781,7 +1780,7 @@
'idx': 44,
'in_filter': None,
'label': 'Aging Date',
- 'modified': '2011-05-25 13:59:15',
+ 'modified': '2011-06-21 17:01:01',
'modified_by': 'Administrator',
'name': 'FL02093',
'no_column': None,
@@ -1817,7 +1816,7 @@
'idx': 45,
'in_filter': None,
'label': 'Select Print Heading',
- 'modified': '2011-05-25 13:59:15',
+ 'modified': '2011-06-21 17:01:01',
'modified_by': 'Administrator',
'name': 'FL02098',
'no_column': None,
@@ -1840,7 +1839,7 @@
{
'allow_on_submit': None,
'colour': None,
- 'creation': '2011-05-25 13:59:16',
+ 'creation': '2011-05-28 10:26:05',
'default': None,
'depends_on': None,
'description': None,
@@ -1853,9 +1852,9 @@
'idx': 46,
'in_filter': None,
'label': None,
- 'modified': '2011-05-25 13:59:16',
+ 'modified': '2011-06-21 17:01:01',
'modified_by': 'Administrator',
- 'name': 'FL05533',
+ 'name': 'FL05519',
'no_column': None,
'no_copy': None,
'oldfieldname': None,
@@ -1889,7 +1888,7 @@
'idx': 47,
'in_filter': 1,
'label': 'Company',
- 'modified': '2011-05-25 13:59:15',
+ 'modified': '2011-06-21 17:01:01',
'modified_by': 'Administrator',
'name': 'FL02094',
'no_column': None,
@@ -1925,7 +1924,7 @@
'idx': 48,
'in_filter': 1,
'label': 'Fiscal Year',
- 'modified': '2011-05-25 13:59:15',
+ 'modified': '2011-06-21 17:01:01',
'modified_by': 'Administrator',
'name': 'FL02095',
'no_column': None,
@@ -1961,7 +1960,7 @@
'idx': 49,
'in_filter': None,
'label': 'Cancel Reason',
- 'modified': '2011-05-25 13:59:15',
+ 'modified': '2011-06-21 17:01:01',
'modified_by': 'Administrator',
'name': 'FL02096',
'no_column': None,
@@ -1997,7 +1996,7 @@
'idx': 50,
'in_filter': None,
'label': 'Remarks',
- 'modified': '2011-05-25 13:59:15',
+ 'modified': '2011-06-21 17:01:01',
'modified_by': 'Administrator',
'name': 'FL02090',
'no_column': None,
@@ -2020,7 +2019,7 @@
{
'allow_on_submit': None,
'colour': None,
- 'creation': '2011-05-25 13:59:16',
+ 'creation': '2011-05-28 10:26:05',
'default': None,
'depends_on': None,
'description': None,
@@ -2033,9 +2032,9 @@
'idx': 51,
'in_filter': None,
'label': 'Advances',
- 'modified': '2011-05-25 13:59:16',
+ 'modified': '2011-06-21 17:01:01',
'modified_by': 'Administrator',
- 'name': 'FL05534',
+ 'name': 'FL05520',
'no_column': None,
'no_copy': None,
'oldfieldname': None,
@@ -2069,7 +2068,7 @@
'idx': 52,
'in_filter': None,
'label': 'Get Advances Paid',
- 'modified': '2011-05-25 13:59:15',
+ 'modified': '2011-06-21 17:01:01',
'modified_by': 'Administrator',
'name': 'FL02100',
'no_column': None,
@@ -2105,7 +2104,7 @@
'idx': 53,
'in_filter': None,
'label': 'Advance Allocation Details',
- 'modified': '2011-05-25 13:59:15',
+ 'modified': '2011-06-21 17:01:01',
'modified_by': 'Administrator',
'name': 'FL02101',
'no_column': None,
@@ -2128,7 +2127,7 @@
{
'allow_on_submit': None,
'colour': None,
- 'creation': '2011-05-25 13:59:16',
+ 'creation': '2011-05-28 10:26:05',
'default': None,
'depends_on': None,
'description': None,
@@ -2141,9 +2140,9 @@
'idx': 54,
'in_filter': None,
'label': 'TDS',
- 'modified': '2011-05-25 13:59:16',
+ 'modified': '2011-06-21 17:01:01',
'modified_by': 'Administrator',
- 'name': 'FL05535',
+ 'name': 'FL05521',
'no_column': None,
'no_copy': None,
'oldfieldname': None,
@@ -2164,7 +2163,7 @@
{
'allow_on_submit': None,
'colour': None,
- 'creation': '2011-05-25 13:59:16',
+ 'creation': '2011-05-28 10:26:05',
'default': None,
'depends_on': None,
'description': None,
@@ -2177,9 +2176,9 @@
'idx': 55,
'in_filter': None,
'label': None,
- 'modified': '2011-05-25 13:59:16',
+ 'modified': '2011-06-21 17:01:01',
'modified_by': 'Administrator',
- 'name': 'FL05536',
+ 'name': 'FL05522',
'no_column': None,
'no_copy': None,
'oldfieldname': None,
@@ -2213,7 +2212,7 @@
'idx': 56,
'in_filter': None,
'label': 'TDS Applicable',
- 'modified': '2011-05-25 13:59:15',
+ 'modified': '2011-06-21 17:01:01',
'modified_by': 'Administrator',
'name': 'FL02103',
'no_column': None,
@@ -2249,7 +2248,7 @@
'idx': 57,
'in_filter': None,
'label': 'TDS Category',
- 'modified': '2011-05-25 13:59:15',
+ 'modified': '2011-06-21 17:01:01',
'modified_by': 'Administrator',
'name': 'FL02104',
'no_column': None,
@@ -2285,7 +2284,7 @@
'idx': 58,
'in_filter': None,
'label': 'Get TDS',
- 'modified': '2011-05-25 13:59:15',
+ 'modified': '2011-06-21 17:01:01',
'modified_by': 'Administrator',
'name': 'FL02105',
'no_column': None,
@@ -2308,7 +2307,7 @@
{
'allow_on_submit': None,
'colour': None,
- 'creation': '2011-05-25 13:59:16',
+ 'creation': '2011-05-28 10:26:05',
'default': None,
'depends_on': None,
'description': None,
@@ -2321,9 +2320,9 @@
'idx': 59,
'in_filter': None,
'label': None,
- 'modified': '2011-05-25 13:59:16',
+ 'modified': '2011-06-21 17:01:01',
'modified_by': 'Administrator',
- 'name': 'FL05537',
+ 'name': 'FL05523',
'no_column': None,
'no_copy': None,
'oldfieldname': None,
@@ -2357,7 +2356,7 @@
'idx': 60,
'in_filter': None,
'label': 'TDS Account Head',
- 'modified': '2011-05-25 13:59:15',
+ 'modified': '2011-06-21 17:01:01',
'modified_by': 'Administrator',
'name': 'FL02106',
'no_column': None,
@@ -2393,7 +2392,7 @@
'idx': 61,
'in_filter': None,
'label': 'Rate',
- 'modified': '2011-05-25 13:59:15',
+ 'modified': '2011-06-21 17:01:01',
'modified_by': 'Administrator',
'name': 'FL02107',
'no_column': None,
@@ -2429,7 +2428,7 @@
'idx': 62,
'in_filter': None,
'label': 'TDS Amount',
- 'modified': '2011-05-25 13:59:15',
+ 'modified': '2011-06-21 17:01:01',
'modified_by': 'Administrator',
'name': 'FL02108',
'no_column': None,
@@ -2452,7 +2451,7 @@
{
'allow_on_submit': None,
'colour': None,
- 'creation': '2011-05-25 13:59:16',
+ 'creation': '2011-05-28 10:26:05',
'default': None,
'depends_on': None,
'description': None,
@@ -2465,9 +2464,9 @@
'idx': 63,
'in_filter': None,
'label': 'Totals',
- 'modified': '2011-05-25 13:59:16',
+ 'modified': '2011-06-21 17:01:01',
'modified_by': 'Administrator',
- 'name': 'FL05538',
+ 'name': 'FL05524',
'no_column': None,
'no_copy': None,
'oldfieldname': None,
@@ -2488,7 +2487,7 @@
{
'allow_on_submit': None,
'colour': None,
- 'creation': '2011-05-25 13:59:16',
+ 'creation': '2011-05-28 10:26:05',
'default': None,
'depends_on': None,
'description': None,
@@ -2501,9 +2500,9 @@
'idx': 64,
'in_filter': None,
'label': None,
- 'modified': '2011-05-25 13:59:16',
+ 'modified': '2011-06-21 17:01:01',
'modified_by': 'Administrator',
- 'name': 'FL05539',
+ 'name': 'FL05525',
'no_column': None,
'no_copy': None,
'oldfieldname': None,
@@ -2537,7 +2536,7 @@
'idx': 65,
'in_filter': None,
'label': 'Other Charges Added',
- 'modified': '2011-05-25 13:59:15',
+ 'modified': '2011-06-21 17:01:01',
'modified_by': 'Administrator',
'name': 'FL02111',
'no_column': None,
@@ -2573,7 +2572,7 @@
'idx': 66,
'in_filter': None,
'label': 'Other Charges Deducted',
- 'modified': '2011-05-25 13:59:15',
+ 'modified': '2011-06-21 17:01:01',
'modified_by': 'Administrator',
'name': 'FL02112',
'no_column': None,
@@ -2609,7 +2608,7 @@
'idx': 67,
'in_filter': None,
'label': 'Total TDS On Voucher',
- 'modified': '2011-05-25 13:59:15',
+ 'modified': '2011-06-21 17:01:01',
'modified_by': 'Administrator',
'name': 'FL02113',
'no_column': None,
@@ -2645,7 +2644,7 @@
'idx': 68,
'in_filter': None,
'label': 'TDS Amount On Advance',
- 'modified': '2011-05-25 13:59:15',
+ 'modified': '2011-06-21 17:01:01',
'modified_by': 'Administrator',
'name': 'FL02114',
'no_column': None,
@@ -2681,7 +2680,7 @@
'idx': 69,
'in_filter': None,
'label': 'Total Advance (Incl. TDS)',
- 'modified': '2011-05-25 13:59:15',
+ 'modified': '2011-06-21 17:01:01',
'modified_by': 'Administrator',
'name': 'FL02115',
'no_column': None,
@@ -2717,7 +2716,7 @@
'idx': 70,
'in_filter': None,
'label': 'Total Amount To Pay',
- 'modified': '2011-05-25 13:59:15',
+ 'modified': '2011-06-21 17:01:01',
'modified_by': 'Administrator',
'name': 'FL02116',
'no_column': None,
@@ -2753,7 +2752,7 @@
'idx': 71,
'in_filter': 1,
'label': 'Outstanding Amount',
- 'modified': '2011-05-25 13:59:15',
+ 'modified': '2011-06-21 17:01:01',
'modified_by': 'Administrator',
'name': 'FL02117',
'no_column': None,
@@ -2776,7 +2775,7 @@
{
'allow_on_submit': None,
'colour': None,
- 'creation': '2011-05-25 13:59:16',
+ 'creation': '2011-05-28 10:26:05',
'default': None,
'depends_on': None,
'description': None,
@@ -2789,9 +2788,9 @@
'idx': 72,
'in_filter': None,
'label': None,
- 'modified': '2011-05-25 13:59:16',
+ 'modified': '2011-06-21 17:01:01',
'modified_by': 'Administrator',
- 'name': 'FL05540',
+ 'name': 'FL05526',
'no_column': None,
'no_copy': None,
'oldfieldname': None,
@@ -2825,7 +2824,7 @@
'idx': 73,
'in_filter': None,
'label': 'Grand Total',
- 'modified': '2011-05-25 13:59:15',
+ 'modified': '2011-06-21 17:01:01',
'modified_by': 'Administrator',
'name': 'FL02075',
'no_column': None,
@@ -2861,7 +2860,7 @@
'idx': 74,
'in_filter': None,
'label': 'In Words',
- 'modified': '2011-05-25 13:59:15',
+ 'modified': '2011-06-21 17:01:01',
'modified_by': 'Administrator',
'name': 'FL02076',
'no_column': None,
@@ -2897,7 +2896,7 @@
'idx': 75,
'in_filter': None,
'label': 'Net Total (Import)',
- 'modified': '2011-05-25 13:59:15',
+ 'modified': '2011-06-21 17:01:01',
'modified_by': 'Administrator',
'name': 'FL02119',
'no_column': None,
@@ -2933,7 +2932,7 @@
'idx': 76,
'in_filter': None,
'label': 'Other Charges Added (Import)',
- 'modified': '2011-05-25 13:59:15',
+ 'modified': '2011-06-21 17:01:01',
'modified_by': 'Administrator',
'name': 'FL02120',
'no_column': None,
@@ -2969,7 +2968,7 @@
'idx': 77,
'in_filter': None,
'label': 'Other Charges Deducted (Import)',
- 'modified': '2011-05-25 13:59:15',
+ 'modified': '2011-06-21 17:01:01',
'modified_by': 'Administrator',
'name': 'FL02121',
'no_column': None,
@@ -3005,7 +3004,7 @@
'idx': 78,
'in_filter': None,
'label': 'Grand Total (Import)',
- 'modified': '2011-05-25 13:59:15',
+ 'modified': '2011-06-21 17:01:01',
'modified_by': 'Administrator',
'name': 'FL02122',
'no_column': None,
@@ -3041,7 +3040,7 @@
'idx': 79,
'in_filter': None,
'label': 'In Words (Import)',
- 'modified': '2011-05-25 13:59:15',
+ 'modified': '2011-06-21 17:01:01',
'modified_by': 'Administrator',
'name': 'FL02123',
'no_column': None,
@@ -3064,7 +3063,7 @@
{
'allow_on_submit': None,
'colour': 'White:FFF',
- 'creation': '2011-05-25 13:59:16',
+ 'creation': '2011-05-28 10:26:05',
'default': None,
'depends_on': 'eval:!doc.__islocal',
'description': None,
@@ -3077,9 +3076,9 @@
'idx': 80,
'in_filter': None,
'label': 'Actions',
- 'modified': '2011-05-25 13:59:16',
+ 'modified': '2011-06-21 17:01:01',
'modified_by': 'Administrator',
- 'name': 'FL05541',
+ 'name': 'FL05527',
'no_column': None,
'no_copy': None,
'oldfieldname': None,
@@ -3113,7 +3112,7 @@
'idx': 81,
'in_filter': None,
'label': 'Repair Outstanding Amt',
- 'modified': '2011-05-25 13:59:15',
+ 'modified': '2011-06-21 17:01:01',
'modified_by': 'Administrator',
'name': 'FL02130',
'no_column': None,
@@ -3149,7 +3148,7 @@
'idx': 82,
'in_filter': None,
'label': 'Against Expense Account',
- 'modified': '2011-05-25 13:59:15',
+ 'modified': '2011-06-21 17:01:01',
'modified_by': 'Administrator',
'name': 'FL02131',
'no_column': None,
diff --git a/crm/doctype/quotation/quotation.txt b/crm/doctype/quotation/quotation.txt
index 527264d..bd79446 100644
--- a/crm/doctype/quotation/quotation.txt
+++ b/crm/doctype/quotation/quotation.txt
@@ -1,7 +1,6 @@
[
{
- '_last_update': '1305804973',
- '_user_tags': None,
+ '_last_update': '1306471002',
'allow_attach': 1,
'allow_copy': None,
'allow_email': 0,
@@ -30,8 +29,8 @@
'istable': None,
'max_attachments': 1,
'menu_index': None,
- 'modified': '2011-05-17 16:24:50',
- 'modified_by': 'Guest',
+ 'modified': '2011-06-21 17:17:07',
+ 'modified_by': 'Administrator',
'module': 'CRM',
'name': 'Quotation',
'name_case': None,
@@ -43,7 +42,7 @@
'print_outline': None,
'read_only': None,
'read_only_onload': 1,
- 'search_fields': 'status,transaction_date, customer,company,order_type',
+ 'search_fields': 'status,transaction_date,customer,lead,order_type',
'section_style': 'Tabbed',
'server_code': None,
'server_code_compiled': None,
@@ -54,30 +53,7 @@
'subject': 'To %(customer_name)s on %(transaction_date)s worth %(currency)s %(grand_total_export)s',
'tag_fields': 'status',
'use_template': None,
- 'version': 594
- },
- {
- 'amend': None,
- 'cancel': None,
- 'create': None,
- 'creation': '2011-03-21 16:39:48',
- 'docstatus': 0,
- 'doctype': 'DocPerm',
- 'execute': None,
- 'idx': 1,
- 'match': None,
- 'modified': '2011-04-29 14:22:54',
- 'modified_by': 'ravi@iwebnotes.com',
- 'name': '000001912',
- 'owner': 'rahul@webnotestech.com',
- 'parent': 'Quotation',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
- 'permlevel': 0,
- 'read': None,
- 'role': 'user print',
- 'submit': None,
- 'write': None
+ 'version': 596
},
{
'amend': 0,
@@ -87,10 +63,10 @@
'docstatus': 0,
'doctype': 'DocPerm',
'execute': None,
- 'idx': 2,
+ 'idx': 1,
'match': None,
- 'modified': '2011-04-29 14:22:54',
- 'modified_by': 'ravi@iwebnotes.com',
+ 'modified': '2011-06-21 17:17:07',
+ 'modified_by': 'Administrator',
'name': 'PERM00435',
'owner': 'Administrator',
'parent': 'Quotation',
@@ -110,10 +86,10 @@
'docstatus': 0,
'doctype': 'DocPerm',
'execute': None,
- 'idx': 3,
+ 'idx': 2,
'match': None,
- 'modified': '2011-04-29 14:22:54',
- 'modified_by': 'ravi@iwebnotes.com',
+ 'modified': '2011-06-21 17:17:07',
+ 'modified_by': 'Administrator',
'name': 'PERM00436',
'owner': 'Administrator',
'parent': 'Quotation',
@@ -133,10 +109,10 @@
'docstatus': 0,
'doctype': 'DocPerm',
'execute': None,
- 'idx': 4,
+ 'idx': 3,
'match': None,
- 'modified': '2011-04-29 14:22:54',
- 'modified_by': 'ravi@iwebnotes.com',
+ 'modified': '2011-06-21 17:17:07',
+ 'modified_by': 'Administrator',
'name': 'PERM00437',
'owner': 'Administrator',
'parent': 'Quotation',
@@ -156,10 +132,10 @@
'docstatus': 0,
'doctype': 'DocPerm',
'execute': None,
- 'idx': 5,
+ 'idx': 4,
'match': None,
- 'modified': '2011-04-29 14:22:54',
- 'modified_by': 'ravi@iwebnotes.com',
+ 'modified': '2011-06-21 17:17:07',
+ 'modified_by': 'Administrator',
'name': 'PERM00438',
'owner': 'Administrator',
'parent': 'Quotation',
@@ -179,10 +155,10 @@
'docstatus': 0,
'doctype': 'DocPerm',
'execute': None,
- 'idx': 6,
+ 'idx': 5,
'match': 'customer_name',
- 'modified': '2011-04-29 14:22:54',
- 'modified_by': 'ravi@iwebnotes.com',
+ 'modified': '2011-06-21 17:17:07',
+ 'modified_by': 'Administrator',
'name': 'PERM00439',
'owner': 'Administrator',
'parent': 'Quotation',
@@ -202,10 +178,10 @@
'docstatus': 0,
'doctype': 'DocPerm',
'execute': None,
- 'idx': 7,
+ 'idx': 6,
'match': None,
- 'modified': '2011-04-29 14:22:54',
- 'modified_by': 'ravi@iwebnotes.com',
+ 'modified': '2011-06-21 17:17:07',
+ 'modified_by': 'Administrator',
'name': 'PERM00440',
'owner': 'ashwini@webnotestech.com',
'parent': 'Quotation',
@@ -225,10 +201,10 @@
'docstatus': 0,
'doctype': 'DocPerm',
'execute': None,
- 'idx': 8,
+ 'idx': 7,
'match': None,
- 'modified': '2011-04-29 14:22:54',
- 'modified_by': 'ravi@iwebnotes.com',
+ 'modified': '2011-06-21 17:17:07',
+ 'modified_by': 'Administrator',
'name': 'PERM00441',
'owner': 'ashwini@webnotestech.com',
'parent': 'Quotation',
@@ -248,10 +224,10 @@
'docstatus': 0,
'doctype': 'DocPerm',
'execute': None,
- 'idx': 9,
+ 'idx': 8,
'match': None,
- 'modified': '2011-04-29 14:22:54',
- 'modified_by': 'ravi@iwebnotes.com',
+ 'modified': '2011-06-21 17:17:07',
+ 'modified_by': 'Administrator',
'name': 'PERM00442',
'owner': 'ashwini@webnotestech.com',
'parent': 'Quotation',
@@ -271,10 +247,10 @@
'docstatus': 0,
'doctype': 'DocPerm',
'execute': None,
- 'idx': 10,
+ 'idx': 9,
'match': None,
- 'modified': '2011-04-29 14:22:54',
- 'modified_by': 'ravi@iwebnotes.com',
+ 'modified': '2011-06-21 17:17:07',
+ 'modified_by': 'Administrator',
'name': 'PERM00443',
'owner': 'ashwini@webnotestech.com',
'parent': 'Quotation',
@@ -289,7 +265,7 @@
{
'allow_on_submit': None,
'colour': 'White:FFF',
- 'creation': '2011-05-25 12:45:09',
+ 'creation': '2011-05-24 10:15:38',
'default': None,
'depends_on': None,
'description': None,
@@ -302,9 +278,9 @@
'idx': 1,
'in_filter': None,
'label': 'Basic Info',
- 'modified': '2011-05-25 12:45:09',
- 'modified_by': 'Guest',
- 'name': 'FL05298',
+ 'modified': '2011-06-21 17:17:07',
+ 'modified_by': 'Administrator',
+ 'name': 'FL05280',
'no_column': None,
'no_copy': None,
'oldfieldname': None,
@@ -325,7 +301,7 @@
{
'allow_on_submit': None,
'colour': None,
- 'creation': '2011-05-25 12:45:09',
+ 'creation': '2011-05-24 10:15:38',
'default': None,
'depends_on': None,
'description': None,
@@ -338,9 +314,9 @@
'idx': 2,
'in_filter': None,
'label': None,
- 'modified': '2011-05-25 12:45:09',
- 'modified_by': 'Guest',
- 'name': 'FL05299',
+ 'modified': '2011-06-21 17:17:07',
+ 'modified_by': 'Administrator',
+ 'name': 'FL05281',
'no_column': None,
'no_copy': None,
'oldfieldname': None,
@@ -362,7 +338,7 @@
'allow_on_submit': None,
'colour': 'White:FFF',
'creation': '2010-08-08 17:09:17',
- 'default': 'QTN',
+ 'default': None,
'depends_on': None,
'description': 'To manage multiple series please go to Setup > Manage Series',
'docstatus': 0,
@@ -374,8 +350,8 @@
'idx': 3,
'in_filter': None,
'label': 'Series',
- 'modified': '2011-05-25 12:45:08',
- 'modified_by': 'Guest',
+ 'modified': '2011-06-21 17:17:07',
+ 'modified_by': 'Administrator',
'name': 'FL02632',
'no_column': None,
'no_copy': None,
@@ -410,8 +386,8 @@
'idx': 4,
'in_filter': 1,
'label': 'Quotation To',
- 'modified': '2011-05-25 12:45:08',
- 'modified_by': 'Guest',
+ 'modified': '2011-06-21 17:17:07',
+ 'modified_by': 'Administrator',
'name': 'FL02634',
'no_column': None,
'no_copy': None,
@@ -441,13 +417,13 @@
'doctype': 'DocField',
'fieldname': 'customer',
'fieldtype': 'Link',
- 'hidden': 1,
+ 'hidden': 0,
'icon': None,
'idx': 5,
'in_filter': 1,
'label': 'Customer',
- 'modified': '2011-05-25 12:45:08',
- 'modified_by': 'Guest',
+ 'modified': '2011-06-21 17:17:07',
+ 'modified_by': 'Administrator',
'name': 'FL03788',
'no_column': None,
'no_copy': None,
@@ -477,27 +453,27 @@
'doctype': 'DocField',
'fieldname': 'customer_address',
'fieldtype': 'Link',
- 'hidden': 1,
+ 'hidden': 0,
'icon': None,
'idx': 6,
'in_filter': 1,
'label': 'Customer Address',
- 'modified': '2011-05-25 12:45:08',
- 'modified_by': 'Guest',
+ 'modified': '2011-06-21 17:17:07',
+ 'modified_by': 'Administrator',
'name': 'FL02638',
'no_column': None,
'no_copy': None,
'oldfieldname': None,
'oldfieldtype': None,
- 'options': None,
+ 'options': 'Address',
'owner': 'Administrator',
'parent': 'Quotation',
'parentfield': 'fields',
'parenttype': 'DocType',
'permlevel': 0,
- 'print_hide': 0,
+ 'print_hide': 1,
'report_hide': None,
- 'reqd': 0,
+ 'reqd': None,
'search_index': None,
'trigger': 'Client',
'width': None
@@ -513,19 +489,19 @@
'doctype': 'DocField',
'fieldname': 'contact_person',
'fieldtype': 'Link',
- 'hidden': 1,
+ 'hidden': 0,
'icon': None,
'idx': 7,
'in_filter': 1,
'label': 'Contact Person',
- 'modified': '2011-05-25 12:45:08',
- 'modified_by': 'Guest',
+ 'modified': '2011-06-21 17:17:07',
+ 'modified_by': 'Administrator',
'name': 'FL02639',
'no_column': None,
'no_copy': None,
'oldfieldname': 'contact_person',
'oldfieldtype': 'Link',
- 'options': None,
+ 'options': 'Contact',
'owner': 'Administrator',
'parent': 'Quotation',
'parentfield': 'fields',
@@ -549,13 +525,13 @@
'doctype': 'DocField',
'fieldname': 'customer_name',
'fieldtype': 'Data',
- 'hidden': 1,
+ 'hidden': None,
'icon': None,
'idx': 8,
'in_filter': None,
'label': 'Name',
- 'modified': '2011-05-25 12:45:08',
- 'modified_by': 'Guest',
+ 'modified': '2011-06-21 17:17:07',
+ 'modified_by': 'Administrator',
'name': 'FL02635',
'no_column': None,
'no_copy': None,
@@ -569,7 +545,7 @@
'permlevel': 1,
'print_hide': None,
'report_hide': None,
- 'reqd': 0,
+ 'reqd': None,
'search_index': None,
'trigger': None,
'width': None
@@ -585,13 +561,13 @@
'doctype': 'DocField',
'fieldname': 'lead',
'fieldtype': 'Link',
- 'hidden': 1,
+ 'hidden': 0,
'icon': None,
'idx': 9,
'in_filter': 1,
'label': 'Lead',
- 'modified': '2011-05-25 12:45:08',
- 'modified_by': 'Guest',
+ 'modified': '2011-06-21 17:17:07',
+ 'modified_by': 'Administrator',
'name': 'FL02636',
'no_column': None,
'no_copy': None,
@@ -603,7 +579,7 @@
'parentfield': 'fields',
'parenttype': 'DocType',
'permlevel': 0,
- 'print_hide': None,
+ 'print_hide': 1,
'report_hide': None,
'reqd': None,
'search_index': None,
@@ -621,13 +597,13 @@
'doctype': 'DocField',
'fieldname': 'lead_name',
'fieldtype': 'Text',
- 'hidden': 1,
+ 'hidden': None,
'icon': None,
'idx': 10,
'in_filter': None,
'label': 'Name',
- 'modified': '2011-05-25 12:45:08',
- 'modified_by': 'Guest',
+ 'modified': '2011-06-21 17:17:07',
+ 'modified_by': 'Administrator',
'name': 'FL02637',
'no_column': None,
'no_copy': None,
@@ -649,7 +625,7 @@
{
'allow_on_submit': None,
'colour': 'White:FFF',
- 'creation': '2011-05-25 12:45:08',
+ 'creation': '2011-05-24 10:15:37',
'default': None,
'depends_on': None,
'description': None,
@@ -662,9 +638,9 @@
'idx': 11,
'in_filter': 0,
'label': 'Address',
- 'modified': '2011-05-25 12:45:08',
- 'modified_by': 'Guest',
- 'name': 'FL05289',
+ 'modified': '2011-06-21 17:17:07',
+ 'modified_by': 'Administrator',
+ 'name': 'FL05271',
'no_column': None,
'no_copy': None,
'oldfieldname': 'customer_address',
@@ -685,7 +661,7 @@
{
'allow_on_submit': None,
'colour': 'White:FFF',
- 'creation': '2011-05-25 12:45:08',
+ 'creation': '2011-05-24 10:15:37',
'default': None,
'depends_on': None,
'description': None,
@@ -698,9 +674,9 @@
'idx': 12,
'in_filter': 0,
'label': 'Contact',
- 'modified': '2011-05-25 12:45:08',
- 'modified_by': 'Guest',
- 'name': 'FL05290',
+ 'modified': '2011-06-21 17:17:07',
+ 'modified_by': 'Administrator',
+ 'name': 'FL05272',
'no_column': None,
'no_copy': None,
'oldfieldname': None,
@@ -721,7 +697,7 @@
{
'allow_on_submit': None,
'colour': 'White:FFF',
- 'creation': '2011-05-25 12:45:08',
+ 'creation': '2011-05-24 10:15:37',
'default': None,
'depends_on': None,
'description': None,
@@ -734,9 +710,9 @@
'idx': 13,
'in_filter': None,
'label': 'Mobile No',
- 'modified': '2011-05-25 12:45:08',
- 'modified_by': 'Guest',
- 'name': 'FL05291',
+ 'modified': '2011-06-21 17:17:07',
+ 'modified_by': 'Administrator',
+ 'name': 'FL05273',
'no_column': None,
'no_copy': None,
'oldfieldname': None,
@@ -757,7 +733,7 @@
{
'allow_on_submit': None,
'colour': 'White:FFF',
- 'creation': '2011-05-25 12:45:08',
+ 'creation': '2011-05-24 10:15:37',
'default': None,
'depends_on': None,
'description': None,
@@ -770,9 +746,9 @@
'idx': 14,
'in_filter': None,
'label': 'Contact Email',
- 'modified': '2011-05-25 12:45:08',
- 'modified_by': 'Guest',
- 'name': 'FL05292',
+ 'modified': '2011-06-21 17:17:07',
+ 'modified_by': 'Administrator',
+ 'name': 'FL05274',
'no_column': None,
'no_copy': None,
'oldfieldname': None,
@@ -793,7 +769,7 @@
{
'allow_on_submit': None,
'colour': 'White:FFF',
- 'creation': '2011-05-25 12:45:09',
+ 'creation': '2011-05-24 10:15:38',
'default': None,
'depends_on': None,
'description': None,
@@ -806,9 +782,9 @@
'idx': 15,
'in_filter': None,
'label': None,
- 'modified': '2011-05-25 12:45:09',
- 'modified_by': 'Guest',
- 'name': 'FL05300',
+ 'modified': '2011-06-21 17:17:07',
+ 'modified_by': 'Administrator',
+ 'name': 'FL05282',
'no_column': None,
'no_copy': None,
'oldfieldname': None,
@@ -842,8 +818,8 @@
'idx': 16,
'in_filter': 1,
'label': 'Quotation Date',
- 'modified': '2011-05-25 12:45:08',
- 'modified_by': 'Guest',
+ 'modified': '2011-06-21 17:17:07',
+ 'modified_by': 'Administrator',
'name': 'FL02642',
'no_column': None,
'no_copy': 1,
@@ -878,8 +854,8 @@
'idx': 17,
'in_filter': 1,
'label': 'Order Type',
- 'modified': '2011-05-25 12:45:08',
- 'modified_by': 'Guest',
+ 'modified': '2011-06-21 17:17:07',
+ 'modified_by': 'Administrator',
'name': 'FL02631',
'no_column': None,
'no_copy': None,
@@ -891,7 +867,7 @@
'parentfield': 'fields',
'parenttype': 'DocType',
'permlevel': 0,
- 'print_hide': None,
+ 'print_hide': 0,
'report_hide': None,
'reqd': 1,
'search_index': 1,
@@ -914,8 +890,8 @@
'idx': 18,
'in_filter': 1,
'label': 'Status',
- 'modified': '2011-05-25 12:45:08',
- 'modified_by': 'Guest',
+ 'modified': '2011-06-21 17:17:07',
+ 'modified_by': 'Administrator',
'name': 'FL02633',
'no_column': None,
'no_copy': 1,
@@ -929,7 +905,7 @@
'permlevel': 1,
'print_hide': 1,
'report_hide': None,
- 'reqd': 0,
+ 'reqd': 1,
'search_index': 1,
'trigger': None,
'width': None
@@ -950,8 +926,8 @@
'idx': 19,
'in_filter': None,
'label': 'Amended From',
- 'modified': '2011-05-25 12:45:08',
- 'modified_by': 'Guest',
+ 'modified': '2011-06-21 17:17:07',
+ 'modified_by': 'Administrator',
'name': 'FL02643',
'no_column': None,
'no_copy': 1,
@@ -986,8 +962,8 @@
'idx': 20,
'in_filter': None,
'label': 'Amendment Date',
- 'modified': '2011-05-25 12:45:08',
- 'modified_by': 'Guest',
+ 'modified': '2011-06-21 17:17:07',
+ 'modified_by': 'Administrator',
'name': 'FL02644',
'no_column': None,
'no_copy': 1,
@@ -1022,8 +998,8 @@
'idx': 21,
'in_filter': 1,
'label': 'Enquiry No',
- 'modified': '2011-05-25 12:45:08',
- 'modified_by': 'Guest',
+ 'modified': '2011-06-21 17:17:07',
+ 'modified_by': 'Administrator',
'name': 'FL02645',
'no_column': None,
'no_copy': 0,
@@ -1058,8 +1034,8 @@
'idx': 22,
'in_filter': None,
'label': 'Pull Enquiry Detail',
- 'modified': '2011-05-25 12:45:08',
- 'modified_by': 'Guest',
+ 'modified': '2011-06-21 17:17:07',
+ 'modified_by': 'Administrator',
'name': 'FL02646',
'no_column': None,
'no_copy': 0,
@@ -1089,13 +1065,13 @@
'doctype': 'DocField',
'fieldname': 'territory',
'fieldtype': 'Link',
- 'hidden': 1,
+ 'hidden': 0,
'icon': None,
'idx': 23,
'in_filter': 1,
'label': 'Territory',
- 'modified': '2011-05-25 12:45:08',
- 'modified_by': 'Guest',
+ 'modified': '2011-06-21 17:17:07',
+ 'modified_by': 'Administrator',
'name': 'FL02640',
'no_column': None,
'no_copy': None,
@@ -1130,8 +1106,8 @@
'idx': 24,
'in_filter': 1,
'label': 'Customer Group',
- 'modified': '2011-05-25 12:45:08',
- 'modified_by': 'Guest',
+ 'modified': '2011-06-21 17:17:07',
+ 'modified_by': 'Administrator',
'name': 'FL02680',
'no_column': None,
'no_copy': None,
@@ -1153,7 +1129,7 @@
{
'allow_on_submit': None,
'colour': 'White:FFF',
- 'creation': '2011-05-25 12:45:09',
+ 'creation': '2011-05-24 10:15:38',
'default': None,
'depends_on': None,
'description': None,
@@ -1166,9 +1142,9 @@
'idx': 25,
'in_filter': None,
'label': 'Items',
- 'modified': '2011-05-25 12:45:09',
- 'modified_by': 'Guest',
- 'name': 'FL05301',
+ 'modified': '2011-06-21 17:17:07',
+ 'modified_by': 'Administrator',
+ 'name': 'FL05283',
'no_column': None,
'no_copy': None,
'oldfieldname': None,
@@ -1202,8 +1178,8 @@
'idx': 26,
'in_filter': None,
'label': 'Clear Table',
- 'modified': '2011-05-25 12:45:08',
- 'modified_by': 'Guest',
+ 'modified': '2011-06-21 17:17:07',
+ 'modified_by': 'Administrator',
'name': 'FL02650',
'no_column': None,
'no_copy': None,
@@ -1238,8 +1214,8 @@
'idx': 27,
'in_filter': 1,
'label': 'Price List',
- 'modified': '2011-05-25 12:45:08',
- 'modified_by': 'Guest',
+ 'modified': '2011-06-21 17:17:07',
+ 'modified_by': 'Administrator',
'name': 'FL02651',
'no_column': None,
'no_copy': None,
@@ -1261,7 +1237,7 @@
{
'allow_on_submit': None,
'colour': None,
- 'creation': '2011-05-25 12:45:09',
+ 'creation': '2011-05-24 10:15:38',
'default': None,
'depends_on': None,
'description': None,
@@ -1274,9 +1250,9 @@
'idx': 28,
'in_filter': None,
'label': None,
- 'modified': '2011-05-25 12:45:09',
- 'modified_by': 'Guest',
- 'name': 'FL05302',
+ 'modified': '2011-06-21 17:17:07',
+ 'modified_by': 'Administrator',
+ 'name': 'FL05284',
'no_column': None,
'no_copy': None,
'oldfieldname': None,
@@ -1310,8 +1286,8 @@
'idx': 29,
'in_filter': 1,
'label': 'Currency',
- 'modified': '2011-05-25 12:45:08',
- 'modified_by': 'Guest',
+ 'modified': '2011-06-21 17:17:07',
+ 'modified_by': 'Administrator',
'name': 'FL02647',
'no_column': None,
'no_copy': None,
@@ -1323,7 +1299,7 @@
'parentfield': 'fields',
'parenttype': 'DocType',
'permlevel': 0,
- 'print_hide': 0,
+ 'print_hide': 1,
'report_hide': None,
'reqd': 1,
'search_index': 0,
@@ -1346,8 +1322,8 @@
'idx': 30,
'in_filter': None,
'label': 'Currency Conversion Rate',
- 'modified': '2011-05-25 12:45:08',
- 'modified_by': 'Guest',
+ 'modified': '2011-06-21 17:17:07',
+ 'modified_by': 'Administrator',
'name': 'FL02648',
'no_column': None,
'no_copy': None,
@@ -1369,7 +1345,7 @@
{
'allow_on_submit': None,
'colour': None,
- 'creation': '2011-05-25 12:45:09',
+ 'creation': '2011-05-24 10:15:38',
'default': None,
'depends_on': None,
'description': None,
@@ -1382,9 +1358,9 @@
'idx': 31,
'in_filter': None,
'label': None,
- 'modified': '2011-05-25 12:45:09',
- 'modified_by': 'Guest',
- 'name': 'FL05303',
+ 'modified': '2011-06-21 17:17:07',
+ 'modified_by': 'Administrator',
+ 'name': 'FL05285',
'no_column': None,
'no_copy': None,
'oldfieldname': None,
@@ -1418,8 +1394,8 @@
'idx': 32,
'in_filter': None,
'label': 'Quotation Details',
- 'modified': '2011-05-25 12:45:08',
- 'modified_by': 'Guest',
+ 'modified': '2011-06-21 17:17:07',
+ 'modified_by': 'Administrator',
'name': 'FL02652',
'no_column': None,
'no_copy': None,
@@ -1454,8 +1430,8 @@
'idx': 33,
'in_filter': None,
'label': 'Net Total*',
- 'modified': '2011-05-25 12:45:08',
- 'modified_by': 'Guest',
+ 'modified': '2011-06-21 17:17:07',
+ 'modified_by': 'Administrator',
'name': 'FL02653',
'no_column': None,
'no_copy': 0,
@@ -1490,8 +1466,8 @@
'idx': 34,
'in_filter': None,
'label': 'Re-Calculate Values',
- 'modified': '2011-05-25 12:45:08',
- 'modified_by': 'Guest',
+ 'modified': '2011-06-21 17:17:07',
+ 'modified_by': 'Administrator',
'name': 'FL02654',
'no_column': None,
'no_copy': None,
@@ -1513,7 +1489,7 @@
{
'allow_on_submit': None,
'colour': 'White:FFF',
- 'creation': '2011-05-25 12:45:09',
+ 'creation': '2011-05-24 10:15:38',
'default': None,
'depends_on': None,
'description': None,
@@ -1526,9 +1502,9 @@
'idx': 35,
'in_filter': None,
'label': 'Note HTML',
- 'modified': '2011-05-25 12:45:09',
- 'modified_by': 'Guest',
- 'name': 'FL05304',
+ 'modified': '2011-06-21 17:17:07',
+ 'modified_by': 'Administrator',
+ 'name': 'FL05286',
'no_column': None,
'no_copy': None,
'oldfieldname': None,
@@ -1549,7 +1525,7 @@
{
'allow_on_submit': None,
'colour': 'White:FFF',
- 'creation': '2011-05-25 12:45:09',
+ 'creation': '2011-05-24 10:15:38',
'default': None,
'depends_on': None,
'description': None,
@@ -1562,9 +1538,9 @@
'idx': 36,
'in_filter': None,
'label': 'Taxes',
- 'modified': '2011-05-25 12:45:09',
- 'modified_by': 'Guest',
- 'name': 'FL05305',
+ 'modified': '2011-06-21 17:17:07',
+ 'modified_by': 'Administrator',
+ 'name': 'FL05287',
'no_column': None,
'no_copy': None,
'oldfieldname': None,
@@ -1598,8 +1574,8 @@
'idx': 37,
'in_filter': None,
'label': 'Select Charges Master',
- 'modified': '2011-05-25 12:45:08',
- 'modified_by': 'Guest',
+ 'modified': '2011-06-21 17:17:07',
+ 'modified_by': 'Administrator',
'name': 'FL02657',
'no_column': None,
'no_copy': None,
@@ -1634,8 +1610,8 @@
'idx': 38,
'in_filter': None,
'label': 'Get Charges',
- 'modified': '2011-05-25 12:45:08',
- 'modified_by': 'Guest',
+ 'modified': '2011-06-21 17:17:07',
+ 'modified_by': 'Administrator',
'name': 'FL02658',
'no_column': None,
'no_copy': None,
@@ -1670,8 +1646,8 @@
'idx': 39,
'in_filter': None,
'label': 'Other Charges',
- 'modified': '2011-05-25 12:45:08',
- 'modified_by': 'Guest',
+ 'modified': '2011-06-21 17:17:07',
+ 'modified_by': 'Administrator',
'name': 'FL02659',
'no_column': None,
'no_copy': None,
@@ -1706,8 +1682,8 @@
'idx': 40,
'in_filter': None,
'label': 'Calculate Charges',
- 'modified': '2011-05-25 12:45:08',
- 'modified_by': 'Guest',
+ 'modified': '2011-06-21 17:17:07',
+ 'modified_by': 'Administrator',
'name': 'FL02660',
'no_column': None,
'no_copy': None,
@@ -1742,8 +1718,8 @@
'idx': 41,
'in_filter': None,
'label': 'Charges Total*',
- 'modified': '2011-05-25 12:45:08',
- 'modified_by': 'Guest',
+ 'modified': '2011-06-21 17:17:07',
+ 'modified_by': 'Administrator',
'name': 'FL02661',
'no_column': None,
'no_copy': None,
@@ -1778,8 +1754,8 @@
'idx': 42,
'in_filter': None,
'label': 'Grand Total*',
- 'modified': '2011-05-25 12:45:08',
- 'modified_by': 'Guest',
+ 'modified': '2011-06-21 17:17:07',
+ 'modified_by': 'Administrator',
'name': 'FL02662',
'no_column': None,
'no_copy': 0,
@@ -1801,7 +1777,7 @@
{
'allow_on_submit': None,
'colour': None,
- 'creation': '2011-05-25 12:45:09',
+ 'creation': '2011-05-24 10:15:39',
'default': None,
'depends_on': None,
'description': None,
@@ -1814,9 +1790,9 @@
'idx': 43,
'in_filter': None,
'label': 'Other Charges Calculation',
- 'modified': '2011-05-25 12:45:09',
- 'modified_by': 'Guest',
- 'name': 'FL05306',
+ 'modified': '2011-06-21 17:17:07',
+ 'modified_by': 'Administrator',
+ 'name': 'FL05288',
'no_column': None,
'no_copy': None,
'oldfieldname': None,
@@ -1837,7 +1813,7 @@
{
'allow_on_submit': None,
'colour': None,
- 'creation': '2011-05-25 12:45:09',
+ 'creation': '2011-05-24 10:15:39',
'default': None,
'depends_on': None,
'description': None,
@@ -1850,9 +1826,9 @@
'idx': 44,
'in_filter': None,
'label': 'OT Notes',
- 'modified': '2011-05-25 12:45:09',
- 'modified_by': 'Guest',
- 'name': 'FL05307',
+ 'modified': '2011-06-21 17:17:07',
+ 'modified_by': 'Administrator',
+ 'name': 'FL05289',
'no_column': None,
'no_copy': None,
'oldfieldname': None,
@@ -1873,7 +1849,7 @@
{
'allow_on_submit': None,
'colour': 'White:FFF',
- 'creation': '2011-05-25 12:45:09',
+ 'creation': '2011-05-24 10:15:39',
'default': None,
'depends_on': None,
'description': None,
@@ -1886,9 +1862,9 @@
'idx': 45,
'in_filter': None,
'label': 'Totals',
- 'modified': '2011-05-25 12:45:09',
- 'modified_by': 'Guest',
- 'name': 'FL05308',
+ 'modified': '2011-06-21 17:17:07',
+ 'modified_by': 'Administrator',
+ 'name': 'FL05290',
'no_column': None,
'no_copy': None,
'oldfieldname': None,
@@ -1922,8 +1898,8 @@
'idx': 46,
'in_filter': None,
'label': 'Rounded Total',
- 'modified': '2011-05-25 12:45:08',
- 'modified_by': 'Guest',
+ 'modified': '2011-06-21 17:17:07',
+ 'modified_by': 'Administrator',
'name': 'FL02686',
'no_column': None,
'no_copy': 0,
@@ -1958,8 +1934,8 @@
'idx': 47,
'in_filter': None,
'label': 'In Words',
- 'modified': '2011-05-25 12:45:08',
- 'modified_by': 'Guest',
+ 'modified': '2011-06-21 17:17:07',
+ 'modified_by': 'Administrator',
'name': 'FL02687',
'no_column': None,
'no_copy': 0,
@@ -1981,7 +1957,7 @@
{
'allow_on_submit': None,
'colour': None,
- 'creation': '2011-05-25 12:45:09',
+ 'creation': '2011-05-24 10:15:39',
'default': None,
'depends_on': None,
'description': None,
@@ -1994,9 +1970,9 @@
'idx': 48,
'in_filter': None,
'label': None,
- 'modified': '2011-05-25 12:45:09',
- 'modified_by': 'Guest',
- 'name': 'FL05309',
+ 'modified': '2011-06-21 17:17:07',
+ 'modified_by': 'Administrator',
+ 'name': 'FL05291',
'no_column': None,
'no_copy': None,
'oldfieldname': None,
@@ -2030,8 +2006,8 @@
'idx': 49,
'in_filter': None,
'label': 'Grand Total (Export)',
- 'modified': '2011-05-25 12:45:08',
- 'modified_by': 'Guest',
+ 'modified': '2011-06-21 17:17:07',
+ 'modified_by': 'Administrator',
'name': 'FL02689',
'no_column': None,
'no_copy': 0,
@@ -2066,8 +2042,8 @@
'idx': 50,
'in_filter': None,
'label': 'Rounded Total (Export)',
- 'modified': '2011-05-25 12:45:08',
- 'modified_by': 'Guest',
+ 'modified': '2011-06-21 17:17:07',
+ 'modified_by': 'Administrator',
'name': 'FL02690',
'no_column': None,
'no_copy': 0,
@@ -2102,8 +2078,8 @@
'idx': 51,
'in_filter': None,
'label': 'In Words (Export)',
- 'modified': '2011-05-25 12:45:08',
- 'modified_by': 'Guest',
+ 'modified': '2011-06-21 17:17:07',
+ 'modified_by': 'Administrator',
'name': 'FL02691',
'no_column': None,
'no_copy': 0,
@@ -2125,7 +2101,7 @@
{
'allow_on_submit': None,
'colour': 'White:FFF',
- 'creation': '2011-05-25 12:45:09',
+ 'creation': '2011-05-24 10:15:39',
'default': None,
'depends_on': None,
'description': 'Add Terms and Conditions for the Quotation like Payment Terms, Validity of Offer etc. You can also prepare a master Term Sheet and use the Template',
@@ -2138,9 +2114,9 @@
'idx': 52,
'in_filter': None,
'label': 'Terms',
- 'modified': '2011-05-25 12:45:09',
- 'modified_by': 'Guest',
- 'name': 'FL05310',
+ 'modified': '2011-06-21 17:17:07',
+ 'modified_by': 'Administrator',
+ 'name': 'FL05292',
'no_column': None,
'no_copy': None,
'oldfieldname': None,
@@ -2169,13 +2145,13 @@
'doctype': 'DocField',
'fieldname': 'letter_head',
'fieldtype': 'Select',
- 'hidden': 1,
+ 'hidden': None,
'icon': None,
'idx': 53,
'in_filter': None,
'label': 'Letter Head',
- 'modified': '2011-05-25 12:45:08',
- 'modified_by': 'Guest',
+ 'modified': '2011-06-21 17:17:07',
+ 'modified_by': 'Administrator',
'name': 'FL04223',
'no_column': None,
'no_copy': None,
@@ -2210,8 +2186,8 @@
'idx': 54,
'in_filter': None,
'label': 'Select Terms',
- 'modified': '2011-05-25 12:45:08',
- 'modified_by': 'Guest',
+ 'modified': '2011-06-21 17:17:07',
+ 'modified_by': 'Administrator',
'name': 'FL02666',
'no_column': None,
'no_copy': None,
@@ -2246,8 +2222,8 @@
'idx': 55,
'in_filter': None,
'label': 'Get Terms',
- 'modified': '2011-05-25 12:45:08',
- 'modified_by': 'Guest',
+ 'modified': '2011-06-21 17:17:07',
+ 'modified_by': 'Administrator',
'name': 'FL02667',
'no_column': None,
'no_copy': None,
@@ -2269,7 +2245,7 @@
{
'allow_on_submit': None,
'colour': None,
- 'creation': '2011-05-25 12:45:09',
+ 'creation': '2011-05-24 10:15:39',
'default': None,
'depends_on': None,
'description': None,
@@ -2282,9 +2258,9 @@
'idx': 56,
'in_filter': None,
'label': 'Terms HTML',
- 'modified': '2011-05-25 12:45:09',
- 'modified_by': 'Guest',
- 'name': 'FL05311',
+ 'modified': '2011-06-21 17:17:07',
+ 'modified_by': 'Administrator',
+ 'name': 'FL05293',
'no_column': None,
'no_copy': None,
'oldfieldname': None,
@@ -2318,8 +2294,8 @@
'idx': 57,
'in_filter': None,
'label': 'Term Details',
- 'modified': '2011-05-25 12:45:08',
- 'modified_by': 'Guest',
+ 'modified': '2011-06-21 17:17:07',
+ 'modified_by': 'Administrator',
'name': 'FL02669',
'no_column': None,
'no_copy': None,
@@ -2341,7 +2317,7 @@
{
'allow_on_submit': None,
'colour': 'White:FFF',
- 'creation': '2011-05-25 12:45:09',
+ 'creation': '2011-05-24 10:15:39',
'default': None,
'depends_on': None,
'description': 'Filling in additional information about the Quotation will help you analyze your data better.',
@@ -2354,9 +2330,9 @@
'idx': 58,
'in_filter': None,
'label': 'More Info',
- 'modified': '2011-05-25 12:45:09',
- 'modified_by': 'Guest',
- 'name': 'FL05312',
+ 'modified': '2011-06-21 17:17:07',
+ 'modified_by': 'Administrator',
+ 'name': 'FL05294',
'no_column': None,
'no_copy': None,
'oldfieldname': None,
@@ -2390,8 +2366,8 @@
'idx': 59,
'in_filter': 1,
'label': 'Company',
- 'modified': '2011-05-25 12:45:08',
- 'modified_by': 'Guest',
+ 'modified': '2011-06-21 17:17:07',
+ 'modified_by': 'Administrator',
'name': 'FL02675',
'no_column': None,
'no_copy': None,
@@ -2426,8 +2402,8 @@
'idx': 60,
'in_filter': 1,
'label': 'Fiscal Year',
- 'modified': '2011-05-25 12:45:08',
- 'modified_by': 'Guest',
+ 'modified': '2011-06-21 17:17:07',
+ 'modified_by': 'Administrator',
'name': 'FL02676',
'no_column': None,
'no_copy': None,
@@ -2462,8 +2438,8 @@
'idx': 61,
'in_filter': None,
'label': 'Enquiry Detail',
- 'modified': '2011-05-25 12:45:08',
- 'modified_by': 'Guest',
+ 'modified': '2011-06-21 17:17:07',
+ 'modified_by': 'Administrator',
'name': 'FL02672',
'no_column': None,
'no_copy': 0,
@@ -2498,8 +2474,8 @@
'idx': 62,
'in_filter': None,
'label': 'Source',
- 'modified': '2011-05-25 12:45:09',
- 'modified_by': 'Guest',
+ 'modified': '2011-06-21 17:17:07',
+ 'modified_by': 'Administrator',
'name': 'FL02673',
'no_column': None,
'no_copy': 0,
@@ -2534,8 +2510,8 @@
'idx': 63,
'in_filter': None,
'label': 'Campaign',
- 'modified': '2011-05-25 12:45:09',
- 'modified_by': 'Guest',
+ 'modified': '2011-06-21 17:17:07',
+ 'modified_by': 'Administrator',
'name': 'FL02674',
'no_column': None,
'no_copy': 0,
@@ -2570,8 +2546,8 @@
'idx': 64,
'in_filter': None,
'label': 'Select Print Heading',
- 'modified': '2011-05-25 12:45:09',
- 'modified_by': 'Guest',
+ 'modified': '2011-06-21 17:17:07',
+ 'modified_by': 'Administrator',
'name': 'FL02683',
'no_column': None,
'no_copy': 1,
@@ -2606,8 +2582,8 @@
'idx': 65,
'in_filter': None,
'label': 'Cancel Reason',
- 'modified': '2011-05-25 12:45:09',
- 'modified_by': 'Guest',
+ 'modified': '2011-06-21 17:17:07',
+ 'modified_by': 'Administrator',
'name': 'FL02677',
'no_column': None,
'no_copy': 1,
@@ -2642,8 +2618,8 @@
'idx': 66,
'in_filter': None,
'label': 'Order Lost Reason',
- 'modified': '2011-05-25 12:45:09',
- 'modified_by': 'Guest',
+ 'modified': '2011-06-21 17:17:07',
+ 'modified_by': 'Administrator',
'name': 'FL02678',
'no_column': None,
'no_copy': 1,
@@ -2655,7 +2631,7 @@
'parentfield': 'fields',
'parenttype': 'DocType',
'permlevel': 1,
- 'print_hide': 0,
+ 'print_hide': 1,
'report_hide': None,
'reqd': None,
'search_index': None,
@@ -2665,7 +2641,7 @@
{
'allow_on_submit': None,
'colour': None,
- 'creation': '2011-05-25 12:45:09',
+ 'creation': '2011-05-24 10:15:39',
'default': None,
'depends_on': None,
'description': None,
@@ -2678,9 +2654,9 @@
'idx': 67,
'in_filter': None,
'label': None,
- 'modified': '2011-05-25 12:45:09',
- 'modified_by': 'Guest',
- 'name': 'FL05313',
+ 'modified': '2011-06-21 17:17:07',
+ 'modified_by': 'Administrator',
+ 'name': 'FL05295',
'no_column': None,
'no_copy': None,
'oldfieldname': None,
@@ -2714,20 +2690,20 @@
'idx': 68,
'in_filter': None,
'label': 'Next Contact By',
- 'modified': '2011-05-25 12:45:09',
- 'modified_by': 'Guest',
+ 'modified': '2011-06-21 17:17:07',
+ 'modified_by': 'Administrator',
'name': 'FL03767',
'no_column': None,
'no_copy': None,
'oldfieldname': 'contact_by',
'oldfieldtype': 'Link',
- 'options': 'Sales Person',
+ 'options': 'Profile',
'owner': 'ashwini@webnotestech.com',
'parent': 'Quotation',
'parentfield': 'fields',
'parenttype': 'DocType',
'permlevel': 0,
- 'print_hide': None,
+ 'print_hide': 1,
'report_hide': None,
'reqd': None,
'search_index': None,
@@ -2750,8 +2726,8 @@
'idx': 69,
'in_filter': None,
'label': 'Next Contact Date',
- 'modified': '2011-05-25 12:45:09',
- 'modified_by': 'Guest',
+ 'modified': '2011-06-21 17:17:07',
+ 'modified_by': 'Administrator',
'name': 'FL03768',
'no_column': None,
'no_copy': None,
@@ -2763,7 +2739,7 @@
'parentfield': 'fields',
'parenttype': 'DocType',
'permlevel': 0,
- 'print_hide': None,
+ 'print_hide': 1,
'report_hide': None,
'reqd': None,
'search_index': None,
@@ -2786,8 +2762,8 @@
'idx': 70,
'in_filter': None,
'label': 'Last Contact Date',
- 'modified': '2011-05-25 12:45:09',
- 'modified_by': 'Guest',
+ 'modified': '2011-06-21 17:17:07',
+ 'modified_by': 'Administrator',
'name': 'FL03769',
'no_column': None,
'no_copy': 1,
@@ -2822,8 +2798,8 @@
'idx': 71,
'in_filter': None,
'label': 'To Discuss',
- 'modified': '2011-05-25 12:45:09',
- 'modified_by': 'Guest',
+ 'modified': '2011-06-21 17:17:07',
+ 'modified_by': 'Administrator',
'name': 'FL03771',
'no_column': None,
'no_copy': None,
@@ -2835,7 +2811,7 @@
'parentfield': 'fields',
'parenttype': 'DocType',
'permlevel': 0,
- 'print_hide': None,
+ 'print_hide': 1,
'report_hide': None,
'reqd': None,
'search_index': None,
@@ -2845,7 +2821,7 @@
{
'allow_on_submit': None,
'colour': 'White:FFF',
- 'creation': '2011-05-25 12:45:09',
+ 'creation': '2011-05-24 10:15:39',
'default': None,
'depends_on': None,
'description': 'Keep a track on communications regarding this Quotation. This will help you remember earlier communications in case the Customer comes back again',
@@ -2858,9 +2834,9 @@
'idx': 72,
'in_filter': None,
'label': 'Communication History',
- 'modified': '2011-05-25 12:45:09',
- 'modified_by': 'Guest',
- 'name': 'FL05314',
+ 'modified': '2011-06-21 17:17:07',
+ 'modified_by': 'Administrator',
+ 'name': 'FL05296',
'no_column': None,
'no_copy': None,
'oldfieldname': None,
@@ -2894,8 +2870,8 @@
'idx': 73,
'in_filter': None,
'label': 'Follow up',
- 'modified': '2011-05-25 12:45:09',
- 'modified_by': 'Guest',
+ 'modified': '2011-06-21 17:17:07',
+ 'modified_by': 'Administrator',
'name': 'FL02694',
'no_column': None,
'no_copy': None,
@@ -2930,8 +2906,8 @@
'idx': 74,
'in_filter': None,
'label': 'File List',
- 'modified': '2011-05-25 12:45:09',
- 'modified_by': 'Guest',
+ 'modified': '2011-06-21 17:17:07',
+ 'modified_by': 'Administrator',
'name': 'FL02703',
'no_column': None,
'no_copy': 1,
diff --git a/patches/patch.py b/patches/patch.py
index 341c484..b2230d4 100644
--- a/patches/patch.py
+++ b/patches/patch.py
@@ -1,6 +1,6 @@
# REMEMBER to update this
# ========================
-last_patch = 288
+last_patch = 289
#-------------------------------------------
@@ -1148,10 +1148,7 @@
elif patch_no == 287:
sql("update `tabDocField` set no_copy = 1 where fieldname in ('per_received', 'per_billed', 'per_delivered') and parent in ('Purchase Order', 'Purchase Receipt', 'Sales Order', 'Delivery Note')")
elif patch_no == 288:
- count = sql("""SELECT * FROM `tabModule Def`
- WHERE `module_name` LIKE 'Home'""")
- if not count:
- md = Document('Module Def')
- md.module_name = 'Home'
- md.module_label = 'Home'
- md.save(1)
+ reload_doc('accounts', 'doctype', 'payable_voucher')
+ elif patch_no == 289:
+ sql("update `tabDocType` set subject = 'From %(supplier_name)s worth %(grand_total)s due on %(due_date)s | %(outstanding_amount)s outstanding' where name = 'Payable Voucher'")
+ sql("update `tabDocType` set search_fields = 'status,transaction_date,customer,lead,order_type' where name = 'Quotation'")