Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
45,589 Commits 3 Branches 0 Tags 1 GiB
7650b0073a
Commit Graph

741 Commits

Author SHA1 Message Date
rohitwaghchaure
0e14ea4e32
Merge pull request #35881 from rohitwaghchaure/fixed-serial-batch-bundle-print 
fix: serial and batch bundle values in the standard print format
 2023-06-26 16:21:34 +05:30
Rohit Waghchaure
9cf645e07f fix: serial and batch bundle values in the standard print format 2023-06-26 16:00:53 +05:30
Rohit Waghchaure
32965f1af9 fix: stock error for service item 2023-06-20 16:27:23 +05:30
Deepesh Garg
534ea5ad21
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 88b598edb61f0ab97b751581cc2719964e169055.

* fix: Add offer properties to website item
 2023-04-17 16:35:22 +05:30
Ritwik Puri
f193393f57
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
 2023-04-05 12:04:36 +05:30
Rohit Waghchaure
aaa4d1eb55 fix: E-commerce issue with Item Variants 2023-03-21 14:44:12 +05:30
s-aga-r
20bdc63b03 fix: show Purchase Order Portal Pay button based on configuration 2023-02-15 20:14:39 +05:30
Rohit Waghchaure
7800db7c0d fix: web supplier quotation 2023-01-23 14:21:10 +05:30
Sabu Siyad
010718ffed
fix(ecommerce/cart): explicitly set frappe.boot (#33431) 
related: https://github.com/frappe/frappe/pull/18323

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

Signed-off-by: Sabu Siyad <hello@ssiyad.com>
 2023-01-02 08:58:01 +05:30
ruthra kumar
9fd70a6827
Merge pull request #33115 from ruthra-kumar/duplicate_schema_block 
fix: remove product schema block from additional info section on item template
 2022-11-28 15:28:50 +05:30
ruthra kumar
2c18a95115 fix: remove duplicate schema 2022-11-25 16:23:45 +05:30
Saurabh
5d9960ae5b feat: handle empty state 2022-11-21 19:37:57 +05:30
Saurabh
80e45828ae fix: ux for project view on web 2022-11-21 18:16:57 +05:30
Ankush Menat
07c4a74838
chore: drop stale demo page (#32515) 2022-10-06 13:01:53 +05:30
Summayya Hashmani
da43a5e371
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>
 2022-10-04 09:57:07 +05:30
Sagar Sharma
80080a3d7b fix: show Make Purchase Invoice button based on permission 2022-09-28 15:40:07 +05:30
Ankush Menat
4a38ce659d refactor!: drop redisearch 
incr: replace text and tag fields

incr: use rediswrapper's make key

incr: indexDefinition from redis

incr: replace index creation

incr: replace AutoCompleter

incr: replace product search ac

incr: replace client querying

fix: broken redisearch load test

fix: pass actual query to get suggestion
 2022-08-31 17:06:20 +05:30
Ankush Menat
08d7c48dc7
refactor: use browser native lazy loading (#31814) 2022-08-09 18:49:14 +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 8a6432ec3f4bf63c39d1f687f618cec2360ebccf)

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
Sam
8fbfba4f2f
chore: class selectors for customizability (#30185) 
* Update project_row.html

Really helpful those fields has own class when styling for mobile or desktop by using Website Settings --> HTML Header, Robots and Redirects

* chore: skewercase
 2022-04-07 19:27:27 +05:30
Jannat Patel
bce1c2a028 fix: removed unused courses template 2022-04-06 14:44:10 +05:30
Marica
bfb2fbea5f
Merge branch 'develop' into redisearch-app-install 2022-04-04 13:27:50 +05:30
marination
397b46a08b chore: Add TODOs(perf) for Redisearch Query 2022-04-04 13:24:56 +05:30
marination
07f17453cd fix: Use Payload in AutoCompleter (categories in search) and misc 
- Separate Item group and Item autocomplete dict definition
- Add payload along with Item group, containing namke and route
- Pass weightage while defining item group autocomplete dict (auto sort)
- Use payload while getting results for categories in search
- Remove check to show categories, always show
- Search fields mandatory if reidsearch enabled
- Code separation (rough)
 2022-04-01 18:47:01 +05:30
Ankush Menat
257623509d
perf: use cached single docs (#30536) 
frappe.local is request specific thread local, hence is almost as good
as no caching.
 2022-04-01 11:55:19 +05:30
marination
7e207c8901 fix: Call Redisearch index creation functions on enabling redisearch in settings 2022-03-31 16:29:18 +05:30
Ankush Menat
494bd9ef78 style: format code with black 2022-03-28 18:52:46 +05:30
marination
f6e64c2cac fix: Product Filters Lookup 
- bind the right classes to the filter lookup field
- make class names more descriptive
- make filter lookup field more visible with white bg and border
- bind lookup input field js in `views.js`
- make filter lookup field functioning for atribute filters too
- added placeholder to lookup field
 2022-03-21 17:58:39 +05:30
marination
3507cf5985 test: Test include_descendants in Item Group Product Listing 
- Also made include_descendants field's visibility dependant on show_in_website
 2022-03-09 13:50:24 +05:30
Sagar Vora
3d45f3a6a8 Merge remote-tracking branch 'upstream/develop' into remove-india 2022-03-03 10:20:50 +05:30
Rushabh Mehta
4e2c284be7 fix(minor): nix the ugly banner 2022-03-01 08:52:42 +05:30