diff --git a/erpnext/__version__.py b/erpnext/__version__.py index 087dba99935..f1b43eee249 100644 --- a/erpnext/__version__.py +++ b/erpnext/__version__.py @@ -1,2 +1,2 @@ from __future__ import unicode_literals -__version__ = '6.21.2' +__version__ = '6.21.3' diff --git a/erpnext/accounts/doctype/payment_request/test_payment_request.py b/erpnext/accounts/doctype/payment_request/test_payment_request.py index a1e975a984f..49c604a8c2b 100644 --- a/erpnext/accounts/doctype/payment_request/test_payment_request.py +++ b/erpnext/accounts/doctype/payment_request/test_payment_request.py @@ -28,7 +28,7 @@ payment_method = [ { "doctype": "Payment Gateway Account", "gateway": "_Test Gateway", - "payment_account": "_Test Bank - _TC", + "payment_account": "_Test Bank USD - _TC", "currency": "USD" } ] diff --git a/erpnext/docs/assets/img/articles/Screen Shot 2015-04-02 at 3.58.19 pm.png b/erpnext/docs/assets/img/articles/Screen Shot 2015-04-02 at 3.58.19 pm.png deleted file mode 100644 index bcb05a3c0a7..00000000000 Binary files a/erpnext/docs/assets/img/articles/Screen Shot 2015-04-02 at 3.58.19 pm.png and /dev/null differ diff --git a/erpnext/docs/assets/img/articles/delete-company.png b/erpnext/docs/assets/img/articles/delete-company.png deleted file mode 100644 index 17c3bb49268..00000000000 Binary files a/erpnext/docs/assets/img/articles/delete-company.png and /dev/null differ diff --git a/erpnext/docs/assets/img/articles/delete-transactions.gif b/erpnext/docs/assets/img/articles/delete-transactions.gif new file mode 100644 index 00000000000..d564024929d Binary files /dev/null and b/erpnext/docs/assets/img/articles/delete-transactions.gif differ diff --git a/erpnext/docs/assets/img/articles/manufacturing-settings-2.png b/erpnext/docs/assets/img/articles/manufacturing-settings-2.png new file mode 100644 index 00000000000..78fbefc4a79 Binary files /dev/null and b/erpnext/docs/assets/img/articles/manufacturing-settings-2.png differ diff --git a/erpnext/docs/assets/img/articles/manufacturing-settings-3.png b/erpnext/docs/assets/img/articles/manufacturing-settings-3.png new file mode 100644 index 00000000000..328541f0ba9 Binary files /dev/null and b/erpnext/docs/assets/img/articles/manufacturing-settings-3.png differ diff --git a/erpnext/docs/assets/img/articles/manufacturing-settings-4.png b/erpnext/docs/assets/img/articles/manufacturing-settings-4.png new file mode 100644 index 00000000000..c90884d2671 Binary files /dev/null and b/erpnext/docs/assets/img/articles/manufacturing-settings-4.png differ diff --git a/erpnext/docs/assets/img/articles/nested-bom-1.png b/erpnext/docs/assets/img/articles/nested-bom-1.png new file mode 100644 index 00000000000..bbd9f2af680 Binary files /dev/null and b/erpnext/docs/assets/img/articles/nested-bom-1.png differ diff --git a/erpnext/docs/assets/img/articles/use-multi-level-bom.png b/erpnext/docs/assets/img/articles/use-multi-level-bom.png new file mode 100644 index 00000000000..5c5a85dae47 Binary files /dev/null and b/erpnext/docs/assets/img/articles/use-multi-level-bom.png differ diff --git a/erpnext/docs/assets/img/articles/valuation-based-on-1.png b/erpnext/docs/assets/img/articles/valuation-based-on-1.png new file mode 100644 index 00000000000..02090e4073b Binary files /dev/null and b/erpnext/docs/assets/img/articles/valuation-based-on-1.png differ diff --git a/erpnext/docs/assets/img/manufacturing/manufacturing-settings-1.png b/erpnext/docs/assets/img/manufacturing/manufacturing-settings-1.png new file mode 100644 index 00000000000..320dffdd218 Binary files /dev/null and b/erpnext/docs/assets/img/manufacturing/manufacturing-settings-1.png differ diff --git a/erpnext/docs/assets/img/manufacturing/manufacturing-settings.png b/erpnext/docs/assets/img/manufacturing/manufacturing-settings.png deleted file mode 100644 index 18b28dd7e87..00000000000 Binary files a/erpnext/docs/assets/img/manufacturing/manufacturing-settings.png and /dev/null differ diff --git a/erpnext/docs/user/manual/en/human-resources/expense-claim.md b/erpnext/docs/user/manual/en/human-resources/expense-claim.md index 187bf494efb..da3b2eedffd 100644 --- a/erpnext/docs/user/manual/en/human-resources/expense-claim.md +++ b/erpnext/docs/user/manual/en/human-resources/expense-claim.md @@ -1,6 +1,4 @@ -Expense Claim is made when Employee’s make expenses out of their pocket on -behalf of the company. For example, if they take a customer out for lunch, -they can make a request for reimbursement via the Expense Claim form. +Expense Claim is made when Employee’s make expenses out of their pocket on behalf of the company. For example, if they take a customer out for lunch, they can make a request for reimbursement via the Expense Claim form. To make a new Expense Claim, go to: @@ -13,16 +11,12 @@ Set the Employee ID, date and the list of expenses that are to be claimed and ### Approving Expenses -The person making the claim must also set the id of the user who will -“Approve” these expenses and set the “Assign To” to notify the user of the -request Approve. +Approver for the Expense Claim is selected by an Employee himself. Users to whom `Expense Approver` role is assigned will shown in the Expense Claim Approver field. -If the Approver sees the “form”, she or he can update the “Approved Amounts” -and click on “Approve”. To cancel the claim, they can click on the “Reject” -button. +After saving Expense Claim, Employee should [Assign document to Approver]({{docs_base_url}}/user/manual/en/using-eprnext/assignment.html). On assignment, approving user will also receive email notification. To automate email notification, you can also setup [Email Alert]({{docs_base_url}}/user/manual/en/setting-up/email/email-alerts.html). -Comments can be added in the Comments section explaining why the claim was -approved or rejected. +Expense Claim Approver can update the “Sanctioned Amounts” against Claimed Amount of an Employee. If submitting, Approval Status should be submitted to Approved or Rejected. If Approved, then Expense Claim gets submitted. If rejected, then Expen +Comments can be added in the Comments section explaining why the claim was approved or rejected. ### Booking the Expense and Reimbursement diff --git a/erpnext/docs/user/manual/en/manufacturing/articles/index.txt b/erpnext/docs/user/manual/en/manufacturing/articles/index.txt index 59f35039b4d..bb78d39731f 100644 --- a/erpnext/docs/user/manual/en/manufacturing/articles/index.txt +++ b/erpnext/docs/user/manual/en/manufacturing/articles/index.txt @@ -1,4 +1,3 @@ nested-bom-structure -partial-production-entry production-planning-subassembly valuation-based-on-field-in-bom \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/manufacturing/articles/nested-bom-structure.md b/erpnext/docs/user/manual/en/manufacturing/articles/nested-bom-structure.md index 266ae12bee9..3f507afd35a 100644 --- a/erpnext/docs/user/manual/en/manufacturing/articles/nested-bom-structure.md +++ b/erpnext/docs/user/manual/en/manufacturing/articles/nested-bom-structure.md @@ -1,30 +1,34 @@ -

Nested BOM Structure

+#Nested BOM Structure **Question:** Our manufacturing process involves producing sub-assembly items before final product. How should we manage BOM master in this scenario? -**Answer:** You should create BOM for item in the order of their production. Let's consider an example to understand this better. +**Answer:** You should create BOM for item in the order of their production. BOM for the sub-assembly item should be created first. BOM for the Product Order item should be created last. Let's consider an example to understand this better. -If Computer manufacturer assembles Hard Disk and DVD Drive (sub-assemblies) themselves, they should first create BOM for Hard Disk and DVD Drive. After that BOM for Computer will be created, which is finished and saleable item. BOM of computer will have  -Hard Disk and DVD Drive (sub-assemblies) will be selected as raw-material items in it. BOM ID will be fetched for the respective sub-assembly item. +A computer assembler is creating a BOM for PC. They also manufacture Hard Disk and DVD Drive themselve. They should first create BOM for Hard Disk and DVD Drive. After that BOM for the PC should be created. + +BOM of PC will have all the raw-material items selected in it. Hard Disk and DVD Drive (sub-assemblies) will also be selected as raw-material items. For the sib-assembly items, respective BOM no. will be fetched as well. +Nested BOM - +Following is how the structure of nested BOM will look: + +
+ +-Personal Computer (FG Item)
+---- Mother Board
+---- SMTP
+---- Accessories and wires
+----Hard Disk (sub-assembly)
+ ------- Item A
+ ------- Item B
+ ------- Item C
+----DVD Drive (sub-assembly)
+ ------- Item X
+ ------- Item Y
+ ------- Item Z + +
-
Following is how the structure of nested BOM will look: -
-
Computer (FG Item) -
--- Mother Board -
--- SMTP -
--- Accessories and wires -
--- Hard Disk (sub-assembly) -
      ------ Item A -
      ------ Item B -
      ------ Item C -
--- DVD Drive (sub-assembly) -
      ------ Item X -
      ------ Item Y -
      ------ Item Z -
\ No newline at end of file diff --git a/erpnext/docs/user/manual/en/manufacturing/articles/partial-production-entry.md b/erpnext/docs/user/manual/en/manufacturing/articles/partial-production-entry.md deleted file mode 100644 index e2a702ebc9e..00000000000 --- a/erpnext/docs/user/manual/en/manufacturing/articles/partial-production-entry.md +++ /dev/null @@ -1,25 +0,0 @@ -

Partial Production Entry

- -If you completed production for few items, then you can make Partial Production Entry for that items in system. For example, your production order is for 15 quantity and you completed production for 10 quantity only. Then you can make production entry for 5 quantity. Following are step to make Partial Production Entry - -#### 1. Stock Entry - -Click on Update Finish Goods button from submitted Product Order, You will land on new Stock entry form. - -#### 2. Edit Manufacturing Quantity - -In the Update Finished Goods entry, check "From Bill of Material section", and edit Manufacturing Quantity to actual quantity produced. Production Order quantity will be fetched as Manufacturing Quantity by default. - -#### 3. Update Qty of Items - -Click on **Get Items**. With this, quantity will be updated for both raw-material as well as finish good item. - -![FGE STE]({{docs_base_url}}/assets/img/articles/Selection_078.png) - -#### 4. Save and Submit - -After updating quantity in stock entry form, save and submit the stock entry. On submit stock will update for quantity entered in this stock entry. - -When will you create another finish goods entry against this Production Order, system will only fetch pending quantity to be produced. - - \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/manufacturing/articles/production-planning-subassembly.html b/erpnext/docs/user/manual/en/manufacturing/articles/production-planning-subassembly.html deleted file mode 100644 index 556875042e3..00000000000 --- a/erpnext/docs/user/manual/en/manufacturing/articles/production-planning-subassembly.html +++ /dev/null @@ -1,8 +0,0 @@ -

Production Planning & Subassembly

- -if you need Production Planning Tool to consider raw-materials required for the manufacturing of sub-assembly items selected in the BOM, please check following instructions to achieve the same.

Production Planning Tool has field called "Use Multi-Level BOM", checking which will consider raw-material of sub-assemblies as well in the material planning. If this field is not checked, then it will consider sub-assembly as an item, and won't consider raw-material required for the manufacturing of that sub-assembly.



You will find same field in the Production Order and Stock Entry as well.

This feature is very useful for the companies who create BOM for the - sub-assemblies, but Production Order is created only for the finished -item. They do not create separate Production Order for the -sub-assemblies, but raw-materials as listed in the BOM of sub-assembly -items are consumed in the production process, and not sub-assembly item -directly.
\ No newline at end of file diff --git a/erpnext/docs/user/manual/en/manufacturing/articles/production-planning-subassembly.md b/erpnext/docs/user/manual/en/manufacturing/articles/production-planning-subassembly.md index 0cf61256015..c17b923ceb8 100644 --- a/erpnext/docs/user/manual/en/manufacturing/articles/production-planning-subassembly.md +++ b/erpnext/docs/user/manual/en/manufacturing/articles/production-planning-subassembly.md @@ -6,4 +6,4 @@ Production Planning Tool has field called "Use Multi-Level BOM", checking which -You will find same field in the Production Order and Stock Entry as well.This feature is very useful for the companies who create BOM for the sub-assemblies, but Production Order is created only for the finished item. They do not create separate Production Order for the sub-assemblies, but raw-materials as listed in the BOM of sub-assembly items are consumed in the production process, and not sub-assembly item directly. \ No newline at end of file +`Use Multi-Level BOM` field is also there in the Production Order and Stock Entry. If checked, raw-materials of sub-assembly item will be consumed in the manufacturing process, and not the sub-assembly item itself. diff --git a/erpnext/docs/user/manual/en/manufacturing/articles/valuation-based-on-field-in-bom.html b/erpnext/docs/user/manual/en/manufacturing/articles/valuation-based-on-field-in-bom.html deleted file mode 100644 index 4460ce0234f..00000000000 --- a/erpnext/docs/user/manual/en/manufacturing/articles/valuation-based-on-field-in-bom.html +++ /dev/null @@ -1,10 +0,0 @@ -

'Valuation Based On' Field in BOM

- -
Question: What do the various options in Valuation Based On Field in Bill Of Materials (BOM) Form mean?

Answer: There are 3 available options in the Valuation Based On field;




\ No newline at end of file diff --git a/erpnext/docs/user/manual/en/manufacturing/articles/valuation-based-on-field-in-bom.md b/erpnext/docs/user/manual/en/manufacturing/articles/valuation-based-on-field-in-bom.md index d743fb6456c..29803ee363f 100644 --- a/erpnext/docs/user/manual/en/manufacturing/articles/valuation-based-on-field-in-bom.md +++ b/erpnext/docs/user/manual/en/manufacturing/articles/valuation-based-on-field-in-bom.md @@ -1,17 +1,16 @@ -#Valuation Based On' Field in BOM +#Valuation Based On in BOM -**Question:** What do the various options in Valuation Based On Field in Bill Of Materials (BOM) Form mean? +**Question:** What are for various options in `Valuation Based On` in the Bill Of Materials (BOM)? -**Answer:** There are 3 available options in the Valuation Based On field; +**Answer:** There are 3 available options in the Valuation Based On field: - +Nested BOM -Valuation Rate: Item valuation rate is defined based on it's purchase/manufacture value + other charges. +**Valuation Rate:** Item valuation rate is defined based on it's purchase or manufacture value. For Purchase Item, it is defined based on charges entered in the Purchase Receipt. If you don't have any Purchase Receipt - made for an item or a Stock Reconciliation, then you won't have -Valuation Rate for that item. +made for an item or a Stock Reconciliation, then there won't be any Valuation Rate for that item. -Price List Rate: Just like you pull item prices in sales and purchase transaction, it can be pulled in BOM via Price List Rate. +**Price List Rate:** This option allows to pull item rates from [Price List.]({{docs_base_url}}/user/manual/en/stock/item/item-price.html) -Last Purchase Rate: It will be the last Purchase Rate value of an item. This value is updated in the item master as well, based on rate in the Purchase Order for this item. \ No newline at end of file +**Last Purchase Rate:** It will be the last Purchase (Order) Rate of an item. \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/manufacturing/setup/manufacturing-settings.md b/erpnext/docs/user/manual/en/manufacturing/setup/manufacturing-settings.md index dc59689f472..9506d5cb1d1 100644 --- a/erpnext/docs/user/manual/en/manufacturing/setup/manufacturing-settings.md +++ b/erpnext/docs/user/manual/en/manufacturing/setup/manufacturing-settings.md @@ -1,15 +1,53 @@ -* Manufacturing Settings can be found at +#Manufacturing Settings -> Manufacturing > Production Order > Setup > Manufacturing Settings +Manufacturing Settings can be found at: -Manufacturing Settings +`Manufacturing > Setup > Manufacturing Settings` -* Allow Overtime - Specify if workstations are to allow overtime.(schedule operations outside working hours) +Manufacturing Settings -* Allow Production on Holidays - Specify if system is to allow scheduling of operations on Holidays. +####Disable Capacity Planning and Time Tracking -* Capacity Planning for (Days) - Specify no. of Days for Capacity Planning. +As per Capacity Planning feature, when Production Order is created for an item, for each Operation, Time Log is created. Based on actual Operation Time, Time Logs is updated. This also provides total Operations Cost against Production Order. -* Time Between Operations (in mins) - Specify the gap between two Production Operations. +If you don't track actual operations time, and want to disable creation of Time Log based on Operations, you should check "Disable Capacity Planning and Time Tracking" in the Manufacturing Settings. -{next} \ No newline at end of file +####Allow Overtime + +In the Workstation master, actual working hours are defined (say 101m to 6pm). As per the Capacity Planning, Time Logs are created against Workstation, for tracking actual operations hour. It also considers working hours of a Workstation when scheduling job (via Time Log). + +Manufacturing Settings + +As per the standard validation, if Operation cannot be completed within working hours of Workstation, then user is asked to divide an Operation into multiple and smaller Operations. However, if `Allow Overtime` field is checked, while creating Time Logs for Operation, working hours of Workstation will not be validated. In this case, Time Logs for Operation will be created beyond working hours of Workstation as well. + +####Allow Production on Holidays + +Holiday of a company can be recorded in the [Holiday List]({{docs_base_url}}/user/manual/en/human-resources/) master. While scheduling production job on workstation, system doesn't consider a day listed in the Holiday list. If you want production job to be scheduled on holidays as well, `Allow Production on Holidays` field should be checked. + +Manufacturing Settings + +####Over Production Allowance Percentage + +In Production Order, `Qty to Manufacture` is set. When creating Manufacture entry against Production Order, it validates `Qty to Manufature` entered in production order, and doesn't allow creating Manufacture Entry for more qty and Production Order qty. If you want to create Manufacture Qty than Production Order qty, mention Over Production Allowance Qty in the Manufacturing Settings. Based on Allowance Percentage mentioned, you will be able to create Manufacture Entry for more Qty than in Production Order. + +####Back-flush Raw Materials Based On + +When creating Manufacture Entry, raw-material items are back-flush based on BOM of production item. If you want raw-material items to be back-flushed based on Material Transfer entry made against that Production Order instead, then you should set Back-flush Raw Materials Based On "Material Transferred for Manufacture". + +Manufacturing Settings + +####Capacity Planning For (Days) + +Define no. of days for which system will do production job allocation in advance. + +####Time Between Operations (in mins) + +Time gap between two production operations. + +####Default Work In Progress Warehouse + +This Warehouse will be auto-updated in the Work In Progress Warehouse field of Production Order. + +####Default Finished Goods Warehouse + +This Warehouse will be auto-updated in the Work In Progress Warehouse field of Production Order. \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/setting-up/articles/delete-a-company-and-all-related-transactions.md b/erpnext/docs/user/manual/en/setting-up/articles/delete-a-company-and-all-related-transactions.md index 45c276715f1..fa7614f4915 100644 --- a/erpnext/docs/user/manual/en/setting-up/articles/delete-a-company-and-all-related-transactions.md +++ b/erpnext/docs/user/manual/en/setting-up/articles/delete-a-company-and-all-related-transactions.md @@ -12,7 +12,7 @@ In Company master, click on the **Delete Company Transactions** button right at This action will wipe out all the data related to that company like Quotation, Invoices, Purchase Orders etc. So be careful -Delete Transactions +Delete Transactions **Note:** If you want to delete the company record itself, use the normal "Delete" button from Menu options. It will also delete Chart of Accounts, Chart of Cost Centers and Warehouse records for that company. diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/adding-attachments-to-outgoing-messages.md b/erpnext/docs/user/manual/en/using-erpnext/articles/adding-attachments-to-outgoing-messages.md index 91f79504146..39fe6d191b7 100644 --- a/erpnext/docs/user/manual/en/using-erpnext/articles/adding-attachments-to-outgoing-messages.md +++ b/erpnext/docs/user/manual/en/using-erpnext/articles/adding-attachments-to-outgoing-messages.md @@ -1,4 +1,4 @@ -

Adding Attachments to Outgoing Messages

+#Adding Attachments to Outgoing Messages ERPNext has in-built file manage system. Click [here](https://erpnext.com/kb/tools/managing-attachments) to learn more on how attachments are managed in ERPNext. diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/check-link-between-documents.md b/erpnext/docs/user/manual/en/using-erpnext/articles/check-link-between-documents.md index 27ad6503e81..92d554733cd 100644 --- a/erpnext/docs/user/manual/en/using-erpnext/articles/check-link-between-documents.md +++ b/erpnext/docs/user/manual/en/using-erpnext/articles/check-link-between-documents.md @@ -1,4 +1,4 @@ -

Checking Link Between Documents

+#Checking Link Between Documents Linked With function in ERPNext allows you checking a document is linked with which other documents. You will find Linked With function in the every document. diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/delete-submitted-document.md b/erpnext/docs/user/manual/en/using-erpnext/articles/delete-submitted-document.md index dad85ad2dba..1af8f86447b 100644 --- a/erpnext/docs/user/manual/en/using-erpnext/articles/delete-submitted-document.md +++ b/erpnext/docs/user/manual/en/using-erpnext/articles/delete-submitted-document.md @@ -1,4 +1,4 @@ -

Delete Submitted Document

+#Delete Submitted Document ERPNext allows you to assign deletion permission exclusively to User. Only those users will be able to delete records. Click [here](/user-guide/setting-up/permissions/role-based-permissions) to learn more about permissions. diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/duplicate-record.md b/erpnext/docs/user/manual/en/using-erpnext/articles/duplicate-record.md index 2a1c0b48dec..0f4e7408db3 100644 --- a/erpnext/docs/user/manual/en/using-erpnext/articles/duplicate-record.md +++ b/erpnext/docs/user/manual/en/using-erpnext/articles/duplicate-record.md @@ -1,4 +1,4 @@ -

Duplicate a Record

+#Duplicate a Record ERPNext allows you to duplicate existing record. With this, you get values of existing record into new form, and create entries faster. diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/managing-attachments.md b/erpnext/docs/user/manual/en/using-erpnext/articles/managing-attachments.md index e7420b7bf07..79a11055a86 100644 --- a/erpnext/docs/user/manual/en/using-erpnext/articles/managing-attachments.md +++ b/erpnext/docs/user/manual/en/using-erpnext/articles/managing-attachments.md @@ -1,4 +1,4 @@ -

Adding Attachments in a Documents

+#Adding Attachments in a Documents ERPNext allows to attach files with documents like Order, Invoices, Items etc. User with a read permission on particular document will also be able to access files attached with it. For example, Sales Order can have text file attached detailing item description and specification as decided with customers. Also it can be image file of drawing as per which product is to be manufactured. diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/merging-documents.md b/erpnext/docs/user/manual/en/using-erpnext/articles/merging-documents.md index 08a262037d8..d4518ea9ad7 100644 --- a/erpnext/docs/user/manual/en/using-erpnext/articles/merging-documents.md +++ b/erpnext/docs/user/manual/en/using-erpnext/articles/merging-documents.md @@ -1,4 +1,4 @@ -

Merging Documents

+#Merging Documents Document merging feature is available in ERPNext. You can done this via 'Rename' feature in ERPNext. diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/rename-tool.md b/erpnext/docs/user/manual/en/using-erpnext/articles/rename-tool.md index 3bae21d7681..72e8b4ff451 100644 --- a/erpnext/docs/user/manual/en/using-erpnext/articles/rename-tool.md +++ b/erpnext/docs/user/manual/en/using-erpnext/articles/rename-tool.md @@ -1,4 +1,4 @@ -

Rename Tool

+#Rename Tool ERPNext has Renaming Tool which allows you to rectify/change record id for existing records. This facility can be only performed by User with System Manager's role. diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/renaming-documents.md b/erpnext/docs/user/manual/en/using-erpnext/articles/renaming-documents.md index 064f41d1b90..da1945f22d7 100644 --- a/erpnext/docs/user/manual/en/using-erpnext/articles/renaming-documents.md +++ b/erpnext/docs/user/manual/en/using-erpnext/articles/renaming-documents.md @@ -1,4 +1,4 @@ -

Renaming Documents

+#Renaming Documents ERPNext has Renaming feature which allows you to correct primary id of a record. diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/search-filters.md b/erpnext/docs/user/manual/en/using-erpnext/articles/search-filters.md index 0853ab1de7f..73dbcfb1348 100644 --- a/erpnext/docs/user/manual/en/using-erpnext/articles/search-filters.md +++ b/erpnext/docs/user/manual/en/using-erpnext/articles/search-filters.md @@ -1,4 +1,4 @@ -

Search Filters

+#Search Filters Search Filter option allows user to filter records based on value in the specific fields of that form. diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/tree-master-renaming.md b/erpnext/docs/user/manual/en/using-erpnext/articles/tree-master-renaming.md index 30aa979dd55..af812c36274 100644 --- a/erpnext/docs/user/manual/en/using-erpnext/articles/tree-master-renaming.md +++ b/erpnext/docs/user/manual/en/using-erpnext/articles/tree-master-renaming.md @@ -1,4 +1,4 @@ -

Tree Master Renaming

+#Tree Master Renaming There are various master which are maintained in tree structure. Click [here](https://erpnext.com/kb/setup/managing-tree-structure-masters) to learn more about tree structured masters in ERPNext. diff --git a/erpnext/hooks.py b/erpnext/hooks.py index 40b6903254b..c63afc56044 100644 --- a/erpnext/hooks.py +++ b/erpnext/hooks.py @@ -7,7 +7,7 @@ app_publisher = "Frappe Technologies Pvt. Ltd." app_description = """ERP made simple""" app_icon = "icon-th" app_color = "#e74c3c" -app_version = "6.21.2" +app_version = "6.21.3" app_email = "info@erpnext.com" app_license = "GNU General Public License (v3)" source_link = "https://github.com/frappe/erpnext" diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js index 6f36bdb8221..b6698df0b8b 100644 --- a/erpnext/public/js/controllers/transaction.js +++ b/erpnext/public/js/controllers/transaction.js @@ -280,14 +280,15 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({ var party_type = "Supplier"; var party_account_field = 'credit_to'; } - - if(me.frm.doc[frappe.model.scrub(party_type)]) { + + var party = me.frm.doc[frappe.model.scrub(party_type)]; + if(party) { return frappe.call({ method: "erpnext.accounts.party.get_party_account", args: { company: me.frm.doc.company, party_type: party_type, - party: me.frm.doc[frappe.model.scrub(party_type)] + party: party }, callback: function(r) { if(!r.exc && r.message) { @@ -296,6 +297,8 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({ } } }); + } else { + set_pricing(); } } else { set_pricing(); diff --git a/setup.py b/setup.py index f23c56540a8..5d3967694c4 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,7 @@ from setuptools import setup, find_packages from pip.req import parse_requirements -version = "6.21.2" +version = "6.21.3" requirements = parse_requirements("requirements.txt", session="") setup(