CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-19 10:14:59 +00:00
Code Issues Packages Projects Releases Wiki Activity
38,851 Commits 423 Branches 1,723 Tags
30a1512caedc6730cdf36bf6a88e87493de4655c
Commit Graph

38851 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rohit Waghchaure
30a1512cae chore: change log for v13.17.0 2021-12-21 17:18:56 +05:30
mergify[bot]
b2de0e7bbd fix: Reset value_after_depreciation on reversing journal entry during Asset return (#28981) 
(cherry picked from commit 1ed30ee7c7)

Co-authored-by: Ganga Manoj <ganga.manoj98@gmail.com>
 2021-12-21 15:08:49 +05:30
Deepesh Garg
b387fe54a6 Merge pull request #28962 from frappe/mergify/bp/version-13-pre-release/pr-28959 
fix: Error on viewing consolidated financial statement (backport #28959)
 2021-12-20 17:15:32 +05:30
Deepesh Garg
d60f51dd09 fix: Error on viewing consolidated financial statement 
(cherry picked from commit 5d6199cf35)
 2021-12-20 11:44:25 +00:00
mergify[bot]
f2464ce04a fix: incorrect rounding off near zero (#28948) (#28949) 
(cherry picked from commit 0724a148e6)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2021-12-18 21:36:17 +05:30
mergify[bot]
5a6ea7a829 fix(ksa): enable ksa pos invoice print format (#28934) 2021-12-17 15:27:23 +05:30
mergify[bot]
3dd12143a2 fix: mapping to maintenance visit gets erased (#28917) (#28926) 
* fix: mappings to maintenance visit gets erased

* test: mapping of schedule to visit

(cherry picked from commit 4cb5b627a1)

Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com>
 2021-12-16 23:33:43 +05:30
mergify[bot]
ac17bc3d31 chore: ledger invariant check report (#28921) (#28923) 
(cherry picked from commit 6ba8f7644d)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2021-12-16 22:48:33 +05:30
mergify[bot]
6b248db0c9 fix: hsn-wise summary is incorrect if an invoice has repeated item code (#28892) 2021-12-15 11:45:59 +05:30
mergify[bot]
a712e5cee6 revert: "fix: expected value after useful life validation" (#28891) 2021-12-15 11:09:34 +05:30
Deepesh Garg
aee4f87b07 Merge pull request #28868 from frappe/mergify/bp/version-13-pre-release/pr-28832 
fix: KSA QR field rename patch (backport #28832)
 2021-12-14 16:02:06 +05:30
mergify[bot]
0d8ad4d64b 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>
(cherry picked from commit 187a69e390)

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
 2021-12-14 14:05:21 +05:30
Deepesh Garg
198b427349 fix: KSA QR field rename patch 
(cherry picked from commit 14d03a9446)
 2021-12-14 07:18:54 +00:00
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
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
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
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
Ankush Menat
f139b4aac6 refactor: remove redundant batch qty validation 
This check was only checking total sum, which is problamatic when making
backdated entries that can cause intermediate values to go negative
while overall values stay positive.

(cherry picked from commit 9c90b7a40d)
 2021-12-08 16:50:28 +05:30
Ankush Menat
68a9c3e160 fix: check future negative stock for batches 
batch's ledger is only maintained in form of `actual_qty` on batch's
SLEs. To validate if batch has any negative qty in future, cumulative
total of `actual_qty` is required to ensure it never goes negative.

(cherry picked from commit 5eba57528c)
 2021-12-08 16:50:28 +05:30