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,841 Commits 401 Branches 1,698 Tags
5f7c5bcac8d544f24816ffec96e621f4aa3eaa4d
Commit Graph

37841 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Afshan
accb98ccf4 Merge branch 'version-13-hotfix' into mergify/bp/version-13-hotfix/pr-27916 2021-10-27 12:58:30 +05:30
Deepesh Garg
6acab32934 Merge pull request #28085 from frappe/mergify/bp/version-13-hotfix/pr-28055 
fix(UX): Add mandatory depends on condition for reference no and date fields (backport #28055)
 2021-10-27 11:57:20 +05:30
Saqib
5d4d6bb52b fix: sider 
(cherry picked from commit ac381d21fe)
 2021-10-27 06:13:33 +00:00
Ankush Menat
a2a462f2f5 fix: undo changes to allow negative stock flag 
(cherry picked from commit 7bafa11d57)
 2021-10-27 06:13:32 +00:00
Saqib Ansari
b1efb7f80b perf: skip insertion of stock ledger entry 
(cherry picked from commit c7fc609236)
 2021-10-27 06:13:32 +00:00
Saqib Ansari
97fc449222 perf: get total company stock only for purchase order 
(cherry picked from commit eb3aae870f)
 2021-10-27 06:13:32 +00:00
Saqib Ansari
cb0168ae65 perf: fetch mode of payments data in single query 
(cherry picked from commit 7b691beabb)
 2021-10-27 06:13:31 +00:00
Saqib Ansari
de38c70707 perf: skip get_pricing_rules if no pricing rule exists 
(cherry picked from commit a500252570)
 2021-10-27 06:13:31 +00:00
Saqib
cb97e950e6 feat(e-invoicing): dispatch address (#28084) 2021-10-27 11:39:00 +05:30
Ankush Menat
a046da1e61 test: picklist item grouping 
(cherry picked from commit 479ecb8de0)
 2021-10-27 11:30:30 +05:30
Ankush Menat
28026f7f1c refactor: use defaultdict and enumeration 
(cherry picked from commit 6942900555)
 2021-10-27 11:30:30 +05:30
Diksha Jadhav
93a0ea7118 feat(pick list): group items based on item code and warehouse before printing picklist 
(cherry picked from commit f2d136e574)
 2021-10-27 11:30:30 +05:30
mergify[bot]
a30cfbce42 fix: change modified timestamp to apply changes on migrate #28095 (#28099) 
fix: change modified timestamp to apply changes on migrate
(cherry picked from commit 2920f2f614)

Co-authored-by: Dany Robert <rtdany10@gmail.com>
 2021-10-27 11:20:13 +05:30
mergify[bot]
019c5a338d fix(ux): overbiling message in SO->SI, PO->PI (bp #28088) 
(cherry picked from commit 6ec047cba9)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2021-10-27 11:08:23 +05:30
gsi-maruiz
8cad23b8fb fix: add filter to query to avoid send reminder for zero years (#28092) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-10-27 11:00:56 +05:30
marination
dd2dba6f01 style: Fixed indentation for visible heirarchy 2021-10-27 10:57:48 +05:30
Deepesh Garg
f63a71e2cc fix(minor): Add mandatory depends on condition for reference no and date fields 
(cherry picked from commit a20058a343)
 2021-10-26 14:33:10 +00:00
mergify[bot]
f81c5cd478 fix: POS Closing Entry without linked invoices (#28077) 2021-10-26 14:42:44 +05:30
mergify[bot]
a23ef95cd8 refactor: shows opening balance from filtered from_date (#26877) (#28072) 
* refactor: shows opening balance from filtered from_date

* refactor: opening balance considered from filtered from_date in stock ledger

* fix: check if stock reco is opening and misc cleanups

(cherry picked from commit fdaf93f76c)

Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com>
 2021-10-25 09:09:44 +05:30
Deepesh Garg
943def5faa Merge pull request #28014 from deepeshgarg007/tds_computation_summary_fixes 
fix: Error in TDS computation summary
 2021-10-23 13:16:30 +05:30
Ankush Menat
7a08f8aeec chore: change semgrep rules repo name 
[skip ci]
 2021-10-22 22:40:56 +05:30
mergify[bot]
a082d70553 ci: move semgrep rules out of repo (backport #28067) 
* ci: move semgrep rules out of repo (#28067)

Moving semgrep rules out of repos as it's unnecessary to maintain
same ruleset for different repos and different branches.

(cherry picked from commit cc1baae5eb)

# Conflicts:
#	.github/helper/semgrep_rules/frappe_correctness.py
#	.github/helper/semgrep_rules/frappe_correctness.yml
#	.github/helper/semgrep_rules/report.py
#	.github/helper/semgrep_rules/ux.py
#	.github/workflows/linters.yml

* fix: resolve conflicts

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2021-10-22 21:58:45 +05:30
mergify[bot]
60620fe335 fix: don't reset rates in Timesheet Detail when Activity Type is cleared (#28056) 
* fix: don't reset rates when activity type is cleared

* refactor: suggestions from review

Co-authored-by: Sagar Vora <sagar@resilient.tech>

* refactor: suggestions from review (fix)

* style: fix sider

* fix: sider issue

Co-authored-by: Sagar Vora <sagar@resilient.tech>
(cherry picked from commit 2bdaf7bb23)

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2021-10-22 14:06:11 +05:30
marination
d7e55387fc fix: SO Portal fixes 
- SO Portal: fixed missing images issue
- SO Portal: fallback state when no images
- SO Portal: code indentation in `order_macros.html`
- SO Portal: Actions and indicator font size
- Recommendations: fixed space between image and title
- Recommendations: give empty image state min height
 2021-10-21 20:14:28 +05:30