ruthra kumar
13febcac81
refactor: add new reference type in journal entry account
2023-07-26 22:33:58 +05:30
ruthra kumar
0587338435
chore: patch to update property setter for Journal Entry Accounts
2023-07-26 22:33:58 +05:30
ruthra kumar
7e94a1c51b
refactor: replace with new method in purchase invoice
2023-07-26 22:33:58 +05:30
ruthra kumar
5e1cd1f227
test: different scenarios for exchange booking
2023-07-26 22:33:58 +05:30
ruthra kumar
81cd7873d3
refactor: book exchange gain/loss through journal
2023-07-26 22:33:58 +05:30
Anand Baburajan
5e7b05e566
chore: adding totals in asset reports ( #36334 )
2023-07-26 21:57:18 +05:30
ruthra kumar
e79f80331d
Merge pull request #36322 from frappe/mergify/bp/develop/pr-36298
...
fix: show invoices name instead of object address (backport #36298 )
2023-07-26 16:11:56 +05:30
Anand Baburajan
f28f8dc596
fix: show depr schedule table in asset doc ( #36332 )
2023-07-26 15:59:37 +05:30
Deepesh Garg
f368894d22
Merge pull request #36238 from RitvikSardana/develop-ritvik-pos-dark
...
fix: POS closing with item name
2023-07-26 15:33:44 +05:30
gouravengineer
a5b626420d
fix: show invoices name instead of object address
...
comma_and function in expecting a list but it gets a tuple so it is returning a object instead of a string
(cherry picked from commit cf93714a7cce465d241bf4e713ee7492c5c01bfa)
2023-07-26 15:30:03 +05:30
Deepesh Garg
89aa6f0269
Merge pull request #36318 from barredterra/remove-autoname
...
chore(Item Group): remove redundant autoname
2023-07-26 09:44:37 +05:30
Deepesh Garg
3fe75ce7d4
Merge pull request #36319 from cogk/fix-taxes-controller-after-refactor
...
fix: Fix initialize_taxes
2023-07-26 09:41:02 +05:30
Corentin Flr
d69af741c8
fix(taxes_and_totals.js): Fix initialize_taxes incorrect refactor
...
Following changes from PR #36147 , `cur_frm.cscript.validate_taxes_and_charges` is not a method anymore and should be replaced with the `erpnext.accounts.taxes.validate_taxes_and_charges` function.
2023-07-25 21:12:14 +02:00
rohitwaghchaure
17d4ab36c0
Merge pull request #36304 from frappe/mergify/bp/develop/pr-36300
...
fix: added missing option Partially Received in the status field (backport #36300 )
2023-07-25 22:49:51 +05:30
Anand Baburajan
11a9d4124f
fix: apply discount on item after applying price list ( #36317 )
2023-07-25 21:55:17 +05:30
barredterra
1691eee26e
chore(Item Group): remove redundant autoname
2023-07-25 18:05:41 +02:00
mergify[bot]
eead2bba9f
fix: group by in fixed asset register (copy #36310 ) ( #36311 )
...
fix: group by in fixed asset register
(cherry picked from commit 1151e47f46a9d4a250be83e751d9e0db6881274e)
Co-authored-by: anandbaburajan <anandbaburajan@gmail.com>
2023-07-25 20:58:41 +05:30
Rohit Waghchaure
55a9537220
fix: added missing option Partially Received in the status dropdown field
...
(cherry picked from commit 4fa93b05c62b7f340a94e9e84d9d2e132ea35b99)
2023-07-25 12:39:07 +00:00
Deepesh Garg
2c1943c7e6
Merge pull request #36246 from blaggacao/bump-tweepy
...
build(deps): update tweepy 3.10.0 -> 4.14.0
2023-07-25 15:06:48 +05:30
Deepesh Garg
6830a8737a
Merge pull request #36196 from GursheenK/customer-details-in-tax-withholding-category-report
...
fix: show tax withholding category details for customers
2023-07-25 14:48:15 +05:30
Deepesh Garg
8c410c617c
chore: Add default value
2023-07-25 14:47:46 +05:30
Deepesh Garg
e1d6bf364e
Merge branch 'develop' of https://github.com/frappe/erpnext into customer-details-in-tax-withholding-category-report
2023-07-25 14:45:36 +05:30
Deepesh Garg
61be373800
Merge pull request #36107 from GursheenK/accounting_dimension_in_based_on_filter
...
feat: filtering based on accounting dimensions in profitability analysis
2023-07-25 14:28:46 +05:30
RitvikSardana
62ca89b10f
fix: POS background color optimized in dark mode ( #36287 )
...
fix: POS dark theme compatability
Co-authored-by: Ritvik Sardana <ritviksardana@Ritviks-MacBook-Air.local>
2023-07-25 13:01:10 +05:30
Deepesh Garg
30554301c9
Merge pull request #36235 from resilient-tech/fix-tax-breakup-for-diff-tax-rates
...
fix: Correct Tax Breakup for different tax rates for same hsn code
2023-07-24 20:57:26 +05:30
Deepesh Garg
3f81e15672
Merge pull request #36147 from deepeshgarg007/eslint
...
refactor(ci): add eslint and update linting confs
2023-07-24 20:55:07 +05:30
Smit Vora
1b8490dc98
Merge branch 'develop' into fix-tax-breakup-for-diff-tax-rates
2023-07-24 20:20:19 +05:30
mergify[bot]
1bc87a970a
fix: set new purchase_receipt_amount on asset split (copy #36272 ) ( #36280 )
...
fix: set new purchase_receipt_amount on asset split
(cherry picked from commit 7fd9b489eed33a81f29ecb3802d8a07d232c4c9c)
Co-authored-by: anandbaburajan <anandbaburajan@gmail.com>
2023-07-24 19:37:07 +05:30
Deepesh Garg
4867a767a2
Merge pull request #36278 from resilient-tech/set-company-flag
...
fix(regional): set `frappe.flags.company` temporarily, where required
2023-07-24 19:34:29 +05:30
Sagar Vora
4205f564a0
fix(regional): set frappe.flags.company
temporarily, where required
2023-07-24 18:37:58 +05:30
DaizyModi
6f376cf103
fix: remove unused params
2023-07-24 18:02:42 +05:30
Deepesh Garg
164df33419
Merge pull request #36274 from GursheenK/process-soa-customer-filter
...
fix: customer filter in process soa
2023-07-24 17:32:17 +05:30
Gursheen Anand
5224f13db2
fix: add patch for renaming tds payable report
2023-07-24 17:11:05 +05:30
Gursheen Anand
34d7fb388d
fix: customer filter in process soa
2023-07-24 16:47:06 +05:30
mergify[bot]
1436040d4c
fix: allow both custodian and location while creating asset (copy #36263 ) ( #36264 )
...
fix: allow both custodian and location while creating asset
(cherry picked from commit bff00bc8b2c8911f1513a25f066077e2b0c0adf0)
Co-authored-by: anandbaburajan <anandbaburajan@gmail.com>
2023-07-24 15:51:24 +05:30
ruthra kumar
4464b2a21b
Merge pull request #36261 from ruthra-kumar/possible_missing_field_error_on_payment_entry
...
refactor: apply terms based validation only on sales/purchase doctypes
2023-07-24 15:22:15 +05:30
rohitwaghchaure
7f4dda1b06
Merge pull request #36259 from rohitwaghchaure/fixed-report-default-email-outgoing-error
...
fix: no default email account causing reposting issue
2023-07-24 15:03:09 +05:30
ruthra kumar
3dd119eeea
refactor: apply terms based validation only on sales/purchase doctyp
2023-07-24 14:50:11 +05:30
ruthra kumar
a785a6054e
Merge pull request #36251 from ruthra-kumar/performance_tune_timsheet_adding_logic
...
fix: unresponsive sales invoice page
2023-07-24 14:01:07 +05:30
Rohit Waghchaure
efb51526a9
fix: no default email account causing reposting issue
2023-07-24 14:00:20 +05:30
Ritvik Sardana
8b4228d616
fix: removed duplicate code
2023-07-24 13:59:24 +05:30
Ritvik Sardana
5389dabe19
Merge branch 'develop' of https://github.com/frappe/erpnext into develop-ritvik-pos-dark
2023-07-24 12:48:58 +05:30
Ritvik Sardana
82b36e2ec8
fix: added test for pos closing without item code
2023-07-24 12:47:29 +05:30
Deepesh Garg
203b8ec872
Merge pull request #36220 from marination/dunning-patch-acc-frozen
...
fix: Patch Dunnings after accounts were frozen
2023-07-24 12:46:32 +05:30
ruthra kumar
740f283ec1
Merge pull request #36241 from ruthra-kumar/fix_allocation_logic_in_get_outstanding_invoices
...
fix: multiple fixes on payment terms based issues in payment entry
2023-07-24 12:35:25 +05:30
Gursheen Anand
2f6d0bdcee
fix: col names for party types
2023-07-24 12:20:58 +05:30
Gursheen Anand
38b501e004
fix: make party type filter mandatory
2023-07-24 12:13:47 +05:30
David Arnold
b740cdfc00
build(deps): update tweepy 3.10.0 -> 4.14.0
2023-07-23 23:14:58 -05:00
Deepesh Garg
cdc9b62688
chore: Remove cur_frm from sales_invoice.js
2023-07-23 22:44:18 +05:30
Deepesh Garg
8d3d9493f0
chore: linting issues
2023-07-23 20:06:41 +05:30