nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-06 23:10:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
38,312 Commits 458 Branches 1,746 Tags
365572f5ea48a30875eecd2c54efdefafd39b76f
Commit Graph

38312 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ankush Menat
e357541509 fix: remove employee_name from job card summary 
This field doesn't exist and it's moved on individual line level logs.

(cherry picked from commit 8221e7e01f)
 2021-10-20 21:00:11 +05:30
mergify[bot]
1fae8f1fcb Merge pull request #28038 from frappe/mergify/bp/version-13-hotfix/pr-28036 
fix: incorrect field name (backport #28036)
 2021-10-20 20:55:00 +05:30
Ankush Menat
8fffd1597d fix: dont recompute item wise taxes from front end 
(cherry picked from commit 393749a611)
 2021-10-20 19:44:26 +05:30
mergify[bot]
34e92ab229 fix: incorrect status being set in Invoices (backport #28019) (#28031) 
* fix: incorrect status being set in Invoices (#28019)

Co-authored-by: Pruthvi Patel <pruthvipatel145@gmail.com>
(cherry picked from commit 8d9d0987fe)

# Conflicts:
#	erpnext/patches.txt

* fix: merge conflict

Co-authored-by: Sagar Vora <sagar@resilient.tech>
 2021-10-20 19:31:47 +05:30
Sagar Vora
ffadd671b7 fix: add mistakenly removed patches 2021-10-20 19:26:15 +05:30
mergify[bot]
47befa697d fix: incorrect status being set in Invoices (backport #28019) (#28030) 
* fix: incorrect status being set in Invoices (#28019)

Co-authored-by: Pruthvi Patel <pruthvipatel145@gmail.com>
(cherry picked from commit 8d9d0987fe)

* fix: merge conflict

Co-authored-by: Sagar Vora <sagar@resilient.tech>
 2021-10-20 19:24:19 +05:30
mergify[bot]
9ce7ea692d fix: avoid resetting employee on amending timesheets (#28025) (#28026) 
(cherry picked from commit 261f80c5ca)

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-10-20 17:45:43 +05:30
mergify[bot]
a739bf90c4 feat: Tax for recurring additional salary (backport #27459) (#28024) 
* 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>
(cherry picked from commit 2ef4844a3c)

# Conflicts:
#	erpnext/payroll/doctype/salary_slip/salary_slip.py
#	erpnext/payroll/doctype/salary_slip/test_salary_slip.py

* fix: conflicts

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-10-20 16:20:25 +05:30
Jannat Patel
676c5280cc Merge pull request #28016 from frappe/mergify/bp/version-13-pre-release/pr-27728 2021-10-20 15:53:48 +05:30
Marica
e0decb0ae2 Merge pull request #28021 from frappe/mergify/bp/version-13-pre-release/pr-28005 
fix: Fetch thumbnail from Item master instead of regenerating (backport #28005)
 2021-10-20 15:14:30 +05:30
marination
b906cc20ae fix: Move thumbnail updation to different patch 
- Thumbnail updation handled via different patch
- create_website_items will only have one purpose
- added progress bar to `create_website_items`
- code cleanup

(cherry picked from commit 348a961b53)
 2021-10-20 09:12:33 +00:00
marination
c98421c69a fix: Check if thumbnail column exists in case of table trimming 
(cherry picked from commit ac8014e24c)
 2021-10-20 09:12:32 +00:00
marination
d7afb9ef65 fix: Get db values as dict when checking for thumbnail in existing web item 
(cherry picked from commit 46a5a83789)
 2021-10-20 09:12:32 +00:00
marination
a915b9cf72 fix: re-run patch 
- Patch will just fetch thumbnails if website items are created, else it will create new website items

(cherry picked from commit 11c498d9e5)
 2021-10-20 09:12:32 +00:00
marination
a022e01d3f fix: Fetch thumbnail from Item master instead of regenerating 
(cherry picked from commit 94177c0764)
 2021-10-20 09:12:31 +00:00
Marica
077026a7ae Merge pull request #28005 from marination/patch-thumbnail-perf 
fix: Fetch thumbnail from Item master instead of regenerating
 2021-10-20 14:40:57 +05:30
marination
348a961b53 fix: Move thumbnail updation to different patch 
- Thumbnail updation handled via different patch
- create_website_items will only have one purpose
- added progress bar to `create_website_items`
- code cleanup
 2021-10-20 14:14:13 +05:30
Jannat Patel
3cf5861a8b Merge pull request #28015 from frappe/mergify/bp/version-13-hotfix/pr-27728 
fix: Employee Leave Balance report should only consider ledgers of transaction type Leave Allocation (backport #27728)
 2021-10-20 13:10:58 +05:30
Jannat Patel
8e9db11c69 Merge pull request #28012 from frappe/mergify/bp/version-13-hotfix/pr-27904 
fix: map missing fields in opportunity (backport #27904)
 2021-10-20 12:36:46 +05:30
Goh Yan Chang
867cfa04b2 Update employee_leave_balance.py 
fix: Employee Leave Balance report showing wrong figures
(cherry picked from commit 632f7848a3)
 2021-10-20 06:58:12 +00:00
Goh Yan Chang
50af32f35c Update employee_leave_balance.py 
fix: Employee Leave Balance report showing wrong figures
(cherry picked from commit 632f7848a3)
 2021-10-20 06:57:51 +00:00
Jannat Patel
6e63dc1360 Merge pull request #28013 from frappe/mergify/bp/version-13-pre-release/pr-27904 2021-10-20 12:24:37 +05:30
Deepesh Garg
944e3d467c fix: Check for supplier name 2021-10-20 12:17:13 +05:30
Deepesh Garg
b7befe49dc fix: Check for other properties 2021-10-20 12:16:22 +05:30
Jannat Patel
8c57394e78 fix: conflicts 2021-10-20 12:14:15 +05:30
Deepesh Garg
f12deae24b fix: Error in TDS computation summary 2021-10-20 12:07:22 +05:30
Jannat Patel
8e2a84e435 Merge pull request #27997 from govindsmenokee/patch-7 
fix: Employee filter in YTD and MTD in salary slip
 2021-10-20 11:43:55 +05:30
Jannat Patel
698214bd59 fix: removed unused lines 2021-10-20 11:36:00 +05:30
Jannat Patel
873d166a4e fix: conflicts 2021-10-20 11:32:35 +05:30
Jannat Patel
ae948e31ea fix: linters 2021-10-20 11:30:33 +05:30
Jannat Patel
9166d58717 fix: map missing fields in opportunity (#27904) 
(cherry picked from commit d81f811349)

# Conflicts:
#	erpnext/crm/doctype/opportunity/opportunity.py
 2021-10-20 05:56:59 +00:00
Jannat Patel
2fff5e5cd1 fix: map missing fields in opportunity (#27904) 
(cherry picked from commit d81f811349)

# Conflicts:
#	erpnext/crm/doctype/opportunity/opportunity.py
 2021-10-20 05:56:37 +00:00
marination
ac8014e24c fix: Check if thumbnail column exists in case of table trimming 2021-10-19 18:50:44 +05:30
marination
46a5a83789 fix: Get db values as dict when checking for thumbnail in existing web item 2021-10-19 18:39:48 +05:30
marination
11c498d9e5 fix: re-run patch 
- Patch will just fetch thumbnails if website items are created, else it will create new website items
 2021-10-19 18:32:43 +05:30
Deepesh Garg
7895d2a048 Merge pull request #28004 from frappe/mergify/bp/version-13-pre-release/pr-27867 
fix: Totals row incorrect value in GL Entry (backport #27867)
 2021-10-19 17:50:20 +05:30
marination
94177c0764 fix: Fetch thumbnail from Item master instead of regenerating 2021-10-19 17:31:55 +05:30
Jannat Patel
0a4abff354 Merge branch 'version-13-hotfix' into patch-7 2021-10-19 16:10:51 +05:30
Deepesh Garg
5a06ee9230 fix: Totals row incorrect value in GL Entry (#27867) 
(cherry picked from commit ebe68c1a7a)
 2021-10-19 09:39:02 +00:00
Deepesh Garg
ebe68c1a7a fix: Totals row incorrect value in GL Entry (#27867) 2021-10-19 15:08:05 +05:30
mergify[bot]
35448886bc Merge pull request #27999 from frappe/mergify/bp/version-13-hotfix/pr-27990 
fix: changes in schedules gets overwritten on save (backport #27990)
 2021-10-19 14:33:57 +05:30
Noah Jacob
b6609d1649 Merge pull request #27998 from frappe/mergify/bp/version-13-pre-release/pr-27990 
fix: changes in schedules gets overwritten on save (backport #27990)
 2021-10-19 14:20:44 +05:30
mergify[bot]
3af060c787 fix: TaxJar update - added nexus list, making api call only for nexus (backport #27497) (#27940) 
* fix: TaxJar update - nexus, selective api call

(cherry picked from commit b01fe1c3e2)

* fix: sales_tax attribute in api call before submit

(cherry picked from commit 3bb60a439a)

* Update erpnext/erpnext_integrations/taxjar_integration.py

Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
(cherry picked from commit 0e527311b9)

* Update erpnext/erpnext_integrations/doctype/taxjar_settings/taxjar_settings.py

Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
(cherry picked from commit 486d7c3a39)

* Update erpnext/erpnext_integrations/doctype/taxjar_settings/taxjar_settings.js

Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
(cherry picked from commit 435a5e4fa3)

* Update erpnext/erpnext_integrations/taxjar_integration.py

Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
(cherry picked from commit 11bd42467e)

* fix: Renamed child table doctype, delete taxes for non nexus state

(cherry picked from commit 5c18654113)

* fix: updated patch, add fields only if fields are checked

(cherry picked from commit 54754f4eb8)

# Conflicts:
#	erpnext/patches/v13_0/custom_fields_for_taxjar_integration.py

* fix: patch fix, fields disabling

(cherry picked from commit 0a28fed679)

* fix: using db.exists and get_value instead of get_doc

(cherry picked from commit 8675ca5bdd)

* fix: dt instead of document in set_value query

(cherry picked from commit d3bb920e71)

* minor fixes

(cherry picked from commit 254b20bc09)

* fix: improved on_update method, added validation for tax calculation, sandbox mode checks

(cherry picked from commit 7114659ecc)

* fix: linters fix

(cherry picked from commit 3ece05a9f7)

* fix: patch fix added reload_doctype

(cherry picked from commit eaa3614155)

* fix: patch fixes- force reload doc, check for company

(cherry picked from commit 1b25e69af4)

* fix: 'Taxjar' type fix

(cherry picked from commit ea2038489f)

* fix: Update pacthes.txt

(cherry picked from commit 5d4c919c5c)

* fix: Patch

(cherry picked from commit 2d19e2d54b)

# Conflicts:
#	erpnext/patches.txt

* fix: Move product tax category folder to taxjar settings

(cherry picked from commit bd8cfb2e30)

* Update custom_fields_for_taxjar_integration.py

* fix: conflicts

* fix: linter issues

removed extra line

* fix: patch fix

einvoicing deprecation patch removed

Co-authored-by: Subin Tom <subintom2@gmail.com>
Co-authored-by: Subin Tom <36098155+nemesis189@users.noreply.github.com>
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
 2021-10-19 13:38:50 +05:30
Noah Jacob
9431bb9466 fix: changes in schedules gets overwritten on save 
(cherry picked from commit af1b9e100e)
 2021-10-19 08:07:42 +00:00
Govind S Menokee
efc292a5dd 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.
 2021-10-19 12:49:00 +05:30
mergify[bot]
37088391bb feat: add enabled field in UOM (#27993) (#27996) 
(cherry picked from commit 7717b99edb)

Co-authored-by: Himanshu <himanshuwarekar@yahoo.com>
 2021-10-19 10:56:33 +05:30
mergify[bot]
fdd9cc76be fix: flaky Org Chart Test (#27971) (#27989) 
(cherry picked from commit 8eacaddde7)

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-10-18 11:47:22 +05:30
mergify[bot]
f328b226fb fix: flaky Org Chart Test (#27971) (#27988) 
(cherry picked from commit 8eacaddde7)

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-10-18 11:47:12 +05:30
Deepesh Garg
f8348ab681 Merge pull request #27983 from frappe/mergify/bp/version-13-pre-release/pr-27967 
fix: Account number and name incorrectly imported using COA importer (backport #27967)
 2021-10-18 11:04:39 +05:30
Deepesh Garg
9f71863a6a Merge pull request #27982 from frappe/mergify/bp/version-13-hotfix/pr-27967 
fix: Account number and name incorrectly imported using COA importer (backport #27967)
 2021-10-18 11:03:51 +05:30