Rushabh Mehta
|
a49a552a37
|
merge
|
2012-08-06 14:30:31 +05:30 |
|
Rushabh Mehta
|
cea0e795b0
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-08-06 14:20:46 +05:30 |
|
Rushabh Mehta
|
5d4a9f8554
|
date format bug fixed
|
2012-08-06 14:20:15 +05:30 |
|
Rushabh Mehta
|
48f5f40ae2
|
moved recurring to daily from every time
|
2012-08-06 14:19:11 +05:30 |
|
Anand Doshi
|
a4f6529801
|
in item's update page name, if item name is null, create page name with only the name
|
2012-08-06 13:42:19 +05:30 |
|
Anand Doshi
|
1c2b192be6
|
Merge branch 'master' of github.com:webnotes/erpnext into unicode
Conflicts:
erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py
|
2012-08-06 13:36:19 +05:30 |
|
Nabin Hait
|
337fef0859
|
call item on_update from UOM Replace Utility
|
2012-08-06 13:33:32 +05:30 |
|
Anand Doshi
|
e64d900322
|
Merge branch 'master' of github.com:webnotes/erpnext into unicode
Conflicts:
erpnext/patches/july_2012/repost_stock_due_to_wrong_packing_list.py
|
2012-08-06 13:23:16 +05:30 |
|
Nabin Hait
|
fd03762445
|
call item on_update from UOM Replace Utility
|
2012-08-06 13:18:32 +05:30 |
|
Rushabh Mehta
|
6243f29ab3
|
framework updates
|
2012-08-06 11:15:22 +05:30 |
|
Rushabh Mehta
|
f83159edbe
|
Merge branch 'unicode' of github.com:webnotes/erpnext into unicode
|
2012-08-06 10:17:38 +05:30 |
|
Anand Doshi
|
326f88cce6
|
fixed patch: repost stock due to wrong packing list
|
2012-08-03 19:19:23 +05:30 |
|
Anand Doshi
|
fea3b64dd0
|
fixed patch: repost stock due to wrong packing list
|
2012-08-03 19:14:42 +05:30 |
|
Anand Doshi
|
df902d1a0c
|
patch: repost stock due to wrong packing list entries - optimized query using index and subqueries
|
2012-08-03 19:11:11 +05:30 |
|
Anand Doshi
|
786444e6bf
|
changed document_type of 'Communication' to 'Master' to enable importing
|
2012-08-03 16:15:39 +05:30 |
|
Rushabh Mehta
|
49dc5da0dc
|
refactor unicode changes and merge with master with refactored email
|
2012-08-03 16:02:24 +05:30 |
|
Anand Doshi
|
b7cc66384d
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-08-03 14:19:36 +05:30 |
|
Anand Doshi
|
3d549775e1
|
mark 'Supplier Quotation' as a beta feature
|
2012-08-03 14:19:05 +05:30 |
|
Rushabh Mehta
|
c0fded82e6
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-08-03 14:18:05 +05:30 |
|
Rushabh Mehta
|
52006ca83d
|
bugfix in scheduler
|
2012-08-03 14:15:25 +05:30 |
|
Rushabh Mehta
|
e5984873e6
|
added standard mail footer and function to get monthly bulk mail limit
|
2012-08-03 14:15:07 +05:30 |
|
Rushabh Mehta
|
ba54cf6eef
|
added 'Email Send' feature in blog to send blog by mail to all subscribers
|
2012-08-03 14:14:02 +05:30 |
|
Rushabh Mehta
|
5f21cc03e6
|
created files for blog subscription to be embedded in blog and blog_page
|
2012-08-03 14:13:30 +05:30 |
|
Rushabh Mehta
|
0c5b438623
|
framework updates
|
2012-08-03 14:12:14 +05:30 |
|
Rushabh Mehta
|
4b3b25e1d6
|
aded 'add_subscriber' method to be called from website
|
2012-08-03 14:10:59 +05:30 |
|
Rushabh Mehta
|
384b61749e
|
added 'blog_subscriber' and 'unsubscribed' fields
|
2012-08-03 14:09:32 +05:30 |
|
Nabin Hait
|
175771c699
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-08-03 08:40:14 +05:30 |
|
Nabin Hait
|
8292691470
|
stock repost patch
|
2012-08-03 08:39:17 +05:30 |
|
Anand Doshi
|
e69c7f487f
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-08-02 18:53:31 +05:30 |
|
Anand Doshi
|
a67a74fee1
|
supplier quotation, project shift patch
|
2012-08-02 18:53:00 +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 |
|
Rushabh Mehta
|
a4fe7180f4
|
html generation moved from web.py to web_cache.py so it can be called from other places as a response from server.py
|
2012-08-02 13:07:23 +05:30 |
|
Nabin Hait
|
dd9d4bbdea
|
repost stock patch due to wrong packing list
|
2012-08-02 10:56:40 +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 |
|
Anand Doshi
|
48553618b0
|
Merge branch 'master' of github.com:webnotes/erpnext into unicode
|
2012-07-31 19:38:39 +05:30 |
|
Anand Doshi
|
dc40385d41
|
validate link only if value is non empty
|
2012-07-31 19:37:39 +05:30 |
|
Anand Doshi
|
33987a0ad2
|
Merge branch 'master' of github.com:webnotes/erpnext into unicode
|
2012-07-31 19:18:44 +05:30 |
|
Anand Doshi
|
5c42d5d2cf
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-07-31 19:15:31 +05:30 |
|
Anand Doshi
|
c7d5fc4952
|
fix in recent blog list link
|
2012-07-31 19:15:01 +05:30 |
|
Anand Doshi
|
e51b9d7248
|
Merge branch 'unicode' of github.com:webnotes/erpnext into unicode
|
2012-07-31 17:31:40 +05:30 |
|
Anand Doshi
|
59d37c4bcb
|
Merge branch 'master' of github.com:webnotes/erpnext into unicode
Conflicts:
erpnext/hr/doctype/expense_claim/expense_claim.js
erpnext/patches/patch_list.py
|
2012-07-31 17:30:49 +05:30 |
|
Nabin Hait
|
f9360ce562
|
filter on actual qty in stock level report
|
2012-07-31 17:27:11 +05:30 |
|
Nabin Hait
|
d614a6ea38
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-07-31 14:12:41 +05:30 |
|
Nabin Hait
|
8d97290c06
|
updated bin permission
|
2012-07-31 14:12:23 +05:30 |
|
Anand Doshi
|
fd684ec247
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-07-31 13:58:16 +05:30 |
|
Anand Doshi
|
29c8b3b487
|
bug fix: strip serial no field before validation to check truthy value
|
2012-07-31 13:57:06 +05:30 |
|
Nabin Hait
|
d8959bfecd
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-07-31 12:08:00 +05:30 |
|
Nabin Hait
|
76697a5c3b
|
added filter on item group and brand
|
2012-07-31 12:07:40 +05:30 |
|
Nabin Hait
|
6c2a9a2f55
|
added filter on item group and brand
|
2012-07-31 12:06:24 +05:30 |
|