Nabin Hait
|
2b12a74fef
|
Merge pull request #5822 from nabinhait/fix_106
Unlink payment entries on cancellation of Invoice
|
2016-07-22 13:17:04 +05:30 |
|
Nabin Hait
|
0953aeb731
|
Merge branch 'master' into develop
|
2016-07-22 13:15:53 +05:30 |
|
Nabin Hait
|
368a314d48
|
bumped to version 6.27.26
|
2016-07-22 13:28:12 +06:00 |
|
Nabin Hait
|
8ecb78ba39
|
Validate warehouse if update stock checked in Purchase Invoice
|
2016-07-22 12:25:16 +05:30 |
|
Rushabh Mehta
|
6207883b7c
|
[fix] patch #5831
|
2016-07-22 12:20:52 +05:30 |
|
Rushabh Mehta
|
04a64a7f48
|
[fix] patch #5831
|
2016-07-22 12:19:18 +05:30 |
|
Rushabh Mehta
|
f276b52af3
|
[fix] patch #5831
|
2016-07-22 11:31:51 +05:30 |
|
Rushabh Mehta
|
0e3e16cda0
|
Merge pull request #5830 from MaxMorais/patch-6
Extend search_fields for customer querie
|
2016-07-22 11:10:54 +05:30 |
|
Rushabh Mehta
|
428a59f7a1
|
Merge pull request #5829 from bcornwellmott/quoteitemreport-1
Added new report for Supplier Quotation comparisons
|
2016-07-22 11:03:51 +05:30 |
|
Rushabh Mehta
|
11900e8fad
|
[fix] make grid editable for schools and fix #5831
|
2016-07-22 10:59:07 +05:30 |
|
Maxwell Morais
|
3557261313
|
Extend search_fields for customer querie
This PR is intended to extend the customer querie adding the meta-info from the doctype using the search fields to extend the customer querie
|
2016-07-21 23:42:59 -03:00 |
|
Ben Cornwell-Mott
|
99e03f2371
|
Added new report for Supplier Quotation comparisons
|
2016-07-21 13:03:58 -07:00 |
|
Rohit Waghchaure
|
ea278b5971
|
[Fix]POS and timesheet issues
|
2016-07-22 01:22:56 +05:30 |
|
Nabin Hait
|
767cf99435
|
Update opening stock on creation if item, only if it is non-serialized and does maintain batch
|
2016-07-21 18:46:09 +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 |
|
Nabin Hait
|
e0cc87d2d8
|
Unlink payment entries on cancellation of Invoice
|
2016-07-21 18:30:18 +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 |
|
Neil Trini Lasrado
|
a537e43838
|
Fixed patch for migrating schools to erpnext again
|
2016-07-21 16:57:04 +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 |
|
Rohit Waghchaure
|
3176bc93c1
|
[Fix] Timesheet to time issue
|
2016-07-21 14:56:15 +05:30 |
|
Rohit Waghchaure
|
47c64ec728
|
[Fix] Stock entry differnce amount issue.
|
2016-07-21 12:24:12 +05:30 |
|
Nabin Hait
|
74edfff0a7
|
Demo data for Budget
|
2016-07-21 11:39:46 +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 |
|
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 |
|
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 |
|
Rushabh Mehta
|
6ecc0888ab
|
[minor] dont make tax template default, by default. #5695
|
2016-07-19 10:17:30 +05:30 |
|
Rohit Waghchaure
|
f14bf502ef
|
billable field access from grid
|
2016-07-18 23:30:46 +05:30 |
|
Rohit Waghchaure
|
03da40ba4c
|
[Fix] Added batch in POS
|
2016-07-18 17:50:50 +05:30 |
|
Rushabh Mehta
|
5f9566f3af
|
[fix] text field for sales, purchase invoice advance fixes #5773
|
2016-07-18 14:44:12 +05:30 |
|
Rushabh Mehta
|
5c52fa9785
|
[fix] variant error message
|
2016-07-18 14:40:14 +05:30 |
|
Rushabh Mehta
|
76b134192f
|
[fix] grid columns now restricted to 10
|
2016-07-18 14:30:27 +05:30 |
|
Nabin Hait
|
4fddff1606
|
Merge pull request #5767 from nabinhait/fix101
Payment Improvements
|
2016-07-16 11:55:12 +05:30 |
|
Nabin Hait
|
2842a86225
|
Merge pull request #5775 from revant/patch-1
Issue #5774
|
2016-07-16 11:28:15 +05:30 |
|
Nabin Hait
|
94105b04b8
|
Asset category mandatory validation while fetching item details
|
2016-07-16 11:20:50 +05:30 |
|
Saurabh
|
dcb41da02a
|
[fix] for setting warehouse in account head
|
2016-07-16 11:17:43 +05:30 |
|
Revant Nandgaonkar
|
88e16a7f82
|
removed force=True
|
2016-07-16 11:00:37 +05:30 |
|
Nabin Hait
|
37dd714e6c
|
Is Stock Item checkbox visibility
|
2016-07-16 11:00:29 +05:30 |
|
Nabin Hait
|
96376b2345
|
Trigger receive/paid amount on change of paid from/to
|
2016-07-16 11:00:29 +05:30 |
|
Nabin Hait
|
6831b9422b
|
payment entry improvements and deletion of payment tool
|
2016-07-16 11:00:29 +05:30 |
|
Nabin Hait
|
4f5f8d7806
|
Set target exchange rate from source if currency is same
|
2016-07-16 10:59:48 +05:30 |
|
Nabin Hait
|
e6cdb01bea
|
[fix] Query for account fields in Company
|
2016-07-16 10:59:48 +05:30 |
|
Nabin Hait
|
530b86b9b2
|
Merge pull request #5752 from KanchanChauhan/employee-holiday-attendance-report-renamed
Employee Attendance report renamed to Employees working on a holiday
|
2016-07-16 10:58:52 +05:30 |
|
Nabin Hait
|
4d64f6d4b4
|
Merge pull request #5772 from rohitwaghchaure/demo_records
Demo records for timesheet
|
2016-07-16 10:52:03 +05:30 |
|
Revant Nandgaonkar
|
cc08682879
|
Issue #5774
|
2016-07-15 23:41:22 +05:30 |
|
Rohit Waghchaure
|
ecb2031bbe
|
[Fix] Timesheet workstation holiday issue
|
2016-07-15 20:11:01 +05:30 |
|
Rohit Waghchaure
|
8002d47ff6
|
Demo records for timesheet
|
2016-07-15 19:24:21 +05:30 |
|
Rushabh Mehta
|
8d8bbb0588
|
[bugfix] opportunity naming
|
2016-07-15 16:50:52 +05:30 |
|
Rushabh Mehta
|
55ea7b1f61
|
[minor] set applicant name automatically
|
2016-07-15 16:43:25 +05:30 |
|
Rushabh Mehta
|
95383bb281
|
[fix] item attribute validation and tests
|
2016-07-15 15:12:06 +05:30 |
|
Kanchan Chauhan
|
9846b945d9
|
Patch to delete previous report
|
2016-07-15 14:06:20 +05:30 |
|
Kanchan Chauhan
|
7ff0c4eef4
|
Employee Attendance report renamed to Employees working on a holiday
|
2016-07-15 13:42:36 +05:30 |
|
Rushabh Mehta
|
3f549980c9
|
Merge pull request #5748 from rohitwaghchaure/v7_timesheet_issue
[WIP] Timesheet overlap issue and fields rearranged
|
2016-07-15 12:44:27 +05:30 |
|
Rushabh Mehta
|
20122aef79
|
[minor] optimize item attribute validation for #5756
|
2016-07-15 12:42:41 +05:30 |
|
Rushabh Mehta
|
b8bdfbcead
|
[minor] optimize item attribute validation for #5756
|
2016-07-15 12:41:08 +05:30 |
|
Rohit Waghchaure
|
3bc6a958c7
|
[Fix] Timesheet overlap issue
|
2016-07-14 18:27:49 +05:30 |
|
Saurabh
|
c63f2e2993
|
[fix] patch fix
|
2016-07-14 18:24:20 +05:30 |
|
Rushabh Mehta
|
176b63b354
|
[fix] remove first row on mapping, fixes #5707
|
2016-07-14 17:43:48 +05:30 |
|
Rushabh Mehta
|
62fcaa7900
|
Merge pull request #5758 from saurabh6790/is_group_fixes
[fix] alter fieldtype for is_group from select to check
|
2016-07-14 16:57:01 +05:30 |
|
Rushabh Mehta
|
528e145a54
|
[docs] fixes #5697
|
2016-07-14 17:00:05 +05:30 |
|
Rushabh Mehta
|
92d1b8cc6d
|
[fix] [demo] permissions for accounting
|
2016-07-14 16:18:20 +05:30 |
|
Rohit Waghchaure
|
de8418efe5
|
[Fix] Timesheet patch
|
2016-07-14 14:36:47 +05:30 |
|
Saurabh
|
6bc7b892c4
|
[fix] alter fieldtype for is_group from select to check
|
2016-07-14 14:06:28 +05:30 |
|
Rushabh Mehta
|
b814a54f2f
|
[demo] mute emails
|
2016-07-13 18:17:19 +05:30 |
|
Rushabh Mehta
|
ffa70e34de
|
[demo] [minor] fixes
|
2016-07-13 17:47:37 +05:30 |
|
Anand Doshi
|
d9b3c5ca60
|
[fix] use base.html's title block in home.html
|
2016-07-13 11:29:50 +05:30 |
|
Rushabh Mehta
|
8cfe18eccd
|
[demo] help
|
2016-07-13 11:30:10 +05:30 |
|
Rohit Waghchaure
|
e3fe828ea6
|
[Fix] Added note in timesheet and minor fixes
|
2016-07-13 09:40:35 +05:30 |
|
Rushabh Mehta
|
1f15cf43d6
|
Merge pull request #5715 from donysukardi/documentation-fixes
[fix] Documentation Fixes
|
2016-07-12 11:16:12 +05:30 |
|