schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
47,348 Commits 322 Branches 1,581 Tags
5dc2e80987f2d8fea0513f05bcd5006f5d13da08
Commit Graph

47348 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepesh Garg
5dc2e80987 fix: Ignore default payment terms template for opening invoices 
(cherry picked from commit 53bf44d2b8)
 2024-01-10 10:37:45 +00:00
mergify[bot]
2598f8e7ec fix: Show timesheet table after fetching data from timesheet (backport #39275) (#39281) 
fix: Show timesheet table after fetching data from timesheet

(cherry picked from commit e1ba5878a3)

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2024-01-10 12:33:24 +05:30
mergify[bot]
fe973a4b53 fix: set parent doctype on chart (backport #39286) (#39288) 
fix: set parent doctype on chart (#39286)

(cherry picked from commit 38c5ecf007)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2024-01-10 12:27:16 +05:30
Nabin Hait
f82125144a Merge pull request #39190 from frappe/mergify/bp/version-15-hotfix/pr-39163 
fix: Purchase information is not required for creating a composite asset (backport #39163)
 2024-01-10 12:15:02 +05:30
Nabin Hait
38c1350018 Merge pull request #39279 from frappe/mergify/bp/version-15-hotfix/pr-39191 
fix: Ignore asset qty and status validation while cancelling LCV (backport #39191)
 2024-01-10 12:14:45 +05:30
Nabin Hait
24cfcf36e4 Merge pull request #39276 from frappe/mergify/bp/version-15-hotfix/pr-39238 
fix: Set asset purchase amount based on qty and valuation_rate (backport #39238)
 2024-01-10 12:14:10 +05:30
Nabin Hait
0c0be03e90 Merge pull request #39218 from frappe/mergify/bp/version-15-hotfix/pr-39214 
fix: Show maintain-stock and is-fixed-asset checkbox in item quick entry dialog (backport #39214)
 2024-01-10 12:12:32 +05:30
ruthra kumar
cd57bbc3d0 Merge pull request #39284 from frappe/mergify/bp/version-15-hotfix/pr-39282 
fix: possible typeerror on transaction.js (backport #39282)
 2024-01-10 12:00:43 +05:30
Nabin Hait
afefae08af fix: Resolved conflict 2024-01-10 11:59:54 +05:30
ruthra kumar
fec892c211 fix: possible typeerror on transaction.js 
(cherry picked from commit 9f27ac142b)
 2024-01-10 06:24:46 +00:00
Nabin Hait
87d1b0f476 fix: Ignore asset qty and status validation while cancelling LCV 
(cherry picked from commit e9d36242ce)
 2024-01-10 06:04:19 +00:00
Nabin Hait
f0070b4046 fix: Set asset purchase amount based on qty and valuation_rate 
(cherry picked from commit 135e19d0aa)
 2024-01-10 06:03:01 +00:00
mergify[bot]
5d6bc96375 fix: projects website list visible for guests and all logged in customers (backport #39164) (#39273) 
fix: projects website list visible for guests and all logged in customers (#39164)

* fix: projects website list visible for guests

fix: projects website list visible for guests and all logged in customers

see the issue for details

fixes issue #39009

* fix: remove user = frappe.session.user

(cherry picked from commit eabf706f37)

Co-authored-by: 0xD0M1M0 <76812428+0xD0M1M0@users.noreply.github.com>
 2024-01-10 10:45:45 +05:30
Raffael Meyer
4fa978ef1f test: fix wrong fieldname (#39270) 2024-01-10 10:32:01 +05:30
mergify[bot]
f00a6f6c59 fix: skip rate validation for return DN Items with Moving Average valuation (backport #39242) (#39266) 
fix: skip rate validation for return `DN Items` with `Moving Average` valuation

(cherry picked from commit e0ad52b500)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2024-01-09 22:02:20 +05:30
mergify[bot]
78c65f27b0 fix: Duplicate Closing Stock Balance (backport #39262) (#39264) 
fix: Duplicate Closing Stock Balance

(cherry picked from commit b15795392b)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2024-01-09 20:37:38 +05:30
Raffael Meyer
a326876cc5 Merge pull request #39258 from frappe/mergify/bp/version-15-hotfix/pr-39158 
fix: add read permission to Buying Settings (backport #39158)
 2024-01-09 13:34:56 +01:00
mergify[bot]
9f793b9b28 fix: incorrect indicator title for portal sales order (backport #39247) (#39255) 
fix: incorrect indicator title for portal sales order (#39247)

(cherry picked from commit 2d2ff7cf52)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-01-09 17:42:27 +05:30
mergify[bot]
bb6025ca26 fix: TypeError is pricing rules (backport #39252) (#39260) 
fix: TypeError is pricing rules (#39252)

(cherry picked from commit 274c65c451)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-01-09 17:41:53 +05:30
ruthra kumar
4ad61fc3a5 Merge pull request #39253 from frappe/mergify/bp/version-15-hotfix/pr-39251 
fix: update status on manual allocation (backport #39251)
 2024-01-09 16:36:35 +05:30
s-aga-r
e62dd0d7cb fix: add read permission to Buying Settings 
(cherry picked from commit e05bf9d32a)
 2024-01-09 10:44:21 +00:00
ruthra kumar
a147e2954f fix: update status on manual allocation 
(cherry picked from commit d32a407e08)
 2024-01-09 10:29:36 +00:00
mergify[bot]
0898ea5d92 fix: BOM replace tool does not update exploded items of root (backport #39244) (#39250) 
fix: BOM replace tool does not update exploded items of root (#39244)

(cherry picked from commit 5e0d017497)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-01-09 15:59:12 +05:30
ruthra kumar
d0688e7a55 Merge pull request #39241 from frappe/mergify/bp/version-15-hotfix/pr-39237 
fix: sales team commission overallocation on fetching items from multiple quotations to Sales Order (backport #39237)
 2024-01-09 14:40:24 +05:30
ruthra kumar
756c062733 fix: total allocated percentage for sales team issue 
(cherry picked from commit b498094a97)
 2024-01-09 07:39:28 +00:00
ruthra kumar
ec7a60bd02 Merge pull request #39234 from frappe/mergify/bp/version-15-hotfix/pr-39196 
fix: bank transaction status upon reconciliation (backport #39196)
 2024-01-09 11:57:50 +05:30
ruthra kumar
53eb6129ea refactor: remove 'Bank Trasaction' logic from status_update 
(cherry picked from commit cf988434e9)
 2024-01-09 05:51:38 +00:00
ruthra kumar
277aa7bc2b fix: bank transction status upon reconciliation 
(cherry picked from commit 6de8c18f98)
 2024-01-09 05:51:37 +00:00
Nabin Hait
97a51487c1 Merge pull request #39219 from frappe/mergify/bp/version-15-hotfix/pr-39209 
fix: Introduced company field to show amounts in company currency (backport #39209)
 2024-01-08 21:53:16 +05:30
Nabin Hait
1d2e831846 fix: Introduced company field to show amounts in company currency 
(cherry picked from commit eab22eb282)
 2024-01-08 16:09:42 +00:00
Nabin Hait
50300b9be6 fix: Show maintain-stock and is-fixed-asset checkbox in item quick entry dialog 
(cherry picked from commit c14986f9e6)
 2024-01-08 16:07:23 +00:00
mergify[bot]
abc99f84e9 fix: FG Item incorrect qty in the work order (backport #39200) (#39211) 
fix: FG Item incorrect qty in the work order (#39200)

(cherry picked from commit 466625213b)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-01-08 18:18:32 +05:30
mergify[bot]
3caf462c6b fix: flaky demo test case (backport #39135) (#39198) 
fix: flaky demo test case

(cherry picked from commit 5b1571879c)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2024-01-08 17:44:24 +05:30
Shariq Ansari
58357f8891 Merge pull request #39206 from frappe/mergify/bp/version-15-hotfix/pr-39204 
fix: add expected_start_date in sort by (backport #39204)
 2024-01-08 16:37:37 +05:30
Shariq Ansari
8cc9ddaebd chore: linter fix 2024-01-08 16:30:26 +05:30
Shariq Ansari
1f64b8fcd8 chore: linter fix 2024-01-08 16:30:03 +05:30
Shariq Ansari
80a2b79bba chore: linter fix 2024-01-08 16:29:13 +05:30
Shariq Ansari
b064944753 fix: add expected_start_date in sort by 
(cherry picked from commit 3d54fd8389)
 2024-01-08 10:40:20 +00:00
mergify[bot]
672e6d6d06 fix: duplicate entry for serial / batch creation (backport #39188) (#39192) 
fix: duplicate entry for serial / batch creation (#39188)

(cherry picked from commit b96c063c93)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-01-08 14:21:04 +05:30
mergify[bot]
926850d1f6 fix: update Maintenance Schedule status on Maintenance Visit submit (backport #39167) (#39186) 
* fix: make `Sales Person` non-mandatory

(cherry picked from commit 4d56f725fe)

* fix: update Maintenance Schedule status on Maintenance Visit submit

(cherry picked from commit cd293a5173)

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2024-01-08 13:23:12 +05:30
Nabin Hait
d6d54ed220 fix: Purchase date and amount is not mandatory for composite asset creation 
(cherry picked from commit c34f09c503)

# Conflicts:
#	erpnext/assets/doctype/asset/asset.py
 2024-01-08 06:53:11 +00:00
Nabin Hait
e89dce726b fix: improved validation message 
(cherry picked from commit fe43dab4d7)
 2024-01-08 06:53:10 +00:00
ruthra kumar
83288fedf1 Merge pull request #39187 from ruthra-kumar/backport_37613 
fix: possible key error in Financial Ratio's report
 2024-01-08 12:08:13 +05:30
ruthra kumar
16269b0730 fix: possible key error on Financial ratios report 2024-01-08 11:50:13 +05:30
ruthra kumar
f1d25700a8 Merge pull request #39183 from frappe/mergify/bp/version-15-hotfix/pr-39161 
refactor: allow sales invoice in Bank Reconciliation tool (backport #39161)
 2024-01-08 11:09:42 +05:30
ruthra kumar
00d36d14fb refactor: allow sales invoice in Bank Reconciliation tool 
(cherry picked from commit b69cdeb4a6)
 2024-01-08 05:02:30 +00:00
ruthra kumar
c912e4c99d Merge pull request #39182 from frappe/mergify/bp/version-15-hotfix/pr-39165 
fix: incorrect outstanding amt validation on advance as liability (backport #39165)
 2024-01-08 10:31:17 +05:30
ruthra kumar
1eee52c59c Merge pull request #39181 from frappe/mergify/bp/version-15-hotfix/pr-39159 
refactor: prevent permission error by always processing bulk transaction in background (backport #39159)
 2024-01-08 10:30:48 +05:30
ruthra kumar
51d8a7a0c1 fix: incorrect outstanding amt validation on advance as liability 
(cherry picked from commit 4cc3c1b765)
 2024-01-08 04:45:03 +00:00
ruthra kumar
f0bc0aa676 refactor: prevent permissions by always processing in background 
(cherry picked from commit 15dc5c7e99)
 2024-01-08 04:43:11 +00:00