Shiloh/brotherton-erpnext
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
38,310 Commits 3 Branches 0 Tags
Commit Graph

6928 Commits

Author SHA1 Message Date
Rushabh Mehta
588a98a10f fixes to chart_of_accounts, added opening + pl condition 2012-09-12 19:00:14 +05:30
Rushabh Mehta
aeb5c0fe70 Merge branch 'master' of github.com:webnotes/erpnext 2012-09-12 18:15:26 +05:30
Rushabh Mehta
0fa8e33835 chart of accounts: balances calculation 2012-09-12 18:14:12 +05:30
Rushabh Mehta
ad37f276da Created Chart of Accounts using Slick Grid and Tree 2012-09-12 17:13:36 +05:30
Nabin Hait
b146353db2 Merge branch 'unicode' of github.com:webnotes/erpnext into unicode 2012-09-12 16:15:09 +05:30
Nabin Hait
5337ce8d02 period closing voucher issue fixed 2012-09-12 16:14:23 +05:30
Anand Doshi
d29e06852d Merge branch 'master' of github.com:webnotes/erpnext into unicode 2012-09-12 15:33:50 +05:30
Nabin Hait
6a6cf5e573 parent account mandatory validation 2012-09-12 15:26:56 +05:30
Nabin Hait
8fdaa4dd66 Merge branch 'unicode' of github.com:webnotes/erpnext into unicode 2012-09-12 14:43:09 +05:30
Nabin Hait
eff2907911 error fixed in period closing entry 2012-09-12 14:42:25 +05:30
Anand Doshi
ce946afb67 Merge branch 'master' of github.com:webnotes/erpnext into unicode 
Conflicts:
	public/js/all-app.js
 2012-09-10 14:18:17 +05:30
Anand Doshi
bf8f343da7 check match conditions for companies list in chart of accounts/cost center 2012-09-10 14:13:01 +05:30
Anand Doshi
0dab087be1 Merge branch 'master' of github.com:webnotes/erpnext into unicode 
Conflicts:
	erpnext/accounts/doctype/sales_invoice/sales_invoice.txt
	public/js/all-app.js
 2012-09-10 11:31:18 +05:30
Nabin Hait
f28f4c7a89 section hide_unhide issue fixed 2012-09-07 11:59:05 +05:30
Anand Doshi
f03e3bb06b Merge branch 'master' of github.com:webnotes/erpnext into unicode 2012-09-06 07:55:19 +05:30
Anand Doshi
e642805882 changed date displayed in transaction listing from modified date to transaction/posting date 2012-09-03 13:32:25 +05:30
Anand Doshi
fa97e8c783 Merge branch 'master' of github.com:webnotes/erpnext into unicode 
Conflicts:
	erpnext/accounts/search_criteria/cash_flow_statement/__init__.py
	erpnext/accounts/search_criteria/cash_flow_statement/cash_flow_statement.py
	public/js/all-app.js
 2012-08-31 12:09:02 +05:30
Nabin Hait
245f920772 removed cash flow statement 2012-08-31 11:01:21 +05:30
Anand Doshi
d0fcdf6ec1 Merge branch 'master' of github.com:webnotes/erpnext into unicode 2012-08-23 18:34:46 +05:30
Anand Doshi
763e4c93bc added permission checking to show add child, edit and view ledger links 
in chart of accounts
 2012-08-23 18:34:04 +05:30
Anand Doshi
297f37da03 Merge branch 'master' of github.com:webnotes/erpnext into unicode 2012-08-22 14:59:14 +05:30
Nabin Hait
fd3f24f4be customer name should come in recurring invoice print format instead of customer id 2012-08-20 11:43:55 +05:30
Anand Doshi
5fc48f566f Merge branch 'master' of github.com:webnotes/erpnext into unicode 
Conflicts:
	erpnext/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.txt
 2012-08-17 11:48:34 +05:30
Nabin Hait
0170b2b4bc default purchase taxes and charges master will be automatically fetched in pur transactions 2012-08-17 11:00:15 +05:30
Nabin Hait
7e555e9f78 Update erpnext/accounts/doctype/cost_center/cost_center.py 2012-08-14 16:42:30 +05:30
Nabin Hait
f039c8b58f get_query for invoice in c-form 2012-08-14 15:38:17 +05:30
Anand Doshi
241437995f Merge branch 'master' of github.com:webnotes/erpnext into unicode 
Conflicts:
	erpnext/setup/doctype/company/company.txt
 2012-08-10 12:58:48 +05:30
Nabin Hait
4d0cba8249 Merge branch 'master' of github.com:webnotes/erpnext 2012-08-09 16:24:47 +05:30
Nabin Hait
cd4918736a error fixed in account browser 2012-08-09 16:24:20 +05:30
Anand Doshi
63fee973d7 Merge branch 'master' of github.com:webnotes/erpnext into unicode 2012-08-09 11:34:47 +05:30
Anand Doshi
c4df355edc removed msgprint in get_pos_details of sales invoice 2012-08-09 11:33:56 +05:30
Rushabh Mehta
49dc5da0dc refactor unicode changes and merge with master with refactored email 2012-08-03 16:02:24 +05:30
Nabin Hait
8292691470 stock repost patch 2012-08-03 08:39:17 +05:30
Anand Doshi
396628e7ea Merge branch 'master' of github.com:webnotes/erpnext into unicode 
Conflicts:
	erpnext/accounts/doctype/sales_invoice/sales_invoice.py
	erpnext/patches/patch_list.py
 2012-07-27 14:45:24 +05:30
Nabin Hait
4572182939 Merge branch 'master' of github.com:webnotes/erpnext 2012-07-27 10:54:43 +05:30
Nabin Hait
3d72da568d SO and DN mandatory only for stock item if made mandatory in global defaults 2012-07-27 10:51:51 +05:30
Rushabh Mehta
0fa628bf86 Merge branch 'master' of github.com:webnotes/erpnext into unicode 
Conflicts:
	erpnext/accounts/doctype/sales_invoice/sales_invoice.py
	erpnext/patches/patch_list.py
	public/js/report-legacy.js
 2012-07-26 15:46:13 +02:00
Anand Doshi
80b8393338 fixes in email validation for recurring invoice 2012-07-26 19:01:16 +05:30
Nabin Hait
e8ff96565c validate notification_email_ids in recurring invoice and if user is administrator set email id from profile 2012-07-24 10:59:31 +05:30
Nabin Hait
e9a62d1236 reload trial balance report 2012-07-23 11:46:37 +05:30
Anand Doshi
7118086658 Merge branch 'master' of github.com:webnotes/erpnext into unicode 2012-07-23 11:28:10 +05:30
Nabin Hait
454e268109 Recurring Invoice repititive mail sending issue fixed 2012-07-20 17:17:32 +05:30
Anand Doshi
486f9dfcec added unicode_literals import at start of each file 2012-07-19 13:40:31 +05:30
Anand Doshi
5756630efb Merge branch 'master' of github.com:webnotes/erpnext into dev 
Conflicts:
	erpnext/stock/doctype/delivery_note/delivery_note.py
	public/js/all-app.js
 2012-07-18 20:31:37 +05:30
Anand Doshi
249659d673 Changed file names from listview.js to doctype_name_list.js 2012-07-18 20:25:58 +05:30
Anand Doshi
f2f5c94c41 Default Currency specification for Customer and Supplier 
This will get fetched in sales and purchase transactions respectively.
Fix in sales order list view
 2012-07-18 20:13:52 +05:30
Nabin Hait
a25ebe3dbf Conversion rate fieldtype set as float (from currency) 2012-07-16 16:34:28 +05:30
Rushabh Mehta
2eef40bf1e get_field > wn.meta.get_docfield 2012-07-16 14:16:57 +05:30
Rushabh Mehta
8cbbab2e75 Merge branch 'dev' of github.com:webnotes/erpnext into dev 2012-07-12 18:01:31 +05:30
Rushabh Mehta
4feae61b62 fixes to taxes and charges master and naming_series 2012-07-12 16:01:20 +05:30