Commit Graph

431 Commits

Author SHA1 Message Date
Nabin Hait
a7687e9ab6 [fix] [minor] create default web page only for first company 2013-09-25 13:43:35 +05:30
Nabin Hait
69a3ee54f2 [fix] [minor] create default warehouse on saving of company if not exists 2013-09-25 13:00:22 +05:30
Nabin Hait
11f41955c9 [minor] fixed conflict while merging perpetual branch into master 2013-09-24 14:36:55 +05:30
Anand Doshi
83de391efc Merge branch 'akhileshdarjee-master' into website-wip 2013-09-17 16:09:15 +05:30
Anand Doshi
2840620070 [fix] [minor] [website] 2013-09-17 15:28:58 +05:30
Nabin Hait
142007a226 [fix] [minor] perpetual inventory: account for each warehouse 2013-09-17 15:15:16 +05:30
Anand Doshi
619ed5e949 [fix] [minor] [website] 2013-09-17 13:46:50 +05:30
Nabin Hait
5cd1d54347 [minor] merged with master branch 2013-09-17 10:30:24 +05:30
Nabin Hait
7a75e10a61 [fix] [minor] perpetual inventory: account for each warehouse 2013-09-17 10:21:20 +05:30
Akhilesh Darjee
2e1f94f222 [fix] [pos] hide custom buttons in pos view 2013-09-13 17:37:23 +05:30
Anand Doshi
8a4b21ab8e Merge branch 'master' of github.com:webnotes/erpnext into website-wip 2013-09-11 19:38:38 +05:30
Akhilesh Darjee
fb6d410e60 [fix] test cases fix for price list 2013-09-11 16:18:10 +05:30
Akhilesh Darjee
c3ec72c991 [fix] [minor] merge conflict fixed 2013-09-11 14:49:38 +05:30
Akhilesh Darjee
db59ffb76d [usability] item price moved to price list 2013-09-11 13:05:24 +05:30
Nabin Hait
6e6ba9de14 [minor] label changed in sms settings 2013-09-10 17:20:42 +05:30
Anand Doshi
429fd1d3d8 Merge branch 'website-wip' of github.com:webnotes/erpnext into website-wip 2013-09-10 12:54:10 +05:30
Rushabh Mehta
7c2312a74c [website] [minor] moving to framework 2013-09-10 12:51:52 +05:30
Anand Doshi
9686b937bb [fix] [minor] print hide communication table 2013-09-10 10:54:34 +05:30
Rushabh Mehta
bdb846f665 [website] [minor] moving to framework 2013-09-09 17:31:19 +05:30
Rushabh Mehta
c59c4e0699 [website] [minor] moving to framework 2013-09-09 12:17:45 +05:30
Rushabh Mehta
46089dbc97 [website] [minor] moving website helper methods to doctypes 2013-09-09 11:32:24 +05:30
Nabin Hait
a653cd3608 [minor] fixed conflict while merging with master 2013-09-05 10:56:44 +05:30
Nabin Hait
2162fee396 Merge pull request #792 from akhileshdarjee/master
[pos][fix] fixed pos view in sales_invoice.js
2013-09-04 22:03:42 -07:00
Akhilesh Darjee
734b2aab5c [fix] pos setting link fields validate to specific company 2013-09-04 18:48:08 +05:30
Nabin Hait
bf4d27ecf1 [minor] repost future gl entries only for current voucher items 2013-09-04 17:55:45 +05:30
Anand Doshi
36b63a44b9 [fix] [minor] profile query 2013-09-03 15:33:56 +05:30
Nabin Hait
3f5e59eeeb [minor] [cleanup] Landed cost wizard 2013-09-02 18:44:55 +05:30
Rushabh Mehta
96690ebd0f [communication] [minor] cleaed model 2013-09-02 17:04:27 +05:30
Nabin Hait
d85d63bb81 [minor] renamed perpetual accounting to make_accounting_entry_for_every_stock_entry 2013-08-28 19:24:52 +05:30
Nabin Hait
92b0e777e8 [fix] [minor] merged with master 2013-08-26 16:55:42 +05:30
Nabin Hait
27994c216a [perpetual accounting] gl entries based on stock_value difference in sl entries 2013-08-26 16:53:30 +05:30
Akhilesh Darjee
d6aa4bff7f [pos] pos view first commit 2013-08-22 17:26:43 +05:30
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