marination
73ac3e0c40
fix: Add patch to patches.txt for https://github.com/frappe/erpnext/pull/27554
2021-09-30 14:22:01 +05:30
Marica
754626a102
fix: Delete accidental __init__.py file
2021-09-30 14:12:19 +05:30
Marica
cc143bca0d
fix: Maintenance Schedule child table status for legacy data ( #27554 )
...
* fix: Maintenance Schedule child table status for legacy data
* fix: Include legacy draft schedules in patch
* fix: Pre-commit formatting
2021-09-30 14:08:45 +05:30
Marica
c75c709114
Merge branch 'develop' into scan-batch
2021-09-30 14:07:54 +05:30
marination
abf450dc70
fix: Increment batch qty if pre-existing batch is scanned
2021-09-30 14:03:40 +05:30
Saqib Ansari
83cc597594
fix: do not set length for date field
2021-09-30 12:37:04 +05:30
mergify[bot]
9df5df4d94
fix: wrong company selected when marking attendance for all employees ( #27685 ) ( #27707 )
...
* fix: wrong company selected when marking attendance for all employees
* fix: enable caching for repeated queries of the same employee
(cherry picked from commit b478e72cefbdffd3e906fdd1ef822becdead78d7)
Co-authored-by: Mohammed Yusuf Shaikh <49878143+mohammedyusufshaikh@users.noreply.github.com>
2021-09-30 12:07:38 +05:30
Ankush Menat
4685ed5a8c
fix: distribution of additional costs in mfg stock entry ( #27629 )
...
* refactor: remove unnecessary list comprehensions
* fix: correct cost distribution logic
While apportioning costs same condition should be present on both sides
so total value is representative of all items to be apportioned.
Here while calculating incoming_items_cost only FG items are considered,
but while apportioning all items with to_warehouse are considered.
Solution: only apportion additional cost on FG items
* test: test cost distribution
* fix: patch for additional cost
fix(patch): consider PCV while patching
- consider Period closing voucher while patching
- recomute rates for SLE of affected stock entries
consider only FG/scrap item SLEs for recomputation of rates
* fix: remove client side logic for addn cost
All of this is done in python code hence removed client side code.
2021-09-30 09:58:59 +05:30
Deepesh Garg
2a1e202e07
Merge pull request #27704 from frappe/mergify/bp/develop/pr-27551
...
fix: Deferred revenue entries post account freezing (backport #27551 )
2021-09-30 09:47:44 +05:30
Deepesh Garg
f1a669c2f7
fix: Test case
...
(cherry picked from commit 23863c7663a94e32e32812301a7efca79575c470)
2021-09-30 03:06:02 +00:00
Deepesh Garg
774cd68f4c
fix: Test Case
...
(cherry picked from commit 846d128c5d536b5003dc3055f3239e6f92a3146c)
2021-09-30 03:06:01 +00:00
Deepesh Garg
13d2e7b198
fix: Deferred revenue entries post account freezing
...
(cherry picked from commit e2eb72eb5ba1aaadddf8278dd77bfe75a178ef01)
2021-09-30 03:06:00 +00:00
rohitwaghchaure
104d107659
Merge pull request #27701 from rohitwaghchaure/minor-added-project-name-in-purchase-order-analysis
...
fix: added project name in the purchase order analysis
2021-09-29 23:41:31 +05:30
Rohit Waghchaure
c1f9997a67
fix: added project name in the purchase order analysis
2021-09-29 23:26:19 +05:30
Saqib
a84cd2674c
Merge branch 'develop' into trim-custom-field-length
2021-09-29 19:56:56 +05:30
Saqib Ansari
f1fcb385f5
patch: trim sales invoice custom field lengths
2021-09-29 19:56:02 +05:30
Deepesh Garg
b39f8a6215
fix: Ignore user permission for Represents Company field in Sales and Purchase docs ( #27684 )
...
* fix: Ignore user permission for Represents Company field in Sales and Purchase docs
* fix: Ignore user permission for fiscal year company
2021-09-29 15:54:35 +05:30
Subin Tom
254b20bc09
minor fixes
2021-09-29 13:34:50 +05:30
Dany Robert
2b4959fb3b
fix: return tax rate since fetch is removed
2021-09-29 13:01:40 +05:30
Subin Tom
d3bb920e71
fix: dt instead of document in set_value query
2021-09-29 11:26:04 +05:30
Subin Tom
8675ca5bdd
fix: using db.exists and get_value instead of get_doc
2021-09-29 11:11:55 +05:30
Saqib
0b040c7437
fix: cannot delete a project if linked with sales order ( #27536 )
2021-09-28 18:13:01 +05:30
Saqib
424efd41e5
feat(regional): toggle for reduced depreciation rate as per IT Act ( #27600 )
2021-09-28 18:12:02 +05:30
Subin Tom
0a28fed679
fix: patch fix, fields disabling
2021-09-28 13:54:01 +05:30
Alan
72c081fd8f
fix: apply price list after batch or serial no insertion ( #27566 )
2021-09-28 12:56:26 +05:30
Alan
b91333afdd
fix: set item.qty as mandatory in picklist ( #27680 )
2021-09-28 06:41:37 +00:00
GangaManoj
c84c983073
fix: Categorize into test suites
2021-09-28 01:22:38 +05:30
Noah Jacob
5c249decbb
fix(ux): added exception of template item in filters ( #27560 )
2021-09-27 22:34:27 +05:30
Ganga Manoj
28bdd6d2e3
Merge branch 'develop' into fix-depr-after-sale
2021-09-27 22:18:04 +05:30
GangaManoj
40ec2d622b
fix: Add tests for depreciation
2021-09-27 22:14:42 +05:30
GangaManoj
fdd9e6cc3c
fix: Replace asset.schedules with asset.get('schedules')
2021-09-27 22:14:16 +05:30
Deepesh Garg
cc5dd5c67d
feat: TDS deduction using journal entry and other fixes ( #27451 )
...
* fix: TDS deduction using journal entry
* fix: Multi category application against single supplier
* refactor: TDS payable monthly report
* fix: Server side handling for default tax withholding category
* fix: Supplier filter for Journal Entry
* refactor: TDS computation summary report
2021-09-27 21:43:20 +05:30
marination
596cf3951d
fix: Batch scans get overwritten on the same row
2021-09-27 15:06:46 +05:30
Saqib
b68ac24cd5
chore: add shipping address in eway bill test ( #27662 )
2021-09-27 15:03:58 +05:30
Saqib
f2fca59ba7
fix: cannot set custom label for 'total' field in print format ( #27664 )
2021-09-27 14:28:16 +05:30
Shariq Ansari
18918e1b4f
chore: linter fix
2021-09-27 14:08:44 +05:30
Saqib Ansari
a7df4227da
fix: trim sales invoice custom field lengths
2021-09-27 13:56:16 +05:30
Shariq Ansari
0de735f20b
fix: Fixed alignment of Title, Subtitle, Action Button
2021-09-27 13:50:19 +05:30
Saqib
9fa24ffccc
Merge pull request #27659 from nextchamp-saqib/fix-32644
...
fix: setting of gain/loss if party account is in company currency
2021-09-27 13:05:19 +05:30
Subin Tom
54754f4eb8
fix: updated patch, add fields only if fields are checked
2021-09-27 12:51:54 +05:30
Saqib
711395db22
fix: linting errors
2021-09-27 12:26:18 +05:30
Saqib
1f8ad72418
fix: indentation
2021-09-27 12:21:06 +05:30
Saqib
30f59b09fd
chore: log modified invoices
2021-09-27 12:20:16 +05:30
ChillarAnand
765a9bb731
refactor: Remove sales invoice custom js related to healthcare
2021-09-27 07:34:54 +05:30
Saqib Ansari
18e5d59d24
fix: unknown column 'ref_exchange_rate'
2021-09-26 20:26:45 +05:30
Dany Robert
5ce6a4c107
fix: tax rate being overridden in case of 0.00
...
Tax rate could be different for different expenses.
Therefore, rate is kept as 0.00 and tax amount entered manually.
But fetching used to override the rate(upon saving) and mess up the amount.
2021-09-26 18:31:27 +05:30
Saqib
e8ff649298
Merge branch 'develop' into fix-32644
2021-09-26 17:07:46 +05:30
Saqib Ansari
e6b4d33f4b
chore: hide exchange gain loss if empty
2021-09-26 17:07:13 +05:30
Saqib Ansari
beebfb323a
patch: invalid gain loss gl entry
2021-09-26 16:58:55 +05:30
Saqib
f8c1c73953
fix: local variable 'fiscal_year_details' referenced before assignment ( #27656 )
2021-09-26 16:27:56 +05:30
