-
-#### Step 2: Stock Reconciliation
-
-To create new Stock Reconciliation, go to:
-
-`Stock > Setup > Stock Reconciliation > New`
-
-Set Posting Date and Time of Stock Reconciliation will when you wish depreciation entry to be posted in your accounts.
-
-#### Step 3: Item
-
-Select Fixed Asset Items in the item table. Update Warehouse of an item. For item valuation, update post-depreciation value. For example, item value was 100. Depreciation amount is 20. As per this post-depreciation valuation of an item will be 80. Hence 80 should be posted as valuation in the Stock Reconciliation.
-
-
-
-#### Step 4: Depreciation Account
-
-Select Depereciation Account in which depereciation amount will be booked.
-
-
-
-#### Step 5: Submit
-
-On submission of Stock Reconciliation, depreciation will booked for items asset items.
-
-
-
-Click [here]({{docs_base_url}}/user/manual/en/setting-up/stock-reconciliation-for-non-serialized-item.html) for steps to be followed when making Stock Reconciliation entry.
-
-
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/accounts/articles/how-to-freeze-accounting-ledger.md b/erpnext/docs/user/manual/en/accounts/articles/how-to-freeze-accounting-ledger.md
index f21bf2d99e..80aed6d40e 100644
--- a/erpnext/docs/user/manual/en/accounts/articles/how-to-freeze-accounting-ledger.md
+++ b/erpnext/docs/user/manual/en/accounts/articles/how-to-freeze-accounting-ledger.md
@@ -1,28 +1,36 @@
#How To Freeze Accounting Ledger?
-You can freeze any accounting ledger in ERPNext. So that frozen accounting ledger became unsearchable in accounting transaction. Follow below step to understand the process.
+If you want to discontinue using specific Account, you can freeze it.
-#### 1. Set Frozen Accounts Modifier
+>Account can be Frozen by the User having specific Role. This Role for set in the Account Settings, in the field "Role Allowed to Set Frozen Accounts & Edit Frozen Entries".
-To set frozen accounts modifier go to `Accounts > Setup > Accounts Setting`
+Please check following steps to freeze an Account from the Chart of Accounts master.
-Search and select Role under Frozen Accounts Modifier field and save the Account Settings form.
-
-
+####Step 1: Chart of Accounts
-#### 2. Edit Accounting Ledger.
+To edit an Account, go to Chart of Accounts:
-To edit accounting ledger go to `Accounts > Setup > Chart of Accounts`
+`Explore > Accounts > Chart of Accounts`
-
+
-#### 3. Set Frozen Status of Ledger.
+Click on Account in which Frozen Date is to be updated.
-
+####Step 2: Set Account as Frozen
+
+In the Account form, you will find a field called **Frozen**. Set value in this field as 'Yes'
+
+
+
+####Step 3: Save
+
+After update Save an Account.
+
+On saving, this Account will be frozen and will not be selectable in any accounting transaction.
+
+
+
-Note: Journal Voucher Reference Date should equal to or less than Posting Date.
+Note: Payment Entry Reference Date should equal to or less than Posting Date.
####Step 3: Save and Submit
-After entering required details, Save and Submit the Journal Entry.
+After entering required details, Save and Submit the Payment Entry.
####Adjusting Post Dated Cheque Entry
-If Post Dated Journal Entry needs to be adjusted against any invoice, it can be accomplished via [Payment Reconciliation Tool]({{docs_base_url}}/user/manual/en/accounts/tools/payment-reconciliation.html).
+You can adjust Post Dated Payment Entry against an invoice via [Payment Reconciliation Tool]({{docs_base_url}}/user/manual/en/accounts/tools/payment-reconciliation.html).
When cheque is cleared, i.e. on actual date on the cheque, you can update its Clearance Date via [Bank Reconciliation Tool]({{docs_base_url}}/user/manual/en/accounts/tools/bank-reconciliation.html).
-You might find value of this Journal Entry already reflecting against bank's ledger. You should check **Bank Reconciliation Statement**, a report in the account module to know difference of bank balance as per system, and actual balance in a account.
+In the Chart of Accounts, you might find value of this Payment Entry already reflecting against bank Account. You should check **Bank Reconciliation Statement**, a report in the account module to know difference of bank balance as per system, and actual balance in the bank's statement.
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/setting-up/articles/setting-up-dropbox-backups.html b/erpnext/docs/user/manual/en/setting-up/articles/setting-up-dropbox-backups.html
deleted file mode 100644
index 1b7e4f7977..0000000000
--- a/erpnext/docs/user/manual/en/setting-up/articles/setting-up-dropbox-backups.html
+++ /dev/null
@@ -1,74 +0,0 @@
-If you wish to store your backups on a periodic basis,on Dropbox, you can do it directly through ERPNext.
---Setup > Manage 3rd Party Backups
-
Step 1: Click on Integrations > Backup Manager
-
-
In the Backup Manager page, enter the email addresses of those people whom you wish to notify about the upload status. Under the topic 'Sync with Dropbox', select whether you wish to upload Daily, Weekly or Never.
-Step 2 Click on Allow Dropbox Access.
---Tip: In future, if you wish to discontinue uploading backups to dropbox, then select the Never option.
-
-You need to login to your dropbox account, with your user id and password.
-
- 
- 
- {
- "db_name": "demo",
- "db_password": "DZ1Idd55xJ9qvkHvUH",
- "dropbox_access_key": "ACCESSKEY",
- "dropbox_secret_key": "SECRECTKEY"
-} 
+
+####Step 4: Allow Dropbox Access
+
+After setting frequency and updating notification email, click on `Allow Dropbox access`. On clicking this button, the Dropbox login page will open in the new tab. This might require you to allow pop-up for your ERPNext account.
+
+####Step 5: Login to Dropbox
+
+Login to your Dropbox account by entering login credentials.
+
+
+
+####Step 6: Allow
+
+On successfull login, you will find a confirmation message as following. Click on "Allow" to let your ERPNext account have access to your Dropbox account.
+
+
+
+With this, a folder called "ERPNext" will be created in your Dropbox account, and database backup will start to auto-download in it.
+
+##Open Source Users
+
+####Step 1: Go to
+
+https://www.dropbox.com/developers/apps
+
+####Step 2:Create a new app
+
+
+
+####Step 3: Fill in details for the app
+
+
+
+-
+
+
+####Step 4: Settings in Site Config
+
+After the app is created, note the app key and app secret and enter in `sites/{sitename}/site_config.json` as follows,
+
+
+ {
+ "db_name": "demo",
+ "db_password": "DZ1Idd55xJ9qvkHvUH",
+ "dropbox_access_key": "ACCESSKEY",
+ "dropbox_secret_key": "SECRECTKEY"
+}
+
+
+
+
+> If you want to make this the default letter head, click on “Is Default”.
-This is how the letter head looks in a document print:
+####Step 4: Save
+
+After enter values in the Header and Footer section, Save Letter Head.
+
+####Letter Head in the Print Format
+
+This is how the letter head looks in a document's print.
-{next}
+> Please note that Footer will be visible only when document's print is seen in the PDF. Footer will not be visible in the HTML based print preview.
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/setting-up/users-and-permissions/user-permissions.md b/erpnext/docs/user/manual/en/setting-up/users-and-permissions/user-permissions.md
index c1cefc6037..7fae95cbe7 100644
--- a/erpnext/docs/user/manual/en/setting-up/users-and-permissions/user-permissions.md
+++ b/erpnext/docs/user/manual/en/setting-up/users-and-permissions/user-permissions.md
@@ -1,72 +1,60 @@
# User Permissions
-Limit access for a User to a set of documents using User Permissions Manager
-
Role Base Permissions define the periphery of document types within which a user with a set of Roles can move around in. However, you can have an even finer control by defining User Permissions for a User. By setting specific documents in User Permissions list, you can limit access for that User to specific documents of a particular DocType, on the condition that "Apply User Permissions" is checked in Role Permissions Manager.
To start with, go to:
+
> Setup > Permissions > User Permissions Manager
-
- 
- 
+
+ Add User Permissions row for a combination of User 'tom.hagen@riosolutions.com' and Company 'Rio Solutions'.
1. Also Role "All" has only Read permission for Company, with 'Apply User Permissions' checked.
- 
-
- 1. The combined effect of the above two rules lead to User 'aromn@example.com' having only Read access to Company 'Wind Power LLC'.
- 
- 
+
+ Access is limited to Company 'Rio Solutions'.
1. We want this User Permission on Company to get applied on other documents like Quotation, Sales Order, etc.
-These forms have a **Link Field based on Company**. As a result, User Permissions on Company also get applied on these documents, which leads to User 'aromn@example.com' to acces these documents having Company 'Wind Power LLC'.
- 
- 
- 
- 
- 
-
+
+ Users with Sales User Role can Read, Write, Create, Submit and Cancel Quotations based on their User Permissions, since 'Apply User Permissions' is checked.
+
+ 
+
+ Quotation List is limited to results for Company 'Rio Solutions' for User 'tom.hagen@riosolutions.com'.
+
+ 1. User Permissions get applied automatically based on Link Fields, just like how it worked for Quotation. But, Lead Form has 4 Link fields: Territory, Company, Lead Owner and Next Contact By. Say, you want Leads to limit access to Users based only on Territory, even though you have defined User Permissions for DocTypes User, Territory and Company. You can do this by setting 'Ignore User Permissions' for Link fields: Company, Lead Owner and Next Contact By.
+
+
+
+Sales User can Read, Write and Create Leads limited by User Permissions.
+
+
+
+Check 'Ingore User Permissions' for Company, Lead Owner and Next Contact By fields using Setup > Customize > Customize Form for Lead.
+
+
+
+Due to the effect of the above combination, User 'tom.hagen@riosolutions.com' can only access Leads with Territory 'United States'.
{next}
diff --git a/erpnext/docs/user/manual/en/stock/accounting-of-inventory-stock/perpetual-inventory.md b/erpnext/docs/user/manual/en/stock/accounting-of-inventory-stock/perpetual-inventory.md
index c31d1ac78f..84fe545174 100644
--- a/erpnext/docs/user/manual/en/stock/accounting-of-inventory-stock/perpetual-inventory.md
+++ b/erpnext/docs/user/manual/en/stock/accounting-of-inventory-stock/perpetual-inventory.md
@@ -1,42 +1,38 @@
-In perpetual inventory, system creates accounting entries for each stock
-transactions, so that stock and account balance will always remain same. The
-account balance will be posted against their respective account heads for each
-Warehouse. On saving of a Warehouse, the system will automatically create an
-account head with the same name as warehouse. As account balance is maintained
-for each Warehouse, you should create Warehouses, based on the type of items
-(Current / Fixed Assets) it stores.
+As per the perpetual inventory system, accounts posting is done for every stock transaction.
-At the time of items received in a particular warehouse, the balance of asset
-account (linked to that warehouse) will be increased. Similarly when you
-deliver some items from that warehouse, an expense will be booked and the
-asset account will be reduced, based on the valuation amount of those items.
+On creating new Warehouse, the system will automatically create an Account in the Chart of Accout, with the same name as Warehouse Name.
-## **Activation**
+On receipt of items in a particular warehouse, the balance in the Warehouse Account will increase. Similarly when items are delivered from the Warehouse, an expense will be booked, and balance in the Warehouse Account will reduce.
- 1. Setup the following default accounts for each Company
+##Activation
+
+ 1. Setup the following default accounts for each Company. These accounts are created automatically in the new ERPNext accounts.
* Stock Received But Not Billed
* Stock Adjustment Account
* Expenses Included In Valuation
* Cost Center
- 2. In perpetual inventory, the system will maintain separate account balance for each warehouse under separate account head. To create that account head, enter "Create Account Under" in Warehouse master.
+
+ 2. Ensure each Warehouse is an Account in the Chart of Accounts master. As per the default configuration, Accounts for Warehouse are created under `Assets > Current Asset > Stock Assets > (Warehouse)`
3. Activate Perpetual Inventory
-> Setup > Accounts Settings > Make Accounting Entry For Every Stock Movement
+ > Explore > Accounts > Accounts Settings > "Make Accounting Entry For Every Stock Movement"
+
+
* * *
-## **Example**
+##Example
Consider following Chart of Accounts and Warehouse setup for your company:
-#### Chart of Accounts
+####Chart of Accounts
* Assets (Dr)
* Current Assets
* Accounts Receivable
- * Jane Doe
+ * Debtor
* Stock Assets
* Stores
* Finished Goods
@@ -44,11 +40,11 @@ Consider following Chart of Accounts and Warehouse setup for your company:
* Tax Assets
* VAT
* Fixed Assets
- * Fixed Asset Warehouse
+ * Fixed Asset Warehouse
* Liabilities (Cr)
* Current Liabilities
* Accounts Payable
- * East Wind Inc.
+ * Creditors
* Stock Liabilities
* Stock Received But Not Billed
* Tax Liabilities
@@ -65,18 +61,15 @@ Consider following Chart of Accounts and Warehouse setup for your company:
* Shipping Charges
* Customs Duty
-#### Warehouse - Account Configuration
+####Warehouse - Account Configuration
* Stores
* Work In Progress
* Finished Goods
- * Fixed Asset Warehouse
-### **Purchase Receipt**
+###Purchase Receipt
-Suppose you have purchased _10 nos_ of item "RM0001" at _$200_ and _5 nos_ of
-item "Desktop" at **$100** from supplier "East Wind Inc". Following are the
-details of Purchase Receipt:
+Suppose you have purchased _10 nos_ of item "RM0001" at _$200_ and _5 nos_ of item "Base Plate" at **$100** from supplier "East Wind Inc". Following are the details of Purchase Receipt:
**Supplier:** East Wind Inc.
@@ -100,15 +93,7 @@ details of Purchase Receipt:
Stock Ledger -
-
+**Stock Ledger**
+
+
**General Ledger**
-
+
-As stock balance increases through Purchase Receipt, "Store" and "Fixed Asset
-Warehouse" accounts are debited and a temporary account "Stock Receipt But Not
-Billed" account is credited, to maintain double entry accounting system. At the same time, negative expense is booked in account "Expense included in Valuation" for the amount added for valuation purpose, to avoid double expense booking.
+As stock balance increases through Purchase Receipt, "Store" accounts are debited and a temporary account "Stock Receipt But Not Billed" account is credited, to maintain double entry accounting system. At the same time, negative expense is booked in account "Expense included in Valuation" for the amount added for valuation purpose, to avoid double expense booking.
* * *
-### **Purchase Invoice**
+###Purchase Invoice
-On receiving Bill from supplier, for the above Purchase Receipt, you will make
-Purchase Invoice for the same. The general ledger entries are as follows:
+On receiving Bill from supplier, for the above Purchase Receipt, you will make Purchase Invoice for the same. The general ledger entries are as follows:
**General Ledger**
@@ -169,7 +151,7 @@ effect of Purchase Receipt.
* * *
-### **Delivery Note**
+###Delivery Note
Lets say, you have an order from "Jane Doe" to deliver 5 nos of item "RM0001"
at $300. Following are the details of Delivery Note:
@@ -246,7 +228,7 @@ valuation method (FIFO / Moving Average) or actual cost of serialized items.
* * *
-### **Sales Invoice with Update Stock**
+###Sales Invoice with Update Stock
Lets say, you did not make Delivery Note against the above order and instead
you have made Sales Invoice directly, with "Update Stock" options. The details
@@ -265,7 +247,7 @@ Goods Sold" accounts are also affected based on the valuation amount.
* * *
-### **Stock Entry (Material Receipt)**
+###Stock Entry (Material Receipt)
**Items:**
@@ -300,7 +282,7 @@ Goods Sold" accounts are also affected based on the valuation amount.
* * *
-### **Stock Entry (Material Issue)**
+###Stock Entry (Material Issue)
**Items:**
@@ -335,7 +317,7 @@ Goods Sold" accounts are also affected based on the valuation amount.
* * *
-### **Stock Entry (Material Transfer)**
+###Stock Entry (Material Transfer)
**Items:**
diff --git a/erpnext/docs/user/manual/en/website/shopping-cart.md b/erpnext/docs/user/manual/en/website/shopping-cart.md
index 773e1628df..16820842c6 100644
--- a/erpnext/docs/user/manual/en/website/shopping-cart.md
+++ b/erpnext/docs/user/manual/en/website/shopping-cart.md
@@ -14,14 +14,10 @@ To set up a shopping cart, go to the selling module.
-
-
#### Step 2: Enter Price List, Tax Master and Shipping Rule.
-
-
#### Shopping Cart Display
On the Website, the shopping cart image will be seen below the Item price.
@@ -31,8 +27,6 @@ to the flower sign.
-
-
Click on the flower sign on the right hand side to see the cart details. Click
on the cart to get the final amount details.
diff --git a/erpnext/hr/doctype/salary_structure/salary_structure.py b/erpnext/hr/doctype/salary_structure/salary_structure.py
index 836e524015..c2f95af904 100644
--- a/erpnext/hr/doctype/salary_structure/salary_structure.py
+++ b/erpnext/hr/doctype/salary_structure/salary_structure.py
@@ -99,7 +99,7 @@ def make_salary_slip(source_name, target_doc=None):
for d in source.get(key):
target.append(key, {
'amount': d.amount,
- 'default_amount': d.default_amount,
+ 'default_amount': d.amount,
'depends_on_lwp' : d.depends_on_lwp,
'salary_component' : d.salary_component
})
diff --git a/erpnext/patches/v5_2/change_item_selects_to_checks.py b/erpnext/patches/v5_2/change_item_selects_to_checks.py
index dde0b56eeb..1ee8f6caa5 100644
--- a/erpnext/patches/v5_2/change_item_selects_to_checks.py
+++ b/erpnext/patches/v5_2/change_item_selects_to_checks.py
@@ -4,8 +4,7 @@ import frappe
def execute():
fields = ("is_stock_item", "is_asset_item", "has_batch_no", "has_serial_no",
- "inspection_required", "is_sub_contracted_item")
-
+ "is_sales_item", "is_purchase_item", "inspection_required", "is_sub_contracted_item")
# convert to 1 or 0
update_str = ", ".join(["`{0}`=if(`{0}`='Yes',1,0)".format(f) for f in fields])
diff --git a/erpnext/patches/v7_0/convert_timelog_to_timesheet.py b/erpnext/patches/v7_0/convert_timelog_to_timesheet.py
index 072ba13cd0..b802656f7f 100644
--- a/erpnext/patches/v7_0/convert_timelog_to_timesheet.py
+++ b/erpnext/patches/v7_0/convert_timelog_to_timesheet.py
@@ -1,23 +1,30 @@
import frappe
from erpnext.manufacturing.doctype.production_order.production_order \
import make_timesheet, add_timesheet_detail
-from erpnext.projects.doctype.timesheet.timesheet import OverlapError
def execute():
frappe.reload_doc('projects', 'doctype', 'timesheet')
for data in frappe.get_all('Time Log', fields=["*"], filters = [["docstatus", "<", "2"]]):
- try:
- time_sheet = make_timesheet(data.production_order)
- args = get_timelog_data(data)
- add_timesheet_detail(time_sheet, args)
- time_sheet.docstatus = data.docstatus
- time_sheet.note = data.note
- time_sheet.company = frappe.db.get_single_value('Global Defaults', 'default_company')
- time_sheet.save(ignore_permissions=True)
- except OverlapError:
- time_sheet.flags.ignore_validate = True
- time_sheet.save(ignore_permissions=True)
+ if data.task:
+ company = frappe.db.get_value("Task", data.task, "company")
+ elif data.production_order:
+ company = frappe.db.get_value("Prodction Order", data.production_order, "company")
+ else:
+ company = frappe.db.get_single_value('Global Defaults', 'default_company')
+
+ time_sheet = make_timesheet(data.production_order)
+ args = get_timelog_data(data)
+ add_timesheet_detail(time_sheet, args)
+ time_sheet.docstatus = data.docstatus
+ time_sheet.note = data.note
+ time_sheet.company = company
+
+ time_sheet.set_status()
+ time_sheet.update_cost()
+ time_sheet.calculate_total_amounts()
+ time_sheet.flags.ignore_validate = True
+ time_sheet.save(ignore_permissions=True)
def get_timelog_data(data):
return {
diff --git a/erpnext/patches/v7_0/make_guardian.py b/erpnext/patches/v7_0/make_guardian.py
index f654b796f4..0839c4f624 100644
--- a/erpnext/patches/v7_0/make_guardian.py
+++ b/erpnext/patches/v7_0/make_guardian.py
@@ -2,19 +2,25 @@ from __future__ import unicode_literals
import frappe
def execute():
- if frappe.db.exists("DocType", "Student") and "father_name" in frappe.db.get_table_columns("Student"):
- frappe.reload_doc("schools", "doctype", "student")
- frappe.reload_doc("schools", "doctype", "guardian")
- frappe.reload_doc("schools", "doctype", "guardian_interest")
- frappe.reload_doc("hr", "doctype", "interest")
+ if frappe.db.exists("DocType", "Student"):
+ student_table_cols = frappe.db.get_table_columns("Student")
+ if "father_name" in student_table_cols:
+ frappe.reload_doc("schools", "doctype", "student")
+ frappe.reload_doc("schools", "doctype", "guardian")
+ frappe.reload_doc("schools", "doctype", "guardian_interest")
+ frappe.reload_doc("hr", "doctype", "interest")
+
+ fields = ["name", "father_name", "mother_name"]
+
+ if "father_email_id" in student_table_cols:
+ fields += ["father_email_id", "mother_email_id"]
- students = frappe.get_all("Student", fields=["name", "father_name", "father_email_id",
- "mother_name", "mother_email_id"])
- for stud in students:
- if stud.father_name:
- make_guardian(stud.father_name, stud.name, stud.father_email_id)
- if stud.mother_name:
- make_guardian(stud.mother_name, stud.name, stud.mother_email_id)
+ students = frappe.get_all("Student", fields)
+ for stud in students:
+ if stud.father_name:
+ make_guardian(stud.father_name, stud.name, stud.father_email_id)
+ if stud.mother_name:
+ make_guardian(stud.mother_name, stud.name, stud.mother_email_id)
def make_guardian(name, student, email=None):
frappe.get_doc({
diff --git a/erpnext/patches/v7_0/migrate_schools_to_erpnext.py b/erpnext/patches/v7_0/migrate_schools_to_erpnext.py
index 80e9eac896..f64f400feb 100644
--- a/erpnext/patches/v7_0/migrate_schools_to_erpnext.py
+++ b/erpnext/patches/v7_0/migrate_schools_to_erpnext.py
@@ -1,5 +1,6 @@
from __future__ import unicode_literals
import frappe, os
+from frappe.installer import remove_from_installed_apps
def execute():
reload_doctypes_for_schools_icons()
@@ -10,18 +11,15 @@ def execute():
if 'schools' in frappe.get_installed_apps():
frappe.db.sql("""delete from `tabDesktop Icon`""")
- if not frappe.db.exists('Module Def', 'Schools'):
- frappe.get_doc({
- 'doctype': 'Module Def',
- 'module_name': 'Schools',
- 'app_name': 'erpnext'
- }).insert()
- frappe.db.sql("""update `tabDocType` set module='Schools' where module='Academics'""")
- from frappe.installer import remove_from_installed_apps
+
+ if not frappe.db.exists('Module Def', 'Schools') and frappe.db.exists('Module Def', 'Academics'):
+ frappe.rename_doc("Module Def", "Academics", "Schools")
+
remove_from_installed_apps("schools")
def reload_doctypes_for_schools_icons():
base_path = frappe.get_app_path('erpnext', 'schools', 'doctype')
for doctype in os.listdir(base_path):
- if os.path.exists(os.path.join(base_path, doctype, doctype + '.json')):
- frappe.reload_doc('schools', 'doctype', doctype)
+ if os.path.exists(os.path.join(base_path, doctype, doctype + '.json')) \
+ and doctype not in ("fee_component", "assessment", "assessment_result"):
+ frappe.reload_doc('schools', 'doctype', doctype)
\ No newline at end of file
diff --git a/erpnext/patches/v7_0/rename_examination_to_assessment.py b/erpnext/patches/v7_0/rename_examination_to_assessment.py
index 3c79c51763..1d6e688282 100644
--- a/erpnext/patches/v7_0/rename_examination_to_assessment.py
+++ b/erpnext/patches/v7_0/rename_examination_to_assessment.py
@@ -9,7 +9,9 @@ from frappe.model.utils.rename_field import rename_field
def execute():
if frappe.db.exists("DocType", "Examination"):
frappe.rename_doc("DocType", "Examination", "Assessment")
- frappe.reload_doctype("Assessment")
+ frappe.rename_doc("DocType", "Examination Result", "Assessment Result")
+ frappe.reload_doc("schools", "doctype", "assessment")
+ frappe.reload_doc("schools", "doctype", "assessment_result")
rename_field("Assessment", "exam_name", "assessment_name")
rename_field("Assessment", "exam_code", "assessment_code")
diff --git a/erpnext/projects/doctype/timesheet/timesheet.py b/erpnext/projects/doctype/timesheet/timesheet.py
index 9140927279..0379f906de 100644
--- a/erpnext/projects/doctype/timesheet/timesheet.py
+++ b/erpnext/projects/doctype/timesheet/timesheet.py
@@ -159,8 +159,8 @@ class Timesheet(Document):
existing = self.get_overlap_for(fieldname, args, value)
if existing:
- frappe.throw(_("Row {0}: From Time and To Time overlap with existing from and to time").format(args.idx),
- OverlapError)
+ frappe.throw(_("Row {0}: From Time and To Time of {1} is overlapping with {2}")
+ .format(args.idx, self.name, existing.name), OverlapError)
def get_overlap_for(self, fieldname, args, value):
cond = "ts.`{0}`".format(fieldname)
diff --git a/erpnext/public/css/erpnext.css b/erpnext/public/css/erpnext.css
index d67f9e0731..535f83a73d 100644
--- a/erpnext/public/css/erpnext.css
+++ b/erpnext/public/css/erpnext.css
@@ -138,12 +138,14 @@
font-size: 15px;
}
.pos-payment-row .col-xs-6 {
- padding: 10px;
+ padding: 15px;
}
.pos-payment-row {
border-bottom: 1px solid #d1d8dd;
margin: 2px 0px 5px 0px;
height: 60px;
+ margin-top: 0px;
+ margin-bottom: 0px;
}
.pos-payment-row:hover,
.pos-keyboard-key:hover {
@@ -203,3 +205,8 @@ body[data-route="pos"] .modal-dialog {
.pos-invoice-list {
padding: 15px 10px;
}
+.write_off_amount,
+.change_amount {
+ margin: 15px;
+ width: 130px;
+}
diff --git a/erpnext/public/js/controllers/taxes_and_totals.js b/erpnext/public/js/controllers/taxes_and_totals.js
index 576bc7137b..c3f4b70043 100644
--- a/erpnext/public/js/controllers/taxes_and_totals.js
+++ b/erpnext/public/js/controllers/taxes_and_totals.js
@@ -615,4 +615,18 @@ erpnext.taxes_and_totals = erpnext.payments.extend({
this.frm.doc.base_change_amount = flt(this.frm.doc.change_amount * this.frm.doc.conversion_rate,
precision("base_change_amount"));
},
+
+ calculate_write_off_amount: function(){
+ if(this.frm.doc.paid_amount > this.frm.doc.grand_total){
+ this.frm.doc.write_off_amount = flt(this.frm.doc.grand_total - this.frm.doc.paid_amount + this.frm.doc.change_amount,
+ precision("write_off_amount"))
+
+ this.frm.doc.base_write_off_amount = flt(this.frm.doc.write_off_amount * this.frm.doc.conversion_rate,
+ precision("base_write_off_amount"));
+ }else{
+ this.frm.doc.paid_amount = 0.0
+ }
+
+ this.calculate_outstanding_amount(false)
+ }
})
diff --git a/erpnext/public/js/payment/payment_details.html b/erpnext/public/js/payment/payment_details.html
index 18f9d03885..596f139ea0 100644
--- a/erpnext/public/js/payment/payment_details.html
+++ b/erpnext/public/js/payment/payment_details.html
@@ -1,5 +1,5 @@
Total
Paid
Outstanding
Change
Change +
+Write off