Commit Graph

6367 Commits

Author SHA1 Message Date
Anand Doshi
573b423a6c Merge branch 'master' of github.com:webnotes/erpnext 2013-07-18 13:26:53 +05:30
Anand Doshi
61cad5076b [minor] [fix] opportunity form, queries, stock uom replace utility 2013-07-18 13:26:27 +05:30
Nabin Hait
67e6c80437 [fix] [minor] validate same sales rate patch 2013-07-18 13:25:47 +05:30
Nabin Hait
60d9a5e2ee [patch] repost billed amt in sales cycle, based on export amount instead of amount in base currency 2013-07-18 13:15:41 +05:30
Nabin Hait
55b5dd2f10 [fix] [mapper] 2013-07-18 13:05:14 +05:30
Nabin Hait
2e652e8294 [fix] [minor] same sales rate throughour sales cycle 2013-07-18 12:30:30 +05:30
Nabin Hait
14f42664ec Merge branch 'master' of github.com:webnotes/erpnext 2013-07-18 12:28:56 +05:30
Nabin Hait
5b43b3dca5 merged with slow branch 2013-07-18 12:28:09 +05:30
Anand Doshi
4daf3dd8a8 [minor] [fix] reload doctype and docfield twice 2013-07-17 18:06:02 +05:30
Anand Doshi
64f316bd2f [minor] [fix] in get item wise tax html, show empty cell if not tax for an account head for a particular item 2013-07-17 15:12:22 +05:30
Anand Doshi
80166e26cc [minor] [selling/buying] use script_manager.trigger instead of calling cscript function directly post item details fetch, so that custom code can be executed 2013-07-17 14:49:13 +05:30
Anand Doshi
cc04a17030 [minor] show brand html in toolbar 2013-07-17 14:15:26 +05:30
Anand Doshi
6537f3d25f [minor] [fix] reload core doctypes before patches 2013-07-17 13:22:04 +05:30
Anand Doshi
bba8664c00 [minor] [contributing] instructions about reporting issues 2013-07-17 13:09:34 +05:30
Anand Doshi
1ba072fa9b [fix] [patch] check in_list_view for Custom DocTypes 2013-07-17 12:41:19 +05:30
Anand Doshi
55da1ff98a [fix] [patch] check in_list_view for Custom DocTypes 2013-07-17 12:36:07 +05:30
Anand Doshi
08352ca0a9 [minor] [fix] installer 2013-07-17 08:24:50 +05:30
Anand Doshi
929fb44769 Merge branch 'master' of github.com:webnotes/erpnext 2013-07-16 20:57:56 +05:30
Anand Doshi
a1299dd652 [minor] fixed patch 2013-07-16 20:56:38 +05:30
Nabin Hait
6f61e2c426 [fix] [minor] net_total on sales/purchase register 2013-07-16 18:47:06 +05:30
Nabin Hait
6a3b951352 [accounts] [feature] optional checkbox for same rate validation in sales cycle 2013-07-16 18:34:35 +05:30
Nabin Hait
618abe487d Merge branch 'master' of github.com:webnotes/erpnext 2013-07-16 17:24:45 +05:30
Nabin Hait
9a380ef40a [fix] [minor] get_query of tax account 2013-07-16 17:24:17 +05:30
Anand Doshi
d618b6e1ab [minor] [fix] email digest creation post setup 2013-07-16 17:12:48 +05:30
Anand Doshi
9c2bb0e1db [minor] [fix] autoset abbreviation if company name is set in complete setup 2013-07-16 16:56:28 +05:30
Anand Doshi
c8f4bda9a2 [minor] [fix] close button in appframe 2013-07-16 16:51:55 +05:30
Anand Doshi
1d5fa40ff2 [minor] [fix] close button in appframe 2013-07-16 16:47:38 +05:30
Anand Doshi
17aa1337bc [minor] fixed patch 2013-07-16 15:22:55 +05:30
Anand Doshi
e47963305d [minor] fixed patch 2013-07-16 15:18:18 +05:30
Anand Doshi
c2b9ce1def [minor] fixed patch 2013-07-16 15:15:02 +05:30
Anand Doshi
526a60b517 [minor] fixed patch 2013-07-16 15:14:13 +05:30
Anand Doshi
447068aefe [minor] fixed patch 2013-07-16 15:11:55 +05:30
Anand Doshi
abf2457889 Merge branch 'master' of github.com:webnotes/erpnext 2013-07-16 15:08:57 +05:30
Nabin Hait
496219ce6b Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-07-16 14:40:40 +05:30
Nabin Hait
cf1829d21c Merge branch 'master' of github.com:webnotes/erpnext into responsive 2013-07-16 14:39:39 +05:30
Nabin Hait
aea0af02aa Merge branch 'master' into slow 2013-07-16 14:28:03 +05:30
Nabin Hait
e724fd45d1 [report] [minor] added warehouse and brand columns in purchase ordered items to be received 2013-07-16 13:23:40 +05:30
Nabin Hait
cbc96d5d14 [fix] [report] accounts receivable/payable 2013-07-16 13:13:38 +05:30
Anand Doshi
2d71a51a08 [minor] fixed patch 2013-07-16 13:06:14 +05:30
Anand Doshi
8ffc42594a Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-07-16 13:00:10 +05:30
Anand Doshi
38bef0e4c9 [patch] merge duplicate leads based on email id 2013-07-16 12:59:23 +05:30
Nabin Hait
642634f6c8 [fix] [report] sales/purchase register: if income/expense account entered in tax table for discount 2013-07-16 12:11:00 +05:30
Rushabh Mehta
edb93bdf0f Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-07-16 12:06:14 +05:30
Rushabh Mehta
54c1545c49 [docs] Updated README, Trademark policy and install 2013-07-16 12:05:41 +05:30
Anand Doshi
9f9877a447 [minor] [patch] save style settings post release of responsive ui 2013-07-16 11:35:24 +05:30
Rushabh Mehta
2861e25fb8 Merge branch 'master' of github.com:webnotes/erpnext into slow
Conflicts:
	stock/doctype/purchase_receipt/purchase_receipt.js
2013-07-15 20:57:26 +02:00
Anand Doshi
05859ad42e Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-07-15 18:30:02 +05:30
Anand Doshi
cefccb921e [minor] [webshop] [fix] 2013-07-15 18:28:14 +05:30
Nabin Hait
00dadc8bd5 [fix] [minor] get query 2013-07-15 18:16:37 +05:30
Anand Doshi
d4e76bc1db [minor] [transaction] validate exchange rate in calculate taxes and totals 2013-07-15 18:10:51 +05:30