nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-01 07:37:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
39,488 Commits 621 Branches 1,804 Tags
ad0d865ccc7d97eea27566044655795eb361f8e7
Commit Graph

29865 Commits

Author SHA1 Message Date
marination
ad0d865ccc chore: Remove commented out code 
(cherry picked from commit 29c576e144)
(cherry picked from commit de834a8362)
 2022-02-16 08:33:44 +00:00
marination
abd5d3caea chore: Fix flaky test test_exact_match_with_price 
- Clear cart settings in cache to avoid stale values

(cherry picked from commit 4f5a0b8941)
(cherry picked from commit b75e982286)
 2022-02-16 08:33:44 +00:00
marination
2bcc77583a fix: Trim spaces from attributes (multi-variant creation) & explicit method for building cache 
- Multiple Item Variants creation fails due to extra spaces in attributes from popup. Clean them before passing to server side
- Mention explicit method to build variants cache to avoid ambiguity between old method path (pre-refactor)

(cherry picked from commit a64228741d)
(cherry picked from commit ca8986028d)
 2022-02-16 08:33:43 +00:00
marination
585b760144 perf: Weed out disabled variants via sql query instead of pythonic looping separately 
- If the number of variants are large (almost 2lakhs), the query to get variants and attribute data takes time
- If the no.of disabled attributes is large as well, the list comprehension weeding out disabled variants takes forever
- We dont need to loop over the variants data so many times
- Avoid any `if a in list(b)` is best when the iterables have tremendous data

(cherry picked from commit 26bd3053d1)
(cherry picked from commit 251656ab52)
 2022-02-16 08:33:43 +00:00
rohitwaghchaure
c843b0b210 Merge pull request #29809 from rohitwaghchaure/merge-branch-hotfix-to-pre-release-for-13-21 
chore: Merge branch 'version-13-hotfix' into 'version-13-pre-release'
 2022-02-15 17:54:17 +05:30
mergify[bot]
20ba40066a fix: dont attempt to set batch number if item doesn't have batch no (#29812) (#29814) 
This causes other triggers and unnecessary changes (e.g. price list)

(cherry picked from commit f89a64db48)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-02-15 16:12:17 +05:30
Deepesh Garg
335e80f787 Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into merge-branch-hotfix-to-pre-release-for-13-21 2022-02-15 15:56:33 +05:30
Deepesh Garg
038d729462 fix: Filter out bank payment entries 
(cherry picked from commit 04cbde2e52)
 2022-02-15 10:10:29 +00:00
Deepesh Garg
ea3acb09be fix: Fixes in TDS payable monthly report 
(cherry picked from commit 2ff6b3560e)
 2022-02-15 10:10:28 +00:00
Rohit Waghchaure
01356031bb chore: Merge branch 'version-13-hotfix' into 'version-13-pre-release' 2022-02-15 15:14:10 +05:30
Sagar Sharma
83ab63ba81 chore: warning for Amazon MWS integration deprecation (#29792) 
* chore: warning for amazon mws integration deprecation

* style: spaces to tabs

[skip ci]
 2022-02-15 11:37:29 +05:30
Saqib Ansari
5d608edc54 fix: disable rounded total in opening invoice creation tool 
(cherry picked from commit 18d0a59a9d)
 2022-02-15 05:09:01 +00:00
Marica
93cde7e5ff Merge pull request #29794 from frappe/mergify/bp/version-13-hotfix/pr-29705 
fix: Set Pending Qty in Prod Plan after updating Work Order (backport #29705)
 2022-02-14 23:39:26 +05:30
marination
e9ef1cbd3d test: Cover back to back recos from different warehouses 
(cherry picked from commit f221a0d253)
 2022-02-14 17:35:38 +00:00
marination
3d45ea0c1f fix: Generate Wh wise FIFO Queue and later aggregate if required 
- Back to back stock recos cause incorrect qty calculation across warehouses
- Hard to differentiate how much of the qty is reset by the reco
- Maintain Queue and balances warehouse wise and later aggregate for accurate values

(cherry picked from commit f62b3207ff)
 2022-02-14 17:35:37 +00:00
marination
698f910a30 fix: Server Tests and sider 
(cherry picked from commit e46a1bc80f)
 2022-02-14 17:32:59 +00:00
marination
1df4e2c44a test: Production Plan Pending Qty impact tests 
- Two tests to check impact on pending qty: From SO and independent Prod Plan
- Added docstring to each test case for brief summary
- Changed helper function args to fallback to 0 instead of 1 if no arg is passed
- Removed unnecessary `get_doc()`
- Made helper function actions optional depending on args passed

(cherry picked from commit 86ca41b14a)
 2022-02-14 17:32:59 +00:00
marination
6800c3efae fix: Initialise pending qty as planned qty for independent item rows in Prod Plan 
- Rows that are not fetched from MR or SO, had pending qty 0 throughout
- Initialise pending qty on save only.
- After submit this field will be updated by work order/stock entry
- Bring functions in `validate()` closer to the top

(cherry picked from commit eaccef6116)
 2022-02-14 17:32:58 +00:00
marination
c7b9df5aee fix: Set Pending Qty in Prod Plan after updating Work Order 
(cherry picked from commit 7116d7ae0e)
 2022-02-14 17:32:58 +00:00
Sagar Sharma
7fa46f77e0 revert: "Merge pull request #29290 from s-aga-r/fix/delivery-note/billed-amount" (#29782) 
* Revert "Merge pull request #29290 from s-aga-r/fix/delivery-note/billed-amount"

This reverts commit 038f949550, reversing
changes made to c7b4918434.

* fix: linter
 2022-02-14 19:54:29 +05:30
Saqib Ansari
47f8b44cfe fix: incorrect pricing rule filtering on selecting first item 
(cherry picked from commit 3713ae75ab)
 2022-02-14 13:11:57 +00:00
mergify[bot]
e5b50557e6 fix: show user id in emp group table (backport #29776) (#29777) 
Co-authored-by: Dany Robert <danyrt@wahni.com>
 2022-02-14 10:09:39 +05:30
rohitwaghchaure
f462d5ba38 Merge pull request #29755 from frappe/mergify/bp/version-13-hotfix/pr-29736 
fix: time out error while making work orders from production plan (backport #29736)
 2022-02-13 22:50:14 +05:30
mergify[bot]
c7fbeb3aac fix(India): Report GSTR-1 minor fixes (#29768) 
* fix(India): Report GSTR-1 minor fixes

(cherry picked from commit 6e679a5ad2)

* fix: cleaner implementation for `get_invoice_type`

(cherry picked from commit 2bc157a95c)

Co-authored-by: Smit Vora <mailsmitvora@gmail.com>
Co-authored-by: Sagar Vora <sagar@resilient.tech>
 2022-02-12 20:55:27 +05:30
Deepesh Garg
90f5372fb1 Merge pull request #29716 from deepeshgarg007/loan_repay_via_salary_v2 
fix: Loan repayment via Salary Slip
 2022-02-12 18:46:38 +05:30
Govind S Menokee
894a406ed4 Bug: fix list mutation within loop 
Prevent list mutation within loop leading to incorrect data
 2022-02-12 12:12:31 +05:30
Sagar Vora
b7b5531ed0 chore: remove deprecated print format 
(cherry picked from commit d93d2a80b1)
 2022-02-12 06:38:49 +00:00
Rucha Mahabal
0e3788e346 fix: conflicts 2022-02-11 21:27:44 +05:30
Rucha Mahabal
6a1c27a18f fix(test): reset test setup 
(cherry picked from commit cbaadcf113)
 2022-02-11 15:55:17 +00:00
Rucha Mahabal
c261621dca test: earned leave allocations based on DOJ 
(cherry picked from commit 9b0f9c3442)
 2022-02-11 15:55:16 +00:00
Rucha Mahabal
c0ea6d0721 chore: clean-up leave policy assignment tests 
(cherry picked from commit 51e6086829)
 2022-02-11 15:55:16 +00:00
Rucha Mahabal
9b6040979a fix: consider leaves for past months if assignment is based on joining date too 
(cherry picked from commit c7be9ef5d2)

# Conflicts:
#	erpnext/hr/doctype/leave_policy_assignment/leave_policy_assignment.py
 2022-02-11 15:55:15 +00:00
Rucha Mahabal
3fea6fd9e8 fix: consider based on DOJ config while calculating leaves for passed months 
(cherry picked from commit 89fa0bb73f)
 2022-02-11 15:55:14 +00:00
Rucha Mahabal
2b4e532226 fix: Earned Leave allocation based on joining date not working 
(cherry picked from commit 7326d57966)
 2022-02-11 15:55:14 +00:00
Deepesh Garg
5df93916b4 bumped to version 13.20.1 2022-02-11 19:34:54 +05:50
Deepesh Garg
5855225366 Revert "fix(India): Tax calculation for overseas suppliers" 
(cherry picked from commit ea20c63182)
 2022-02-11 12:11:31 +00:00
Deepesh Garg
87decb3734 Revert "fix(India): Tax calculation for overseas suppliers" 
(cherry picked from commit ea20c63182)
 2022-02-11 12:11:09 +00:00
Rohit Waghchaure
adaa8bd32d fix: time out error while making work orders from prodcution plan 
(cherry picked from commit eec2f87088)
 2022-02-11 10:43:09 +00:00
barredterra
032e4e4486 fix: encode filters for URI 
(cherry picked from commit 5811d9e318)
 2022-02-11 09:16:09 +00:00
Saqib Ansari
7c5480d729 fix: cannot jump to sales invoice in gross profit report 
(cherry picked from commit 78dd364b0b)
 2022-02-11 09:09:38 +00:00
Ankush Menat
5a771dca46 fix: update bin modified timestamp when updating qty 
These timestamps are used for writing integrations hence whenever bin is
updated timestamp should update to reliabily use Bin for integration
logic.

(cherry picked from commit 77be98295c)
 2022-02-11 12:12:49 +05:30
Saqib Ansari
c980bce1c8 Merge branch 'version-13-hotfix' into mergify/bp/version-13-hotfix/pr-29701 2022-02-10 10:53:53 +05:30
Saqib Ansari
6922a91a66 Merge pull request #29726 from frappe/mergify/bp/version-13-hotfix/pr-29374 
fix: ignore pricing rule in transactions (backport #29374)
 2022-02-10 10:52:35 +05:30
Ankush Menat
d062504593 fix: restrict filetypes to csv for rename tool 
(cherry picked from commit c371b52d27)
 2022-02-10 10:31:42 +05:30
Saqib Ansari
503cc65db4 fix: restore missing change from develop branch 2022-02-10 10:28:51 +05:30
Saqib Ansari
ec1bafeafc Merge branch 'version-13-hotfix' into mergify/bp/version-13-hotfix/pr-29374 2022-02-09 16:45:34 +05:30
Saqib Ansari
d97fa58e4f fix: merge conflicts 2022-02-09 16:44:13 +05:30
Saqib Ansari
41b7c5f92d fix: cancelling of consolidated sales invoice that doesn't have closing entry 
(cherry picked from commit 0ebd32dc63)
 2022-02-09 11:13:05 +00:00
Saqib Ansari
02cf4e9f25 fix: flaky point of sale test 
(cherry picked from commit 4bb557dbd8)
 2022-02-09 11:13:05 +00:00
Saqib Ansari
7835e86da0 fix(test): do not enable negative stock 
(cherry picked from commit 75256863c6)
 2022-02-09 11:13:04 +00:00