nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-31 10:49:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

[conflict] fixed

Browse Source
This commit is contained in:
Nabin Hait
2013-07-05 15:25:58 +05:30
parent eb883ee7a3 11d688a536
commit 1bec8012d2
145 changed files with 772 additions and 497 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
accounts/doctype/account/account.txt
View File

@@ -2,7 +2,7 @@
{
"creation": "2013-01-30 12:49:46",
"docstatus": 0,
"modified": "2013-02-05 15:38:32",
"modified": "2013-07-05 14:23:30",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -12,6 +12,7 @@
"description": "Heads (or groups) against which Accounting Entries are made and balances are maintained.",
"doctype": "DocType",
"document_type": "Master",
"icon": "icon-money",
"in_create": 1,
"module": "Accounts",
"name": "__common__",

3
accounts/doctype/accounts_settings/accounts_settings.txt
View File

@@ -2,13 +2,14 @@
{
"creation": "2013-06-24 15:49:57",
"docstatus": 0,
"modified": "2013-06-24 16:12:29",
"modified": "2013-07-05 14:23:40",
"modified_by": "Administrator",
"owner": "Administrator"
},
{
"description": "Settings for Accounts",
"doctype": "DocType",
"icon": "icon-cog",
"issingle": 1,
"module": "Accounts",
"name": "__common__"

2
accounts/doctype/bank_reconciliation/bank_reconciliation.js
View File

@@ -17,4 +17,6 @@
cur_frm.add_fetch("bank_account", "company", "company");
cur_frm.cscript.onload = function(doc, cdt, cdn){
cur_frm.set_intro('<i class="icon-question" /> ' +
wn._("Update clearance date of Journal Entries marked as 'Bank Vouchers'"))
}

3
accounts/doctype/bank_reconciliation/bank_reconciliation.txt
View File

@@ -2,7 +2,7 @@
{
"creation": "2013-01-10 16:34:05",
"docstatus": 0,
"modified": "2013-01-29 16:27:50",
"modified": "2013-07-05 14:26:22",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -13,6 +13,7 @@
"doctype": "DocType",
"hide_heading": 1,
"hide_toolbar": 1,
"icon": "icon-check",
"issingle": 1,
"module": "Accounts",
"name": "__common__",

18
accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.txt
View File

@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:27:37",
"docstatus": 0,
"modified": "2013-03-07 07:03:18",
"modified": "2013-07-05 11:05:59",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -54,6 +54,14 @@
"oldfieldtype": "Date",
"read_only": 1
},
{
"doctype": "DocField",
"fieldname": "clearance_date",
"fieldtype": "Date",
"label": "Clearance Date",
"oldfieldname": "clearance_date",
"oldfieldtype": "Date"
},
{
"doctype": "DocField",
"fieldname": "cheque_number",
@@ -91,13 +99,5 @@
"oldfieldtype": "Currency",
"options": "Company:company:default_currency",
"read_only": 1
},
{
"doctype": "DocField",
"fieldname": "clearance_date",
"fieldtype": "Date",
"label": "Clearance Date",
"oldfieldname": "clearance_date",
"oldfieldtype": "Date"
}
]

3
accounts/doctype/budget_distribution/budget_distribution.txt
View File

@@ -2,7 +2,7 @@
{
"creation": "2013-01-10 16:34:05",
"docstatus": 0,
"modified": "2013-01-22 14:55:58",
"modified": "2013-07-05 14:29:23",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -10,6 +10,7 @@
"autoname": "field:distribution_id",
"description": "**Budget Distribution** helps you distribute your budget across months if you have seasonality in your business.\n\nTo distribute a budget using this distribution, set this **Budget Distribution** in the **Cost Center**",
"doctype": "DocType",
"icon": "icon-bar-chart",
"module": "Accounts",
"name": "__common__",
"name_case": "Title Case"

3
accounts/doctype/c_form/c_form.txt
View File

@@ -2,7 +2,7 @@
{
"creation": "2013-03-07 11:55:06",
"docstatus": 0,
"modified": "2013-06-11 12:10:33",
"modified": "2013-07-05 14:29:48",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -10,6 +10,7 @@
"allow_attach": 1,
"autoname": "naming_series:",
"doctype": "DocType",
"icon": "icon-file-text",
"is_submittable": 1,
"max_attachments": 3,
"module": "Accounts",

3
accounts/doctype/cost_center/cost_center.txt
View File

@@ -2,7 +2,7 @@
{
"creation": "2013-01-23 19:57:17",
"docstatus": 0,
"modified": "2013-01-25 15:04:03",
"modified": "2013-07-05 14:33:05",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -13,6 +13,7 @@
"description": "Track separate Income and Expense for product verticals or divisions.",
"doctype": "DocType",
"document_type": "Master",
"icon": "icon-money",
"in_create": 1,
"module": "Accounts",
"name": "__common__",

3
accounts/doctype/fiscal_year/fiscal_year.txt
View File

@@ -2,7 +2,7 @@
{
"creation": "2013-01-22 16:50:25",
"docstatus": 0,
"modified": "2013-03-13 12:29:40",
"modified": "2013-07-05 14:38:22",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -11,6 +11,7 @@
"description": "**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.",
"doctype": "DocType",
"document_type": "Master",
"icon": "icon-calendar",
"module": "Accounts",
"name": "__common__"
},

3
accounts/doctype/gl_entry/gl_entry.txt
View File

@@ -2,13 +2,14 @@
{
"creation": "2013-01-10 16:34:06",
"docstatus": 0,
"modified": "2013-01-29 16:27:50",
"modified": "2013-07-05 14:39:07",
"modified_by": "Administrator",
"owner": "Administrator"
},
{
"autoname": "GL.#######",
"doctype": "DocType",
"icon": "icon-list",
"in_create": 1,
"module": "Accounts",
"name": "__common__",

15
accounts/doctype/journal_voucher/journal_voucher.txt
View File

@@ -2,13 +2,14 @@
{
"creation": "2013-03-25 10:53:52",
"docstatus": 0,
"modified": "2013-06-28 14:27:11",
"modified": "2013-07-05 14:43:51",
"modified_by": "Administrator",
"owner": "Administrator"
},
{
"autoname": "naming_series:",
"doctype": "DocType",
"icon": "icon-file-text",
"is_submittable": 1,
"module": "Accounts",
"name": "__common__",
@@ -37,6 +38,13 @@
"doctype": "DocType",
"name": "Journal Voucher"
},
{
"doctype": "DocField",
"fieldname": "voucher_type_and_date",
"fieldtype": "Section Break",
"label": "Voucher Type and Date",
"options": "icon-flag"
},
{
"doctype": "DocField",
"fieldname": "column_break0",
@@ -102,7 +110,7 @@
"fieldtype": "Section Break",
"label": "Journal Entries",
"oldfieldtype": "Section Break",
"options": "Simple",
"options": "icon-table",
"read_only": 0
},
{
@@ -121,7 +129,6 @@
"doctype": "DocField",
"fieldname": "section_break99",
"fieldtype": "Section Break",
"options": "Simple",
"read_only": 0
},
{
@@ -180,6 +187,7 @@
"fieldname": "reference",
"fieldtype": "Section Break",
"label": "Reference",
"options": "icon-pushpin",
"read_only": 0
},
{
@@ -286,6 +294,7 @@
"fieldtype": "Section Break",
"label": "More Info",
"oldfieldtype": "Section Break",
"options": "icon-file-text",
"read_only": 0
},
{

5
accounts/doctype/mis_control/mis_control.py
View File

@@ -35,8 +35,6 @@ class DocType:
self.account_list = []
self.ac_details = {} # key: account id, values: debit_or_credit, lft, rgt
self.roles = webnotes.user.get_roles()
self.period_list = []
self.period_start_date = {}
self.period_end_date = {}
@@ -44,7 +42,7 @@ class DocType:
self.fs_list = []
self.root_bal = []
self.flag = 0
# Get defaults on load of MIS, MIS - Comparison Report and Financial statements
# ----------------------------------------------------
def get_comp(self):
@@ -75,6 +73,7 @@ class DocType:
ret['month'] = mon
# ------------------------ get MIS Type on basis of roles of session user ------------------------------------------
self.roles = webnotes.user.get_roles()
if has_common(self.roles, ['Sales Manager']):
type.append('Sales')
if has_common(self.roles, ['Purchase Manager']):

3
accounts/doctype/mode_of_payment/mode_of_payment.txt
View File

@@ -2,7 +2,7 @@
{
"creation": "2012-12-04 17:49:20",
"docstatus": 0,
"modified": "2013-04-19 10:59:05",
"modified": "2013-07-05 14:46:28",
"modified_by": "Administrator",
"owner": "harshada@webnotestech.com"
},
@@ -11,6 +11,7 @@
"autoname": "field:mode_of_payment",
"doctype": "DocType",
"document_type": "Master",
"icon": "icon-credit-card",
"module": "Accounts",
"name": "__common__"
},

3
accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.txt
View File

@@ -2,7 +2,7 @@
{
"creation": "2013-01-30 12:49:46",
"docstatus": 0,
"modified": "2013-02-01 14:05:56",
"modified": "2013-07-05 14:48:10",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -10,6 +10,7 @@
"doctype": "DocType",
"document_type": "Other",
"hide_toolbar": 1,
"icon": "icon-magic",
"issingle": 1,
"module": "Accounts",
"name": "__common__"

3
accounts/doctype/period_closing_voucher/period_closing_voucher.txt
View File

@@ -2,13 +2,14 @@
{
"creation": "2013-01-10 16:34:07",
"docstatus": 0,
"modified": "2013-06-11 16:04:45",
"modified": "2013-07-05 14:50:27",
"modified_by": "Administrator",
"owner": "jai@webnotestech.com"
},
{
"autoname": "PCE/.###",
"doctype": "DocType",
"icon": "icon-file-text",
"is_submittable": 1,
"module": "Accounts",
"name": "__common__",

3
accounts/doctype/pos_setting/pos_setting.txt
View File

@@ -2,13 +2,14 @@
{
"creation": "2013-05-24 12:15:51",
"docstatus": 0,
"modified": "2013-05-30 12:09:39",
"modified": "2013-07-05 14:50:33",
"modified_by": "Administrator",
"owner": "Administrator"
},
{
"autoname": "POS/.####",
"doctype": "DocType",
"icon": "icon-cog",
"module": "Accounts",
"name": "__common__"
},

33
accounts/doctype/purchase_invoice/purchase_invoice.txt
View File

@@ -2,7 +2,7 @@
{
"creation": "2013-05-21 16:16:39",
"docstatus": 0,
"modified": "2013-07-05 14:40:59",
"modified": "2013-07-05 14:51:53",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -10,6 +10,7 @@
"allow_attach": 1,
"autoname": "naming_series:",
"doctype": "DocType",
"icon": "icon-file-text",
"is_submittable": 1,
"module": "Accounts",
"name": "__common__",
@@ -37,6 +38,13 @@
"doctype": "DocType",
"name": "Purchase Invoice"
},
{
"doctype": "DocField",
"fieldname": "supplier_section",
"fieldtype": "Section Break",
"label": "Supplier",
"options": "icon-user"
},
{
"doctype": "DocField",
"fieldname": "column_break0",
@@ -100,38 +108,34 @@
"read_only": 1
},
{
"depends_on": "supplier",
"doctype": "DocField",
"fieldname": "address_display",
"fieldtype": "Small Text",
"hidden": 0,
"hidden": 1,
"label": "Address",
"read_only": 1
},
{
"depends_on": "supplier",
"doctype": "DocField",
"fieldname": "contact_display",
"fieldtype": "Small Text",
"hidden": 0,
"hidden": 1,
"label": "Contact",
"read_only": 1
},
{
"depends_on": "supplier",
"doctype": "DocField",
"fieldname": "contact_mobile",
"fieldtype": "Text",
"hidden": 0,
"hidden": 1,
"label": "Mobile No",
"read_only": 1
},
{
"depends_on": "supplier",
"doctype": "DocField",
"fieldname": "contact_email",
"fieldtype": "Text",
"hidden": 0,
"hidden": 1,
"label": "Contact Email",
"print_hide": 1,
"read_only": 1
@@ -194,6 +198,7 @@
"fieldtype": "Section Break",
"label": "Items",
"oldfieldtype": "Section Break",
"options": "icon-shopping-cart",
"read_only": 0
},
{
@@ -225,7 +230,6 @@
"doctype": "DocField",
"fieldname": "section_break_17",
"fieldtype": "Section Break",
"options": "Simple",
"read_only": 0
},
{
@@ -265,6 +269,7 @@
"fieldname": "currency_price_list",
"fieldtype": "Section Break",
"label": "Currency & Price List",
"options": "icon-tag",
"read_only": 0
},
{
@@ -332,6 +337,7 @@
"fieldtype": "Section Break",
"label": "Taxes",
"oldfieldtype": "Section Break",
"options": "icon-money",
"read_only": 0
},
{
@@ -400,6 +406,7 @@
"fieldname": "contact_section",
"fieldtype": "Section Break",
"label": "Contact Info",
"options": "icon-bullhorn",
"read_only": 0
},
{
@@ -432,6 +439,7 @@
"fieldtype": "Section Break",
"label": "Totals",
"oldfieldtype": "Section Break",
"options": "icon-money",
"read_only": 0
},
{
@@ -645,6 +653,7 @@
"fieldtype": "Section Break",
"label": "Advances",
"oldfieldtype": "Section Break",
"options": "icon-money",
"print_hide": 1,
"read_only": 0
},
@@ -674,7 +683,8 @@
"doctype": "DocField",
"fieldname": "terms_section_break",
"fieldtype": "Section Break",
"label": "Terms and Conditions"
"label": "Terms and Conditions",
"options": "icon-legal"
},
{
"doctype": "DocField",
@@ -702,6 +712,7 @@
"fieldtype": "Section Break",
"label": "More Info",
"oldfieldtype": "Section Break",
"options": "icon-file-text",
"print_hide": 1,
"read_only": 0
},

3
accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.txt
View File

@@ -2,7 +2,7 @@
{
"creation": "2013-01-10 16:34:08",
"docstatus": 0,
"modified": "2013-01-22 14:57:21",
"modified": "2013-07-05 14:52:17",
"modified_by": "Administrator",
"owner": "wasim@webnotestech.com"
},
@@ -11,6 +11,7 @@
"description": "Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like \"Shipping\", \"Insurance\", \"Handling\" etc.\n\n#### Note\n\nThe tax rate you define here will be the standard tax rate for all **Items**. If there are **Items** that have different rates, they must be added in the **Item Tax** table in the **Item** master.\n\n#### Description of Columns\n\n1. Calculation Type: \n - This can be on **Net Total** (that is the sum of basic amount).\n - **On Previous Row Total / Amount** (for cumulative taxes or charges). If you select this option, the tax will be applied as a percentage of the previous row (in the tax table) amount or total.\n - **Actual** (as mentioned).\n2. Account Head: The Account ledger under which this tax will be booked\n3. Cost Center: If the tax / charge is an income (like shipping) or expense it needs to be booked against a Cost Center.\n4. Description: Description of the tax (that will be printed in invoices / quotes).\n5. Rate: Tax rate.\n6. Amount: Tax amount.\n7. Total: Cumulative total to this point.\n8. Enter Row: If based on \"Previous Row Total\" you can select the row number which will be taken as a base for this calculation (default is the previous row).\n9. Consider Tax or Charge for: In this section you can specify if the tax / charge is only for valuation (not a part of total) or only for total (does not add value to the item) or for both.\n10. Add or Deduct: Whether you want to add or deduct the tax.",
"doctype": "DocType",
"document_type": "Master",
"icon": "icon-money",
"module": "Accounts",
"name": "__common__"
},

3
accounts/doctype/sales_invoice/sales_invoice.js
View File

@@ -43,6 +43,7 @@ erpnext.accounts.SalesInvoiceController = erpnext.selling.SellingController.exte
this._super();
cur_frm.cscript.is_opening(doc, dt, dn);
cur_frm.dashboard.reset();
if(doc.docstatus==1) {
cur_frm.add_custom_button('View Ledger', function() {
@@ -53,6 +54,8 @@ erpnext.accounts.SalesInvoiceController = erpnext.selling.SellingController.exte
};
wn.set_route("general-ledger");
});
cur_frm.dashboard.add_progress()
cur_frm.add_custom_button('Send SMS', cur_frm.cscript.send_sms);

76
accounts/doctype/sales_invoice/sales_invoice.txt
View File

@@ -2,7 +2,7 @@
{
"creation": "2013-05-24 19:29:05",
"docstatus": 0,
"modified": "2013-06-27 11:35:29",
"modified": "2013-07-05 14:54:19",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -11,6 +11,7 @@
"autoname": "naming_series:",
"doctype": "DocType",
"document_type": "Transaction",
"icon": "icon-file-text",
"is_submittable": 1,
"module": "Accounts",
"name": "__common__",
@@ -39,6 +40,13 @@
"doctype": "DocType",
"name": "Sales Invoice"
},
{
"doctype": "DocField",
"fieldname": "customer_section",
"fieldtype": "Section Break",
"label": "Customer",
"options": "icon-user"
},
{
"description": "To manage multiple series please go to Setup > Manage Series",
"doctype": "DocField",
@@ -94,38 +102,34 @@
"read_only": 1
},
{
"depends_on": "customer",
"doctype": "DocField",
"fieldname": "address_display",
"fieldtype": "Small Text",
"hidden": 0,
"hidden": 1,
"label": "Address",
"read_only": 1
},
{
"depends_on": "customer",
"doctype": "DocField",
"fieldname": "contact_display",
"fieldtype": "Small Text",
"hidden": 0,
"hidden": 1,
"label": "Contact",
"read_only": 1
},
{
"depends_on": "customer",
"doctype": "DocField",
"fieldname": "contact_mobile",
"fieldtype": "Text",
"hidden": 0,
"hidden": 1,
"label": "Mobile No",
"read_only": 1
},
{
"depends_on": "customer",
"doctype": "DocField",
"fieldname": "contact_email",
"fieldtype": "Text",
"hidden": 0,
"hidden": 1,
"label": "Contact Email",
"print_hide": 1,
"read_only": 1
@@ -137,6 +141,16 @@
"oldfieldtype": "Column Break",
"read_only": 0
},
{
"doctype": "DocField",
"fieldname": "is_pos",
"fieldtype": "Check",
"label": "Is POS",
"oldfieldname": "is_pos",
"oldfieldtype": "Check",
"print_hide": 1,
"read_only": 0
},
{
"doctype": "DocField",
"fieldname": "amended_from",
@@ -205,31 +219,12 @@
"options": "link:Mode of Payment",
"read_only": 0
},
{
"doctype": "DocField",
"fieldname": "is_pos",
"fieldtype": "Check",
"label": "Is POS",
"oldfieldname": "is_pos",
"oldfieldtype": "Check",
"print_hide": 1,
"read_only": 0
},
{
"doctype": "DocField",
"fieldname": "update_stock",
"fieldtype": "Check",
"label": "Update Stock",
"oldfieldname": "update_stock",
"oldfieldtype": "Check",
"print_hide": 1,
"read_only": 0
},
{
"doctype": "DocField",
"fieldname": "currency_section",
"fieldtype": "Section Break",
"label": "Price List and Currency",
"options": "icon-tag",
"read_only": 0
},
{
@@ -304,6 +299,17 @@
"fieldtype": "Section Break",
"label": "Items",
"oldfieldtype": "Section Break",
"options": "icon-shopping-cart",
"read_only": 0
},
{
"doctype": "DocField",
"fieldname": "update_stock",
"fieldtype": "Check",
"label": "Update Stock",
"oldfieldname": "update_stock",
"oldfieldtype": "Check",
"print_hide": 1,
"read_only": 0
},
{
@@ -323,6 +329,7 @@
"fieldname": "packing_list",
"fieldtype": "Section Break",
"label": "Packing List",
"options": "icon-suitcase",
"print_hide": 1,
"read_only": 0
},
@@ -347,7 +354,6 @@
"doctype": "DocField",
"fieldname": "section_break0",
"fieldtype": "Section Break",
"options": "Simple",
"read_only": 0
},
{
@@ -426,6 +432,7 @@
"fieldtype": "Section Break",
"label": "Taxes and Charges",
"oldfieldtype": "Section Break",
"options": "icon-money",
"read_only": 0
},
{
@@ -524,6 +531,7 @@
"fieldtype": "Section Break",
"label": "Totals",
"oldfieldtype": "Section Break",
"options": "icon-money",
"print_hide": 1,
"read_only": 0
},
@@ -657,6 +665,7 @@
"fieldtype": "Section Break",
"label": "Advances",
"oldfieldtype": "Section Break",
"options": "icon-money",
"print_hide": 1,
"read_only": 0
},
@@ -686,6 +695,7 @@
"fieldname": "payments_section",
"fieldtype": "Section Break",
"label": "Payments",
"options": "icon-money",
"read_only": 0
},
{
@@ -765,6 +775,7 @@
"fieldtype": "Section Break",
"label": "Terms and Conditions",
"oldfieldtype": "Section Break",
"options": "icon-legal",
"read_only": 0
},
{
@@ -813,6 +824,7 @@
"fieldtype": "Section Break",
"hidden": 0,
"label": "Contact Info",
"options": "icon-bullhorn",
"read_only": 0
},
{
@@ -869,6 +881,7 @@
"fieldtype": "Section Break",
"label": "More Info",
"oldfieldtype": "Section Break",
"options": "icon-file-text",
"print_hide": 1,
"read_only": 0
},
@@ -1033,6 +1046,7 @@
"fieldtype": "Section Break",
"label": "Sales Team",
"oldfieldtype": "Section Break",
"options": "icon-group",
"print_hide": 1,
"read_only": 0
},
@@ -1091,7 +1105,6 @@
"doctype": "DocField",
"fieldname": "section_break2",
"fieldtype": "Section Break",
"options": "Simple",
"print_hide": 1,
"read_only": 0
},
@@ -1112,6 +1125,7 @@
"fieldname": "recurring_invoice",
"fieldtype": "Section Break",
"label": "Recurring Invoice",
"options": "icon-time",
"print_hide": 1,
"read_only": 0
},

20
accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.txt
View File

@@ -2,7 +2,7 @@
{
"creation": "2013-01-10 16:34:09",
"docstatus": 0,
"modified": "2013-06-25 12:06:45",
"modified": "2013-07-05 14:54:37",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -11,6 +11,7 @@
"description": "Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like \"Shipping\", \"Insurance\", \"Handling\" etc.\n\n#### Note\n\nThe tax rate you define here will be the standard tax rate for all **Items**. If there are **Items** that have different rates, they must be added in the **Item Tax** table in the **Item** master.\n\n#### Description of Columns\n\n1. Calculation Type: \n - This can be on **Net Total** (that is the sum of basic amount).\n - **On Previous Row Total / Amount** (for cumulative taxes or charges). If you select this option, the tax will be applied as a percentage of the previous row (in the tax table) amount or total.\n - **Actual** (as mentioned).\n2. Account Head: The Account ledger under which this tax will be booked\n3. Cost Center: If the tax / charge is an income (like shipping) or expense it needs to be booked against a Cost Center.\n4. Description: Description of the tax (that will be printed in invoices / quotes).\n5. Rate: Tax rate.\n6. Amount: Tax amount.\n7. Total: Cumulative total to this point.\n8. Enter Row: If based on \"Previous Row Total\" you can select the row number which will be taken as a base for this calculation (default is the previous row).\n9. Is this Tax included in Basic Rate?: If you check this, it means that this tax will not be shown below the item table, but will be included in the Basic Rate in your main item table. This is useful where you want give a flat price (inclusive of all taxes) price to customers.",
"doctype": "DocType",
"document_type": "Master",
"icon": "icon-money",
"module": "Accounts",
"name": "__common__"
},
@@ -30,7 +31,8 @@
"parenttype": "DocType",
"permlevel": 0,
"read": 1,
"report": 1
"report": 1,
"submit": 0
},
{
"doctype": "DocType",
@@ -100,20 +102,21 @@
"create": 0,
"doctype": "DocPerm",
"role": "Sales User",
"submit": 0,
"write": 0
},
{
"doctype": "DocPerm",
"role": "Accounts User"
},
{
"amend": 0,
"cancel": 1,
"create": 1,
"doctype": "DocPerm",
"role": "Accounts Manager",
"submit": 0,
"write": 1
},
{
"cancel": 1,
"create": 1,
"doctype": "DocPerm",
"role": "System Manager",
"write": 1
},
{
@@ -122,7 +125,6 @@
"create": 1,
"doctype": "DocPerm",
"role": "Sales Master Manager",
"submit": 0,
"write": 1
}
]

3
accounts/doctype/shipping_rule/shipping_rule.txt
View File

@@ -2,7 +2,7 @@
{
"creation": "2013-06-25 11:48:03",
"docstatus": 0,
"modified": "2013-07-04 16:28:42",
"modified": "2013-07-05 14:55:00",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -10,6 +10,7 @@
"autoname": "Prompt",
"description": "Specify conditions to calculate shipping amount",
"doctype": "DocType",
"icon": "icon-truck",
"module": "Accounts",
"name": "__common__"
},