Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,762 Commits 3 Branches 0 Tags 1 GiB
23649c6852
Commit Graph

471 Commits

Author SHA1 Message Date
Anand Doshi
1fc9ae2230 Fixes and Validations for nested doctypes 2012-09-24 14:00:59 +05:30
Rushabh Mehta
09d84b6575 Stock Ageing & release of Analytics 2012-09-21 19:46:24 +05:30
Rushabh Mehta
f200c5296d added sales analytics 2012-09-21 15:19:40 +05:30
Anand Doshi
6450b12881 fix in permissions of role 'All'. Fix in Credit Days and Credit Limit permissions in Customer form 2012-09-17 11:34:24 +05:30
Anand Doshi
4de55b6f6b Merge branch 'master' of github.com:webnotes/erpnext into unicode 2012-09-10 14:44:03 +05:30
Nabin Hait
eb9f6eda02 order type fix in quote/SO 2012-09-10 14:36:49 +05:30
Anand Doshi
e67bcc38b4 Merge branch 'master' of github.com:webnotes/erpnext into unicode 2012-09-06 17:51:05 +05:30
Anand Doshi
f480dc9d2e fix in opportunity to quotation fetch 2012-09-06 17:50:44 +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
b211a41547 Merge branch 'master' of github.com:webnotes/erpnext into unicode 2012-08-31 13:39:58 +05:30
Anand Doshi
00d3c7c67d open communication in dialog 2012-08-31 13:25:03 +05:30
Anand Doshi
62a3881837 Merge branch 'master' of github.com:webnotes/erpnext into unicode 2012-08-30 18:17:20 +05:30
Nabin Hait
fff16c337d fixes in over billing validation 2012-08-29 12:07:32 +05:30
Nabin Hait
9c043b2f51 Billed amount in SO and DN based on export amount and patch for it 2012-08-29 11:46:12 +05:30
Anand Doshi
998d39f71b Merge branch 'master' of github.com:webnotes/erpnext into unicode 2012-08-24 12:17:33 +05:30
Anand Doshi
ba278000d7 edit / add nodes allowed in sales browser, only if user has valid permissions 2012-08-24 12:15:44 +05:30
Rushabh Mehta
24fabf3b73 cleaned up source from lead 2012-08-06 15:21:35 +05:30
Rushabh Mehta
f83159edbe Merge branch 'unicode' of github.com:webnotes/erpnext into unicode 2012-08-06 10:17:38 +05:30
Rushabh Mehta
49dc5da0dc refactor unicode changes and merge with master with refactored email 2012-08-03 16:02:24 +05:30
Rushabh Mehta
384b61749e added 'blog_subscriber' and 'unsubscribed' fields 2012-08-03 14:09:32 +05:30
Rushabh Mehta
f0018b5e05 added unsubscribed fields in Lead and Contact and cleaned up sendmail function 2012-08-02 18:03:12 +05:30
Anand Doshi
cf546d547d fix in quotation item's get query 2012-08-01 12:05:13 +05:30
Anand Doshi
96efd2ba9b fix in quotation item's get query 2012-08-01 12:00:30 +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
e87482ac86 Fixed: Lead Lost Reason message 2012-07-26 12:48:26 +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
18b9eccdfa packing list issue fixed 2012-07-18 13:31:08 +05:30
Nabin Hait
41c922d200 Merge branch 'master' of github.com:webnotes/erpnext 2012-07-18 13:19:32 +05:30
Nabin Hait
510eda353a packing list issue fixed 2012-07-18 13:19:01 +05:30
Nabin Hait
8b091cd864 Merge branch 'dev' of github.com:webnotes/erpnext into dev 2012-07-16 16:35:10 +05:30
Nabin Hait
a25ebe3dbf Conversion rate fieldtype set as float (from currency) 2012-07-16 16:34:28 +05:30
Anand Doshi
2f192a6167 Merge branch 'dev' of github.com:webnotes/erpnext into dev 2012-07-16 16:33:22 +05:30
Anand Doshi
8499773db8 fix in last sales and quote rate in quotation 2012-07-16 16:33:10 +05:30
Rushabh Mehta
527c5b6da5 Merge branch 'dev' of github.com:webnotes/erpnext into dev 2012-07-16 15:45:18 +05:30
Rushabh Mehta
3c419c5e05 cur_frm.doc re-reference when is called 2012-07-16 15:44:38 +05:30
Nabin Hait
65535da220 Merge branch 'dev' of github.com:webnotes/erpnext into dev 2012-07-16 15:38:41 +05:30
Nabin Hait
49e170153e Include in print rate validation added 2012-07-16 15:38:11 +05:30
Anand Doshi
e7c54a4714 Merge branch 'dev' of github.com:webnotes/erpnext into dev 2012-07-16 15:16:27 +05:30
Anand Doshi
7f2385cee9 Merge branch 'master' into dev 2012-07-16 15:15:34 +05:30
Anand Doshi
59fa430be3 fixes in quotation item code get query 2012-07-16 15:15:24 +05:30
Rushabh Mehta
9e9809a44f Merge branch 'dev' of github.com:webnotes/erpnext into dev 2012-07-16 14:17:22 +05:30
Rushabh Mehta
2eef40bf1e get_field > wn.meta.get_docfield 2012-07-16 14:16:57 +05:30
Nabin Hait
8f5cd388cc Merge branch 'dev' of github.com:webnotes/erpnext into dev 2012-07-16 12:50:25 +05:30
Nabin Hait
388e09834c Check duplicate SO entry for same po no and customer 2012-07-16 12:49:52 +05:30
Anand Doshi
bb81c198f5 Merge branch 'dev' of github.com:webnotes/erpnext into dev 
Conflicts:
	public/js/all-app.js
	public/js/all-web.js
 2012-07-13 16:48:08 +05:30
Anand Doshi
9ec8024db7 show order type icon in sales order list view 2012-07-13 16:46:12 +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
Nabin Hait
70db682a9a fixed conflict in setup control 2012-07-12 11:47:40 +05:30
Rushabh Mehta
5faf37f312 item group cleanup 2012-07-12 11:33:00 +05:30
Rushabh Mehta
cf969143f2 cleaned up customer group 2012-07-12 09:54:43 +05:30
Rushabh Mehta
b9fabf8e16 sales bom cleanup 2012-07-11 19:18:50 +05:30
Nabin Hait
cfc6bb1d6c consider warehouse, serial no and batch no from packing list for sales bom item and populate packing list only for sales bom items 2012-07-11 13:14:52 +05:30
Nabin Hait
0a38e4528b Merge branch 'master' of github.com:webnotes/erpnext 2012-07-10 10:28:21 +05:30
Nabin Hait
1b310c26ce removed depricated commenting style 2012-07-10 10:27:58 +05:30
Anand Doshi
95a822c701 Fetch Customer's Item Code in Sales Transaction 2012-07-09 11:09:07 +05:30
Nabin Hait
cb2e76a79c delete row issue in grid fixed 2012-07-05 14:44:39 +05:30
Anand Doshi
d383e573fc contact, address list views and allow their deletion from customer / supplier form 2012-07-02 19:45:35 +05:30
Anand Doshi
e301e8a6c1 Merge branch 'master' into dev 
Conflicts:
	erpnext/buying/doctype/quality_inspection/quality_inspection.py
 2012-06-28 18:40:57 +05:30
Nabin Hait
2c2a17f138 pull available qty in so and DN in selection of item 2012-06-27 15:14:58 +05:30
Anand Doshi
d4425cc57d Merge branch 'master' into dev 
Conflicts:
	erpnext/support/doctype/maintenance_visit/maintenance_visit.py
 2012-06-27 14:13:34 +05:30
Anand Doshi
81fa802e09 Merge branch 'master' into dev 2012-06-25 20:06:54 +05:30
Anand Doshi
8ae5ba9abf fixes related to --> clear locals and then sync locals when whole doclist is passed 2012-06-25 20:05:35 +05:30
Nabin Hait
a5e972dd89 reserved warehouse in so and delivery warehouse in dn can be different 2012-06-25 18:06:37 +05:30
Nabin Hait
318eab813c delete customer account on deletion of customer record 2012-06-22 13:35:13 +05:30
Anand Doshi
2939a0ea65 fetch price list rates when creating quotation from opportunity 2012-06-21 11:20:37 +05:30
Anand Doshi
f8946b1e31 fix in buttons displayed - on change of status in lead form 2012-06-18 18:04:28 +05:30
Anand Doshi
7d1e8f218b change date field for sales invoice in sales personwise transaction summary search criteria 2012-06-14 18:11:36 +05:30
Rushabh Mehta
4c56275d26 appframe is now heading 2012-06-14 11:05:09 +05:30
Anand Doshi
7deaff1979 fixed default tax fetch issue 2012-06-13 14:20:24 +05:30
Anand Doshi
0146ddcfc6 delete communication log for supplier and customer, on trash 2012-06-12 14:09:44 +05:30
Anand Doshi
89e2b3bda4 minor fix in lead's listview 2012-06-12 13:11:29 +05:30
Anand Doshi
3b6eda3b45 fix in listviews of lead, customer and supplier 2012-06-12 13:08:57 +05:30
Nabin Hait
be5e5059c3 Lead Organization field added in quotation 2012-06-08 16:15:08 +05:30
Nabin Hait
2e3579a4eb Item Barcode implemented 2012-06-07 19:09:17 +05:30
Anand Doshi
dbb84a271e Merge branch 'master' of github.com:webnotes/erpnext into comm_log 
Conflicts:
	erpnext/selling/doctype/lead/lead.js
	erpnext/setup/doctype/contact_control/contact_control.js
 2012-06-05 18:37:17 +05:30
Nabin Hait
e315aba130 expected delivery date mandatory only if order type is sales 2012-06-01 10:11:14 +05:30
Anand Doshi
a6708fb748 new doctype: communication 2012-05-31 14:53:55 +05:30
Nabin Hait
0908b2709b fixed conflict 2012-05-31 11:49:37 +05:30
Nabin Hait
5c1de3a639 fixed conflict 2012-05-31 11:47:09 +05:30
Nabin Hait
353bc313a6 Link to Sales/accounts browser fixed 2012-05-31 11:43:14 +05:30
Anand Doshi
82695ddd90 fixes in transaction history of customer and supplier 2012-05-29 14:14:27 +05:30
Anand Doshi
2ac77beb50 fix in packing list issue 2012-05-29 11:29:52 +05:30
Anand Doshi
2ad2426610 fix in get other charges of sales_common.py 2012-05-28 16:05:54 +05:30
Anand Doshi
041cea763e fix in stock ledger entry for items have sales bom 2012-05-25 17:49:37 +05:30
Anand Doshi
16cf4fa806 fix in get_item_list, which was causing negative stock error 2012-05-25 16:54:27 +05:30
Anand Doshi
fcbd2ad792 Merge branch 'master' of github.com:webnotes/erpnext 2012-05-23 18:27:29 +05:30
Anand Doshi
9da0bf6106 fix in customer address contact report 2012-05-23 18:27:05 +05:30
Nabin Hait
4aaaa8af7b Merge branch 'master' of github.com:webnotes/erpnext 2012-05-23 16:22:41 +05:30
Nabin Hait
2b06b903a5 Merge branch 'shf_rename' 2012-05-23 16:22:24 +05:30
Nabin Hait
517eacf9e3 packing list code updated for duplicate items in item table 2012-05-23 16:21:39 +05:30
Anand Doshi
9327bb9585 fix in tag viewing in doclistview 2012-05-23 15:12:22 +05:30
Nabin Hait
86df78aabc fixed conflict 2012-05-23 11:33:28 +05:30
Anand Doshi
38830ddae1 removed console log in customer.js 2012-05-23 10:55:59 +05:30
Nabin Hait
611157447f sms fix 2012-05-22 17:25:39 +05:30
Anand Doshi
e780f661a7 fix in transaction history 2012-05-22 17:04:33 +05:30
Nabin Hait
86375f089a Merge branch 'shf_rename' 
Conflicts:
	erpnext/patches/patch_list.py
 2012-05-21 15:48:21 +05:30
Nabin Hait
cba9c716f2 Remove all those parent items from packing details which are no longer present in main item table 2012-05-21 15:35:23 +05:30
Nabin Hait
fec3f783af custom field included in docfield query 2012-05-21 14:40:25 +05:30
Anand Doshi
1aae261490 delete button in doclistview 2012-05-21 14:31:03 +05:30
Anand Doshi
df914991c4 Merge branch 'shf_rename' 2012-05-18 18:21:43 +05:30
Anand Doshi
bde13a655f moved uom next to qty in quotation item 2012-05-18 18:21:29 +05:30
Anand Doshi
d643d367ca Merge branch 'shf_rename' 
Conflicts:
	public/js/all-app.js
	public/js/all-web.js
 2012-05-18 11:52:31 +05:30
Anand Doshi
acd291a228 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-18 11:50:08 +05:30
Nabin Hait
c1f1702e22 so pending item patch 2012-05-18 11:43:10 +05:30
Anand Doshi
fc9145425d Fixes in Print Formats - discount in description 2012-05-17 18:11:54 +05:30
Nabin Hait
7a13b238cb fixes in sales order pending items report 2012-05-17 18:06:14 +05:30
Anand Doshi
c7e26873c0 Merge branch 'shf_rename' 2012-05-17 15:28:54 +05:30
Nabin Hait
8b2473cc40 report fixed: sales persons target variance (item group wise) 2012-05-17 12:47:48 +05:30
Anand Doshi
1bba28a723 Merge branch 'shf_rename' 
Conflicts:
	erpnext/patches/patch_list.py
 2012-05-15 18:22:55 +05:30
Nabin Hait
ed02a85184 fixed issue 2012-05-15 12:15:19 +05:30
Rushabh Mehta
deeae62b18 merge js/css 2012-05-14 15:03:17 +05:30
Anand Doshi
4a3d3d75de Merge branch 'shf_rename' 
Conflicts:
	erpnext/patches/patch_list.py
 2012-05-14 12:53:29 +05:30
Rushabh Mehta
7483ae9573 fix in button disablity leading to double click 2012-05-11 16:23:41 +05:30
Rushabh Mehta
0eb790a0ae cleaned up imports, doc 2012-05-11 15:53:37 +05:30
Nabin Hait
956eeb1361 fetch defaults after mapping from prev document 2012-05-11 14:45:02 +05:30
Anand Doshi
3fa25faca2 fixes after merge with cms 2012-05-10 15:15:43 +05:30
Anand Doshi
bf68e04d2f Merge branch 'master' of github.com:webnotes/erpnext 
Conflicts:
	erpnext/patches/patch_list.py
 2012-05-10 12:40:58 +05:30
Nabin Hait
08f4cb7f6a stock reco fix in valuation and cancellation 2012-05-10 12:13:47 +05:30
Anand Doshi
df8b4ab9b1 Merge branch 'cms' 2012-05-10 10:21:29 +05:30
Rushabh Mehta
078867c411 fixes to listview 2012-05-09 16:15:51 +05:30
Nabin Hait
7f82256394 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-09 15:27:03 +05:30
Nabin Hait
68f9ad31ae serialized inventory fixes : serial no for sales bom child item and rejected qty 2012-05-09 15:26:27 +05:30
Rushabh Mehta
e45042e011 merge 2012-05-09 12:22:50 +05:30
Anand Doshi
c241a476ab moved shipping address in basic info section 2012-05-09 11:07:15 +05:30
Rushabh Mehta
458ca8eddb cms fixes 2012-05-09 10:17:08 +05:30
Rushabh Mehta
a920943e43 new cms with public folder 2012-05-07 18:00:57 +05:30
Rushabh Mehta
252664e288 remove unsupported for google 2012-05-07 10:43:18 +05:30
Nabin Hait
7c60fc13b2 reports fixed: itemwise sales/delivery report 2012-05-03 18:22:32 +05:30
Nabin Hait
d8df7b5884 quotation fix 2012-05-03 17:49:45 +05:30
Nabin Hait
dc7ffe47b2 fixes in quotation 2012-05-03 14:55:21 +05:30
Nabin Hait
16b6386648 fixes in quotation 2012-05-03 14:41:35 +05:30
Nabin Hait
32826a8cf1 fixes in customerwise price list 2012-05-03 13:10:34 +05:30
Nabin Hait
ab96d12086 fixes in customerwise price list 2012-05-02 12:19:33 +05:30
Anand Doshi
98ae634c50 fixes in sales order item widths 2012-05-01 18:31:40 +05:30
Nabin Hait
57d7c815d2 field arrangement in sales cycle 2012-05-01 12:35:12 +05:30
Nabin Hait
926f46f04a Fixed conflict while merging with master 2012-05-01 11:51:08 +05:30
Nabin Hait
d58da50f50 Merge branch 'master' of github.com:webnotes/erpnext 2012-05-01 11:37:45 +05:30
Nabin Hait
2ade43a647 field arrangement in sales cycle 2012-05-01 11:37:13 +05:30
Rushabh Mehta
79a664b4dc cleaned up lead, opportunity, jv 2012-04-30 16:12:03 +05:30
Nabin Hait
41cc32790f Fixed issie in auto notification 2012-04-30 14:36:18 +05:30
Nabin Hait
50c799880a Merge branch 'master' of github.com:webnotes/erpnext 2012-04-26 12:47:30 +05:30
Nabin Hait
663e971557 Make next document button hide/unhide 2012-04-24 11:39:54 +05:30
Nabin Hait
6ed865f89a Fld label based on currency 2012-04-23 10:37:28 +05:30
Nabin Hait
f7c506d69e fixed conflict while merging with master branch 2012-04-20 13:58:43 +05:30
Nabin Hait
e72ae2a19b fixed conflict 2012-04-20 13:41:09 +05:30
Anand Doshi
b301251090 Store base currency on client side 2012-04-20 11:51:27 +05:30
Nabin Hait
239e79038f Customer/customer group wise price list 2012-04-20 10:25:03 +05:30
Anand Doshi
44f16eaefa Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-17 13:00:01 +05:30
Anand Doshi
b9e9197e5f fix in doclistview - check if _user_tags exists before rendering 2012-04-17 12:59:18 +05:30
Rushabh Mehta
38bdf6c5e7 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-17 12:41:04 +05:30
Rushabh Mehta
2146fd17e7 new sales_browser 2012-04-17 12:40:37 +05:30
Anand Doshi
24e18569d9 fixes in install docs for roles 2012-04-17 11:45:35 +05:30
Nabin Hait
6f89f1eb86 fixes in sales cycle 2012-04-16 14:44:47 +05:30
Nabin Hait
eb3bb01431 Update erpnext/selling/doctype/sales_order/sales_order.js 2012-04-16 13:41:06 +05:30
Nabin Hait
6c615d9527 Merge branch 'master' of github.com:webnotes/erpnext 2012-04-13 14:14:39 +05:30
Anand Doshi
7aafb7e19e Purchase Requisition to Purchase Request 2012-04-13 11:52:17 +05:30
Rushabh Mehta
97ae17eaf7 merge 2012-04-13 11:42:56 +05:30
Rushabh Mehta
f1264a7f76 listing, module pages in appframe 2012-04-13 11:41:43 +05:30
Anand Doshi
83808267d5 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-13 11:40:38 +05:30
Anand Doshi
1c2ac00a82 fixes in sales cycle 2012-04-13 11:38:01 +05:30
Anand Doshi
f31fc22ef0 fixes in doctype 2012-04-13 11:37:19 +05:30
Anand Doshi
09e8c4cd2d further fixes 2012-04-12 17:51:53 +05:30
Anand Doshi
5ed0b6971c Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-11 17:51:12 +05:30
Anand Doshi
e68fe505b9 custom fields creation patch - not to be executed automatically 2012-04-11 17:49:21 +05:30
Nabin Hait
c594bbcae0 address html issue fixed 2012-04-11 17:14:45 +05:30
Anand Doshi
87a2c5cc69 Merge branch 'master' of github.com:webnotes/erpnext into shf_rename 
Conflicts:
	erpnext/accounts/doctype/c_form/c_form.txt
	erpnext/patches/patch_list.py
	erpnext/setup/doctype/permission_control/permission_control.py
 2012-04-09 12:14:53 +05:30
Anand Doshi
82042f1cff fixes after sync 2012-04-06 17:54:17 +05:30
Anand Doshi
7e0479bc4c cleanup of search criteria 2012-04-05 18:27:56 +05:30
Nabin Hait
9ba2e49468 Update erpnext/selling/doctype/sales_common/sales_common.js 2012-04-05 16:54:19 +05:30
Nabin Hait
758eed555c Update erpnext/selling/doctype/sales_common/sales_common.js 2012-04-05 16:45:33 +05:30
Nabin Hait
f77c940fcf fixed price list currency issue 2012-04-05 16:29:02 +05:30
Anand Doshi
fa0cd89a7c change from labels to fieldname in cur_frm.cscript 2012-04-05 13:03:35 +05:30
Anand Doshi
5112b5b6b8 rerun of rename_dt 2012-04-02 19:12:29 +05:30
Anand Doshi
c88ae2be4d rename dt second cut 2012-03-30 18:18:36 +05:30
Anand Doshi
fedfd89e4a rename dt first cut 2012-03-30 12:29:06 +05:30
Anand Doshi
37fb9c8f27 Merge branch 'handlerupdate' of github.com:webnotes/erpnext into shf_rename 
Conflicts:
	version.num
 2012-03-29 15:35:08 +05:30
Anand Doshi
7ff696fb12 Merge branch 'renamedt' into shf_rename 
Conflicts:
	erpnext/patches/patch_list.py
 2012-03-29 15:31:17 +05:30
Anand Doshi
fddb782a82 Merge branch 'renamedt' of github.com:webnotes/erpnext into renamedt 2012-03-29 15:28:16 +05:30
Rushabh Mehta
635f359a71 Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate 2012-03-28 15:18:28 +02:00
Rushabh Mehta
43d64c6116 Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-28 15:17:59 +02:00
Anand Doshi
779a365420 fix in print hide of amount in words 2012-03-28 18:31:26 +05:30
Anand Doshi
c9456c18dc listviews 2012-03-28 17:48:30 +05:30
Anand Doshi
2513e50dc4 Merge branch 'handlerupdate' of github.com:webnotes/erpnext into shf_merge 
Conflicts:
	erpnext/website/doctype/style_settings/style_settings.txt
	version.num
 2012-03-27 19:37:10 +05:30
Anand Doshi
a30fbd004e merge of sync handler and sync_file_db - first cut 2012-03-27 19:31:38 +05:30
Anand Doshi
c009450ef0 fix in item addition - details fetching 2012-03-26 14:17:30 +05:30
Nabin Hait
e2fe5629f0 Merge branch 'master' of github.com:webnotes/erpnext 2012-03-26 11:07:01 +05:30
Rushabh Mehta
9d0ea6a5f1 Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-26 07:25:22 +02:00
Anand Doshi
5f9501d4d8 Merge branch 'sync_file_db' into shf_merge 
Conflicts:
	erpnext/projects/doctype/project/project.txt
 2012-03-23 14:51:35 +05:30
Anand Doshi
134ca41db8 Merge branch 'sync_file_db' of github.com:webnotes/erpnext into sync_file_db 2012-03-23 12:45:05 +05:30
Anand Doshi
358304d216 fix in sales common regarding date formatting 2012-03-23 11:12:03 +05:30
Rushabh Mehta
1952f5b033 lead listview 2012-03-22 12:21:56 +05:30
Rushabh Mehta
6ac1d73731 lead listview 2012-03-22 12:10:49 +05:30
Rushabh Mehta
3f46696db2 removed slider ui 2012-03-22 11:37:08 +05:30
Nabin Hait
0ad2ef2111 sync with respect to file 2012-03-21 15:02:39 +05:30
Rushabh Mehta
a665c1f60d stylefixes and listviews 2012-03-21 11:47:58 +05:30