schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
38,808 Commits 322 Branches 1,581 Tags
c261621dcaecf026f38c85b309ea968f3e7dd4c7
Commit Graph

38808 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Ankush Menat
bde3bece36 test: remove dependency on other tests 
(cherry picked from commit d2cc5f2482)
 2022-02-09 06:17:25 +00:00
aaronmenezes
bc80f34d92 fix: Reserved for Production calculation considered closed work orders 
(cherry picked from commit 6a8b7eeffe)

# Conflicts:
#	erpnext/stock/doctype/bin/bin.py
 2022-02-09 06:17:25 +00:00
rohitwaghchaure
a3f1844311 Merge pull request #29552 from frappe/mergify/bp/version-13-hotfix/pr-29359 
fix: bypass selling price validation for free item (backport #29359)
 2022-02-09 10:39:34 +05:30
mergify[bot]
e69f70f264 fix: fetch image form item (backport #29523) (#29571) 
* fix: fetch image form item (#29523)

(cherry picked from commit 319322228a)

# Conflicts:
#	erpnext/assets/doctype/asset/asset.json

* chore: resolve merge conflicts

Co-authored-by: Himanshu <himanshuwarekar@yahoo.com>
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2022-02-08 21:54:07 +05:30
Saqib Ansari
422dcc245f Merge pull request #29707 from frappe/mergify/bp/version-13-hotfix/pr-29560 
fix: typeerror on invoice creation from SO/PO (backport #29560)
 2022-02-08 17:24:47 +05:30
Deepesh Garg
ca02fa98f8 Merge pull request #29710 from frappe/mergify/bp/version-13-hotfix/pr-29709 
fix: currency in bank reconciliation chart (backport #29709)
 2022-02-08 16:57:43 +05:30
Saqib Ansari
df870e4b22 fix: currency in bank reconciliation chart 
(cherry picked from commit 0fc5d2278d)
 2022-02-08 11:03:10 +00:00
Rucha Mahabal
409664387c Merge pull request #29708 from frappe/mergify/bp/version-13-hotfix/pr-29650 2022-02-08 16:31:07 +05:30
Rucha Mahabal
e3246efa5d fix: conflicts 2022-02-08 16:12:24 +05:30
Rucha Mahabal
cc867d6338 fix: conflicts 2022-02-08 15:55:44 +05:30
Rucha Mahabal
a5f016a7cd fix: handle carry forwarded leaves while checking for duplicate allocation 
(cherry picked from commit bd1555bd23)
 2022-02-08 10:18:34 +00:00
Rucha Mahabal
aa04e02710 fix(test): add ignore duplicates flag to allocation function 
(cherry picked from commit e25544f94e)
 2022-02-08 10:18:34 +00:00
Rucha Mahabal
ce26759a95 fix: linter 
(cherry picked from commit a52ba0a544)
 2022-02-08 10:18:34 +00:00
Rucha Mahabal
d26a8d47e4 test: earned leave allocation for passed months and allocation on month-end 
(cherry picked from commit 63ee4f1b64)
 2022-02-08 10:18:33 +00:00
Rucha Mahabal
5363b1922a fix: earned leaves not allocated if assignment is created on month-end 
(cherry picked from commit 25c7f850b1)

# Conflicts:
#	erpnext/hr/doctype/leave_policy_assignment/leave_policy_assignment.py
 2022-02-08 10:18:33 +00:00
Saqib Ansari
48a9d985e8 Merge pull request #29702 from frappe/mergify/bp/version-13-hotfix/pr-29699 
chore: show credit/debit-to account in error message (backport #29699)
 2022-02-08 15:28:01 +05:30