Merge branch 'master' of github.com:webnotes/erpnext

2026-05-29 18:04:46 +00:00 · 2013-03-07 11:42:47 +05:30
parent 58b2a101ae 80f7637ae6
commit ad7266e48d
83 changed files with 460 additions and 336 deletions
--- a/accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.txt
+++ b/accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.txt
@@ -1,8 +1,8 @@
 [
 {
-  "creation": "2013-01-10 16:34:05", 
+  "creation": "2013-02-22 01:27:37", 
  "docstatus": 0, 
-  "modified": "2013-01-29 16:27:50", 
+  "modified": "2013-03-07 07:03:18", 
  "modified_by": "Administrator", 
  "owner": "Administrator"
 }, 
--- a/accounts/doctype/budget_detail/budget_detail.txt
+++ b/accounts/doctype/budget_detail/budget_detail.txt
@@ -1,8 +1,8 @@
 [
 {
-  "creation": "2013-01-10 16:34:05", 
+  "creation": "2013-02-22 01:27:37", 
  "docstatus": 0, 
-  "modified": "2013-01-29 16:28:16", 
+  "modified": "2013-03-07 07:03:19", 
  "modified_by": "Administrator", 
  "owner": "Administrator"
 }, 
--- a/accounts/doctype/budget_distribution_detail/budget_distribution_detail.txt
+++ b/accounts/doctype/budget_distribution_detail/budget_distribution_detail.txt
@@ -1,8 +1,8 @@
 [
 {
-  "creation": "2013-01-10 16:34:05", 
+  "creation": "2013-02-22 01:27:38", 
  "docstatus": 0, 
-  "modified": "2013-01-22 14:41:34", 
+  "modified": "2013-03-07 07:03:19", 
  "modified_by": "Administrator", 
  "owner": "Administrator"
 }, 
--- a/accounts/doctype/c_form_invoice_detail/c_form_invoice_detail.txt
+++ b/accounts/doctype/c_form_invoice_detail/c_form_invoice_detail.txt
@@ -1,8 +1,8 @@
 [
 {
-  "creation": "2013-01-10 16:34:06", 
+  "creation": "2013-02-22 01:27:38", 
  "docstatus": 0, 
-  "modified": "2013-01-29 16:27:50", 
+  "modified": "2013-03-07 07:03:19", 
  "modified_by": "Administrator", 
  "owner": "Administrator"
 }, 
@@ -30,6 +30,7 @@
  "fieldtype": "Link", 
  "label": "Invoice No", 
  "options": "Sales Invoice", 
+  "print_width": "160px", 
  "width": "160px"
 }, 
 {
@@ -37,6 +38,7 @@
  "fieldname": "invoice_date", 
  "fieldtype": "Date", 
  "label": "Invoice Date", 
+  "print_width": "120px", 
  "read_only": 1, 
  "width": "120px"
 }, 
@@ -46,6 +48,7 @@
  "fieldtype": "Link", 
  "label": "Territory", 
  "options": "Territory", 
+  "print_width": "120px", 
  "read_only": 1, 
  "width": "120px"
 }, 
@@ -55,6 +58,7 @@
  "fieldtype": "Currency", 
  "label": "Net Total", 
  "options": "Company:company:default_currency", 
+  "print_width": "120px", 
  "read_only": 1, 
  "width": "120px"
 }, 
@@ -64,6 +68,7 @@
  "fieldtype": "Currency", 
  "label": "Grand Total", 
  "options": "Company:company:default_currency", 
+  "print_width": "120px", 
  "read_only": 1, 
  "width": "120px"
 }
--- a/accounts/doctype/journal_voucher_detail/journal_voucher_detail.txt
+++ b/accounts/doctype/journal_voucher_detail/journal_voucher_detail.txt
@@ -1,8 +1,8 @@
 [
 {
-  "creation": "2013-01-10 16:34:06", 
+  "creation": "2013-02-22 01:27:39", 
  "docstatus": 0, 
-  "modified": "2013-01-29 16:27:50", 
+  "modified": "2013-03-07 07:03:23", 
  "modified_by": "Administrator", 
  "owner": "Administrator"
 }, 
@@ -34,6 +34,7 @@
  "oldfieldname": "account", 
  "oldfieldtype": "Link", 
  "options": "Account", 
+  "print_width": "250px", 
  "reqd": 1, 
  "search_index": 1, 
  "width": "250px"
@@ -65,6 +66,7 @@
  "oldfieldname": "cost_center", 
  "oldfieldtype": "Link", 
  "options": "Cost Center", 
+  "print_width": "180px", 
  "search_index": 0, 
  "width": "180px"
 }, 
--- a/accounts/doctype/multi_ledger_report_detail/multi_ledger_report_detail.txt
+++ b/accounts/doctype/multi_ledger_report_detail/multi_ledger_report_detail.txt
@@ -1,8 +1,8 @@
 [
 {
-  "creation": "2012-03-27 14:35:44", 
+  "creation": "2013-02-22 01:27:39", 
  "docstatus": 0, 
-  "modified": "2012-03-27 14:35:44", 
+  "modified": "2013-03-07 07:03:26", 
  "modified_by": "Administrator", 
  "owner": "Administrator"
 }, 
@@ -10,10 +10,7 @@
  "doctype": "DocType", 
  "istable": 1, 
  "module": "Accounts", 
-  "name": "__common__", 
-  "section_style": "Simple", 
-  "show_in_menu": 0, 
-  "version": 3
+  "name": "__common__"
 }, 
 {
  "doctype": "DocField", 
@@ -26,6 +23,7 @@
  "parentfield": "fields", 
  "parenttype": "DocType", 
  "permlevel": 0, 
+  "print_width": "300px", 
  "reqd": 1, 
  "width": "300px"
 }, 
--- a/accounts/doctype/payment_to_invoice_matching_tool_detail/payment_to_invoice_matching_tool_detail.txt
+++ b/accounts/doctype/payment_to_invoice_matching_tool_detail/payment_to_invoice_matching_tool_detail.txt
@@ -1,8 +1,8 @@
 [
 {
-  "creation": "2013-01-10 16:34:07", 
+  "creation": "2013-02-22 01:27:39", 
  "docstatus": 0, 
-  "modified": "2013-01-29 16:27:50", 
+  "modified": "2013-03-07 07:03:26", 
  "modified_by": "Administrator", 
  "owner": "Administrator"
 }, 
--- a/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.txt
+++ b/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.txt
@@ -1,8 +1,8 @@
 [
 {
-  "creation": "2013-01-10 16:34:08", 
+  "creation": "2013-02-22 01:27:40", 
  "docstatus": 0, 
-  "modified": "2013-01-29 16:27:50", 
+  "modified": "2013-03-07 07:03:26", 
  "modified_by": "Administrator", 
  "owner": "Administrator"
 }, 
@@ -33,6 +33,7 @@
  "oldfieldname": "journal_voucher", 
  "oldfieldtype": "Link", 
  "options": "Journal Voucher", 
+  "print_width": "180px", 
  "read_only": 1, 
  "width": "180px"
 }, 
@@ -45,6 +46,7 @@
  "oldfieldname": "jv_detail_no", 
  "oldfieldtype": "Date", 
  "print_hide": 1, 
+  "print_width": "80px", 
  "read_only": 1, 
  "width": "80px"
 }, 
@@ -56,6 +58,7 @@
  "oldfieldname": "advance_amount", 
  "oldfieldtype": "Currency", 
  "options": "Company:company:default_currency", 
+  "print_width": "100px", 
  "read_only": 1, 
  "width": "100px"
 }, 
@@ -67,6 +70,7 @@
  "oldfieldname": "allocated_amount", 
  "oldfieldtype": "Currency", 
  "options": "Company:company:default_currency", 
+  "print_width": "100px", 
  "width": "100px"
 }, 
 {
@@ -76,6 +80,7 @@
  "label": "Remarks", 
  "oldfieldname": "remarks", 
  "oldfieldtype": "Small Text", 
+  "print_width": "150px", 
  "read_only": 1, 
  "width": "150px"
 }
--- a/accounts/doctype/purchase_invoice_item/purchase_invoice_item.txt
+++ b/accounts/doctype/purchase_invoice_item/purchase_invoice_item.txt
@@ -1,8 +1,8 @@
 [
 {
-  "creation": "2013-02-11 10:54:51", 
+  "creation": "2013-02-27 13:45:00", 
  "docstatus": 0, 
-  "modified": "2013-02-27 18:10:04", 
+  "modified": "2013-03-07 07:03:26", 
  "modified_by": "Administrator", 
  "owner": "Administrator"
 }, 
--- a/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.txt
+++ b/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.txt
@@ -1,8 +1,8 @@
 [
 {
-  "creation": "2013-01-10 16:34:08", 
+  "creation": "2013-02-22 01:27:40", 
  "docstatus": 0, 
-  "modified": "2013-01-29 16:27:50", 
+  "modified": "2013-03-07 07:03:29", 
  "modified_by": "Administrator", 
  "owner": "wasim@webnotestech.com"
 }, 
@@ -62,6 +62,7 @@
  "label": "Description", 
  "oldfieldname": "description", 
  "oldfieldtype": "Small Text", 
+  "print_width": "300px", 
  "reqd": 1, 
  "width": "300px"
 }, 
--- a/accounts/doctype/sales_invoice_advance/sales_invoice_advance.txt
+++ b/accounts/doctype/sales_invoice_advance/sales_invoice_advance.txt
@@ -1,8 +1,8 @@
 [
 {
-  "creation": "2013-01-10 16:34:09", 
+  "creation": "2013-02-22 01:27:41", 
  "docstatus": 0, 
-  "modified": "2013-01-29 16:27:51", 
+  "modified": "2013-03-07 07:03:30", 
  "modified_by": "Administrator", 
  "owner": "Administrator"
 }, 
@@ -33,6 +33,7 @@
  "oldfieldname": "journal_voucher", 
  "oldfieldtype": "Link", 
  "options": "Journal Voucher", 
+  "print_width": "250px", 
  "read_only": 1, 
  "width": "250px"
 }, 
@@ -45,6 +46,7 @@
  "oldfieldname": "jv_detail_no", 
  "oldfieldtype": "Data", 
  "print_hide": 1, 
+  "print_width": "120px", 
  "read_only": 1, 
  "width": "120px"
 }, 
@@ -56,6 +58,7 @@
  "oldfieldname": "advance_amount", 
  "oldfieldtype": "Currency", 
  "options": "Company:company:default_currency", 
+  "print_width": "120px", 
  "read_only": 1, 
  "width": "120px"
 }, 
@@ -67,6 +70,7 @@
  "oldfieldname": "allocated_amount", 
  "oldfieldtype": "Currency", 
  "options": "Company:company:default_currency", 
+  "print_width": "120px", 
  "width": "120px"
 }, 
 {
@@ -76,6 +80,7 @@
  "label": "Remarks", 
  "oldfieldname": "remarks", 
  "oldfieldtype": "Small Text", 
+  "print_width": "150px", 
  "read_only": 1, 
  "width": "150px"
 }
--- a/accounts/doctype/sales_invoice_item/sales_invoice_item.txt
+++ b/accounts/doctype/sales_invoice_item/sales_invoice_item.txt
@@ -1,8 +1,8 @@
 [
 {
-  "creation": "2013-01-29 19:25:49", 
+  "creation": "2013-03-05 09:11:04", 
  "docstatus": 0, 
-  "modified": "2013-03-01 13:41:51", 
+  "modified": "2013-03-07 07:03:30", 
  "modified_by": "Administrator", 
  "owner": "Administrator"
 }, 
@@ -73,6 +73,7 @@
  "label": "Description", 
  "oldfieldname": "description", 
  "oldfieldtype": "Text", 
+  "print_width": "200px", 
  "reqd": 1, 
  "width": "200px"
 }, 
@@ -190,6 +191,7 @@
  "oldfieldtype": "Link", 
  "options": "Account", 
  "print_hide": 1, 
+  "print_width": "120px", 
  "reqd": 1, 
  "width": "120px"
 }, 
@@ -203,6 +205,7 @@
  "oldfieldtype": "Link", 
  "options": "Cost Center", 
  "print_hide": 1, 
+  "print_width": "120px", 
  "reqd": 0, 
  "width": "120px"
 }, 
--- a/accounts/doctype/sales_taxes_and_charges/sales_taxes_and_charges.txt
+++ b/accounts/doctype/sales_taxes_and_charges/sales_taxes_and_charges.txt
@@ -1,8 +1,8 @@
 [
 {
-  "creation": "2013-01-24 15:56:19", 
+  "creation": "2013-02-22 01:27:41", 
  "docstatus": 0, 
-  "modified": "2013-01-29 16:28:04", 
+  "modified": "2013-03-07 07:03:31", 
  "modified_by": "Administrator", 
  "owner": "Administrator"
 }, 
@@ -63,6 +63,7 @@
  "label": "Description", 
  "oldfieldname": "description", 
  "oldfieldtype": "Small Text", 
+  "print_width": "300px", 
  "reqd": 1, 
  "width": "300px"
 }, 
@@ -163,6 +164,7 @@
  "label": "Is this Tax included in Basic Rate?", 
  "no_copy": 0, 
  "print_hide": 1, 
+  "print_width": "150px", 
  "report_hide": 1, 
  "width": "150px"
 }