Anand Doshi
|
879ec66ea3
|
Merge branch 'production' of github.com:webnotes/erpnext into production
Conflicts:
accounts/doctype/purchase_invoice_item/purchase_invoice_item.txt
buying/doctype/purchase_order_item/purchase_order_item.txt
buying/doctype/supplier_quotation_item/supplier_quotation_item.txt
patches/patch_list.py
|
2012-12-19 22:28:00 +05:30 |
|
Rushabh Mehta
|
8ebf1b86f8
|
added disabled in Report and no_sync fields in import_merge
|
2012-12-19 15:34:00 +05:30 |
|
Nabin Hait
|
4ecc785aab
|
fixed conflict
|
2012-12-19 12:18:15 +05:30 |
|
Rushabh Mehta
|
647e0d1164
|
updates to product_page (search) and kb fix
|
2012-12-18 14:47:54 +05:30 |
|
Nabin Hait
|
5f175dfd00
|
Merge branch 'master' into production
|
2012-12-18 13:49:07 +05:30 |
|
Rushabh Mehta
|
ee472b0926
|
upgraded to bootstrap 2.2
|
2012-12-18 11:47:13 +05:30 |
|
Nabin Hait
|
f8de5b9878
|
merged with master
|
2012-12-14 10:43:56 +05:30 |
|
Nabin Hait
|
df011dbfa5
|
deleted unwanted control doctype and pages
|
2012-12-14 10:42:09 +05:30 |
|
Nabin Hait
|
22c3f63edd
|
small fixes: sms, quotation messages etc
|
2012-12-13 15:09:42 +05:30 |
|
Rushabh Mehta
|
291449b6fb
|
refactored javascript models
|
2012-12-13 12:53:21 +05:30 |
|
Rushabh Mehta
|
9e12af4b7c
|
updated recipients email in communication
|
2012-12-12 16:13:29 +05:30 |
|
Rushabh Mehta
|
686022f777
|
fixes to recent patch and removed company_control, home_control, webforms, wip_monitor
|
2012-12-12 15:25:51 +05:30 |
|
Nabin Hait
|
be356b8692
|
Merge branch 'master' of github.com:webnotes/erpnext into production
|
2012-12-12 12:58:22 +05:30 |
|
Rushabh Mehta
|
39b5b0653e
|
assign_to / messages public bug
|
2012-12-11 16:28:33 +05:30 |
|
Rushabh Mehta
|
24a69613e0
|
update file urls
|
2012-12-11 15:58:19 +05:30 |
|
Anand Doshi
|
c3b9a00c53
|
changed old type txt to new type txtt
|
2012-12-11 15:20:53 +05:30 |
|
Anand Doshi
|
36bf910563
|
removed Standard from default print format
|
2012-12-11 14:01:59 +05:30 |
|
Rushabh Mehta
|
880e26d9c2
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-12-07 15:23:41 +01:00 |
|
Anand Doshi
|
d62845641d
|
fix in assign to notifications
|
2012-12-07 19:28:27 +05:30 |
|
Rushabh Mehta
|
4ddbacc460
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-12-07 14:40:42 +01:00 |
|
Anand Doshi
|
b6a0f780f0
|
fix in assign notifications
|
2012-12-07 19:10:16 +05:30 |
|
Rushabh Mehta
|
989ca93b17
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-12-06 07:17:58 +01:00 |
|
Rushabh Mehta
|
2d05732589
|
kb - error fixed
|
2012-12-05 17:32:52 +05:30 |
|
Rushabh Mehta
|
cf9668758a
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-12-03 11:00:23 +01:00 |
|
Rushabh Mehta
|
346c832475
|
remove rename_tool
|
2012-12-03 14:15:53 +05:30 |
|
Rushabh Mehta
|
fccdfb1ccf
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-12-03 07:03:33 +01:00 |
|
Rushabh Mehta
|
833f070991
|
added allow_rename and also fix in autonotification
|
2012-12-03 11:33:08 +05:30 |
|
Rushabh Mehta
|
7c49b32636
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-12-03 05:54:25 +01:00 |
|
Rushabh Mehta
|
08a437bad7
|
removed schedule date mandatory from purchase receipt
|
2012-12-03 10:21:52 +05:30 |
|
Rushabh Mehta
|
1491328bf1
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-11-30 12:49:11 +01:00 |
|
Anand Doshi
|
ea61d8cf99
|
replaced set
|
2012-11-30 17:18:45 +05:30 |
|
Anand Doshi
|
535fbb1b00
|
replaced get_value
|
2012-11-30 17:16:03 +05:30 |
|
Rushabh Mehta
|
f9d4927303
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-11-30 12:32:50 +01:00 |
|
Anand Doshi
|
0fd99e7536
|
removed unnecessary imports
|
2012-11-30 16:38:04 +05:30 |
|
Rushabh Mehta
|
35c017a78f
|
cleanup of notification control: now in boot
|
2012-11-30 10:57:28 +05:30 |
|
Rushabh Mehta
|
b12d5363bc
|
merge
|
2012-11-29 16:30:57 +05:30 |
|
Rushabh Mehta
|
2df69f048e
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-11-29 10:55:30 +01:00 |
|
Nabin Hait
|
5f91862aef
|
error fixed in adding answer in knowledge base
|
2012-11-29 15:23:26 +05:30 |
|
Rushabh Mehta
|
d7fe2bfe1b
|
webnotes.model.doctype (new version)
|
2012-11-29 11:49:56 +05:30 |
|
Rushabh Mehta
|
42bd645dea
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-11-28 11:35:07 +01:00 |
|
Rushabh Mehta
|
57774c032c
|
contact.js: set customer, supplier
|
2012-11-28 16:01:58 +05:30 |
|
Rushabh Mehta
|
d547aee201
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-11-27 14:27:11 +01:00 |
|
Rushabh Mehta
|
80127bfb6a
|
refactored communication and added to Lead / Contact
|
2012-11-27 18:41:35 +05:30 |
|
Rushabh Mehta
|
e1a1a7f637
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-11-26 13:48:53 +01:00 |
|
Rushabh Mehta
|
c4e7b6800a
|
separated communication view
|
2012-11-26 18:18:10 +05:30 |
|
Rushabh Mehta
|
1d1d96641d
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-11-24 11:16:16 +01:00 |
|
Rushabh Mehta
|
bf09c672cd
|
support ticket response deprecated, moved to communication
|
2012-11-24 15:26:48 +05:30 |
|
Rushabh Mehta
|
17db39dc94
|
moving support ticket response to communication (wip)
|
2012-11-24 14:45:31 +05:30 |
|
Rushabh Mehta
|
4d4a21eab7
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-11-23 13:36:02 +01:00 |
|
Rushabh Mehta
|
78d4b49e62
|
introducing model 3.0, refactored import module
|
2012-11-23 17:53:43 +05:30 |
|