Deepesh Garg
1165a8ac3a
Merge branch 'develop' into company_change_fixes
3 years ago
Deepesh Garg
89d5e494dd
fix: Reload customer and supplier doctype
3 years ago
Kenneth Sequeira
07a3be6f61
fix: remove VM from installation ( #28075 )
3 years ago
Deepesh Garg
9c1705205f
fix: Payment Terms validation precision
3 years ago
Ganga Manoj
0515b4b6f6
Merge branch 'develop' into fix-depr-after-sale
3 years ago
Anuja Pawar
59b5987030
Merge branch 'develop' into gst-category
3 years ago
Subin Tom
fc8307621c
fix: POS Closing Entry without linked invoices ( #28042 )
3 years ago
Deepesh Garg
cd4b20313e
fix: Test case fixes and linting issues
3 years ago
Anuja Pawar
a1213006a1
Merge branch 'develop' into gst-category
3 years ago
GangaManoj
9e7022830e
fix: Only add additional depreciation schedule row on sale if depreciation_amount > 0
3 years ago
Deepesh Garg
e3ae8d5a1e
fix: Move PAN field from standard doctype to fixtures for India
3 years ago
Noah Jacob
fdaf93f76c
refactor: shows opening balance from filtered from_date ( #26877 )
* refactor: shows opening balance from filtered from_date
* refactor: opening balance considered from filtered from_date in stock ledger
* fix: check if stock reco is opening and misc cleanups
3 years ago
Deepesh Garg
35fe065cf1
Merge pull request #28070 from frappe/mergify/bp/develop/pr-28014
fix: Error in TDS computation summary (backport #28014 )
3 years ago
Deepesh Garg
bf13d183d8
fix: Replace section code with tax withholding category in LDC
3 years ago
Deepesh Garg
e6e804e7d7
fix: Get LTDS based on tax withholding category
3 years ago
Deepesh Garg
7f2dde7d94
fix: Check for supplier name
(cherry picked from commit 944e3d467c5ab0a2a4a76a8b532e53bca77f8e61)
3 years ago
Deepesh Garg
881e091b85
fix: Check for other properties
(cherry picked from commit b7befe49dc83b938b74b7a63d31787734d7857f8)
3 years ago
Deepesh Garg
2ea4c95f86
fix: Error in TDS computation summary
(cherry picked from commit f12deae24b7ab164edd0868a1254bdf28bfeac09)
3 years ago
Anuja Pawar
21889945bf
Merge branch 'develop' into gst-category
3 years ago
Ankush Menat
4ad2b851c4
chore: change semgrep rules repo name
[skip ci]
3 years ago
Ankush Menat
cc1baae5eb
ci: move semgrep rules out of repo ( #28067 )
Moving semgrep rules out of repos as it's unnecessary to maintain
same ruleset for different repos and different branches.
3 years ago
Anuja Pawar
6a3bd882b4
fix: sider
3 years ago
Anuja Pawar
4f53837624
fix: sider
3 years ago
Anuja Pawar
59c31bb124
fix: check if gst_category exist
3 years ago
Raffael Meyer
2bdaf7bb23
fix: don't reset rates in Timesheet Detail when Activity Type is cleared ( #28056 )
* fix: don't reset rates when activity type is cleared
* refactor: suggestions from review
Co-authored-by: Sagar Vora <sagar@resilient.tech>
* refactor: suggestions from review (fix)
* style: fix sider
* fix: sider issue
Co-authored-by: Sagar Vora <sagar@resilient.tech>
3 years ago
Deepesh Garg
65025fb628
fix: Update receivable/payable account on company change
3 years ago
Deepesh Garg
a20058a343
fix(minor): Add mandatory depends on condition for reference no and date fields
3 years ago
Deepesh Garg
7733afc0ae
fix(minor): Filters and fixes in Tax Withholding Category
3 years ago
Deepesh Garg
c6d06816cf
fix: Auto update company address check on linking with company
3 years ago
Faris Ansari
8b547e39a8
feat: Taxes template for selling/buying doctypes
Depends on the new Print Format Builder
frappe/frappe#14134
3 years ago
Alan
2849297471
refactor: move process loss report to manufacturing ( #28043 )
* refactor: move process loss report to manufacturing
* test: fix process loss report test
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
3 years ago
mergify[bot]
1a31d5856f
fix: useless validation message ( #28029 ) ( #28046 )
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
(cherry picked from commit 152f9b0a432361f1c801364d1c85c42a16691a8a)
Co-authored-by: Devin Slauenwhite <devin.slauenwhite@gmail.com>
3 years ago
Mohammed Yusuf Shaikh
03bfc77940
feat: employee initial work history updated when transfer is performed ( #27768 )
* feat: employee initial work history updated when transfer is performed
* fix: sider
* fix: remove commit statement
* fix: tests and code formatting
* fix: tests
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
3 years ago
rohitwaghchaure
871cb1157f
fix: consolidated report issue #28035
fix: consolidated report issue
3 years ago
Rohit Waghchaure
311bafb23b
fix: incorrect fieldname
3 years ago
Ankush Menat
da3635b94f
test: execute manufacturing reports
3 years ago
Ankush Menat
126ba16740
fix: remove debug from query
3 years ago
Ankush Menat
8221e7e01f
fix: remove employee_name from job card summary
This field doesn't exist and it's moved on individual line level logs.
3 years ago
Deepesh Garg
ddacff38ba
Merge pull request #28002 from ankush/dont_recompute_item_tax
fix: dont recompute item wise taxes from front end
3 years ago
Sagar Vora
8d9d0987fe
fix: incorrect status being set in Invoices ( #28019 )
Co-authored-by: Pruthvi Patel <pruthvipatel145@gmail.com>
3 years ago
Ankush Menat
5ada11b1af
ci: run semgrep after basic linters
3 years ago
Ankush Menat
92c0dcc3ea
ci: install dev requirements in CI
3 years ago
Rucha Mahabal
261f80c5ca
fix: avoid resetting employee on amending timesheets ( #28025 )
3 years ago
Nabin Hait
2ef4844a3c
feat: Tax for recurring additional salary ( #27459 )
* fix: Logic for tax calculation on recurring additional salary
* fix: Get actual amount always in case of overwritten additional salary even if based on payment days
* feat: Test case added for recurring additional salary
* fix: use query builder to get additional salaries instead of raw SQL
* fix: query formatting and remove trailing spaces
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
3 years ago
Jannat Patel
830fa60acd
Merge pull request #28018 from frappe/mergify/bp/develop/pr-27997
fix: Employee filter in YTD and MTD in salary slip (backport #27997 )
3 years ago
Govind S Menokee
4f2cf43db7
YTD and MTD Messed up in Salary Slip
The filter for YTD, MTD etc are based on employee name. This seems like an amateur mistake. It should be based on employee id.
(cherry picked from commit efc292a5ddc00e433d75b87d6b3378455bac4438)
3 years ago
Jannat Patel
9a409df8fa
Merge pull request #27728 from itechstro/develop
fix: Employee Leave Balance report should only consider ledgers of transaction type Leave Allocation
3 years ago
Jannat Patel
d81f811349
fix: map missing fields in opportunity ( #27904 )
3 years ago
Chillar Anand
73ae504721
fix(healthcare): Add patch for removing healthcare doctypes ( #27995 )
* fix(healthcare): Add patch for healthcare doctypes
* fix: Update healthcare patch
* fix: Reload stale doctypes
* fix: Reload doc fix
3 years ago
Deepesh Garg
74b0a819a0
Merge pull request #28003 from frappe/mergify/bp/develop/pr-27867
fix: Totals row incorrect value in GL Entry (backport #27867 )
3 years ago