CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-14 18:23:55 +00:00
Code Issues Packages Projects Releases Wiki Activity
38,288 Commits 397 Branches 1,698 Tags
b33fd6acc769dbfaa43c665c19f378e8e041d010
Commit Graph

38288 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepesh Garg
b33fd6acc7 fix: Is Reverse Charge check in Tax Category 2021-12-17 15:59:21 +05:30
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
18alantom
341a02eaf4 test: check execution of illegal stock entry seq 
(cherry picked from commit 1cbeba5f1d)
 2021-12-08 16:50:28 +05:30
Deepesh Garg
d9f92ddc27 Merge pull request #28786 from deepeshgarg007/tax_template_fix_new 
fix: Error on Invoice generation
 2021-12-08 14:09:08 +05:30
Deepesh Garg
82255293c4 fix: Error on Invoice generation 2021-12-08 14:06:34 +05:30
Deepesh Garg
5a6d7706a6 Merge pull request #28777 from deepeshgarg007/auto_tax_fetch_fixes 
fix: Error on creating invoice
 2021-12-07 22:19:52 +05:30
Deepesh Garg
e11515a356 fix: Error on creating invoice 2021-12-07 18:44:05 +05:30
Deepesh Garg
f5ab2f4f8c Merge pull request #28773 from frappe/mergify/bp/version-13-hotfix/pr-28731 
fix: Better Error logging for deferred revenue/expense booking (backport #28731)
 2021-12-07 16:55:20 +05:30
mergify[bot]
28b84ad7d6 fix: ignore mandatory fields while creating WO from SO (#28772) (#28774) 
If fields are made mandatory from customizations the WO creation simply
fails.

(cherry picked from commit 6efbbb1058)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2021-12-07 16:49:43 +05:30
Deepesh Garg
dad9a913db fix: Log error before throwing exception 
(cherry picked from commit 3c64e201cc)
 2021-12-07 10:12:59 +00:00
Deepesh Garg
6b8b2946c1 fix: Commit joural entries 
(cherry picked from commit 0ba4fcee2a)
 2021-12-07 10:12:58 +00:00
Deepesh Garg
46e492d594 fix: Better Error logging fordeferred revenue/expense booking 
(cherry picked from commit 67a001d876)
 2021-12-07 10:12:58 +00:00
Saqib
f9742394f3 feat: Make Depreciation Entry posting more flexible 2021-12-06 16:45:15 +05:30
Saqib
ef65774b77 fix: Create Depreciation Schedules for existing Assets accurately (backport #28675) 2021-12-06 16:44:38 +05:30
Saqib Ansari
a9bcc869b9 fix: conflicts 2021-12-06 16:12:18 +05:30
Saqib Ansari
f908dcf510 Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into mergify/bp/version-13-hotfix/pr-28675 2021-12-06 16:10:54 +05:30
Saqib Ansari
5b25558135 fix(test): test_depr_entry_posting_with_income_account 2021-12-06 16:07:38 +05:30
GangaManoj
c8541ed8e5 fix: Test Depreciation Entry posting when Depreciation Expense Account is an Income Account 2021-12-06 16:07:29 +05:30
GangaManoj
5763f8405a fix: Test Depreciation Entry posting when Depreciation Expense Account is an Expense Account 2021-12-06 16:07:29 +05:30
GangaManoj
d898e74980 fix: Check root_type of Depreciation Expense Account 2021-12-06 16:07:29 +05:30
GangaManoj
81c88d643a fix: Check all ancestors and not just the root node 2021-12-06 16:07:06 +05:30
GangaManoj
78032dfb35 fix: Only raise an error if Depreciation Expense Account is neither an Income nor an Expense Account 2021-12-06 16:07:06 +05:30
GangaManoj
ce86bcf1eb fix: Make Depreciation Entry posting more flexible 2021-12-06 16:07:06 +05:30
GangaManoj
84952beed4 fix: Filter Depreciation Expense Account by root type 2021-12-06 16:06:27 +05:30
Deepesh Garg
334f22f453 Merge pull request #28744 from frappe/mergify/bp/version-13-hotfix/pr-28656 
fix: Taxjar Nexus list visible only if child table is visible (backport #28656)
 2021-12-06 15:57:14 +05:30
Saqib Ansari
d55daf5910 Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into mergify/bp/version-13-hotfix/pr-28675 2021-12-06 15:49:02 +05:30