Anand Doshi
|
88e4a0ffc2
|
Merge branch 'stable' into latest
|
2012-02-08 10:24:03 +05:30 |
|
Rushabh Mehta
|
bd20d29dae
|
pre style
|
2012-02-08 10:23:16 +05:30 |
|
Anand Doshi
|
d7ac84f430
|
removed msgprint in pending po items to receive report
|
2012-02-08 10:18:30 +05:30 |
|
Anand Doshi
|
a629fa3f05
|
Merge branch 'stable' into latest
|
2012-02-07 18:02:42 +05:30 |
|
Anand Doshi
|
02035d071a
|
Fix in import docs containing utf-8 encoding
|
2012-02-07 17:57:40 +05:30 |
|
Rushabh Mehta
|
a7f0c448bb
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
|
2012-02-07 14:58:14 +05:30 |
|
Rushabh Mehta
|
4d20b2246c
|
style fixes
|
2012-02-07 14:57:49 +05:30 |
|
Anand Doshi
|
f812acf063
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
|
2012-02-07 14:51:56 +05:30 |
|
Anand Doshi
|
8d3d2a9905
|
Merge branch 'stable' into latest
|
2012-02-07 14:51:38 +05:30 |
|
Anand Doshi
|
e59f456ad4
|
If support ticket doesnt have body, then do not append in reply to string
|
2012-02-07 14:50:50 +05:30 |
|
Rushabh Mehta
|
5b625fa592
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
|
2012-02-07 14:32:20 +05:30 |
|
Rushabh Mehta
|
f9620eaf44
|
fix to product, blog
|
2012-02-07 14:31:49 +05:30 |
|
Anand Doshi
|
b65363aa46
|
Merge branch 'stable' into latest
|
2012-02-07 14:28:29 +05:30 |
|
Anand Doshi
|
188a499f45
|
Fix in default customer group fetch while converting lead to customer
|
2012-02-07 14:28:05 +05:30 |
|
Anand Doshi
|
4e47c48707
|
Merge branch 'stable' into latest
|
2012-02-07 13:33:10 +05:30 |
|
Anand Doshi
|
7e8082e193
|
Fixed mapping of conversion rate for PO-PR and PO-PV
|
2012-02-07 13:32:20 +05:30 |
|
Rushabh Mehta
|
518533fde0
|
added sitemap, rss feeds
|
2012-02-07 13:29:31 +05:30 |
|
Rushabh Mehta
|
9c7fe3bce4
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
|
2012-02-07 11:43:51 +05:30 |
|
Rushabh Mehta
|
8b96b05163
|
fixes to products
|
2012-02-07 11:43:41 +05:30 |
|
Rushabh Mehta
|
002340080d
|
fixes to products
|
2012-02-07 07:08:05 +01:00 |
|
Anand Doshi
|
67d2c8396c
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
Conflicts:
version.num
|
2012-02-07 10:59:29 +05:30 |
|
Anand Doshi
|
e00e70841c
|
Merge branch 'stable' into latest
Conflicts:
erpnext/accounts/doctype/journal_voucher/journal_voucher.js
erpnext/accounts/doctype/payable_voucher/payable_voucher.js
index.html
version.num
|
2012-02-07 10:58:45 +05:30 |
|
Anand Doshi
|
d008964fd6
|
Fetch defaults in purchase common and sales common related doctypes and fix minor utf-8 issues
|
2012-02-07 10:48:11 +05:30 |
|
Rushabh Mehta
|
f35992f695
|
top bar to accept url
|
2012-02-07 10:39:17 +05:30 |
|
Anand Doshi
|
99e7f3d7a4
|
Fix in valuation_control.py: eval requires a string. does not accept None.
|
2012-02-06 18:06:34 +05:30 |
|
Rushabh Mehta
|
0a45f96c48
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
|
2012-02-06 17:40:46 +05:30 |
|
Rushabh Mehta
|
28307193a1
|
item group txt
|
2012-02-06 17:40:37 +05:30 |
|
Rushabh Mehta
|
cc54fd46bc
|
website fixes
|
2012-02-06 13:09:08 +01:00 |
|
Rushabh Mehta
|
e651648b1b
|
added missing icons
|
2012-02-06 16:28:06 +05:30 |
|
Rushabh Mehta
|
a7e68f7cd7
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
|
2012-02-06 15:33:37 +05:30 |
|
Rushabh Mehta
|
e219db0e20
|
moved wnf.py to erpnext and added website manager role
|
2012-02-06 15:33:08 +05:30 |
|
Rushabh Mehta
|
b4244bacba
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
|
2012-02-06 10:59:48 +01:00 |
|
Rushabh Mehta
|
4167e2f97a
|
patch fix
|
2012-02-06 10:58:48 +01:00 |
|
Rushabh Mehta
|
74fab55948
|
add home in website patch
|
2012-02-06 14:34:42 +05:30 |
|
Rushabh Mehta
|
594a0ca11d
|
fix in related page
|
2012-02-06 12:52:15 +05:30 |
|
Rushabh Mehta
|
af1cb632d6
|
bugfix to topbar
|
2012-02-06 07:29:52 +01:00 |
|
Rushabh Mehta
|
04048ff890
|
Merge branch 'stable' of github.com:webnotes/erpnext into latest
|
2012-02-06 07:12:43 +01:00 |
|
Anand Doshi
|
7e13f9b4b5
|
Fix in email digest due to unicode change
|
2012-02-06 11:41:25 +05:30 |
|
Rushabh Mehta
|
fd5005567b
|
Fix in setup role permissions
|
2012-02-06 06:34:04 +01:00 |
|
Rushabh Mehta
|
7d5575ea3a
|
Merge branch 'stable' of github.com:webnotes/erpnext into latest
|
2012-02-04 11:53:08 +01:00 |
|
Anand Doshi
|
b05f1a68f5
|
support ticket send issue
|
2012-02-04 16:22:21 +05:30 |
|
Rushabh Mehta
|
eba29ab88a
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
|
2012-02-04 09:54:10 +05:30 |
|
Rushabh Mehta
|
6147451da3
|
refactored patches, bug fix for assign_to
|
2012-02-04 09:53:25 +05:30 |
|
Rushabh Mehta
|
cc43b7e927
|
Merge branch 'stable' of github.com:webnotes/erpnext into latest
|
2012-02-03 13:35:59 +01:00 |
|
Anand Doshi
|
3f711e2cb0
|
Fix in support ticket response issue
|
2012-02-03 18:03:32 +05:30 |
|
Rushabh Mehta
|
479670e4e1
|
added unicode to mysql, fix in about us
|
2012-02-03 16:56:18 +05:30 |
|
Rushabh Mehta
|
b4c814484e
|
fix to patch
|
2012-02-03 13:36:44 +05:30 |
|
Rushabh Mehta
|
63d669f390
|
updated feed for comments and login
|
2012-02-03 12:56:12 +05:30 |
|
Rushabh Mehta
|
adc9a61bd7
|
bugfix
|
2012-02-02 16:45:26 +05:30 |
|
Rushabh Mehta
|
50e2cfe78e
|
dateutil.js/patch fix
|
2012-02-02 16:40:01 +05:30 |
|
Anand Doshi
|
6d5cd01e03
|
Merge branch 'stable' into latest
|
2012-02-02 15:36:58 +05:30 |
|
Anand Doshi
|
2cb047d5a4
|
Added search field 'account_type' in account doctype
|
2012-02-02 15:36:34 +05:30 |
|
Anand Doshi
|
62427a6024
|
Merge branch 'stable' into latest
|
2012-02-02 15:23:33 +05:30 |
|
Anand Doshi
|
962c2aa80d
|
Auto fetch default bank account for jv of type Bank Voucher
|
2012-02-02 15:22:11 +05:30 |
|
Anand Doshi
|
8694dbb754
|
Merge branch 'stable' into latest
|
2012-02-02 14:07:55 +05:30 |
|
Anand Doshi
|
fd11313138
|
Support ticket response text fix
|
2012-02-02 14:07:39 +05:30 |
|
Anand Doshi
|
1a3bce3676
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
|
2012-02-02 13:45:00 +05:30 |
|
Anand Doshi
|
32e1fa22cd
|
Merge branch 'stable' into latest
|
2012-02-02 13:44:32 +05:30 |
|
Rushabh Mehta
|
63adcb7355
|
patch update
|
2012-02-02 13:44:28 +05:30 |
|
Anand Doshi
|
ce25e169ab
|
Show only last response in support ticket response message
|
2012-02-02 13:44:05 +05:30 |
|
Rushabh Mehta
|
a3d21a46e8
|
version
|
2012-02-02 13:43:20 +05:30 |
|
Rushabh Mehta
|
7018b19f42
|
added website settings, refactored home
|
2012-02-02 13:42:28 +05:30 |
|
Anand Doshi
|
0c9cde9f62
|
Merge branch 'stable' into latest
Conflicts:
version.num
|
2012-02-02 12:43:39 +05:30 |
|
Anand Doshi
|
354dd9b35a
|
Allow changing export_rate if discount=0, then calculate discount based on ref_rate and export_rate (valid for non inclusive pricing)
|
2012-02-02 12:42:14 +05:30 |
|
Anand Doshi
|
a9a5128402
|
Merge branch 'stable' into latest
Conflicts:
erpnext/stock/doctype/item/item.txt
index.html
version.num
|
2012-02-02 11:44:25 +05:30 |
|
Anand Doshi
|
75d30b803f
|
Packing Slip and its patches
|
2012-02-02 11:38:15 +05:30 |
|
Rushabh Mehta
|
d47e1d14b7
|
added related page and other cleanups
|
2012-02-01 18:02:33 +05:30 |
|
Rushabh Mehta
|
9c69914cf6
|
todo fix
|
2012-02-01 15:03:54 +05:30 |
|
Rushabh Mehta
|
9ef63f93d6
|
moved back to 'index.cgi' model
|
2012-02-01 14:47:29 +05:30 |
|
Anand Doshi
|
3325d0db74
|
Patch to set docstatus=2 for purchase returned serial no
|
2012-02-01 11:36:31 +05:30 |
|
Anand Doshi
|
4f948e03be
|
Set docstatus as 2 for a purchase returned serial no
|
2012-02-01 11:27:36 +05:30 |
|
Rushabh Mehta
|
ab1148cbc9
|
added products, custom pages and footer
|
2012-01-31 18:01:16 +05:30 |
|
Anand Doshi
|
6afc6818a3
|
Check for duplicate challan number only in submitted purchase receipts
|
2012-01-31 17:21:04 +05:30 |
|
Anand Doshi
|
0717ca63b2
|
Fix in Purchase Return - Serial No. status issue
|
2012-01-31 16:20:37 +05:30 |
|
Anand Doshi
|
6c95ccb8f5
|
Net total calculation fix
|
2012-01-30 14:28:31 +05:30 |
|
Rushabh Mehta
|
bc5ec4f19e
|
version
|
2012-01-30 14:02:41 +05:30 |
|
Rushabh Mehta
|
d6840b202a
|
added products + cleanups
|
2012-01-30 14:00:46 +05:30 |
|
Anand Doshi
|
2729123868
|
Fix add user from my company
|
2012-01-30 12:50:18 +05:30 |
|
Anand Doshi
|
5f29438b1c
|
Fix in add user in my company
|
2012-01-30 12:44:59 +05:30 |
|
Anand Doshi
|
f3d3105d9a
|
Password fix on add user
|
2012-01-30 12:40:07 +05:30 |
|
Anand Doshi
|
e72de12993
|
Merge branch 'master' into latest
Conflicts:
index.html
version.num
|
2012-01-30 11:59:05 +05:30 |
|
Anand Doshi
|
69cfc5566a
|
Email settings check on save
|
2012-01-30 11:54:59 +05:30 |
|
Anand Doshi
|
d3db70bb72
|
Supplier rename fix
|
2012-01-30 11:08:47 +05:30 |
|
Anand Doshi
|
327269fbc6
|
Check email settings while saving
|
2012-01-27 18:49:51 +05:30 |
|
Rushabh Mehta
|
3a751e8f82
|
added blog subscriber, unsubscribe
|
2012-01-27 18:00:14 +05:30 |
|
Rushabh Mehta
|
ad10c695ff
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
|
2012-01-27 15:57:32 +05:30 |
|
Rushabh Mehta
|
c8d2e73ee6
|
added blog
|
2012-01-27 15:57:17 +05:30 |
|
Anand Doshi
|
76a4caeada
|
fix in send notification part of recurring invoices
|
2012-01-27 14:34:26 +05:30 |
|
Anand Doshi
|
f5738817db
|
fix in recurring invoice
|
2012-01-27 14:18:09 +05:30 |
|
Anand Doshi
|
707cd06606
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
Conflicts:
erpnext/accounts/doctype/receivable_voucher/receivable_voucher.py
|
2012-01-27 12:30:35 +05:30 |
|
Anand Doshi
|
02c662936f
|
Merge branch 'master' into latest
|
2012-01-27 12:28:21 +05:30 |
|
Anand Doshi
|
74d1b65105
|
changed sql to webnotes.conn.sql to avoid errors due to closing of connections in scheduler/push patch
|
2012-01-27 12:25:09 +05:30 |
|
Rushabh Mehta
|
51e51da63f
|
added about_us
|
2012-01-27 12:17:09 +05:30 |
|
Rushabh Mehta
|
4adaae6974
|
version
|
2012-01-25 18:49:32 +05:30 |
|
Rushabh Mehta
|
949496c31b
|
added website.page.contact
|
2012-01-25 18:48:46 +05:30 |
|
Anand Doshi
|
af1ad9a31e
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
Conflicts:
version.num
|
2012-01-25 17:27:57 +05:30 |
|
Anand Doshi
|
6e174cc2c4
|
Merge branch 'master' into latest
Conflicts:
erpnext/setup/doctype/notification_control/notification_control.js
index.html
version.num
|
2012-01-25 17:21:14 +05:30 |
|
Anand Doshi
|
46848a48fe
|
Show DocType Labels instead of DocType names in Customize Form View
|
2012-01-25 17:15:46 +05:30 |
|
Rushabh Mehta
|
4b1fe0528a
|
added home template
|
2012-01-25 15:06:28 +05:30 |
|
Anand Doshi
|
04a115e771
|
Fix: Logout user on disabling profile
|
2012-01-25 12:52:38 +05:30 |
|