Commit Graph

5219 Commits

Author SHA1 Message Date
Rushabh Mehta
30be03673e [website] [fix] no cache for order, ticket 2013-03-22 13:51:41 +05:30
Rushabh Mehta
a0fa3300b7 [website] [fix] signup permissions 2013-03-22 13:02:08 +05:30
Rushabh Mehta
da512ba8c9 website: made order and ticket listing 2013-03-22 12:45:44 +05:30
Rushabh Mehta
11394f0986 Merge branch 'edge' of github.com:webnotes/erpnext into edge 2013-03-21 17:40:56 +05:30
Rushabh Mehta
af578d73ef merge 2013-03-21 17:40:08 +05:30
Rushabh Mehta
4a80bc63b0 added permissions for server side print 2013-03-21 17:23:54 +05:30
Rushabh Mehta
bed19ac4d3 added website pages for orders, tickets and added sales invoice print format 2013-03-21 17:12:25 +05:30
Anand Doshi
407331675f recurring invoice test cases, set period start date and period end date as first and last day of the month if previously so, else just add months 2013-03-20 21:14:03 +05:30
Anand Doshi
5e63962ef2 Merge branch 'master' into edge 2013-03-20 17:06:49 +05:30
Anand Doshi
f0a8406d31 Merge branch 'master' of github.com:webnotes/erpnext 2013-03-20 17:01:31 +05:30
Anand Doshi
7da72dd449 unlink against voucher in jv when Purchase Invoice, Sales Invoice or Journal Voucher are cancelled 2013-03-20 17:00:41 +05:30
Anand Doshi
2d12a42145 Merge pull request #312 from saurabh6790/master
updated accounts_controller.py, buying_controller.py, selling_controller.py
2013-03-20 03:55:40 -07:00
Saurabh
f848b8bafc merged backup manager python file 2013-03-20 13:55:08 +05:30
Saurabh
9c02b81cdd merged backup dropbox file 2013-03-20 13:51:43 +05:30
Saurabh
076535d979 Merge branch 'master' of https://github.com/webnotes/erpnext
Conflicts:
	controllers/buying_controller.py
2013-03-20 13:48:48 +05:30
Saurabh
6f75318134 no -ve balance accepted in sales and purchase invoice 2013-03-20 12:55:28 +05:30
Nabin Hait
aa6f939b86 Merge branch 'master' of github.com:webnotes/erpnext 2013-03-20 11:43:47 +05:30
Saurabh
19a504d32e Merge branch 'master' of https://github.com/webnotes/erpnext 2013-03-20 10:12:22 +05:30
Nabin Hait
8803df04cc aii: get_query for default account in company 2013-03-19 18:53:00 +05:30
Anand Doshi
e31d64ffe1 save global defaults 2013-03-19 18:42:29 +05:30
Anand Doshi
9bddd83604 fix in global defaults 2013-03-19 18:40:35 +05:30
Nabin Hait
364f08a171 fixed conflict 2013-03-19 18:29:05 +05:30
Nabin Hait
80abad2ee0 aii: default account from company 2013-03-19 18:18:52 +05:30
Rushabh Mehta
a75efa76f9 added my account 2013-03-19 17:59:49 +05:30
Anand Doshi
a2b3eb17e3 fix in depends on of stock entry 2013-03-19 17:48:50 +05:30
Anand Doshi
9a20cc5cd8 Merge branch 'sales_purchase_return' 2013-03-19 16:23:11 +05:30
Anand Doshi
3e967ab9b6 hide Reference section break when using Sales or Purchase Return 2013-03-19 16:22:22 +05:30
Anand Doshi
73091ecac3 shifted return reference fields in stock entry to the main section 2013-03-19 15:15:12 +05:30
Anand Doshi
f6b06a6b30 fixes in sales purchase return 2013-03-19 15:01:07 +05:30
Rushabh Mehta
1755b36ba3 fix to login 2013-03-19 14:35:20 +05:30
Nabin Hait
fbafced1e4 Merge branch 'master' of github.com:webnotes/erpnext 2013-03-19 13:53:55 +05:30
Anand Doshi
af6f1ba82e fixes in sales purchase return for stock entry 2013-03-19 13:43:49 +05:30
Anand Doshi
688b52e14b increase width of taxes table in print format 2013-03-19 13:35:40 +05:30
Anand Doshi
f9e51bbab3 removed complications from sales purchase return 2013-03-19 13:33:51 +05:30
Rushabh Mehta
fd18fc7986 print format standard - start 2013-03-19 13:02:46 +05:30
Nabin Hait
d98e511c8b deafult account creation in company 2013-03-19 12:45:02 +05:30
Nabin Hait
e68103be30 fixes in reorder level and company 2013-03-19 12:34:47 +05:30
Rushabh Mehta
43fbc9d1b9 added server side print format 2013-03-19 12:05:10 +05:30
Nabin Hait
928355ad9a Merge branch 'master' of github.com:webnotes/erpnext 2013-03-19 12:02:13 +05:30
Nabin Hait
89a94d8135 aii: stock reconciliation with test case 2013-03-19 12:01:46 +05:30
Nabin Hait
c3afb256b4 aii: stock entry 2013-03-19 12:01:24 +05:30
Nabin Hait
35e037651c fixes in packing slip 2013-03-19 11:58:57 +05:30
Rushabh Mehta
c8580930eb Merge branch 'master' of github.com:webnotes/erpnext into edge 2013-03-19 11:12:44 +05:30
Rushabh Mehta
a54cb247c4 webshop login, logout 2013-03-19 11:12:22 +05:30
Anand Doshi
a111bb104b Merge branch 'master' of github.com:webnotes/erpnext 2013-03-18 18:20:50 +05:30
Anand Doshi
839fee3e71 restrict material_request_type in Material Request form 2013-03-18 18:20:09 +05:30
Anand Doshi
5afe037a5b deprecate sales and purchase return tool 2013-03-18 17:59:56 +05:30
Anand Doshi
080f9098c0 deprecated sales and purchase return tool 2013-03-18 17:57:59 +05:30
Anand Doshi
f11e2f8f6f Merge branch 'master' of github.com:webnotes/erpnext into sales_purchase_return
Conflicts:
	patches/patch_list.py
2013-03-18 17:42:08 +05:30
Anand Doshi
ab7b7c2974 completed sales purchase return as part of stock entry 2013-03-18 17:37:31 +05:30