Anand Doshi
|
4985691617
|
Role and User Permissions
|
2014-06-04 17:48:54 +05:30 |
|
Anand Doshi
|
fab0904af7
|
Started permission relogication
|
2014-06-04 17:48:52 +05:30 |
|
Pratik Vyas
|
76e48b5c3f
|
hotfix: update_account_root_type.py patch
|
2014-05-28 15:22:34 +05:30 |
|
Anand Doshi
|
c57d7dea8b
|
Fixed global_defaults_to_system_settings
|
2014-05-22 11:05:46 +05:30 |
|
Nabin Hait
|
d811303d7b
|
minor fix
|
2014-05-21 12:36:43 +05:30 |
|
Nabin Hait
|
27b12ef1b6
|
update account root type patch
|
2014-05-21 11:53:59 +05:30 |
|
Nabin Hait
|
dec02340e8
|
reload account doc in root type patch
|
2014-05-21 11:53:59 +05:30 |
|
Nabin Hait
|
3f80ef0648
|
reload account doc in root type patch
|
2014-05-21 11:53:59 +05:30 |
|
Nabin Hait
|
0e6554edc1
|
Root Type field added in account and patch for existing accoutns
|
2014-05-21 11:53:58 +05:30 |
|
Nabin Hait
|
a220e5d850
|
Update global_defaults_to_system_settings.py
|
2014-05-15 18:36:38 +05:30 |
|
Nabin Hait
|
ac3ba70ed9
|
Update global_defaults_to_system_settings.py
|
2014-05-15 18:25:57 +05:30 |
|
Nabin Hait
|
52b5c134fc
|
Update global_defaults_to_system_settings.py
|
2014-05-15 18:25:10 +05:30 |
|
Nabin Hait
|
5c50e213ac
|
Update global_defaults_to_system_settings.py
|
2014-05-15 18:18:32 +05:30 |
|
Nabin Hait
|
9419575126
|
Merged language patch with global_defaults_to_system_settings patch
|
2014-05-15 17:17:58 +05:30 |
|
Nabin Hait
|
d0a915c47a
|
Global Defaults to system settings. Fixes #1653
|
2014-05-15 16:42:23 +05:30 |
|
Nabin Hait
|
aade34b0c9
|
Reports and print formats modified for renamed fields
|
2014-05-13 16:12:37 +05:30 |
|
Nabin Hait
|
0c54e2d0d0
|
4_0 patch dir renamed to v4_0
|
2014-05-12 17:44:55 +05:30 |
|
Pratik Vyas
|
6e686224eb
|
fix patches
|
2014-05-10 22:17:04 +05:30 |
|
Pratik Vyas
|
95f558e7bc
|
fix update user properties patch
|
2014-05-10 22:16:39 +05:30 |
|
Pratik Vyas
|
34e36a233c
|
Patch changes for 3 to 4 migration
|
2014-05-09 12:01:25 +05:30 |
|
Anand Doshi
|
4b7a6b13ec
|
Additions to remove India specific fields
|
2014-05-06 16:41:31 +05:30 |
|
Anand Doshi
|
37909b292f
|
Remove India specific fields
|
2014-05-06 16:15:56 +05:30 |
|
Anand Doshi
|
91b451b8ce
|
Updated validate v3 patch
|
2014-05-05 18:25:37 +05:30 |
|
Nabin Hait
|
985918d42b
|
Minor fixes in company and account
|
2014-04-28 17:08:28 +05:30 |
|
Nabin Hait
|
6298536e46
|
set stock balance as per serial no count
Cherry Picked and Modified by @anandpdoshi
Conflicts:
stock/doctype/stock_ledger/stock_ledger.py
utilities/repost_stock.py
|
2014-04-16 15:23:08 +05:30 |
|
Rushabh Mehta
|
a504f0638b
|
frappe/frappe#478, fixed list passed in
|
2014-04-04 12:16:26 +05:30 |
|
Rushabh Mehta
|
558a9aabfb
|
removed control panel
|
2014-04-04 12:00:36 +05:30 |
|
Rushabh Mehta
|
0a0f2495a2
|
frappe/frappe#478, frappe tests pass, .txt renamed to .json
|
2014-03-31 17:27:06 +05:30 |
|
Rushabh Mehta
|
b385ecf65e
|
frappe/frappe#478
|
2014-03-28 16:54:45 +05:30 |
|
Anand Doshi
|
f78d1aee28
|
Replaced doc, doc.fields frappe/frappe#478
|
2014-03-28 13:55:00 +05:30 |
|
Rushabh Mehta
|
e88bc8b12a
|
frappe/frappe#478
|
2014-03-27 17:51:41 +05:30 |
|
Nabin Hait
|
2c517e0a62
|
Fixes related to countrywise coa
|
2014-03-25 18:28:49 +05:30 |
|
Nabin Hait
|
ec9fb67d84
|
fixed conflict
|
2014-03-25 16:53:50 +05:30 |
|
Anand Doshi
|
7fbdba02ab
|
Fixed Countrywise Chart of Accounts patch
|
2014-03-25 13:50:52 +05:30 |
|
Nabin Hait
|
221a8fff1c
|
minor fix in patch
|
2014-03-23 17:35:24 +05:30 |
|
Nabin Hait
|
155c96b410
|
patch to delete mis control and financial statements and set bank/cash account
|
2014-03-21 12:15:13 +05:30 |
|
Nabin Hait
|
47a3c10334
|
Patch to update old accounts property
|
2014-03-21 11:26:08 +05:30 |
|
Nabin Hait
|
037bf6b382
|
More country charts imported from openerp
|
2014-03-21 11:25:17 +05:30 |
|
Nabin Hait
|
24e136e3f3
|
Patch: set root_type for old existing accounts
|
2014-03-21 11:25:16 +05:30 |
|
Nabin Hait
|
b93ebaebe4
|
Added new account types and patch for existing
|
2014-03-21 11:22:41 +05:30 |
|
Nabin Hait
|
a69c30edec
|
country code added
|
2014-03-21 11:22:39 +05:30 |
|
Nabin Hait
|
53822ae9d0
|
Account balance must be of type debit/credit
|
2014-03-21 11:22:38 +05:30 |
|
Rushabh Mehta
|
7c932003ed
|
rename Profile to User frappe/frappe#470
|
2014-03-11 16:15:59 +05:30 |
|
Anand Doshi
|
c379c78fec
|
Fixed Dropbox, Scheduler, 3to4 migration
|
2014-03-11 15:17:13 +05:30 |
|
Anand Doshi
|
ebdac5db5c
|
Fix in Pricing Rule Patch
|
2014-03-05 17:31:37 +05:30 |
|
Anand Doshi
|
74d0e40bdc
|
Moved Notification Count hooks to frappe, employee user id patch, Item ignore restriction fields
|
2014-03-05 15:24:29 +05:30 |
|
Anand Doshi
|
e30511d315
|
Email Settings split into Outgoing Email Settings and Support Email Settings
|
2014-03-03 20:32:20 +05:30 |
|
Anand Doshi
|
f5794f1c07
|
Module Home Pages using Module View
|
2014-03-03 15:06:34 +05:30 |
|
Nabin Hait
|
f976143063
|
pricing rule patch fix
|
2014-02-28 19:02:27 +05:30 |
|
Nabin Hait
|
311079a311
|
Patch: copy customer discount to pricing rule
|
2014-02-28 13:04:19 +05:30 |
|
Rushabh Mehta
|
063141d152
|
added patch for address
|
2014-02-28 11:37:36 +05:30 |
|
Anand Doshi
|
fb21ce3893
|
3to4 fixes
|
2014-02-27 13:18:20 +05:30 |
|
Anand Doshi
|
e9baaa68e7
|
Changed frappe.conn to frappe.db
|
2014-02-26 12:35:33 +05:30 |
|
Anand Doshi
|
901f4434fd
|
Fixed Purchase Invoice test cases
|
2014-02-25 17:25:28 +05:30 |
|
Rushabh Mehta
|
a6628eee56
|
rename sitemap to route
|
2014-02-25 11:08:37 +05:30 |
|
Pratik Vyas
|
da0a23e635
|
remove print in patch, booboo
|
2014-02-17 14:56:00 +05:30 |
|
Pratik Vyas
|
31affc0e67
|
bump modified dates for purchase receipt and purchase invoice
|
2014-02-17 11:36:10 +05:30 |
|
Rushabh Mehta
|
793ba6bd37
|
-webnotes +frappe 💥
|
2014-02-14 15:47:51 +05:30 |
|
Nabin Hait
|
eba1bdbcca
|
minor fixes
|
2014-02-12 16:04:17 +05:30 |
|
Nabin Hait
|
139dc7b9b2
|
minor fixes
|
2014-02-12 14:54:16 +05:30 |
|
Nabin Hait
|
5f59726903
|
Rename fields: replaced in html and txt files
|
2014-02-12 14:54:15 +05:30 |
|
Nabin Hait
|
777397489e
|
Fields renamed in schema
|
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
|
7bb9c3f125
|
Nested Set Test using Test Item group
|
2014-02-06 17:51:18 +05:30 |
|
Nabin Hait
|
574c7e7c63
|
item related cleanup
|
2014-02-06 15:51:01 +05:30 |
|
Nabin Hait
|
dfae0ea570
|
minor fix in patch
|
2014-01-31 17:25:09 +05:30 |
|
Akhilesh Darjee
|
e0a1039756
|
merge conflict fixed
|
2014-01-30 14:44:35 +05:30 |
|
Akhilesh Darjee
|
4cdb79941b
|
map charge to taxes and charges in transactions
|
2014-01-30 13:56:57 +05:30 |
|
Nabin Hait
|
fe8db590a1
|
Fixed conflict while merging with develop
|
2014-01-30 12:32:47 +05:30 |
|
Akhilesh Darjee
|
b665d86292
|
patch to reload all sales and purchase doctypes and print formats
|
2014-01-29 17:40:34 +05:30 |
|
Akhilesh Darjee
|
86894f3bbf
|
merge conflict fixed
|
2014-01-27 15:42:02 +05:30 |
|
Anand Doshi
|
cb39e0878e
|
Merge remote-tracking branch 'webnotes/develop' into 4.0.0-wip
Conflicts:
config.json
erpnext/accounts/utils.py
erpnext/patches/patch_list.py
erpnext/stock/doctype/price_list/price_list.txt
erpnext/stock/doctype/warehouse/warehouse.py
portal/templates/sale.html
portal/utils.py
selling/doctype/sales_order/templates/pages/order.py
selling/utils/cart.py
selling/utils/product.py
utilities/demo/demo_docs/Fiscal_Year.csv
utilities/demo/make_demo.py
|
2014-01-24 21:44:36 +05:30 |
|
Rushabh Mehta
|
1cd96a136f
|
updates for restriction
|
2014-01-24 11:10:24 +05:30 |
|
Nabin Hait
|
5c6d13a0df
|
Fixed conflict while merging with develop branch
|
2014-01-20 17:18:16 +05:30 |
|
Nabin Hait
|
dc15b4fa8a
|
Fixed conflict while merging with develop brnach
|
2014-01-20 16:48:49 +05:30 |
|
Akhilesh Darjee
|
5dd92fd5d6
|
reload doc in maintenance schedule
|
2014-01-03 19:14:01 +05:30 |
|
Akhilesh Darjee
|
e27717261d
|
merge conflict fixed
|
2014-01-03 18:18:31 +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 |
|
Akhilesh Darjee
|
829eda47a8
|
Merge branch '4.0.0-wip' of github.com:webnotes/erpnext into flat-discount
|
2013-12-30 12:31:07 +05:30 |
|
Anand Doshi
|
0663ec4a9c
|
Merge fixes: removed patches, removed Warehouse User
|
2013-12-27 18:00:28 +05:30 |
|
Rushabh Mehta
|
61bf425935
|
deleted moves
|
2013-12-27 17:58:39 +05:30 |
|
Akhilesh Darjee
|
d203aea7c2
|
[flat discount] flat discount implemented on sales cycle
|
2013-12-27 17:49:57 +05:30 |
|
Rushabh Mehta
|
c4a0ed63ef
|
Moved demo to separate app, moved patches folder
|
2013-12-27 17:30:24 +05:30 |
|
Rushabh Mehta
|
4ac68952e8
|
Moved patches and fixed method routing in pages
|
2013-12-27 13:43:40 +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
|
caa4380d49
|
Merge with 3.3.8
|
2013-12-26 11:07:58 +05:30 |
|
Rushabh Mehta
|
54047780fc
|
Merge with 3.3.8
|
2013-12-26 11:07:46 +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
|
1f84799f2d
|
install, web serving, session booting webnotes/wnframework#351
|
2013-12-12 19:12:19 +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
|
55fd5f3ed6
|
added voucher import tool
|
2012-09-26 19:00:02 +05:30 |
|
Anand Doshi
|
3c4238fc9c
|
Merge branch 'master' of github.com:webnotes/erpnext into 1209
Conflicts:
public/js/all-app.js
public/js/all-web.js
|
2012-09-26 12:24:28 +05:30 |
|
Rushabh Mehta
|
2fa2f7178d
|
moved directory structure
|
2012-09-24 19:13:42 +05:30 |
|
Nabin Hait
|
de7fcc66df
|
updated repost_stock patch
|
2012-09-24 15:53:01 +05:30 |
|
Nabin Hait
|
9ed7b8bb75
|
fixed conflict
|
2012-09-24 15:46:55 +05:30 |
|
Nabin Hait
|
6e6dd1b0d5
|
reload gross profit report
|
2012-09-24 15:45:02 +05:30 |
|
Anand Doshi
|
5f76ceb38e
|
Delete permission for Event doctype to System Manager
|
2012-09-24 15:41:41 +05:30 |
|
Anand Doshi
|
9ef7bd8494
|
Delete permission for Event doctype to System Manager
|
2012-09-24 15:41:27 +05:30 |
|