Commit Graph

6200 Commits

Author SHA1 Message Date
Nabin Hait
13f2e4d8d7 [fix][transaction.js] syntax error 2013-06-25 10:56:39 +05:30
Akhilesh Darjee
a19014a846 Moved Sales BOM & Sales BOM Item to Selling module, completed 'Available Stock for packing Items' report 2013-06-24 19:05:16 +05:30
Rushabh Mehta
7a93d5de30 [bug fixes] [global defaults] [cleanup] 2013-06-24 18:18:46 +05:30
Nabin Hait
3e8eca35a2 [report][fix] stock balance 2013-06-24 17:18:24 +05:30
Rushabh Mehta
7925bd7079 [merge] 2013-06-24 15:47:02 +05:30
Rushabh Mehta
847cfe2b07 [docs] [setup] cleanup 2013-06-24 15:43:18 +05:30
Rushabh Mehta
7fba9b31d9 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-06-24 15:00:25 +05:30
Rushabh Mehta
7b69f5b425 [docs] upgraded font-awesome and added some icons 2013-06-24 14:59:44 +05:30
Nabin Hait
82366d3bb8 [report] deleted old reports based on search_criteria 2013-06-24 14:31:56 +05:30
Nabin Hait
8b96ba1da6 [general ledger] group by voucher 2013-06-24 13:54:16 +05:30
Nabin Hait
55d0ec36ac Merge branch 'master' of github.com:webnotes/erpnext 2013-06-24 12:21:18 +05:30
Nabin Hait
4cd977a2a9 [fixes] pull previous doc details 2013-06-24 12:20:35 +05:30
Anand Doshi
df2b95b892 Merge branch 'master' of github.com:webnotes/erpnext 2013-06-24 12:11:50 +05:30
Anand Doshi
7edb191661 [complete setup] [usability] refresh after success 2013-06-24 12:11:15 +05:30
Nabin Hait
65f038c926 [fixes] pull previous doc details 2013-06-24 11:59:37 +05:30
Anand Doshi
79470f3ed0 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-06-21 17:57:31 +05:30
Rushabh Mehta
a8f9aa0254 [docs] completed structure 2013-06-21 17:55:43 +05:30
Anand Doshi
61a2f68bc6 [webshop] territories in price list, taxes, updates in shopping cart settings 2013-06-21 17:55:31 +05:30
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