Commit Graph

484 Commits

Author SHA1 Message Date
Anand Doshi
3dceb8438e [cart] add to cart, update cart 2013-06-19 14:57:14 +05:30
Rushabh Mehta
4736c35662 [commit] unified notifications 2013-06-18 15:46:32 +05:30
Rushabh Mehta
dd790a57ba [keyboard shortcuts] keyboard shortcuts using jquery hotkeys instead of mousetrap 2013-06-17 12:55:54 +05:30
Rushabh Mehta
64c2764b56 [translations/build] deleted translation files (to be built on demand) 2013-06-17 11:56:41 +05:30
Anand Doshi
abc100302c [cart] create quotation on checkout 2013-06-14 17:44:03 +05:30
Saurabh
1848b71a0a [Reports][Sales and Purchase Trends][Completed] 2013-06-14 15:03:45 +05:30
Saurabh
0326f5414e [reports][purchase and sales trends] 2013-06-13 19:17:56 +05:30
Anand Doshi
ab69029d4e [shopping cart] [start] 2013-06-13 11:21:35 +05:30
Anand Doshi
060d9248d3 [fixes] buying/selling price lists, communication and website settings 2013-06-12 17:40:36 +05:30
Rushabh Mehta
3c8cffb69b [cleanup] removed Shipping Address, Communication Log 2013-06-11 14:23:59 +05:30
Rushabh Mehta
4cea6af519 [removed footer] 2013-06-07 15:39:45 +05:30
Anand Doshi
d3b41b965f [favicon] [update] 2013-06-07 12:23:16 +05:30
Anand Doshi
2c376a4968 [toolbar logo] [fix] 2013-06-06 19:10:52 +05:30
Anand Doshi
1fe3bc575b [logo] update erpnext logo in favicon and toolbar 2013-06-06 18:55:20 +05:30
Anand Doshi
68d0dbabe9 [splash] [monochrome] 2013-06-06 18:04:03 +05:30
Anand Doshi
bf3e54a45b [issues #437] [fix] pulling terms and conditions 2013-06-05 14:11:32 +05:30
Anand Doshi
515646343e [splash] position erpnext 2013-06-05 12:36:50 +05:30
Anand Doshi
713c18336f [splash] show erpnext 2013-06-05 12:25:28 +05:30
Anand Doshi
d379cb7fe9 [splash] embed svg of splash 2013-06-05 12:12:56 +05:30
Anand Doshi
1510de3ecc [splash] changed back go background image 2013-06-05 11:50:07 +05:30
Anand Doshi
9c8ed8b71f [splash] renamed file 2013-06-05 11:32:11 +05:30
Rushabh Mehta
dc18529a7f [splash] added erpnext-2013 icon 2013-06-04 15:43:19 +05:30
Anand Doshi
53b7342b09 [itemwise tax details] store tax rate as well as tax amount for that item tax combination 2013-05-31 11:50:01 +05:30
Rushabh Mehta
506379da7e [toolbars] removed view / module menus 2013-05-29 11:23:45 +05:30
Anand Doshi
d0b007235d [buying/selling] fixes after responsive merge 2013-05-28 18:54:48 +05:30
Anand Doshi
5d74c82c06 Merge branch 'webshop' of github.com:webnotes/erpnext into responsive
Conflicts:
	selling/doctype/quotation/quotation.js
2013-05-28 17:46:50 +05:30
Anand Doshi
923d41dfd2 [selling/buying] [fixes] fixes in client side code, server side code, print formats 2013-05-28 17:23:36 +05:30
Anand Doshi
fc77718a3d [selling/buying] [fixes] updated js files of various doctypes related to selling/g/buying 2013-05-27 19:29:07 +05:30
Anand Doshi
3543f30046 [calculations] [client/server] first cut 2013-05-24 19:25:01 +05:30
Rushabh Mehta
d9384c0583 [listview] fixed alignment of tags and fixed progress bars 2013-05-24 17:26:27 +05:30
Rushabh Mehta
9c5f4fe165 [knowledge base] removed and added patch to move to notes 2013-05-24 16:33:10 +05:30
Rushabh Mehta
126f2c62f2 [merge] merge with master 2013-05-24 16:09:13 +05:30
Anand Doshi
5be11b44ac Merge branch 'edge' of github.com:webnotes/erpnext into webshop
Conflicts:
	controllers/buying_controller.py
2013-05-21 19:40:09 +05:30
Anand Doshi
6b2aa7ed0d [country info] [fix] added additional timezones + fixed fresh install 2013-05-20 13:43:50 +05:30
Anand Doshi
39384d36ea [precision] server side cleanup and client side precision method 2013-05-11 19:39:53 +05:30
Anand Doshi
9e1d120186 [time log] [query] search task based on subject 2013-05-09 19:34:34 +05:30
Rushabh Mehta
cc32b65b66 [toolbars] [design] commonified into common toolbar 2013-04-19 13:01:32 +05:30
Rushabh Mehta
d6c8235fb5 [style] [upgrade] moved to bootstrap 3 2013-04-18 17:43:21 +05:30
Rushabh Mehta
651ce05fcc [merge master
]
2013-04-18 10:37:16 +05:30
Rushabh Mehta
f61b680576 [style] moving to 100% bootstrap css, started form / appframe headers 2013-04-16 15:45:05 +05:30
Anand Doshi
60666a278f [Leave Application] [fixes] Validate Leave Approver based on a list specified in Employee 2013-04-12 20:19:53 +05:30
Nabin Hait
6ce8af3b67 item search by item_name by default 2013-04-11 16:57:01 +05:30
Rushabh Mehta
27c4079ff9 [framework] [cleanup] desktop, todo, messages, modules setup moved to framework 2013-04-03 15:21:44 +05:30
Nabin Hait
6dcee5a1f8 fixes in website utils 2013-03-26 10:45:29 +05:30
Anand Doshi
ceba917e86 Merge branch 'master' into edge 2013-03-22 14:16:53 +05:30
Anand Doshi
1b08d88bb4 fixes in stock grid report - trim spaces in serial no 2013-03-22 13:29:06 +05:30
Rushabh Mehta
da512ba8c9 website: made order and ticket listing 2013-03-22 12:45:44 +05:30
Rushabh Mehta
bed19ac4d3 added website pages for orders, tickets and added sales invoice print format 2013-03-21 17:12:25 +05:30
Rushabh Mehta
a75efa76f9 added my account 2013-03-19 17:59:49 +05:30
Rushabh Mehta
1755b36ba3 fix to login 2013-03-19 14:35:20 +05:30
Rushabh Mehta
a54cb247c4 webshop login, logout 2013-03-19 11:12:22 +05:30
Rushabh Mehta
7bec21cfe7 feature setup: fix for more info 2013-03-14 10:09:13 +05:30
Rushabh Mehta
b8bf40f789 feature setup: fix for more info 2013-03-14 10:07:59 +05:30
Anand Doshi
df6ff1385f fixes in warehouse validation 2013-03-11 19:44:52 +05:30
Anand Doshi
88ac485541 minor fixes in utils, purchase common and task 2013-03-11 14:57:45 +05:30
Anand Doshi
d5aeb21dd9 fix in get_value_diff of stock grid report: case for serialized items 2013-03-08 12:46:48 +05:30
billyfordson
9b352309c6 Adding German translation 2013-02-27 17:36:23 +01:00
Anand Doshi
805fdf313c shifted item name and description fields to the left of stock reports 2013-02-26 12:23:39 +05:30
Rushabh Mehta
e4eb89b02a added new language and filters in query reports 2013-02-25 13:00:16 +05:30
Rushabh Mehta
0ad995460c fixed tags in kb 2013-02-22 10:34:22 +05:30
Anand Doshi
5acd08205e fix in website pages - should be of _type POST 2013-02-21 20:06:57 +05:30
Rushabh Mehta
f41dd39286 added language 2013-02-21 16:57:54 +05:30
Anand Doshi
59d8a76e60 Merge branch 'master' of github.com:webnotes/erpnext into edge
Conflicts:
	hr/doctype/leave_application/locale/_messages_py.json
	hr/doctype/leave_block_list/locale/_messages_doc.json
	public/js/locale/_messages_js.json
	setup/doctype/email_digest/locale/_messages_doc.json
	setup/doctype/global_defaults/global_defaults.txt
2013-02-21 11:09:43 +05:30
Rushabh Mehta
87e4801946 website settings social icons 2013-02-20 15:02:21 +05:30
Rushabh Mehta
c06ce25470 updated translations 2013-02-18 14:24:05 +05:30
Anand Doshi
236cc173ad rename Purchase Request to Material Request 2013-02-18 13:49:15 +05:30
Anand Doshi
03741698e4 added icons in modules drop down menu 2013-02-16 15:05:37 +05:30
Rushabh Mehta
1a9f0848b3 added calendar view 2013-02-15 12:09:05 +05:30
Rushabh Mehta
8fbfbfbb78 number format fix 2013-02-13 22:02:09 +05:30
Rushabh Mehta
af222dc6b2 updated language 2013-02-11 11:49:18 +05:30
Rushabh Mehta
60135df6fd updated language 2013-02-11 11:44:12 +05:30
Rushabh Mehta
8c713e7f0c added holidy_block_list_allow 2013-02-06 16:10:48 +05:30
Rushabh Mehta
eadedb567d added bookmarks 2013-02-06 13:15:13 +05:30
Rushabh Mehta
fdc629be4d get post fix 2013-01-31 22:05:39 +05:30
Rushabh Mehta
028abd2d08 bugfix in session update and separated GET and POST queries 2013-01-31 11:20:10 +05:30
Anand Doshi
f83f151ac3 fix in get_currency -- using :Company 2013-01-30 00:42:41 +05:30
Nabin Hait
c0ef8de6f7 Merge branch 'master' of github.com:webnotes/erpnext 2013-01-28 16:56:51 +05:30
Nabin Hait
23decac683 fixes in features setup 2013-01-28 16:56:07 +05:30
Rushabh Mehta
cda5d42a65 updated languages 2013-01-28 14:21:40 +05:30
Rushabh Mehta
8e3affbf70 added nl 2013-01-25 11:58:18 +05:30
Rushabh Mehta
4e01011669 added language to pages 2013-01-24 19:31:55 +05:30
Rushabh Mehta
317177afd2 updated languages 2013-01-24 18:18:39 +05:30
Rushabh Mehta
ad14943c3f added arabic 2013-01-24 17:37:43 +05:30
Rushabh Mehta
4c17718b4c added portuguese 2013-01-24 16:31:23 +05:30
Rushabh Mehta
6c8cef71a0 fixes to desktop 2013-01-24 16:30:50 +05:30
Rushabh Mehta
908d09d058 added spanish 2013-01-24 15:55:30 +05:30
Rushabh Mehta
27254d9440 added spanish 2013-01-24 15:55:08 +05:30
Rushabh Mehta
9c77a25cd3 merge 2013-01-23 19:44:35 +05:30
Rushabh Mehta
597d470e63 added format_currency and added options to all currency fields 2013-01-23 19:39:51 +05:30
Nabin Hait
92a0218091 added uom column in stock reports 2013-01-22 17:52:43 +05:30
Nabin Hait
319fb92d18 consider global val method if not specified in item master and apply zero filters 2013-01-22 14:40:20 +05:30
Nabin Hait
d797ffbd37 show analytics value based valuation method defined in item master 2013-01-22 14:02:55 +05:30
Anand Doshi
ef02ddfc40 Merge branch 'master' of github.com:webnotes/erpnext into purchase_price_list
Conflicts:
	accounts/doctype/gl_control/gl_control.py
2013-01-17 20:31:41 +05:30
Rushabh Mehta
db7139a649 started fresh install and added country_info 2013-01-17 18:22:22 +05:30
Anand Doshi
03fa78597d Merge branch 'master' into purchase_price_list 2013-01-17 10:58:41 +05:30
Rushabh Mehta
8d3fe553e5 added automatic lead creation for sales email id 2013-01-16 12:19:28 +05:30
Rushabh Mehta
2e5db35856 added automatic lead creation for sales email id 2013-01-16 11:34:26 +05:30
Anand Doshi
756dca719b refactored purchase cycle's get item details and update item details functions and started with purchase price list 2013-01-15 18:39:21 +05:30
Rushabh Mehta
3c5161113e merge 2013-01-14 16:11:03 +05:30
Rushabh Mehta
be9ef4ac89 added code to update timestamps in Task, Customer Issue and Support Ticket 2013-01-14 15:48:00 +05:30