Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
39,352 Commits 3 Branches 0 Tags 1 GiB
942dedddb4
Commit Graph

39352 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
marination
60f35ad8a2 fix: Remove trailing space and line break in translatable string 2021-10-13 16:50:10 +05:30
marination
646acb6b46 fix: Improve error message for Serial No mismatch between SI and DN 2021-10-13 16:41:11 +05:30
Noah Jacob
2bb383b178
fix: not authorized to update entries after freezing accounts (#27937) 
* fix: not authorized to update entries after freezing accounts

* fix: Add test case

* fix(patch): patched to requeue failed reposts(check_freezing_date)

* chore: misc fixes

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
 2021-10-13 16:20:08 +05:30
Shariq Ansari
790c1cda6f
fix: Removing unused fields from workspace JSON files #27612 
fix: Removing unused fields from workspace JSON files
 2021-10-13 16:18:20 +05:30
Deepesh Garg
bd310e2816
Merge pull request #27783 from hrwX/subscription_generation_fix_develop 
fix(Subscription): reorder updation of end date
 2021-10-13 15:21:50 +05:30
Deepesh Garg
bd8dda2de4
Merge pull request #27497 from nemesis189/taxjar-nexus-update 
fix: TaxJar update - added nexus list, making api call only for nexus
 2021-10-13 15:08:48 +05:30
Deepesh Garg
bd8cfb2e30 fix: Move product tax category folder to taxjar settings 2021-10-13 13:40:53 +05:30
Jannat Patel
00f7f97dc9
Merge branch 'develop' into auto-attendance-issue 2021-10-13 13:28:25 +05:30
Deepesh Garg
2d19e2d54b fix: Patch 2021-10-13 13:24:19 +05:30
Deepesh Garg
2b9b158448
Merge pull request #27907 from nemesis189/gst-setts-hsn-wise-tax-breakup 
feat: HSN based tax breakup table check in GST Settings
 2021-10-13 12:07:29 +05:30
Deepesh Garg
ca0067212d fix: TDS round off not working from second transaction 2021-10-13 12:00:25 +05:30
Deepesh Garg
0b263c5100
Merge pull request #27927 from Anuja-pawar/invoice-sections 
fix: minor ux fixes in Sales & Purchase Invoice
 2021-10-12 23:05:48 +05:30
Deepesh Garg
b990d5b112
Merge pull request #27545 from nextchamp-saqib/pay-received-amt-fix 
fix: cannot add deductions in internal transfer payment entry
 2021-10-12 23:04:04 +05:30
Ankush Menat
06b426e9c3
ci: rule to fail PRs that add a new manual commit (#27928) 
Manual commits are frequent source of bugs, confusions or undefined
behaviour.

All new manual commits should be explcitly ignored with explanation on
why it's added. This will only fail for new additions. Existing ones
need to be cleaned up manually.
 2021-10-12 23:01:37 +05:30
Deepesh Garg
3b9514d6e1
fix: Update message string 2021-10-12 21:49:51 +05:30
Anuja Pawar
b7769c733e
Merge branch 'develop' into invoice-sections 2021-10-12 21:32:01 +05:30
Anuja Pawar
d181cc42a1 fix: set collapsible & print hide 2021-10-12 20:57:08 +05:30
Ankush Menat
4ebae7c5dc
Merge branch 'develop' into optimize-get-item-details 2021-10-12 20:39:49 +05:30
Ankush Menat
7bafa11d57
fix: undo changes to allow negative stock flag 2021-10-12 20:39:10 +05:30
Marica
b6da7ff1b1
Merge pull request #27914 from marination/avoid-auto-customer-creation-website 
fix: Avoid automatic customer creation on website user login
 2021-10-12 20:24:12 +05:30
Deepesh Garg
6f107da165
perf: Add indexes in stock queries and speed up bin updation #27758 
perf: Add indexes in stock queries and speed up bin updation
 2021-10-12 20:15:55 +05:30
marination
fd6f3c6b88 Merge branch 'develop' of https://github.com/frappe/erpnext into e-commerce-refactor-develop 2021-10-12 18:24:21 +05:30
marination
8f0b9c9406 fix: Show Offers section only if offers exist 2021-10-12 18:16:17 +05:30
marination
0a703740bb feat: Offer Display 
- Added offers section in website item
- Added more roles to website item
- Fixed attachment limit issue in website item
- Created Website Offer child doctype
- Added offers listing in Item full page view
- style fixes
 2021-10-12 18:16:03 +05:30
Hussain Nagaria
c69de2d7a8 chores: Add function params and remove unused imports 2021-10-12 18:15:07 +05:30
Hussain Nagaria
4309239d6c feat: Show Recent Searches 2021-10-12 18:14:43 +05:30
Hussain Nagaria
34f3a6629f feat: Show brand line in search results 2021-10-12 18:14:29 +05:30
Hussain Nagaria
9ee13ba86b feat: Add brand line display setting 2021-10-12 18:14:16 +05:30
Hussain Nagaria
55d2bf0ff9 chore: Add placeholder image 2021-10-12 18:14:04 +05:30
Hussain Nagaria
70b164e7dd chore: Add query clean-up 2021-10-12 18:13:51 +05:30
Hussain Nagaria
ffc8616c63 refactor: Use global redis connection 2021-10-12 18:13:37 +05:30
Hussain Nagaria
ba25460edf chore: Make it a little beautiful 2021-10-12 18:13:27 +05:30
Hussain Nagaria
f3421554ad feat: Add Category autocomplete with config in settings 2021-10-12 18:02:24 +05:30
Hussain Nagaria
8e55c95ecc feat: Make search index fields configurable 
- Move indexing logic to separate file
- Add more validation logic for 'search index fields' field
 2021-10-12 18:02:09 +05:30
Hussain Nagaria
3160187825 feat: Add search fields field 2021-10-12 17:58:01 +05:30
Hussain Nagaria
e82833f14a feat: Basic Query + Autocomplete 2021-10-12 17:57:46 +05:30
Hussain Nagaria
0c47f3a876 feat: Add basic autocomplete using redisearch 2021-10-12 17:57:19 +05:30
marination
71f4b98d0c chore: Sider and Semgrep 2021-10-12 17:52:54 +05:30
marination
1d94914102 feat: Discount Filters 
- Discount filters in filters section
- Code cleanup
 2021-10-12 17:46:03 +05:30
marination
817f695c57 fix: Item schema modified date update 
- Modified date changed due to merge conflict
- Changed it to a later date to make sure Item migrates correctly
 2021-10-12 17:39:23 +05:30
marination
60261852b2 feat: Slashed Prices and Discount display 
- Registered mrp and price after discounts
- slashed price with discount in listing, item page and wishlist
- removed redundant imports
- renamed method to `get_web_item_qty_in_stock` to get Website Item stock
- adjusted styles for resizing
- made add to cart button full width on cards
 2021-10-12 17:38:36 +05:30
marination
3d5f029e51 fix: Sider and Tests 2021-10-12 17:33:22 +05:30
marination
c842305be0 feat: Customer Ratings & Reviews Full Page 
- Created macros for repetitive snippets
- Created Customer Reviews full page
- View more button to reveal 10 more reviews at a time
- Common function to get reviews with start and end
 2021-10-12 17:30:03 +05:30
marination
b15ff57a66 feat: (wip) Ratings and Reviews 
- Added Ratings and Reviews section in Item full page view
- Added provision to write a review with popup
- Created Item Review Doctype to store User-Item unique reviews
- Added privision to enable/disable wishlist and reviews in e commerce settings
- Hide cart and wishlist actions everywhere (even navbar) depending on settings
- Moved some more inline css to scss
- Small logic fixes
TODO: Reviews full page view with paging
 2021-10-12 17:27:32 +05:30
marination
07d7cf01b4 fix: Remove unnecessary css variable and hover state 
- Removed wish-red variable
- Removed hover state from remove wishlist item button in card
- Removed inline css from wishlist item card
 2021-10-12 17:26:10 +05:30
marination
25ffafae81 feat: Product Details Tabbed Section and Add to Wishlist in Item Full Page 
- Add to Wishlist button next to add to cart
- Beautified Product Specifications table section
- Product Specifications can be optionally in a tabbed section with custom tabs added
- Removed hard coded gray bg to allow custom theme overwrites
- Fixed resizing issues in Item Full Page view
- Cleaned up inline styles and ported to scss
 2021-10-12 17:25:51 +05:30
marination
cd117149e1 fix: Sider 2021-10-12 17:24:15 +05:30
marination
59514408b9 feat: Wishlist Page 
- Navbar icon with badge count for wishlist
- Wishlist page with cards
- Cards can be moved to cart or removed in a click
- Separated all wishlist related methods into wishlist.js
- Made a common js method(util) to add/remove wishlist items
- Bug fix: Make sure items are removed from session user's wishlist
 2021-10-12 17:23:55 +05:30
marination
96cc5068b2 feat: Wishlist from card actions 
- Add remove items from wishlist
- Wishlist icon at nav bar
- Animate wishlist icon in card and navbar
- Remember wished state after refresh as well
 2021-10-12 17:23:12 +05:30
marination
4f64d1c7f2 feat: Animate Add to Cart List interactions (UX) 
- Increased qty in cart on clicking add to cart for existing item
- Simplified macro arguments
- Navbar cart icon animation
- Explore button for template item in card
- Add to cart button animation
 2021-10-12 17:18:51 +05:30