Commit Graph

969 Commits

Author SHA1 Message Date
Anand Doshi
17c1a7d9ed Merge branch 'master' of github.com:webnotes/erpnext into edigest 2011-12-08 19:36:54 +05:30
Anand Doshi
fb3c3fb064 Merge branch 'master' of github.com:anandpdoshi/erpnext into edigest 2011-12-08 19:36:29 +05:30
Anand Doshi
633edbef46 Email Digest - ready to be deployed 2011-12-08 19:34:01 +05:30
Nijil Y
38821f6104 txt order update 2011-12-08 18:32:58 +05:30
Nabin Hait
7e44f9789b Patch for c-form 2011-12-08 18:07:20 +05:30
Nabin Hait
2577e2ae27 Patch for c-form 2011-12-08 18:06:53 +05:30
Nabin Hait
fd20340576 Introduced C-form for Indian customer 2011-12-08 17:49:40 +05:30
Nijil Y
edf8bc2a3e Discount in purchase cycle Merge branch 'master' of git://github.com/nijil/erpnext
Conflicts:
	erpnext/accounts/doctype/pv_detail/pv_detail.txt
	erpnext/buying/doctype/po_detail/po_detail.txt
	erpnext/stock/doctype/purchase_receipt_detail/purchase_receipt_detail.txt
2011-12-08 17:29:24 +05:30
Nijil Y
add0c85648 Discount in purchase cycle 2011-12-08 16:53:12 +05:30
Nijil Y
d8e5bed9e5 Discount in purchase cycle 2011-12-08 16:09:18 +05:30
Nijil Y
4499851ceb checking.. 2011-12-08 14:14:11 +05:30
Nijil Y
630256f65b purchase recipt detail 2011-12-08 13:01:43 +05:30
Nabin Hait
cde8bec0a6 Merge branch 'master' of github.com:webnotes/erpnext 2011-12-06 19:05:14 +05:30
Nabin Hait
38d24534d7 Recurring invoice checkbox added in features setup 2011-12-06 19:04:21 +05:30
Anand Doshi
590448aaef Changes in email digest 2011-12-06 18:51:14 +05:30
Nabin Hait
b28d6dc617 Repost stock patch 2011-12-06 15:11:14 +05:30
Nabin Hait
ea5f5ca57d Recurring invoices patch 2011-12-06 15:10:48 +05:30
Nabin Hait
a4fdc84fda Introduced recurring invoices 2011-12-06 15:04:47 +05:30
Anand Doshi
47a30c0991 Merge pull request #154 from anandpdoshi/master
Changes due to modified dom.js in framework
2011-12-05 21:18:52 -08:00
Anand Doshi
2532391bcb Version changes due to change in dom.js 2011-12-06 10:43:15 +05:30
Anand Doshi
41e542ce4d Email Digest changes 2011-12-06 10:41:54 +05:30
Anand Doshi
8e4690df65 Merge pull request #153 from anandpdoshi/master
Bug Fix: "Customer details not getting autofilled on customer selection"
2011-12-04 23:04:08 -08:00
Anand Doshi
3f040a8f9e Resolved bug Project creation:
Customer details not getting autofilled on customer selection
2011-12-05 12:17:51 +05:30
Anand Doshi
adf2f777d3 Removed print format option. Instead show html code. 2011-12-05 12:16:31 +05:30
Anand Doshi
393f5e6078 Queries to get new records in a particular doctype 2011-12-02 19:20:10 +05:30
Anand Doshi
f10ad98ebf Refactored queries to be more clean 2011-12-02 17:53:08 +05:30
Anand Doshi
7057cbf9e5 Started with email digest 2011-12-02 15:15:38 +05:30
Anand Doshi
e0395d9e03 Merge pull request #152 from anandpdoshi/master
Changed error message on update security change password dialog
2011-11-30 01:56:27 -08:00
Anand Doshi
a27ae827c9 Merge branch 'master' of github.com:webnotes/erpnext 2011-11-30 15:25:19 +05:30
Anand Doshi
ed825062f1 Hide programming error messages from user on update_security 2011-11-30 15:23:37 +05:30
Nabin Hait
8fc84198cf repost sle for all serialized item 2011-11-30 12:11:36 +05:30
Nabin Hait
142af06d19 update serial no incoming rate through landing cost wizard 2011-11-25 16:37:21 +05:30
Nabin Hait
3aed35da0a Merge branch 'master' of github.com:webnotes/erpnext 2011-11-25 14:43:39 +05:30
Nabin Hait
28b793c88a incoming rate in serial no should be valuation rate instead of pur rate 2011-11-25 14:43:11 +05:30
Anand Doshi
2dd7863b1d Merge pull request #150 from anandpdoshi/master
Modified Patch to create a DocType Label entry for DocLayer
2011-11-24 21:57:31 -08:00
Anand Doshi
8c10de6c1a Modified patch to create a DocType Label record for DocLayer 2011-11-25 11:25:39 +05:30
Nijil
4e54d7a434 pvdetail and patch 2011-11-24 16:18:42 +05:30
Nijil
1530b93a6e purchase recipt 2011-11-24 15:53:56 +05:30
Nijil
2f82c29348 .. 2011-11-24 15:18:17 +05:30
Nijil
ba40bc93fe payable voucher txt 2011-11-24 15:14:09 +05:30
Anand Doshi
d7e066bb1f Merge pull request #149 from anandpdoshi/master
Changed sidebar.js
2011-11-24 01:41:23 -08:00
Nijil
c37dad26d9 txt files 2011-11-24 15:07:54 +05:30
Anand Doshi
82573a1c44 Merge branch 'master' of github.com:webnotes/erpnext 2011-11-24 15:05:27 +05:30
Nabin Hait
e92066fa80 modified fld prop in gl entry and index patch 2011-11-24 15:04:47 +05:30
Anand Doshi
6084bf32dc Changes in sidebar.js to hide email and print links if allow_email and allow_print are 1 2011-11-24 15:01:47 +05:30
Nabin Hait
a8be65aedf Merge branch 'master' of github.com:webnotes/erpnext 2011-11-24 14:48:13 +05:30
Nabin Hait
d6ed0748a3 help content midified 2011-11-24 14:47:18 +05:30
Anand Doshi
956d665738 Merge pull request #148 from anandpdoshi/master
Modified GLEntry doctype to be not in create
2011-11-24 00:29:53 -08:00
Anand Doshi
be14e021b9 Reload GL Entry doctype 2011-11-24 13:57:46 +05:30
Anand Doshi
96e5343519 Marked GLEntry as Not In Create 2011-11-24 13:51:09 +05:30