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

29304 Commits

Author SHA1 Message Date
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
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
Saqib Ansari
df870e4b22 fix: currency in bank reconciliation chart 
(cherry picked from commit 0fc5d2278d)
 2022-02-08 11:03:10 +00:00
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
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
barredterra
ec55251f6a feat: option to disable tax category 
(cherry picked from commit 663c594ead)
 2022-02-07 12:11:14 +00:00
barredterra
501ce90796 feat: option to disable Item Tax Template 
(cherry picked from commit f60e040d69)
 2022-02-07 12:11:13 +00:00
Deepesh Garg
f4e2c1fad3 fix: Add disbursement accounts to tests 
(cherry picked from commit 8ece2845f2)
 2022-02-07 09:08:48 +00:00
Deepesh Garg
946e560c55 feat: Refund entry against loans 
(cherry picked from commit c68c70f8bc)

# Conflicts:
#	erpnext/loan_management/doctype/loan/loan.json
#	erpnext/patches.txt
 2022-02-07 09:08:48 +00:00
mergify[bot]
8cadc2668d fix(ux): make stock entry type the title field (#29674) (#29675) 
(cherry picked from commit 5e6227e3d8)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-02-07 13:20:34 +05:30
Deepesh Garg
fd4e0f1d40 Merge pull request #29666 from frappe/mergify/bp/version-13-hotfix/pr-29659 
fix: Billing status for zero amount ref doc (backport #29659)
 2022-02-06 21:56:34 +05:30
Deepesh Garg
3c032146ad Merge pull request #29668 from frappe/mergify/bp/version-13-hotfix/pr-29601 
fix: Incorrect provisional profit and loss in balance sheet (backport #29601)
 2022-02-06 21:55:54 +05:30
Deepesh Garg
dcff8e74fc Merge pull request #29669 from frappe/mergify/bp/version-13-hotfix/pr-29609 
fix: Zero rated exports in GSTR-3B report (backport #29609)
 2022-02-06 21:55:15 +05:30
Deepesh Garg
00af714743 Merge pull request #29661 from frappe/mergify/bp/version-13-hotfix/pr-29641 
fix: Ignore linked invoices on Journal Entry cancel (backport #29641)
 2022-02-06 21:53:12 +05:30
Ankush Menat
3e79533112 fix: dont show cancelled PO items in plan report 
(cherry picked from commit 6459ceaea1)
 2022-02-06 20:07:31 +05:30
Deepesh Garg
aca788cbe0 fix: Zero rated exports in GSTR-3B report 
(cherry picked from commit 233e6449fc)
 2022-02-06 14:04:46 +00:00
Deepesh Garg
d10423ef1f fix: Incorrect provisional profit and loss in balance sheet 
(cherry picked from commit ed2c6b6637)
 2022-02-06 14:03:41 +00:00
Deepesh Garg
62b71f9edd fix: Add test case 
(cherry picked from commit c5726fd3da)
 2022-02-06 13:52:58 +00:00
Deepesh Garg
3b47a55932 fix: Billing status for zero amount ref doc 
(cherry picked from commit d679692472)
 2022-02-06 13:52:57 +00:00
Deepesh Garg
5acf773042 Merge pull request #29635 from deepeshgarg007/sales_invoice_tax_template 
fix: Incorrect tax template in Sales Invoice via data import
 2022-02-06 18:58:43 +05:30