nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-23 06:59:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

synced timestamps

Browse Source
This commit is contained in:
Rushabh Mehta
2011-09-05 13:17:22 +05:30
parent 962e92ee00 98f9e98068
commit 2a9afbf4f6
105 changed files with 4302 additions and 8178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

524
accounts/DocType Mapper/Delivery Note-Receivable Voucher/Delivery Note-Receivable Voucher.txt
View File

@@ -5,7 +5,7 @@
{
'creation': '2010-08-08 17:09:34',
'docstatus': 0,
'modified': '2011-06-15 14:42:33',
'modified': '2011-08-09 11:14:09',
'modified_by': 'Administrator',
'owner': 'Administrator'
},
@@ -23,6 +23,7 @@
{
'doctype': 'Field Mapper Detail',
'map': 'Yes',
'match_id': 1,
'name': '__common__',
'parent': 'Delivery Note-Receivable Voucher',
'parentfield': 'field_mapper_details',
@@ -48,261 +49,14 @@
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'contact_person',
'idx': 1,
'match_id': 0,
'to_field': 'contact_person'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'customer',
'idx': 2,
'match_id': 0,
'to_field': 'customer'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'customer',
'idx': 3,
'match_id': 0,
'to_field': 'customer'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'customer_name',
'idx': 4,
'match_id': 0,
'to_field': 'customer_name'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'address_display',
'idx': 5,
'match_id': 0,
'to_field': 'address_display'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'contact_display',
'idx': 6,
'match_id': 0,
'to_field': 'contact_display'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'contact_mobile',
'idx': 7,
'match_id': 0,
'to_field': 'contact_mobile'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'contact_email',
'idx': 8,
'match_id': 0,
'to_field': 'contact_email'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'customer_group',
'idx': 9,
'match_id': 0,
'to_field': 'customer_group'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'currency',
'idx': 10,
'match_id': 0,
'to_field': 'currency'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'conversion_rate',
'idx': 11,
'match_id': 0,
'to_field': 'conversion_rate'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'company',
'idx': 12,
'match_id': 0,
'to_field': 'company'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'fiscal_year',
'idx': 13,
'match_id': 0,
'to_field': 'fiscal_year'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'price_list_name',
'idx': 14,
'match_id': 0,
'to_field': 'price_list_name'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'charge',
'idx': 15,
'match_id': 0,
'to_field': 'charge'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'item_code',
'idx': 16,
'match_id': 1,
'to_field': 'item_code'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'terms',
'idx': 17,
'match_id': 0,
'to_field': 'terms'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'item_name',
'idx': 18,
'match_id': 1,
'to_field': 'item_name'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'brand',
'idx': 19,
'match_id': 1,
'to_field': 'brand'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'description',
'idx': 20,
'match_id': 1,
'to_field': 'description'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'batch_no',
'idx': 21,
'match_id': 1,
'to_field': 'batch_no'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'serial_no',
'idx': 22,
'match_id': 1,
'to_field': 'serial_no'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'item_group',
'idx': 23,
'match_id': 1,
'to_field': 'item_group'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'eval: flt(obj.qty) - flt(obj.billed_qty)',
'idx': 24,
'match_id': 1,
'from_field': 'eval: (flt(obj.amount) - flt(obj.billed_amt)) / flt(obj.basic_rate)',
'to_field': 'qty'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'export_rate',
'idx': 25,
'match_id': 1,
'to_field': 'export_rate'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'base_ref_rate',
'idx': 26,
'match_id': 1,
'to_field': 'base_ref_rate'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'ref_rate',
'idx': 27,
'match_id': 1,
'to_field': 'ref_rate'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'basic_rate',
'idx': 28,
'match_id': 1,
'to_field': 'basic_rate'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'parent',
'idx': 29,
'match_id': 1,
'to_field': 'delivery_note'
},
@@ -310,8 +64,6 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'name',
'idx': 30,
'match_id': 1,
'to_field': 'dn_detail'
},
@@ -319,8 +71,6 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'prevdoc_docname',
'idx': 31,
'match_id': 1,
'to_field': 'sales_order'
},
@@ -328,286 +78,27 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'prevdoc_detail_docname',
'idx': 32,
'match_id': 1,
'to_field': 'so_detail'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'export_rate',
'idx': 33,
'match_id': 1,
'to_field': 'export_rate'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'stock_uom',
'idx': 34,
'match_id': 1,
'to_field': 'stock_uom'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'eval: (flt(obj.qty) - flt(obj.billed_qty)) * flt(obj.basic_rate)',
'idx': 35,
'match_id': 1,
'from_field': 'eval: flt(obj.amount) - flt(obj.billed_amt)',
'to_field': 'amount'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'eval: (flt(obj.qty) - flt(obj.billed_qty)) * flt(obj.export_rate)',
'idx': 36,
'match_id': 1,
'from_field': 'eval: (flt(obj.amount) - flt(obj.billed_amt)) * flt(obj.export_rate)/flt(obj.basic_rate)',
'to_field': 'export_amount'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'adj_rate',
'idx': 37,
'match_id': 1,
'to_field': 'adj_rate'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'item_tax_rate',
'idx': 38,
'match_id': 1,
'to_field': 'item_tax_rate'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'charge_type',
'idx': 39,
'match_id': 2,
'to_field': 'charge_type'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'row_id',
'idx': 40,
'match_id': 2,
'to_field': 'row_id'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'item_wise_tax_detail',
'idx': 41,
'match_id': 2,
'to_field': 'item_wise_tax_detail'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'description',
'idx': 42,
'match_id': 2,
'to_field': 'description'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'account_head',
'idx': 43,
'match_id': 2,
'to_field': 'account_head'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'rate',
'idx': 44,
'match_id': 2,
'to_field': 'rate'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'tax_amount',
'idx': 45,
'match_id': 2,
'to_field': 'tax_amount'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'total',
'idx': 46,
'match_id': 2,
'to_field': 'total'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'sales_person',
'idx': 47,
'match_id': 3,
'to_field': 'sales_person'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'sales_designation',
'idx': 48,
'match_id': 3,
'to_field': 'sales_designation'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'allocated_percentage',
'idx': 49,
'match_id': 3,
'to_field': 'allocated_percentage'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'allocated_amount',
'idx': 50,
'match_id': 3,
'to_field': 'allocated_amount'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'incentives',
'idx': 51,
'match_id': 3,
'to_field': 'incentives'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'source',
'idx': 52,
'match_id': 0,
'to_field': 'source'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'campaign',
'idx': 53,
'match_id': 0,
'to_field': 'campaign'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'territory',
'idx': 54,
'match_id': 0,
'to_field': 'territory'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'sales_partner',
'idx': 55,
'match_id': 0,
'to_field': 'sales_partner'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'commission_rate',
'idx': 56,
'match_id': 0,
'to_field': 'commission_rate'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'total_commission',
'idx': 57,
'match_id': 0,
'to_field': 'total_commission'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'customer_address',
'idx': 58,
'match_id': 0,
'to_field': 'customer_address'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'net_total',
'idx': 59,
'match_id': 0,
'to_field': 'net_total'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'grand_total',
'idx': 60,
'match_id': 0,
'to_field': 'grand_total'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'project_name',
'idx': 61,
'match_id': 0,
'to_field': 'project_name'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'warehouse',
'idx': 62,
'match_id': 1,
'to_field': 'warehouse'
},
# Table Mapper Detail
{
'doctype': 'Table Mapper Detail',
'from_table': 'Delivery Note',
'idx': 1,
'match_id': 0,
'to_table': 'Receivable Voucher',
'validation_logic': 'docstatus=1'
@@ -618,11 +109,10 @@
'doctype': 'Table Mapper Detail',
'from_field': 'delivery_note_details',
'from_table': 'Delivery Note Detail',
'idx': 2,
'match_id': 1,
'to_field': 'entries',
'to_table': 'RV Detail',
'validation_logic': '(qty > ifnull(billed_qty, 0) or amount > ifnull(billed_amt, 0)) and docstatus = 1'
'validation_logic': 'amount > ifnull(billed_amt, 0) and docstatus = 1'
},
# Table Mapper Detail
@@ -630,7 +120,6 @@
'doctype': 'Table Mapper Detail',
'from_field': 'other_charges',
'from_table': 'RV Tax Detail',
'idx': 3,
'match_id': 2,
'to_field': 'other_charges',
'to_table': 'RV Tax Detail',
@@ -642,7 +131,6 @@
'doctype': 'Table Mapper Detail',
'from_field': 'sales_team',
'from_table': 'Sales Team',
'idx': 4,
'match_id': 3,
'to_field': 'sales_team',
'to_table': 'Sales Team',

36
accounts/DocType Mapper/Project-Receivable Voucher/Project-Receivable Voucher.txt
View File

@@ -14,7 +14,6 @@
{
'doctype': 'Table Mapper Detail',
'from_table': 'Project',
'idx': 1,
'match_id': 0,
'name': '__common__',
'parent': 'Project-Receivable Voucher',
@@ -26,13 +25,16 @@
# These values are common for all Field Mapper Detail
{
'checking_operator': '=',
'doctype': 'Field Mapper Detail',
'from_field': 'customer',
'map': 'Yes',
'match_id': 0,
'name': '__common__',
'parent': 'Project-Receivable Voucher',
'parentfield': 'field_mapper_details',
'parenttype': 'DocType Mapper'
'parenttype': 'DocType Mapper',
'to_field': 'customer'
},
# These values are common for all DocType Mapper
@@ -52,35 +54,7 @@
# Field Mapper Detail
{
'checking_operator': '=',
'doctype': 'Field Mapper Detail',
'from_field': 'customer',
'idx': 1,
'to_field': 'customer'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'customer_name',
'idx': 2,
'to_field': 'customer_name'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'customer_address',
'idx': 3,
'to_field': 'customer_address'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'territory',
'idx': 4,
'to_field': 'territory'
'doctype': 'Field Mapper Detail'
},
# Table Mapper Detail

288
accounts/DocType Mapper/Purchase Order-Payable Voucher/Purchase Order-Payable Voucher.txt
View File

@@ -6,7 +6,7 @@
'creation': '2010-08-08 17:09:35',
'docstatus': 0,
'modified': '2011-05-13 11:26:20',
'modified_by': 'Administrator',
'modified_by': 'umair@iwebnotes.com',
'owner': 'Administrator'
},
@@ -23,6 +23,7 @@
{
'doctype': 'Field Mapper Detail',
'map': 'Yes',
'match_id': 1,
'name': '__common__',
'parent': 'Purchase Order-Payable Voucher',
'parentfield': 'field_mapper_details',
@@ -45,156 +46,10 @@
'name': 'Purchase Order-Payable Voucher'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'company',
'idx': 1,
'match_id': 0,
'to_field': 'company'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'fiscal_year',
'idx': 2,
'match_id': 0,
'to_field': 'fiscal_year'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'conversion_rate',
'idx': 3,
'match_id': 0,
'to_field': 'conversion_rate'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'currency',
'idx': 4,
'match_id': 0,
'to_field': 'currency'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'supplier',
'idx': 5,
'match_id': 0,
'to_field': 'supplier'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'supplier_name',
'idx': 6,
'match_id': 0,
'to_field': 'supplier_name'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'supplier_name',
'idx': 6,
'match_id': 1,
'to_field': 'supplier_name'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'supplier_address',
'idx': 7,
'match_id': 0,
'to_field': 'supplier_address'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'contact_person',
'idx': 8,
'match_id': 0,
'to_field': 'contact_person'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'address_display',
'idx': 9,
'match_id': 0,
'to_field': 'address_display'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'contact_display',
'idx': 10,
'match_id': 0,
'to_field': 'contact_display'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'contact_mobile',
'idx': 11,
'match_id': 0,
'to_field': 'contact_mobile'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'contact_email',
'idx': 12,
'match_id': 0,
'to_field': 'contact_email'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'item_code',
'idx': 13,
'match_id': 1,
'to_field': 'item_code'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'item_name',
'idx': 14,
'match_id': 1,
'to_field': 'item_name'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'brand',
'idx': 15,
'match_id': 1,
'to_field': 'brand'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'eval: flt(obj.qty) - flt(obj.billed_qty)',
'idx': 16,
'match_id': 1,
'to_field': 'qty'
},
@@ -202,8 +57,6 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'purchase_rate',
'idx': 17,
'match_id': 1,
'to_field': 'rate'
},
@@ -211,44 +64,20 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'eval: (flt(obj.qty) - flt(obj.billed_qty)) * flt(obj.purchase_rate)',
'idx': 18,
'match_id': 1,
'to_field': 'amount'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'import_rate',
'idx': 19,
'match_id': 1,
'to_field': 'import_rate'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'eval: (flt(obj.qty) - flt(obj.billed_qty)) * flt(obj.import_rate)',
'idx': 20,
'match_id': 1,
'to_field': 'import_amount'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'description',
'idx': 21,
'match_id': 1,
'to_field': 'description'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'parent',
'idx': 22,
'match_id': 1,
'to_field': 'purchase_order'
},
@@ -256,124 +85,13 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'name',
'idx': 23,
'match_id': 1,
'to_field': 'po_detail'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'item_group',
'idx': 24,
'match_id': 1,
'to_field': 'item_group'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'item_tax_rate',
'idx': 25,
'match_id': 1,
'to_field': 'item_tax_rate'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'category',
'idx': 26,
'match_id': 2,
'to_field': 'category'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'add_deduct_tax',
'idx': 27,
'match_id': 2,
'to_field': 'add_deduct_tax'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'charge_type',
'idx': 28,
'match_id': 2,
'to_field': 'charge_type'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'row_id',
'idx': 29,
'match_id': 2,
'to_field': 'row_id'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'item_wise_tax_detail',
'idx': 30,
'match_id': 2,
'to_field': 'item_wise_tax_detail'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'description',
'idx': 31,
'match_id': 2,
'to_field': 'description'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'account_head',
'idx': 32,
'match_id': 2,
'to_field': 'account_head'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'cost_center',
'idx': 33,
'match_id': 2,
'to_field': 'cost_center'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'rate',
'idx': 34,
'match_id': 2,
'to_field': 'rate'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'project_name',
'idx': 35,
'match_id': 0,
'to_field': 'project_name'
},
# Table Mapper Detail
{
'doctype': 'Table Mapper Detail',
'from_table': 'Purchase Order',
'idx': 1,
'match_id': 0,
'to_table': 'Payable Voucher',
'validation_logic': 'docstatus =1'
@@ -384,7 +102,6 @@
'doctype': 'Table Mapper Detail',
'from_field': 'po_details',
'from_table': 'PO Detail',
'idx': 2,
'match_id': 1,
'to_field': 'entries',
'to_table': 'PV Detail',
@@ -396,7 +113,6 @@
'doctype': 'Table Mapper Detail',
'from_field': 'purchase_tax_details',
'from_table': 'Purchase Tax Detail',
'idx': 3,
'match_id': 2,
'to_field': 'purchase_tax_details',
'to_table': 'Purchase Tax Detail',

283
accounts/DocType Mapper/Purchase Receipt-Payable Voucher/Purchase Receipt-Payable Voucher.txt
View File

@@ -6,7 +6,7 @@
'creation': '2010-08-08 17:09:35',
'docstatus': 0,
'modified': '2011-05-13 12:18:34',
'modified_by': 'Administrator',
'modified_by': 'umair@iwebnotes.com',
'owner': 'Administrator'
},
@@ -23,6 +23,7 @@
{
'doctype': 'Field Mapper Detail',
'map': 'Yes',
'match_id': 1,
'name': '__common__',
'parent': 'Purchase Receipt-Payable Voucher',
'parentfield': 'field_mapper_details',
@@ -45,156 +46,10 @@
'name': 'Purchase Receipt-Payable Voucher'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'company',
'idx': 1,
'match_id': 0,
'to_field': 'company'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'fiscal_year',
'idx': 2,
'match_id': 0,
'to_field': 'fiscal_year'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'supplier',
'idx': 3,
'match_id': 0,
'to_field': 'supplier'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'supplier_name',
'idx': 4,
'match_id': 0,
'to_field': 'supplier_name'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'supplier_address',
'idx': 5,
'match_id': 0,
'to_field': 'supplier_address'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'contact_person',
'idx': 6,
'match_id': 0,
'to_field': 'contact_person'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'address_display',
'idx': 7,
'match_id': 0,
'to_field': 'address_display'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'contact_display',
'idx': 8,
'match_id': 0,
'to_field': 'contact_display'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'contact_mobile',
'idx': 9,
'match_id': 0,
'to_field': 'contact_mobile'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'contact_email',
'idx': 10,
'match_id': 0,
'to_field': 'contact_email'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'currency',
'idx': 11,
'match_id': 0,
'to_field': 'currency'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'conversion_rate',
'idx': 12,
'match_id': 0,
'to_field': 'conversion_rate'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'item_code',
'idx': 13,
'match_id': 1,
'to_field': 'item_code'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'item_name',
'idx': 14,
'match_id': 1,
'to_field': 'item_name'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'brand',
'idx': 15,
'match_id': 1,
'to_field': 'brand'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'description',
'idx': 16,
'match_id': 1,
'to_field': 'description'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'eval: flt(obj.qty) - flt(obj.billed_qty)',
'idx': 17,
'match_id': 1,
'to_field': 'qty'
},
@@ -202,8 +57,6 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'purchase_rate',
'idx': 18,
'match_id': 1,
'to_field': 'rate'
},
@@ -211,26 +64,13 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'eval: (flt(obj.qty) - flt(obj.billed_qty)) * flt(obj.purchase_rate)',
'idx': 19,
'match_id': 1,
'to_field': 'amount'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'import_rate',
'idx': 20,
'match_id': 1,
'to_field': 'import_rate'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'eval: (flt(obj.qty) - flt(obj.billed_qty)) * flt(obj.import_rate)',
'idx': 21,
'match_id': 1,
'to_field': 'import_amount'
},
@@ -238,8 +78,6 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'parent',
'idx': 22,
'match_id': 1,
'to_field': 'purchase_receipt'
},
@@ -247,8 +85,6 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'prevdoc_docname',
'idx': 23,
'match_id': 1,
'to_field': 'purchase_order'
},
@@ -256,8 +92,6 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'name',
'idx': 24,
'match_id': 1,
'to_field': 'pr_detail'
},
@@ -265,125 +99,14 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'prevdoc_detail_docname',
'idx': 25,
'match_id': 1,
'to_field': 'po_detail'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'item_group',
'idx': 26,
'match_id': 1,
'to_field': 'item_group'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'item_tax_rate',
'idx': 27,
'match_id': 1,
'to_field': 'item_tax_rate'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'category',
'idx': 28,
'match_id': 2,
'to_field': 'category'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'add_deduct_tax',
'idx': 29,
'match_id': 2,
'to_field': 'add_deduct_tax'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'charge_type',
'idx': 30,
'match_id': 2,
'to_field': 'charge_type'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'row_id',
'idx': 31,
'match_id': 2,
'to_field': 'row_id'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'item_wise_tax_detail',
'idx': 32,
'match_id': 2,
'to_field': 'item_wise_tax_detail'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'description',
'idx': 33,
'match_id': 2,
'to_field': 'description'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'account_head',
'idx': 34,
'match_id': 2,
'to_field': 'account_head'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'cost_center',
'idx': 35,
'match_id': 2,
'to_field': 'cost_center'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'rate',
'idx': 36,
'match_id': 2,
'to_field': 'rate'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'project_name',
'idx': 37,
'match_id': 0,
'to_field': 'project_name'
},
# Table Mapper Detail
{
'doctype': 'Table Mapper Detail',
'from_field': 'purchase_receipt_details',
'from_table': 'Purchase Receipt Detail',
'idx': 1,
'match_id': 1,
'to_field': 'entries',
'to_table': 'PV Detail',
@@ -394,7 +117,6 @@
{
'doctype': 'Table Mapper Detail',
'from_table': 'Purchase Receipt',
'idx': 2,
'match_id': 0,
'to_table': 'Payable Voucher',
'validation_logic': 'docstatus=1'
@@ -405,7 +127,6 @@
'doctype': 'Table Mapper Detail',
'from_field': 'purchase_tax_details',
'from_table': 'Purchase Tax Detail',
'idx': 3,
'match_id': 2,
'to_field': 'purchase_tax_details',
'to_table': 'Purchase Tax Detail',

573
accounts/DocType Mapper/Sales Order-Receivable Voucher/Sales Order-Receivable Voucher.txt
View File

@@ -5,7 +5,7 @@
{
'creation': '2010-08-08 17:09:36',
'docstatus': 0,
'modified': '2011-05-16 17:34:21',
'modified': '2011-08-08 16:56:40',
'modified_by': 'Administrator',
'owner': 'Administrator'
},
@@ -50,7 +50,6 @@
'checking_operator': '=',
'doctype': 'Field Mapper Detail',
'from_field': 'customer',
'idx': 1,
'match_id': 0,
'to_field': 'customer'
},
@@ -58,269 +57,31 @@
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'customer_address',
'idx': 2,
'match_id': 0,
'to_field': 'customer_address'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'contact_person',
'idx': 3,
'match_id': 0,
'to_field': 'contact_person'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'customer_name',
'idx': 4,
'match_id': 0,
'to_field': 'customer_name'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'address_display',
'idx': 5,
'match_id': 0,
'to_field': 'address_display'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'contact_display',
'idx': 6,
'match_id': 0,
'to_field': 'contact_display'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'contact_mobile',
'idx': 7,
'match_id': 0,
'to_field': 'contact_mobile'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'contact_email',
'idx': 8,
'match_id': 0,
'to_field': 'contact_email'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'customer_group',
'idx': 10,
'match_id': 0,
'to_field': 'customer_group'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'company',
'idx': 11,
'match_id': 0,
'to_field': 'company'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'fiscal_year',
'idx': 12,
'match_id': 0,
'to_field': 'fiscal_year'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'charge',
'idx': 13,
'match_id': 0,
'to_field': 'charge'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'conversion_rate',
'idx': 14,
'match_id': 0,
'to_field': 'conversion_rate'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'price_list_name',
'idx': 15,
'match_id': 0,
'to_field': 'price_list_name'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'currency',
'idx': 16,
'match_id': 0,
'to_field': 'currency'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'item_code',
'idx': 17,
'match_id': 1,
'to_field': 'item_code'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'item_name',
'idx': 18,
'match_id': 1,
'to_field': 'item_name'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'brand',
'idx': 19,
'match_id': 1,
'to_field': 'brand'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'description',
'idx': 20,
'match_id': 1,
'to_field': 'description'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'eval: flt(obj.qty) - flt(obj.billed_qty)',
'idx': 21,
'from_field': 'eval: (flt(obj.amount) - flt(obj.billed_amt))/flt(obj.basic_rate)',
'match_id': 1,
'to_field': 'qty'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'base_ref_rate',
'idx': 22,
'match_id': 1,
'to_field': 'base_ref_rate'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'name',
'idx': 22,
'match_id': 1,
'to_field': 'so_detail'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'ref_rate',
'idx': 23,
'match_id': 1,
'to_field': 'ref_rate'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'export_rate',
'idx': 23,
'match_id': 1,
'to_field': 'export_rate'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'basic_rate',
'idx': 24,
'match_id': 1,
'to_field': 'basic_rate'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'item_group',
'idx': 25,
'match_id': 1,
'to_field': 'item_group'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'parent',
'idx': 26,
'match_id': 1,
'to_field': 'sales_order'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'stock_uom',
'idx': 27,
'match_id': 1,
'to_field': 'stock_uom'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'name',
'idx': 29,
'match_id': 1,
'to_field': 'export_rate'
'to_field': 'so_detail'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'export_rate',
'idx': 30,
'match_id': 1,
'to_field': 'export_rate'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'eval: (flt(obj.qty) - flt(obj.billed_qty)) * flt(obj.basic_rate)',
'idx': 31,
'from_field': 'eval:flt(obj.amount) - flt(obj.billed_amt)',
'match_id': 1,
'to_field': 'amount'
},
@@ -328,342 +89,24 @@
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'eval: (flt(obj.qty) - flt(obj.billed_qty)) * flt(obj.export_rate)',
'idx': 32,
'from_field': 'eval: (flt(obj.amount) - flt(obj.billed_amt))* flt(obj.export_rate)/flt(obj.basic_rate)',
'match_id': 1,
'to_field': 'export_amount'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'adj_rate',
'idx': 33,
'match_id': 1,
'to_field': 'adj_rate'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'item_tax_rate',
'idx': 34,
'match_id': 1,
'to_field': 'item_tax_rate'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'charge_type',
'idx': 35,
'match_id': 2,
'to_field': 'charge_type'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'row_id',
'idx': 36,
'match_id': 2,
'to_field': 'row_id'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'description',
'idx': 37,
'match_id': 2,
'to_field': 'description'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'account_head',
'idx': 38,
'match_id': 2,
'to_field': 'account_head'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'total_amount',
'idx': 39,
'match_id': 2,
'to_field': 'total_amount'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'territory',
'idx': 39,
'match_id': 0,
'to_field': 'territory'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'total_tax_amount',
'idx': 40,
'match_id': 2,
'to_field': 'total_tax_amount'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'item_wise_tax_detail',
'idx': 41,
'match_id': 2,
'to_field': 'item_wise_tax_detail'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'cost_center_other_charges',
'idx': 42,
'match_id': 2,
'to_field': 'cost_center_other_charges'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'rate',
'idx': 43,
'match_id': 2,
'to_field': 'rate'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'tax_amount',
'idx': 44,
'match_id': 2,
'to_field': 'tax_amount'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'total',
'idx': 45,
'match_id': 2,
'to_field': 'total'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'source',
'idx': 46,
'match_id': 0,
'to_field': 'source'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'campaign',
'idx': 47,
'match_id': 0,
'to_field': 'campaign'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'tc_name',
'idx': 48,
'match_id': 0,
'to_field': 'tc_name'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'select_print_heading',
'idx': 49,
'match_id': 0,
'to_field': 'select_print_heading'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'terms',
'idx': 50,
'match_id': 0,
'to_field': 'terms'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'net_total',
'idx': 51,
'match_id': 0,
'to_field': 'net_total'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'grand_total',
'idx': 52,
'match_id': 0,
'to_field': 'grand_total'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'other_charges_total',
'idx': 53,
'match_id': 0,
'to_field': 'other_charges_total'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'rounded_total',
'idx': 54,
'match_id': 0,
'to_field': 'rounded_total'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'in_words',
'idx': 55,
'match_id': 0,
'to_field': 'in_words'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'grand_total_export',
'idx': 56,
'match_id': 0,
'to_field': 'grand_total_export'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'rounded_total_export',
'idx': 57,
'match_id': 0,
'to_field': 'rounded_total_export'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'in_words_export',
'idx': 58,
'match_id': 0,
'to_field': 'in_words_export'
},
# Field Mapper Detail
{
'checking_operator': '=',
'doctype': 'Field Mapper Detail',
'from_field': 'project_name',
'idx': 59,
'match_id': 0,
'to_field': 'project_name'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'sales_partner',
'idx': 60,
'match_id': 0,
'to_field': 'sales_partner'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'sales_designation',
'idx': 61,
'match_id': 3,
'to_field': 'sales_designation'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'commission_rate',
'idx': 62,
'match_id': 0,
'to_field': 'commission_rate'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'total_commission',
'idx': 63,
'match_id': 0,
'to_field': 'total_commission'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'allocated_percentage',
'idx': 64,
'match_id': 3,
'to_field': 'allocated_percentage'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'sales_person',
'idx': 65,
'match_id': 3,
'to_field': 'sales_person'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'allocated_amount',
'idx': 66,
'match_id': 3,
'to_field': 'allocated_amount'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'incentives',
'idx': 67,
'match_id': 3,
'to_field': 'incentives'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'reserved_warehouse',
'idx': 68,
'match_id': 1,
'to_field': 'warehouse'
},
@@ -672,7 +115,6 @@
{
'doctype': 'Table Mapper Detail',
'from_table': 'Sales Order',
'idx': 1,
'match_id': 0,
'to_table': 'Receivable Voucher',
'validation_logic': 'docstatus=1'
@@ -683,11 +125,10 @@
'doctype': 'Table Mapper Detail',
'from_field': 'sales_order_detail',
'from_table': 'Sales Order Detail',
'idx': 2,
'match_id': 1,
'to_field': 'entries',
'to_table': 'RV Detail',
'validation_logic': '(qty > ifnull(billed_qty, 0) or amount > ifnull(billed_amt, 0)) and docstatus = 1'
'validation_logic': 'amount > ifnull(billed_amt, 0) and docstatus = 1'
},
# Table Mapper Detail
@@ -695,7 +136,6 @@
'doctype': 'Table Mapper Detail',
'from_field': 'other_charges',
'from_table': 'RV Tax Detail',
'idx': 3,
'match_id': 2,
'to_field': 'other_charges',
'to_table': 'RV Tax Detail',
@@ -707,7 +147,6 @@
'doctype': 'Table Mapper Detail',
'from_field': 'sales_team',
'from_table': 'Sales Team',
'idx': 4,
'match_id': 3,
'to_field': 'sales_team',
'to_table': 'Sales Team',

0
accounts/doctype/loan/__init__.py
View File

54
accounts/doctype/loan/loan.js
View File

@@ -1,54 +0,0 @@
$.extend(cur_frm.cscript, {
Generate: function(doc, dt, dn) {
cur_frm.cscript.clear_installments(doc);
for(var i=0; i< doc.no_of_installments; i++) {
d = LocalDB.add_child(doc, 'Loan Installment', 'installments');
d.amount = doc.loan_amount / doc.no_of_installments;
d.due_date = dateutil.add_months(doc.start_date, i+1);
}
cur_frm.refresh();
},
/* submit:function(doc){
data=doc.get_values();
data['']=
$c_obj(make_doclist(dt,dn),'loan_post',data,function(){});
},*/
refresh: function(doc) {
cur_frm.cscript.hide_show_buttons(doc);
},
hide_show_buttons: function(doc) {
if(doc.docstatus==0) {
hide_field('Installment Reciept'); unhide_field('Generate');
} else if (doc.docstatus==1) {
unhide_field('Installment Reciept');hide_field('Generate');
}
},
clear_installments: function(doc) {
$.each(getchildren('Loan Installment', doc.name, 'installments', 'Loan'),
function(i, d) {
LocalDB.delete_doc('Loan Installment', d.name);
}
)
},
'Installment Reciept': function(doc, dt, dn) {
var d = new wn.widgets.Dialog({
width: 500,
title: 'Add a new payment installment',
fields: [
{fieldtype:'Data', label:'Cheque Number', fieldname:'cheque_number', reqd:1},
{fieldtype:'Date', label:'Cheque Date', fieldname:'cheque_date', reqd:1},
{fieldtype:'Link', label:'Bank Account', fieldname:'bank_account', reqd:1, options:'Account'},
{fieldtype:'Button', label:'Update',fieldname:'update'}
]
})
d.show();
d.fields_dict.update.input.onclick = function() {
var data = d.get_values();
if(data) {
$c_obj(make_doclist(dt,dn),'loan_installment_post',data,function(){cur_frm.refresh(); d.hide();});
}
}
}
})

48
accounts/doctype/loan/loan.py
View File

@@ -1,48 +0,0 @@
import webnotes
from webnotes.model.doc import make_autoname, Document, addchild
from webnotes import msgprint
from webnotes.utils import get_defaults
import json
from accounts.utils import post_jv
sql = webnotes.conn.sql
class DocType:
def __init__(self, doc, doclist):
self.doc, self.doclist = doc, doclist
def autoname(self):
"""
Create Loan Id using naming_series pattern
"""
self.doc.name = make_autoname(self.doc.naming_series+ '.#####')
def loan_post(self):
data['voucher_type']='Loan Issue'
data['naming_series']='JV'
data['fiscal_year'] = get_defaults()['fiscal_year'] # To be modified to take care
data['company'] = get_defaults()['company']
data['debit_account'] = self.doc['receivable_account']
data['credit_account'] = self.doc['account']
data['amount'] = self.doc.loan_amount
jv_name=post_jv(data)
def loan_installment_post(self, args):
"""
Posts the loan receipt into Journal Voucher
"""
next_inst = sql("select amount,name from `tabLoan Installment` where parent=%s and ifnull(cheque_number,'')='' order by due_date limit 1",self.doc.name)
data = json.loads(args)
data['voucher_type']='Loan Receipt'
data['naming_series']='JV'
data['amount']=next_inst[0][0]
data['debit_account']=data.get('bank_account')
data['credit_account']=self.doc.account
data['fiscal_year']=get_defaults()['fiscal_year']
data['company']=get_defaults()['company']
jv_name=post_jv(data)
sql("update `tabLoan Installment` set cheque_number=%s, cheque_date=%s, jv_number=%s where name=%s",(data.get('cheque_number'),data.get('cheque_date'),jv_name,next_inst[0][1]))
self.doclist = [Document(d.doctype, d.name) for d in self.doclist]

172
accounts/doctype/loan/loan.txt
View File

@@ -1,172 +0,0 @@
# DocType, Loan
[
# These values are common in all dictionaries
{
'creation': '2011-07-15 10:35:26',
'docstatus': 0,
'modified': '2011-07-18 12:12:19',
'modified_by': 'Administrator',
'owner': 'Administrator'
},
# These values are common for all DocType
{
'_last_update': '1310963215',
'colour': 'White:FFF',
'doctype': 'DocType',
'module': 'Accounts',
'name': '__common__',
'section_style': 'Simple',
'show_in_menu': 0,
'version': 15
},
# These values are common for all DocField
{
'doctype': 'DocField',
'name': '__common__',
'parent': 'Loan',
'parentfield': 'fields',
'parenttype': 'DocType',
'permlevel': 0
},
# These values are common for all DocPerm
{
'doctype': 'DocPerm',
'name': '__common__',
'parent': 'Loan',
'parentfield': 'permissions',
'parenttype': 'DocType',
'read': 1,
'role': 'Accounts User'
},
# DocType, Loan
{
'doctype': 'DocType',
'name': 'Loan'
},
# DocPerm
{
'cancel': 1,
'create': 1,
'doctype': 'DocPerm',
'idx': 1,
'permlevel': 0,
'submit': 1,
'write': 1
},
# DocPerm
{
'doctype': 'DocPerm',
'idx': 2,
'permlevel': 1
},
# DocField
{
'doctype': 'DocField',
'fieldname': 'naming_series',
'fieldtype': 'Select',
'idx': 1,
'label': 'Naming Series',
'options': '\nLOAN',
'reqd': 1
},
# DocField
{
'doctype': 'DocField',
'fieldname': 'account',
'fieldtype': 'Link',
'idx': 2,
'label': 'Account',
'options': 'Account',
'reqd': 1
},
# DocField
{
'doctype': 'DocField',
'fieldname': 'receivable_account',
'fieldtype': 'Link',
'idx': 3,
'label': 'Receivable Account',
'options': 'Account'
},
# DocField
{
'doctype': 'DocField',
'fieldname': 'invoice',
'fieldtype': 'Link',
'idx': 4,
'label': 'Invoice',
'options': 'Receivable Voucher',
'reqd': 1
},
# DocField
{
'doctype': 'DocField',
'fieldname': 'loan_amount',
'fieldtype': 'Currency',
'idx': 5,
'label': 'Loan Amount',
'reqd': 1
},
# DocField
{
'doctype': 'DocField',
'fieldname': 'start_date',
'fieldtype': 'Date',
'idx': 6,
'label': 'Start Date',
'reqd': 1
},
# DocField
{
'doctype': 'DocField',
'fieldname': 'no_of_installments',
'fieldtype': 'Int',
'idx': 7,
'label': 'No of Installments',
'reqd': 1
},
# DocField
{
'colour': 'White:FFF',
'doctype': 'DocField',
'fieldtype': 'Button',
'idx': 8,
'label': 'Generate',
'trigger': 'Client'
},
# DocField
{
'doctype': 'DocField',
'fieldname': 'installments',
'fieldtype': 'Table',
'idx': 9,
'label': 'Installments',
'options': 'Loan Installment'
},
# DocField
{
'allow_on_submit': 1,
'colour': 'White:FFF',
'doctype': 'DocField',
'fieldtype': 'Button',
'idx': 10,
'label': 'Installment Reciept'
}
]

17
accounts/doctype/loan/test_loan.py
View File

@@ -1,17 +0,0 @@
import unittest
import webnotes
from webnotes.model.code import get_obj
class TestScheduleGeneartion(unittest.TestCase):
def setUp(self):
webnotes.conn.begin()
# create a mock loan
self.loan = get_obj('Loan', 'LOAN00001')
def test_generation(self):
"test the genaration of loan installments"
self.loan.generate()
self.assertEqual(self.loan.get_installment_total(), self.loan.doc.loan_amount)
def tearDown(self):
webnotes.conn.rollback()

0
accounts/doctype/loan_installment/__init__.py
View File

111
accounts/doctype/loan_installment/loan_installment.txt
View File

@@ -1,111 +0,0 @@
# DocType, Loan Installment
[
# These values are common in all dictionaries
{
'creation': '2011-07-15 10:36:42',
'docstatus': 0,
'modified': '2011-07-15 15:48:34',
'modified_by': 'Administrator',
'owner': 'Administrator'
},
# These values are common for all DocType
{
'colour': 'White:FFF',
'doctype': 'DocType',
'istable': 1,
'module': 'Accounts',
'name': '__common__',
'section_style': 'Simple',
'show_in_menu': 0,
'version': 4
},
# These values are common for all DocField
{
'doctype': 'DocField',
'name': '__common__',
'parent': 'Loan Installment',
'parentfield': 'fields',
'parenttype': 'DocType'
},
# DocType, Loan Installment
{
'doctype': 'DocType',
'name': 'Loan Installment'
},
# DocField
{
'doctype': 'DocField',
'fieldname': 'amount',
'fieldtype': 'Currency',
'idx': 1,
'label': 'Amount',
'permlevel': 0
},
# DocField
{
'doctype': 'DocField',
'fieldname': 'due_date',
'fieldtype': 'Date',
'idx': 2,
'label': 'Due Date',
'permlevel': 0
},
# DocField
{
'doctype': 'DocField',
'fieldname': 'cheque_number',
'fieldtype': 'Data',
'idx': 3,
'label': 'Cheque Number',
'permlevel': 0
},
# DocField
{
'doctype': 'DocField',
'fieldname': 'cheque_date',
'fieldtype': 'Date',
'idx': 4,
'label': 'Cheque Date',
'permlevel': 0
},
# DocField
{
'doctype': 'DocField',
'fieldname': 'deposit_date',
'fieldtype': 'Date',
'idx': 5,
'label': 'Deposit Date',
'permlevel': 0
},
# DocField
{
'doctype': 'DocField',
'fieldname': 'realized_date',
'fieldtype': 'Date',
'idx': 6,
'label': 'Realized Date',
'permlevel': 0
},
# DocField
{
'doctype': 'DocField',
'fieldname': 'jv_number',
'fieldtype': 'Link',
'hidden': 0,
'idx': 7,
'label': 'JV Number',
'options': 'Journal Voucher',
'permlevel': 1
}
]

2
accounts/doctype/payable_voucher/payable_voucher.py
View File

@@ -84,7 +84,7 @@ class DocType(TransactionBase):
self.validate_duplicate_docname('purchase_order')
self.doclist = get_obj('DocType Mapper', 'Purchase Order-Payable Voucher').dt_map('Purchase Order', 'Payable Voucher', self.doc.purchase_order_main, self.doc, self.doclist, "[['Purchase Order', 'Payable Voucher'],['PO Detail', 'PV Detail']]")
ret = eval(self.get_credit_to())
ret = self.get_credit_to()
#self.doc.supplier_name = ret['supplier_name']
#self.doc.supplier_address = ret['supplier_address']

50
accounts/doctype/receivable_voucher/receivable_voucher.js
View File

@@ -18,10 +18,10 @@ cur_frm.cscript.onload = function(doc,dt,dn) {
if(!doc.voucher_date) set_multiple(dt,dn,{voucher_date:get_today()});
if(!doc.due_date) set_multiple(dt,dn,{due_date:get_today()});
if(!doc.posting_date) set_multiple(dt,dn,{posting_date:get_today()});
//for previously created sales invoice, set required field related to pos
if(doc.is_pos ==1) cur_frm.cscript.is_pos(doc, dt, dn);
hide_field(['customer_address','contact_person','customer_name','address_display','contact_display','contact_mobile','contact_email','territory','customer_group']);
}
}
@@ -37,10 +37,10 @@ cur_frm.cscript.onload_post_render = function(doc, dt, dn) {
}
);
}
if(!doc.customer && doc.__islocal) {
// new -- load default taxes
cur_frm.cscript.load_taxes(doc, cdt, cdn);
cur_frm.cscript.load_taxes(doc, cdt, cdn);
}
}
@@ -61,19 +61,19 @@ cur_frm.cscript.refresh = function(doc, dt, dn) {
// Show / Hide button
cur_frm.clear_custom_buttons();
if(doc.docstatus==1) {
if(doc.docstatus==1) {
cur_frm.add_custom_button('View Ledger', cur_frm.cscript['View Ledger Entry']);
cur_frm.add_custom_button('Send SMS', cur_frm.cscript['Send SMS']);
unhide_field('Repair Outstanding Amt');
if(doc.is_pos==1 && doc.update_stock!=1)
cur_frm.add_custom_button('Make Delivery', cur_frm.cscript['Make Delivery Note']);
if(doc.outstanding_amount!=0)
cur_frm.add_custom_button('Make Payment Entry', cur_frm.cscript['Make Bank Voucher']);
}
else
else
hide_field('Repair Outstanding Amt');
cur_frm.cscript.is_opening(doc, dt, dn);
cur_frm.cscript.hide_fields(doc, cdt, cdn);
@@ -117,13 +117,13 @@ cur_frm.cscript.customer = function(doc,dt,dn) {
var doc = locals[cur_frm.doctype][cur_frm.docname];
get_server_fields('get_debit_to','','',doc, dt, dn, 0);
cur_frm.refresh();
}
}
if(doc.customer) $c_obj(make_doclist(doc.doctype, doc.name), 'get_default_customer_address', '', callback);
if(doc.customer) $c_obj(make_doclist(doc.doctype, doc.name), 'get_default_customer_address', '', callback);
if(doc.customer) unhide_field(['customer_address','contact_person','customer_name','address_display','contact_display','contact_mobile','contact_email','territory','customer_group']);
}
cur_frm.cscript.customer_address = cur_frm.cscript.contact_person = function(doc,dt,dn) {
cur_frm.cscript.customer_address = cur_frm.cscript.contact_person = function(doc,dt,dn) {
if(doc.customer) get_server_fields('get_customer_address', JSON.stringify({customer: doc.customer, address: doc.customer_address, contact: doc.contact_person}),'', doc, dt, dn, 1);
}
@@ -152,15 +152,15 @@ cur_frm.cscript.debit_to = function(doc,dt,dn) {
var callback2 = function(r,rt) {
var doc = locals[cur_frm.doctype][cur_frm.docname];
cur_frm.refresh();
}
}
var callback = function(r,rt) {
var doc = locals[cur_frm.doctype][cur_frm.docname];
var doc = locals[cur_frm.doctype][cur_frm.docname];
if(doc.customer) $c_obj(make_doclist(dt,dn), 'get_default_customer_address', '', callback2);
if(doc.customer) unhide_field(['customer_address','contact_person','customer_name','address_display','contact_display','contact_mobile','contact_email','territory','customer_group']);
cur_frm.refresh();
}
if(doc.debit_to && doc.posting_date){
get_server_fields('get_cust_and_due_date','','',doc,dt,dn,1,callback);
}
@@ -187,13 +187,13 @@ cur_frm.cscript.project_name = function(doc,cdt,cdn){
//Set debit and credit to zero on adding new row
//----------------------------------------------
cur_frm.fields_dict['entries'].grid.onrowadd = function(doc, cdt, cdn){
cl = getchildren('RV Detail', doc.name, cur_frm.cscript.fname, doc.doctype);
acc = '';
cc = '';
for(var i = 0; i<cl.length; i++) {
if (cl[i].idx == 1){
acc = cl[i].income_account;
cc = cl[i].cost_center;
@@ -221,7 +221,7 @@ cur_frm.cscript.is_opening = function(doc, dt, dn) {
// Get Items based on SO or DN Selected
cur_frm.cscript['Get Items'] = function(doc, dt, dn) {
var callback = function(r,rt) {
var callback = function(r,rt) {
unhide_field(['customer_address','contact_person','customer_name','address_display','contact_display','contact_mobile','contact_email','territory','customer_group']);
cur_frm.refresh();
}
@@ -335,10 +335,10 @@ cur_frm.fields_dict.sales_order_main.get_query = function(doc) {
// Delivery Note
// --------------
cur_frm.fields_dict.delivery_note_main.get_query = function(doc) {
if (doc.customer)
return 'SELECT DISTINCT `tabDelivery Note`.`name` FROM `tabDelivery Note` WHERE `tabDelivery Note`.company = "' + doc.company + '" and `tabDelivery Note`.`docstatus` = 1 and ifnull(`tabDelivery Note`.per_billed,0) < 100 and `tabDelivery Note`.`customer` = "' + doc.customer + '" and `tabDelivery Note`.%(key)s LIKE "%s" ORDER BY `tabDelivery Note`.`name` DESC LIMIT 50';
if (doc.customer)
return 'SELECT DISTINCT `tabDelivery Note`.`name` FROM `tabDelivery Note` WHERE `tabDelivery Note`.company = "' + doc.company + '" and `tabDelivery Note`.`docstatus` = 1 and ifnull(`tabDelivery Note`.per_billed,0) < 100 and `tabDelivery Note`.`customer` = "' + doc.customer + '" and `tabDelivery Note`.%(key)s LIKE "%s" ORDER BY `tabDelivery Note`.`name` DESC LIMIT 50';
else
return 'SELECT DISTINCT `tabDelivery Note`.`name` FROM `tabDelivery Note` WHERE `tabDelivery Note`.company = "' + doc.company + '" and `tabDelivery Note`.`docstatus` = 1 and ifnull(`tabDelivery Note`.per_billed,0) < 100 and `tabDelivery Note`.%(key)s LIKE "%s" ORDER BY `tabDelivery Note`.`name` DESC LIMIT 50';
return 'SELECT DISTINCT `tabDelivery Note`.`name` FROM `tabDelivery Note` WHERE `tabDelivery Note`.company = "' + doc.company + '" and `tabDelivery Note`.`docstatus` = 1 and ifnull(`tabDelivery Note`.per_billed,0) < 100 and `tabDelivery Note`.%(key)s LIKE "%s" ORDER BY `tabDelivery Note`.`name` DESC LIMIT 50';
}
@@ -393,18 +393,18 @@ cur_frm.cscript.make_jv = function(doc, dt, dn) {
jv.company = doc.company;
jv.remark = repl('Payment received against invoice %(vn)s for %(rem)s', {vn:doc.name, rem:doc.remarks});
jv.fiscal_year = doc.fiscal_year;
// debit to creditor
var d1 = LocalDB.add_child(jv, 'Journal Voucher Detail', 'entries');
d1.account = doc.debit_to;
d1.credit = doc.outstanding_amount;
d1.against_invoice = doc.name;
// credit to bank
var d1 = LocalDB.add_child(jv, 'Journal Voucher Detail', 'entries');
d1.debit = doc.outstanding_amount;
loaddoc('Journal Voucher', jv.name);
}

2
accounts/doctype/receivable_voucher/receivable_voucher.py
View File

@@ -128,7 +128,7 @@ class DocType(TransactionBase):
get_obj('DocType Mapper', 'Sales Order-Receivable Voucher').dt_map('Sales Order', 'Receivable Voucher', self.doc.sales_order_main, self.doc, self.doclist, "[['Sales Order', 'Receivable Voucher'],['Sales Order Detail', 'RV Detail'],['RV Tax Detail','RV Tax Detail'], ['Sales Team', 'Sales Team']]")
self.get_income_account('entries')
ret = eval(self.get_debit_to())
ret = self.get_debit_to()
if ret.has_key('debit_to'):
self.doc.debit_to = ret['debit_to']

10
accounts/search_criteria/budget_variance_report/budget_variance_report.js
View File

@@ -1,17 +1,15 @@
report.customize_filters = function() {
//this.hide_all_filters();
this.mytabs.items['Select Columns'].hide();
this.mytabs.items['More Filters'].hide();
this.add_filter({fieldname:'period', label:'Period', fieldtype:'Select', options:'Monthly'+NEWLINE+'Quarterly'+NEWLINE+'Half Yearly'+NEWLINE+'Annual',report_default:'Quarterly',ignore : 1, parent:'Budget Detail'});
this.add_filter({fieldname:'company', label:'Company', fieldtype:'Link', options:'Company', report_default:sys_defaults.company, ignore : 1, parent:'Budget Detail', in_first_page:1});
this.filter_fields_dict['Budget Detail'+FILTER_SEP +'Fiscal Year'].df.in_first_page = 1;
this.filter_fields_dict['Budget Detail'+FILTER_SEP +'Period'].df.in_first_page = 1;
this.filter_fields_dict['Budget Detail'+FILTER_SEP +'Fiscal Year'].df['report_default'] = sys_defaults.fiscal_year;
}
report.aftertableprint = function(t) {
$yt(t,'*',1,{whiteSpace:'pre'});
}
this.mytabs.items['More Filters'].hide();
this.mytabs.items['Select Columns'].hide();

7
accounts/search_criteria/budget_variance_report/budget_variance_report.py
View File

@@ -131,11 +131,6 @@ def append_colnames(name, colnames, coltypes, colwidths, coloptions, col_idx):
col_idx[str(c) + n ] = len(colnames) - 1
# make default columns
#coltypes[col_idx[based_on]] = 'Link'
#coloptions[col_idx[based_on]]= based_on
# get start date
start_date = get_value('Fiscal Year', fiscal_year, 'year_start_date')
if not start_date:
@@ -162,7 +157,7 @@ for r in res:
ch = make_child_lst(based_on,r[0].strip())
actual = sql("select sum(ifnull(t1.debit,0))-sum(ifnull(t1.credit,0)) from `tabGL Entry` t1, `tabAccount` t2 where t2.is_pl_account = 'Yes' and t1.is_cancelled = 'No' and t1.cost_center in %s and t2.debit_or_credit = 'Debit' and t1.posting_date between '%s' and '%s' and t1.account = t2.name"%(ch, mon_list[count][data['start_date']], mon_list[count][data['end_date']]))
actual = sql("select sum(ifnull(t1.debit,0))-sum(ifnull(t1.credit,0)) from `tabGL Entry` t1, `tabAccount` t2 where ifnull(t2.is_pl_account, 'No') = 'Yes' and ifnull(t1.is_cancelled, 'No') = 'No' and t1.cost_center in %s and t2.debit_or_credit = 'Debit' and t1.posting_date between '%s' and '%s' and t1.account = t2.name"%(ch, mon_list[count][data['start_date']], mon_list[count][data['end_date']]))
#----------------------------------------------------------
actual = flt(actual[0][0])

11
accounts/search_criteria/budget_variance_report/budget_variance_report.sql
View File

@@ -1 +1,10 @@
SELECT CONCAT(REPEAT(' ', COUNT(parent.name) - 1), node.name) AS name FROM `tabCost Center` AS node,`tabCost Center` AS parent WHERE node.lft BETWEEN parent.lft AND parent.rgt AND node.docstatus !=2 GROUP BY node.name ORDER BY node.lft
SELECT
CONCAT(REPEAT(' ', COUNT(parent.name) - 1), node.name) AS name
FROM
`tabCost Center` AS node,`tabCost Center` AS parent
WHERE
node.lft BETWEEN parent.lft AND parent.rgt
AND node.docstatus !=2
AND node.company_name like '%(company)s%%'
GROUP BY node.name
ORDER BY node.lft

40
accounts/search_criteria/general_ledger/general_ledger.py
View File

@@ -11,8 +11,8 @@ else:
from_date = filter_values['posting_date']
to_date = filter_values['posting_date1']
ysd, from_date_year = sql("select year_start_date, name from `tabFiscal Year` where %s between year_start_date and date_sub(date_add(year_start_date,interval 1 year), interval 1 day)",from_date)[0]
from_date_year = sql("select name from `tabFiscal Year` where %s between year_start_date and date_sub(date_add(year_start_date,interval 1 year), interval 1 day)",from_date)[0][0]
#to_date_year = sql("select name from `tabFiscal Year` where %s between year_start_date and date_sub(date_add(year_start_date,interval 1 year), interval 1 day)",to_date)[0][0]
# define columns
#---------------
@@ -49,13 +49,25 @@ total_diff = total_debit - total_credit
# opening
account = filter_values.get('account')
if account:
acc_det = sql("select debit_or_credit, is_pl_account, lft, rgt, group_or_ledger from tabAccount where name = '%s'" % account)
closing_bal = get_obj('GL Control').get_as_on_balance(account, from_date_year, to_date, acc_det[0][0], acc_det[0][2], acc_det[0][3])[2]
if acc_det[0][0] == 'Credit':
closing_bal = -1*closing_bal
if not account:
msgprint('Select an account to proceed',raise_exception=0,small=1)
acc_det = sql("select debit_or_credit, is_pl_account, lft, rgt, group_or_ledger from tabAccount where name = '%s'" % account)
opening_bal = get_obj('GL Control').get_as_on_balance(account, from_date_year, from_date, acc_det[0][0], acc_det[0][2], acc_det[0][3])[2]
closing_bal = get_obj('GL Control').get_as_on_balance(account, from_date_year, to_date, acc_det[0][0], acc_det[0][2], acc_det[0][3])[2]
if acc_det[0][0] == 'Credit':
closing_bal = -1*closing_bal
opening_bal = -1*opening_bal
out = []
t_row = ['' for i in range(len(colnames))]
t_row[1] = 'Opening as on '+formatdate(from_date)
t_row[col_idx['Debit']-1] = opening_bal
out.append(t_row)
count = 0
for r in res:
count +=1
@@ -71,24 +83,24 @@ if total_debit != 0 or total_credit != 0:
# Total debit/credit
t_row = ['' for i in range(len(colnames))]
t_row[1] = 'Total'
t_row[col_idx['Debit']-1] = total_debit
t_row[col_idx['Credit']-1] = total_credit
t_row[col_idx['Debit']-1] = total_debit
t_row[col_idx['Credit']-1] = total_credit
out.append(t_row)
# diffrence (dr-cr)
t_row = ['' for i in range(len(colnames))]
t_row[1] = 'Total(Dr-Cr)'
t_row[col_idx['Debit']-1] = total_diff
t_row[col_idx['Debit']-1] = total_diff
out.append(t_row)
# closing
if account:
t_row = ['' for i in range(len(colnames))]
t_row[1] = 'Closing Balance on ' + to_date
t_row[1] = 'Closing Balance on ' + formatdate(to_date)
t_row[col_idx['Debit']-1] = flt(closing_bal)
out.append(t_row)
# Print Format
myheader = """<table width = '100%%'><tr><td>"""+l_head+"""</td>
</tr>
@@ -99,5 +111,5 @@ myheader = """<table width = '100%%'><tr><td>"""+l_head+"""</td>
""" % {'acc':account,
'fdt':from_date,
'tdt':to_date}
page_template = myheader+"<div>%(table)s</div>"

5
accounts/search_criteria/lease_agreement_list/lease_agreement_list.txt
View File

@@ -3,15 +3,10 @@
# These values are common in all dictionaries
{
<<<<<<< HEAD
'creation': '2011-07-27 16:17:04',
'docstatus': 0,
'modified': '2011-07-27 16:17:04',
=======
'creation': '2011-07-26 17:01:34',
'docstatus': 0,
'modified': '2011-07-28 12:55:50',
>>>>>>> d075a6c53dc2c832a363409cd4b32ff5a6482e5a
'modified_by': 'Administrator',
'owner': 'Administrator'
},

4
accounts/search_criteria/lease_monthly_future_installment_inflows/lease_monthly_future_installment_inflows.txt
View File

@@ -3,9 +3,9 @@
# These values are common in all dictionaries
{
'creation': '2011-07-27 16:17:04',
'creation': '2011-08-29 13:45:35',
'docstatus': 0,
'modified': '2011-07-27 16:17:04',
'modified': '2011-08-29 13:45:35',
'modified_by': 'Administrator',
'owner': 'Administrator'
},

4
accounts/search_criteria/lease_over_due_list/lease_over_due_list.txt
View File

@@ -3,9 +3,9 @@
# These values are common in all dictionaries
{
'creation': '2011-07-26 18:11:47',
'creation': '2011-08-29 13:45:35',
'docstatus': 0,
'modified': '2011-07-26 18:27:01',
'modified': '2011-08-29 13:45:35',
'modified_by': 'Administrator',
'owner': 'Administrator'
},

4
accounts/search_criteria/lease_overdue_age_wise/lease_overdue_age_wise.txt
View File

@@ -3,9 +3,9 @@
# These values are common in all dictionaries
{
'creation': '2011-07-27 16:17:04',
'creation': '2011-08-29 13:45:35',
'docstatus': 0,
'modified': '2011-07-27 16:17:04',
'modified': '2011-08-29 13:45:35',
'modified_by': 'Administrator',
'owner': 'Administrator'
},

6
accounts/search_criteria/lease_receipt_summary_month_wise/lease_receipt_summary_month_wise.txt
View File

@@ -3,15 +3,9 @@
# These values are common in all dictionaries
{
<<<<<<< HEAD
'creation': '2011-07-27 16:17:04',
'docstatus': 0,
'modified': '2011-07-27 16:17:04',
=======
'creation': '2011-07-27 18:48:29',
'docstatus': 0,
'modified': '2011-07-28 12:56:35',
>>>>>>> d075a6c53dc2c832a363409cd4b32ff5a6482e5a
'modified_by': 'Administrator',
'owner': 'Administrator'
},

10
accounts/search_criteria/lease_receipts_client_wise/lease_receipts_client_wise.txt
View File

@@ -3,15 +3,9 @@
# These values are common in all dictionaries
{
<<<<<<< HEAD
'creation': '2011-07-27 16:17:04',
'creation': '2011-08-29 13:45:36',
'docstatus': 0,
'modified': '2011-07-27 16:17:04',
=======
'creation': '2011-07-28 12:13:41',
'docstatus': 0,
'modified': '2011-07-28 12:56:47',
>>>>>>> d075a6c53dc2c832a363409cd4b32ff5a6482e5a
'modified': '2011-08-29 13:45:36',
'modified_by': 'Administrator',
'owner': 'Administrator'
},

4
accounts/search_criteria/lease_yearly_future_installment_inflows/lease_yearly_future_installment_inflows.txt
View File

@@ -3,9 +3,9 @@
# These values are common in all dictionaries
{
'creation': '2011-07-27 16:17:04',
'creation': '2011-08-29 13:45:36',
'docstatus': 0,
'modified': '2011-07-27 16:17:04',
'modified': '2011-08-29 13:45:36',
'modified_by': 'Administrator',
'owner': 'Administrator'
},