erpnext2

Author	SHA1	Message	Date
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
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
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
Deepesh Garg	21ba9ac744	fix: Totals row incorrect value in GL Entry (#27867 ) (cherry picked from commit ebe68c1a7a47f5e711cc9fc1d40c07e140b76888)	3 years ago
gavin	9916b87767	ci: Rule Added for using frappe.qb over db.sql* (#28000 ) ERPNext port of https://github.com/frappe/frappe/pull/14481 Co-authored-by: Ankush Menat <ankush@iwebnotes.com> Co-authored-by: abhishek <as7122000@gmail.com>	3 years ago
Ankush Menat	393749a611	fix: dont recompute item wise taxes from front end	3 years ago
Noah Jacob	01bb97bd09	Merge pull request #27990 from noahjacob/maint_schedule_fix fix: changes in schedules gets overwritten on save	3 years ago
Noah Jacob	e08a0992b2	Merge branch 'develop' into maint_schedule_fix	3 years ago
Noah Jacob	af1b9e100e	fix: changes in schedules gets overwritten on save	3 years ago
Himanshu	7717b99edb	feat: add enabled field in UOM (#27993 )	3 years ago
Rucha Mahabal	8eacaddde7	fix: flaky Org Chart Test (#27971 )	3 years ago
Deepesh Garg	9c54d6df13	Merge pull request #27967 from deepeshgarg007/account_name_number_error fix: Account number and name incorrectly imported using COA importer	3 years ago
Deepesh Garg	46e80095c6	Merge pull request #27934 from deepeshgarg007/tds_round_off_error fix: TDS round off not working from second transaction	3 years ago
Deepesh Garg	30e6f4dfed	Merge pull request #27970 from deepeshgarg007/gstr_1_interstate_internal_transfer fix (India): Interstate internal transfer invoices not visible in GSTR-1	3 years ago
Deepesh Garg	b7a08535b5	fix: TDS round off not working from second transaction	3 years ago
Deepesh Garg	d9d42b13ab	fix: Interstate internal transfer invoices not visible in GSTR-1	3 years ago
Deepesh Garg	17a8649500	fix: Account number and name incorrectly import using COA importer	3 years ago
Subin Tom	f3cf36f613	fix: POS Profile payment methods table (#27956 ) Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>	3 years ago
Marica	c0e632842a	Merge pull request #27962 from marination/clean-serial-no-logic fix: Retain space inside Serial no string while cleaning serial nos	3 years ago
Ankush Menat	4437eb0c4b	fix: remove bad description (#27963 )	3 years ago
marination	a9341672cf	test: Include serial no with spaces in it in sanitation test	3 years ago
Marica	8cf188d9c0	fix: Use strip instead of lstrip and rstrip Co-authored-by: Ankush Menat <ankushmenat@gmail.com>	3 years ago
marination	41035b0330	fix: Retain space inside Serial no string while cleaning serial nos	3 years ago
Ankush Menat	9c1d828b1b	chore: formatting	3 years ago
rohitwaghchaure	1233725b64	Merge pull request #27957 from rohitwaghchaure/patch-to-enable-scheduler-job fix: patch to enable scheduled job for reposting	3 years ago
rohitwaghchaure	230a5d4b39	Update enable_scheduler_job_for_item_reposting.py	3 years ago
Ankush Menat	3f97413814	chore: formatting	3 years ago
Saqib	1f70dd6e98	fix: value_after_depreciation calculation (#27954 )	3 years ago
Rohit Waghchaure	efc60ec2b5	fix: patch to enable scheduled job for reposting	3 years ago
Marica	ee25ba07a2	Merge pull request #27947 from marination/si-dn-sn-mismatch fix: Improve error message for Serial No mismatch between SI and DN	3 years ago
Jannat Patel	8de5f1f04d	Merge pull request #27850 from pateljannat/auto-attendance-issue fix: exclude inactive employees from auto attendance	3 years ago

1 2 3 4 5 ...

38982 Commits (cc1baae5eb738a821e4e3c14987acc71b5f6318f) All Branches Search

38982 Commits (cc1baae5eb738a821e4e3c14987acc71b5f6318f)

All Branches