Rushabh Mehta
|
dfa9db86ba
|
Merge branch 'responsive' of github.com:webnotes/erpnext into responsive
|
2013-06-21 17:53:35 +05:30 |
|
Rushabh Mehta
|
c98ba1bd6c
|
[docs] completed structure
|
2013-06-21 17:51:32 +05:30 |
|
Nabin Hait
|
b0f69cdd88
|
[report][deleted] itemwise last purchase rate
|
2013-06-21 16:57:53 +05:30 |
|
Nabin Hait
|
99fd749334
|
[report][cleanup] pending so items for purchase request
|
2013-06-21 16:56:32 +05:30 |
|
Nabin Hait
|
ab01b5ee5d
|
Merge pull request #518 from saurabh6790/master
[Report]Pending so Items for purchase receipt
|
2013-06-21 04:07:29 -07:00 |
|
Saurabh
|
d35a69b450
|
Merge branch 'master' of https://github.com/webnotes/erpnext
|
2013-06-21 16:35:50 +05:30 |
|
Nabin Hait
|
4555d3bcf4
|
[report][trends]
|
2013-06-21 16:27:34 +05:30 |
|
Saurabh
|
36cb3caaa7
|
[Pending so Items for purchase receipt]
|
2013-06-21 16:25:28 +05:30 |
|
Nabin Hait
|
8086125705
|
Merge pull request #513 from saurabh6790/master
Trends Analyzer's Cleanup Complete
|
2013-06-21 03:37:59 -07:00 |
|
Nabin Hait
|
f78d16cca1
|
[general ledger] group by voucher option
|
2013-06-21 15:13:49 +05:30 |
|
Rushabh Mehta
|
4bbd8e35db
|
[docs] made structure for user docs combining manual and existing help
|
2013-06-21 13:26:04 +05:30 |
|
Akhilesh Darjee
|
64c8e28423
|
[Fixed] Merge conflict fixed
|
2013-06-21 13:09:18 +05:30 |
|
Akhilesh Darjee
|
1ded5c618e
|
[Report]Cleanup of territory target variance, sales person target variance & budget variance reports
|
2013-06-21 12:47:51 +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 |
|
Anand Doshi
|
2ef637b346
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-06-21 12:06:04 +05:30 |
|
Anand Doshi
|
8df49ca772
|
[buying] [fix] on change of currency, set conversion rate = 1 if currency=company currency
|
2013-06-21 12:05:35 +05:30 |
|
Saurabh
|
7989deda20
|
Merge branch 'master' of https://github.com/webnotes/erpnext
|
2013-06-21 10:54:12 +05:30 |
|
Saurabh
|
2b02f1410a
|
Trends Analyzer cleanup finished
|
2013-06-21 10:46:26 +05:30 |
|
Saurabh
|
f8f68c54d9
|
[trends analyzer] cleanup completed
|
2013-06-20 18:52:31 +05:30 |
|
Nabin Hait
|
71253bea0f
|
[fix][report] in item prices
|
2013-06-20 17:32:00 +05:30 |
|
Nabin Hait
|
b7784eac36
|
[fix][report] in item prices
|
2013-06-20 17:19:51 +05:30 |
|
Nabin Hait
|
0930b94264
|
[target report] cleanup
|
2013-06-20 16:35:09 +05:30 |
|
Nabin Hait
|
739a7fdf74
|
Merge pull request #494 from akhileshdarjee/master
[Report] Completed Territory Target Variance & Sales Person Target Variance reports
|
2013-06-20 02:53:31 -07:00 |
|
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 |
|