Commit Graph

7276 Commits

Author SHA1 Message Date
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
Priya
20de8f48c6 [docs] new selling pages added 2013-09-05 17:16:22 +05:30
Anand Doshi
f6e62c94ff [fix] [minor] removed pos view check patch 2013-09-05 17:11:52 +05:30
Anand Doshi
9328233eb3 Merge branch 'master' of github.com:webnotes/erpnext 2013-09-05 17:05:24 +05:30
Nabin Hait
87eb4b99a8 [fix] [minor] gl entries for purchase invoice 2013-09-05 17:03:31 +05:30
Anand Doshi
179e3772c0 [fix] [minor] item wise taxes 2013-09-05 16:53:57 +05:30
Nabin Hait
ab1b5a4a79 Merge pull request #821 from akhileshdarjee/master
[fix] purchase receipt test cases
2013-09-05 04:00:00 -07:00
Akhilesh Darjee
2ea7a241a3 [fix] purchase receipt test cases 2013-09-05 16:28:45 +05:30
Anand Doshi
284275cb70 Merge branch 'master' of github.com:webnotes/erpnext 2013-09-05 15:44:59 +05:30
Nabin Hait
272410bb87 [fix] [minor] fixes in payment reconciiation 2013-09-05 15:43:05 +05:30
Anand Doshi
f021310cca Merge branch 'master' of github.com:webnotes/erpnext 2013-09-05 14:36:59 +05:30
Nabin Hait
335cdeaf7d [fix] [minor] fixes in test cases for is_pos 2013-09-05 14:00:57 +05:30
Nabin Hait
eec9371de7 [fix] [minor] gl entries for purchase invoice 2013-09-05 13:42:54 +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
Nabin Hait
2cf1496a2d Merge pull request #819 from akhileshdarjee/master
[fix] [patch] fixed paid_amount & patch for default pos view check in features setup
2013-09-05 00:52:09 -07:00
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
ea55734df5 [fix] [minor] delivered items to be billed 2013-09-05 12:41:16 +05:30
Anand Doshi
8543469fba Merge branch 'master' of github.com:webnotes/erpnext 2013-09-05 12:22:14 +05:30
Anand Doshi
512113ae51 Merge branch 'customer-login' 2013-09-05 12:21:29 +05:30
Anand Doshi
a9c0f5de7d [feature] [customer login] send links in email for portal access of Sales Order, Sales Invoice, Delivery Note and Suppor Ticket 2013-09-05 12:19:00 +05:30
Nabin Hait
a653cd3608 [minor] fixed conflict while merging with master 2013-09-05 10:56:44 +05:30
Nabin Hait
2162fee396 Merge pull request #792 from akhileshdarjee/master
[pos][fix] fixed pos view in sales_invoice.js
2013-09-04 22:03:42 -07:00
Nabin Hait
4e8216696f [minor] [fix] patch name changed 2013-09-04 19:04:00 +05:30
Akhilesh Darjee
734b2aab5c [fix] pos setting link fields validate to specific company 2013-09-04 18:48:08 +05:30
Nabin Hait
526eaaa208 [minor] [fix] patch name changed 2013-09-04 18:43:44 +05:30
Anand Doshi
a9ad4e3045 [fix] [minor] feed label 2013-09-04 18:26:51 +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
fd5b5c187a Merge branch 'master' of github.com:webnotes/erpnext 2013-09-04 17:53:04 +05:30
Anand Doshi
53ecddd612 [fix] [communication] on communication send, update status 2013-09-04 17:52:27 +05:30
Priya
456f0ab570 [docs] screenshots added 2013-09-04 17:48:54 +05:30
Rushabh Mehta
bc4de987b5 Merge pull request #810 from fogueri/master
[docs] major update
2013-09-04 05:17:09 -07:00
Anand Doshi
d01f0cb46e [fix] [communication] on communication send, update status 2013-09-04 17:38:29 +05:30
Anand Doshi
85ef502745 [minor] [customer login] removed messages, fixes in sale, ticket 2013-09-04 16:46:08 +05:30
Rushabh Mehta
090d410498 [minor] communication, webnotes/erpnext#790 2013-09-04 16:20:18 +05:30
Anand Doshi
36cd22bf71 Merge branch 'master' into customer-login 2013-09-04 15:10:17 +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
Rushabh Mehta
140f9052a9 [webutils] [minor] [bugfix] 2013-09-04 14:58:15 +05:30
Rushabh Mehta
4515805b9a Merge branch 'master' of github.com:webnotes/erpnext 2013-09-04 14:43:12 +05:30
Rushabh Mehta
fdaf5fd087 [bug] [minor] fix #790 2013-09-04 14:42:38 +05:30
Nabin Hait
df1854f0b5 [fix] [minor] serial no status update for material transfer 2013-09-04 13:07:17 +05:30
Nabin Hait
2851bc0514 [minor] [tetscases] for serialized item 2013-09-04 13:02:58 +05:30
Nabin Hait
3e34a6d0e1 [fix] [minor] serial no status update for material transfer 2013-09-04 12:54:33 +05:30
Priya
c8c229dcc0 [docs] backup manager docs 2013-09-04 12:39:43 +05:30
Nabin Hait
dd71a02ec7 Merge branch 'master' of github.com:webnotes/erpnext 2013-09-03 23:20:20 +05:30
Nabin Hait
3b152ba6c7 [fix] [minor] make bank voucher from expense claim and serial no status 2013-09-03 23:19:08 +05:30
Rushabh Mehta
9dd25b35d7 [minor] [boot] moved load_country_and_currency to framework 2013-09-03 17:36:41 +05:30