Rushabh Mehta
|
11900e8fad
|
[fix] make grid editable for schools and fix #5831
|
2016-07-22 10:59:07 +05:30 |
|
Rushabh Mehta
|
20fc7a1e1e
|
Merge pull request #5826 from rohitwaghchaure/v7_pos_issue
[Fix]POS and timesheet issues
|
2016-07-22 10:35:06 +05:30 |
|
Rohit Waghchaure
|
ea278b5971
|
[Fix]POS and timesheet issues
|
2016-07-22 01:22:56 +05:30 |
|
Nabin Hait
|
6889d294ae
|
Merge pull request #5812 from nabinhait/budget_demo
Demo data for Budget
|
2016-07-21 18:32:56 +05:30 |
|
Rushabh Mehta
|
d4f3c6b5e7
|
[fix] schools patch
|
2016-07-21 18:22:58 +05:30 |
|
Rushabh Mehta
|
7e472f898d
|
[fix] setup wizard
|
2016-07-21 18:01:42 +05:30 |
|
Rushabh Mehta
|
39671e22c9
|
[fix] patch
|
2016-07-21 17:14:27 +05:30 |
|
Rushabh Mehta
|
fe7d6932ee
|
[fix] patch
|
2016-07-21 17:12:47 +05:30 |
|
Rushabh Mehta
|
744d77466c
|
Merge pull request #5819 from neilLasrado/develop
Fixed patch for migrating schools to erpnext again
|
2016-07-21 17:00:12 +05:30 |
|
Neil Trini Lasrado
|
a537e43838
|
Fixed patch for migrating schools to erpnext again
|
2016-07-21 16:57:04 +05:30 |
|
Rushabh Mehta
|
5f7727424e
|
Merge pull request #5818 from neilLasrado/develop
Fixed patch for migrating schools to erpnext
|
2016-07-21 16:43:40 +05:30 |
|
Neil Trini Lasrado
|
af5e00363a
|
Fixed patch for migrating schools to erpnext
|
2016-07-21 16:41:05 +05:30 |
|
Rushabh Mehta
|
137e722af1
|
Merge pull request #5817 from rmehta/neilLasrado-schools
Merge schools, fix setup wizard, update domainify
|
2016-07-21 16:04:22 +05:30 |
|
Rushabh Mehta
|
20038ad2c9
|
[fixes] setup wizard and domainify for schools;
|
2016-07-21 16:01:59 +05:30 |
|
Rushabh Mehta
|
4a5cc77352
|
Merge pull request #5816 from rohitwaghchaure/minor_issue
[Fix] To time issue in timesheet
|
2016-07-21 14:58:49 +05:30 |
|
Rohit Waghchaure
|
3176bc93c1
|
[Fix] Timesheet to time issue
|
2016-07-21 14:56:15 +05:30 |
|
Nabin Hait
|
74edfff0a7
|
Demo data for Budget
|
2016-07-21 11:39:46 +05:30 |
|
Nabin Hait
|
cfd9b1a24c
|
Merge pull request #5811 from nabinhait/demo2
Demo data for Payment Entry
|
2016-07-21 11:33:57 +05:30 |
|
Nabin Hait
|
1606626d29
|
Demo data for Payment Entry
|
2016-07-21 11:00:28 +05:30 |
|
Rushabh Mehta
|
b0061c9341
|
Merge branch 'schools' of https://github.com/neilLasrado/erpnext into neilLasrado-schools
|
2016-07-21 10:46:32 +05:30 |
|
Nabin Hait
|
26cad30372
|
Demo data for Payment Entry
|
2016-07-21 10:29:06 +05:30 |
|
Nabin Hait
|
89d0b1b9a5
|
Merge pull request #5804 from nabinhait/demo1
Demo data for fixed asset depreciation
|
2016-07-21 10:05:00 +05:30 |
|
Nabin Hait
|
ba33026a6b
|
Merge pull request #5798 from rohitwaghchaure/sales_invoice_form_is_pos_issue
[Fix] POS auto set paid amount with outstanding amount issue
|
2016-07-21 09:39:57 +05:30 |
|
Rushabh Mehta
|
5a39d41a0c
|
[redesign] replace document flow with dashboard, sorry @saurabh6790, fixes #5792
|
2016-07-20 22:53:23 +05:30 |
|
Neil Trini Lasrado
|
3f0a581b85
|
Merge ERPNext Schools into ERPNext
|
2016-07-20 19:25:02 +05:30 |
|
Rushabh Mehta
|
39077d4210
|
[dashboard] for quotation and sales order
|
2016-07-20 18:55:42 +05:30 |
|
Rohit Waghchaure
|
61b4a43d84
|
[Fix] POS auto set paid amount with outstanding amount issue
|
2016-07-20 17:01:29 +05:30 |
|
Nabin Hait
|
3edefb19b9
|
Demo data for fixed asset depreciation
|
2016-07-20 16:14:30 +05:30 |
|
Rushabh Mehta
|
649e2538e5
|
[fix] merge conflict?
|
2016-07-20 15:30:17 +05:30 |
|
Rushabh Mehta
|
2f0dbd9bd8
|
[fix] test
|
2016-07-20 15:28:39 +05:30 |
|
Rushabh Mehta
|
f65b50ea6c
|
Merge pull request #5801 from netchampfaris/ui-fixes
fix pos layout #5780
|
2016-07-20 14:50:25 +05:30 |
|
Faris Ansari
|
8908d19bc9
|
[mobile ui] fix buttons
|
2016-07-20 14:00:08 +05:30 |
|
Nabin Hait
|
e2d0d7c5db
|
Merge pull request #5799 from nabinhait/fix104
Fixes
|
2016-07-20 12:38:49 +05:30 |
|
Nabin Hait
|
430a97aeba
|
Merge pull request #5800 from nabinhait/fix105
Patch fixed for expense claim type
|
2016-07-20 12:17:15 +05:30 |
|
Nabin Hait
|
9a5dc452f1
|
Patch fixed for expense claim type
|
2016-07-20 12:16:35 +05:30 |
|
Rushabh Mehta
|
fc8e589295
|
[fix] party status updating bug, fixes #5794, #5796
|
2016-07-20 12:09:27 +05:30 |
|
Nabin Hait
|
9d93ad92bc
|
minor fixes
|
2016-07-20 11:28:50 +05:30 |
|
Nabin Hait
|
85648d9bd6
|
payment entry fixes
|
2016-07-20 11:28:50 +05:30 |
|
Nabin Hait
|
b1234fa5e8
|
Set missing values in asset
|
2016-07-20 11:28:50 +05:30 |
|
Nabin Hait
|
df2a75ad1d
|
Updated standard chart of accounts
|
2016-07-20 11:27:58 +05:30 |
|
Rushabh Mehta
|
c0cc9902d9
|
Merge pull request #5776 from saurabh6790/warehouse_accounting_fix
[fix] for setting warehouse in account head
|
2016-07-19 21:35:09 +05:30 |
|
Rushabh Mehta
|
f997c6981d
|
Merge pull request #5770 from saurabh6790/demo_expense_claim
[enhance] demo for expense claim #5731
|
2016-07-19 21:34:30 +05:30 |
|
Rushabh Mehta
|
28773214bf
|
Merge pull request #5795 from rohitwaghchaure/sales_invoice_form_is_pos_issue
set paid amount with grand amount on sales invoice form
|
2016-07-19 21:34:05 +05:30 |
|
Rohit Waghchaure
|
88514a246b
|
set paid amount with grand amount on invoice form
|
2016-07-19 20:04:44 +05:30 |
|
Rushabh Mehta
|
636acc2565
|
[minor] run stock reco in background if more than 100 items, fixes #4904
|
2016-07-19 17:14:48 +05:30 |
|
Saurabh
|
9cba6e1f25
|
[fix] test case fix for expense claim
|
2016-07-19 11:38:16 +05:30 |
|
Saurabh
|
718d835f45
|
[enhance] Add Accounts table in to mention expense account based on company #5777
|
2016-07-19 11:38:16 +05:30 |
|
Saurabh
|
f589c82d68
|
[enhance] demo for expense claim #5731
|
2016-07-19 11:38:15 +05:30 |
|
Rushabh Mehta
|
771773240b
|
Merge pull request #5788 from rohitwaghchaure/clean_timesheet
billable field access from grid and create timesheet without employee
|
2016-07-19 10:43:09 +05:30 |
|
Rushabh Mehta
|
02ba94784b
|
Merge pull request #5785 from rohitwaghchaure/batch_added_in_pos
[POS] Added batch and fixed issue of searching serial no #5779
|
2016-07-19 10:19:52 +05:30 |
|