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,087 Commits 401 Branches 1,700 Tags
e6b3becfbb75d4dbd2a8886c9e512dd67d4ca869
Commit Graph

38087 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepesh Garg
e6b3becfbb Merge pull request #28581 from frappe/mergify/bp/version-13-hotfix/pr-27348 
fix (refactor): Tax Withholding for Advances using Payment Entry against suppliers (backport #27348)
 2021-11-26 14:50:12 +05:30
Deepesh Garg
03449a09ce fix: Incorrect indentation 
(cherry picked from commit 7f06c8ca57)
 2021-11-26 08:59:30 +00:00
Deepesh Garg
125ce5dd6d fix: Add tests 
(cherry picked from commit f07f010962)
 2021-11-26 08:59:30 +00:00
Deepesh Garg
31f95bd5d1 fix(refactor): Advance tds allocation to purchase invoice 
(cherry picked from commit 5ba3b28d69)
 2021-11-26 08:59:30 +00:00
Deepesh Garg
e2956922dc fix: GL Entries on advance TDS allocation 
(cherry picked from commit 25d208aa8a)
 2021-11-26 08:59:29 +00:00
mergify[bot]
cf5cb70f35 fix: Use get_all instead of get_list for child doctype (#28538) (#28577) 
* fix(Student Attendance Tool): Use `get_all` instead of `get_list` for child doctype

* fix(Course Schedule): incorrect fetch from value

* fix: sider

* fix(Gratuity): Use `get_all` instead of `get_list` for child doctype

(cherry picked from commit ca8dec0cf2)

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-11-26 14:01:04 +05:30
mergify[bot]
875b924279 fix: Customer, Supplier heatmap data not rendering (#28553) (#28575) 
* fix: adding get_timeline_data import on supplier.py, customer.py

(cherry picked from commit 2a5f663a1e)

Co-authored-by: Shariq Ansari <30859809+shariquerik@users.noreply.github.com>
 2021-11-26 13:37:09 +05:30
mergify[bot]
b9218b3c60 fix: over billing validation (#28573) 2021-11-26 12:46:49 +05:30
mergify[bot]
eac67db985 fix: checkbox triggers get_items and sub_assembly buttons (#28558) (#28571) 
(cherry picked from commit 73bfd59846)

Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com>
 2021-11-26 11:54:54 +05:30
mergify[bot]
c4262210c1 fix: total stock summary UI glitch #28564 (#28566) 
fix: total stock summary UI glitch
(cherry picked from commit 87f2dcfb59)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2021-11-25 19:40:48 +05:30
Marica
90049ffff5 Merge pull request #28557 from frappe/mergify/bp/version-13-hotfix/pr-28123 
fix: Remove RM Cost column as cost is not retrievable from Job card (backport #28123)
 2021-11-25 19:09:08 +05:30
Marica
66f02b0817 Merge branch 'version-13-hotfix' into mergify/bp/version-13-hotfix/pr-28123 2021-11-25 18:46:56 +05:30
Ankush Menat
479259c1ae Merge pull request #28560 from frappe/mergify/bp/version-13-hotfix/pr-28124 
refactor: item-warehouse based reposting (backport #28124)
 2021-11-25 18:07:27 +05:30
Ankush Menat
12e1d169d0 Merge branch 'version-13-hotfix' into mergify/bp/version-13-hotfix/pr-28124 2021-11-25 17:48:37 +05:30
Ankush Menat
fbfaf75b66 chore: remove __future__ py2 compatibility imports 2021-11-25 17:42:24 +05:30
Ankush Menat
16682e452d fix: patch failure due to new doctype 
(cherry picked from commit 2b3404435b)
 2021-11-25 17:40:58 +05:30
Ankush Menat
ccb8defc0b fix: ignore permissions while creating reposts 
(cherry picked from commit 0a2964dc82)
 2021-11-25 16:43:13 +05:30
Ankush Menat
1c485a8ae4 refactor: deduplicate during repost background job 
(cherry picked from commit ed94f0f3f2)
 2021-11-25 16:43:06 +05:30
Ankush Menat
2b8950243a test: item-wh deduplication in reposting 
(cherry picked from commit 55631dd0d6)
 2021-11-25 11:08:14 +00:00
Ankush Menat
d55aac26ce perf: skip unnecessary item-wh reposts 
Using basic idea that repost with older posting date will also take care
of subsequent posting dates...

When Item-WH reposts are queued:

1. If another repost with same item-wh but older posting date exists
    then skip current one.
2. If another repost with same item-wh but newer posting date exists
    then skip another one.

(cherry picked from commit 0d0e24a5f5)
 2021-11-25 11:08:13 +00:00
Ankush Menat
3e9d639fb5 fix: dont erase voucher_type and voucher_no for item_wh repost 
kept for tracability.

(cherry picked from commit 1d3842f03a)
 2021-11-25 11:08:12 +00:00
Ankush Menat
21f64e5eba perf: index for item-sh on repost item valuation 
Item-WH based reposting requires querying existing similar repost.
Assuming there is only 1 max extra entry with same params just indexing
item-WH is sufficient to speed up the query.

(cherry picked from commit a5a8c9104f)
 2021-11-25 11:08:11 +00:00
Ankush Menat
7ae5bc8911 feat: option to select reposting method 
In current implementation selecting Item-Warehouse based reposting is
better for few users, who don't use depenent SLEs but have frequent
transactions involving same items.

This change lets them switch to item-warehouse based reposting if
required.

Only use this if you understand technicalities of stock reposting. This
is experimental but will become mainstream in coming days.

(cherry picked from commit 45dd46be3d)
 2021-11-25 11:08:10 +00:00
Ankush Menat
db22859b54 refactor: reuse get_items_to_be_repost function 
(cherry picked from commit d220e08ba4)
 2021-11-25 11:08:09 +00:00
Ankush Menat
876c85fbf7 test: item-wh repost creation 
(cherry picked from commit a36c249d3d)
 2021-11-25 11:08:09 +00:00
Ankush Menat
0032ee46be refactor: item-wh wise reposting by default 
(cherry picked from commit 6dc9b822bc)
 2021-11-25 11:08:08 +00:00
Saqib
80d0b6ddc8 revert: "feat: Accounts, Selling & Assets Onboarding cleanup (#28491)" (#28559) 2021-11-25 16:36:29 +05:30
marination
9fa8d02184 fix: Remove commented code 
(cherry picked from commit 42395af22a)
 2021-11-25 09:06:24 +00:00
marination
e47f7a3023 chore: Add comment hinting to reason 
(cherry picked from commit 8502ccb5b2)
 2021-11-25 09:06:24 +00:00
marination
8e9cd83c4b fix: Remove RM Cost column as cost is not retrievable from Job card 
(cherry picked from commit 27236b7e9e)
 2021-11-25 09:06:23 +00:00
Saqib
5589e189b5 fix: do not get password if client_secret is not set (#28547) 2021-11-25 12:05:29 +05:30
Ankush Menat
88a8bc7ebc test: shopify test custom field creation failing (#28544) 2021-11-24 17:20:38 +05:30
mergify[bot]
32855073ff fix: fixes in work order doctype (#28217) (#28543) 
* fix: fixes in work order doctype

* fix: sider issues and disabled set only once property

* fix: set default qty to manufacture

* fix: dont manually collapse sections

* fix: remove unnecessary messages

* fix: make dependent fields read only


Co-authored-by: Mohammed Yusuf Shaikh <49878143+mohammedyusufshaikh@users.noreply.github.com>
Co-authored-by: Ankush Menat <ankush@frappe.io>
 2021-11-24 16:44:20 +05:30
mergify[bot]
b8c867a4bc fix: correct module for reloading doc (#28526) 
(cherry picked from commit 0a6021e854)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2021-11-23 18:20:36 +05:30
Bhavesh Maheshwari
7ae1369d64 fix: broken bom tree view and remove duplicate button (#28512) 
* fix: broken bom tree view and remove duplicate button

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2021-11-23 17:51:13 +05:30
Akash Krishna
34deab5b71 fix: Healthcare Practitioner - query (#28303) 2021-11-23 17:48:50 +05:30
mergify[bot]
623cef1032 fix: Replace 'parent' with 'invoice_or_item' (#28516) 2021-11-23 14:02:54 +05:30
mergify[bot]
b7c63212cd fix: POS Item cart only taxes with amount displayed (#28515) 2021-11-23 11:41:24 +05:30
mergify[bot]
adcf906d1c fix: Employee link formatter showing incorrect value for Employee Name (#28504) (#28514) 
(cherry picked from commit 5ba1bc1572)

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-11-23 09:39:10 +05:30
mergify[bot]
294de89b9b fix(UX): Allocated Amount in Advances not updated on updating expense amount in Expense Claim (#28497) (#28505) 
* fix(UX): Allocated Amount in Advances not updated on updating expense amount in Expense Claim

* fix: Expense Claim Advance form labels

(cherry picked from commit e7eef9601d)

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-11-23 08:52:31 +05:30
Deepesh Garg
fe94ec6036 Merge pull request #28502 from frappe/mergify/bp/version-13-hotfix/pr-28469 
fix: FY query returning None for new company (backport #28469)
 2021-11-22 20:20:07 +05:30
Subin Tom
b68d5f86f9 fix: FY query returning None for new company 
(cherry picked from commit 350ed1a6c2)
 2021-11-22 13:53:44 +00:00
mergify[bot]
3bdf5c8673 fix: KSA Invoice print format for multicurrency invoices (#28496) 2021-11-22 18:25:21 +05:30
mergify[bot]
358205b177 feat: Accounts, Selling & Assets Onboarding cleanup (#28491) 2021-11-22 16:45:23 +05:30
Anupam Kumar
295dc32bd2 Merge pull request #28436 from anupamvs/crm-lead-validate-cleanup 
fix: lead validate function cleanup
 2021-11-22 14:43:47 +05:30
Anupam Kumar
08717192c7 Merge branch 'version-13-hotfix' into crm-lead-validate-cleanup 2021-11-22 14:43:34 +05:30
mergify[bot]
b6b45c6275 fix: POS string translation (#28490) 2021-11-22 13:58:47 +05:30
mergify[bot]
dff3decd56 fix: Closed status error in Work Order Summary (backport #28460) 
* fix: Closed status error in Work Order Summary (#28460)

* fix: Closed status error in Work Order Summary

* chore: use get_meta to get status options

* refactor: simplify code

Co-authored-by: Ankush Menat <ankush@frappe.io>
(cherry picked from commit aa689874e3)

# Conflicts:
#	erpnext/manufacturing/report/work_order_summary/work_order_summary.py

* fix: resolve conflict

Co-authored-by: Sagar Sharma <63660334+s-aga-r@users.noreply.github.com>
Co-authored-by: Ankush Menat <ankush@frappe.io>
 2021-11-22 13:24:25 +05:30
Saqib
2a7ca32296 Merge pull request #28480 from frappe/mergify/bp/version-13-hotfix/pr-28402 
fix: Gross Profit report totals (backport #28402)
 2021-11-22 13:15:30 +05:30
mergify[bot]
d8025b37cd feat: create party link from customer/supplier (#28481) 2021-11-22 13:15:12 +05:30