Commit Graph

5751 Commits

Author SHA1 Message Date
Nabin Hait
a477d41843 [aii] some fixes 2013-04-08 12:39:11 +05:30
Anand Doshi
30bd65a81b [patches] [fix] reload docperm 2013-04-07 10:19:18 +05:30
Nabin Hait
95d30d3acc Merge branch 'master' of github.com:webnotes/erpnext 2013-04-06 08:23:27 +05:30
Nabin Hait
b72af39331 fixes in packing slip 2013-04-06 08:20:35 +05:30
Nabin Hait
5d4758b3e6 [validation] fixes in item 2013-04-06 08:20:21 +05:30
Anand Doshi
bfa7a86883 Merge branch 'master' of github.com:webnotes/erpnext 2013-04-05 15:09:53 +05:30
Anand Doshi
0f0bc3892d [packing slip] [fix] removed console log 2013-04-05 15:08:08 +05:30
Nabin Hait
38e6326677 [Item][Validation] if sle exists, soem fields can not be changed 2013-04-05 14:47:42 +05:30
Nabin Hait
86a8d01ce9 [column addition][daily time log summary] time log id, activity type and task subject column added 2013-04-05 12:12:39 +05:30
Nabin Hait
93b4e4d90c [JV] added letter head field in jv 2013-04-05 11:11:14 +05:30
Nabin Hait
1a738f72f4 match condition added in daily time log summary report 2013-04-04 16:34:51 +05:30
Nabin Hait
7da387100d Merge branch 'master' of github.com:webnotes/erpnext 2013-04-04 15:31:49 +05:30
Nabin Hait
a8d8abc670 small fixes in item 2013-04-04 15:31:03 +05:30
Anand Doshi
e60f4560d1 [supplier] [fix] on_trash sql syntax fix 2013-04-04 14:00:56 +05:30
Anand Doshi
6c5a37167a Merge branch 'master' into edge 2013-04-04 13:59:16 +05:30
Anand Doshi
4db3b33dd6 [customer] [fix] on_trash sql syntax 2013-04-04 13:57:35 +05:30
Rushabh Mehta
cfa663e337 [message] [fix] rewire to core 2013-04-04 10:02:08 +05:30
Rushabh Mehta
9c7830b9cb Merge branch 'edge' of github.com:webnotes/erpnext into edge 2013-04-03 16:39:33 +05:30
Rushabh Mehta
d8cf1d74ba Merge branch 'master' into edge 2013-04-03 16:39:02 +05:30
Rushabh Mehta
cc86ec8642 merge 2013-04-03 16:38:20 +05:30
Rushabh Mehta
3023a8fa9b [website] [cleanup] separated website generation in framework and erpnext 2013-04-03 16:34:23 +05:30
Nabin Hait
9274f2772c [New Script Report] added report daily time log summary 2013-04-03 16:09:50 +05:30
Nabin Hait
dd8e964a17 [New Script Report] added report daily time log summary 2013-04-03 15:51:55 +05:30
Nabin Hait
7dfa1d935c [New Script Report] added report daily time log summary 2013-04-03 15:48:57 +05:30
Nabin Hait
5c1d3c5a8b [New Script Report] added report daily time log summary 2013-04-03 15:44:19 +05:30
Rushabh Mehta
27c4079ff9 [framework] [cleanup] desktop, todo, messages, modules setup moved to framework 2013-04-03 15:21:44 +05:30
Rushabh Mehta
85adc07b5a Merge branch 'master' of github.com:webnotes/erpnext 2013-04-03 14:41:59 +05:30
Anand Doshi
56bac218f5 Merge branch 'master' into edge 2013-04-03 13:46:10 +05:30
Anand Doshi
0b9ec8cbc1 [auto inventory accounting] [fix] if non stock item, dont create gl entry in delivery note and pos sales invoice 2013-04-03 13:45:28 +05:30
Anand Doshi
807a4ddb52 Merge branch 'master' into edge 2013-04-03 13:33:13 +05:30
Anand Doshi
458fda8ca5 [quotation] [fix] letter head 2013-04-03 13:30:17 +05:30
Rushabh Mehta
b596bcbccf [desktop] [cleanup] moved to framework 2013-04-03 11:41:01 +05:30
Rushabh Mehta
e726448268 Merge branch 'edge' of github.com:webnotes/erpnext into edge 2013-04-03 10:42:37 +05:30
Rushabh Mehta
5bbe063222 Merge branch 'master' into edge 2013-04-03 10:42:12 +05:30
Rushabh Mehta
c5ddb85d39 [patch] [fix] added reload print format 2013-04-03 10:06:54 +05:30
Rushabh Mehta
c0ad4a2229 [patch] [fix] added reload print format 2013-04-03 09:58:04 +05:30
Rushabh Mehta
ad16279efd [quotation] [fix
] broken links
2013-04-03 09:53:24 +05:30
Nabin Hait
596ff91b3a [quotation][improvement] when made from lead 2013-04-02 18:24:06 +05:30
Nabin Hait
8f97d2dab0 [quotation][improvement] when made from lead 2013-04-02 18:14:31 +05:30
Nabin Hait
1e3fc88940 [quotation][improvement] when made from lead 2013-04-02 18:13:20 +05:30
Nabin Hait
ff3106c7d4 [stock reco] improved validation message 2013-04-02 17:44:50 +05:30
Anand Doshi
05a819daf1 Merge branch 'edge' of github.com:webnotes/erpnext into edge
Conflicts:
	patches/march_2013/p07_update_valuation_rate.py
2013-04-02 16:38:09 +05:30
Anand Doshi
234b8e3de3 Merge branch 'master' into edge
Conflicts:
	patches/march_2013/p07_update_valuation_rate.py
	patches/patch_list.py
2013-04-02 16:06:43 +05:30
Nabin Hait
996e469562 added country Aruba and currency AWG 2013-04-02 14:26:26 +05:30
Rushabh Mehta
5c12765313 [merge] 2013-04-02 10:51:11 +05:30
Rushabh Mehta
1373edab92 Merge branch 'master' into edge 2013-04-02 10:48:33 +05:30
Rushabh Mehta
9db1a68d89 [website] [cleanup] moved website generic utils to framework 2013-04-02 10:41:37 +05:30
Anand Doshi
7692352390 Merge branch 'master' of github.com:webnotes/erpnext 2013-04-01 18:53:32 +05:30
Anand Doshi
4b6052b57b [stock] [fix] serial nos scrub method 2013-04-01 18:52:47 +05:30
Nabin Hait
1a5d97e6b6 fixes in stock ledger 2013-04-01 18:46:42 +05:30