nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-03 00:23:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
48,508 Commits 621 Branches 1,807 Tags
9b5183e0e5bd3077a2e36c746db6b602d3d08155
Commit Graph

753 Commits

Author SHA1 Message Date
mergify[bot]
fbf6d8c9e2 chore: erpnext.com -> frappe.io/erpnext (backport #46288) (#46289) 
* chore: erpnext.com -> frappe.io/erpnext (#46288)

(cherry picked from commit 41fe30ea6e)

# Conflicts:
#	README.md
#	pyproject.toml

* Update README.md

* Update pyproject.toml

---------

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2025-03-05 11:37:49 +05:30
Akhil Narang
703fd816d1 fix(send_message): escape HTML in the text 
Signed-off-by: Akhil Narang <me@akhilnarang.dev>
(cherry picked from commit 448a5db20f)
 2025-02-19 10:45:28 +00:00
mergify[bot]
46eba50c8c fix: Party name in Supplier Portal for Purchase Order (backport #45772) (#45857) 
fix: Party name in Supplier Portal for Purchase Order

(cherry picked from commit fc8663421b)

Co-authored-by: ljain112 <ljain112@gmail.com>
 2025-02-11 15:41:04 +05:30
mergify[bot]
78e0799a06 fix: Show order tax amount in customer currency on the portal (backport #44915) (#44922) 
* fix: Show order tax amount in customer currency on the portal (#44915)

(cherry picked from commit b998933ef0)

# Conflicts:
#	erpnext/templates/includes/order/order_taxes.html

* fix: resolved conflict

---------

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2024-12-27 11:25:59 +05:30
mahsem
0a4090a771 fix: add docstatus for translation 
(cherry picked from commit dda272220b)
 2024-12-09 05:51:35 +00:00
mergify[bot]
bc9f0f8368 fix: task showing limit in customer portal (backport #44003) (#44004) 
fix: task showing limit in customer portal (#44003)

(cherry picked from commit 44832c3b5c)

Co-authored-by: Nihantra C. Patel <141945075+Nihantra-Patel@users.noreply.github.com>
 2024-11-07 12:49:42 +05:30
Raffael Meyer
aa38f69a67 Merge pull request #40543 from frappe/mergify/bp/version-14-hotfix/pr-40542 2024-06-18 12:51:55 +02:00
Nihantra C. Patel
89d507e07e fix: print format bold for field "total" 
(cherry picked from commit 3c9640df27)
 2024-05-16 10:04:03 +00:00
Akhil Narang
4d34b1ead7 refactor(treewide): formatting and ruff fixes, + manually enabled F401 
Signed-off-by: Akhil Narang <me@akhilnarang.dev>
 2024-04-10 17:13:31 +05:30
Raffael Meyer
b55d8597e8 fix: translatable web footer (#40834) 
(cherry picked from commit f3bcdbe5bd)
 2024-04-02 15:16:18 +00:00
barredterra
3b2044dcd7 chore: resolve conflicts 2024-03-19 12:46:14 +01:00
barredterra
7f2a54d95b refactor: usage of in_list 
(cherry picked from commit d238751e6b)

# Conflicts:
#	erpnext/accounts/doctype/payment_entry/payment_entry.js
#	erpnext/buying/doctype/purchase_order/purchase_order.js
#	erpnext/public/js/controllers/accounts.js
#	erpnext/public/js/controllers/buying.js
#	erpnext/public/js/controllers/transaction.js
#	erpnext/public/js/utils/sales_common.js
#	erpnext/templates/form_grid/item_grid.html
 2024-03-19 11:12:58 +00:00
Ankush Menat
4c629d31c6 style: format js files 2024-03-11 11:03:58 +05:30
Rohit Waghchaure
e3fdb6f55c fix: not able to edit / change address from portal 2024-01-24 12:15:55 +05:30
mergify[bot]
e1504efd40 fix: Issues related to RFQ and Supplier Quotation on Portal (backport #37565) (#37577) 
* fix: Issues related to RFQ and Supplier Quotation on Portal (#37565)

fix: RFQ and Supplier Quotation for Portal
(cherry picked from commit 2851a41310)

* chore: removed backport changes

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-10-19 13:50:55 +05:30
mergify[bot]
56657b6122 fix: allow to select parent warehouse in the website item (backport #37047) (#37173) 
fix: allow to select parent warehouse in the website item (#37047)

(cherry picked from commit e6199dc802)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-09-20 18:06:30 +05:30
mergify[bot]
c308bd5309 feat(RFQ): make email message fully configurable (backport #36353) (#36531) 
* feat(RFQ): make email message fully configurable (#36353)

feat: make RFQ message fully configurable
(cherry picked from commit 21080afd92)

* fix(RFQ): hide description in print and report

---------

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2023-08-17 12:11:37 +05:30
DaizyModi
6f2e639182 fix: itemised tax breakup 2023-07-25 11:44:48 +05:30
Sagar Vora
30cbc682b4 chore: use consistent quotes 
(cherry picked from commit bccb718cc2)
 2023-07-17 10:17:00 +00:00
Rohit Waghchaure
2bbea63de1 fix: stock error for service item 
(cherry picked from commit 32965f1af9)
 2023-06-20 11:51:27 +00:00
mergify[bot]
f1a1fc6c5b fix: Add offers info to website item (#34873) 
fix: Add offers info to website item (#34873)

* fix: Add offers info to website item

* Revert "fix: Add offers info to website item"

This reverts commit 88b598edb6.

* fix: Add offer properties to website item

(cherry picked from commit 534ea5ad21)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-04-18 07:43:17 +05:30
mergify[bot]
3c0cc024aa fix!: require sender and message for contact us page (#34707) 
fix!: require sender and message for contact us page (#34707)

* fix: require sender and message for contact us page

* refactor: dont override frappe.send_message from client side

used override_whitelisted_method hook for the same

(cherry picked from commit f193393f57)

Co-authored-by: Ritwik Puri <ritwikpuri5678@gmail.com>
 2023-04-05 12:33:55 +05:30
Rohit Waghchaure
53c3fff235 fix: E-commerce issue with Item Variants 
(cherry picked from commit aaa4d1eb55)
 2023-03-21 09:17:33 +00:00
s-aga-r
84da0c6f1e fix: show Purchase Order Portal Pay button based on configuration 
(cherry picked from commit 20bdc63b03)
 2023-02-18 06:51:14 +00:00
Rohit Waghchaure
ceef2d6553 fix: web supplier quotation 
(cherry picked from commit 7800db7c0d)
 2023-01-24 10:30:07 +00:00
ruthra kumar
cdd13cd95f fix: remove duplicate schema 
(cherry picked from commit 2c18a95115)
 2022-11-29 04:06:25 +00:00
mergify[bot]
5f6bbd4929 chore: drop stale demo page (backport #32515) (#32516) 
chore: drop stale demo page (#32515)

(cherry picked from commit 07c4a74838)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-10-06 13:03:29 +05:30
mergify[bot]
d6888bc8c8 refactor(UI): clean up portal pages (backport #29018) (#32489) 
refactor(UI): clean up portal pages (#29018)

* refactor: list view for portal pages

* refactor: add align center class

* refactor: change footer btn class(primary)

* refactor: add order style page

* refactor: import order page in website

* refactor: remove table elements

* fix: preview image height

* fix: make string translatable

* refactor: change font variables

* refactor: order preview bg white

* refactor: center align items

* fix: breadcrumb padding

* refactor: make preview image rounded

* refactor: add condition for image container

* refactor: change alignment for mobile view

* fix: make footer button secondary

* refactor: clean code

* refactor: code indentantion

* refactor: remove space

* fix: Payment section cleanup

Co-authored-by: Summayya <frappe@Summayyas-MacBook-Air.local>
Co-authored-by: Marica <maricadsouza221197@gmail.com>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
(cherry picked from commit da43a5e371)

Co-authored-by: Summayya Hashmani <58825865+sumaiya2908@users.noreply.github.com>
 2022-10-04 10:21:50 +05:30
Sagar Sharma
fd86876a0e fix: show Make Purchase Invoice button based on permission 
(cherry picked from commit 80080a3d7b)
 2022-09-29 09:26:36 +00:00
mergify[bot]
c3fd802351 refactor: use browser native lazy loading (backport #31814) (#31815) 
refactor: use browser native lazy loading (#31814)

(cherry picked from commit 08d7c48dc7)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-08-09 18:51:27 +05:30
Marica
56db91b322 Merge branch 'develop' into make-image-field-obsolete-in-web-item 2022-07-27 14:12:09 +05:30
mergify[bot]
5b7b58322f fix: hero image not loading in portal homepage (backport #31699) (#31700) 
fix: hero image not loading in portal homepage (#31699)

(cherry picked from commit 8a6432ec3f)

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2022-07-26 13:46:03 +05:30
Marica
d2d651a0c3 Merge branch 'develop' into make-image-field-obsolete-in-web-item 2022-07-25 12:43:08 +05:30
Rucha Mahabal
f765428757 chore: Remove HRMS templates 2022-07-14 11:59:06 +05:30
Marica
681b334236 Merge branch 'develop' into make-image-field-obsolete-in-web-item 2022-07-11 11:22:51 +05:30
Suraj Shetty
c9dc902dee Merge branch 'develop' into update-library-usage 2022-07-07 09:40:21 +05:30
Suraj Shetty
f0e8a518cd fix: Update font awesome path 2022-07-06 15:10:39 +05:30
Suraj Shetty
32fd753a14 fix: Update html2text import path 2022-07-06 15:09:44 +05:30
Marica
b58d7d1c89 Merge branch 'develop' into make-image-field-obsolete-in-web-item 2022-07-06 14:43:23 +05:30
Marica
1a749e2589 Merge branch 'develop' into make-image-field-obsolete-in-web-item 2022-06-29 10:25:30 +05:30
marination
9541354ec7 chore: Make image field obsolete in Website Item (redundant) 
- Delete Image field and set `website_image` as form's image field for uploads
- Remove instances of `image` field access via Website Item
- Item -> Web Item via Desk: Map Item's `image` to Web Item's `website_image`
- Item -> Web Item via patch: `website_image` will be mapped with thumbnail
- Remove magic that auto-sets `website_image` from `image` in Website Item
 2022-06-27 13:00:00 +05:30
Sagar Vora
7f390fb755 Merge branch 'develop' into remove-india 2022-06-26 18:10:44 +05:30
Nabin Hait
f904ac599e fix: merge conflicts and sider issues 2022-06-25 11:40:23 +05:30
Sagar Vora
ec9861266e Merge remote-tracking branch 'upstream/develop' into remove-india 2022-06-19 22:57:22 +05:30
Conor
00ef499739 refactor: use db independent offset syntax (#31345) 
* chore: use db independent offset syntax

* fix: typo

* style: reformat code to black spec

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-06-14 10:49:07 +05:30
Suraj Shetty
a29b92febc fix: Use directly <a> and style it as button instead of using button 
Since few email servers (like outlook) strips out link in the button making them unclickable.
 2022-05-23 10:08:20 +05:30
Rushabh Mehta
548afba8bb fix(minor): update frappe.error_log to new API (#30864) 
* fix(minor): update frappe.error_log to new API

* refactor: changes for updated log_error api

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-05-02 15:04:26 +05:30
Deepesh Garg
44c54f69f8 chore: Remove references for Student doctype 2022-04-28 16:16:47 +05:30
Deepesh Garg
8dcbbf1b9e chore: Remove course links from training doctypes 2022-04-28 13:49:34 +05:30
Jannat Patel
59ad7e037c Merge pull request #30596 from pateljannat/remove-courses-template 2022-04-08 16:27:31 +05:30