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

38787 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
ruthra kumar
e5112e16a8 fix: typeerror on invoice creation from SO/PO 
(cherry picked from commit 9bd56b0f79)
 2022-02-08 09:57:47 +00:00
Saqib Ansari
dddfab1310 fix: Coupon code item pricing dynamic updation issue in pos screen (backport #29599) 2022-02-08 15:27:36 +05:30
Bhavesh Maheshwari
08b9ee7b36 fix: ignore rate validation for work order (#29690) 
* fix: ignore rate validation for work order

* test: validate on save instead of on creation

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-02-08 14:01:20 +05:30
mergify[bot]
bd9a07ed4c fix: dont ignore items that dont have SVD (backport #29656) (#29694) 
* fix: dont ignore items that dont have SVD

When items go from negative to positive stock value diff can be zero but
item might have taxes / need divisional loss adjustment.

(cherry picked from commit c88c368880)

* test: check when PR moves stock from neg to pos

(cherry picked from commit d1f5753885)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-02-08 13:52:41 +05:30
mergify[bot]
cc5107eab3 fix: ignore cancelled SLEs (#29679) (#29698) 
(cherry picked from commit 0ca60afc3f)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-02-08 13:52:28 +05:30
Subin Tom
c494ed087a fix: Coupon code item pricing dynamic updation issue 
(cherry picked from commit ccf63124d6)
 2022-02-08 06:20:51 +00:00
Saqib Ansari
52a74921c0 chore: show credit/debit-to account in error message 
(cherry picked from commit e93bb8a336)
 2022-02-08 06:13:31 +00:00
Ankush Menat
8e660890f4 test: commit item/warehouse creation to db 
(cherry picked from commit f82d7eb73f)
 2022-02-07 23:16:18 +05:30
Ankush Menat
29d3a189cb chore: drop dead field from stock reconciliation 
(cherry picked from commit 43f8ee1dd1)
 2022-02-07 23:16:18 +05:30
Ankush Menat
19f99a1c5f test: product bundle reposting 
(cherry picked from commit 699519f7b6)
 2022-02-07 23:16:18 +05:30
Ankush Menat
86d30ed583 test: move bundle info to class variables 
(cherry picked from commit 853e658dcc)
 2022-02-07 23:16:18 +05:30
Ankush Menat
6f6b474333 fix: merge stock ledger item warehouse with doc's 
(cherry picked from commit 1022db0474)
 2022-02-07 23:16:18 +05:30
Ankush Menat
eeb8f4874d refactor: simplify get_items_and_warehouses 
Also remove dead code related to stock reconciliation_json.

(cherry picked from commit e6ab8df8f2)
 2022-02-07 23:16:18 +05:30
Ankush Menat
bd401810e4 fix: consider packed items too when reposting 
(cherry picked from commit c56d07dee3)
 2022-02-07 23:16:18 +05:30
Ritwik Puri
c137b141e8 fix: use item_code instead of parent field in bom_stock_calculated report (#29684) 
(cherry picked from commit 72a812f18b)
 2022-02-07 23:11:40 +05:30
Deepesh Garg
cace76b355 Merge pull request #29682 from frappe/mergify/bp/version-13-hotfix/pr-29349 
feat: option to disable Item Tax Template and Tax Category (backport #29349)
 2022-02-07 22:26:09 +05:30
Deepesh Garg
fbf6b4e5aa Merge pull request #29677 from frappe/mergify/bp/version-13-hotfix/pr-29460 
feat: Refund entry against loans (backport #29460)
 2022-02-07 19:17:32 +05:30
Deepesh Garg
146cf89588 Merge pull request #29685 from frappe/mergify/bp/version-13-hotfix/pr-29660 
fix: Add missing key in Loan (backport #29660)
 2022-02-07 19:05:38 +05:30
Deepesh Garg
066ceb06cd fix: Resolve conflicts 2022-02-07 18:46:53 +05:30
Deepesh Garg
4196f04f49 test: Add test case for repayment against partially disbursed loans 
(cherry picked from commit ef69d1fd38)
 2022-02-07 13:15:42 +00:00
Abhinav Raut
9396143009 fix: missing key in loan 
(cherry picked from commit d0043bdbac)
 2022-02-07 13:15:41 +00:00