nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-04-12 11:25:09 +00:00
Code Issues Packages Projects Releases Wiki Activity
37,975 Commits 432 Branches 1,737 Tags
d44cab39264e2851fba833f7f4e590608b9052d6
Commit Graph

37975 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
ae948e31ea fix: linters 2021-10-20 11:30:33 +05:30
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
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
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
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
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]
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
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
Deepesh Garg
c99fe8b57d Merge pull request #27980 from frappe/mergify/bp/version-13-hotfix/pr-27934 
fix: TDS round off not working from second transaction (backport #27934)
 2021-10-18 11:02:33 +05:30
Deepesh Garg
a883f16f31 Merge pull request #27978 from frappe/mergify/bp/version-13-hotfix/pr-27970 
fix (India): Interstate internal transfer invoices not visible in GSTR-1 (backport #27970)
 2021-10-18 11:00:47 +05:30
Jannat Patel
07a9f16eb5 Merge pull request #27984 from frappe/mergify/bp/version-13-hotfix/pr-27850 2021-10-18 10:35:55 +05:30
pateljannat
acc5cff7ff fix: exclude inactive employees from auto attendance 
(cherry picked from commit 921b4be348)
 2021-10-18 04:34:53 +00:00
Deepesh Garg
f2340b360f fix: Account number and name incorrectly import using COA importer 
(cherry picked from commit 17a8649500)
 2021-10-18 03:46:59 +00:00
Deepesh Garg
9b71e02003 fix: TDS round off not working from second transaction 
(cherry picked from commit b7a08535b5)
 2021-10-18 03:24:23 +00:00
Deepesh Garg
50e718f508 fix: TDS round off not working from second transaction 
(cherry picked from commit ca0067212d)
 2021-10-18 03:24:22 +00:00
Deepesh Garg
289650748c fix: Interstate internal transfer invoices not visible in GSTR-1 
(cherry picked from commit d9d42b13ab)
 2021-10-18 03:23:31 +00:00
mergify[bot]
268893d5d0 fix: POS Profile payment methods table (#27956) (#27966) 
Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
(cherry picked from commit f3cf36f613)

Co-authored-by: Subin Tom <36098155+nemesis189@users.noreply.github.com>
 2021-10-15 14:32:55 +05:30
Marica
7b4a5e7e64 Merge pull request #27965 from frappe/mergify/bp/version-13-hotfix/pr-27962 
fix: Retain space inside Serial no string while cleaning serial nos (backport #27962)
 2021-10-14 20:38:20 +05:30
marination
0d1b04326a test: Include serial no with spaces in it in sanitation test 
(cherry picked from commit a9341672cf)
 2021-10-14 14:48:24 +00:00
Marica
db9f56bee8 fix: Use strip instead of lstrip and rstrip 
Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
(cherry picked from commit 8cf188d9c0)
 2021-10-14 14:48:24 +00:00
marination
2e9d08f8b1 fix: Retain space inside Serial no string while cleaning serial nos 
(cherry picked from commit 41035b0330)
 2021-10-14 14:48:24 +00:00
mergify[bot]
02ddd5f2b0 fix: remove bad description (#27963) (#27964) 
(cherry picked from commit 4437eb0c4b)

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-10-14 20:06:07 +05:30
rohitwaghchaure
8c33103838 Merge pull request #27958 from frappe/mergify/bp/version-13-hotfix/pr-27954 
fix: value_after_depreciation calculation (backport #27954)
 2021-10-14 18:25:57 +05:30
mergify[bot]
a8c966eb25 fix: patch to enable scheduled job for reposting (backport #27957) 
* fix: patch to enable scheduled job for reposting

(cherry picked from commit efc60ec2b5)

# Conflicts:
#	erpnext/patches.txt

* chore: formatting

(cherry picked from commit 3f97413814)

* Update enable_scheduler_job_for_item_reposting.py

(cherry picked from commit 230a5d4b39)

* fix: resolve conflict

Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
 2021-10-14 17:31:51 +05:30
Saqib
88b1c1c87e fix: value_after_depreciation calculation (#27954) 
(cherry picked from commit 1f70dd6e98)
 2021-10-14 10:53:52 +00:00
Marica
771213c415 Merge pull request #27955 from frappe/mergify/bp/version-13-hotfix/pr-27947 
fix: Improve error message for Serial No mismatch between SI and DN (backport #27947)
 2021-10-14 14:24:54 +05:30
marination
d86f5ec1ba fix: Remove trailing space and line break in translatable string 
(cherry picked from commit 60f35ad8a2)
 2021-10-14 08:19:54 +00:00
marination
a568fc7924 fix: Improve error message for Serial No mismatch between SI and DN 
(cherry picked from commit 646acb6b46)
 2021-10-14 08:19:53 +00:00
mergify[bot]
c040256793 fix: cannot add deductions in internal transfer payment entry (backport #27545) (#27930) 
* fix: cannot add deductions in internal transfer payment entry

(cherry picked from commit 1b7414e948)

# Conflicts:
#	erpnext/accounts/doctype/payment_entry/payment_entry.py

* fix: Update message string

(cherry picked from commit 3b9514d6e1)

# Conflicts:
#	erpnext/accounts/doctype/payment_entry/payment_entry.py

* fix: conflicts

Co-authored-by: Saqib Ansari <nextchamp.saqib@gmail.com>
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
 2021-10-14 12:34:03 +05:30
Chillar Anand
29996ee726 fix(hr): Update expense account after company is updated (#27843) (#27919) 
(cherry picked from commit f0c4ea14a9)

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-10-14 11:13:00 +05:30
Deepesh Garg
1120506e11 Merge pull request #27941 from frappe/mergify/bp/version-13-hotfix/pr-27783 
fix(Subscription): reorder updation of end date (backport #27783)
 2021-10-13 16:56:07 +05:30
mergify[bot]
e64751e3a2 fix: not authorized to update entries after freezing accounts (backport #27937) 
* fix: not authorized to update entries after freezing accounts (#27937)

* fix: not authorized to update entries after freezing accounts

* fix: Add test case

* fix(patch): patched to requeue failed reposts(check_freezing_date)

* chore: misc fixes

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
(cherry picked from commit 2bb383b178)

# Conflicts:
#	erpnext/patches.txt

* fix: resolve conflict

Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com>
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-10-13 16:41:21 +05:30
Himanshu
bf47c6836e Update subscription.py 
(cherry picked from commit 44306bd0e5)
 2021-10-13 09:52:21 +00:00
hrwx
e80192e2da fix: create past invoices 
(cherry picked from commit ae657c7e4e)
 2021-10-13 09:52:21 +00:00
Sagar Vora
b2f1b02e34 test: use test_dependencies instead of duplication 
(cherry picked from commit 656015d99d)
 2021-10-13 09:52:20 +00:00
Sagar Vora
ed090f2e3e fix: remove newline 
(cherry picked from commit fc375c5bde)
 2021-10-13 09:52:20 +00:00