nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-17 16:45:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
38,102 Commits 401 Branches 1,700 Tags
873d166a4ee24c1c3274516e21bb00a6fabf51fe
Commit Graph

38102 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jannat Patel
873d166a4e fix: conflicts 2021-10-20 11:32:35 +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
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
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
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
Noah Jacob
9431bb9466 fix: changes in schedules gets overwritten on save 
(cherry picked from commit af1b9e100e)
 2021-10-19 08:07:42 +00:00
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
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
eecfb25c90 Merge pull request #27981 from frappe/mergify/bp/version-13-pre-release/pr-27934 
fix: TDS round off not working from second transaction (backport #27934)
 2021-10-18 11:03:00 +05:30
Deepesh Garg
41a0e12954 Merge pull request #27979 from frappe/mergify/bp/version-13-pre-release/pr-27970 
fix (India): Interstate internal transfer invoices not visible in GSTR-1 (backport #27970)
 2021-10-18 11:01:06 +05:30
Ankush Menat
f0383289d8 Merge pull request #27986 from frappe/mergify/bp/version-13-pre-release/pr-27962 
fix: Retain space inside Serial no string while cleaning serial nos (backport #27962)
 2021-10-18 10:34:31 +05:30
Jannat Patel
46209023ce Merge pull request #27985 from frappe/mergify/bp/version-13-pre-release/pr-27850 2021-10-18 10:32:48 +05:30
marination
e69bd39cdd test: Include serial no with spaces in it in sanitation test 
(cherry picked from commit a9341672cf)
 2021-10-18 04:56:11 +00:00
Marica
0fcb3cd918 fix: Use strip instead of lstrip and rstrip 
Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
(cherry picked from commit 8cf188d9c0)
 2021-10-18 04:56:10 +00:00
marination
44ab131792 fix: Retain space inside Serial no string while cleaning serial nos 
(cherry picked from commit 41035b0330)
 2021-10-18 04:56:10 +00:00
pateljannat
b648d77316 fix: exclude inactive employees from auto attendance 
(cherry picked from commit 921b4be348)
 2021-10-18 04:35:18 +00:00
Deepesh Garg
0012f0b2da fix: Account number and name incorrectly import using COA importer 
(cherry picked from commit 17a8649500)
 2021-10-18 03:47:22 +00:00
Deepesh Garg
1796f09c0f fix: TDS round off not working from second transaction 
(cherry picked from commit b7a08535b5)
 2021-10-18 03:24:46 +00:00
Deepesh Garg
64b58b148f fix: TDS round off not working from second transaction 
(cherry picked from commit ca0067212d)
 2021-10-18 03:24:46 +00:00
Deepesh Garg
4415bf9968 fix: Interstate internal transfer invoices not visible in GSTR-1 
(cherry picked from commit d9d42b13ab)
 2021-10-18 03:23:55 +00:00
rohitwaghchaure
1b7d94d70d Merge pull request #27961 from rohitwaghchaure/merge-13-hotfix-to-pre-release-for-13-13 
chore: Merge branch 'version-13-hotfix' into 'version-13-pre-release'
 2021-10-14 19:17:22 +05:30
Rohit Waghchaure
952c60b3f5 Merge branch 'version-13-hotfix' into 'version-13-pre-release' 2021-10-14 18:31:09 +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
hrwx
d796172249 fix: reorder updation of end date 
(cherry picked from commit 0f03b19109)
 2021-10-13 09:52:20 +00:00
Deepesh Garg
ff9f6366ad Merge pull request #27935 from frappe/mergify/bp/version-13-hotfix/pr-27907 
feat: HSN based tax breakup table check in GST Settings  (backport #27907)
 2021-10-13 12:56:00 +05:30
Deepesh Garg
b8683d5532 Merge pull request #27925 from frappe/mergify/bp/version-13-hotfix/pr-27758 
perf: Add indexes in stock queries and speed up bin updation (backport #27758)
 2021-10-13 12:08:38 +05:30
Subin Tom
4a156cdc2e added new section in gst settings page 
(cherry picked from commit fc4facc5dc)
 2021-10-13 06:38:27 +00:00
Subin Tom
771b076448 feat: HSN wise tax breakup check in GST Settings 
(cherry picked from commit 530de12b07)
 2021-10-13 06:38:26 +00:00
mergify[bot]
e6346ac982 fix: minor ux fixes in Sales & Purchase Invoice (backport #27927) (#27932) 
* fix: keeping sections consistent across sales & purchase invoice

(cherry picked from commit 2bc1ca993a)

* fix: set collapsible & print hide

(cherry picked from commit d181cc42a1)

Co-authored-by: Anuja Pawar <anuja.pawar20@gmail.com>
 2021-10-13 11:01:21 +05:30
Ankush Menat
547e173fe0 ci: rule to fail PRs that add a new manual commit (#27928) 
Manual commits are frequent source of bugs, confusions or undefined
behaviour.

All new manual commits should be explcitly ignored with explanation on
why it's added. This will only fail for new additions. Existing ones
need to be cleaned up manually.

(cherry picked from commit 06b426e9c3)
 2021-10-12 23:05:09 +05:30
mergify[bot]
37bd0ecf87 fix: force reload custom field doctype (#27909) (#27910) 
custom_field.json has the same modified key in both versions but not the same content. This can happen again if something is backported, safe solution is to force reload.

(cherry picked from commit ad444153cc)

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-10-12 20:38:09 +05:30
Marica
8244980d79 Merge pull request #27924 from marination/item-configure-empty-popup 
fix: Item Variant selection empty popup on website
 2021-10-12 20:32:18 +05:30
Deepesh Garg
10b239ec50 perf: Add indexes in stock queries and speed up bin updation #27758 
perf: Add indexes in stock queries and speed up bin updation
(cherry picked from commit 6f107da165)
 2021-10-12 14:46:26 +00:00
marination
c9c4a9995b fix: Item Variant selection empty popup on website 
- pass item_code instead of website item name to fetch attributes
 2021-10-12 19:56:12 +05:30
Ankush Menat
b6dc71679e fix: remove transaction commit from tests 
(cherry picked from commit 8d69ec72a6)
 2021-10-12 16:41:48 +05:30
Ankush Menat
5bdb6041b9 refactor: rollback after full test 
(cherry picked from commit acdb26a4bb)
 2021-10-12 16:41:48 +05:30
Ankush Menat
89828defc5 test: add custom TestCase class and use in stock 
(cherry picked from commit 06fa35a9c1)
 2021-10-12 16:41:48 +05:30