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
|
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
|
afea58b7a1
|
moved modules inside erpnext folder
|
2013-12-11 10:43:52 +05:30 |
|