Anand Doshi
|
70902da4da
|
Merge branch 'master' of github.com:webnotes/erpnext into responsive
Conflicts:
patches/december_2012/deprecate_tds.py
patches/june_2012/reports_list_permission.py
selling/doctype/sales_bom/locale/_messages_doc.json
selling/doctype/sales_bom/locale/ar-doc.json
selling/doctype/sales_bom/locale/de-doc.json
selling/doctype/sales_bom/locale/es-doc.json
selling/doctype/sales_bom/locale/fr-doc.json
selling/doctype/sales_bom/locale/hi-doc.json
selling/doctype/sales_bom/locale/hr-doc.json
selling/doctype/sales_bom/locale/nl-doc.json
selling/doctype/sales_bom/locale/pt-BR-doc.json
selling/doctype/sales_bom/locale/pt-doc.json
selling/doctype/sales_bom/locale/sr-doc.json
selling/doctype/sales_bom/locale/ta-doc.json
selling/doctype/sales_bom/locale/th-doc.json
selling/doctype/sales_bom_item/locale/_messages_doc.json
selling/doctype/sales_bom_item/locale/ar-doc.json
selling/doctype/sales_bom_item/locale/de-doc.json
selling/doctype/sales_bom_item/locale/es-doc.json
selling/doctype/sales_bom_item/locale/fr-doc.json
selling/doctype/sales_bom_item/locale/hi-doc.json
selling/doctype/sales_bom_item/locale/hr-doc.json
selling/doctype/sales_bom_item/locale/nl-doc.json
selling/doctype/sales_bom_item/locale/pt-BR-doc.json
selling/doctype/sales_bom_item/locale/pt-doc.json
selling/doctype/sales_bom_item/locale/sr-doc.json
selling/doctype/sales_bom_item/locale/ta-doc.json
selling/doctype/sales_bom_item/locale/th-doc.json
|
2013-06-26 14:07:29 +05:30 |
|
Anand Doshi
|
b802050cd4
|
[grid report] round currency values
|
2013-06-26 12:05:37 +05:30 |
|
Nabin Hait
|
13f2e4d8d7
|
[fix][transaction.js] syntax error
|
2013-06-25 10:56:39 +05:30 |
|
Rushabh Mehta
|
7925bd7079
|
[merge]
|
2013-06-24 15:47:02 +05:30 |
|
Anand Doshi
|
7edb191661
|
[complete setup] [usability] refresh after success
|
2013-06-24 12:11:15 +05:30 |
|
Anand Doshi
|
61a2f68bc6
|
[webshop] territories in price list, taxes, updates in shopping cart settings
|
2013-06-21 17:55:31 +05:30 |
|
Anand Doshi
|
d52b03a8cc
|
Merge branch 'master' of github.com:webnotes/erpnext into responsive
Conflicts:
accounts/search_criteria/trend_analyzer/trend_analyzer.py
buying/doctype/purchase_common/purchase_common.js
|
2013-06-21 12:22:52 +05:30 |
|
Saurabh
|
f8f68c54d9
|
[trends analyzer] cleanup completed
|
2013-06-20 18:52:31 +05:30 |
|
Anand Doshi
|
c2a352711f
|
[shopping cart] show items, editable qty and show amount for that item
|
2013-06-19 17:19:20 +05:30 |
|
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
|
bf3e54a45b
|
[issues #437] [fix] pulling terms and conditions
|
2013-06-05 14:11:32 +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 |
|