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

49856 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ruthra kumar
ba09ddcc3a chore: resolve conflict 2024-11-01 14:10:45 +05:30
ruthra kumar
d0a655d5ae test: PO advance and currency from journal 
(cherry picked from commit cf7b8f1b41)
 2024-11-01 08:35:08 +00:00
ruthra kumar
91a276d4ed test: PO 'Advance Paid' and curreny when using payment 
(cherry picked from commit ca85c75e39)
 2024-11-01 08:35:08 +00:00
ruthra kumar
16c1fc75b5 chore: move tests to advance payment ledger doctype 
(cherry picked from commit 14cef3d4c4)
 2024-11-01 08:35:08 +00:00
ruthra kumar
7f9ae4e044 test: advance and currency from Journal 
(cherry picked from commit 1825082512)
 2024-11-01 08:35:07 +00:00
ruthra kumar
c8be4f3f78 refactor: use dr / cr account currency field for journals 
(cherry picked from commit 9c1a4e284c)
 2024-11-01 08:35:07 +00:00
ruthra kumar
d830ce1d88 test: USD Sales Order with advance payment 
(cherry picked from commit 6c731561f3)
 2024-11-01 08:35:07 +00:00
ruthra kumar
07a394a1c5 refactor: handle currency on advance payment ledger 
(cherry picked from commit ae6a81cd07)
 2024-11-01 08:35:07 +00:00
ruthra kumar
68a95c7dbc refactor: move creation logic to controller 
(cherry picked from commit ad88bde448)
 2024-11-01 08:35:07 +00:00
ruthra kumar
164d7cc896 refactor: handle 'no data' situation in patch 
(cherry picked from commit 8e3bf7dc09)
 2024-11-01 08:35:07 +00:00
ruthra kumar
063cef576c chore: update ignore_linked_doctypes for Journal Entry 
(cherry picked from commit 767ae6a372)
 2024-11-01 08:35:06 +00:00
ruthra kumar
c6bfdcf503 chore: update patchex.txt 
(cherry picked from commit 8ab7194b1d)
 2024-11-01 08:35:06 +00:00
ruthra kumar
085e0455d8 refactor: patch to migrating old SO / PO to advance ledger 
(cherry picked from commit b927f2f4a0)
 2024-11-01 08:35:06 +00:00
ruthra kumar
cb36dcb382 refactor(test): reconciliation shouldn't affect advance paid 
(cherry picked from commit 35a8a18728)
 2024-11-01 08:35:06 +00:00
ruthra kumar
ffd426d43d refactor: link journal entry to advance payment ledger 
(cherry picked from commit fca5e95248)
 2024-11-01 08:35:06 +00:00
ruthra kumar
d84a3c4f29 fix: deleting SO/PO will remove its advance payment ledger entry 
(cherry picked from commit 14357bccba)
 2024-11-01 08:35:06 +00:00
ruthra kumar
a12df122a9 refactor(test): advance_paid stays after reconciliation 
(cherry picked from commit c4197c3f31)
 2024-11-01 08:35:05 +00:00
ruthra kumar
df25d33735 chore: remove duplicate test class 
(cherry picked from commit e2891a60d5)
 2024-11-01 08:35:05 +00:00
ruthra kumar
a6c26874c7 refactor: remove advance payment ledgers on document deletion 
(cherry picked from commit 3c53b92f05)
 2024-11-01 08:35:05 +00:00
ruthra kumar
54f758c327 refactor: calculate advance from advance ledger 
(cherry picked from commit 2b2360bf7b)

# Conflicts:
#	erpnext/controllers/accounts_controller.py
 2024-11-01 08:35:05 +00:00
ruthra kumar
bf0b74bcbd refactor: create advance ledger entries on submit and cancel 
(cherry picked from commit 575ca5b900)
 2024-11-01 08:35:04 +00:00
ruthra kumar
0d02f8b5d1 refactor: make all fields readonly 
(cherry picked from commit f176a82198)
 2024-11-01 08:35:04 +00:00
ruthra kumar
b343334f69 feat: advance payment ledger doctype 
(cherry picked from commit 2d6efd7cc8)
 2024-11-01 08:35:04 +00:00
mergify[bot]
4a749cec72 feat: remove Payroll Entry from Bank Account dashboard (backport #43931) (#43933) 
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2024-10-30 15:49:26 +01:00
Shariq Ansari
5ea498062c Merge pull request #43927 from frappe/mergify/bp/version-15-hotfix/pr-43921 
fix: cannot create opp from lead without prospect (backport #43921)
 2024-10-30 14:40:00 +05:30
Shariq Ansari
4dcaf42bc5 fix: cannot create opp from lead without prospect 
(cherry picked from commit 603383bca7)
 2024-10-30 08:18:53 +00:00
mergify[bot]
db3be4195c fix: purchase return validation issue (backport #43871) (backport #43874) (#43879) 
fix: purchase return validation issue (backport #43871) (#43874)

fix: purchase return validation issue (#43871)

(cherry picked from commit a7cc7b28c0)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
(cherry picked from commit b4d4c4a736)

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
 2024-10-30 12:17:46 +05:30
mergify[bot]
9a526611e0 fix: calculate tds with net amount when invoice exceeds single threshold amount (backport #43869) (#43920) 
* fix: calculate tds with net amount when invoice exceeds single threshold amount

(cherry picked from commit ef694a40a1)

* test: add unit test to validate purchase invoice exceeding single threshold value

(cherry picked from commit 94badb464d)

---------

Co-authored-by: venkat102 <venkatesharunachalam659@gmail.com>
 2024-10-30 11:25:56 +05:30
Nabin Hait
9ac87bd3b1 fix: rounding issue of required qty in subcontracting order (#43908) 
* fix: rounding issue of required qty in subcontracting order

* fix: uom issue in test case

* fix: test case

* fix: restored report tests for manufacturing
 2024-10-30 11:25:08 +05:30
Nabin Hait
0171af4604 Merge branch 'version-15' into version-15-hotfix 2024-10-30 11:23:52 +05:30
ruthra kumar
3ab31dcb92 Merge pull request #43917 from frappe/mergify/bp/version-15-hotfix/pr-43886 
fix: remarks field in payment reconciliation (backport #43886)
 2024-10-30 10:43:58 +05:30
ruthra kumar
63ecf13058 Merge pull request #43918 from frappe/mergify/bp/version-15-hotfix/pr-43913 
fix: find first PCV to consider opening entries (backport #43913)
 2024-10-30 10:43:47 +05:30
Nabin Hait
8218ca990c fix: find first PCV to consider opening entries 
(cherry picked from commit 2201fc62a2)
 2024-10-30 04:55:31 +00:00
ruthra kumar
ac121dd4e3 chore: resolve conflict 2024-10-30 10:23:41 +05:30
Ahmed Shareef
870709079b fix: remarks field in payment reconciliation 
(cherry picked from commit 2d5b079949)

# Conflicts:
#	erpnext/accounts/doctype/payment_reconciliation_payment/payment_reconciliation_payment.json
 2024-10-30 04:50:27 +00:00
ruthra kumar
302f049025 Merge pull request #43915 from frappe/mergify/bp/version-15-hotfix/pr-43884 
fix: recalculate outstanding after save on checkout for POS Invoice (backport #43884)
 2024-10-30 10:19:50 +05:30
ljain112
63668eb855 fix: recalculate outstanding after save on checkout for POS Invoice 
(cherry picked from commit 9ce2184c66)
 2024-10-30 04:37:19 +00:00
Khushi Rawat
9a93c892be Merge pull request #43912 from frappe/mergify/bp/version-15-hotfix/pr-43899 
fix: consider opening asset values while calculating depreciation rate (backport #43899)
 2024-10-30 00:24:47 +05:30
Khushi Rawat
1af2326a52 fix: consider opening asset values while calculating asset depreciation rate 
(cherry picked from commit 9d0fe7aa56)
 2024-10-29 18:36:31 +00:00
mergify[bot]
ab162070a6 fix: Patch for reposting account closing balance (backport #43905) (#43910) 
fix: Patch for reposting account closing balance (#43905)

(cherry picked from commit 3a0d27b393)

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2024-10-29 23:22:29 +05:30
Frappe PR Bot
d8e1a21bdc chore(release): Bumped to Version 15.39.6 
## [15.39.6](https://github.com/frappe/erpnext/compare/v15.39.5...v15.39.6) (2024-10-29)

### Bug Fixes

* Patch for reposting account closing balance (backport [#43905](https://github.com/frappe/erpnext/issues/43905)) ([#43909](https://github.com/frappe/erpnext/issues/43909)) ([c2eb771](c2eb771c4d))
v15.39.6 		2024-10-29 17:39:33 +00:00
mergify[bot]
c2eb771c4d fix: Patch for reposting account closing balance (backport #43905) (#43909) 
fix: Patch for reposting account closing balance (#43905)

(cherry picked from commit 3a0d27b393)

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2024-10-29 23:07:58 +05:30
mergify[bot]
8a72845ee6 fix: Handle None value for item description in customer portal invoice view (backport #43823) (#43889) 
fix: Handle None value for item description in customer portal invoice view

(cherry picked from commit ceb449c75b)

Co-authored-by: ljain112 <ljain112@gmail.com>
 2024-10-29 22:38:41 +05:30
mergify[bot]
7189daba19 fix: work order finish button not showing (backport #43875) (backport #43877) (#43904) 
fix: work order finish button not showing (backport #43875) (#43877)

* fix: work order finish button not showing (#43875)

(cherry picked from commit 0a70be5b99)

# Conflicts:
#	erpnext/manufacturing/doctype/job_card/job_card.js
#	erpnext/manufacturing/doctype/job_card/job_card.py

* chore: fix conflicts

* chore: fix conflicts

* chore: fix conflicts

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
(cherry picked from commit 76530de786)

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
 2024-10-29 22:37:26 +05:30
mergify[bot]
93d0db2910 fix: Calculate gross margin on update of project costing from invoices (backport #43876) (#43900) 
* fix: Calculate gross margin on update of project costing from invoices (#43876)

* fix: Calculate gross margin on update of project costing from invoices

* chore: linter issues

(cherry picked from commit 0bba6442c0)

# Conflicts:
#	erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json

* fix: merge conflict

---------

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2024-10-29 22:36:39 +05:30
Frappe PR Bot
50db0aca61 chore(release): Bumped to Version 15.39.5 
## [15.39.5](https://github.com/frappe/erpnext/compare/v15.39.4...v15.39.5) (2024-10-29)

### Bug Fixes

* post account closing balance against pcv closing account ([#43887](https://github.com/frappe/erpnext/issues/43887)) ([becfd98](becfd980b2))
v15.39.5 		2024-10-29 15:39:40 +00:00
ruthra kumar
b5d2708f69 Merge pull request #43902 from frappe/mergify/bp/version-15/pr-43887 
fix: post account closing balance against pcv closing account (backport #43887)
 2024-10-29 21:08:20 +05:30
Nabin Hait
becfd980b2 fix: post account closing balance against pcv closing account (#43887) 
(cherry picked from commit 34295d0344)
 2024-10-29 15:37:05 +00:00
Frappe PR Bot
be6cd6adc3 chore(release): Bumped to Version 15.39.4 
## [15.39.4](https://github.com/frappe/erpnext/compare/v15.39.3...v15.39.4) (2024-10-29)

### Bug Fixes

* use period closing voucher object to call get_account_closing_ba… ([#43880](https://github.com/frappe/erpnext/issues/43880)) ([94a03c6](94a03c6e17))
v15.39.4 		2024-10-29 15:34:46 +00:00
ruthra kumar
48939f25c8 Merge pull request #43901 from frappe/mergify/bp/version-15/pr-43880 
fix: use period closing voucher object to call get_account_closing_ba… (backport #43880)
 2024-10-29 21:03:20 +05:30