CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-15 16:28:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
38,328 Commits 416 Branches 1,718 Tags
b60fbf5ba95350e79463f922b0e8dce518780383
Commit Graph

38328 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepesh Garg
b60fbf5ba9 fix: Add round floats for price list rate 2021-12-22 12:01:39 +05:30
Deepesh Garg
233f79bf96 fix: Recalculate taxes irrespective of price list rate changed or not 2021-12-22 11:26:19 +05:30
Deepesh Garg
0980c2f981 fix: Linting issues 2021-12-20 13:26:16 +05:30
Deepesh Garg
4b3ef24378 Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into price_fetch_optimize 2021-12-20 12:17:37 +05:30
Deepesh Garg
6087d5a603 fix(UX): Optimize rate updation of changing price list 2021-12-20 12:16:14 +05:30
Ankush Menat
0724a148e6 fix: incorrect rounding off near zero (#28948) 2021-12-18 21:34:25 +05:30
mergify[bot]
d3c62821fb fix: Add Invoice Number field to list view in Opening Invoice Creation Tool (#28941) 2021-12-18 12:07:45 +05:30
mro-admin
c5931e4b1e fix: convert asynchronous field update to synchronous (#28906) 
Co-authored-by: Dan Navarro on Ubuntu Work <danjeremynavarro@gmail.com>
 2021-12-17 19:06:08 +05:30
mergify[bot]
9c2a9c28df fix(ksa): enable ksa pos invoice print format (backport #28911) 2021-12-17 15:27:05 +05:30
Deepesh Garg
349785dcbd Merge pull request #28932 from frappe/mergify/bp/version-13-hotfix/pr-28916 
fix: Multicurrency invoices using subscription (backport #28916)
 2021-12-17 13:52:30 +05:30
Deepesh Garg
94d3e66428 fix: Add tests for multicurrency subscription 
(cherry picked from commit 6ab753015e)
 2021-12-17 06:59:59 +00:00
Deepesh Garg
eb36742427 fix: Multicurrency invoices using subscription 
(cherry picked from commit 0e4842b986)
 2021-12-17 06:59:59 +00:00
mergify[bot]
fcb08d54ea fix: mapping to maintenance visit gets erased (#28917) (#28925) 
* 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:56 +05:30
mergify[bot]
167e8d3dde chore: ledger invariant check report (#28921) (#28922) 
(cherry picked from commit 6ba8f7644d)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2021-12-16 22:48:12 +05:30
mergify[bot]
85ded9e7ce perf: remove forcing of posting sort index on stock balance (#28902) (#28904) 
mysql is generally smart enough to figure out which index is better
based on cardinality of index. While posting sort index is better for
low item high # of SLE scenario it's bad for high item variety each with
lower count of SLEs.

(cherry picked from commit 228e011819)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2021-12-15 19:23:12 +05:30
mergify[bot]
970cdef911 feat: added required_date field to set date in child table (backport #28432) 
feat: added required_date field to set date in child table (backport #28432)
 2021-12-15 12:49:23 +05:30
mergify[bot]
1988e72710 revert: "fix: expected value after useful life validation" (backport #28853) 2021-12-15 11:09:21 +05:30
Saqib
cd075ce3be Merge pull request #28854 from frappe/mergify/bp/version-13-hotfix/pr-28783 
fix: hsn-wise summary is incorrect if an invoice has repeated item code (backport #28783)
 2021-12-15 10:35:25 +05:30
Ankush Menat
bdd43274b2 fix: incorrect logic for "Reserved Qty for Production" (#28880) 
* fix: reservation for production incorrect

The query uses case to decide what fields to compute reservation on,
this case is outermost case hence the very first Work order's "Skip
transfer" is considered for ALL work orders.

Solution: move the case inside Sum.

Steps to reproduce:
1. Make work order for more than 1 qty (with | without skip transfer)
2. Create manufacture and transfer entries.
3. Keep checking reserved quantities during this process.

* test: use default warehouse for testing reservation

(cherry picked from commit 80f1a8c645)
 2021-12-14 18:22:10 +05:30
Ankush Menat
25fd11e24f test: timeout certain tests in work order to avoid stuck tests (#28666) 2021-12-14 18:21:48 +05:30
Ankush Menat
73693ac153 test: remove commits from tests (#27939) 
* test: remove commits from tests in selling module

* test: remove commits from manufacturing module

* test: remove commits from accounts module tests

* test: remove commits from controller tests

* test: keep commits in accounting dimension test

* Revert "test: remove commits from controller tests"

This reverts commit f5cfbee5da.

* Revert "test: remove commits from accounts module tests"

This reverts commit df4c27efdd.

(cherry picked from commit 96ef88d935)
 2021-12-14 18:21:48 +05:30
mergify[bot]
a4814f5519 fix: remove set only once from valuation method (#28876) (#28882) 
(cherry picked from commit 66960cf050)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2021-12-14 17:29:40 +05:30
Deepesh Garg
a6f9b523d9 Merge pull request #28867 from frappe/mergify/bp/version-13-hotfix/pr-28832 
fix: KSA QR field rename patch (backport #28832)
 2021-12-14 16:01:57 +05:30
mergify[bot]
d0d5236a1a Merge pull request #28845 from ruchamahabal/fix-salary-slip-timesheet (#28874) 
fix: incorrect amount based on payment days in timesheet salary slip
(cherry picked from commit b027050f77)

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-12-14 15:32:22 +05:30
mergify[bot]
b3720f62d8 fix: Nonstock item showing in Itemwise Recommended Reorder Level report bp (#28873) 
(cherry picked from commit 304aa44feb)

Co-authored-by: aaronmenezes <ron2805@gmail.com>
 2021-12-14 15:19:11 +05:30
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
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]
46a6c8dbfe fix: migration hashes (#28850) 
Co-authored-by: Ankush Menat <ankush@frappe.io>
 2021-12-14 11:10:57 +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
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