nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-18 09:05:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
38,825 Commits 399 Branches 1,700 Tags
c7b9df5aee0992ffd45ca8b2c4e2e7308e92b36e
Commit Graph

38825 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
Saqib Ansari
e2d8fce3c5 fix(test): case if write off is calculated as negative amount 
(cherry picked from commit c2b83a0283)
 2022-02-09 11:13:04 +00:00
Saqib Ansari
96034c4396 fix(test): ignore stock validation 
(cherry picked from commit afc5c26d1c)
 2022-02-09 11:13:04 +00:00
Saqib Ansari
32b55e715a fix(pos): incorrect grand_total in case of inclusive taxes on item 
(cherry picked from commit 0452d7de20)
 2022-02-09 11:13:03 +00:00
Ankush Menat
a86e8f47e5 Merge pull request #29723 from frappe/mergify/copy/version-13-hotfix/pr-29715 
fix: Reserved for Production calculation considered closed work orders (copy #29715)
 2022-02-09 15:59:23 +05:30
Deepesh Garg
a54e0fe42b test: Update account type in payroll payable account 2022-02-09 13:44:14 +05:30
Saqib Ansari
23a5b3df18 fix: ignore pricing rule in all transactions 
(cherry picked from commit ab36b27a94)
 2022-02-09 08:02:56 +00:00
Saqib Ansari
91f65da4ec fix(test): pass price_list_rate only if pricing rule has to be removed 
(cherry picked from commit 6fa406dd04)
 2022-02-09 08:02:55 +00:00
Saqib Ansari
fc67f02ffc test: item price on remove pricing rule 
(cherry picked from commit b8c41e3030)

# Conflicts:
#	erpnext/accounts/doctype/pricing_rule/test_pricing_rule.py
 2022-02-09 08:02:55 +00:00
Saqib Ansari
78c5f34286 fix: ignore pricing rule in all transactions 
(cherry picked from commit f6dda738dc)
 2022-02-09 08:02:53 +00:00
Ankush Menat
94fc5f95db fix: concflicts 2022-02-09 12:21:38 +05:30
Ankush Menat
0ac16f9e63 fix: patch existing bins 
(cherry picked from commit e134524532db0473bef48b7e558e5d7a289f090e)

# Conflicts:
#	erpnext/patches.txt
 2022-02-09 06:17:27 +00:00
Ankush Menat
197bf8fbec refactor: move reserve quantity computation to work order 
(cherry picked from commit a8bf3a3f0d)

# Conflicts:
#	erpnext/stock/doctype/bin/bin.py
 2022-02-09 06:17:26 +00:00