Gursheen Anand
033e4e84f5
fix: modify voucher details for liability entries
2023-06-14 14:20:42 +05:30
Gursheen Anand
ba4ab06ae3
fix: changed account types in controller method
2023-06-14 12:39:16 +05:30
Gursheen Anand
17341adf1c
fix: calculate outstanding amount on reconcile correctly
2023-06-13 15:00:46 +05:30
Gursheen Anand
5e9821dce2
test: modify test to check posting date
2023-06-12 18:00:15 +05:30
Gursheen Anand
a06017c2c3
fix: Use advance account from Reconciliation document for fetching Payment Entries
2023-06-12 15:24:53 +05:30
Gursheen Anand
7591f1010b
fix: Make get party account method return a list instead of a single default account.
2023-06-12 11:06:03 +05:30
Gursheen Anand
b65e58c1ae
test: add tests for advance liability entries
...
Add Sales and Purchase Invoice Tests to check if GL entries and Outstanding Amount are generated correctly when advance entries are recorded as liability.
Few changes to return value of added column in Payment Entry References.
2023-06-08 18:15:37 +05:30
Gursheen Anand
4ee163742a
fix: Using one field for both advance liability accounts
2023-06-08 13:15:23 +05:30
Gursheen Anand
74619269f0
feat: Record Advance Payments as Liability
...
Ability to let user record advance payments as liability instead of a negative asset.
Issue #34282
2023-06-02 17:13:51 +05:30
Akshay
1ab04344db
fix (ui): debit note issued status indicator color ( #35401 )
...
* fix: debit note issued status indicator color
* fix: change DebitNoteIssued color from grey to gray
2023-05-29 09:42:01 +05:30
Nabin Hait
3504bf7f62
fix: Show future payments in accounts receivable summary ( #35416 )
2023-05-29 09:23:40 +05:30
Sagar Sharma
027de41600
fix: incorrect POS Reserved Qty in Stock Projected Qty Report
2023-05-27 12:05:37 +05:30
mergify[bot]
55806c51f2
fix: Gross and Net Profit Report - incorrect calculation of totals
...
* fix: account group totals calculation to consider include_in_gross
(cherry picked from commit 8dcb9302b417618505ea24e5566c017eff451c1e)
* refactor: remove unused parameters
(cherry picked from commit 50822f207ec5272d4d71a2b6579693da2088105d)
* refactor: merge separate loops for calculating group / leaf node totals
rename function
remove return statement as the list is mutated
(cherry picked from commit 1a3b9c5bdfb9fac04a3a7d8724e6b3c3b593ec19)
* fix: add total col for gross and net profit
(cherry picked from commit cb9b4fbb91f4b73916416167932064ef5965eed1)
---------
Co-authored-by: Anoop Kurungadam <anoop@earthianslive.com>
2023-05-25 18:12:50 +05:30
ruthra kumar
ec5d34117b
Merge pull request #35417 from ruthra-kumar/fix_ambiguous_company_in_gross_profit_report
...
fix(Gross Profit): 'company' column is ambiguous in filter
2023-05-25 15:06:35 +05:30
ruthra kumar
448712f719
fix(Gross Profit): 'company' column is ambiguous in filter
2023-05-25 14:18:41 +05:30
Anand Baburajan
edb7b0db8f
fix: incorrect depr schedule and posting dates on selling of existing assets [dev] ( #35398 )
...
* fix: calc depr amount properly on selling of existing assets and fix incorrect posting dates
* chore: get number_of_depreciations_booked properly
* chore: fix test_gle_made_by_asset_sale_for_existing_asset
2023-05-24 12:29:46 +05:30
Ankush Menat
b0eb72ffac
fix: replace quotation with invoice in first onboarding ( #35389 )
...
[skip ci]
2023-05-23 15:35:55 +05:30
ruthra kumar
1587ce3bfb
Merge pull request #35335 from ruthra-kumar/incorrect_tds_calcuation_if_supplier_has_different_category
...
fix: tds incorrectly calculated for invoice that are below threshold
2023-05-18 12:38:31 +05:30
ruthra kumar
132846bbd1
fix(test): cumulative threshold checks
2023-05-18 12:00:59 +05:30
ruthra kumar
84b7c1bba0
fix: tds incorrectly calculated for invoice that are below threshold
...
Two purchase invoices for the same supplier, using different tax
withholding categories have this issue.
| Category | single | cumulative |
|----------+--------+------------|
| cat1 | 100 | 500 |
| cat2 | 1000 | 5000 |
1. PINV1 of net total: 105/- uses cat1. TDS is calculated as it
breached single threshold
2. PINV2 of net total: 200/- uses cat2. TDS incorrectly calculated as
PINV1 already has TDS calculated and 'consider_party_ledger_amount' is enabled.
2023-05-17 13:55:41 +05:30
ruthra kumar
e927f6cab1
Merge pull request #35239 from ashish-greycube/patch-8
...
fix: in payment_entry difference amount cal is broken
2023-05-17 10:25:55 +05:30
Ashish Shah
ae4e56747c
refactor: use 'flt' for base_total_taxes_and_charges
...
difference_amount calculation is broken, as calculation gives NaN. Fix is make frm.doc.base_total_taxes_and_charges as flt(frm.doc.base_total_taxes_and_charges)
2023-05-16 16:55:11 +05:30
ruthra kumar
776a83066d
fix: cancelled vouchers in tax withheld vouchers list ( #35309 )
2023-05-16 15:54:46 +05:30
Smit Vora
2a609616d9
fix: port option for additional_conditions in item wise sales register ( #35187 )
...
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
2023-05-15 13:24:39 +05:30
Phanupong Janthapoon
2b59a95162
fix: share_transfer display wrong currency symbo
...
In multi-companies setting, on amount and rate field of Share Transfer
doctype are displaying wrong currency symbol, when create a
Share Transfer of others company that has different currency than
the main company. This due to the lack of `options` on those fields.
To fix this, add `options` to `amount` and `rate` fields.
2023-05-14 08:06:58 +05:30
Ankush Menat
2ea38333f0
refactor: use job_id instead of job_name ( #35242 )
...
depends on https://github.com/frappe/frappe/pull/20951
2023-05-10 13:26:10 +05:30
ruthra kumar
afe9d7614b
Merge pull request #35212 from ruthra-kumar/chore_change_throw_to_msgprint
...
chore: convert throw to msgprint in payment reconciliation job hook
2023-05-08 17:57:13 +05:30
Anand Baburajan
5a3acab110
fix: handle empty FBs properly in TB and GL [develop] ( #35190 )
...
fix: handle empty FBs properly in TB and GL
2023-05-08 16:54:00 +05:30
ruthra kumar
73134d57bf
chore: convert throw to msgprint
2023-05-08 16:42:12 +05:30
ruthra kumar
34a5f24026
Merge pull request #35186 from ruthra-kumar/child_account_should_inherit_parent_account_currency
...
fix: child acc will inherit acc currency if explicitly specified
2023-05-08 14:09:46 +05:30
ruthra kumar
f6ea8fd8d7
test: currency inheritance on child accounts
2023-05-08 13:30:39 +05:30
Rohit Waghchaure
15f5f98858
fix: error regarding accepted and supplier warehouse
2023-05-07 20:27:17 +05:30
ruthra kumar
abe691c03d
fix: child acc will inherit acc currency if explicitly specified
2023-05-06 10:40:41 +05:30
Anand Baburajan
6864b11f83
fix: handle finance book properly in trial balance and general ledger ( #35085 )
...
* fix: get default fb properly and handle different fb and default fb case
* chore: minor UX improvement
* fix: handle FBs properly in general ledger
2023-05-02 20:58:22 +05:30
ruthra kumar
7e24215b3a
Merge pull request #35107 from ruthra-kumar/fix_incorrect_paid_amount_if_bank_cash_account_missing
...
fix: incorrect paid_amount and exchange rate in Payment Entry
2023-05-02 15:07:36 +05:30
ruthra kumar
1d70183d8c
Merge pull request #35091 from ruthra-kumar/cost_center_allocation_splits_roundoff
...
refactor: button to toggle parent doc cost center preference for rounding adjustment amount
2023-05-02 14:07:22 +05:30
ruthra kumar
8f2302a7bf
Merge pull request #35061 from ruthra-kumar/refactor_pe_dont_book_gain_loss_for_sales_purchase_orders
...
refactor: don't book exchange gain/loss for sales/purchase orders
2023-05-02 14:03:17 +05:30
rohitwaghchaure
a10aab35ff
Merge pull request #35118 from rohitwaghchaure/fixed-don-not-allow-to-repost-valuation
...
fix: don't allow to make reposting for the closed period
2023-05-01 20:41:14 +05:30
Rohit Waghchaure
f751727149
fix: don't allow to make reposting for the closed period
2023-05-01 18:48:29 +05:30
ruthra kumar
ce4e18c8d2
test: Sales/Purchase Orders will not book Exchange gain/loss
2023-05-01 14:09:19 +05:30
ruthra kumar
effb34bbfa
refactor: don't book exch gain/loss for sales/purchase orders
2023-05-01 14:08:30 +05:30
Deepesh Garg
ea0b03ae9e
fix: Updates in process statement of Accounts ( #35064 )
2023-05-01 13:09:47 +05:30
Deepesh Garg
f3b3dabb9a
fix: Naming series error in Journal Entry template ( #35084 )
2023-05-01 10:50:51 +05:30
ruthra kumar
123355392b
fix: incorrect paid_amount and exchange rate in PE
...
If Company master has no default cash or bank account set but Party has
default company bank account set. In this case, paid_amount and
conversion rate are not calculated correctly
2023-04-30 08:36:56 +05:30
ruthra kumar
4ccce93394
refactor: checkbox to toggle parent doc cost center preference
2023-04-28 14:20:50 +05:30
ruthra kumar
0f3b06cc8a
refactor: checkbox in Sales Invoice
2023-04-28 14:20:50 +05:30
ruthra kumar
ebe6787510
refactor: checkbox to toggle parent doc cost center preference
2023-04-28 14:20:48 +05:30
ruthra kumar
b44331c981
refactor: checkbox in purchase invoice
2023-04-28 14:06:04 +05:30
Nihantra Patel
6dfca79af3
fix: Report link, option, and added a link for Sales Person in GP
2023-04-27 15:04:50 +05:30
Kitti U. @ Ecosoft
c36dc3dc57
fix: v14, Bank Reconcile Tools not cover case JV debit bank ( #35000 )
2023-04-25 21:34:28 +05:30
