marination
1d94914102
feat: Discount Filters
...
- Discount filters in filters section
- Code cleanup
2021-10-12 17:46:03 +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
marination
16b9c8c383
feat: Card Actions and Wishlist
...
- Rough UI for card actions
- Wishlist doctype
- Indicators on card based on stock availability
2021-10-12 17:18:06 +05:30
marination
d7130e31fe
feat: Shop by Category
...
- Added Shop by Category Page
- Tabbed sections for item fields in Shop by Category Page
- Added Shop by Category Section in E commerce Settings
- Nested Navigation & Breadcrumbs in Item group pages
- Added scrollable & clickable Sub categories in Item Group page
- Made breadcrumbs slightly dynamic in Item Page
- Added image to Brand doctype
2021-10-12 17:00:30 +05:30
marination
22f41a17b7
chore: Removed Shopping Cart Module
...
- Moved all files and web templates from Shopping Cart to E-commerce module
- Made Shopping Cart module obsolete
- Moved select E-commerce related files from Portal to E-commerce module
- Minor cleanups
- Fixed Shopping Cart and Product Configurator tests
2021-10-12 16:54:11 +05:30
marination
37a246e738
chore: Patches for Website Item
...
- Patch to make website item from item
- Patch to move Products and Shopping Cart Settings into E Commerce Settings
- Patch to move products in Homepage from Item to Website Item
- Minor cleanup, replacing/removing references to Item website fields (obsolete)
2021-10-12 16:16:17 +05:30
marination
eef9cf152f
chore: Drive E-commerce via Website Item
...
- Removed Shopping Cart Settings
- Portal fully driven via E Commerce Settings
- All Item listing querying will happen via ProductQuery engine only
- Product Listing via Website Items
- removed redundant code
- Moved all website logic from Item to Website Item
2021-10-12 15:48:06 +05:30
Saqib
f2fca59ba7
fix: cannot set custom label for 'total' field in print format ( #27664 )
2021-09-27 14:28:16 +05:30
escix
dafe99b6e2
fix: holiday message reminder
...
Minor grammatical change
2021-09-26 11:09:13 +05:30
Chillar Anand
915b34391c
chore: Clean up imports ( #27302 )
...
* chore: Added isort to pre-commit config
* chore: Sort imports with isort
* chore: Clean up imports with pycln
* chore: Sort imports with isort
* chore: Fix import issues
* chore: Clean up sider issues
* chore: Remove import errors from flake8 ignore list
* chore: Clean up lint issues
2021-09-02 16:44:59 +05:30
Ankush Menat
b147b85e6a
chore: whitespace / eof fixes
2021-09-01 16:57:21 +05:30
Dany Robert
c7bad657b1
fix: broken URL in supplier portal ( #26823 )
...
* fix: broken URL
The quotations are supplier quotations, not sales quotation.
* fix: remove erpnext from path
2021-08-24 22:10:14 +05:30
Frappe PR Bot
255b99ebdc
feat: Employee reminders ( #25735 ) ( #27115 )
...
* feat: Add reminders section to HR Settings
* refactor: Extract generic function for getting Employees
* feat: Employee Work Anniversary Reminder
* feat: Daily Holiday Reminder
* fix: Unnecessary params and replace [] with .get()
* test: Daily Holiday Reminders
* test: is_holiday basic tests
* refactor: Move employee reminders code to separate module
* feat: Add advance reminder to HR settings
* feat: Advance Holiday Reminders
* refactor: get_holidays_for_employee
* feat: Email holiday reminders in advance + tests
* fix: Remove unused import
* refactor: HR Setting Reminder Section
* refactor: Remove Daily Holiday Reminders feat
* feat: Reminder miss warning
* fix: Failing test and function name change
* chore: Add patch for field rename
* chore: Rename frequency label
* fix: Failing patch test
* fix: sider and removed description of fields
* fix: email alignment
Co-authored-by: pateljannat <pateljannat2308@gmail.com>
Co-authored-by: Jannat Patel <31363128+pateljannat@users.noreply.github.com>
(cherry picked from commit 24b2a315818d08ad4cb03347ccf5297df916a5ac)
Co-authored-by: Mohammad Hussain Nagaria <34810212+NagariaHussain@users.noreply.github.com>
Co-authored-by: Jannat Patel <31363128+pateljannat@users.noreply.github.com>
2021-08-24 20:19:22 +05:30
Ankush Menat
4551d7d602
chore: mass trailing whitespace and EOF fixes
2021-08-19 13:43:28 +05:30
Nabin Hait
11475487fb
fix: merge conflict
2021-07-16 15:58:50 +05:30
marination
f40da4ac4c
fix: Paging buttons not working on item group portal page
2021-07-14 20:48:06 +05:30
Marica
dbf835ced3
Merge branch 'develop' into paging-btns
2021-07-14 20:15:22 +05:30
marination
4c6e952902
fix: Paging buttons not working on item group portal page
2021-07-14 20:01:36 +05:30
18alantom
9ea5072c52
fix: set item group as a persistent filter
2021-07-14 17:41:38 +05:30
18alantom
ddbf7c0020
fix: set item group as a persistent filter
2021-07-14 15:43:22 +05:30
Jannat Patel
5173e74a04
fix: Project Portal Enhancements ( #26290 )
...
* fix: project portal enhancements
* fix: condition for pills
2021-07-02 11:48:46 +05:30
Jannat Patel
5a4251107c
feat: Project Portal Enhancements ( #26090 )
...
* fix: project portal enhancements
* fix: timesheet table and task nesting
* fix: semgrep and link issue
* fix: sider
* fix: project details view title
* fix: project progress pills
* fix: website route rule for project
* fix: multi level nesting
* fix: added subject and indentation
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-07-01 17:17:34 +05:30
Nabin Hait
5b462ad11a
fix: merge conflict
2021-06-24 15:36:51 +05:30
marination
26bec9d7b4
fix: Country Link field in 'Add address' website modal auto-clears
2021-06-24 13:50:18 +05:30
marination
f5fa1ee4b6
fix: Country Link field in 'Add address' website modal auto-clears
2021-06-24 11:03:32 +05:30
Rohit Waghchaure
9e616b09a2
fix: material request and supplier quotation not linked if sq created from supplier portal against rfq
2021-06-20 15:17:20 +05:30
Rohit Waghchaure
8c844e4515
fix: material request and supplier quotation not linked if sq created from supplier portal against rfq
2021-06-19 16:08:26 +05:30
Suraj Shetty
d3b9edd2c4
fix: Remove unnecessary import
2021-05-25 12:52:26 +05:30
Faris Ansari
69eb6d476e
Merge remote-tracking branch 'upstream/develop' into esbuild
2021-05-07 15:21:33 +05:30
Faris Ansari
464d838447
fix: Update bundle paths
2021-05-07 14:53:42 +05:30
Faris Ansari
1fe891b287
refactor: Replace Class.extend with native class
2021-04-23 08:04:00 +05:30
Nabin Hait
10c61376e3
fix: Backport missing commits to develop branch ( #25305 )
2021-04-13 15:46:01 +05:30
prssanna
56ab3fb132
fix: issue web list style
2021-03-31 18:26:37 +05:30
prssanna
f1dbc021fc
fix: issue web list style
2021-03-16 14:15:59 +05:30
Nabin Hait
fe3529b194
fix: merge conflict
2021-03-11 16:45:41 +05:30
Anupam
d7f4aefd00
feat: added continue-shopping button on cart
2021-02-05 16:17:20 +05:30
prssanna
526ea46ae2
fix: formatting issues
2021-02-01 20:12:47 +05:30
prssanna
11eae6d51a
fix: add default product-image css class
2021-02-01 20:01:37 +05:30
prssanna
a3585e40f7
style: fix formatting
2021-02-01 19:50:27 +05:30
Suraj Shetty
0a8939e1c1
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2021-01-29 08:56:22 +05:30
Nabin Hait
a6213ccd61
Merge branch 'develop' into version-13-beta-pre-release
2021-01-28 17:36:08 +05:30
Anupam Kumar
0d9a8ae4d2
feat: shopping portal changes ( #24445 )
...
* feat: shopping portal changes
* fix: review changes
* review changes
2021-01-28 17:32:57 +05:30
Anupam
e6f925e5e6
review changes
2021-01-28 15:58:03 +05:30
Mohamed Almubarak
f7ea340181
fix(template): cards on second row overlaps the one before ( #23454 )
...
* Update macros.html
fix second row of cards overlapps with the one before
* Update macros.html
fix(template): second row of cards overlaps with the one before
* Update macros.html
fix(template): second row of cards overlaps with the one before
2021-01-28 12:32:13 +05:30
prssanna
74feaf85dc
fix: website order page style
2021-01-27 17:41:15 +05:30
Suraj Shetty
0c34a711eb
Merge branch 'develop' of github.com:frappe/erpnext into version-13-beta-pre-release
2021-01-25 16:06:38 +05:30
Anupam
8541d9738f
fix: review changes
2021-01-25 14:18:26 +05:30
prssanna
2aa1efb70e
fix: broken image style
2021-01-22 15:31:38 +05:30
Anupam
988ea8d61d
feat: shopping portal changes
2021-01-22 10:53:50 +05:30
Suraj Shetty
8670dda5b7
fix: Use abbr method for abbr
2021-01-21 16:47:04 +05:30
Suraj Shetty
2dcdeb8231
Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into rebrand-ui
2021-01-21 15:33:42 +05:30
Suraj Shetty
17ed3fc270
fix: Set css_style fallback
2021-01-21 15:33:36 +05:30
prssanna
f3d321fb82
fix: remove console.log
2021-01-21 15:31:42 +05:30
prssanna
9f1a156307
Merge branch 'shopping-cart' of https://github.com/frappe/erpnext into rebrand-ui
2021-01-21 13:04:58 +05:30
prssanna
b00eb1b0cc
feat: shopping cart page
2021-01-20 17:52:54 +05:30
prssanna
706eae7cac
fix: product page fixes
2021-01-20 17:47:25 +05:30
Suraj Shetty
2e67a41c27
fix: Update birthday avatar code
2021-01-20 10:12:01 +05:30
Suraj Shetty
bbc6bfd3c3
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2021-01-19 09:34:06 +05:30
Suraj Shetty
3d00e25232
refactor: Employee birthday reminder
2021-01-15 14:48:28 +05:30
Kanchan Chauhan
d2c71350cd
refactor(Job Application): New fields in Job Applicant and webform ( #23326 )
...
* refactor(Job Application): New fields in Job Applicant and webform
* fix: translation syntax
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-01-15 13:56:03 +05:30
Shivam Mishra
45a56288bb
feat: style adjustments to product page
2020-12-30 15:51:50 +05:30
Shivam Mishra
31a651365d
feat: update item group website slider
2020-12-30 15:51:34 +05:30
Shivam Mishra
7055969ef3
feat: update item group template
2020-12-29 17:18:41 +05:30
Shivam Mishra
bba2726333
fix: minor styling fixes
2020-12-24 14:14:17 +05:30
prssanna
eb0e596d43
feat: store home page and product page
2020-12-24 11:40:33 +05:30
Deepesh Garg
5a06908bbc
fix: Add breadccrumbs to item group page
2020-12-17 17:38:53 +05:30
Rushabh Mehta
34fc528500
fix(minor): debounce taxes call
2020-12-16 09:44:11 +05:30
Nabin Hait
3423d94145
fix: Fixed merge conflict
2020-12-12 21:12:56 +05:30
Suraj Shetty
dc13d4b0fc
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2020-12-11 12:57:04 +05:30
Saqib Ansari
19d5074c25
fix: get formatted value in 'taxes' print template
2020-11-30 15:49:00 +05:30
prssanna
922432616f
Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into rebrand-ui
2020-11-10 17:24:15 +05:30
prssanna
e3b71b9b24
fix: compact item print style
2020-11-10 17:23:24 +05:30
Anupam
14ef229b12
Revert "Update item_add_to_cart.html"
...
This reverts commit 5b3af82e75
.
2020-11-06 16:50:15 +05:30
Anupam
886b680e1b
revert changes
2020-11-06 16:48:39 +05:30
Anupam Kumar
ca9b58589b
fix: replaced formatdate -> format_date ( #23847 )
...
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2020-11-06 14:56:27 +05:30
Suraj Shetty
c2d97e9d9c
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2020-11-06 10:26:19 +05:30
Anupam Kumar
3a9dc90695
fix: fix: replaced formatdate -> format_date ( #23829 )
2020-11-05 18:51:56 +05:30
prssanna
71e5b60df1
refactor: refactor contextual print setting implementation
2020-10-29 14:19:34 +05:30
Faris Ansari
bc6a2b2f9c
wip
2020-10-28 13:54:11 +05:30
prssanna
13c6e2f320
feat: contextual setting for print uom after quantity
2020-10-22 17:19:00 +05:30
Shivam Mishra
9d468a8daf
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2020-10-21 11:38:31 +05:30
Shivam Mishra
55f52e8135
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2020-10-13 20:09:22 +05:30
Marica
9cc05bb83e
Merge branch 'develop' into rfq-email
2020-10-12 18:02:15 +05:30
marination
629fa57f9d
fix: Remove unneccessary div
2020-09-28 21:17:49 +05:30
marination
056c86033d
fix: Reuse function to render email preview
...
- Reused `supplier_rfq_mail` to render preview
- Print hid Salutation and Subject
- Completely dynamic greeting
2020-09-28 17:42:22 +05:30
marination
bd36f2b94d
feat: Supplier Email Preview in RFQ
2020-09-28 15:59:03 +05:30
Anupam Kumar
5b3af82e75
Update item_add_to_cart.html
2020-09-28 10:59:43 +05:30
Shivam Mishra
9a4d603403
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2020-09-25 11:44:37 +05:30
Anupam
a4df105813
fix: UI fixes
2020-09-24 13:21:54 +05:30
Anupam
09775bbdaa
feat: showing UOM even item price is hidden
2020-09-24 11:19:32 +05:30
Anupam
c077fac2a6
feat: provision to draft quotation from portal
2020-09-23 22:02:31 +05:30
Frappe ERPnext
9355641c49
refactor: logic moved to standard template
...
Previously print_settings.py controller decided which template to use.
Now standard template decides what to print according to settings.
2020-09-03 17:31:21 +02:00
Frappe ERPnext
a5d5e70bf4
Revert "feat: Option to print UOM after quantity"
...
This reverts commit a787882a8f
.
2020-09-03 17:30:25 +02:00
Frappe ERPnext
be3b8a1c96
Merge branch 'develop' of https://github.com/frappe/erpnext into uom_after_qty
2020-09-02 21:31:31 +02:00
Anupam K
f9f26d2fa4
fix: contact us button issue
2020-08-31 14:34:42 +05:30
Frappe ERPnext
a787882a8f
feat: Option to print UOM after quantity
...
Standard for ERPNext prints was UOM before quantity. Now user has a choice.
2020-08-28 13:28:52 +02:00
Suraj Shetty
b6ebcd7559
refactor: Replace darkgray indicator with gray indicator
2020-08-27 18:57:18 +05:30
prssanna
744169833c
fix: replace indicator color darkgrey with darkgray
2020-08-27 17:06:10 +05:30
Anupam K
c7830f7107
feat: Added phone field in product Inquiry
2020-08-26 15:28:22 +05:30
Shivam Mishra
2fe5d76fe4
Merge branch 'develop' into item-image-alt
2020-08-11 14:45:55 +00:00
Shivam Mishra
3325be1d87
fix: spacing for slideshow ( #22996 )
2020-08-11 16:03:46 +05:30
Shivam Mishra
b1f8859121
feat: add alt value in product page
2020-08-07 14:38:40 +05:30
Shivam Mishra
a0954e66a8
feat: add image alt argument for product_image macros
2020-08-07 14:34:54 +05:30
marination
63513f1b14
fix: Show Add to Cart Button anyway
...
- add to cart wasnt visible if show price is disabled in shopping cart settings (product_info = null), creating confusion
2020-08-06 18:22:28 +05:30
marination
ccf44a1bfd
fix: product action instead of info
2020-08-06 17:34:38 +05:30
Shivam Mishra
01f664a88f
fix: handle product_info null
2020-08-06 17:24:02 +05:30
Anupam Kumar
7137b0b670
refactor: shopping cart ( #22617 )
...
* refactoring shopping cart settings
* adding column_break in shopping cart settings
2020-07-23 15:58:47 +05:30
Shivam Mishra
f50312b6d2
fix: button sizing ( #22777 )
2020-07-22 16:17:11 +05:30
Anoop
5e16ca0326
fix: Login page doesn't load for new sites ( #22388 )
...
* fix: Login page doesn't load for new sites
Login page broken as active domains are not set for new sites
* Update footer_powered.html
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-06-23 11:11:13 +05:30
Shivam Mishra
25702a1c55
refactor: show service instead of services
2020-06-18 19:49:46 +05:30
Anupam Kumar
c6592c880a
fix: Student Admission ( #22255 )
...
* Student Admission fix
* adding check for application
* adding check for application
* updating error message
* added date_diff for date comparision
2020-06-17 12:38:31 +05:30
Anupam Kumar
0a3c34de01
address label chages ( #22137 )
...
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-06-17 10:53:13 +05:30
Marica
2112834743
fix: Handle unavailable Variants in Website ( #22195 )
...
* fix: Handle unavailable Variants in Website
* fix: Fetch cart setting from argument
2020-06-16 00:20:57 +05:30
Deepesh Garg
dd78eb3842
Merge pull request #21252 from nextchamp-saqib/tax-breakup-for-cn
...
fix: show positive taxes in credit notes
2020-04-14 12:41:25 +05:30
Saqib Ansari
10a6a2d77f
fix: show positive taxes in credit notes
2020-04-13 16:40:13 +05:30
Vishal Dhayagude
24e79b14e1
fix(shopping cart): UX Improvements ( #21034 )
...
* fix: nontype error for resolved and moved place order button at bottom left
* fix: removed inline style
* fix: Request for quotation move to lower right
* fix: move buttons
Co-authored-by: Naren <patilnarendra3@gmail.com>
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
2020-04-07 12:18:47 +05:30
Myuddin khatri
4635ff9368
fix(shopping-cart): address is made mandatory to place order
2020-03-12 14:45:08 +05:30
Rohan
395b2b15b2
fix: apply url encoding to project names ( #20642 )
2020-02-20 12:59:32 +05:30
Suraj Shetty
48e9bc3fc9
fix: Incorrect translation syntax
2020-01-29 15:06:18 +05:30
thefalconx33
894c210027
fix: enable address without checkout feature
...
* fix add address form country link field
2019-12-11 17:43:04 +05:30
Pranav Nachnekar
af18b2cdc5
Merge branch 'develop' into scheduling-ui-rewrite
2019-11-04 04:38:59 +00:00
0Pranav
53ec8c6322
Merge branch 'develop' of https://github.com/0Pranav/erpnext into scheduling-ui-rewrite
2019-11-01 12:40:08 +05:30
0Pranav
97f6576213
prettify confirmation email
2019-11-01 12:36:06 +05:30
Suraj Shetty
519ca54f53
feat: Show timesheets related to customer's projects on customer portal ( #19443 )
...
* fix: Show timesheets related to customer's projects on customer portal
* style: fix codacy
2019-10-31 16:00:04 +05:30
gavin
ed8e3b3786
fix: link field country in shopping cart ( #19370 )
2019-10-21 18:12:29 +05:30
ashish-greycube
74dc3c99de
feat: coupon_code and referral_sales_partner functionality
2019-10-15 11:44:45 +05:30
Faris Ansari
38ac7f7350
Enhancements to Supplier Portal ( #19221 )
...
* fix: Add Purchase Order to portal
* fix: Create Customer or Supplier on first login
Based on default role set in Portal Settings, a Customer or Supplier
will be created when the user logs in for the first time.
* fix: Styling for transaction_row
* fix: Styling for RFQ page
* fix: Add Purchase Invoice route
- Make Purchase Invoice from PO
* fix: minor
- Admissions for Student role
- Remove print statement
2019-10-09 11:41:33 +05:30
Shivam Mishra
8781dc8ca3
fix: footer link redirect to landing pages ( #19181 )
2019-09-26 12:53:52 +05:30
sahil28297
b1604a24ed
fix(add_to_cart): show add_to_card button only if specific conditions are satisfied ( #19007 )
2019-09-12 11:20:55 +05:30
Shivam Mishra
c69cc13c85
fix: updated footer message ( #18949 )
2019-09-06 15:40:15 +05:30
Shivam Mishra
db3bb793e9
feat: added domain info on footer ( #18839 )
2019-08-26 11:29:18 +05:30
Shivam Mishra
eab5be1110
fix: shopping cart item availability
2019-08-20 19:31:54 +05:30
Suraj Shetty
83705af0b3
fix: Filters for portal quotation list ( #18689 )
...
* fix: Filters for portal quotation list
* fix: Remove unwanted import
2019-08-12 11:51:27 +05:30
Deepesh Garg
1fb21cd9e5
Merge branch 'version-12-hotfix' into fix-item-template-description
2019-08-10 17:36:00 +05:30
Deepesh Garg
04b42600b0
fix: Changes in print format due to attribute name changes in frappe ( #18641 )
2019-08-08 15:51:50 +05:30
Faris Ansari
2260838933
fix(Item Template): Fallback description string
...
Fixes #18572
2019-08-07 17:21:22 +05:30
Faris Ansari
82770d9152
fix: Project fixes ( #18343 )
...
* fix: Add fetch from in Full Name
* fix: Remove deprecated buttons
* fix: Show Project to Administrator
2019-07-16 09:40:09 +05:30
sahil28297
ec810a4a55
fix(product_page): compare type as well and provide base class for parseInt ( #18332 )
2019-07-15 11:24:41 +00:00
Nabin Hait
34c551d9a5
fix: Missing commits from hotfix branch ( #17997 )
...
* fix: merge conflict
* fix: restored missing set_gst_state_and_state_number function
* fix: style linting as per codacy
* fix: Fixes related to customer/lead merging
* fix: merge conflict
* fix: Fixes related to customer/lead merging
* fix: Assign isue/opportunity to user
* fix: Assign isue/opportunity to user
* fix: Replaced Invoice type by GST Category
* fix: merge conflict
* fix: merge conflict
* fix: test cases
* fix: test cases
2019-07-03 10:34:31 +05:30
Suraj Shetty
93fc6004ad
Merge pull request #17942 from netchampfaris/product-page-cart-disabled
...
fix: Show product page even if cart is not enabled
2019-06-17 12:36:09 +05:30
Suraj Shetty
f821b18a82
Merge pull request #17951 from netchampfaris/product-page-specification
...
fix: Remove Specifications label
2019-06-17 12:32:58 +05:30