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

42223 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anand Baburajan
d4f8b057e1 fix: fetch logic for repay_from_salary in loan_repayment [v13] (#37136) 
fix: fetch logic for repay_from_salary in loan_repayment
 2023-09-19 15:18:17 +05:30
mergify[bot]
86b152fe5c feat: provision to create RIV from Stock Ledger Invariant Check report (backport #37115) (#37149) 
* feat: provision to create RIV from `Stock Ledger Invariant Check` report (#37115)

* feat: provision to create RIV from `Stock Ledger Invariant Check` report

* fix: `linter`

(cherry picked from commit 9c9d0ecb73)

# Conflicts:
#	erpnext/stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.py

* chore: `conflicts`

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-09-19 09:19:46 +00:00
Deepesh Garg
437a294621 Merge pull request #37009 from frappe/mergify/bp/version-13-hotfix/pr-36953 
fix: prorate factor for subscription plan (#36953)
 2023-09-10 12:21:09 +05:30
Gursheen Kaur Anand
9a15ed8083 fix: prorate factor for subscription plan (#36953) 
(cherry picked from commit fc79af5926)
 2023-09-10 06:06:12 +00:00
mergify[bot]
3a49d4f9b3 chore: asset finance books validation (backport #36979) (#36982) 
* chore: asset finance books validation (#36979)

(cherry picked from commit 0077659e93)

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

* chore: fix conflicts

* chore: fix tests

---------

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
 2023-09-06 15:39:44 +05:30
mergify[bot]
3a71fa9d96 fix: ask for asset related accounts only when needed (backport #36960) (#36972) 
fix: ask for asset related accounts only when needed (#36960)

* fix: only ask for asset_received_but_not_billed account when needed

* chore: remove unnecessary if condition

* fix: only ask for expenses_included_in_asset_valuation account when needed

(cherry picked from commit 174f95d699)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
 2023-09-05 18:14:49 +05:30
Anand Baburajan
6f40d0cdf6 fix: update repay_from_salary, payment_account and payroll_payable_account fields (#36949) 
* fix: update repay_from_salary, payment_account and payroll_payable_account fields

* chore: formatting
 2023-09-05 12:43:09 +05:30
Anand Baburajan
5bd6c27b05 chore: patch to correct asset values if je has workflow [v13] (#36916) 
chore: patch to correct asset values if je has workflow
 2023-09-02 18:32:23 +05:30
mergify[bot]
783bb93913 fix: timeout error coming during reposting (backport #36715) (#36753) 
fix: timeout error coming during reposting (#36715)

(cherry picked from commit 620b21fec5)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-08-22 13:22:48 +05:30
ruthra kumar
066cf0e3bc Merge pull request #36671 from frappe/mergify/bp/version-13-hotfix/pr-36590 
fix: disallow mulitple SO with same Purchase Order No if not enabled in Settings (backport #36590)
 2023-08-16 16:21:33 +05:30
ruthra kumar
829298066f chore: resolve conflict 2023-08-16 15:02:04 +05:30
ruthra kumar
006da22d3f refactor(test): don't set po_no by default 
(cherry picked from commit 64614cd915)

# Conflicts:
#	erpnext/stock/doctype/delivery_note/test_delivery_note.py
 2023-08-16 09:12:18 +00:00
ruthra kumar
3b9ac9f46a fix: disallow mulitple SO with same PO No 
(cherry picked from commit dbd3fdbb41)
 2023-08-16 09:12:17 +00:00
mergify[bot]
84b6f68108 chore: add validation for depreciation expense account in asset category (backport #36659) (#36662) 
chore: add validation for depreciation expense account in asset category (#36659)

(cherry picked from commit e0c79d3b53)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
 2023-08-15 18:26:33 +05:30
mergify[bot]
e5b38607ce fix: payment allocation in invoice payment schedule (#36440) 
fix: payment allocation in invoice payment schedule (#36440)
 2023-08-13 13:21:04 +05:30
Deepesh Garg
b3c9d0d910 Merge pull request #36624 from frappe/mergify/bp/version-13-hotfix/pr-36614 
fix: Allow backdated repayment cancels for term loans (#36614)
 2023-08-13 13:20:02 +05:30
Deepesh Garg
c417365e03 fix: Allow backdated repayment cancels for term loans 
(cherry picked from commit 1377cf4cf1)
 2023-08-13 06:28:38 +00:00
mergify[bot]
b2a4175d43 chore: set default filter dates if missing (backport #36597) (#36599) 
chore: set default filter dates if missing (#36597)

(cherry picked from commit 98e82e0d99)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
 2023-08-11 09:17:08 +00:00
mergify[bot]
a801bba83e perf(invoice): Faster return amount query (backport #36556) (#36558) 
perf(invoice): Faster return amount query (#36556)

perf: Faster return amount query
(cherry picked from commit b0c79a0467)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2023-08-09 14:07:52 +05:30
mergify[bot]
5dbca09899 fix: Tax withholding against order via Payment Entry (#36493) 
* fix: Tax withholding against order via Payment Entry (#36493)

* fix: Tax withholding against order via Payment Entry

* test: Add test case

* fix: Nonetype exceptions

(cherry picked from commit 93767eb7fc)

# Conflicts:
#	erpnext/accounts/doctype/tax_withholding_category/test_tax_withholding_category.py

* chore: resolve conflicts

---------

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-08-07 17:15:22 +05:30
mergify[bot]
9ec7bb9be3 chore: better cost center validation for assets (backport #36477) (#36478) 
chore: better cost center validation for assets (#36477)

(cherry picked from commit 38a612c62e)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
 2023-08-03 17:19:05 +05:30
RitvikSardana
a165b37fd7 fix: added validation for unique serial numbers in pos invoice (#36302) 
* fix: added validation for unique serial numbers in pos invoice

* fix: updated title of validation

* fix: removed extra whitespace

* fix: added validation for duplicate batch numbers

---------

Co-authored-by: Ritvik Sardana <ritviksardana@Ritviks-MacBook-Air.local>
 2023-07-31 23:28:10 +05:30
mergify[bot]
cdc86bd76c perf: use LEFT JOIN instead of NOT EXISTS (backport #36221) (#36384) 
* perf: use `LEFT JOIN` instead of `NOT EXISTS`

(cherry picked from commit 58d867503b)

# Conflicts:
#	erpnext/manufacturing/doctype/bom_update_log/bom_updation_utils.py

* fix: long queue `process_boms_cost_level_wise`

(cherry picked from commit 148d466ae5)

* chore: `conflicts`

* fix: failing test case

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-07-31 17:39:31 +05:30
mergify[bot]
e9df06406f fix: only publish repost progress to doc subscriber (backport #36400) (#36403) 
* fix: only publish repost progress to doc subscriber (#36400)

Huge size of string gets blasted to everyone on site. Due to some memory
leak (cause unknown) till sockets are open the strings are also in
process' memory.

related https://github.com/frappe/frappe/issues/21863

(cherry picked from commit c0642cf528)

# Conflicts:
#	erpnext/stock/stock_ledger.py

* chore: conflicts

---------

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2023-07-29 18:14:26 +05:30
mergify[bot]
c574494ddd fix: removed "fetch_from" (backport #36365) (#36387) 
fix: removed "fetch_from"

* fix: removed ("fetch_from": "goal.objective")
The field ended up being disabled because of this.

(cherry picked from commit 1c687a4afd)

Co-authored-by: xdlumertz <alexandrelumertz@gmail.com>
 2023-07-28 18:15:24 +05:30
mergify[bot]
a5e1c4798f fix: group by in fixed asset register (copy #36310) (#36312) 
fix: group by in fixed asset register

(cherry picked from commit 1151e47f46)

Co-authored-by: anandbaburajan <anandbaburajan@gmail.com>
 2023-07-25 21:01:47 +05:30
Anand Baburajan
bde9e89582 fix: apply discount on item after applying price list (#36125) 2023-07-25 20:32:57 +05:30
mergify[bot]
e4f28e8a5b fix: allow both custodian and location while creating asset (backport #36263) (#36270) 
fix: allow both custodian and location while creating asset (#36263)

(cherry picked from commit 2b47f5815e)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
 2023-07-24 16:25:23 +05:30
Sagar Vora
4854c2e7f7 Merge pull request #36165 from frappe/mergify/bp/version-13-hotfix/pr-36163 2023-07-17 15:47:54 +05:30
Sagar Vora
a93c4b6c65 chore: use consistent quotes 
(cherry picked from commit bccb718cc2)
 2023-07-17 10:17:01 +00:00
mergify[bot]
287c67f7a2 chore: add validation for account type of party type and account (#36141) 
chore: add validation for account type of party type and account (#36141)

chore: add validation to check if account type of party type and account match
(cherry picked from commit 305c37917f)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
 2023-07-17 11:51:45 +05:30
mergify[bot]
120de249dd perf: index in Item and Item Variant Attribute (backport #36133) (#36145) 
* perf: index `variant_of` and `attribute` in `Item Variant Attribute`

(cherry picked from commit e4128a5c91)

* perf: index `disabled` in `Item`

(cherry picked from commit 04400eb2e4)

# Conflicts:
#	erpnext/stock/doctype/item/item.json

* chore: `conflicts`

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-07-15 10:20:32 +05:30
Anand Baburajan
1d3917b335 fix: HSN code not showing up in GST itemised register reports (#36142) 
fix: hsn code not showing up in gst itemised registers
 2023-07-14 20:16:49 +05:30
mergify[bot]
3bc899f354 fix: improve "Update Items" modal (#36105) 
fix: improve "Update Items" modal (#36105)

* fix: make "Update Items" modal larger

* fix: remove conversion factor from overview

Conversion factor doesn't make much sense without two different UOMs
next to it, hence moving it to row detail view

(cherry picked from commit d5fe1432f8)

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2023-07-14 13:03:43 +05:30
Ankush Menat
6b113c6abc ci: fix repo name in relase notes workflow 
[skip ci]

(cherry picked from commit b5f6a1cc20)
 2023-07-14 12:05:21 +05:30
mergify[bot]
82e2ff8731 ci: regen release notes with GH API (backport #36098) (#36100) 
ci: regen release notes with GH API (#36098)

[skip ci]

(cherry picked from commit 0340bfc90d)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2023-07-12 12:18:34 +05:30
mergify[bot]
2993eb5ce9 fix: allow manual asset receipt mov from nowhere (backport #36093) (#36095) 
* fix: allow manual asset receipt mov from nowhere (#36093)

(cherry picked from commit 4aaa1a15d7)

# Conflicts:
#	erpnext/assets/doctype/asset_movement/asset_movement.py

* chore: fix conflict

---------

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
 2023-07-12 09:39:47 +05:30
rohitwaghchaure
1d6bc68d87 Merge pull request #36090 from frappe/mergify/bp/version-13-hotfix/pr-36088 
fix: circular dependency during reposting causing timeout error (backport #36088)
 2023-07-11 19:09:36 +05:30
Rohit Waghchaure
ba69be1ced fix: circular dependency during reposting causing timeout error 
(cherry picked from commit c16a5814d4)
 2023-07-11 12:59:59 +00:00
Saurabh
4af57a7318 fix: error messages while evaluating formulas and handle line boundaries (#35989) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2023-07-11 18:04:31 +05:30
mergify[bot]
e05bb103f3 fix: incorrect status in MR created from PP (backport #36085) (#36087) 
fix: incorrect status in MR created from PP (#36085)

(cherry picked from commit be5881280f)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-07-11 17:44:41 +05:30
Deepesh Garg
6f2fb89c49 Merge branch 'version-13' into version-13-hotfix 2023-07-11 16:17:56 +05:30
Rucha Mahabal
beaf13e00e fix(Employee Advance): check if return amount is set before validating (#36080) 2023-07-11 14:12:21 +05:30
mergify[bot]
9c3ec41803 fix: payment entry voucher_type error (#35779) 
* fix: payment entry `voucher_type` error (#35779)

* fix: payment entry `voucher_type` error

* chore: linters

(cherry picked from commit 361a357088)

# Conflicts:
#	erpnext/accounts/doctype/payment_entry/payment_entry.py

* chore: resolve conflicts

---------

Co-authored-by: Dany Robert <danyrt@wahni.com>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-07-11 10:19:55 +05:30
Anand Baburajan
06c85fa252 Revert "fix: gst_hsn_code is ambiguous on gst reports" (#36072) 2023-07-10 23:45:11 +05:30
mergify[bot]
0248fee533 refactor(Payment Entry): translatable strings (#36017) 
* refactor(Payment Entry): translatable strings (#36017)

* refactor(Payment Entry): translatable strings

* fix: German translations

(cherry picked from commit af28f95c60)

# Conflicts:
#	erpnext/accounts/doctype/payment_entry/payment_entry.py
#	erpnext/translations/de.csv

* chore: resolve conflicts

---------

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2023-07-10 21:02:05 +05:30
RJPvT
5aa02b8571 fix: also check on_hold (#35910) 2023-07-10 19:43:12 +05:30
mergify[bot]
53f7764c67 fix: single column indexes (#32425) 
fix: single column indexes (#32425)

refactor: move single column indexes to doctypes
(cherry picked from commit 8d1db0ea3d)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2023-07-10 18:12:55 +05:30
mergify[bot]
cf3ec935a7 fix: precision causing outstanding issue on partly paid invoices (#36030) 
fix: precision causing outstanding issue on partly paid invoices (#36030)

* fix: precision causing outstanding issue on partly paid invoices

* chore: linters

(cherry picked from commit 5c820ecc20)

Co-authored-by: Dany Robert <danyrt@wahni.com>
 2023-07-10 16:49:41 +05:30
mergify[bot]
2732276498 chore: add asset depr posting error in error log (backport #36052) (#36056) 
chore: add asset depr posting error in error log (#36052)

(cherry picked from commit 0f9a6ee70a)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
 2023-07-10 14:12:43 +05:30