Commit Graph

20462 Commits

Author SHA1 Message Date
Nabin Hait
ecc6b1917b Merge branch 'develop' of https://github.com/frappe/erpnext into develop 2019-11-25 18:13:58 +05:30
Nabin Hait
a7d168c05f fix: merge conflict 2019-11-25 18:12:56 +05:30
Pranav Nachnekar
d63ad3bb5f fix: add email group and newsletter links to CRM module view (#19679)
* fix: add email group and newsletter links to CRM module view

* chore: move email group to bottom
2019-11-25 16:50:47 +05:30
Nabin Hait
4d12f8acab bumped to version 12.2.0 2019-11-25 15:31:23 +05:50
Nabin Hait
c856cb85d9 log: Change log for v12.2.0 2019-11-25 15:08:47 +05:30
Nabin Hait
35e8d1e1d7
Stock acc bal sync msg (#19676)
* fix: Prefilled JV via Account Balance and Stock Value mismatch error message

- Make JV button will route to Journal Entry and add rows in child table

* fix: make journal entry to sync stock and account balance

* fix: translated action label
2019-11-25 14:02:51 +05:30
Nabin Hait
2fd6814cbf Merge branch 'marination-account_stock_sync_error' into develop 2019-11-25 12:46:45 +05:30
Nabin Hait
1ed1c4e6a4 fix: make journal entry to sync stock and account balance 2019-11-25 12:33:40 +05:30
Saqib
cd3976f7d2 Asset cancellation fix (#19671)
* fix: remove asset movement mandatory fields

* fix: label for reference doctype
2019-11-25 12:24:34 +05:30
Pranav Nachnekar
04e3a506e4 fix: Primary address not being fetched for customer (#19667)
* fix: priamry address not being fetched

* add doctype to filter for customer_primary_address

* remove get_customer_primary_address_method
2019-11-25 12:04:00 +05:30
Saqib
c9203a1bee fix: asset movement ux fixes (#19637) 2019-11-22 16:35:15 +05:30
Saqib
f37a46edea Fixed Asset Refactor Review fixes (#19665)
* fix: fixed asset item creation ux fixes

* fix: auto creation of asset ux fixes

* fix: [LCV] incorrect condition when checking assets linked with PR

* fix: bulk update assets

* refac: remove company level cwip enabling
* cwip can be enabled only on category level

* fix: #19649
2019-11-22 16:32:50 +05:30
Saqib
1919af2ff1 Fixed Asset Refactor Review fixes (#19666)
* fix: fixed asset item creation ux fixes

* fix: auto creation of asset ux fixes

* fix: [LCV] incorrect condition when checking assets linked with PR

* fix: bulk update assets

* refac: remove company level cwip enabling
* cwip can be enabled only on category level

* fix: #19649
2019-11-22 16:32:34 +05:30
Nabin Hait
aff4a67954 Merge branch 'account_stock_sync_error' of https://github.com/marination/erpnext into marination-account_stock_sync_error 2019-11-22 15:14:32 +05:30
Marica
b5c296da9e fix: Validation Error message on Prepared Report. (#19639)
Give the user the reason why he has to use filters.
2019-11-22 14:38:58 +05:30
Marica
7ca472780b fix: Get Current Stock button not working in Purchase Receipt (#19645)
- Field visible in grid view as well for better feedback
2019-11-22 14:37:38 +05:30
Anurag Mishra
763660b2e4 fix: set allocated amount in employee advance as per total amount (#19626) 2019-11-22 13:32:25 +05:30
Mangesh-Khairnar
b10526dd86 fix: consider taxes in the grand total (#19631) 2019-11-22 12:28:33 +05:30
thefalconx33
fa42999314 fix: last purchase rate greater than selling price 2019-11-22 12:15:41 +05:30
Saqib
290253fdd0 fix: last purchase rate greater than selling price (#19617) 2019-11-22 12:12:29 +05:30
Deepesh Garg
24cde55e28 fix: Patch for updating price or product discount field (#19642)
* fix: Patch for updating price or product discount field

* fix: Update pactch

* Update update_price_or_product_discount.py
2019-11-22 11:57:42 +05:30
Ben Knowles
49cd19d917 fix: update syntax error in company.js (#19661) 2019-11-22 11:36:02 +05:30
Nabin Hait
7af153da50
fix: Multiple fixes related to landed cost accounting (#19656) 2019-11-22 11:35:14 +05:30
Nabin Hait
046137caa2
fix: Multiple fixes related to landed cost accounting (#19657) 2019-11-22 11:34:50 +05:30
Saqib
150c44b350 fix: asset movement ux fixes (#19641) 2019-11-22 11:08:35 +05:30
Mangesh-Khairnar
1a92eb14ed fix: Mark attendance from employee attendance tool (#19627) 2019-11-21 17:58:18 +05:30
Rohit Waghchaure
a831848074 fix: code cleanup 2019-11-20 19:42:27 +05:30
Rohit Waghchaure
eed30c6d8c fix: not able to select item in sales order 2019-11-20 19:42:11 +05:30
Rucha Mahabal
45e9dd9c51 fix(Journal Entry): default Cash Entry account not getting fetched 2019-11-20 11:40:38 +05:30
rohitwaghchaure
26c46282e8
Merge pull request #19618 from nextchamp-saqib/pos_fix
fix: stock qty not displayed in pos
2019-11-19 19:41:25 +05:30
rohitwaghchaure
95270ad14b
Merge pull request #19619 from rohitwaghchaure/not_able_to_select_item_in_the_sales_order
fix: not able to select item in sales order
2019-11-19 19:40:11 +05:30
Rohit Waghchaure
248585b5a1 fix: code cleanup 2019-11-19 19:21:27 +05:30
Rohit Waghchaure
c42312ea12 fix: not able to select item in sales order 2019-11-19 19:06:51 +05:30
rohitwaghchaure
a85ddf2fb4 fix: performance issue of sales invoice while save/submit (#19598)
* fix: performace issue of sales invoice while save/submit

* Cached price list data, item group child data, added indexing for blanket order
2019-11-19 18:47:48 +05:30
Nabin Hait
9db9edca2c fix(expense claim): fetch outstanding documents based on party account type 2019-11-19 18:44:54 +05:30
rohitwaghchaure
238521c2bd
Merge pull request #19501 from Mangesh-Khairnar/multiple-pos-profile
feat: multiple company pos profile
2019-11-19 18:39:06 +05:30
thefalconx33
353f73a153 fix: stock qty not displayed in pos 2019-11-19 18:37:21 +05:30
Mangesh-Khairnar
c436d93303 fix: reset pos profile when default doesn't exists 2019-11-19 18:21:53 +05:30
Mangesh-Khairnar
3f854fce2e feat: fetch leave approver from both employee and department approvers (#19613)
* fix: fetch leave approvers from both department and employee master

* fix: creaate a set of approvers
2019-11-19 15:07:30 +05:30
RJPvT
a998978415 fix: pending on review date (#19609)
* fix: On Specific case if no item code in name

* fix: pending on review date
2019-11-19 14:54:38 +05:30
Joseph Marie Alba
2578d49b84 Correct bug in abbr cause by missing " " separator (#19605)
Only 1 letter ABBR is generated after typing in a COMPANY NAME separated by spaces. This is due to missing " " value in split method.

For example: 

Company Name:    ABC Multiple Industries
Generates Abbr:     A
Correct Abbr should be:  AMI

This is caused by mission " " in split method.
2019-11-19 14:54:09 +05:30
Shivam Mishra
776ff2f75d fix: query for item group listing (#19604) 2019-11-19 14:51:25 +05:30
Mangesh-Khairnar
f3ecfd8e58 fix: fetch leave approvers from both department and employee master (#19611)
* fix: fetch leave approvers from both department and employee master

* fix: creaate a set of approvers
2019-11-19 14:50:05 +05:30
Deepesh Garg
ee69f707a9
Merge pull request #19600 from rohitwaghchaure/make_email_queue_issue_in_pos
fix: 'NoneType' object has no attribute 'replace' in POS
2019-11-19 09:47:55 +05:30
rohitwaghchaure
8131f7657e
Merge pull request #19601 from rohitwaghchaure/fix_set_query_not_working_for_department_field
fix: not able to select department in instructor form
2019-11-18 16:40:42 +05:30
marination
6ef057a2a3 fix: Prefilled JV via Account Balance and Stock Value mismatch error message
- Make JV button will route to Journal Entry and add rows in child table
2019-11-18 15:55:32 +05:30
Rohit Waghchaure
39eeac265b fix: not able to select department in instructor form 2019-11-18 15:20:15 +05:30
Rohit Waghchaure
466702200f fix: 'NoneType' object has no attribute 'replace' in POS 2019-11-18 14:57:55 +05:30
Deepesh Garg
87c6718d90 fix: Book valuation expense in specified account rather than expense included in valuation account (#19590)
* fix: Book valuation expense in specified accout rather than expense included in valuation account

* fix: Remove undefined variable

* fix: Test cases

* fix: Test Case
2019-11-18 12:34:30 +05:30
Saqib
d995609ffa Fixed asset refactor (#19369)
* refactor: Asset Movement with multiple assets using table

* refactor: Create Asset Movement from Asset List & Linking PR/PI with Asset

* feat: Auto create asset on Purchase checkbox

* refactor: LCV for asset created via PR/PI

* refactor: get asset category accounts from item master

* refactor: Purchase Receipt for asset purchasing

* refactor: Purchase Invoice for asset purchasing

* fix: post-refactor delete fixes

* refactor: moved asset validation from pr/pi on asset submission

* fix: Asset Category should be defined for auto purchasing assets

* fix: undo serial_no_update removal (for non asset item) from LCV

* fix: remove duplicate calls from item.js

* fix: args position of all occurrence of get_asset_category_account()

* fix: test cases

* fix: landed cost voucher validations

* refactor: test case for auto creation of asset

* fix: removed invalid assertions

* fix: patch errors on travis

* fix: codacy fixes

* fix: PI Items not fetching details from item

* fix: asset movement from list view having default purpose 'Receipt'

* chore: msgprint for selecting item code first while creating asset manually

* fix: alert messages

* minor: asset movement fixes

* fix: lcv was made against submitted assets

* minor: ux fixes

* refac: move specific asset validation to SINV

* chore: remove make_purchase_invoice from asset form
* make asset movement on asset submission
* add PR & PI queries based on item code

* refac: not allow last movement cancellation
* move asset movement creation on asset submission
* asset movement naming series
* add tests

* fix: code review changes

* chore: remove unecessary asset movement updation

* refac: setting latest location while making asset movements
* Added extra validations

* fix: form dashboard make lcv button

* fix: auto asset movement creation validation

* fix: allow lcv against other items after removing submitted assets

* chore: remove unwanted condition

* fix: mismatch debit credit on  purchase of asset with valuation tax

* chore: toggle required field based on movement type

* chore: fix lcv error message

* fix: travis failing

* fix: travis failing test

* fix: wrong conditions after merge

* fix: cannot cancel assets

* fix: travis failing* fix change in deletion of assets

* fix: codacy

* fix: process cancellation of assets

* refac: cancellation of pr only deletes auto created assets

* fix: incorrect query
2019-11-18 11:46:55 +05:30