Commit Graph

615 Commits

Author SHA1 Message Date
Nabin Hait
6ec4b0c52a [fix] [minor] display product image in shopping cart 2013-09-26 15:45:44 +05:30
Nabin Hait
16ec981bfd [cleanup] [minor] fetch lead details in opportunity 2013-09-25 20:00:22 +05:30
Nabin Hait
11f41955c9 [minor] fixed conflict while merging perpetual branch into master 2013-09-24 14:36:55 +05:30
Anand Doshi
12144f339e Merge branch 'website-wip' 2013-09-19 12:27:11 +05:30
Nabin Hait
aa67e7ed29 [minor] field reordered in lead 2013-09-19 10:39:59 +05:30
Anand Doshi
e122121dc4 [fix] [minor] stock uom and price list currency in webshop 2013-09-18 17:28:06 +05:30
Anand Doshi
83de391efc Merge branch 'akhileshdarjee-master' into website-wip 2013-09-17 16:09:15 +05:30
Anand Doshi
8c002491d0 [fix] [minor] show missing currency message in shopping cart settings 2013-09-17 15:57:17 +05:30
Anand Doshi
ad0b05060a Merge branch 'master' of github.com:webnotes/erpnext into website-wip 2013-09-17 11:00:24 +05:30
Nabin Hait
5cd1d54347 [minor] merged with master branch 2013-09-17 10:30:24 +05:30
Nabin Hait
7a75e10a61 [fix] [minor] perpetual inventory: account for each warehouse 2013-09-17 10:21:20 +05:30
Akhilesh Darjee
c96c13af4e [fix] make demo for price list 2013-09-12 19:19:46 +05:30
Anand Doshi
3a6f4f882a [fix] [minor] communication related cleanup 2013-09-12 19:10:05 +05:30
Anand Doshi
1be5bb7e6a [portal] [minor] show status for order and invoice 2013-09-12 15:25:47 +05:30
Anand Doshi
fb109aded0 [website] [minor] moving to framework 2013-09-11 18:58:20 +05:30
Akhilesh Darjee
fb6d410e60 [fix] test cases fix for price list 2013-09-11 16:18:10 +05:30
Akhilesh Darjee
c3ec72c991 [fix] [minor] merge conflict fixed 2013-09-11 14:49:38 +05:30
Akhilesh Darjee
db59ffb76d [usability] item price moved to price list 2013-09-11 13:05:24 +05:30
Anand Doshi
b0d996ffb1 [website] [minor] moving to framework 2013-09-10 18:29:39 +05:30
Anand Doshi
429fd1d3d8 Merge branch 'website-wip' of github.com:webnotes/erpnext into website-wip 2013-09-10 12:54:10 +05:30
Rushabh Mehta
7c2312a74c [website] [minor] moving to framework 2013-09-10 12:51:52 +05:30
Anand Doshi
9686b937bb [fix] [minor] print hide communication table 2013-09-10 10:54:34 +05:30
Anand Doshi
1b2d84db0d [fix] [minor] print hide communication table 2013-09-10 10:46:56 +05:30
Rushabh Mehta
c59c4e0699 [website] [minor] moving to framework 2013-09-09 12:17:45 +05:30
Nabin Hait
ce4be997ab Merge branch 'master' of github.com:webnotes/erpnext 2013-09-05 17:38:52 +05:30
Nabin Hait
63b5ef7ecf [fix] [minor] is_pos zero when mapping 2013-09-05 17:38:24 +05:30
Anand Doshi
d983aca567 Merge branch 'master' of github.com:webnotes/erpnext 2013-09-05 13:31:46 +05:30
Anand Doshi
c28f84298f [fix] [minor] opportunity to quotation - load price list values 2013-09-05 13:31:20 +05:30
Akhilesh Darjee
a7b7d2559e [fix] merge conflict 2013-09-05 13:18:22 +05:30
Akhilesh Darjee
38e8f989fa [fix] [patch] fixed paid_amount & patch for default pos view check in features setup 2013-09-05 12:59:33 +05:30
Anand Doshi
512113ae51 Merge branch 'customer-login' 2013-09-05 12:21:29 +05:30
Nabin Hait
a653cd3608 [minor] fixed conflict while merging with master 2013-09-05 10:56:44 +05:30
Anand Doshi
7b044da0e3 [fix] [minor] on_communication, when checking if system user, extract email id and then check 2013-09-04 18:14:20 +05:30
Nabin Hait
bf4d27ecf1 [minor] repost future gl entries only for current voucher items 2013-09-04 17:55:45 +05:30
Anand Doshi
53ecddd612 [fix] [communication] on communication send, update status 2013-09-04 17:52:27 +05:30
Anand Doshi
d01f0cb46e [fix] [communication] on communication send, update status 2013-09-04 17:38:29 +05:30
Rushabh Mehta
090d410498 [minor] communication, webnotes/erpnext#790 2013-09-04 16:20:18 +05:30
Anand Doshi
d5c18d46d0 [minor] [customer login] renamed order template to sale and use it for order, invoice and delivery note 2013-09-04 15:07:00 +05:30
Anand Doshi
0e23929740 Merge branch 'master' into customer-login 2013-09-03 16:42:21 +05:30
Anand Doshi
4263344cd2 [fix] [minor] customer-wise discount 2013-09-03 16:21:21 +05:30
Anand Doshi
3139973662 [fix] [minor] quotation to sales order, if not able to create customer, show message 2013-09-03 15:41:31 +05:30
Anand Doshi
627c42bdb6 [fix] [minor] quotation to sales order, if not able to create customer, show message 2013-09-03 15:34:24 +05:30
Anand Doshi
36b63a44b9 [fix] [minor] profile query 2013-09-03 15:33:56 +05:30
Nabin Hait
20a6f93612 Merge branch 'master' into perpetual 2013-09-03 11:26:02 +05:30
Rushabh Mehta
98429afe91 [communication] [minor] 2013-09-02 18:52:27 +05:30
Rushabh Mehta
0f2b684a45 [communication] [minor] 2013-09-02 18:47:34 +05:30
Rushabh Mehta
57e47cd93d [communication] [minor] 2013-09-02 18:45:11 +05:30
Nabin Hait
3f5e59eeeb [minor] [cleanup] Landed cost wizard 2013-09-02 18:44:55 +05:30
Rushabh Mehta
a2d0da8840 [communication] [minor] 2013-09-02 18:27:29 +05:30
Rushabh Mehta
8f04d119bb [communication] [minor 2013-09-02 17:39:59 +05:30