Akhilesh Darjee
|
e6974d10c2
|
Fixed conflict merge
|
2013-06-20 15:22:04 +05:30 |
|
Saurabh
|
af5df66847
|
to avoid merge conflict
|
2013-06-20 15:00:53 +05:30 |
|
Nabin Hait
|
b8ebbcafa9
|
[trend analyzer] cleanup
|
2013-06-20 13:03:10 +05:30 |
|
Anand Doshi
|
cd6dcacc6e
|
[shopping cart] show ok icon in update button
|
2013-06-20 12:39:25 +05:30 |
|
Nabin Hait
|
616657d4a2
|
Merge pull request #495 from saurabh6790/master
[erpnext][reports][Trend Analyzer]
|
2013-06-19 22:18:44 -07:00 |
|
Akhilesh Darjee
|
92571c6929
|
[Report] Completed Budget variance Report and corrections in Territory Target Varinace & Sales Person Target Variance Report
|
2013-06-19 18:15:20 +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 |
|
Nabin Hait
|
bc2d9e89a7
|
[validation][buying] stock and non-stock items are now allowed in same document
|
2013-06-19 14:58:01 +05:30 |
|
Anand Doshi
|
3dceb8438e
|
[cart] add to cart, update cart
|
2013-06-19 14:57:14 +05:30 |
|
Saurabh
|
d4f2199269
|
[Reports][Trend Analyzer completed]
|
2013-06-19 14:44:44 +05:30 |
|
Nabin Hait
|
21f7623d2e
|
[fix][report] in item prices
|
2013-06-19 14:13:01 +05:30 |
|
Saurabh
|
bfe9fe7c3b
|
[Report][Spliting of Trend Analyzer Completed]
|
2013-06-19 12:41:28 +05:30 |
|
Saurabh
|
5b6d03e479
|
[Report][Trend Analyzer]
|
2013-06-19 12:34:22 +05:30 |
|
Akhilesh Darjee
|
4ddc2618e8
|
[Report] Completed Sales Person Target Variance (Item-Group wise)
|
2013-06-18 18:46:02 +05:30 |
|
Anand Doshi
|
60035c9830
|
[blog category] [permission] allow blogger to read blog category
|
2013-06-18 18:38:28 +05:30 |
|
Anand Doshi
|
ca628d9f54
|
Merge branch 'master' of github.com:webnotes/erpnext into responsive
Conflicts:
selling/doctype/sales_order/sales_order.txt
|
2013-06-18 18:30:41 +05:30 |
|
Anand Doshi
|
3c6c3cf5ee
|
[sales order] [shipping address] allow to edit shipping address
|
2013-06-18 18:26:30 +05:30 |
|
Rushabh Mehta
|
68b9b1f11d
|
Merge branch 'responsive' of github.com:webnotes/erpnext into responsive
|
2013-06-18 15:47:24 +05:30 |
|
Rushabh Mehta
|
4736c35662
|
[commit] unified notifications
|
2013-06-18 15:46:32 +05:30 |
|
Saurabh
|
24208f5c4a
|
[Report][Item-Wise Purchase Receipt]
|
2013-06-18 15:45:08 +05:30 |
|
Akhilesh Darjee
|
2967581102
|
Merge branch 'master' of https://github.com/webnotes/erpnext
|
2013-06-17 19:27:30 +05:30 |
|
Akhilesh Darjee
|
f841a7bc14
|
Completed territory_target_variance(item_group_wise) report
|
2013-06-17 19:25:48 +05:30 |
|
Anand Doshi
|
e81321219e
|
[webshop] [cart] add to cart, remove_from_cart, update qty, checkout methods
|
2013-06-17 15:42:38 +05:30 |
|
Anand Doshi
|
aa0ccf8223
|
Merge branch 'responsive' of github.com:webnotes/erpnext into responsive
|
2013-06-17 13:46:55 +05:30 |
|
Rushabh Mehta
|
dd790a57ba
|
[keyboard shortcuts] keyboard shortcuts using jquery hotkeys instead of mousetrap
|
2013-06-17 12:55:54 +05:30 |
|
Anand Doshi
|
b5fd788131
|
Merge branch 'master' of github.com:webnotes/erpnext into responsive
Conflicts:
projects/doctype/project/project.py
utilities/transaction_base.py
|
2013-06-17 12:55:05 +05:30 |
|
Anand Doshi
|
11d311376e
|
[event] [fix] commonified delete_events method, which is executed before auto-creation of events. Fixed delete issue
|
2013-06-17 12:51:36 +05:30 |
|
Rushabh Mehta
|
8155ff23ad
|
[build/translate] now translate will work on demand
|
2013-06-17 12:09:53 +05:30 |
|
Anand Doshi
|
1e820f352e
|
Merge branch 'master' of github.com:webnotes/erpnext into responsive
Conflicts:
buying/doctype/purchase_common/purchase_common.py
|
2013-06-17 12:02:04 +05:30 |
|
Anand Doshi
|
ad6180ef6d
|
[material request on re-order level] [fixes] if error occurs, send email to the System Manager
|
2013-06-17 11:57:04 +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
|
a7ffd0c81d
|
Merge branch 'responsive' of github.com:webnotes/erpnext into responsive
|
2013-06-14 17:45:01 +05:30 |
|
Anand Doshi
|
abc100302c
|
[cart] create quotation on checkout
|
2013-06-14 17:44:03 +05:30 |
|
Saurabh
|
feb8669cbd
|
[Reports][Validation changes in Purchase and Sales trends]
|
2013-06-14 17:40:48 +05:30 |
|
Saurabh
|
606d8383ff
|
Merge branch 'master' of https://github.com/webnotes/erpnext
|
2013-06-14 16:48:41 +05:30 |
|
Saurabh
|
1848b71a0a
|
[Reports][Sales and Purchase Trends][Completed]
|
2013-06-14 15:03:45 +05:30 |
|
Rushabh Mehta
|
466298b6e7
|
[fix] fixes in purchase common
|
2013-06-14 14:27:53 +05:30 |
|
Rushabh Mehta
|
37982a6a1f
|
[contact/address] fixed auto setting closes #475 (erpnext)
|
2013-06-14 13:29:20 +05:30 |
|
Rushabh Mehta
|
1475e4d295
|
Merge branch 'responsive' of github.com:webnotes/erpnext into responsive
|
2013-06-14 11:33:44 +05:30 |
|
Rushabh Mehta
|
798262d09b
|
[docs] [fixes] fixes to link selection, attachment exception, pageview
|
2013-06-14 11:33:01 +05:30 |
|
Saurabh
|
0326f5414e
|
[reports][purchase and sales trends]
|
2013-06-13 19:17:56 +05:30 |
|
Anand Doshi
|
32f9f366e5
|
[progress bar] [fix]
|
2013-06-13 16:11:03 +05:30 |
|
Anand Doshi
|
3c5b1a5460
|
[partner listing] clear partners page on save
|
2013-06-13 15:38:16 +05:30 |
|
Anand Doshi
|
1e92aeddb4
|
[website] set max width to 728px and show email icon in partner's email
|
2013-06-13 15:25:38 +05:30 |
|
Anand Doshi
|
8e2ea5fed6
|
[website] [partners listing] first cut
|
2013-06-13 14:40:57 +05:30 |
|
Anand Doshi
|
48519ef8ae
|
Merge branch 'responsive' of github.com:webnotes/erpnext into responsive
|
2013-06-13 11:22:19 +05:30 |
|
Anand Doshi
|
ab69029d4e
|
[shopping cart] [start]
|
2013-06-13 11:21:35 +05:30 |
|
Rushabh Mehta
|
3403805684
|
Merge branch 'responsive' of github.com:webnotes/erpnext into responsive
|
2013-06-12 18:20:44 +05:30 |
|
Rushabh Mehta
|
9c2159e19c
|
[docs] updates
|
2013-06-12 18:20:08 +05:30 |
|
Saurabh
|
f9966f44cd
|
[Report][Quotation Trend Complete]
|
2013-06-12 17:55:19 +05:30 |
|