Akhilesh Darjee
|
064d2ba16a
|
fixed sr no in maintenance schedule
|
2014-01-02 17:47:32 +05:30 |
|
Nabin Hait
|
06720dfb90
|
Merge branch '4.0.0-wip' of github.com:webnotes/erpnext into 4.0.0-wip
|
2014-01-01 10:47:18 +05:30 |
|
Nabin Hait
|
a2e0a9b05f
|
Fliend rearrangemet in tables
|
2014-01-01 10:45:42 +05:30 |
|
Nabin Hait
|
6260b58a0a
|
Merge pull request #1253 from nabinhait/4.0.0-wip
4.0.0 wip
|
2013-12-31 21:13:45 -08:00 |
|
Anand Doshi
|
2511aa2b14
|
Merge pull request #1254 from anandpdoshi/4.0.0-shopping-cart-wip
Moved Portal and Shopping Cart to Shopping Cart app, and some minor fixe...
|
2013-12-31 04:14:15 -08:00 |
|
Anand Doshi
|
9a4a13cb73
|
Moved Portal and Shopping Cart to Shopping Cart app, and some minor fixes
|
2013-12-31 17:38:21 +05:30 |
|
Nabin Hait
|
139aa71666
|
Fixed conflict while merging with master
|
2013-12-31 16:09:22 +05:30 |
|
Nabin Hait
|
d3f04d754a
|
General ledger path fixed
|
2013-12-31 16:04:48 +05:30 |
|
Nabin Hait
|
432b86344e
|
Validate account with reference voucher if against voucher mentioned
|
2013-12-31 15:07:58 +05:30 |
|
Pratik Vyas
|
8c52258e6d
|
Merge branch 'develop'
|
2013-12-31 14:12:36 +05:30 |
|
Pratik Vyas
|
ffe8af3f2f
|
bumped to version 3.4.3
|
2013-12-31 14:42:36 +06:00 |
|
Nabin Hait
|
fe5728718f
|
Merge pull request #1251 from nabinhait/hotfix
Hotfix
|
2013-12-30 21:02:20 -08:00 |
|
Nabin Hait
|
424b4a4b36
|
Supplier bill info in accounts payable report
|
2013-12-31 10:24:28 +05:30 |
|
Nabin Hait
|
2a3d7e660f
|
Fixes in general ledger report
|
2013-12-30 20:28:23 +05:30 |
|
Pratik Vyas
|
a0a43ca4e4
|
Merge branch 'develop'
|
2013-12-30 19:34:38 +05:30 |
|
Pratik Vyas
|
9cd9836e18
|
bumped to version 3.4.2
|
2013-12-30 20:04:38 +06:00 |
|
Pratik Vyas
|
39a3f50732
|
Merge branch 'develop'
|
2013-12-30 18:58:03 +05:30 |
|
Pratik Vyas
|
ba7221c332
|
bumped to version 3.4.1
|
2013-12-30 19:28:03 +06:00 |
|
Pratik Vyas
|
6a45588a2c
|
Merge branch 'develop'
|
2013-12-30 17:48:01 +05:30 |
|
Pratik Vyas
|
ab9d755e4d
|
bumped to version 3.4.0
|
2013-12-30 18:18:01 +06:00 |
|
Nabin Hait
|
1cf8bd8767
|
Merge pull request #1246 from nabinhait/hotfix
General Ledger and more
|
2013-12-30 03:44:41 -08:00 |
|
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 |
|
Nabin Hait
|
a4f99428d7
|
Fixes in time log batch
|
2013-12-27 17:36:17 +05:30 |
|
Nabin Hait
|
e761fe89e2
|
Stock Entry catch exceptions for testcase
|
2013-12-27 17:35:39 +05:30 |
|
Nabin Hait
|
d51f805b78
|
Rewritten General Ledger report with grouping functions
|
2013-12-27 17:33:55 +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
|
e7fc25d6a8
|
Fixes after permissions merge
|
2013-12-27 10:49:28 +05:30 |
|
Rushabh Mehta
|
0527a393aa
|
Merge pull request #1236 from anandpdoshi/permissions
Permissions
|
2013-12-26 21:07:54 -08:00 |
|
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
|
7334bea3c2
|
fixed languages, moved framework strings to framework
|
2013-12-26 14:44:08 +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
|
4b6b377134
|
Removed config.json
|
2013-12-25 17:38:12 +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 |
|
Nabin Hait
|
9a064e9ced
|
Merge pull request #1233 from nabinhait/hotfix
Removed country field from Search Fields
|
2013-12-25 01:01:17 -08:00 |
|
Nabin Hait
|
9dc1b00d87
|
Removed country field from Search Fields
|
2013-12-25 12:28:54 +05:30 |
|
Rushabh Mehta
|
3c68488873
|
Fixes to setup wizard
|
2013-12-24 18:51:49 +05:30 |
|
Rushabh Mehta
|
30fb30cffb
|
Merge pull request #1 from pdvyas/testing
add travis ci
|
2013-12-24 05:21:21 -08:00 |
|
Pratik Vyas
|
9373ba96d5
|
Merge branch 'develop'
|
2013-12-24 13:12:21 +05:30 |
|
Pratik Vyas
|
a402079cd4
|
bumped to version 3.3.8
|
2013-12-24 13:42:21 +06:00 |
|
Nabin Hait
|
2ca388b0a5
|
Merge pull request #1232 from nabinhait/hotfix
Hotfix
|
2013-12-23 23:29:00 -08:00 |
|
Pratik Vyas
|
f437e867fd
|
add travis ci
|
2013-12-24 12:17:59 +05:30 |
|
Nabin Hait
|
6ebcc5c006
|
Change parent account of warehouse from inside the warehouse
|
2013-12-24 12:14:12 +05:30 |
|
Nabin Hait
|
6a2edee914
|
Fixes in general ledger report
|
2013-12-24 11:58:05 +05:30 |
|
Nabin Hait
|
de69ad0a48
|
Merge pull request #1230 from akhileshdarjee/hotfix
[fix] [minor] update item_name and description in item price
|
2013-12-23 22:09:13 -08:00 |
|
Akhilesh Darjee
|
25a4bd02f4
|
[fix] [minor] update item_name and description in item price
|
2013-12-24 11:32:57 +05:30 |
|
Nabin Hait
|
a3d058938e
|
Company mandatory validation while enabling perpetual inventory
|
2013-12-24 11:03:04 +05:30 |
|
Nabin Hait
|
4cae8a0d54
|
Fixes in stock ledger report
|
2013-12-24 10:47:34 +05:30 |
|