Commit Graph

4437 Commits

Author SHA1 Message Date
Anand Doshi
75c85a0ff5 Merge branch 'master' into edge 2013-01-18 16:01:53 +05:30
Anand Doshi
2dab2862a0 Merge branch 'master' of github.com:webnotes/erpnext 2013-01-18 15:59:33 +05:30
Anand Doshi
9985699247 add to holiday list sorted by idx 2013-01-18 15:57:13 +05:30
Nabin Hait
e5f1152c01 fixes in stock entry 2013-01-18 15:17:40 +05:30
Nabin Hait
dad280ed8e fixes in stock entry 2013-01-18 15:01:30 +05:30
Anand Doshi
35af9ba4e6 Merge branch 'master' into edge 2013-01-18 14:50:25 +05:30
Nabin Hait
a1716543c2 fixes in stock entry 2013-01-18 14:26:43 +05:30
Anand Doshi
a81370f2a3 added description to Price List field. added in latest updates 2013-01-18 13:26:54 +05:30
Anand Doshi
8b940ee451 fixes after merge 2013-01-18 13:07:02 +05:30
Nabin Hait
b9b1e67c7d made c-form submittable 2013-01-18 12:58:21 +05:30
Anand Doshi
2865571cb9 Merge branch 'master' of github.com:webnotes/erpnext into purchase_price_list
Conflicts:
	patches/patch_list.py
2013-01-18 12:32:00 +05:30
Nabin Hait
dc84d410bc fixes in employee master 2013-01-18 11:39:24 +05:30
Nabin Hait
a642ae14eb updated gl mapper for tds entry 2013-01-18 10:49:39 +05:30
Anand Doshi
ef02ddfc40 Merge branch 'master' of github.com:webnotes/erpnext into purchase_price_list
Conflicts:
	accounts/doctype/gl_control/gl_control.py
2013-01-17 20:31:41 +05:30
Anand Doshi
8957bf9e09 print hide price list related fields 2013-01-17 20:29:28 +05:30
Anand Doshi
f8f0c0d089 updates in purchase cycle's price list 2013-01-17 20:20:56 +05:30
Nabin Hait
16546d25e7 gl control cleanup[ 2013-01-17 18:43:54 +05:30
Nabin Hait
274de5462b Merge branch 'master' of github.com:webnotes/erpnext 2013-01-17 18:27:20 +05:30
Nabin Hait
1efaf841c4 payment reconciliation fixes 2013-01-17 18:26:58 +05:30
Rushabh Mehta
8af47e8413 Merge branch 'edge' 2013-01-17 18:24:09 +05:30
Rushabh Mehta
80721518e3 Merge branch 'master' of github.com:webnotes/erpnext 2013-01-17 18:23:07 +05:30
Rushabh Mehta
db7139a649 started fresh install and added country_info 2013-01-17 18:22:22 +05:30
Nabin Hait
a81010a5b3 removed debug mode 2013-01-17 17:25:55 +05:30
Nabin Hait
144ba186d3 fixes in c-form 2013-01-17 17:21:29 +05:30
Nabin Hait
1b4f56c57f fixes in c-form 2013-01-17 17:01:51 +05:30
Anand Doshi
9d9aec1ed4 shifted get_company_currency from transaction base to setup/utils.py 2013-01-17 15:44:57 +05:30
Nabin Hait
80c681294c fixes in website page naming 2013-01-17 13:24:51 +05:30
Nabin Hait
feee252093 fixes in website page_name for item 2013-01-17 13:03:30 +05:30
Nabin Hait
35b6d94c06 automatic purchase request from production planning tool 2013-01-17 12:31:09 +05:30
Nabin Hait
64d7c4b2d5 fixes in get_incoming_rate 2013-01-17 12:22:59 +05:30
Anand Doshi
03fa78597d Merge branch 'master' into purchase_price_list 2013-01-17 10:58:41 +05:30
Rushabh Mehta
6f9915cd17 install from txt files, part 1 2013-01-16 17:48:17 +05:30
Nabin Hait
6b1f21d1bb fixes in get_incoming_rate 2013-01-16 17:17:17 +05:30
Nabin Hait
d11e9d6619 removed time_to_ampm and time_to_hhmm function 2013-01-16 16:51:58 +05:30
Nabin Hait
831207ff54 incoming rate for sales return as per delivery note outgoing rate 2013-01-16 14:15:48 +05:30
Nabin Hait
ec65665151 Merge branch 'master' of github.com:webnotes/erpnext 2013-01-16 13:04:44 +05:30
Nabin Hait
30ab3b40a3 fixes in tree type documents 2013-01-16 13:03:33 +05:30
Rushabh Mehta
23ac436933 add job applicant, sales and jobs email settings to module help 2013-01-16 12:54:24 +05:30
Rushabh Mehta
8f3916dd54 add job applicant, sales and jobs email settings to module help 2013-01-16 12:50:55 +05:30
Rushabh Mehta
1a0b27ee7b added automatic lead creation for sales email id 2013-01-16 12:36:07 +05:30
Rushabh Mehta
8d3fe553e5 added automatic lead creation for sales email id 2013-01-16 12:19:28 +05:30
Rushabh Mehta
6666ebb94f Merge branch 'master' of github.com:webnotes/erpnext 2013-01-16 11:35:52 +05:30
Rushabh Mehta
83f5181987 added automatic lead creation for sales email id 2013-01-16 11:35:09 +05:30
Rushabh Mehta
2e5db35856 added automatic lead creation for sales email id 2013-01-16 11:34:26 +05:30
Nabin Hait
44ffd4360c reorder level and qty added in stock level report 2013-01-16 11:16:21 +05:30
Nabin Hait
c57c0d4e1d item name and description added in stock ageing report 2013-01-16 10:31:55 +05:30
Rushabh Mehta
9942987c9c Merge branch 'master' of github.com:webnotes/erpnext 2013-01-16 07:48:45 +05:30
Rushabh Mehta
c0f2e6dd23 timesheet fix 2013-01-16 07:47:33 +05:30
Anand Doshi
59929db5c8 Merge branch 'master' of github.com:webnotes/erpnext 2013-01-15 18:55:00 +05:30
Anand Doshi
8ec06aed5c only allow upto 100 rows in stock reco 2013-01-15 18:54:16 +05:30