Commit Graph

547 Commits

Author SHA1 Message Date
Anand Doshi
40dc9e83a5 fixes in test cases and added fiscal year field to stock reco 2013-03-26 14:49:25 +05:30
Nabin Hait
e1c76a1a8e Merge branch 'master' of github.com:webnotes/erpnext 2013-03-26 13:01:28 +05:30
Nabin Hait
4a4ae0840a expense account optional mandatory in pos setting 2013-03-26 13:00:53 +05:30
Nabin Hait
fd606afcb9 expense account optional mandatory in pos sett 2013-03-26 12:50:03 +05:30
Anand Doshi
fc33ef6bfb fixes in purchase invoice 2013-03-26 12:13:14 +05:30
Nabin Hait
72d9c5b724 fixed floating point issue in jv 2013-03-26 11:54:40 +05:30
Nabin Hait
82be7dc301 fixed conflict 2013-03-25 18:30:15 +05:30
Nabin Hait
557d858d89 aii: patches and default values fetching 2013-03-25 18:28:16 +05:30
Rushabh Mehta
74506e96d3 [profile/email] [feature] added option not to send print as email body. fix in profile delete 2013-03-25 17:52:14 +05:30
Rushabh Mehta
06d186ba98 [stock] [feature] added project to stock ledger entry and updated stock balance report 2013-03-25 17:03:52 +05:30
Rushabh Mehta
e97ce3475d [accounts] [feature] added default_cash_account in company and gets set in Journal Voucher 2013-03-25 15:55:24 +05:30
Rushabh Mehta
2f8ad5e5c1 [accounts] [feature] added default_cash_account in company and gets set in Journal Voucher 2013-03-25 15:48:57 +05:30
Rushabh Mehta
df8b652402 [accounts] [feature] added default_cash_account in company and gets set in Journal Voucher 2013-03-25 15:44:36 +05:30
Rushabh Mehta
c5570c6341 added warehouse company validation, if warehouse is added to company 2013-03-25 15:21:24 +05:30
Nabin Hait
690fefe9c1 Merge branch 'master' of github.com:webnotes/erpnext 2013-03-25 11:07:38 +05:30
Nabin Hait
0fc2454384 aii: patches and fine tuning 2013-03-25 11:06:00 +05:30
Anand Doshi
aeed499d12 Merge branch 'master' into edge
Conflicts:
	setup/doctype/backup_manager/backup_dropbox.py
2013-03-22 18:43:47 +05:30
Anand Doshi
b632ba5f51 changed fieldtype of repeat_on_day_of_month to Int 2013-03-22 18:38:33 +05:30
Akhilesh Darjee
2f2ac966ad Merge branch 'master' of https://github.com/webnotes/erpnext 2013-03-22 18:28:51 +05:30
Akhilesh Darjee
ac61ec3a5b Permissions problem in invoice fixed. 2013-03-22 18:20:11 +05:30
Anand Doshi
c8e64f5d42 shifted field category of Purchase Taxes and Charges to the left 2013-03-22 16:49:16 +05:30
Anand Doshi
ceba917e86 Merge branch 'master' into edge 2013-03-22 14:16:53 +05:30
Anand Doshi
a47ac1bed0 Merge branch 'master' of github.com:webnotes/erpnext 2013-03-22 13:32:11 +05:30
Anand Doshi
a3b9b1a868 added filters from date and to date 2013-03-22 13:16:10 +05:30
Rushabh Mehta
da512ba8c9 website: made order and ticket listing 2013-03-22 12:45:44 +05:30
Nabin Hait
54e79995ee fixes in trend analyzer 2013-03-22 12:35:11 +05:30
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
a0e7c1539b aii: book expense in delivery note instead of sales invoice 2013-03-21 18:37:06 +05:30
Rushabh Mehta
af578d73ef merge 2013-03-21 17:40:08 +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
Akhilesh Darjee
34c13ac52c added description to sales_invoice.txt 2013-03-21 13:22:32 +05:30
Akhilesh Darjee
fadffcf528 description added to 'Is Opening' and 'Aging Date' field 2013-03-21 13:06:41 +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
7da72dd449 unlink against voucher in jv when Purchase Invoice, Sales Invoice or Journal Voucher are cancelled 2013-03-20 17:00:41 +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
9a20cc5cd8 Merge branch 'sales_purchase_return' 2013-03-19 16:23:11 +05:30
Nabin Hait
fbafced1e4 Merge branch 'master' of github.com:webnotes/erpnext 2013-03-19 13:53:55 +05:30
Anand Doshi
688b52e14b increase width of taxes table in print format 2013-03-19 13:35:40 +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
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
71bed3116f working on merging sales purchase return into stock entry 2013-03-13 12:57:04 +05:30
Anand Doshi
f55922e962 fix in chart of accounts balance display 2013-03-13 12:53:00 +05:30
Anand Doshi
c9d229ec9e Merge branch 'master' of github.com:webnotes/erpnext 2013-03-12 11:06:06 +05:30
Nabin Hait
bffbc18b2d fixes in cleanup data 2013-03-12 10:41:21 +05:30
Anand Doshi
df6ff1385f fixes in warehouse validation 2013-03-11 19:44:52 +05:30
Nabin Hait
8c7234f270 aii: gl_entries for sales invoice 2013-03-11 16:32:33 +05:30