Nabin Hait
|
32f168617c
|
default value in global defaults
|
2014-02-19 18:11:42 +05:30 |
|
Rushabh Mehta
|
e0e3f92019
|
fixed sales / accounts tree
|
2014-02-19 12:43:16 +05:30 |
|
Rushabh Mehta
|
793ba6bd37
|
-webnotes +frappe 💥
|
2014-02-14 15:47:51 +05:30 |
|
Nabin Hait
|
7979f7ed21
|
Field Rename: rate field mass replacement
|
2014-02-12 14:54:14 +05:30 |
|
Nabin Hait
|
a7f757a3f4
|
Rename fields: initial commit
|
2014-02-12 14:54:13 +05:30 |
|
Nabin Hait
|
436f526102
|
commonify get_item_details and rename fields to sync selling and purchase
|
2014-02-12 14:54:12 +05:30 |
|
Anand Doshi
|
93fdc670fe
|
Fixes in Test Cases
|
2014-02-11 14:40:21 +05:30 |
|
Anand Doshi
|
080b64a98f
|
Fixes in Sales Partner and Support Mails
|
2014-02-07 19:14:21 +05:30 |
|
Anand Doshi
|
7c34f1c472
|
Test Item Group
|
2014-02-07 14:52:14 +05:30 |
|
Anand Doshi
|
7bb9c3f125
|
Nested Set Test using Test Item group
|
2014-02-06 17:51:18 +05:30 |
|
Nabin Hait
|
a03f654446
|
Merge pull request #1382 from akhileshdarjee/4.0-hotfix
Newsletter can also be sent to employees
|
2014-02-06 16:02:39 +05:30 |
|
Anand Doshi
|
3decf4dbc5
|
Fixes related website hierarchy
|
2014-02-06 12:50:35 +05:30 |
|
Akhilesh Darjee
|
8f674fe0fb
|
minor changes
|
2014-02-03 17:47:50 +05:30 |
|
Akhilesh Darjee
|
abb3af7b30
|
Merge branch '4.0.0-wip' of github.com:webnotes/erpnext into 4.0-hotfix
|
2014-02-03 16:44:14 +05:30 |
|
Akhilesh Darjee
|
d6d2193f91
|
newsletter reload
|
2014-01-31 19:59:25 +05:30 |
|
Nabin Hait
|
8dc2c6a16c
|
Default accounts in company should not be copied
|
2014-01-30 17:00:09 +05:30 |
|
Akhilesh Darjee
|
86894f3bbf
|
merge conflict fixed
|
2014-01-27 15:42:02 +05:30 |
|
Nabin Hait
|
5ae6a61c4d
|
Fixes related to appifing shopping cart
|
2014-01-23 15:33:30 +05:30 |
|
Rushabh Mehta
|
f96bcf943b
|
added explicit delete perimssions
|
2014-01-20 17:52:13 +05:30 |
|
Nabin Hait
|
dc15b4fa8a
|
Fixed conflict while merging with develop brnach
|
2014-01-20 16:48:49 +05:30 |
|
Akhilesh Darjee
|
2a79b00700
|
minor fix
|
2014-01-15 11:54:05 +05:30 |
|
Akhilesh Darjee
|
5c96b75a68
|
fixed maintenance schedule
|
2014-01-02 17:54:12 +05:30 |
|
Anand Doshi
|
9a4a13cb73
|
Moved Portal and Shopping Cart to Shopping Cart app, and some minor fixes
|
2013-12-31 17:38:21 +05:30 |
|
Rushabh Mehta
|
c4a0ed63ef
|
Moved demo to separate app, moved patches folder
|
2013-12-27 17:30:24 +05:30 |
|
Anand Doshi
|
8e332ffd16
|
Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions
Conflicts:
erpnext/accounts/page/accounts_browser/accounts_browser.css
erpnext/controllers/buying_controller.py
erpnext/manufacturing/doctype/production_order/production_order.py
erpnext/patches/patch_list.py
erpnext/selling/doctype/customer/customer.txt
erpnext/selling/doctype/sales_order/sales_order.py
erpnext/selling/doctype/sales_order/test_sales_order.py
erpnext/setup/doctype/features_setup/features_setup.txt
erpnext/stock/doctype/stock_entry/test_stock_entry.py
erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
startup/query_handlers.py
|
2013-12-26 19:12:51 +05:30 |
|
Rushabh Mehta
|
54047780fc
|
Merge with 3.3.8
|
2013-12-26 11:07:46 +05:30 |
|
Rushabh Mehta
|
df200f305b
|
Redesigned templates. Now all templates must be inside templates/pages templates/generators
|
2013-12-25 15:19:22 +05:30 |
|
Rushabh Mehta
|
c652a6254f
|
Rewrote hooks for scheduler, notifications, boot, session, login, webpage webnotes/wnframework#351
|
2013-12-16 12:48:38 +05:30 |
|
Rushabh Mehta
|
6de403f2be
|
added manifest, hooks and fixed requires webnotes/wnframework#351
|
2013-12-13 14:10:14 +05:30 |
|
Rushabh Mehta
|
1f84799f2d
|
install, web serving, session booting webnotes/wnframework#351
|
2013-12-12 19:12:19 +05:30 |
|
Rushabh Mehta
|
d2dd83c3a3
|
fixed template loader webnotes/wnframework#351
|
2013-12-12 13:57:58 +05:30 |
|
Rushabh Mehta
|
39bb8e2ed4
|
step 0: install
|
2013-12-11 15:32:14 +05:30 |
|
Rushabh Mehta
|
afea58b7a1
|
moved modules inside erpnext folder
|
2013-12-11 10:43:52 +05:30 |
|
Rushabh Mehta
|
2fa2f7178d
|
moved directory structure
|
2012-09-24 19:13:42 +05:30 |
|
Anand Doshi
|
1fc9ae2230
|
Fixes and Validations for nested doctypes
|
2012-09-24 14:00:59 +05:30 |
|
Anand Doshi
|
8bdfaa3438
|
msgprint fix, company abbreviation length validation
|
2012-09-19 12:41:06 +05:30 |
|
Anand Doshi
|
1953f04e68
|
added validation that abbreviation should not be more than 5 characters when creating company
|
2012-09-19 12:12:07 +05:30 |
|
Anand Doshi
|
d86e282eda
|
show only those bank/cash balances which have non-zero value
|
2012-09-15 22:42:45 +05:30 |
|
Anand Doshi
|
609b25bcdb
|
refactor email digest
|
2012-09-15 22:11:23 +05:30 |
|
Anand Doshi
|
f03e3bb06b
|
Merge branch 'master' of github.com:webnotes/erpnext into unicode
|
2012-09-06 07:55:19 +05:30 |
|
Nabin Hait
|
d948e9b15c
|
reload doc before auto nification
|
2012-09-05 12:59:07 +05:30 |
|
Anand Doshi
|
b4ea4adeec
|
Merge branch 'master' of github.com:webnotes/erpnext into unicode
Conflicts:
erpnext/setup/doctype/price_list/price_list.py
|
2012-08-31 16:56:44 +05:30 |
|
Anand Doshi
|
41cd5a68f4
|
autocommit for price list update
|
2012-08-31 13:57:22 +05:30 |
|
Anand Doshi
|
7b20428976
|
merged master
|
2012-08-16 17:10:39 +05:30 |
|
Anand Doshi
|
1467a059ed
|
Merge branch 'master' of github.com:webnotes/erpnext into unicode
|
2012-08-16 17:09:37 +05:30 |
|
Anand Doshi
|
37b1b88710
|
fix in email settings: json.loads defaults to unicode string, hence encode string for smtp login
|
2012-08-16 17:09:13 +05:30 |
|
Anand Doshi
|
241437995f
|
Merge branch 'master' of github.com:webnotes/erpnext into unicode
Conflicts:
erpnext/setup/doctype/company/company.txt
|
2012-08-10 12:58:48 +05:30 |
|
Anand Doshi
|
6810979dab
|
Company Form: do not hide 'Default Settings' section break for a new company, as it contains a mandatory field 'Default Currency'
|
2012-08-10 12:38:48 +05:30 |
|
Anand Doshi
|
0cedc1cc9c
|
removed reply_to while sending email in email digest
|
2012-08-08 10:54:11 +05:30 |
|
Rushabh Mehta
|
49dc5da0dc
|
refactor unicode changes and merge with master with refactored email
|
2012-08-03 16:02:24 +05:30 |
|