nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-13 18:21:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
40,505 Commits 463 Branches 1,750 Tags
a7bf236c285abbcdfb74a60ebcbe5f04fe2f985f
Commit Graph

40505 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mergify[bot]
187a69e390 fix: reorder patch to fix custom field options (backport #28866) 
* fix: reorder patch to fix custom field options (#28866)

(cherry picked from commit 7fd06108bf)

# Conflicts:
#	erpnext/patches.txt

* fix: resolve conflict

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2021-12-14 14:03:14 +05:30
Deepesh Garg
198b427349 fix: KSA QR field rename patch 
(cherry picked from commit 14d03a9446)
 2021-12-14 07:18:54 +00:00
Deepesh Garg
55db2f8808 fix: KSA QR field rename patch 
(cherry picked from commit 14d03a9446)
 2021-12-14 07:18:33 +00:00
mergify[bot]
1a986f0b11 fix(UX): hide RM table(Job Card) if material transfer is against work order (backport #28746) 
* fix(UX): hide RM table(Job Card) if material transfer is against work order (#28746)

(cherry picked from commit cc8c0595e2)

# Conflicts:
#	erpnext/manufacturing/doctype/job_card/job_card.js

* chore: resolve conflicts

Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com>
Co-authored-by: Ankush Menat <ankush@frappe.io>
 2021-12-14 12:44:42 +05:30
mergify[bot]
5798687951 fix: packing slip incorrect item value (bp #28862) 
(cherry picked from commit 534c64abcd)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2021-12-14 12:16:42 +05:30
mergify[bot]
0e68037082 fix: migration hashes (#28850) (#28860) 
Co-authored-by: Ankush Menat <ankush@frappe.io>
(cherry picked from commit 46a6c8dbfe)

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
 2021-12-14 11:13:58 +05:30
mergify[bot]
46a6c8dbfe fix: migration hashes (#28850) 
Co-authored-by: Ankush Menat <ankush@frappe.io>
 2021-12-14 11:10:57 +05:30
rohitwaghchaure
e08c9cc250 Merge pull request #28855 from rohitwaghchaure/merge-hotfix-to-pre-release-for-13-17 
chore: merge branch 'version-13-hotfix' into 'version-13-pre-release'
 2021-12-14 00:47:47 +05:30
Rohit Waghchaure
a3189226a5 chore: merge branch 'version-13-hotfix' into 'version-13-pre-release' 2021-12-13 23:01:11 +05:30
Saqib Ansari
1f41c7fed1 test: test_hsn_summary_for_invoice_with_duplicate_items 
(cherry picked from commit 6a239c8ea3)
 2021-12-13 17:10:20 +00:00
Saqib Ansari
1c96c6fe08 fix: hsn-wise summary is incorrect if an invoice has repeated item code 
(cherry picked from commit e74739a677)
 2021-12-13 17:10:19 +00:00
Saqib
99c6db155d Merge pull request #28852 from frappe/mergify/bp/version-13-hotfix/pr-28677 
fix: Fix 'Adjust Asset Value' button (backport #28677)
 2021-12-13 22:17:40 +05:30
GangaManoj
cefd0185a6 fix: Rename function 
(cherry picked from commit 4629308d94)
 2021-12-13 16:23:35 +00:00
GangaManoj
414558aa70 fix: Rename variable 
(cherry picked from commit 5b224f841b)
 2021-12-13 16:23:34 +00:00
GangaManoj
e10eea931b fix: Fix 'Adjust Asset Value' button 
(cherry picked from commit 6f1cf94c9f)
 2021-12-13 16:23:33 +00:00
GangaManoj
d000782de0 fix: Edit dates and frequency of depreciation 
(cherry picked from commit 4311936b7d)
 2021-12-13 16:20:51 +00:00
GangaManoj
855ae399b5 fix: Test if clear_depreciation_schedule() works for multiple finance books 
(cherry picked from commit 6ec5a19063)
 2021-12-13 16:20:50 +00:00
GangaManoj
ae875ab021 fix: Retain depreciation schedule rows that are linked with JEs while clearing the schedule 
(cherry picked from commit 33a0b1db2c)
 2021-12-13 16:20:49 +00:00
GangaManoj
57f41bc30a fix: Test if multiple Depreciation Schedules are set up for multiple Finance Books 
(cherry picked from commit f455de2924)
 2021-12-13 16:20:49 +00:00
GangaManoj
8a4019e501 fix: Clear Depreciation Schedule entries that aren't linked with Journal Entries before modifying the schedule 
(cherry picked from commit 475d8394e4)
 2021-12-13 16:20:48 +00:00
GangaManoj
54cac351cd fix: Rename loop variable 
(cherry picked from commit 059d1f3b74)

# Conflicts:
#	erpnext/assets/doctype/asset/asset.py
 2021-12-13 16:20:47 +00:00
GangaManoj
db3d2c31a3 fix: Prevent clearing of Depreciation Schedule on adding more than one Finance Book 
(cherry picked from commit a4043c035d)
 2021-12-13 16:20:43 +00:00
mergify[bot]
8fe5326c8e fix: validate if asset account is set against company (#28849) 2021-12-13 21:10:03 +05:30
Deepesh Garg
61f48e9856 Merge pull request #28836 from frappe/mergify/bp/version-13-hotfix/pr-28748 
fix: Ageing in AR/AP report for advances (backport #28748)
 2021-12-12 19:29:53 +05:30
Deepesh Garg
24b37defcc Merge pull request #28835 from frappe/mergify/bp/version-13-hotfix/pr-28764 
fix: TDS Monthly payable report (backport #28764)
 2021-12-12 19:29:41 +05:30
Deepesh Garg
fac357ebe9 fix: Ageing in AR/AP report for advances 
(cherry picked from commit 3dabac15ed)
 2021-12-12 11:57:41 +00:00
Deepesh Garg
44f97dfd5e fix: TDS Monthly payable report 
(cherry picked from commit d106d59c3f)
 2021-12-12 11:42:46 +00:00
mergify[bot]
59f6277e4d feat(buying): quotation number in supplier quotation (#28827) 
(cherry picked from commit 624481be6f)

Co-authored-by: Himanshu <himanshuwarekar@yahoo.com>
 2021-12-11 17:37:17 +05:30
Dany Robert
3f686a67e6 fix: no module named 'redisearch' (#28818) 
* chore: rename file to avoid the overriding

* fix: rename ref #1

* fix: rename ref in e_commerce_settings

* fix: rename ref in product_search.py

* chore: rename rsearch.py to redisearch_utils.py

* chore: rename rsearch to redisearch_utils in product_search
 2021-12-10 18:13:22 +05:30
rohitwaghchaure
7f9d0061ac Merge pull request #28819 from frappe/mergify/bp/version-13-hotfix/pr-28815 
fix: validate pending reposts before freezing stock/account (backport #28815)
 2021-12-10 17:52:17 +05:30
Ankush Menat
140e91f459 test: stock frozen validation 
(cherry picked from commit 75bc404cbe)
 2021-12-10 11:42:16 +00:00
Ankush Menat
9e69725102 fix: ensure that reposting is finished before freezing stock/account 
(cherry picked from commit d37541d3fb)
 2021-12-10 11:42:15 +00:00
mergify[bot]
d2fac14922 feat: added QI link in Job Card Dashboard (#28643) (#28810) 
(cherry picked from commit f1c0190f02)

Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com>
 2021-12-09 20:31:42 +05:30
mergify[bot]
99851e7f3a refactor: map serial from schedule if only one (#28747) 
(cherry picked from commit eb522a3746)

Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com>
 2021-12-09 20:26:21 +05:30
mergify[bot]
623d32597d fix: misleading "Set Default X" fields after saving (#28798) (#28809) 
* fix: misleading "Set Default X" fields after saving

* refactor: remove unncessary code and minor formatting

* fix: extend to more doctypes and correct fieldnames

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

Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com>
 2021-12-09 17:21:12 +05:30
mergify[bot]
4d0d39c59c fix: deduplicate after finishing the repost (#28803) (#28806) 
Not really a bug but avoids potential of prematurely skipping something
if failure occurs and failure isn't resolved.

(cherry picked from commit c64d5028b4)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2021-12-09 15:55:38 +05:30
Saqib
0cf3ab3264 Merge pull request #28799 from rtdany10/version-13-hotfix 
feat(Regional): KSA E-Invoing optimizations and POS support
 2021-12-09 13:05:52 +05:30
mergify[bot]
43bc612f07 fix: wrong german translation of abbreviation PAN (#28804) 
Wrong german translation of abbreviation: PAN

(cherry picked from commit f043f59324)

Co-authored-by: Michael Köller <michael.koeller@greenbytes.de>
 2021-12-09 11:39:05 +05:30
Dany Robert
f98a410501 feat: KSA POS Invoice 2021-12-08 23:19:29 +05:30
Dany Robert
dde17b3585 feat: init KSA POS Invoice 2021-12-08 23:18:16 +05:30
Dany Robert
9006ed4ac2 feat: run patches 2021-12-08 23:16:25 +05:30
Dany Robert
3373fcceb6 feat: rename old qr fields 2021-12-08 23:15:08 +05:30
Dany Robert
6c1bc27b12 feat: disable print formats for other countries 2021-12-08 23:13:50 +05:30
Dany Robert
73ce03288c fix: disable print format by default 2021-12-08 23:11:12 +05:30
Dany Robert
f4c8be820e feat: generate QR code for POS invoice 2021-12-08 23:05:34 +05:30
Dany Robert
2e3c9c0aad feat: create QR field incase of missing 2021-12-08 23:04:02 +05:30
Dany Robert
c6d4a23bdc fix: rename QR field and enable print formats 2021-12-08 23:01:12 +05:30
aaronmenezes
3aead835c5 fix: Maintenence Visit -Purpose (item ) tables is not visible on submitted or saved entries (#28792) 
(cherry picked from commit 90b98440e2)
 2021-12-08 16:50:58 +05:30
Ankush Menat
0d71496461 test: add multi-batch negative qty test 
(cherry picked from commit 96a019ec49)
 2021-12-08 16:50:28 +05:30
Ankush Menat
1aec6a6cb5 test: simplfy test and expect specific exception 
(cherry picked from commit f0152d03a4)
 2021-12-08 16:50:28 +05:30