barredterra
|
8039dc5194
|
Merge branch 'develop' into unreconcile-bank-transaction-on-cancel
|
2024-01-11 13:54:07 +01:00 |
|
ruthra kumar
|
2a195d457e
|
Merge pull request #39320 from ruthra-kumar/possible_typeerror_in_consolidated_report
fix: possible typeerror in consolidated report
|
2024-01-11 16:54:30 +05:30 |
|
ruthra kumar
|
951e8e3a73
|
Merge pull request #39317 from ruthra-kumar/fix_broken_dimension_filters_in_sales_purchase_register_report
fix: broken dimension filters in Sales/Purchase register
|
2024-01-11 16:50:12 +05:30 |
|
ruthra kumar
|
268731aec4
|
fix: possible typeerror in consolidated report
|
2024-01-11 16:45:49 +05:30 |
|
ruthra kumar
|
7b3f9386d7
|
fix: broken dimension filters in Sales/Purchase register
|
2024-01-11 16:24:43 +05:30 |
|
rohitwaghchaure
|
eb0bc5c6ad
|
Merge pull request #39215 from rohitwaghchaure/fixed-incorrect-per-received-in-pi
fix: incorrect percentage received in purchase invoice
|
2024-01-11 14:50:19 +05:30 |
|
Gursheen Anand
|
813b7a96fb
|
fix: reset default after test
|
2024-01-11 12:22:08 +05:30 |
|
Gursheen Anand
|
bbdf98a8f0
|
test: naming series variable parsing
|
2024-01-10 22:06:06 +05:30 |
|
Gursheen Anand
|
d96a777edd
|
fix: date in master document for dictionary condition
|
2024-01-10 22:05:02 +05:30 |
|
David Arnold
|
e53931e27a
|
feat(accounts): add preview for accounts
|
2024-01-10 11:07:39 +01:00 |
|
Raffael Meyer
|
6f9fe6a792
|
fix: wrong usage of get_single_value (#39268)
* fix: wrong usage of get_single_value
* test: fix wrong fieldname
* chore: typo
---------
Co-authored-by: Ankush Menat <ankush@frappe.io>
|
2024-01-10 12:32:27 +05:30 |
|
Nabin Hait
|
2ef0596df2
|
Merge pull request #39275 from nabinhait/fetch-timesheet-in-invoice
fix: Show timesheet table after fetching data from timesheet
|
2024-01-10 11:33:51 +05:30 |
|
Nabin Hait
|
01f507ebcb
|
Merge pull request #39238 from nabinhait/asset-purchase-amount
fix: Set asset purchase amount based on qty and valuation_rate
|
2024-01-10 11:31:30 +05:30 |
|
Nabin Hait
|
e1ba5878a3
|
fix: Show timesheet table after fetching data from timesheet
|
2024-01-10 11:26:33 +05:30 |
|
barredterra
|
5b4c5d59d8
|
Merge branch 'develop' into unreconcile-bank-transaction-on-cancel
|
2024-01-09 18:12:30 +01:00 |
|
Ankush Menat
|
bb18ae82cf
|
refactor: use db.get_single_value
|
2024-01-09 21:57:50 +05:30 |
|
Gursheen Anand
|
8e1f6c8149
|
test: split and auto set against in JV
|
2024-01-09 21:47:59 +05:30 |
|
rohitwaghchaure
|
274c65c451
|
fix: TypeError is pricing rules (#39252)
|
2024-01-09 16:20:42 +05:30 |
|
ruthra kumar
|
d32a407e08
|
fix: update status on manual allocation
|
2024-01-09 15:35:42 +05:30 |
|
Gursheen Anand
|
ce7d05aa1f
|
fix: gl_map for auto-set against accounts
|
2024-01-09 15:08:30 +05:30 |
|
Nabin Hait
|
ec07b42ea2
|
Merge pull request #38530 from bosue/duplicate_zero_quantity_check2
refactor: Consolidate duplicate zero-quantity Items checks for transactions.
|
2024-01-09 13:12:25 +05:30 |
|
Nabin Hait
|
135e19d0aa
|
fix: Set asset purchase amount based on qty and valuation_rate
|
2024-01-09 12:51:57 +05:30 |
|
Gursheen Anand
|
bb421c8b07
|
fix: validate doctype before creating payment request
|
2024-01-09 11:33:52 +05:30 |
|
David Arnold
|
b5be17c6df
|
fix: use most reliable section reference per report line
|
2024-01-08 22:12:19 +01:00 |
|
mahsem
|
2b93be1139
|
Update sales_taxes_and_charges.json
Change Rate label to existing Tax Rate label so it can be correctly translated in other languages
|
2024-01-08 18:47:44 +01:00 |
|
mahsem
|
bd464197c4
|
Update purchase_taxes_and_charges.json label Rate to Tax Rate
Change Rate label to existing Tax Rate label so it can be correctly translated in other languages
|
2024-01-08 18:45:39 +01:00 |
|
Nabin Hait
|
62bbcbc7ef
|
Merge pull request #39202 from GursheenK/fiscal-year-naming-keyerror
fix: parse naming series with FY name
|
2024-01-08 21:48:39 +05:30 |
|
Nabin Hait
|
96530b9c0b
|
Merge pull request #39193 from GursheenK/coa-from-existing-company
fix: account currency from existing company COA
|
2024-01-08 21:46:52 +05:30 |
|
Nabin Hait
|
0cbcc55d9a
|
Merge pull request #39195 from GursheenK/no-copy-party-balance
fix: avoid copying party balance on duplication of PE
|
2024-01-08 21:38:53 +05:30 |
|
Rohit Waghchaure
|
8d2c78867e
|
fix: incorrect percentage received in purchase invoice
|
2024-01-08 18:17:01 +05:30 |
|
Gursheen Anand
|
d0ea598cdf
|
fix: fetch name for fy
|
2024-01-08 15:50:50 +05:30 |
|
ruthra kumar
|
6de8c18f98
|
fix: bank transction status upon reconciliation
|
2024-01-08 15:38:43 +05:30 |
|
Gursheen Anand
|
5923b48ede
|
fix: avoid copying party balance
|
2024-01-08 13:18:01 +05:30 |
|
Gursheen Anand
|
7d264696f3
|
fix: account currency from existing company coa
|
2024-01-08 13:07:42 +05:30 |
|
ruthra kumar
|
7ddbfa10c9
|
Merge pull request #39161 from ruthra-kumar/allow_sales_invoice_in_bank_reconciliation
refactor: allow sales invoice in Bank Reconciliation tool
|
2024-01-08 10:31:31 +05:30 |
|
ruthra kumar
|
4bd437b59d
|
Merge pull request #39165 from ruthra-kumar/bug_in_payment_entry_outstanding_reference
fix: incorrect outstanding amt validation on advance as liability
|
2024-01-08 10:14:15 +05:30 |
|
David Arnold
|
b73507abe0
|
Merge remote-tracking branch 'origin/develop' into feat/so-po-advance-payment-status
|
2024-01-05 21:36:14 +01:00 |
|
Raffael Meyer
|
07b605a287
|
fix: make Dr/Cr in CoA translatable (#39033)
* fix: make Dr/Cr in CoA translatable
* fix: german translations
|
2024-01-05 23:33:42 +05:30 |
|
barredterra
|
5d33bbaff0
|
refactor(Journal Entry): remove unused/redundant list indicators
|
2024-01-05 17:26:54 +01:00 |
|
ruthra kumar
|
4cc3c1b765
|
fix: incorrect outstanding amt validation on advance as liability
|
2024-01-05 20:42:38 +05:30 |
|
ruthra kumar
|
b69cdeb4a6
|
refactor: allow sales invoice in Bank Reconciliation tool
|
2024-01-05 16:13:49 +05:30 |
|
Raffael Meyer
|
68c0e188e8
|
fix: remove parent_field parameter from calls to rebuild_tree (#39146)
fix: remove parent_field parameter from calls to rebuild_tree
The parent_field parameter became redundant with https://github.com/frappe/frappe/pull/24107
|
2024-01-04 18:12:41 +05:30 |
|
Deepesh Garg
|
e2cf1ea73e
|
Merge pull request #39125 from ruthra-kumar/ignore_cancelled_payment_in_sales_register
fix: ignore cancelled payments in Sales/Purchase Register
|
2024-01-04 11:14:25 +05:30 |
|
Deepesh Garg
|
5b1571879c
|
fix: flaky demo test case
|
2024-01-04 10:48:01 +05:30 |
|
ruthra kumar
|
0f1be03faf
|
fix: ignore cancelled payments in Sales/Purchase Register
|
2024-01-03 20:57:01 +05:30 |
|
Ankush Menat
|
e84c9f7c51
|
fix(UX): dont override framework's permission check messages (#39118)
|
2024-01-03 20:10:19 +05:30 |
|
Deepesh Garg
|
b21da472f6
|
feat: In words in payment entry
|
2024-01-03 13:34:22 +05:30 |
|
Ankush Menat
|
6401908f41
|
fix: Ignore UP on "allowed to transact with" (#39103)
If a customer is allowed to transact with some company it usually
doesn't imply that customer is somehow "linked with" that company.
|
2024-01-03 11:15:34 +05:30 |
|
Deepesh Garg
|
beee98da6d
|
feat: Against voucher filter in General Ledger (#39100)
|
2024-01-03 10:03:27 +05:30 |
|
ruthra kumar
|
60c33ac3e6
|
Merge pull request #39097 from ruthra-kumar/make_loyalty_program_editable
refactor: flag to control loyalty point creation at invoice level
|
2024-01-03 09:46:43 +05:30 |
|