Commit Graph

399 Commits

Author SHA1 Message Date
Nabin Hait
9b09c95d83 [cleanup] [accounts] delete gl entries on cancellation of accounting transactions 2013-08-21 17:47:11 +05:30
Nabin Hait
74c281cc55 [cleanup] [minor] On cancellation of transation, do not post cancelled sl entries, delete allexisting sl entries against that transaction 2013-08-19 16:17:18 +05:30
Nabin Hait
44da6f2efe [fix] [minor] fixed conflict while merging with master 2013-08-19 11:06:06 +05:30
Nabin Hait
4af2dbf84d [perpetual accounting] [minor] patch for intial setup 2013-08-12 12:24:08 +05:30
Rushabh Mehta
813b1cba65 Merge branch 'master' of github.com:webnotes/erpnext 2013-08-09 18:12:15 +05:30
Rushabh Mehta
4a404e9299 [price list] Separated Default Price List for Selling and Buying and changed fieldnames 2013-08-09 18:11:35 +05:30
Nabin Hait
d9ef559f3b [fix] [minor] fix in updating numbering series 2013-08-09 13:17:32 +05:30
Rushabh Mehta
0983cb75d5 [cleanup] [minor] removed default value 0.00 2013-08-07 15:06:51 +05:30
Nabin Hait
cc0e2d1740 [minor] merged with master 2013-08-06 16:19:18 +05:30
Nabin Hait
43eba26dcf [perpetual accounting] make gl entries relevant for different transactions 2013-08-06 16:00:50 +05:30
Anand Doshi
7e76ca350c [fix] default float precision = 3, changed description of float precision in global defaults [issue] webnotes/erpnext#712 2013-08-06 13:33:42 +05:30
Rushabh Mehta
a1d668a6e3 [nested set] [minor] Added validation to test loop in hierarchy 2013-08-05 18:14:39 +05:30
Rushabh Mehta
d056e1b453 [minor] added webnotes.get_list, fixed webnotes/erpnext#663 2013-08-05 16:21:04 +05:30
Rushabh Mehta
e67d1fbcdf [license] [minor] Updated License Text in all js and py files 2013-08-05 14:59:54 +05:30
Anand Doshi
e79d57ca19 [salary slip] total no. of working days calculation [issue] webnotes/erpnext#285 2013-08-02 19:31:41 +05:30
Anand Doshi
5cd58dc387 [usability] [issue] webnotes/erpnext#606 - disable default currency after a transaction is created for a company 2013-08-01 18:58:35 +05:30
Anand Doshi
49154c790e [fix] if no valid territory for price list, try adding the user's default territory 2013-08-01 15:43:33 +05:30
Rushabh Mehta
e3742322fb Merge branch 'master' of github.com:webnotes/erpnext 2013-07-30 16:20:19 +05:30
Rushabh Mehta
ed186b719e [demo] [minor] Started make_demo.py 2013-07-30 16:19:40 +05:30
Anand Doshi
1fac2a98cf [fix] [client script] call cur_frm.cscript.custom_ type functions in the callback of standard functions 2013-07-29 19:30:39 +05:30
Anand Doshi
5f6022681b [fix] [minor] email digest events fix 2013-07-28 09:15:11 +05:30
Anand Doshi
2b518e37e5 Merge branch 'master' of github.com:webnotes/erpnext 2013-07-26 11:34:38 +05:30
Anand Doshi
720a01a6f6 [selling] changed fieldtype of Price List to link 2013-07-26 11:32:02 +05:30
Rushabh Mehta
dea6e51929 Merge branch 'master' of github.com:webnotes/erpnext 2013-07-26 11:22:09 +05:30
Rushabh Mehta
c4f5e4fd3f [docs] remove attributions from page and added to docs 2013-07-26 11:21:45 +05:30
Anand Doshi
23de6df72e [fix] [minor] replace single quote in territory name while creating territories in setup control 2013-07-25 19:30:13 +05:30
Rushabh Mehta
4dca40195e [feature] Ability to set UOM as Integer-only and related validations. 2013-07-25 17:45:59 +05:30
Anand Doshi
648a5c7e33 [fix] added required permissions for fiscal year, brand, company, country, currency, item group, price list, uom and warehouse 2013-07-23 12:07:55 +05:30
Anand Doshi
832dd5f27d Merge branch 'master' of github.com:webnotes/erpnext 2013-07-22 16:36:38 +05:30
Rushabh Mehta
500ce2bd6d [minor] [fix] #218 add default home icon in website if brand not set so it appears okay for small layouts 2013-07-22 16:30:40 +05:30
Anand Doshi
fbd47e3da5 Merge branch 'master' of github.com:webnotes/erpnext 2013-07-22 16:26:44 +05:30
Anand Doshi
420828a416 [minor] [fix] parent item group query 2013-07-22 15:57:56 +05:30
Rushabh Mehta
c9bcfd1070 [cleanup] [minor] removed 'System Manager' permission for new setups 2013-07-22 15:33:10 +05:30
Anand Doshi
a45d164140 [currency exchange] set the default Currency as To Currency for a new record 2013-07-18 13:31:07 +05:30
Nabin Hait
67e6c80437 [fix] [minor] validate same sales rate patch 2013-07-18 13:25:47 +05:30
Nabin Hait
5b43b3dca5 merged with slow branch 2013-07-18 12:28:09 +05:30
Nabin Hait
6a3b951352 [accounts] [feature] optional checkbox for same rate validation in sales cycle 2013-07-16 18:34:35 +05:30
Anand Doshi
d618b6e1ab [minor] [fix] email digest creation post setup 2013-07-16 17:12:48 +05:30
Anand Doshi
cefccb921e [minor] [webshop] [fix] 2013-07-15 18:28:14 +05:30
Anand Doshi
1ffc5b576c [minor] [for territory] auto add default For Territory in a new Tax Master, Shipping Rule and Price List 2013-07-15 18:09:43 +05:30
Anand Doshi
34736c8d87 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive
Conflicts:
	accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.py
2013-07-11 18:29:32 +05:30
Anand Doshi
946e0de0cf [minor] [fix] 2013-07-11 18:26:00 +05:30
Nabin Hait
cfecd2bc16 [fix] [cleanup] fixes while testing and code cleanup 2013-07-11 17:49:18 +05:30
Rushabh Mehta
e464105c8e [style] Style Fixes for Home Page 2013-07-11 15:28:05 +05:30
Rushabh Mehta
80d83f5ae3 [style] Style Fixes for Home Page 2013-07-11 15:19:13 +05:30
Rushabh Mehta
7571ff36b4 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-07-10 20:43:15 +05:30
Rushabh Mehta
e41bceb3df [feature] [website] Create Default Home Page 2013-07-10 20:42:44 +05:30
Nabin Hait
d96bfaf6af [fix] get_query where options not mentioned 2013-07-10 20:30:00 +05:30
Nabin Hait
eddd4a1674 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-07-10 19:12:14 +05:30
Nabin Hait
a4f0240bfc [conflict] merged for get_query 2013-07-10 19:05:57 +05:30