Commit Graph

1246 Commits

Author SHA1 Message Date
Akhilesh Darjee
42a8fc2ee3 [fix] [minor] stashed sales_invoice.txt 2013-12-11 11:15:03 +05:30
Akhilesh Darjee
aebb9f422b [fix] [minor] merge conflict fixes 2013-12-10 18:01:18 +05:30
Akhilesh Darjee
a652347bd1 [fix] [minor] customer_name not visible in sales invoice 2013-12-09 15:52:47 +05:30
Pratik Vyas
1417c6d58f [hotfix] fix null issue in budget variance 2013-12-06 14:50:06 +05:30
Nabin Hait
40580d5d01 [fix] [minor] Master name validation for customer/supplier/warehouse account 2013-12-04 15:18:11 +05:30
Akhilesh Darjee
72f689b1f9 [fix] [minor] setup print fix in sales invoice 2013-12-04 10:46:55 +05:30
Akhilesh Darjee
9c0569ee2d [report] payment collection with ageing and payment made with ageing merged to payment period based on invoice date 2013-12-02 17:58:23 +05:30
Nabin Hait
86d7139c21 Merge pull request #1107 from akhileshdarjee/master
[fix] [minor] fiscal year validation ignored for test cases
2013-11-27 04:05:36 -08:00
Nabin Hait
752bdbacaf Merge branch '1310' of github.com:webnotes/erpnext 2013-11-27 17:31:04 +05:30
Akhilesh Darjee
ed3e05e181 [fix] [minor] fiscal year validation ignored for test cases 2013-11-27 17:26:25 +05:30
Rushabh Mehta
50989cdd7f Merge pull request #1106 from akhileshdarjee/master
[fix] [minor] make_demo_fresh fixed
2013-11-27 02:48:21 -08:00
Akhilesh Darjee
a8e704d4ab [fix] [minor] make_demo_fresh fixed 2013-11-27 16:16:32 +05:30
Nabin Hait
a07a5084c1 Update payment_made_with_ageing.py 2013-11-27 12:05:32 +05:30
Nabin Hait
a967100990 Update payment_collection_with_ageing.py 2013-11-27 12:05:15 +05:30
Nabin Hait
7cc52d9aaf Merge pull request #1102 from akhileshdarjee/master
[fix] [minor] ageing related reports fixed
2013-11-26 22:31:50 -08:00
Akhilesh Darjee
ca414a96cc [fix] [minor] ageing related reports fixed 2013-11-27 11:53:57 +05:30
Nabin Hait
e3eafd94ff Merge pull request #1100 from akhileshdarjee/master
[fix] [minor] patch for fixing report columns in defaults
2013-11-26 21:26:08 -08:00
Akhilesh Darjee
84ed127e72 [fix] [minor] setup wizard - calculate year end date on change of year start date 2013-11-26 17:29:51 +05:30
Akhilesh Darjee
259208187c [fix] [minor] patch for fixing report columns in defaults 2013-11-26 16:35:50 +05:30
Nabin Hait
5033ef03cf [fix] [minor] merge conflict 2013-11-26 16:04:53 +05:30
Nabin Hait
ad35d1b409 [cleanup] [minor] mis control 2013-11-26 15:39:21 +05:30
Nabin Hait
ac9bcf714d Merge pull request #1097 from akhileshdarjee/master
[fix] fiscal year fix in setup wizard
2013-11-26 01:57:17 -08:00
Nabin Hait
175640d910 Merge branch 'master' of github.com:webnotes/erpnext 2013-11-26 15:04:10 +05:30
Nabin Hait
131939a742 [fix] [minor] rename and merge for customer and supplier 2013-11-26 15:03:51 +05:30
Akhilesh Darjee
d333f20ca0 [fix] [minor] fiscal year fix 2013-11-26 14:57:03 +05:30
Akhilesh Darjee
8cf9ab8188 Merge branch 'master' of github.com:webnotes/erpnext 2013-11-26 14:46:51 +05:30
Akhilesh Darjee
b0a1b3ab47 [fix] [minor] test cases fixes 2013-11-26 14:45:27 +05:30
Rushabh Mehta
cd65b953a3 [fix] Removed voucher import tool webnotes/erpnext#1094 2013-11-26 14:09:59 +05:30
Akhilesh Darjee
60ae96d588 [fix] [minor] merge conflict fixed 2013-11-26 11:21:07 +05:30
Akhilesh Darjee
ec0da0b177 [fix] [setup_wizard] fiscal year fix for setup wizard 2013-11-25 19:51:18 +05:30
Nabin Hait
451b01cfe4 [fix] [minor] print hide for purchase net and grand total 2013-11-22 17:17:35 +05:30
Nabin Hait
f1faf2d285 [fix] [minor] print hide for purchase net and grand total 2013-11-22 16:59:28 +05:30
Nabin Hait
55afd2620e Merge branch 'master' of github.com:webnotes/erpnext 2013-11-21 12:41:37 +05:30
Nabin Hait
8eb0c61649 [minor] merge conflict fixed 2013-11-21 12:28:50 +05:30
Nabin Hait
784a95cf1a [fix] [minor] check print hide properties in purchase standard print format 2013-11-21 10:39:43 +05:30
https://github.com/account/admin
4a54aec493 Updated Accounts receivable report
-Modified the columns a bit
-Added link to the customer column (was missing earlier)
-Added a link for the transactions (it is very necessary)
2013-11-20 22:48:56 +05:30
Nabin Hait
1d35c444b6 [fix] [minor] check print hide property to show net total and grand total in purchase cycle standard print format 2013-11-20 16:24:11 +05:30
Nabin Hait
458b30b5d3 Merge branch '1310' of github.com:webnotes/erpnext into 1310 2013-11-20 13:51:16 +05:30
Akhilesh Darjee
20f93546eb [fix] [minor] all variance related reports fixed 2013-11-20 13:25:04 +05:30
Nabin Hait
ca471f41a1 [fix] Rename and merge rewrite 2013-11-20 13:14:12 +05:30
Rushabh Mehta
ad45e31356 [copyright] added Contributors 2013-11-20 13:00:28 +05:30
Rushabh Mehta
ebdddf3fb6 [website] [sitemap] cleanup 2013-11-19 14:20:52 +05:30
Anand Doshi
0c26f8116d Merge branch '1310' of github.com:webnotes/erpnext
Conflicts:
	accounts/doctype/account/account.py
	controllers/accounts_controller.py
	patches/patch_list.py
	selling/doctype/sales_common/sales_common.py
	stock/doctype/purchase_receipt/purchase_receipt.py
2013-11-15 19:12:09 +05:30
Rushabh Mehta
e34090aa2f [pos] [minor] button back on toolbar and css, fixes webnotes/erpnext#1052 2013-11-15 11:30:23 +05:30
Nabin Hait
7373a83043 Merge branch '1310' of github.com:webnotes/erpnext into 1310 2013-11-14 18:50:23 +05:30
Nabin Hait
e83069cb32 [fix] update future gl entries for stock 2013-11-14 18:40:08 +05:30
Nabin Hait
155232e04e [fix] credit limit validation 2013-11-14 18:37:33 +05:30
Akhilesh Darjee
d2d210dc68 [fix] [minor] variance reports fixes 2013-11-13 17:27:35 +05:30
Rushabh Mehta
4f642e7670 [cleanup] Fixed title bars, toolbars in all pages, added default background 2013-11-13 16:58:18 +05:30
Akhilesh Darjee
bfe264be8c [fix] [minor] all types of variance reports fixed 2013-11-13 16:45:11 +05:30