schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
39,482 Commits 322 Branches 1,581 Tags
335e80f787d8e6b0ea8f315c5b60c47c9782b547
Commit Graph

39482 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Deepesh Garg
540559d6fd Merge branch 'version-13-pre-release' into version-13 v13.20.1 2022-02-11 19:14:54 +05:30
Deepesh Garg
5df93916b4 bumped to version 13.20.1 2022-02-11 19:34:54 +05:50
Deepesh Garg
6cb5e85342 Merge pull request #29758 from frappe/mergify/bp/version-13-pre-release/pr-29756 
Revert "fix(India): Tax calculation for overseas suppliers" (backport #29756)
 2022-02-11 18:06:03 +05:30
Deepesh Garg
5a961dec24 Merge pull request #29757 from frappe/mergify/bp/version-13-hotfix/pr-29756 
Revert "fix(India): Tax calculation for overseas suppliers" (backport #29756)
 2022-02-11 18:05:08 +05:30
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
Saqib Ansari
31d5d9e1c0 Merge pull request #29752 from frappe/mergify/bp/version-13-hotfix/pr-29732 
fix: encode filters for URI (backport #29732)
 2022-02-11 17:02:31 +05:30
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
7629d472a1 Merge pull request #29751 from frappe/mergify/bp/version-13-hotfix/pr-29748 
fix: cannot jump to sales invoice in gross profit report (backport #29748)
 2022-02-11 14:45:02 +05:30
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
5fd120a926 Merge pull request #29728 from frappe/mergify/bp/version-13-hotfix/pr-29701 
fix(pos): incorrect grand_total in case of inclusive taxes on item (backport #29701)
 2022-02-10 11:24:33 +05:30
Ankush Menat
70951bd833 ci: bump ci python version for patch test 2022-02-10 10:57:24 +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
Ankush Menat
ffd5efe669 ci: bump ci python version for patch test 2022-02-10 10:53:17 +05:30