added get_value, fixed appframe from Single
diff --git a/accounts/module_def/accounts/locale/_messages_doc.json b/accounts/module_def/accounts/locale/_messages_doc.json
index a1a3236..912db81 100644
--- a/accounts/module_def/accounts/locale/_messages_doc.json
+++ b/accounts/module_def/accounts/locale/_messages_doc.json
@@ -5,6 +5,7 @@
"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.",
"Track separate Income and Expense for product verticals or divisions.",
"Delivered Items To Be Billed",
+ "Gross Profit",
"**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**",
"Financial Statements",
"General Ledger",
diff --git a/accounts/page/accounts_home/locale/_messages_js.json b/accounts/page/accounts_home/locale/_messages_js.json
index 4a1144a..3f1cd7b 100644
--- a/accounts/page/accounts_home/locale/_messages_js.json
+++ b/accounts/page/accounts_home/locale/_messages_js.json
@@ -28,6 +28,7 @@
"Setup",
"Manage sales or purchase returns",
"Purchase Taxes and Charges Master",
+ "Gross Profit",
"Reports",
"Period Closing Voucher",
"Structure cost centers for budgeting.",
diff --git a/projects/doctype/timesheet/timesheet.txt b/projects/doctype/timesheet/timesheet.txt
index 649be40..d64a3e1 100644
--- a/projects/doctype/timesheet/timesheet.txt
+++ b/projects/doctype/timesheet/timesheet.txt
@@ -1,8 +1,8 @@
[
{
- "creation": "2013-01-10 16:34:17",
+ "creation": "2013-01-29 19:25:50",
"docstatus": 0,
- "modified": "2013-01-29 14:36:53",
+ "modified": "2013-02-26 13:44:35",
"modified_by": "Administrator",
"owner": "ashwini@webnotestech.com"
},
@@ -23,19 +23,12 @@
"permlevel": 0
},
{
- "amend": 1,
- "cancel": 1,
- "create": 1,
"doctype": "DocPerm",
"name": "__common__",
"parent": "Timesheet",
"parentfield": "permissions",
"parenttype": "DocType",
- "permlevel": 0,
- "read": 1,
- "report": 1,
- "submit": 1,
- "write": 1
+ "read": 1
},
{
"doctype": "DocType",
@@ -48,6 +41,23 @@
"label": "Timesheet Details"
},
{
+ "default": "Today",
+ "doctype": "DocField",
+ "fieldname": "timesheet_date",
+ "fieldtype": "Date",
+ "in_filter": 1,
+ "label": "Timesheet Date",
+ "oldfieldname": "timesheet_date",
+ "oldfieldtype": "Date",
+ "reqd": 1,
+ "search_index": 1
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "column_break_3",
+ "fieldtype": "Column Break"
+ },
+ {
"default": "Draft",
"doctype": "DocField",
"fieldname": "status",
@@ -63,16 +73,31 @@
"search_index": 1
},
{
- "default": "Today",
"doctype": "DocField",
- "fieldname": "timesheet_date",
- "fieldtype": "Date",
- "in_filter": 1,
- "label": "Timesheet Date",
- "oldfieldname": "timesheet_date",
- "oldfieldtype": "Date",
- "reqd": 1,
- "search_index": 1
+ "fieldname": "section_break0",
+ "fieldtype": "Section Break",
+ "options": "Simple"
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "timesheet_details",
+ "fieldtype": "Table",
+ "label": "Timesheet Details",
+ "oldfieldname": "timesheet_details",
+ "oldfieldtype": "Table",
+ "options": "Timesheet Detail"
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "section_break_7",
+ "fieldtype": "Section Break"
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "notes",
+ "fieldtype": "Text",
+ "in_list_view": 1,
+ "label": "Notes"
},
{
"doctype": "DocField",
@@ -109,38 +134,47 @@
"read_only": 1
},
{
- "doctype": "DocField",
- "fieldname": "column_break0",
- "fieldtype": "Column Break"
- },
- {
- "doctype": "DocField",
- "fieldname": "notes",
- "fieldtype": "Text",
- "in_list_view": 1,
- "label": "Notes"
- },
- {
- "doctype": "DocField",
- "fieldname": "section_break0",
- "fieldtype": "Section Break",
- "options": "Simple"
- },
- {
- "doctype": "DocField",
- "fieldname": "timesheet_details",
- "fieldtype": "Table",
- "label": "Timesheet Details",
- "oldfieldname": "timesheet_details",
- "oldfieldtype": "Table",
- "options": "Timesheet Detail"
- },
- {
+ "amend": 1,
+ "cancel": 1,
+ "create": 1,
"doctype": "DocPerm",
- "role": "Projects User"
+ "permlevel": 0,
+ "report": 1,
+ "role": "Projects User",
+ "submit": 0,
+ "write": 1
},
{
+ "amend": 0,
+ "cancel": 0,
+ "create": 0,
"doctype": "DocPerm",
- "role": "System Manager"
+ "permlevel": 1,
+ "report": 0,
+ "role": "Projects User",
+ "submit": 0,
+ "write": 0
+ },
+ {
+ "amend": 1,
+ "cancel": 1,
+ "create": 1,
+ "doctype": "DocPerm",
+ "permlevel": 0,
+ "report": 1,
+ "role": "System Manager",
+ "submit": 1,
+ "write": 1
+ },
+ {
+ "amend": 0,
+ "cancel": 0,
+ "create": 0,
+ "doctype": "DocPerm",
+ "permlevel": 1,
+ "report": 0,
+ "role": "System Manager",
+ "submit": 0,
+ "write": 0
}
]
\ No newline at end of file
diff --git a/setup/doctype/email_digest/locale/_messages_doc.json b/setup/doctype/email_digest/locale/_messages_doc.json
index 3e21e3d..1e15703 100644
--- a/setup/doctype/email_digest/locale/_messages_doc.json
+++ b/setup/doctype/email_digest/locale/_messages_doc.json
@@ -1,21 +1,27 @@
[
- "New Leads",
- "Add/Remove Recipients",
+ "Income Booked",
+ "Bank/Cash Balance",
"Monthly",
"Support",
"New Material Requests",
+ "New Leads",
+ "Expenses booked for the digest period",
"Send regular summary reports via Email.",
"Select Digest Content",
"Expenses Booked",
- "Income",
- "Stock",
+ "Payments received during the digest period",
+ "Add/Remove Recipients",
"To Do List",
"Selling",
+ "Payments Made",
"Recipients",
"Email Digest Settings",
"Check all the items below that you want to send in this digest.",
+ "Payments made during the digest period",
"New Quotations",
"New Support Tickets",
+ "Payments Received",
+ "Income booked for the digest period",
"Buying",
"New Communications",
"New Projects",
@@ -23,16 +29,19 @@
"Setup",
"Enabled",
"Daily",
+ "Balances of Accounts of type \"Bank or Cash\"",
+ "Income / Expense",
"New Delivery Notes",
- "Payments",
- "Bank Balance",
+ "Stock",
"How frequently?",
"Payables",
"New Enquiries",
+ "New Purchase Orders",
"New Sales Orders",
"Calendar Events",
"New Purchase Receipts",
- "New Purchase Orders",
+ "Total amount of invoices sent to the customer during the digest period",
+ "Receivable / Payable account will be identified based on the field Master Type",
"Receivables",
"For Company",
"Note: Email will not be sent to disabled users",
@@ -40,10 +49,10 @@
"New Supplier Quotations",
"Income Year to Date",
"General",
+ "Receivables / Payables",
"Open Tickets",
- "Accounts",
"Projects",
- "Collections",
+ "Total amount of invoices received from suppliers during the digest period",
"Email Digest",
"Weekly"
]
\ No newline at end of file
diff --git a/setup/doctype/email_digest/locale/_messages_py.json b/setup/doctype/email_digest/locale/_messages_py.json
index 7915fc9..6bd8607 100644
--- a/setup/doctype/email_digest/locale/_messages_py.json
+++ b/setup/doctype/email_digest/locale/_messages_py.json
@@ -1,3 +1,4 @@
[
+ "assigned by",
"All Day"
]
\ No newline at end of file
diff --git a/stock/doctype/material_request/locale/_messages_doc.json b/stock/doctype/material_request/locale/_messages_doc.json
index 7ecd1f7..6227d2f 100644
--- a/stock/doctype/material_request/locale/_messages_doc.json
+++ b/stock/doctype/material_request/locale/_messages_doc.json
@@ -40,6 +40,5 @@
"More Info",
"MREQ-",
"Draft",
- "Terms and Conditions Content",
- "Print Heading"
+ "Terms and Conditions Content"
]
\ No newline at end of file
diff --git a/translations/si.csv b/translations/si.csv
deleted file mode 100644
index c528f0f..0000000
--- a/translations/si.csv
+++ /dev/null
@@ -1 +0,0 @@
-,