Rushabh Mehta
4500f7b4d6
[cleanup] remove unused LMS ( #7612 )
2017-01-30 17:04:38 +05:30
robert schouten
67eff49516
[fix] compact print format not longer ignores format builder
2017-01-25 08:20:43 +08:00
rohitwaghchaure
ab65f6d8b1
Merge pull request #7547 from mnatalia/develop
...
Added translations to the web page and item dashboard.
2017-01-23 15:57:33 +05:30
Rushabh Mehta
397e508fc0
[fix] sales_partner.js, fixes #7553
2017-01-21 16:58:57 +05:30
mnatalia
e09407571c
Added translations to the web page and item dashboard.
2017-01-20 12:00:25 +02:00
Felipe Orellana
ac81440a81
[FIX] Contact form breaks on existing lead
...
When an email address from the contacts form is from a existing lead utils.py tries to set new_lead(an undefined var) as the lead reference if a lead is found.
2017-01-12 12:08:20 -05:00
Rushabh Mehta
d40e661ebd
[style] better demo start page
2017-01-10 14:46:54 +05:30
Nabin Hait
d08c248642
Merge pull request #7354 from Scheercuzy/enlarge-item-image-website
...
Hyperlink on item image on website
2017-01-04 15:58:44 +05:30
Kanchan Chauhan
b7cc393eb8
Email ID renamed to Email Address
2017-01-03 16:45:38 +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
5cb1b6bf3f
[minor] translation fix
2016-12-27 16:30:20 +05:30
Rushabh Mehta
827588adf2
[minor] fixes to job opening
2016-12-19 17:06:26 +05:30
Rushabh Mehta
99c814b360
[fix] paging for products (support)
2016-12-19 11:55:10 +05:30
Rushabh Mehta
86f8ab95f6
[minor] font-awesome fixes
2016-12-05 15:02:24 +05: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
d51e1587d5
[fix] contact us page should create a opportunity by default ( #6939 )
2016-11-16 11:13:31 +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
0702fa2fc6
Fixed version conflict
2016-10-19 16:49:36 +05:30
Faris Ansari
2acbb11923
[fix] print format image size
2016-10-19 12:08:00 +05:30
Rushabh Mehta
257bbbe588
[refactor] has_website_permission parameters
2016-10-12 10:53:34 +05:30
Rushabh Mehta
ac5b193100
[minor] direct student admission to the list page
2016-10-09 15:19:23 +05:30
Nabin Hait
558f526a68
Fixed version conflict
2016-10-05 17:18:36 +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
Nabin Hait
7229b64128
Merge pull request #6516 from bcornwellmott/patch-6
...
Update request_for_quotation.html
2016-10-05 13:12:09 +05:30
Rushabh Mehta
3af3d7abe3
[fixes] admission-applicant link and student applicant fixes
2016-10-04 12:20:47 +05:30
Rushabh Mehta
aedad64445
[minor] fixes
2016-10-04 11:41:42 +05:30
Nabin Hait
7fb79d175f
Fixed version conflict
2016-10-03 18:05:34 +05:30
Faris Ansari
69ca382529
[fix] image size fix in print format
2016-10-03 17:15:42 +05:30
Neil Trini Lasrado
93d314c573
Merged introduction and eligibility into a single text field in Student Admission. ( #6529 )
2016-10-03 15:50:47 +05:30
bcornwellmott
47863a3049
Update request_for_quotation.html
...
Fixing spelling mistakes
2016-09-30 15:45:20 -07:00
Rushabh Mehta
2d4f3bb04a
[fix] space
2016-09-22 15:17:04 +05:30
Rohit Waghchaure
21499e820d
[Enhancement] Supplier quotation added on supplier portal
2016-09-21 17:07:25 +05:30
Nabin Hait
0be6073f10
Fixed version conflict
2016-09-21 13:06:19 +05:30
Nabin Hait
429a38f90b
Merge pull request #6415 from rmehta/hotfix
...
[minor] bring back old grid style in material request
2016-09-20 18:05:32 +05:30
Rushabh Mehta
57a1905576
[minor] bring back old grid style in material request
2016-09-20 17:22:54 +05:30
Neil Trini Lasrado
bb5eb7d6f4
Added title to Student Admission ( #6379 )
2016-09-15 16:44:25 +05:30
Neil Trini Lasrado
7e1b516103
fixes for student admission ( #6377 )
...
* fixes for student admission
* Added Application Route to Student Admission
2016-09-15 15:36:14 +05:30
Neil Trini Lasrado
83d81203b2
Added Student Admissions ( #6359 )
...
* Added Student Admissions
* Fixes for Student Application
2016-09-15 14:48:13 +05:30
Nabin Hait
d5ebd79ad7
Fixed version conflict
2016-09-14 15:50:22 +05:30
Rushabh Mehta
b6bca567ce
[fixes] [style] for web-form
2016-09-13 14:40:13 +05:30
Nabin Hait
9c82dd9157
Merge pull request #6332 from rmehta/item-group-paging
...
[fix] paging for item group
2016-09-12 13:01:54 +05:30
Rushabh Mehta
3aa315040f
[fix] paging for item group
2016-09-11 16:48:24 +05:30
Rohit Waghchaure
b34ba6bd6e
[RFQ] Web form alignment issue
2016-09-01 19:10:58 +05:30
Rushabh Mehta
9d1b56f423
[minor] validate permission in Process Payroll and all products fix for home page
2016-08-29 11:03:10 +05:30
Revant Nandgaonkar
5bbc68df8b
[fix] Issue #6046 group_name replaced with name
2016-08-10 11:06:31 +05:30
Rushabh Mehta
ec2d09c557
[minor] setting up website optional in setup wizard
2016-08-09 16:44:37 +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
Rushabh Mehta
ea5ad84c5e
[minor] fix image for demo
2016-08-02 21:26:04 +05:30
Neil Trini Lasrado
3f0a581b85
Merge ERPNext Schools into ERPNext
2016-07-20 19:25:02 +05:30
Anand Doshi
d9b3c5ca60
[fix] use base.html's title block in home.html
2016-07-13 11:29:50 +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
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
Rushabh Mehta
b620fed762
[fixes] [minor]
2015-02-24 16:51:22 +05:30
Nabin Hait
9524ee7ec6
tax amount in print
2015-02-24 14:43:14 +05:30
Nabin Hait
de9c8a9028
discount calculation and in print view
2015-02-24 10:02:27 +05:30
Anand Doshi
f9fc04ce8e
Website Listing
2015-02-23 22:34:27 +05:30
Rushabh Mehta
50dc4e90e3
[cleanup] item grid views, removed desc etc
2015-02-19 20:05:45 +05:30
Rushabh Mehta
c7a11cc451
[usability] [fixes] stock entry and production order
2015-02-19 16:28:35 +05:30
Nabin Hait
7c28fc4014
Merge branch 'v5.0' of https://github.com/frappe/erpnext into v5.0
2015-02-18 12:24:49 +05:30
Rushabh Mehta
2e0e711eb2
[minor] stock_ledger_entry.py
2015-02-18 11:38:48 +05:30
Rushabh Mehta
df9e80c87a
[refactor] stock entry, minor ux
2015-02-17 19:56:04 +05:30
Nabin Hait
7d845502a0
Merge branch 'foreign_currency_calc' into v5.0
2015-02-17 12:51:54 +05:30
Rushabh Mehta
06072c1e51
[refactor] Material Transfer for Manufacture
2015-02-17 11:50:45 +05:30
Nabin Hait
5690be103c
Replaced renamed total fields in code files
2015-02-12 16:09:11 +05:30
Nabin Hait
8fa503e177
Fixed conflict while merging v4 into v5
2015-02-10 16:44:00 +05:30
Nabin Hait
15cd12214e
Fixed conflict while merging v4 into v5
2015-02-10 16:37:18 +05:30
Anand Doshi
6dfd430a2f
Moved flags like ignore_mandatory, ignore_validate etc to doc.flags
2015-02-10 14:41:27 +05:30
Nabin Hait
a3cb828ed3
progress bar in item grid
2015-02-06 13:00:33 +05:30
Rushabh Mehta
0e13221338
[print] item tables - override description and uom
2015-02-04 17:02:24 +05:30
Nabin Hait
4ce020f521
Item grid header in print format
2015-02-03 17:59:00 +05:30
Nabin Hait
f6f2fc4079
Print format: show item table header as per meta label
2015-01-28 16:45:13 +05:30
Rushabh Mehta
5bceebc6a1
[fix] fixes birthday reminders #2021
2015-01-23 15:22:30 +05:30
Anand Doshi
f02e142d5d
[design] mobile
2015-01-19 15:59:45 +05:30
Anand Doshi
b942cb86ae
[minor] auto-create Fiscal Year, loading, general ledger
2015-01-19 15:59:45 +05:30
Rushabh Mehta
419ae33c3e
[merge] v5-design
2014-12-31 15:03:14 +05:30
Nabin Hait
54361e8651
fixed conflict while merging develop into v5
2014-12-31 13:24:36 +05:30
Rushabh Mehta
a5b149c061
[design] module pages, messages, timelines
2014-12-26 12:53:02 +05:30
Rushabh Mehta
f870527e7c
[design] wip
2014-12-26 12:52:11 +05:30
Nabin Hait
e7d153624f
Table Field Renaming: code replace, JV and budget distribution renamed
2014-12-25 16:01:55 +05:30
Nabin Hait
1fa7171bfa
minor fixes
2014-12-23 17:38:59 +05:30
Neil Trini Lasrado
e84fa67f30
Actual operating cost, Actal operating time added to 'production order operations' - auto fetched based on 'time log' creation 'make time log' button appears only if 'production order' document is submitted server side validation added to check if 'Production Order' mentioned on 'Time Log' is in submit state test cases added to check all of the above
...
Time Log Bug Fixed
Manufacturing seetings doctype added.
prod order holiday list time calculation added
2014-12-23 17:38:59 +05:30
Nabin Hait
90b5174256
minor fix
2014-12-15 11:48:43 +05:30
Rushabh Mehta
bd9b62ff28
[rename] Support Ticket -> Issue
2014-11-28 11:46:10 +05:30
Neil Trini Lasrado
d718c93726
shopping cart fix
2014-10-27 11:03:09 +05:30
Rushabh Mehta
3daa49ac1f
[shopping-cart] i'm back
2014-10-21 16:16:30 +05:30
Nabin Hait
c68646c694
[merge] 4.x to 5.0
2014-10-06 12:57:48 +05:30
Anand Doshi
1394509343
Fixes for recurring document
2014-09-21 19:45:49 +05:30
Rushabh Mehta
5cdc8e560c
[mailbox] removed separate email settings for jobs, sales, support
2014-09-16 15:12:18 +05:30
Anand Doshi
4211aa41a0
[hotfix] Product Search 'More' button
2014-09-04 15:16:13 +05:30
Anand Doshi
f395b7ce11
[hotfix] item grid rate visibility booboo
2014-09-01 17:26:00 +05:30
ankitjavalkarwork
28a975dd32
Add patch for field name change in SI, rename email template
2014-09-01 16:22:56 +05:30
ankitjavalkarwork
e8331d40f3
Commonify Recurring Sales Order/Invoice
2014-09-01 16:20:59 +05:30
Anand Doshi
24989b90ba
Hide Rate, Amount in Item Grid template based on permlevel
2014-09-01 12:38:09 +05:30
Anand Doshi
e0ffe7a575
[hotfix] Product Search
2014-08-25 18:38:08 +05:30
Rushabh Mehta
ebd30beee4
[route] redesigned
2014-08-20 11:44:30 +05:30
Anand Doshi
96964a4e03
[minor] Visible Columns' Label should show ellipsis on overflow
2014-08-11 12:28:32 +05:30
Anand Doshi
03eadb74ab
Fixes to microtemplate feature
2014-08-08 11:56:32 +05:30
Rushabh Mehta
873141c1a5
more updates to lists and started sane filters
2014-08-08 11:56:32 +05:30
Rushabh Mehta
18eb4f5015
added listviews for sales, purchase
2014-08-08 11:56:31 +05:30
Rushabh Mehta
b5e768906a
built item grids for sales, purchase, stock
2014-08-08 11:56:31 +05:30
Anand Doshi
f16fefafe3
[print] [fix] empty item grid issue
2014-08-05 13:57:29 +05:30
Anand Doshi
8d16e9fd6d
[print] convert newlines to <br> based on fieldtype for Text/Small Text
2014-08-05 11:39:51 +05:30
Anand Doshi
2b8344e75c
[print] [fix] when item grid is empty
2014-08-05 11:30:37 +05:30
Nabin Hait
4d18b3f96d
Fixes for standard print formats
2014-08-04 17:01:01 +05:30
Anand Doshi
0e93352c8d
[print] Hide Rate, Amount if Print Without Amount in Delivery Note
2014-07-29 22:03:40 +05:30
Anand Doshi
ad1638e6b6
[print] Improvements to Item grid
2014-07-29 14:38:48 +05:30
Anand Doshi
85eefadada
[fix] [print] Print Hide Item Code
2014-07-28 21:17:20 +05:30
Anand Doshi
11586eda4c
[minor] [fix] taxes print
2014-07-28 17:38:08 +05:30
Anand Doshi
a5437cdac1
Fixes for print
2014-07-25 13:02:28 +05:30
Anand Doshi
16deabef82
Format Qty
2014-07-25 13:02:28 +05:30
Rushabh Mehta
85ff3bcd04
updated pos invoice
2014-07-25 13:01:53 +05:30
Rushabh Mehta
5b51cc86a9
many fixes to print
2014-07-25 13:01:53 +05:30
Rushabh Mehta
d82352eacc
item grid, added other printable fields in description
2014-07-25 13:01:53 +05:30
Rushabh Mehta
f84c240d1c
cleanup for print format
2014-07-25 13:01:52 +05:30
Rushabh Mehta
28804bfb62
started sales order print format (new style)
2014-07-25 13:01:52 +05:30
Anand Doshi
11ada53ed5
Fixes related to Website Route system and other misc fixes
2014-06-28 12:13:11 +05:30
Rushabh Mehta
151125e537
fixed for travis
2014-06-18 17:33:01 +05:30
Rushabh Mehta
5df521bad5
updated generators for wip-4.2
2014-06-17 14:21:26 +05:30
Rushabh Mehta
3b7bcf0f4f
make font size smaller for erpnext powered
2014-06-16 14:21:37 +05:30
Anand Doshi
ede8ea52b0
Fixes
2014-06-05 18:06:20 +05:30
Anand Doshi
56f29cbb27
Fixed contact page response. Fixes #1557
2014-05-02 18:17:39 +05:30
Rushabh Mehta
a15164750d
started client side testing using selenium and other related and unrelated fixes
2014-04-30 19:39:13 +05:30
Rushabh Mehta
4ef1835bee
website updates
2014-04-22 16:52:35 +05:30
Rushabh Mehta
3f51705ba4
website cleanups
2014-04-21 22:10:43 +05:30
Rushabh Mehta
f63513ed38
minor fixes to website
2014-04-21 13:43:35 +05:30
Anand Doshi
5d591ebe83
Item, Item Group and Partner Web Page generators moved from Shopping Cart to ERPNext
2014-04-18 16:20:07 +05:30
Rushabh Mehta
793ba6bd37
-webnotes +frappe 💥
2014-02-14 15:47:51 +05:30
Anand Doshi
3decf4dbc5
Fixes related website hierarchy
2014-02-06 12:50:35 +05:30
Rushabh Mehta
347889b233
merge
2014-02-03 14:49:53 +05:30
Rushabh Mehta
fcb6b01e4e
cleaned up email
2014-01-30 15:09:05 +05:30
Akhilesh Darjee
a7ab20ec78
webnotes/erpnext#912 Stay Updated button in website fixed
2014-01-28 15:50:28 +05:30
Anand Doshi
9a4a13cb73
Moved Portal and Shopping Cart to Shopping Cart app, and some minor fixes
2013-12-31 17:38:21 +05:30
Rushabh Mehta
df200f305b
Redesigned templates. Now all templates must be inside templates/pages templates/generators
2013-12-25 15:19:22 +05:30