Faris Ansari
|
578624db1f
|
Fix column width in GST Tax Breakup (#10230)
|
2017-08-02 17:44:32 +05:30 |
|
Vishal Dhayagude
|
edb2749dfd
|
Timesheet web (#10037)
* [new]Timesheet added
* [new] Customer wise timesheet on webportal added
|
2017-07-25 10:53:12 +05:30 |
|
Faris Ansari
|
e355f99786
|
Remove ellipsis in title and description (#9992)
|
2017-07-20 17:51:19 +05:30 |
|
Nabin Hait
|
b962fc1573
|
Show hsn code in tax breakup for India and render via template (#9866)
* Show hsn code in tax breakup for India and render via template
* tax breakup if gst_tax_field does not exists
* Fixed tax-breakup test cases
|
2017-07-17 18:02:31 +05:30 |
|
Britlog
|
faf75c4ddd
|
Fix and improve shopping cart (#9348)
* Fix and improve shopping cart
* Update shopping_cart.js
* Update shopping_cart.js
|
2017-06-20 12:51:32 +05:30 |
|
Nabin Hait
|
d0ac0bdc18
|
Merge branch 'master' into develop
|
2017-06-12 13:50:12 +05:30 |
|
Makarand Bauskar
|
665311b38a
|
[hotfix] replaced __ call with _ in project_timesheets.html (#9198)
|
2017-06-09 14:03:20 +05:30 |
|
Nabin Hait
|
2c808c578d
|
Merge branch 'master' into develop
|
2017-06-08 10:34:45 +05:30 |
|
rohitwaghchaure
|
6b95210c19
|
[Fix] User not able to view projects from the portal (#9173)
|
2017-06-07 20:03:37 +05:30 |
|
Faris Ansari
|
ab74ca7fff
|
Lint and fix JS files
|
2017-05-30 12:54:42 +05:30 |
|
Francisco Roldán
|
85bfc05efa
|
Fix missing translations (#8871)
* Fix missing translations
* Fix
|
2017-05-17 19:42:04 +05:30 |
|
mbauskar
|
22cedeb006
|
[minor] POS & RFQ format_number fixes
|
2017-04-17 12:24:24 +05:30 |
|
mbauskar
|
ed8ad9cfee
|
[minor] fides for add to card button issue
|
2017-04-13 18:45:09 +05:30 |
|
mbauskar
|
9a0efc7710
|
[minor] validate email address before get update button click
|
2017-04-13 18:18:18 +05:30 |
|
Rushabh Mehta
|
66272a168d
|
[minor] README.md + encode query parameter in search
|
2017-04-12 14:32:07 +05:30 |
|
Nabin Hait
|
00b04ed61e
|
Merge pull request #8076 from KanchanChauhan/qty-in-shopping-cart
Show qty in Shopping Cart
|
2017-03-24 13:14:03 +05:30 |
|
Kanchan Chauhan
|
a844040781
|
Show qty in Shopping Cart
|
2017-03-23 18:22:02 +05:30 |
|
Robert Kirschner
|
b8f5148a44
|
[minor] fix: translatable title, h1, button on product_search page. Address row in web view has translatable address type
|
2017-03-23 13:43:26 +01:00 |
|
Robert Kirschner
|
d162eb367c
|
[minor] fix translation strings in cart web view
|
2017-03-23 12:18:24 +01:00 |
|
Robert Kirschner
|
0af93a782d
|
Merge branch 'develop' of https://github.com/frappe/erpnext into develop
|
2017-03-23 12:10:46 +01:00 |
|
mbauskar
|
67e3e32dd6
|
[minor] fixed shipping and billing address issue in cart
|
2017-03-22 16:14:43 +05:30 |
|
Robert Kirschner
|
c6b52a321e
|
update on cart.js pull request feedback
|
2017-03-22 08:10:30 +01:00 |
|
Robert Kirschner
|
0a33d4ffc5
|
[fix] selecting new address in cart web page unchecks previously checked address
|
2017-03-21 14:52:59 +01:00 |
|
pratu16x7
|
0e94b4bec4
|
Mobile view fixes
|
2017-02-14 17:18:09 +05:30 |
|
pratu16x7
|
60fe77cc90
|
Website data from existing child tables, layout, images
|
2017-02-14 17:18:09 +05:30 |
|
Scheercuzy
|
7c161cfff2
|
Merge remote-tracking branch 'frappe/develop' into enlarge-item-image-website
|
2017-01-03 16:03:43 +06:30 |
|
KanchanChauhan
|
4601fdd98d
|
Better Salary Slip logs in Process Payroll (#7322)
|
2016-12-30 16:26:55 +05:30 |
|
Scheercuzy
|
f483582957
|
Hyperlink Item Image
added hyperlink on item image
|
2016-12-29 18:56:44 +06:30 |
|
Rushabh Mehta
|
323c06ebbf
|
[minor] rename icons as per FontAwesome 4 (#7136)
|
2016-12-05 14:17:26 +05:30 |
|
Kanchan Chauhan
|
2c1f399479
|
Apply Pricing Rule in Shopping Cart
|
2016-11-22 22:23:31 +05:30 |
|
Nabin Hait
|
46753de6d7
|
fixed merge conflict
|
2016-11-17 15:55:11 +05:30 |
|
Kanchan Chauhan
|
98f499a43e
|
[Fix]Product thumbnail in Shopping Cart
|
2016-11-16 15:17:55 +05:30 |
|
Rushabh Mehta
|
4bfa0748cd
|
[merge] master
|
2016-11-16 11:28:23 +05:30 |
|
Rushabh Mehta
|
440650d4a2
|
[fix] view shopping cart dropdown (#6928)
|
2016-11-14 13:13:53 +05:30 |
|
Rushabh Mehta
|
e855f53f08
|
[minor] fix ellipsis style
|
2016-11-02 07:34:17 +05:30 |
|
Nabin Hait
|
7c0fe7d9d3
|
Merge pull request #6534 from rohitwaghchaure/rfq_added_links_of_quotations
[Enhancement] Added supplier quotation link on rfq
|
2016-10-05 15:44:51 +05:30 |
|
Rohit Waghchaure
|
a26f685b9f
|
[Enhancement] Added supplier quotation link on rfq
|
2016-10-05 15:04:50 +05:30 |
|
Rushabh Mehta
|
aedad64445
|
[minor] fixes
|
2016-10-04 11:41:42 +05:30 |
|
Rohit Waghchaure
|
21499e820d
|
[Enhancement] Supplier quotation added on supplier portal
|
2016-09-21 17:07:25 +05:30 |
|
Rohit Waghchaure
|
b34ba6bd6e
|
[RFQ] Web form alignment issue
|
2016-09-01 19:10:58 +05:30 |
|
Revant Nandgaonkar
|
5bbc68df8b
|
[fix] Issue #6046 group_name replaced with name
|
2016-08-10 11:06:31 +05:30 |
|
Neil Trini Lasrado
|
50b2278eda
|
Renamed fields in Examination Doctype, Renamed examination doctype to Assessment, Added Assessment Group, added patch
|
2016-08-05 15:09:49 +05:30 |
|
Neil Trini Lasrado
|
3f0a581b85
|
Merge ERPNext Schools into ERPNext
|
2016-07-20 19:25:02 +05:30 |
|
Kanchan Chauhan
|
6d76359c31
|
[WIP] Task statuses updated in website
|
2016-07-07 12:19:01 +05:30 |
|
Rohit Waghchaure
|
f154c611bb
|
[Fixes] RFQ contact and multiple creation of supplier quotation issue
|
2016-07-06 17:26:15 +05:30 |
|
Kanchan Chauhan
|
1605ff02c6
|
[WIP] Address view fixed
|
2016-07-04 15:41:07 +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 |
|
Rushabh Mehta
|
a2c4dad90e
|
[fix] product search
|
2016-06-27 14:55:01 +05:30 |
|
Rushabh Mehta
|
a334062b03
|
[redesign] website routing system
|
2016-06-24 16:18:07 +05:30 |
|