Commit Graph

5197 Commits

Author SHA1 Message Date
Anand Doshi
8c5844e3fb show sales invoice data in gross profit report 2013-03-21 20:24:10 +05:30
Anand Doshi
6d8d3b4cee fixes in gross profit report 2013-03-21 18:45:02 +05:30
Nabin Hait
4c56220089 Merge branch 'master' of github.com:webnotes/erpnext 2013-03-21 18:37:48 +05:30
Nabin Hait
a0e7c1539b aii: book expense in delivery note instead of sales invoice 2013-03-21 18:37:06 +05:30
Anand Doshi
162a081a9f unchecked Not In Create in item customer detail and item price 2013-03-21 17:30:22 +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
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
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
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
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
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
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
root
5e8c91d79e Merge branch 'master' of https://github.com/webnotes/erpnext
Conflicts:
	setup/doctype/backup_manager/backup_dropbox.py
	setup/doctype/backup_manager/backup_manager.py
2013-03-18 15:08:37 +05:30
Rushabh Mehta
edf639b607 fixed backup/gdrive 2013-03-18 12:48:34 +05:30
Rushabh Mehta
f64407d363 Merge branch 'master' of github.com:akhileshdarjee/erpnext 2013-03-18 11:26:09 +05:30
Akhilesh Darjee
daae56926b Merge branch 'master' of https://github.com/webnotes/erpnext 2013-03-18 11:17:06 +05:30
Anand Doshi
cfbd192782 Merge branch 'master' of github.com:webnotes/erpnext 2013-03-18 11:16:00 +05:30
Akhilesh Darjee
b0f0e7a82f added backup_googledrive.py in backup_manager 2013-03-18 11:15:44 +05:30
Anand Doshi
6f1dd26100 on deletion of lead, delete communication reference 2013-03-18 11:15:31 +05:30
Anand Doshi
34e13add4c on deletion of lead, delete communication 2013-03-18 11:14:25 +05:30
Rushabh Mehta
9feffd5591 Merge branch 'master' of github.com:akhileshdarjee/erpnext 2013-03-18 10:57:37 +05:30