nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-17 16:45:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
38,856 Commits 401 Branches 1,700 Tags
6db0ea8be84f8a5479cbc23acf1cf77fa3603ac4
Commit Graph

38856 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rucha Mahabal
6db0ea8be8 fix(Timesheet): convert time logs to datetime while checking for overlap 
(cherry picked from commit e2e998fbd9)
 2022-02-17 18:22:43 +05:30
Saqib Ansari
5db80b2b57 Merge pull request #29860 from frappe/mergify/bp/version-13-hotfix/pr-29859 
fix: coupon code is applied even if ignore_pricing_rule is enabled (backport #29859)
 2022-02-17 16:20:51 +05:30
Saqib Ansari
63079f3e07 fix: coupon code is applied even if ignore_pricing_rule is enabled 
(cherry picked from commit 2743999785)
 2022-02-17 10:42:15 +00:00
Ankush Menat
20f7db98cb fix: production plan status should consider qty + WO status 
(cherry picked from commit db93f26f20)
 2022-02-17 15:09:08 +05:30
Saqib Ansari
a4cd33441f Merge pull request #29850 from frappe/mergify/bp/version-13-hotfix/pr-29848 
fix: currency in bank reconciliation tool (backport #29848)
 2022-02-17 14:40:16 +05:30
Saqib Ansari
97505fdc82 fix: currency in bank reconciliation tool 
(cherry picked from commit 60674e52b8)
 2022-02-17 08:57:28 +00:00
Ankush Menat
fb0167ffc6 test: putaway rule re-application shouldn't do anything 
(cherry picked from commit d9fc3f3d90)
 2022-02-17 12:47:44 +05:30
Ankush Menat
90f2cfd102 fix: avoid updating items table if no change due to putaway 
(cherry picked from commit b000e93744)
 2022-02-17 12:47:44 +05:30
mergify[bot]
8953794cda fix: allow renaming and merging (backport #29830) (#29832) 
Co-authored-by: Wolfram Schmidt <wolfram.schmidt@phamos.eu>
 2022-02-16 17:53:00 +05:30
Marica
ec0ea604ac Merge pull request #29823 from frappe/mergify/bp/version-13-hotfix/pr-29639 
perf: Weed out disabled variants via sql query instead of pythonic looping separately (backport #29639)
 2022-02-16 14:02:54 +05:30
marination
de834a8362 chore: Remove commented out code 
(cherry picked from commit 29c576e144)
 2022-02-16 08:10:00 +00:00
marination
b75e982286 chore: Fix flaky test test_exact_match_with_price 
- Clear cart settings in cache to avoid stale values

(cherry picked from commit 4f5a0b8941)
 2022-02-16 08:10:00 +00:00
marination
ca8986028d 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)
 2022-02-16 08:10:00 +00:00
marination
251656ab52 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)
 2022-02-16 08:09:59 +00:00
mergify[bot]
765ade74e6 fix: add supported currencies (#29805) (#29822) 
(cherry picked from commit a26183e205)

Co-authored-by: Kenneth Sequeira <33246109+kennethsequeira@users.noreply.github.com>
 2022-02-16 13:04:20 +05:30
mergify[bot]
dccf2a3dec test: set correct DocType (#29819) (#29820) 
(cherry picked from commit 08a391fa88)

Co-authored-by: Sagar Vora <sagar@resilient.tech>
 2022-02-16 11:52:03 +05:30
mergify[bot]
3b4e4955f7 fix: task status loop (backport #26006) (#29821) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
Co-authored-by: Jannat Patel <31363128+pateljannat@users.noreply.github.com>
 2022-02-16 11:32:40 +05:30
mergify[bot]
fd5ce9ca10 fix: dont attempt to set batch number if item doesn't have batch no (#29812) (#29813) 
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:03 +05:30
Deepesh Garg
3e2b9a2c50 Merge pull request #29810 from frappe/mergify/bp/version-13-hotfix/pr-29791 
fix: Fixes in TDS payable monthly report (backport #29791)
 2022-02-15 15:55:08 +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
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
Deepesh Garg
321cbd5982 Merge pull request #29800 from frappe/mergify/bp/version-13-hotfix/pr-29789 
fix: disable rounded total in opening invoice creation tool (backport #29789)
 2022-02-15 11:32:14 +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
Marica
a8107f6e06 Merge pull request #29795 from frappe/mergify/bp/version-13-hotfix/pr-29788 
fix: Generate Warehouse wise FIFO Queue always and later aggregate if required (backport #29788)
 2022-02-14 23:38:52 +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
53275d4045 Merge pull request #29790 from frappe/mergify/bp/version-13-hotfix/pr-29778 
fix: incorrect pricing rule filtering on selecting first item (backport #29778)
 2022-02-14 19:13:38 +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
Saqib Ansari
e55a27b6a5 Merge pull request #29765 from frappe/mergify/bp/version-13-hotfix/pr-29754 
chore: remove deprecated print format (backport #29754)
 2022-02-12 12:12:03 +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
672a633154 Merge pull request #29763 from frappe/mergify/bp/version-13-hotfix/pr-29711 2022-02-11 21:43:38 +05:30
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