nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-17 08:35:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
37,865 Commits 401 Branches 1,698 Tags
7cbf577f1f980c9ad85d8d762233dbfcf516e9db
Commit Graph

37865 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepesh Garg
7cbf577f1f fix: Accounting Dimension filters not honouring user permissions 
(cherry picked from commit aa9e78bed1)
 2021-10-29 09:10:50 +00:00
mergify[bot]
1454f8bc96 fix: Skip empty rows while updating unsaved BOM cost (#28136) (#28142) 
- Dont try to get valuation rate if row has no item code
- Dont try to add exploded items if row has no item code

(cherry picked from commit 292419bc9e)

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2021-10-29 14:19:51 +05:30
mergify[bot]
a33ebbdc54 test: remove unnecessary creation of new company (#28137) (#28140) 
(cherry picked from commit afe09d4e80)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2021-10-29 14:19:25 +05:30
Deepesh Garg
ee6da35c0b Merge pull request #28134 from frappe/mergify/bp/version-13-hotfix/pr-28122 
fix: Consolidated Financial Report throws error for empty equity data list (backport #28122)
 2021-10-29 13:51:48 +05:30
Deepesh Garg
1c0ae92912 Merge pull request #28133 from frappe/mergify/bp/version-13-hotfix/pr-27609 
fix: Unlink PO on cancelling SO (backport #27609)
 2021-10-29 13:51:21 +05:30
Subin Tom
3fc2442622 fix: Consolidated Financial Report throws error for empty equity data list 
(cherry picked from commit d786855d94)
 2021-10-29 06:42:13 +00:00
Deepesh Garg
a60ecb95b0 fix: Ignore PO on So cancel 
(cherry picked from commit 051aaa708d)
 2021-10-29 06:28:28 +00:00
GangaManoj
ed58f206fa fix: Remove unused imports 
(cherry picked from commit d24cfff388)
 2021-10-29 06:28:27 +00:00
GangaManoj
305b9508e6 fix: Remove debugger 
(cherry picked from commit 1a9d2684e2)
 2021-10-29 06:28:27 +00:00
GangaManoj
d47007adb2 fix: Remove print statements 
(cherry picked from commit 8844fdbf23)
 2021-10-29 06:28:26 +00:00
GangaManoj
7c42b8b702 fix: Unlink PO on cancelling SO 
(cherry picked from commit e77534fe13)
 2021-10-29 06:28:25 +00:00
GangaManoj
2fb18afea0 fix: Unlink PO on cancelling SO 
(cherry picked from commit 8396f24e70)
 2021-10-29 06:28:24 +00:00
Deepesh Garg
c822f286c7 Merge pull request #28125 from deepeshgarg007/ksa-vat-v13 
feat(regional): KSA E-Invoicing and VAT Report
 2021-10-29 11:15:19 +05:30
Deepesh Garg
6260f0caa1 Merge pull request #28128 from frappe/mergify/bp/version-13-hotfix/pr-28071 
fix : Get LTDS based on tax withholding category (backport #28071)
 2021-10-29 09:05:12 +05:30
Deepesh Garg
4019148a42 fix: Resolve conflicts 2021-10-28 20:26:38 +05:30
Deepesh Garg
7a25d5f2de fix: Rewrite patch using query builder 
(cherry picked from commit 09a5616e2d)
 2021-10-28 14:31:06 +00:00
Deepesh Garg
1ba0111e16 fix: Replace section code with tax withholding category in LDC 
(cherry picked from commit bf13d183d8)

# Conflicts:
#	erpnext/patches.txt
 2021-10-28 14:31:06 +00:00
Deepesh Garg
e9c3d3ff0d fix: Get LTDS based on tax withholding category 
(cherry picked from commit e6e804e7d7)
 2021-10-28 14:31:05 +00:00
Ahmad
6d39b90b8e refactor: make strings translate 2021-10-28 17:53:41 +05:30
Ahmad
b69381117f fix: pre-commit hooks 2021-10-28 17:53:22 +05:30
Ahmad
301b94e06a fix: pre-commit hooks 2021-10-28 17:53:22 +05:30
Ahmad
30f3b4804d refactor (regional): KSA utils 2021-10-28 17:53:22 +05:30
Ahmad
0313b44f1f Update erpnext/regional/saudi_arabia/utils.py 
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
 2021-10-28 17:53:22 +05:30
Ahmad
f9770b69b2 Update erpnext/regional/saudi_arabia/utils.py 
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
 2021-10-28 17:53:22 +05:30
Ahmad
5f7c5bcac8 fix: indentations 2021-10-28 17:52:53 +05:30
Ahmad
873ed1ae4f refactor(regional): moved methos to region specific utils for KSA 2021-10-28 17:52:02 +05:30
Ahmad
3fca08e3e8 Update erpnext/regional/saudi_arabia/setup.py 
Method name updated

Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
 2021-10-28 17:46:30 +05:30
Ahmad
220ab16698 Refactor erpnext/regional/__init__.py 
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
 2021-10-28 17:44:26 +05:30
Ahmad
a8ba52e8a5 Update erpnext/regional/report/ksa_vat/ksa_vat.py 
String made translatable

Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
 2021-10-28 17:44:19 +05:30
Ahmad
60fd96085c feat(regional): QR Code generation for Saudi Arabia Sales Invoices 2021-10-28 17:44:04 +05:30
Ahmad
e03965afa5 feat(Regional): KSA VAT Report 2021-10-28 17:39:15 +05:30
Deepesh Garg
d116aa6f23 Merge pull request #28116 from frappe/mergify/bp/version-13-hotfix/pr-28114 
fix: Autoemail report not showing dynamic report filters (backport #28114)
 2021-10-28 11:57:28 +05:30
mergify[bot]
9c7cdc1079 fix: opportunity link is missign from customer (#28110) (#28121) 
(cherry picked from commit 4787a75208)

Co-authored-by: Anupam Kumar <anupamvns0099@gmail.com>
 2021-10-28 11:48:19 +05:30
Marica
a19f0f484c Merge pull request #28098 from marination/so-quote-portal 
fix: SO/Quotation Portal Missing Images
 2021-10-28 00:16:07 +05:30
Marica
5388ecf85e Merge pull request #27926 from frappe/mergify/bp/version-13-hotfix/pr-27914 
fix: Avoid automatic customer creation on website user login (backport #27914)
 2021-10-28 00:05:55 +05:30
Deepesh Garg
b34e737930 fix: Autoemail report not showing dynamic report filters 
(cherry picked from commit 3a6894fb9c)
 2021-10-27 14:29:38 +00:00
Ankush Menat
56c98aa59e fix(ux): make qty 1 by default in WO 
(cherry picked from commit d81b87d9b3)
 2021-10-27 19:49:00 +05:30
Ankush Menat
aa210ba6c8 fix: don't show blocked supplier in autocomplete 
(cherry picked from commit 2221c9ed89)
 2021-10-27 19:49:00 +05:30
Ankush Menat
4bfacabf85 fix(ux): alternative item two way validation 
(cherry picked from commit 5902762ec8)
 2021-10-27 19:49:00 +05:30
Ankush Menat
99a1eea982 fix: remove bad hardcoded max value 
(cherry picked from commit 5f9bd9b8e9)
 2021-10-27 19:49:00 +05:30
mergify[bot]
48acb56cb0 fix: Remove pointless buttons from Payment Order (#28108) 
fix: Remove pointless buttons from Payment Order
(cherry picked from commit c9f3ea5fea)

Co-authored-by: Ganga Manoj <ganga.manoj98@gmail.com>
 2021-10-27 16:16:31 +05:30
mergify[bot]
5867d97e7c fix(ux): misleading label for image fields (#28107) (#28109) 
(cherry picked from commit e0cf45e7ec)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2021-10-27 15:29:08 +05:30
mergify[bot]
e757970db3 fix(general_ledger): Order by in case Group by Account (#28093) (#28106) 
* Update general_ledger.py

Fix order_by_statement if filter group by: Group by Account

* chore: whitespace

Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
(cherry picked from commit f24ed6723e)

Co-authored-by: hendrik <hendrik.zeta@gmail.com>
 2021-10-27 14:45:05 +05:30
Saqib
2a60a65ccd Merge pull request #28102 from frappe/mergify/bp/version-13-hotfix/pr-27916 
perf(minor): improve sales invoice submission (backport #27916)
 2021-10-27 14:26:38 +05:30
Afshan
db5593287e Merge branch 'version-13-hotfix' into mergify/bp/version-13-hotfix/pr-27916 2021-10-27 14:05:51 +05:30
mergify[bot]
e8b46bf3a3 fix(ux): add naming series to ERPNext setting workspace (backport #28090) (#28103) 
* fix(ux): add naming series to ERPNext setting workspace  (#28090)

* fix(ux): add naming series to setting workspace

* fix: doctype link to naming series

Co-authored-by: Ankush Menat <ankushmenat@gmail.com>

Co-authored-by: Summayya <frappe@Summayyas-MacBook-Air.local>
Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
(cherry picked from commit 0806e32049)

# Conflicts:
#	erpnext/setup/workspace/erpnext_settings/erpnext_settings.json

* fix: conflicts

Co-authored-by: Summayya Hashmani <58825865+sumaiya2908@users.noreply.github.com>
Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
 2021-10-27 14:03:24 +05:30
Marica
67e5e95466 Merge pull request #27931 from marination/optimize-get-attribute-filters-hotfix 
perf: Optimize get_attribute_filters (#26729)
 2021-10-27 13:31:58 +05:30
mergify[bot]
f1b7bb8878 fix: Update receivable/payable account on company change (backport #28057) (#28087) 
* fix: Update receivable/payable account on company change

(cherry picked from commit 65025fb628)

# Conflicts:
#	erpnext/accounts/doctype/sales_invoice/sales_invoice.js

* fix: Update sales_invoice.js

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
 2021-10-27 13:30:32 +05:30
mergify[bot]
fb742476f8 fix: Payment Terms validation precision (#28104) 
(cherry picked from commit 9c1705205f)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
 2021-10-27 13:26:57 +05:30
mergify[bot]
d4b4bd9d97 fix: update production plan status (backport #27567) 
* fix: update production plan status #27567

fix: update production plan status
(cherry picked from commit 05831b18ad)

# Conflicts:
#	erpnext/patches.txt

* fix: resolve conflicts

Co-authored-by: Alan <2.alan.tom@gmail.com>
Co-authored-by: Ankush Menat <ankush@frappe.io>
 2021-10-27 13:20:51 +05:30