Commit Graph

6540 Commits

Author SHA1 Message Date
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
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
Nabin Hait
da46a3782f [fix] [minor] get query 2013-07-15 17:52:10 +05:30
Nabin Hait
40cb8fb193 [fix] [minor] Installation Note: pulling from DN and code cleanup 2013-07-15 17:23:49 +05:30
Nabin Hait
a9a914ce97 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-07-15 16:33:46 +05:30
Nabin Hait
a9ec49e0bf [fix] [mapper] add rows only table is blank, allow multiple time pull and validation if same item pulled twice 2013-07-15 16:33:24 +05:30
Anand Doshi
4563ef3aea Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-07-15 14:49:42 +05:30
Anand Doshi
ce36204129 [minor] [item] on adding image, add description html if it is empty 2013-07-15 14:49:03 +05:30
Anand Doshi
c4e9deeea8 [minor] [website] hide shopping cart icon if shopping cart is not enabled 2013-07-15 14:48:14 +05:30
Nabin Hait
1c88490ff9 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-07-15 13:05:09 +05:30
Nabin Hait
a279d78496 [minor] [fix] 2013-07-15 13:04:33 +05:30
Rushabh Mehta
bb2cf07078 [license] added CONTRIBUTING.md 2013-07-15 12:19:56 +05:30
Anand Doshi
921fdfc30a [docs] [install] added instructions for one command install 2013-07-15 11:43:24 +05:30
Nabin Hait
8faa90fb20 [fix] [minor] add customer_name/supplier_name in sales/purchase register 2013-07-12 17:50:34 +05:30
Nabin Hait
87bed52818 [minor] [fix] get_query for cost center 2013-07-12 16:55:03 +05:30
Anand Doshi
e102235662 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-07-11 19:15:33 +05:30
Anand Doshi
9b4961400a [minor] [fix] get queries 2013-07-11 19:13:58 +05:30
Rushabh Mehta
9702bca20c Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-07-11 18:46:53 +05:30
Rushabh Mehta
37fed601e9 [translations] Updated Latest 2013-07-11 18:45:47 +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
Nabin Hait
1ac928ed5c Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-07-11 16:07:53 +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
df92a553cb [style] Added Icons to Pages 2013-07-11 14:50:43 +05:30
Nabin Hait
efc998b61e Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-07-11 12:37:01 +05:30
Rushabh Mehta
278f961daf [minor] [fix] doctype recursive 2013-07-11 12:35:42 +05:30