Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,752 Commits 3 Branches 0 Tags 1 GiB
175640d910
Commit Graph

1217 Commits

Author SHA1 Message Date
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
Rushabh Mehta
cd65b953a3 [fix] Removed voucher import tool webnotes/erpnext#1094 2013-11-26 14:09:59 +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
Nabin Hait
49f2bafa0f [fix] [minor] budget variance report logic + loading time 2013-11-13 15:32:12 +05:30
Nabin Hait
06da1a6147 Merge pull request #1029 from akhileshdarjee/1310 
[fix] [minor] budget variance report fixed
 2013-11-11 21:57:22 -08:00
Akhilesh Darjee
fbfefd3dcd [fix] [minor] budget variance report fixed 2013-11-12 11:24:56 +05:30
Nabin Hait
e587bc3024 Update accounts_payable.py 2013-11-11 18:42:22 +05:30
Nabin Hait
113b4c1a21 [fix] [minor] accounts payable ageing data 2013-11-11 18:25:12 +05:30
Anand Doshi
c89b49c322 Merge remote-tracking branch 'origin/1310' 2013-11-11 13:45:19 +05:30
Akhilesh Darjee
7344353ac5 [report] [fix] accounts payable fixed for get_ageing_date() 2013-11-11 12:47:49 +05:30
Rushabh Mehta
515636f24c Merge branch 'master' of github.com:webnotes/erpnext into cleanup 2013-11-08 16:28:12 +05:30
Anand Doshi
0516fc6161 Merge branches '1310' and 'master' of github.com:webnotes/erpnext 2013-11-07 21:10:38 +05:30
Anand Doshi
ce7ed98e31 [minor] [refactor] Accounts Receivable 2013-11-07 21:09:44 +05:30
Anand Doshi
aacbe7a277 Merge branches '1310' and 'master' of github.com:webnotes/erpnext 2013-11-07 21:04:36 +05:30
Anand Doshi
3990104e9b [minor] [refactor] Accounts Receivable 2013-11-07 21:04:01 +05:30
Anand Doshi
ed1679a1c5 Merge branch '1310' of github.com:webnotes/erpnext 2013-11-07 20:49:13 +05:30
Anand Doshi
9ff22fd508 [minor] [refactor] Accounts Receivable 2013-11-07 20:44:30 +05:30
Rushabh Mehta
a063b4d50e [cleanup] UI Fixes, minor 2013-11-06 11:29:47 +05:30
Anand Doshi
8bc3c16497 [minor] fix in general ledger after translation merge 2013-11-05 20:05:39 +05:30
Anand Doshi
2ced381976 [minor] fixes in test cases and demo 2013-11-04 14:37:29 +05:30
Anand Doshi
daaa14c079 Merge branch '1310' of github.com:webnotes/erpnext 
Conflicts:
	setup/doctype/setup_control/setup_control.py
	stock/doctype/stock_entry/stock_entry.py
	utilities/demo/demo_docs/Price_List.csv
 2013-11-04 13:14:39 +05:30
Anand Doshi
06757a19ef [minor] [query] expense and income account queries should exclude customer and supplier accounts 2013-11-04 12:55:24 +05:30
Rushabh Mehta
f7b203de2d [cleanup] UI Fixes 2013-11-03 20:37:49 +05:30
Rushabh Mehta
ef5845589d [cleanup] [minor] finishing styles, labels, descriptions 2013-11-02 14:47:11 +05:30
Nabin Hait
4144b1c841 [fix] [minor] itemwise sales/purchase register 2013-11-01 18:08:55 +05:30
Akhilesh Darjee
e158cea77a [cleanup] [minor] replaced for territory to applicable territory 2013-10-31 19:50:51 +05:30
Rushabh Mehta
bed14d7fa4 Merge branch 'master' of github.com:webnotes/erpnext into cleanup 2013-10-31 15:16:05 +05:30
Nabin Hait
93ba6f7e0e [fix] [minor] update outstanding amount 2013-10-31 11:47:45 +05:30
Anand Doshi
fec52b5a8f [minor] fixed stock entry and demo 2013-10-28 19:59:45 +05:30
Nabin Hait
494a216193 [fix] [minor] Cost center is mandatory if tax is include din valuation and perpetual inventory enabled 2013-10-28 19:59:45 +05:30
Rushabh Mehta
069672e197 [minor] cleanup start 2013-10-28 18:21:07 +05:30
Nabin Hait
9304396e17 [fix] [minor] Cost center is mandatory if tax is include din valuation and perpetual inventory enabled 2013-10-28 15:33:36 +05:30