mergify[bot]
18c3a668d9
chore: update translations ( #35905 )
...
chore: update translations
chore: update translations
(cherry picked from commit 1d1103f39c48353029+RJPvT@users.noreply.github.com >
2023-06-29 13:29:56 +05:30
mergify[bot]
0bcd0476a2
fix: asset movement (backport #35918 ) ( #35924 )
...
* fix: asset movement (#35918 )
fix: asset movement fixes
(cherry picked from commit e16c14863banandbaburajan@gmail.com >
2023-06-28 21:00:02 +05:30
mergify[bot]
41344593c9
perf: improve item wise register reports (backport #35908 ) ( #35912 )
...
perf: improve item wise register reports (#35908 )
(cherry picked from commit 33ee01174banandbaburajan@gmail.com >
2023-06-28 10:25:33 +05:30
mergify[bot]
bcfd7708f2
fix: filter parent warehouses not showing (backport #35897 ) ( #35900 )
...
* fix: filter parent warehouses not showing (#35897 )
(cherry picked from commit af418d2342hanglaoda@hotmail.com >
Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com >
2023-06-27 14:27:33 +05:30
mergify[bot]
4dd088cba4
fix: TDS amount calculation post LDC breach ( #35886 )
...
* fix: TDS amount calculation post LDC breach
(cherry picked from commit 1f9ef6c48fdeepeshgarg6@gmail.com >
2023-06-27 13:12:06 +05:30
mergify[bot]
12b62571b8
fix(ux): PO Get Items From Open Material Requests (backport #35894 ) ( #35896 )
...
fix(ux): PO Get Items From Open Material Requests
(cherry picked from commit 3a00bf83d6sagarsharma.s312@gmail.com >
2023-06-27 12:30:08 +05:30
Ashish Shah
3785fe6927
fix: frappe.exceptions.DoesNotExistError: DocType KSA VAT Setting ( #35797 )
...
fix: frappe.exceptions.DoesNotExistError: DocType KSA VAT Setting not found
When migrating from v12->v13 migration fails
While migrating the doctype is not reloaded before adding permission. #35795
2023-06-24 16:40:12 +05:30
mergify[bot]
de529f0adf
fix: use correct fieldname for purchase receipt column in item_wise_purchase_register report (backport #35828 ) ( #35848 )
...
fix: use correct fieldname for purchase receipt column in item_wise_purcchase_register report
(cherry picked from commit dcfc86e3afritwikpuri5678@gmail.com >
2023-06-23 11:37:38 +05:30
mergify[bot]
2e2c319f20
fix: show non-depreciable assets in fixed asset register (backport #35858 ) ( #35861 )
...
fix: show non-depreciable assets in fixed asset register (#35858 )
fix: show non-depr assets in fixed asset register
(cherry picked from commit 42d09448eeanandbaburajan@gmail.com >
2023-06-23 08:25:11 +05:30
mergify[bot]
8939e95c62
chore: asset scrap and restore fixes [v14] (backport #35851 ) ( #35854 )
...
* chore: asset scrap and restore fixes [v14] (#35851 )
chore: better err msg on cancelling JE for asset scrap and allow restoring non-depr assets
(cherry picked from commit 69780da099anandbaburajan@gmail.com >
2023-06-22 23:01:59 +05:30
Rucha Mahabal
6c4dff38da
fix: employee link fields in payroll reports ( #619 ) ( #35845 )
2023-06-22 18:10:54 +05:30
saeedkola
000ebe4479
Fixes issue of asset value_after_depreciation field getting updated twice if workflow is enabled in Journal Entry ( #35821 )
...
* Fixes issue of asset value_after_depreciation field getting updated twice if workflow is enabled in Journal Entry
* chore: remove unnecessary line break
* chore: formatting
---------
Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com >
2023-06-21 14:42:16 +05:30
Daizy Modi
0fe95bf77e
chore: remove whitelisting for methods not used from UI ( #35592 )
2023-06-21 10:33:28 +05:30
mergify[bot]
aa8446d794
fix: date and finance book fixes in fixed asset register (backport #35751 ) ( #35800 )
...
* fix: date and finance book fixes in fixed asset register (#35751 )
* fix: handle finance books properly and show all assets by default in fixed asset register
* chore: rename value to depr amount
* chore: get asset value for correct fb properly
* chore: rename include_default_book_entries to include_default_book_assets
(cherry picked from commit 0d12588583anandbaburajan@gmail.com >
2023-06-20 13:03:06 +05:30
mergify[bot]
7239e839a0
perf: index purpose in Stock Entry (backport #35782 ) ( #35784 )
...
* perf: index `purpose` in `Stock Entry`
(cherry picked from commit 4f941ac5c0sagarsharma.s312@gmail.com >
2023-06-20 12:02:04 +05:30
mergify[bot]
04990d51db
fix: fix get outstanding invoices btn and add get outstanding orders btn (backport #35776 ) ( #35788 )
...
* fix: fix get outstanding invoices btn and add get outstanding orders btn (#35776 )
* fix: fix get outstanding invoices btn and add get outstanding orders btn
* chore: remove unnecessary arg
(cherry picked from commit c1da3ddbbfanandbaburajan@gmail.com >
2023-06-19 20:42:28 +05:30
ruthra kumar
af10d8080b
Merge pull request #35780 from frappe/mergify/bp/version-13-hotfix/pr-35320
...
fix: Gross and Net Profit Report - incorrect calculation of totals (backport #35320 )
2023-06-19 16:48:17 +05:30
Anoop Kurungadam
e899c30428
fix: add total col for gross and net profit
...
(cherry picked from commit cb9b4fbb91
2023-06-19 10:26:00 +00:00
Anoop Kurungadam
a53832e16e
refactor: merge separate loops for calculating group / leaf node totals
...
rename function
remove return statement as the list is mutated
(cherry picked from commit 1a3b9c5bdf
2023-06-19 10:26:00 +00:00
Anoop Kurungadam
c6885e6789
refactor: remove unused parameters
...
(cherry picked from commit 50822f207e
2023-06-19 10:26:00 +00:00
Anoop Kurungadam
f22969d266
fix: account group totals calculation to consider include_in_gross
...
(cherry picked from commit 8dcb9302b4
2023-06-19 10:26:00 +00:00
mergify[bot]
3d0add81fa
fix: Allocated amount validation for other party types ( #35741 )
...
* fix: Allocated amount validation for other party types (#35741 )
* fix: Allocated amount validation for other party types
* chore: Validation for return allocations
* chore: minor typo
---------
Co-authored-by: anandbaburajan <anandbaburajan@gmail.com >
(cherry picked from commit 9d27a25e5fdeepeshgarg6@gmail.com >
Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com >
2023-06-19 12:53:00 +05:30
mergify[bot]
46d0b7d317
fix: loan interest accrual date ( #35695 )
...
fix: loan interest accrual date (#35695 )
fix: loan interest accrual date
---------
Co-authored-by: Abhinav Raut <abhinav.raut@zerodha.com >
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com >
(cherry picked from commit 2a24423ad2abhinavrautcs@gmail.com >
2023-06-19 09:14:01 +05:30
mergify[bot]
0a8b7148a5
fix: add validation for QI in PR (backport #35677 ) ( #35758 )
...
fix: add validation for QI in PR
(cherry picked from commit 2c1ab569a7sagarsharma.s312@gmail.com >
2023-06-17 13:08:06 +05:30
Deepesh Garg
e37b6bbbf1
Merge pull request #35733 from deepeshgarg007/tax_withholding_limit_consumed
...
fix: Incorrect field while calculating Tax withholding net total
2023-06-16 12:20:44 +05:30
Deepesh Garg
bcc8a45c4e
Merge branch 'version-13-hotfix' into tax_withholding_limit_consumed
2023-06-16 12:18:57 +05:30
Deepesh Garg
571c977e8e
fix: Incorrect field while calculating Tax withholding net total
2023-06-16 12:17:31 +05:30
Deepesh Garg
1685305b53
Merge pull request #35730 from deepeshgarg007/tax_ithholding_v13
...
fix: Incorrect field while calculating Tax withholding net total
2023-06-16 11:18:22 +05:30
Deepesh Garg
b95d459812
fix: Incorrect field while calculating Tax withholding net total
2023-06-16 11:15:42 +05:30
mergify[bot]
0e11317303
fix: don't add GL Entry for Acc. Depr. while scrapping non-depreciable assets (backport #35714 ) ( #35716 )
...
* fix: don't add GL Entry for Acc. Depr. while scrapping non-depreciable assets (#35714 )
fix: on asset scrap, don't add gl entry for acc. depr. if no acc. depr.
(cherry picked from commit bb39a2cac7anandbaburajan@gmail.com >
2023-06-15 17:40:42 +05:30
mergify[bot]
c2bf8e3502
fix: Lower deduction certificate not getting applied ( #35667 )
...
* fix: Lower deduction certificate not getting applied (#35667 )
(cherry picked from commit 937c0feefedeepeshgarg6@gmail.com >
2023-06-14 09:01:54 +05:30
mergify[bot]
4d4f218175
fix(accounts): validate payment entry references with latest data. (backport #31166 ) ( #35674 )
...
* fix(accounts): validate payment entry references with latest data. (#31166 )
* test: payment entry over allocation.
* fix: validate allocated_amount against latest outstanding amount.
* fix: payment entry get outstanding documents for advance payments
* fix: only fetch latest outstanding_amount.
* fix: throw if reference is allocated
* test: throw error if a reference has been partially allocated after inital creation.
* chore: test name
* fix: remove unused part of test
* chore: linter
* chore: more user friendly error messages
* fix: only validate outstanding amount if partly paid and don't filter by cost center
* chore: minor refactor for doc.cost_center
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com >
---------
Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com >
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com >
(cherry picked from commit 20de27d480devin.slauenwhite@gmail.com >
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com >
Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com >
2023-06-13 23:01:51 +05:30
mergify[bot]
4c2c037a86
fix: make showing taxes as table in print configurable ( #35672 )
...
* fix: make showing taxes as table in print configurable (#35672 )
(cherry picked from commit 491a50a027anandbaburajan@gmail.com >
2023-06-13 21:38:16 +05:30
mergify[bot]
4f79214ae6
Stock aging report fix when called in dashboard chart (backport #35671 ) ( #35676 )
...
fix: get_range_age conditions fixed (#35671 )
see https://github.com/frappe/erpnext/issues/35669
(cherry picked from commit 9f669d4c2f86075967+ihosseinu@users.noreply.github.com >
2023-06-13 19:24:21 +05:30
Rucha Mahabal
5b37abd2d6
Merge pull request #35663 from ruchamahabal/perf-org-charts-v13
2023-06-13 13:20:09 +05:30
Rucha Mahabal
a24d488817
test: get children for org chart
2023-06-13 12:29:53 +05:30
Rucha Mahabal
986a90efe0
perf: refactor get_all_nodes in Org Chart
2023-06-13 12:07:15 +05:30
Rucha Mahabal
4a35ff0e57
fix: savepoint policy assignment submission, log errors & inform the user about failures ( #35507 )
2023-06-13 12:03:55 +05:30
mergify[bot]
8e3636ff53
fix: don't set default payment amount in case of invoice return (backport #35645 ) ( #35648 )
...
* fix: don't set default payment amount in case of invoice return (#35645 )
(cherry picked from commit 79483cc90eanandbaburajan@gmail.com >
2023-06-12 18:44:56 +05:30
Trusted Computer
1b69b37229
fix: CSS not applied to product title (backport #35582 ) ( #35635 )
...
In an erpnext website, the /all-products route shows website items that have been published to the web site.
In the list view (erpnext/e_commerce/product_ui/list.js), the css class is null for the product title. Instead, inline style statements have been added in that can not be modified by overriding CSS.
This fix uses a similar approach to that which is taken in the grid view (erpnext/e_commerce/product_ui/grid.js). It removes the null CSS parameter in the product title link as well as the inline style statement. Then, as in the grid view, the product title is wrapped in a div tag with the product_title CSS class.
This makes it possible to style the product title as desired with a CSS override.
2023-06-12 14:39:41 +05:30
Anand Baburajan
97f4af8d97
fix: calculate wdv depr schedule properly for existing assets [v13] ( #35615 )
...
* fix: calculate wdv depr schedule properly for existing assets
* fix: calculate wdv depr schedule properly for existing assets properly
2023-06-08 23:16:35 +05:30
mergify[bot]
9d5b500060
fix: Project in item-wise sales register ( #35596 )
...
fix: Project in item-wise sales register (#35596 )
(cherry picked from commit f732cac678deepeshgarg6@gmail.com >
2023-06-07 22:36:49 +05:30
AJAY NATARAJAN
3831c7920d
fix: Asset Depreciation Ledger Report - Add Total Row Checkbox Enabled
2023-06-07 21:48:27 +05:30
mergify[bot]
1415f40dfb
fix: Interest Accrual on Loan Topup ( #35555 )
...
fix: Interest Accrual on Loan Topup (#35555 )
* fix: Interest Accrual on Loan Topup
* chore: CI
* chore: Ignore test
(cherry picked from commit 2ffcca6f10deepeshgarg6@gmail.com >
2023-06-07 10:11:54 +05:30
Suraj Shetty
09cf050b0d
Merge pull request #35532 from frappe/mergify/bp/version-13-hotfix/pr-35530
...
fix: Task gantt popup style and info (backport #35530 )
2023-06-02 11:11:35 +05:30
Suraj Shetty
55448017d7
fix: Task gantt popup style
...
(cherry picked from commit f7b2d103e7
2023-06-02 05:39:53 +00:00
ruthra kumar
202513ae6a
Merge pull request #35520 from frappe/mergify/bp/version-13-hotfix/pr-35112
...
refactor(Gross Profit): simplify group by invoice logic (backport #35112 )
2023-06-01 15:13:02 +05:30
ruthra kumar
e3a8a8d195
refactor: simplify group by invoice logic
...
(cherry picked from commit 092c4b4c58
2023-06-01 09:05:35 +00:00
Sagar Vora
169af8f9f8
Merge pull request #35502 from frappe/mergify/bp/version-13-hotfix/pr-35500
2023-05-31 14:46:24 +05:30
Sagar Vora
f0580b0e4d
chore: remove whitelisting for method not accessed from UI
...
(cherry picked from commit 517d8a03ec
2023-05-31 09:15:46 +00:00
