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
Rucha Mahabal
63fba9db39
feat: Allow ceil & floor functions in salary slip formulae ( #35475 )
2023-05-30 16:11:44 +05:30
Sagar Sharma
00fd08c7bc
Merge pull request #35468 from frappe/mergify/bp/version-13-hotfix/pr-35459
...
fix: retention stock entry: grab conversion factor from source (backport #35459 )
2023-05-30 11:30:41 +05:30
Marc de Lima Lucio
d8dd22adaf
fix: retention stock entry: grab conversion factor from source
...
(cherry picked from commit 6954f538c9
2023-05-30 05:36:33 +00:00
Anand Baburajan
6f43829c32
fix: monthly WDV depr schedule for existing assets [v13] ( #35461 )
...
fix: monthly wdv depr schedule for existing assets
2023-05-29 23:18:04 +05:30
Sagar Sharma
3e95d56240
Merge pull request #35456 from frappe/mergify/bp/version-13-hotfix/pr-35328
...
fix: force to do reposting for cancelled document (backport #35328 )
2023-05-29 15:56:54 +05:30
s-aga-r
44cb62824d
chore: conflicts
2023-05-29 15:22:22 +05:30
Rohit Waghchaure
022893391b
fix: force to do reposting for cancelled document
...
(cherry picked from commit 6e661e7c0e
2023-05-29 09:38:35 +00:00
mergify[bot]
139a193f1d
fix: incorrect POS Reserved Qty in Stock Projected Qty Report ( #35437 )
...
* fix: incorrect `POS Reserved Qty` in `Stock Projected Qty` Report
(cherry picked from commit 027de41600sagarsharma.s312@gmail.com >
2023-05-29 09:24:20 +05:30
ruthra kumar
4f5ee6876d
Merge pull request #35420 from frappe/mergify/bp/version-13-hotfix/pr-35417
...
fix(Gross Profit): 'company' column is ambiguous in filter (backport #35417 )
2023-05-25 16:44:56 +05:30
ruthra kumar
270eb1db4d
fix(Gross Profit): 'company' column is ambiguous in filter
...
(cherry picked from commit 448712f719
2023-05-25 09:37:39 +00:00
Anand Baburajan
20d3381010
fix: incorrect depr schedule and posting dates on selling of existing assets [v13] ( #35404 )
...
fix: calc depr amount properly on selling of existing assets and fix incorrect posting dates
2023-05-24 14:24:18 +05:30
Saurabh
1e1dddfe6c
Merge pull request #35387 from saurabh6790/minor-fix
...
fix: change field-type to remove currency field from total row in export
2023-05-23 18:53:45 +05:30
Saurabh
0a42e6ff0f
fix: linter
2023-05-23 15:36:23 +05:30
Sagar Sharma
97f9c0d53f
Merge pull request #35391 from frappe/mergify/bp/version-13-hotfix/pr-35303
...
fix: Pick List TypeError (backport #35303 )
2023-05-23 15:05:41 +05:30
Sagar Sharma
137898d55d
fix: Pick List TypeError
...
(cherry picked from commit a111917114
2023-05-23 08:51:32 +00:00
Saurabh
f65be40037
fix: change field-type to remove currency field from total row in export
2023-05-23 12:39:20 +05:30
Sagar Sharma
75f4a616f1
Merge pull request #35384 from frappe/mergify/bp/version-13-hotfix/pr-35380
...
fix: TypeError while saving Job card (backport #35380 )
2023-05-23 10:59:15 +05:30
Sagar Sharma
8d97f8b0b7
chore: conflicts
2023-05-23 10:54:27 +05:30
vishnu
f63b866de3
fix: use flt instead of mandatory field
...
(cherry picked from commit 8c34cc0e00
2023-05-23 05:20:21 +00:00
vishnu
d6427cfe53
fix: error while saving job card
...
(cherry picked from commit a209fb4b64
2023-05-23 05:20:21 +00:00
rohitwaghchaure
774092343a
Merge pull request #35374 from frappe/mergify/bp/version-13-hotfix/pr-35227
...
fix: non manufacturing items/fixed asset items in BOM (backport #35227 )
2023-05-22 13:48:10 +05:30
