Rohit Waghchaure
|
f154c611bb
|
[Fixes] RFQ contact and multiple creation of supplier quotation issue
|
2016-07-06 17:26:15 +05:30 |
|
Rushabh Mehta
|
bc10431b7d
|
Merge pull request #5631 from KanchanChauhan/address-viewww-fixed
Address view fixed for website
|
2016-07-04 15:50:40 +05:30 |
|
Kanchan Chauhan
|
1605ff02c6
|
[WIP] Address view fixed
|
2016-07-04 15:41:07 +05:30 |
|
Rushabh Mehta
|
5f5f0bec2c
|
[fix] buttons for rfq and material request
|
2016-07-04 11:39:25 +05:30 |
|
Rushabh Mehta
|
dc8067eb33
|
[demo] new cleaner, more-flexible demo
|
2016-07-04 11:39:25 +05:30 |
|
Rushabh Mehta
|
878dfec46a
|
[minor]
|
2016-07-04 11:39:25 +05:30 |
|
Kanchan Chauhan
|
a756e3f765
|
Reverted changes
|
2016-06-28 15:02:35 +05:30 |
|
Kanchan Chauhan
|
c8d47da6bc
|
Shopping cart and dropdown cart update
|
2016-06-28 11:29:43 +05:30 |
|
Rohit Waghchaure
|
d6c986da8f
|
[Enhancement] Time log wages and multiple active salary structure
|
2016-06-27 16:46:39 +05:30 |
|
Rushabh Mehta
|
a2c4dad90e
|
[fix] product search
|
2016-06-27 14:55:01 +05:30 |
|
Anand Doshi
|
771ab0c8c3
|
[fix] [patch] re-route
|
2016-06-27 12:04:48 +05:30 |
|
Rushabh Mehta
|
a334062b03
|
[redesign] website routing system
|
2016-06-24 16:18:07 +05:30 |
|
Saurabh
|
ed0816832d
|
[enhance] ux fixes for payment request, added jinja for payment request message
|
2016-05-25 11:55:30 +05:30 |
|
Rushabh Mehta
|
ac123c57f3
|
[cleanup] website / portal css
|
2016-05-20 16:37:14 +05:30 |
|
Rushabh Mehta
|
532eedf411
|
[enhance] more editable grids
|
2016-05-19 18:22:49 +05:30 |
|
Rushabh Mehta
|
35047ac283
|
[ux] direct editing in material request
|
2016-05-18 18:17:38 +05:30 |
|
Rushabh Mehta
|
6471e178f6
|
Merge pull request #5321 from rohitwaghchaure/rfq_fixes
[Fixes] RFQ minor fixes
|
2016-05-16 11:57:35 +05:30 |
|
Rushabh Mehta
|
4b9238a03b
|
[cleanup] homepage
|
2016-05-12 15:23:17 +05:30 |
|
Rohit Waghchaure
|
29c7876e87
|
[Fixes] RFQ minor fixes
|
2016-05-11 19:38:29 +05:30 |
|
Kanchan Chauhan
|
1d79f350bc
|
Shopping Cart error messages issue resolved
|
2016-05-10 17:19:47 +05:30 |
|
Kanchan Chauhan
|
b3573a881e
|
Shopping cart dropdown changes
|
2016-05-09 12:30:58 +05:30 |
|
Rushabh Mehta
|
c711b82889
|
Merge pull request #5296 from KanchanChauhan/websitemakeover
New look to the website
|
2016-05-02 15:54:41 +05:30 |
|
Kanchan Chauhan
|
239b351367
|
New look to the website
|
2016-05-02 11:43:44 +05:30 |
|
Rushabh Mehta
|
be2ee18de4
|
[fixed] frappe.require is now async 💥
|
2016-04-29 17:22:42 +05:30 |
|
Anand Doshi
|
a6f48688bc
|
[enhancement] website: optionally show products as list
|
2016-04-22 19:10:49 +05:30 |
|
Anand Doshi
|
e3bd78e912
|
[css] portal
|
2016-04-22 18:53:21 +05:30 |
|
Kanchan Chauhan
|
e0818f8f46
|
Website Changes
|
2016-04-22 17:47:16 +05:30 |
|
Rushabh Mehta
|
c291ab64a6
|
Merge pull request #5197 from KanchanChauhan/UXChanges_ERPNext
[WIP] No not merge
|
2016-04-21 11:39:45 +05:30 |
|
Rushabh Mehta
|
f2c3cb85a9
|
Merge pull request #5164 from KanchanChauhan/project-permissions
Collaborate PM permission fixes and daily tme log fix
|
2016-04-21 11:37:31 +05:30 |
|
Kanchan Chauhan
|
11638ba358
|
Changes 3
|
2016-04-20 16:24:25 +05:30 |
|
Kanchan Chauhan
|
704f248952
|
Changes 2
|
2016-04-20 16:24:24 +05:30 |
|
Kanchan Chauhan
|
2dbf5294a9
|
[WIP] No not merge
|
2016-04-20 16:24:24 +05:30 |
|
Rohit Waghchaure
|
ae270d6648
|
[Fixes] Supplier can view their addresses, default buying price list issue
|
2016-04-11 13:58:33 +05:30 |
|
Kanchan Chauhan
|
a4ff5d3195
|
Collaborate PM permission fixes and daily tme log fix
|
2016-04-08 23:22:04 +05:30 |
|
Anand Doshi
|
e6e7cd90c9
|
Merge pull request #5143 from KanchanChauhan/somefixes
[Minor Fixes] Findings in setting up erpnext
|
2016-04-08 16:20:11 +05:30 |
|
Kanchan Chauhan
|
017d30f465
|
[Minor Fixes] Findings in setting up erpnext
|
2016-04-06 19:28:50 +05:30 |
|
Rushabh Mehta
|
78b7a53635
|
[cleanup] set default bold, print_hide for prints
|
2016-04-06 15:29:45 +05:30 |
|
rohitwaghchaure
|
62fea0374b
|
[Enhancement] Added currency symbol on RFQ form of supplier portal, currency validation for party
|
2016-03-31 21:49:07 +05:30 |
|
Rushabh Mehta
|
cb144bfcd4
|
[cleanup] projects
|
2016-03-31 14:27:35 +05:30 |
|
Rushabh Mehta
|
2d985e1973
|
[fix] edit-profile in frappe;
|
2016-03-30 17:15:33 +05:30 |
|
Rushabh Mehta
|
df7e523c3f
|
[fix] web forms for collaborative pm
|
2016-03-30 11:00:42 +05:30 |
|
Rushabh Mehta
|
8b43fd7f02
|
Merge pull request #5084 from KanchanChauhan/PM-UI-Edits
UI Changes
|
2016-03-29 18:45:58 +05:30 |
|
Kanchan Chauhan
|
b566d42d37
|
UI Changes
|
2016-03-29 18:21:59 +05:30 |
|
Rushabh Mehta
|
7a1b5da830
|
[cleanup] request for quotation cleanup
|
2016-03-29 16:04:43 +05:30 |
|
rohitwaghchaure
|
a1064a6149
|
[enhancement] request for quotation
|
2016-03-28 17:28:45 +05:30 |
|
Rushabh Mehta
|
d5bf8253da
|
[fix] job application link, fixes #5066
|
2016-03-28 11:30:05 +05:30 |
|
Rushabh Mehta
|
c20c536f28
|
[fix] [wip] cleanup for collaborative pm
|
2016-03-25 17:22:17 +05:30 |
|
Kanchan Chauhan
|
53ce94f9bd
|
Minor fixes
|
2016-03-25 12:04:54 +05:30 |
|
Rushabh Mehta
|
b2269dd326
|
[fix] back links from project web view
|
2016-03-23 18:29:00 +05:30 |
|
Kanchan Chauhan
|
e14389ec6e
|
Added task and issue webforms and few fixes
|
2016-03-23 14:14:38 +05:30 |
|
Anand Doshi
|
1947b1784e
|
[minor] removed typo in order.html
|
2016-03-23 12:12:41 +05:30 |
|
Kanchan Chauhan
|
2ad801cfd8
|
Minor Updates
|
2016-03-22 16:00:41 +05:30 |
|
Kanchan Chauhan
|
b3fe6a45a7
|
WIP Collaborative Project Management first commit
|
2016-03-16 18:34:33 +05:30 |
|
Nabin Hait
|
6c3cc3647b
|
Merge pull request #4969 from rmehta/link-count
[enhancement] sort links on basis of link_count (idx)
|
2016-03-15 11:40:18 +05:30 |
|
Anand Doshi
|
ad61a28730
|
[fix] [hot] compact print: check in_format_data for print format builder prints
|
2016-03-14 18:20:48 +05:30 |
|
rohitwaghchaure
|
bea7558908
|
[fixes]indicator in material request item
|
2016-03-14 17:47:36 +05:30 |
|
Rushabh Mehta
|
3574b37ff3
|
[enhancement] sort links on basis of link_count (idx)
|
2016-03-11 14:33:04 +05:30 |
|
Rushabh Mehta
|
07263462f6
|
[minor] add translated get_formatted
|
2016-03-03 10:48:45 +05:30 |
|
Rushabh Mehta
|
fe6eadfe22
|
[cleanup] job opening and job applicant
|
2016-03-02 12:53:19 +05:30 |
|
rohitwaghchaure
|
4151e3dc92
|
[enhancement] Multi-lingual print format
|
2016-03-01 16:33:08 +05:30 |
|
Rushabh Mehta
|
ae7dc31d14
|
Merge pull request #4846 from KanchanChauhan/job-applicant
Added feature to allow people to apply for job from website
|
2016-02-29 17:22:01 +05:30 |
|
Nabin Hait
|
a1d5494fb3
|
Merge pull request #4867 from KanchanChauhan/item-group
Added pagination to Products web page
|
2016-02-25 11:56:30 +05:30 |
|
Kanchan Chauhan
|
0d6db633f7
|
Added pagination to Products web page
|
2016-02-24 17:29:25 +05:30 |
|
Saurabh
|
f54be2c7f0
|
[fixes] test case fixes for multi-currency check
|
2016-02-24 15:07:25 +05:30 |
|
Saurabh
|
da9e9cdb13
|
[fixes] minor get_payment_gateway_account
|
2016-02-24 15:07:24 +05:30 |
|
Saurabh
|
dca6302e15
|
[fixes] field renaming, cart checkout fixes, JE fixes for multi-currency payment
|
2016-02-24 15:07:24 +05:30 |
|
Saurabh
|
883cc04701
|
[fixes] compare attributes in lower case
|
2016-02-24 15:07:24 +05:30 |
|
rohit waghchaure
|
da321b44cb
|
removed translator
|
2016-02-23 02:17:04 +05:30 |
|
saurabh
|
9364f35a2c
|
fixed issue of stock_uom translator
|
2016-02-23 02:17:04 +05:30 |
|
saurabh
|
60def66644
|
added translator into print format
|
2016-02-23 02:17:02 +05:30 |
|
Kanchan Chauhan
|
49c4aa6ce3
|
Minor fix
|
2016-02-19 17:36:52 +05:30 |
|
Kanchan Chauhan
|
2e8cc89e34
|
Added webform for Job Opening
|
2016-02-19 17:31:13 +05:30 |
|
Anand Doshi
|
828d5ffaab
|
[fix] Show Debit/Credit in Bank Reconciliation table
|
2016-02-17 18:31:58 +05:30 |
|
Anand Doshi
|
9a933788be
|
[cleanup] Compact Item Print
|
2016-02-16 15:30:17 +05:30 |
|
ShashaQin
|
541abf5687
|
Update item_table_description.html
|
2016-02-16 15:07:09 +05:30 |
|
ShashaQin
|
c77669f3d1
|
Update item_table_description.html
|
2016-02-16 15:07:09 +05:30 |
|
Anand Doshi
|
0bcd9efa88
|
[fix] value returned by frappe._ will always be unicode
|
2016-01-18 12:30:31 +05:30 |
|
Saurabh
|
69f9975748
|
[fixes] show link to visit cart after adding item, hide cart button on cart view
|
2016-01-12 14:09:52 +05:30 |
|
Saurabh
|
df2783dbb0
|
[enhance] i. facility to send PR email; ii. update cart, item view and order view;
|
2016-01-12 14:09:52 +05:30 |
|
Saurabh
|
0a0c78729f
|
[enhace] display payment status on order
|
2016-01-12 14:09:51 +05:30 |
|
Saurabh
|
276d3e60bd
|
[enhance] pay via cart
|
2016-01-12 14:09:51 +05:30 |
|
Anand Doshi
|
e88ffe032e
|
[fix] show fields like sales_order, against_sales_order, schedule_date in item grid if In List View is checked
|
2016-01-06 12:54:59 +05:30 |
|
Anand Doshi
|
13bf123b24
|
[hotfix] item on web
|
2016-01-04 17:51:35 +05:30 |
|
Rushabh Mehta
|
51008f2abc
|
[cleanup] [website]
|
2016-01-01 17:24:37 +05:30 |
|
Anand Doshi
|
dfdededcf0
|
[fix] product search limit = 12 instead of 10, since we show it in a grid of 12
|
2015-12-16 12:57:02 +05:30 |
|
Anand Doshi
|
cc24d28ddc
|
[fix] address creation for new user
|
2015-12-08 12:34:13 +05:30 |
|
Rushabh Mehta
|
14a0441b4b
|
[fix] removed temp_highlight
|
2015-12-07 12:28:03 +05:30 |
|
Anand Doshi
|
15b22c9d7d
|
Merge pull request #4383 from anandpdoshi/fix/auto-material-request-template
[fix] Show Item Name in re-order email. Fixes #4381
|
2015-11-27 11:31:36 +05:30 |
|
Anand Doshi
|
4b12740e8d
|
[fix] Shipment in portal. Fixes #4291
|
2015-11-26 18:22:03 +05:30 |
|
Anand Doshi
|
5cf7a0bf72
|
[fix] Show Item Name in re-order email. Fixes #4381
|
2015-11-26 15:11:18 +05:30 |
|
Anand Doshi
|
4fbf01fd9d
|
[fix] urlencode address list's link
|
2015-11-16 15:05:49 +05:30 |
|
Nabin Hait
|
7ba4d02444
|
[docs] First commit for docs
|
2015-11-09 14:40:29 +05:30 |
|
Rushabh Mehta
|
8d1191ac8f
|
Merge pull request #4252 from anandpdoshi/edge-case-website-variant-selection
[fix] Edge case in variant selection in website - when variant has less number of attributes than template
|
2015-11-02 15:20:10 +05:30 |
|
Anand Doshi
|
532b9e8bfb
|
[fix] Edge case in variant selection in website - when variant has less number of attributes than template
|
2015-10-29 13:20:07 +05:30 |
|
Anand Doshi
|
21e09a2bd8
|
[enhancement] Ability to disable an Item
|
2015-10-29 12:39:47 +05:30 |
|
Anand Doshi
|
6d69ca6bac
|
[fix] don't show expired items in website item list. Fixes #4210.
|
2015-10-29 11:35:16 +05:30 |
|
Nabin Hait
|
fdeab29e94
|
Removed console.log
|
2015-10-27 11:23:43 +05:30 |
|
Anand Doshi
|
3f3696d1eb
|
[enhancement] [website] numeric attribute selector, smart selection of variant based on attribute combinations
|
2015-10-26 21:55:34 +05:30 |
|
Anand Doshi
|
25ef4ff373
|
[fix] variant selector display
|
2015-10-20 18:34:21 +05:30 |
|
Anand Doshi
|
7c0eadb451
|
[fix] Patch template item to be shown in website, show variant's description and price on change of attribute
|
2015-10-20 17:30:02 +05:30 |
|
Saurabh
|
9f235b891f
|
[fix] order.html rate display
|
2015-10-14 18:03:07 +05:30 |
|
Rushabh Mehta
|
6e322d0a02
|
[enhancement] use thumbnails in grid views, patch to make thumbnails
|
2015-10-14 16:21:24 +05:30 |
|
Rushabh Mehta
|
80d2a55342
|
[enhancement] add variants in website
|
2015-10-14 16:16:00 +05:30 |
|
Anand Doshi
|
199d8a44fc
|
[fix] check doc.has_website_permission in order.html
|
2015-09-28 19:04:42 +05:30 |
|
Anand Doshi
|
06ad308ca1
|
[fixes] setup wizard and other fixes related to cart
|
2015-09-23 12:50:35 +05:30 |
|
Rushabh Mehta
|
72fbf902d7
|
[cleanup] added single price list for shopping cart, removed Applicable Territory
|
2015-09-23 12:50:34 +05:30 |
|
Rushabh Mehta
|
8ffd483e24
|
[wip] shopping cart shipping rule, price list cleanup
|
2015-09-23 12:49:16 +05:30 |
|
Rushabh Mehta
|
3d76686b82
|
[shopping-cart] cart via Jinja WIP
|
2015-09-23 12:49:16 +05:30 |
|
Rushabh Mehta
|
156ce607e2
|
[cleanup] [wip] portal, shopping cart cleanup
|
2015-09-23 12:49:16 +05:30 |
|
bobzz-zone
|
3bcb13b1b8
|
Update item_grid.html
Change the colour of the indicator to be green when delivered qty is bigger than ordered qty
|
2015-09-23 11:42:06 +07:00 |
|
Rushabh Mehta
|
f7800c053b
|
[layout cleanup] in Quotation, Sales Order, Delivery Note
|
2015-08-26 18:53:37 +05:30 |
|
Rushabh Mehta
|
ddd79f43d2
|
[fix] [hot] erpnext contact page
|
2015-08-25 14:03:43 +05:30 |
|
Nabin Hait
|
3c3a3ecea8
|
Additional Costs in Stock Entry
|
2015-08-10 14:07:45 +05:30 |
|
Rushabh Mehta
|
69095e7285
|
[fix] website search
|
2015-08-07 15:48:53 +05:30 |
|
Anand Doshi
|
886def0a69
|
[fix] convert Item and Item Grid images to absolute urls
|
2015-07-22 14:43:37 +05:30 |
|
Anand Doshi
|
f3a67c4533
|
[fix] Mozilla hack for images in table for print
|
2015-07-15 12:37:45 +05:30 |
|
Anand Doshi
|
e6f7ac961f
|
[fix] Add to Cart visibility, Customer's Price List in Shopping Cart and Address creation from Shopping Cart
|
2015-07-13 16:24:37 +05:30 |
|
Anand Doshi
|
c530161de0
|
[fix] Item image urls can now have paranthesis
|
2015-07-13 15:05:39 +05:30 |
|
Rushabh Mehta
|
fc3d87181a
|
[fix] cart and general leger report
|
2015-07-10 10:11:07 +05:30 |
|
Rushabh Mehta
|
71349d221b
|
[fix] item image in mozilla #3412 #3413
|
2015-07-03 10:43:35 +05:30 |
|
Rushabh Mehta
|
5105f909d6
|
[fix] show item description in form grid based on in_list_view
|
2015-07-02 15:09:18 +05:30 |
|
Nabin Hait
|
8ad0b4e0b9
|
Show Issue id in list view from customer login
|
2015-06-26 14:42:51 +05:30 |
|
Nabin Hait
|
686ef8308a
|
Show item name in item grid view based 'In List View' property
|
2015-06-08 14:22:56 +05:30 |
|
Nabin Hait
|
6bf301f53c
|
Show item description in grid view based on 'In List View' property
|
2015-06-05 15:49:25 +05:30 |
|
Nabin Hait
|
c87595b2da
|
show item description in item grid view if marked for 'In List View'
|
2015-06-03 11:24:37 +05:30 |
|
Rushabh Mehta
|
2204d0af94
|
Merge pull request #3397 from rmehta/portal-fixes
Portal fixes
|
2015-06-02 10:42:59 +05:30 |
|
Rushabh Mehta
|
aded46d33e
|
[fix] product search in new block header_actions
|
2015-06-01 17:23:42 +05:30 |
|
Rushabh Mehta
|
a33d468d30
|
[fixes] portal, issues, addresses etc
|
2015-06-01 17:15:42 +05:30 |
|
Nabin Hait
|
e481a211b1
|
item table print template
|
2015-06-01 17:12:55 +05:30 |
|
Nabin Hait
|
8908543a9c
|
In standard print format, item name will now honour 'Print Hide' property
|
2015-06-01 14:01:56 +05:30 |
|
Rushabh Mehta
|
b0b446e899
|
[fix] cleanup tables from description and re-sync print format
|
2015-05-29 12:44:33 +05:30 |
|
Anand Doshi
|
81bded1afe
|
[fix] Product Search
|
2015-05-27 16:48:06 -04:00 |
|
Nabin Hait
|
d4c8dc2915
|
multiple minor fixes
|
2015-05-26 16:32:30 +05:30 |
|
Rushabh Mehta
|
822fd7747a
|
[email] [website] footer cleanup
|
2015-05-26 12:15:39 +05:30 |
|
Rushabh Mehta
|
f29a618b69
|
[email] [website] footer cleanup
|
2015-05-26 12:15:39 +05:30 |
|
Nabin Hait
|
90fc19ed9a
|
Item image in print view
|
2015-05-14 12:32:26 +05:30 |
|
Rushabh Mehta
|
73249551e8
|
[fix] [hot] website product list make full urls
|
2015-05-12 11:37:47 +05:30 |
|
Rushabh Mehta
|
9cf1edc2c0
|
[fix] [hot] website product list make full urls
|
2015-05-12 11:32:25 +05:30 |
|
Rushabh Mehta
|
20a41b52cd
|
[temp-fix] missing product image
|
2015-05-09 12:18:17 +05:30 |
|
Anand Doshi
|
8be3ba36d9
|
fixed relative urls in some web pages
|
2015-04-24 13:22:08 -04:00 |
|
Rushabh Mehta
|
7f9c4d8677
|
[fix] item grid fix, via #3136
|
2015-04-21 10:19:53 +05:30 |
|
Rushabh Mehta
|
20bcf6aeff
|
[fixes] print_hide on stock uom and gross profit
|
2015-04-13 15:31:24 +05:30 |
|
Rushabh Mehta
|
f5f0d5a83a
|
[breadcrumbs] refactor
|
2015-03-09 15:48:16 +05:30 |
|
Rushabh Mehta
|
31724da2d6
|
[print] item qty & uom on same line
|
2015-03-04 15:51:08 +05:30 |
|
Anand Doshi
|
885e074697
|
Changed company name from Web Notes to Frappe Technologies
|
2015-03-03 14:56:43 +05:30 |
|
Anand Doshi
|
8f9e631a44
|
minor fixes
|
2015-02-26 20:29:43 +05:30 |
|
Anand Doshi
|
e474aa5d91
|
[minor] Product grid text-ellipsis
|
2015-02-25 18:52:22 +05:30 |
|
Rushabh Mehta
|
e91388381c
|
[minor] notifications and other fixes to stock
|
2015-02-25 15:08:57 +05:30 |
|
Anand Doshi
|
d35354cc06
|
Merge remote-tracking branch 'frappe/develop' into v5.0
Conflicts:
erpnext/__version__.py
erpnext/accounts/doctype/budget_distribution/test_budget_distribution.py
erpnext/accounts/doctype/chart_of_accounts/charts/account_properties.py
erpnext/hooks.py
erpnext/patches.txt
erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
erpnext/stock/get_item_details.py
erpnext/translations/ar.csv
erpnext/translations/bs.csv
erpnext/translations/ca.csv
erpnext/translations/el.csv
erpnext/translations/es.csv
erpnext/translations/fr.csv
erpnext/translations/hr.csv
erpnext/translations/id.csv
erpnext/translations/is.csv
erpnext/translations/ja.csv
erpnext/translations/nl.csv
erpnext/translations/pl.csv
erpnext/translations/pt-BR.csv
erpnext/translations/ru.csv
erpnext/translations/tr.csv
erpnext/translations/zh-cn.csv
erpnext/translations/zh-tw.csv
setup.py
|
2015-02-24 18:12:17 +05:30 |
|
Anand Doshi
|
da858cc587
|
Website Product Image
|
2015-02-24 17:52:09 +05:30 |
|