Commit Graph

215 Commits

Author SHA1 Message Date
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