ruthra kumar
|
4f51c5a433
|
refactor: submit and make JV through background job
|
2023-07-07 05:49:53 +05:30 |
|
Raffael Meyer
|
4badac8e9e
|
fix(Payment Entry): compare rounded amount (#36011)
|
2023-07-05 21:35:41 +05:30 |
|
mergify[bot]
|
98281341b9
|
fix: handle loan_repayment's posting_date datetime in bank_clearance_summary report (backport #36004) (#36005)
* fix: handle loan_repayment's posting_date datetime in bank_clearance_summary report (#36004)
(cherry picked from commit 937e1fb0245af291789ccd88f168d0402d9a00d8)
# Conflicts:
# erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py
* chore: resolving conflicts
---------
Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
|
2023-07-04 22:46:00 +05:30 |
|
Deepesh Garg
|
0a17c78a36
|
fix: Share ledger showing cancelled docs (#35993)
|
2023-07-04 17:49:07 +05:30 |
|
Sagar Vora
|
30e4052a76
|
feat(accounts): standardize additional columns implementation for sales/purchase reports (#36000)
|
2023-07-04 17:41:30 +05:30 |
|
Deepesh Garg
|
2f169575e9
|
fix: Netherlands - Grootboekschema COA structure (#35991)
fix: Netherlands - Grootboekschema coa structure
|
2023-07-04 15:30:27 +05:30 |
|
Ankush Menat
|
a449a4be29
|
chore: Add frappe school links (#35995)
Frappe School provides plenty of free tutorial for learning ERPNext.
|
2023-07-04 14:58:45 +05:30 |
|
barredterra
|
a939431d48
|
fix: german translations
|
2023-07-03 21:03:24 +02:00 |
|
barredterra
|
e686bb0739
|
Merge remote-tracking branch 'upstream/develop' into payments-based-dunning
|
2023-07-03 19:56:42 +02:00 |
|
rohitwaghchaure
|
8179d6a30d
|
Merge pull request #35977 from rohitwaghchaure/reserve-pos-invoice-batches
fix: reserve the pos invoice batches
|
2023-07-03 22:33:45 +05:30 |
|
Rohit Waghchaure
|
1e8f6c0840
|
fix: reserve the pos invoice batches
|
2023-07-03 17:38:48 +05:30 |
|
ruthra kumar
|
6644311c8b
|
refactor: checkbox for enabling auto ERR creation
|
2023-07-03 14:31:13 +05:30 |
|
Anand Baburajan
|
dedb5e23f7
|
fix: delete loan module workspace properly after separation (#35971)
* fix: delete loan module workspace properly after separation
* chore: run remove_loan_management_module patch again
|
2023-07-03 13:06:46 +05:30 |
|
Deepesh Garg
|
5448859254
|
fix: Update no copy for received_qty field (#35965)
|
2023-07-03 13:03:52 +05:30 |
|
Vishnu VS
|
e05b33a6c2
|
feat: add method for ordered quantity in supplier scorecard (#35930)
fix: add method for getting ordered quantity in the supplier scorecard variable.
Co-authored-by: vishnu <vishnuviswambara2002@gmail.com>
|
2023-07-03 09:23:27 +05:30 |
|
rohitwaghchaure
|
ab58c01a0f
|
Merge pull request #35961 from frappe/mergify/bp/develop/pr-35955
fix: incorrect reposting causing stock adjustment entry (backport #35955)
|
2023-07-02 11:17:37 +05:30 |
|
rohitwaghchaure
|
232dfad13a
|
fix: conflicts
|
2023-07-02 10:45:12 +05:30 |
|
Rohit Waghchaure
|
b77a808921
|
fix: reposting has not changed valuation rate
(cherry picked from commit c0c693d8b0faf42089314cf43f4fc117f45de4b4)
# Conflicts:
# erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
|
2023-07-02 05:13:29 +00:00 |
|
Deepesh Garg
|
3df0c5e32f
|
Merge pull request #35609 from GursheenK/#34282-Record-advance-payment-as-a-liability
feat: Record Advance Payment as a liability
|
2023-07-01 17:49:49 +05:30 |
|
Deepesh Garg
|
d54f52474a
|
fix: Expense Account filter in Sales Invoice (#35944)
|
2023-06-30 20:02:46 +05:30 |
|
Deepesh Garg
|
be5cb1aa17
|
Merge pull request #35943 from GursheenK/company-specific-proj-filtering
fix: project filtering based on company in P&L Report
|
2023-06-30 20:01:24 +05:30 |
|
Deepesh Garg
|
fda2d2bd59
|
Merge branch 'develop' of https://github.com/frappe/erpnext into #34282-Record-advance-payment-as-a-liability
|
2023-06-30 19:35:34 +05:30 |
|
Deepesh Garg
|
80e6c90740
|
chore: precision in test
|
2023-06-30 19:35:22 +05:30 |
|
Florian HENRY
|
da72bd9819
|
feat: add Lead to Adresse And contact report
|
2023-06-30 15:11:45 +02:00 |
|
Deepesh Garg
|
7e7737d692
|
test: Update test account
|
2023-06-30 18:37:52 +05:30 |
|
Deepesh Garg
|
0a49213338
|
test: Update test records
|
2023-06-30 17:32:42 +05:30 |
|
s-aga-r
|
fa3ab678e1
|
Merge pull request #35945 from s-aga-r/BATCH-DISABLE-FILTER
fix: add filter for disabled batch
|
2023-06-30 13:39:11 +05:30 |
|
Marica
|
0a67a3a9c4
|
Merge branch 'develop' into payments-based-dunning
|
2023-06-30 13:32:50 +05:30 |
|
Deepesh Garg
|
bbb6ebb84e
|
fix: Outstanding amount validation
|
2023-06-30 13:25:22 +05:30 |
|
Gursheen Anand
|
84d4888f5f
|
fix: make company field mandatory in project doctype
|
2023-06-30 12:54:45 +05:30 |
|
Gursheen Anand
|
ce252a0d45
|
fix: show projects with no company value set
|
2023-06-30 12:42:19 +05:30 |
|
s-aga-r
|
90a77030a7
|
fix: add filter for disabled batch
|
2023-06-30 12:34:39 +05:30 |
|
Gursheen Anand
|
904ca746a6
|
fix: project filtering in P&L Report
|
2023-06-30 12:11:23 +05:30 |
|
Anand Baburajan
|
988d755906
|
refactor!: removing loan management module (#35522)
* chore: resolving conflicts
* refactor: bank_clearance and add hook for get_payment_entries_for_bank_clearance
* refactor: bank_reconciliation_tool and add hook for get_matching_vouchers_for_bank_reconciliation
* fix: remove sales invoice from bank_reconciliation_doctypes and use hook for voucher clearance
* refactor: remove loan tests from test_bank_transaction
* refactor: bank_clearance_summary and add hook for get_entries_for_bank_clearance_summary
* refactor: removed test_bank_reconciliation_statement
* refactor: bank_reconciliation_statement and add hook for get_amounts_not_reflected_in_system_for_bank_reconciliation_statement
* refactor: add missing hook and patches for module removal and deprecation warning
* refactor: remove loan management translations
* chore: add erpnext tests dependent on lending
|
2023-06-30 11:02:49 +05:30 |
|
rohitwaghchaure
|
9f1cf0bbb0
|
Merge pull request #35921 from rohitwaghchaure/fixed-seperate-table-for-schedule
refactor: separate table added to track scheduling in the job card.
|
2023-06-29 22:24:47 +05:30 |
|
s-aga-r
|
fe4161e4d7
|
Merge pull request #35935 from s-aga-r/FIX-35898
feat: allow the partial return of components against SCO
|
2023-06-29 21:20:59 +05:30 |
|
Rohit Waghchaure
|
497c83eb7e
|
refactor: separate table added to track scheduling in the job card
|
2023-06-29 20:51:44 +05:30 |
|
s-aga-r
|
2a60884abc
|
fix: reduce return qty while calculating transferred qty
|
2023-06-29 18:59:18 +05:30 |
|
s-aga-r
|
2f6d56dd62
|
fix: don't update SCO status to closed until full return
|
2023-06-29 18:44:40 +05:30 |
|
Deepesh Garg
|
0408b6d655
|
Merge branch 'develop' of https://github.com/frappe/erpnext into #34282-Record-advance-payment-as-a-liability
|
2023-06-29 12:19:42 +05:30 |
|
Deepesh Garg
|
1e078d03bb
|
fix: Partial PLE cancellation
|
2023-06-29 12:18:25 +05:30 |
|
RJPvT
|
1d1103f39c
|
chore: update translations
chore: update translations
|
2023-06-29 11:02:08 +05:30 |
|
Deepesh Garg
|
06821f9781
|
Merge pull request #35904 from GursheenK/voucher-wise-balance-report
feat: add voucher-wise balance report for unequal dr/cr GL entries
|
2023-06-29 09:07:45 +05:30 |
|
Anand Baburajan
|
50cbdc778f
|
Merge pull request #35923 from frappe/mergify/bp/develop/pr-35918
fix: asset movement (backport #35918)
|
2023-06-28 20:59:50 +05:30 |
|
Anand Baburajan
|
a4d6f2eba6
|
fix: asset movement (#35918)
fix: asset movement fixes
(cherry picked from commit e16c14863b52aaa7856c799ad64fe977d4a4fbbe)
|
2023-06-28 14:46:27 +00:00 |
|
Ankush Menat
|
86f453593a
|
perf: avoid perm checks from background jobs
|
2023-06-28 20:15:29 +05:30 |
|
Ankush Menat
|
9e1736e027
|
fix: index collect_progress and project date (#35920)
There's background job to send progress update, this ends up scanning
entire table.
|
2023-06-28 19:19:14 +05:30 |
|
marination
|
5a952987a3
|
fix: Use this.frm (Linter)
|
2023-06-28 17:13:34 +05:30 |
|
Marica
|
0498a31c42
|
Merge branch 'develop' into payments-based-dunning
|
2023-06-28 16:48:22 +05:30 |
|
Gursheen Kaur Anand
|
b9e9204e52
|
fix: create multiple variants button count and status (#35915)
fix: change class for fetching columns in multiple variants
|
2023-06-28 15:39:00 +05:30 |
|