nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-17 08:35:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
37,931 Commits 401 Branches 1,698 Tags
fa944382c53bdeeb92f2dcc876e2c11ed03e20cc
Commit Graph

37931 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mergify[bot]
fa944382c5 fix: using DN for transfer w/o internal customer (backport #27798) (#27805) 
* fix: using DN for transfer w/o internal customer (#27798)

This used to be work before though not "advertised", since a lot of
users have started using it as feature, it can't be broken now.

(cherry picked from commit df1f8fddf6)

* fix(ux): use toast instead of popup

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-10-05 14:53:26 +05:30
Deepesh Garg
28aa9a7215 Merge pull request #27761 from frappe/mergify/bp/version-13-pre-release/pr-27712 
fix(India): Internal transfer check fix (backport #27712)
 2021-10-05 14:10:57 +05:30
Saqib
953073bc77 fix(asset): expected value after useful life validation (#27787) 2021-10-05 11:13:50 +05:30
Deepesh Garg
e6909a0899 fix(India): Internal transfer check fix 
(cherry picked from commit f0af24fc6d)
 2021-10-04 05:31:59 +00:00
Marica
68cce8eb98 Merge pull request #27757 from frappe/mergify/bp/version-13-pre-release/pr-27720 
fix: Website Items with same Item name unhandled, thumbnails missing (backport #27720)
 2021-10-03 14:46:18 +05:30
Marica
869c1beb0a Merge pull request #27744 from frappe/mergify/bp/version-13-pre-release/pr-27611 
fix: Hero Slider Control & Alignment fixes (backport #27611)
 2021-10-03 14:29:39 +05:30
marination
a453fc6385 fix: Pre-commit formatting 
(cherry picked from commit 77d4849ce8)
 2021-10-03 08:57:13 +00:00
marination
00978a195a fix: Website Items with same Item name unhandled, thumbnails missing 
- Use naming series for Website Item. There could be two items with same name and different item code
- Fix: Website Item Page view breaks if cart is disabled
- Fix: thumbnails not created for Website Items after patch
- Fix: ‘Request for Quote’ button & cart summary not visible if checkout is disabled

(cherry picked from commit 36b519c962)
 2021-10-03 08:57:12 +00:00
Deepesh Garg
66286881f3 Merge pull request #27752 from frappe/mergify/bp/version-13-pre-release/pr-27748 
fix: Chart Of Accounts import button not visible (backport #27748)
 2021-10-02 22:16:15 +05:30
Deepesh Garg
c2e4bbe9cc fix: Linting issues 
(cherry picked from commit ff570f48a0)
 2021-10-02 16:10:41 +00:00
Deepesh Garg
02984551ce fix: Remove unwanted comments 
(cherry picked from commit e4b89d2fcd)
 2021-10-02 16:10:40 +00:00
Deepesh Garg
42f0a97d26 fix: Chart Of Accounts import button not visible 
(cherry picked from commit 3529622a0d)
 2021-10-02 16:10:39 +00:00
Shariq Ansari
477d36413b chore: linter fix 
(cherry picked from commit 18918e1b4f)
 2021-10-02 11:39:01 +00:00
Shariq Ansari
b5fc3076bf fix: Fixed alignment of Title, Subtitle, Action Button 
(cherry picked from commit 0de735f20b)
 2021-10-02 11:39:00 +00:00
Shariq Ansari
2c9162160a fix: Creating unique hash for slider id instead of slider name 
(cherry picked from commit 3e8e6ac4e2)
 2021-10-02 11:38:59 +00:00
mergify[bot]
3e7a029869 fix: option to limit reposting in certain timeslot (bp #27725) 
(cherry picked from commit a04f9c904e)

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-10-01 16:50:05 +05:30
mergify[bot]
f572a4e0e5 fix(Org Chart): use attribute selectors instead of ID selector for node IDs with special characters (#27717) (#27719) 
* fix(Org Chart): use attribute selectors instead of ID selector for node IDs with special chars

* fix: UI tests

(cherry picked from commit 9e08229b7b)

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-09-30 18:44:55 +05:30
rohitwaghchaure
348f082490 Merge pull request #27716 from rohitwaghchaure/merge-v13-hotfix-to-pre-release 
chore: Merge branch 'version-13-hotfix' into 'version-13-pre-release'
 2021-09-30 18:07:47 +05:30
Rohit Waghchaure
49174cd414 chore: Merge branch 'version-13-hotfix' into 'version-13-pre-release' 2021-09-30 16:59:18 +05:30
Mohammed Yusuf Shaikh
b478e72cef fix: wrong company selected when marking attendance for all employees (#27685) 
* fix: wrong company selected when marking attendance for all employees

* fix: enable caching for repeated queries of the same employee

Co-authored-by: Ankush Menat <ankushmenat@gmail.com>

Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
 2021-09-30 12:02:39 +05:30
mergify[bot]
471a8ddce0 fix: distribution of additional costs in mfg stock entry (#27629) (#27706) 
* refactor: remove unnecessary list comprehensions

* fix: correct cost distribution logic

While apportioning costs same condition should be present on both sides
so total value is representative of all items to be apportioned.

Here while calculating incoming_items_cost only FG items are considered,
but while apportioning all items with to_warehouse are considered.

Solution: only apportion additional cost on FG items

* test: test cost distribution

* fix: patch for additional cost

fix(patch): consider PCV while patching

- consider Period closing voucher while patching
- recomute rates for SLE of affected stock entries

consider only FG/scrap item SLEs for recomputation of rates

* fix: remove client side logic for addn cost

All of this is done in python code hence removed client side code.

(cherry picked from commit 4685ed5a8c)

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-09-30 11:20:09 +05:30
Deepesh Garg
7fc7405be7 fix: Deferred revenue entries post account freezing (#27551) 
* fix: Deferred revenue entries post account freezing

* fix: Test Case

* fix: Test case
 2021-09-30 08:35:30 +05:30
rohitwaghchaure
26c16412bb Merge pull request #27702 from frappe/mergify/bp/version-13-hotfix/pr-27701 
fix: added project name in the purchase order analysis (backport #27701)
 2021-09-29 23:43:54 +05:30
Rohit Waghchaure
c8396f4970 fix: added project name in the purchase order analysis 
(cherry picked from commit c1f9997a67)
 2021-09-29 18:13:25 +00:00
Deepesh Garg
aeffaf312a Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into deferred_entry_freeze_v13 2021-09-29 22:27:02 +05:30
Deepesh Garg
23863c7663 fix: Test case 2021-09-29 22:26:33 +05:30
Frappe PR Bot
887e3765bf feat: TDS deduction using journal entry and other fixes (#27451) (#27672) 
* fix: TDS deduction using journal entry

* fix: Multi category application against single supplier

* refactor: TDS payable monthly report

* fix: Server side handling for default tax withholding category

* fix: Supplier filter for Journal Entry

* refactor: TDS computation summary report

(cherry picked from commit cc5dd5c67d)

Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2021-09-29 20:26:43 +05:30
Frappe PR Bot
633847c514 fix: Ignore user permission for Represents Company field in Sales and Purchase docs (#27684) (#27695) 
* fix: Ignore user permission for Represents Company field in Sales and Purchase docs

* fix: Ignore user permission for fiscal year company

(cherry picked from commit b39f8a6215)

Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2021-09-29 20:26:16 +05:30
Deepesh Garg
72986abab9 Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into deferred_entry_freeze_v13 2021-09-29 16:13:28 +05:30
mergify[bot]
6b32fa7b1c feat(regional): toggle for reduced depreciation rate as per IT Act (#27688) 2021-09-28 19:48:50 +05:30
Frappe PR Bot
212492220d fix: cannot delete a project if linked with sales order (#27536) (#27689) 2021-09-28 19:46:35 +05:30
Frappe PR Bot
fbae3c7fd6 fix: apply price list after batch or serial no insertion (#27566) (#27683) 
(cherry picked from commit 72c081fd8f)

Co-authored-by: Alan <2.alan.tom@gmail.com>
 2021-09-28 12:59:45 +05:30
Frappe PR Bot
745abef0e7 fix: set item.qty as mandatory in picklist (#27680) (#27682) 
(cherry picked from commit b91333afdd)

Co-authored-by: Alan <2.alan.tom@gmail.com>
 2021-09-28 12:24:55 +05:30
Frappe PR Bot
1acdadea00 fix(ux): added exception of template item in filters (#27560) (#27675) 
(cherry picked from commit 5c249decbb)

Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com>
 2021-09-27 23:01:14 +05:30
mergify[bot]
2ee9da3504 fix: cannot set custom label for 'total' field in print format (#27667) 2021-09-27 15:03:16 +05:30
Frappe PR Bot
e8de8b8454 fix: Improvements in COA Importer (#27584) (#27587) 
(cherry picked from commit f07ff92a35)

Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2021-09-27 14:53:51 +05:30
Frappe PR Bot
1b9e96f760 fix: Tax Breakup table headers fix (#27596) (#27598) 
(cherry picked from commit 0ff7367f39)

Co-authored-by: Subin Tom <36098155+nemesis189@users.noreply.github.com>
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
 2021-09-27 14:53:29 +05:30
Saqib
0e59873cc0 Merge pull request #27663 from frappe/mergify/bp/version-13-hotfix/pr-27659 
fix: setting of gain/loss if party account is in company currency (backport #27659)
 2021-09-27 14:29:25 +05:30
Saqib
1063ced7cd fix: linting errors 
(cherry picked from commit 711395db22)
 2021-09-27 07:36:17 +00:00
Saqib
904c592978 fix: indentation 
(cherry picked from commit 1f8ad72418)
 2021-09-27 07:36:16 +00:00
Saqib
7a8ff85308 chore: log modified invoices 
(cherry picked from commit 30f59b09fd)
 2021-09-27 07:36:16 +00:00
Saqib Ansari
8a8921fb5b fix: unknown column 'ref_exchange_rate' 
(cherry picked from commit 18e5d59d24)
 2021-09-27 07:36:15 +00:00
Saqib Ansari
705f094a1a chore: hide exchange gain loss if empty 
(cherry picked from commit e6b4d33f4b)
 2021-09-27 07:36:15 +00:00
Saqib Ansari
19b06b0745 patch: invalid gain loss gl entry 
(cherry picked from commit beebfb323a)
 2021-09-27 07:36:15 +00:00
Saqib Ansari
2108bf9f73 fix: cost center in exchange gain loss gl entry 
(cherry picked from commit 78ad50efc2)
 2021-09-27 07:36:14 +00:00
Saqib Ansari
677a59b005 chore: hide exchange gain loss if empty 
(cherry picked from commit dd2d039ca8)
 2021-09-27 07:36:13 +00:00
Saqib Ansari
af531372da fix: setting of gain/loss if party account is in company currency 
(cherry picked from commit 64efe8bf15)
 2021-09-27 07:36:13 +00:00
Frappe PR Bot
986ca8815d fix: local variable 'fiscal_year_details' referenced before assignment (#27658) 2021-09-26 20:28:06 +05:30
Frappe PR Bot
646f8b7871 fix: update default KSA VAT rate for setup (#27614) (#27622) 
(cherry picked from commit abded895f3)

Co-authored-by: Kenneth Sequeira <33246109+kennethsequeira@users.noreply.github.com>
 2021-09-26 11:14:20 +05:30
Frappe PR Bot
08e24bd907 fix: holiday message reminder (#27654) 
Minor grammatical change

(cherry picked from commit dafe99b6e2)

Co-authored-by: escix <preminik@preminik.com>
 2021-09-26 11:12:48 +05:30