Neil Trini Lasrado
|
98151ce5b2
|
[Patch] Change status in Opportunity to Quotation where status is converted
|
2016-07-27 15:58:16 +05:30 |
|
Neil Trini Lasrado
|
ee75d41da0
|
[Fix] Fixed issues in Fee records
|
2016-07-27 15:23:19 +05:30 |
|
Rushabh Mehta
|
b2c9848886
|
bumped to version 7.0.7
|
2016-07-27 15:49:58 +06:00 |
|
Nabin Hait
|
b4bf757a15
|
Update fix_nonwarehouse_ledger_gl_entries_for_transactions.py
|
2016-07-27 15:19:12 +05:30 |
|
Rushabh Mehta
|
fc49c2c5f9
|
Merge branch 'develop'
|
2016-07-27 15:09:03 +05:30 |
|
Rushabh Mehta
|
384f0b18c0
|
bumped to version 7.0.6
|
2016-07-27 15:39:03 +06:00 |
|
Nabin Hait
|
2a2346422d
|
[fix] Set amounts only if party and bank account exists
|
2016-07-27 13:08:00 +05:30 |
|
Rushabh Mehta
|
548ea777a9
|
Merge pull request #5883 from saurabh6790/maintenance_schedule_fix
[fix] report filter fix
|
2016-07-27 12:43:41 +05:30 |
|
Nabin Hait
|
10007ab4df
|
[fix] reposting of gle where stock account not linked with warehouse
|
2016-07-27 12:43:02 +05:30 |
|
Nabin Hait
|
444bedcd20
|
Merge branch 'warehouse_blank_issue_for_non_stock_account' of https://github.com/rohitwaghchaure/erpnext_develop into rohitwaghchaure-warehouse_blank_issue_for_non_stock_account
|
2016-07-27 12:33:10 +05:30 |
|
Saurabh
|
4bc0f7d105
|
[minor][fix] rename attribute from amount to components
|
2016-07-27 12:10:21 +05:30 |
|
Saurabh
|
3642f987c7
|
[fix] report filter fix
|
2016-07-27 11:42:50 +05:30 |
|
Ben Cornwell-Mott
|
07e5758a94
|
Timesheets update on date changes in Salary Slip
|
2016-07-26 21:00:43 -07:00 |
|
Ben Cornwell-Mott
|
e326ae95ef
|
Fixed typo
|
2016-07-26 19:55:09 -07:00 |
|
bcornwellmott
|
5f59a0a00f
|
Corrected SQL query
|
2016-07-28 06:56:20 -07:00 |
|
Ben Cornwell-Mott
|
19cb34ce40
|
removed test variable
|
2016-07-26 13:48:36 -07:00 |
|
Ben Cornwell-Mott
|
5342ec5055
|
Added employee name to get_employee_list query
|
2016-07-26 13:47:55 -07:00 |
|
Rushabh Mehta
|
593d2e3146
|
Merge pull request #5877 from rohitwaghchaure/v7_fixes
[minor] Fixes
|
2016-07-26 21:21:45 +05:30 |
|
Rohit Waghchaure
|
c4afd63e50
|
[minor] Fixes
|
2016-07-26 20:47:42 +05:30 |
|
Rushabh Mehta
|
154be9b693
|
bumped to version 7.0.5
|
2016-07-26 18:32:38 +06:00 |
|
Saurabh
|
17a9940f00
|
[minor][fix] end date should not be less or equal to start date
|
2016-07-26 17:18:45 +05:30 |
|
Rohit Waghchaure
|
4d3e8da4a2
|
[Fix] Set warehouse to stock account and fixed gl entries against transactions.
|
2016-07-26 17:09:33 +05:30 |
|
Ben Cornwell-Mott
|
d4d1f1b036
|
Added date filters for the Timesheet query in Salary Slip
|
2016-07-26 03:33:38 -07:00 |
|
Saurabh
|
21a5658fdf
|
[fix] fee component rename patch fix
|
2016-07-26 15:03:41 +05:30 |
|
Rohit Waghchaure
|
8a9daece7e
|
[Fix] Timesheet patch
|
2016-07-26 12:57:05 +05:30 |
|
Rushabh Mehta
|
5662ad6d96
|
bumped to version 7.0.4
|
2016-07-26 09:54:00 +06:00 |
|
Rushabh Mehta
|
859843687e
|
[minor] add abbr if missing
|
2016-07-26 08:23:32 +05:30 |
|
Rohit Waghchaure
|
26cf01aaba
|
[mionr] fixes and cleanups
|
2016-07-26 00:30:25 +05:30 |
|
Neil Trini Lasrado
|
ce1c63f776
|
[rename] Renamed Fee Amount to Fee Component
|
2016-07-25 18:24:37 +05:30 |
|
Rushabh Mehta
|
95b550dd8f
|
Merge pull request #5862 from neilLasrado/rename
Renamed sg_creation_tool_course to Student Group Creation Tool Course
|
2016-07-25 16:21:32 +05:30 |
|
Rushabh Mehta
|
bb78f1ac16
|
Merge pull request #5861 from neilLasrado/develop
[Fix] fixed test cases for schools
|
2016-07-25 16:21:18 +05:30 |
|
Neil Trini Lasrado
|
feea2e3dec
|
[Doctype Rename] Renamed sg_creation_tool_course to Student Group Creation Tool Course
|
2016-07-25 16:13:05 +05:30 |
|
Neil Trini Lasrado
|
7dae3e1ed4
|
[Fix] fixed test cases for schools
|
2016-07-25 15:55:31 +05:30 |
|
Rushabh Mehta
|
1c93dd0591
|
bumped to version 7.0.3
|
2016-07-25 16:15:46 +06:00 |
|
Rushabh Mehta
|
c910e0c614
|
[translations] update icenlandic
|
2016-07-25 15:03:39 +05:30 |
|
Rushabh Mehta
|
6c3ac9587e
|
[fix] quick entry
|
2016-07-25 15:03:39 +05:30 |
|
Javier Wong
|
5b2af6ad40
|
[Fixed] Stopping and Re-Opening of Production Order
|
2016-07-25 16:49:39 +08:00 |
|
Rushabh Mehta
|
3f8428e972
|
bumped to version 7.0.2
|
2016-07-25 13:28:03 +06:00 |
|
Rushabh Mehta
|
644a04b378
|
[fix] translations v7.0
|
2016-07-25 12:15:30 +05:30 |
|
Rushabh Mehta
|
c9478fc4f1
|
[minor] setup website before domainify
|
2016-07-25 12:09:21 +05:30 |
|
Neil Trini Lasrado
|
d69d961f2a
|
Removed Administrator role from Doctypes
|
2016-07-25 11:39:23 +05:30 |
|
Rushabh Mehta
|
ead3ccfd52
|
[fix] more routes patch up
|
2016-07-24 22:28:50 +05:30 |
|
Rushabh Mehta
|
581a12c56a
|
bumped to version 7.0.1
|
2016-07-24 17:47:43 +06:00 |
|
Rushabh Mehta
|
cd385c3735
|
[fix] [minor] email pulling error, via scheduler log
|
2016-07-24 13:07:50 +05:30 |
|
Rushabh Mehta
|
49e17e4590
|
Merge pull request #5849 from netchampfaris/ui-fixes
[mobile ui] fix pos payment layout #5780
|
2016-07-24 12:47:13 +05:30 |
|
Faris Ansari
|
8e282c2ed8
|
[mobile ui] fix pos payment layout #5780
|
2016-07-24 11:37:25 +05:30 |
|
Rohit Waghchaure
|
f027fd0c66
|
[Fix] Timesheet patch
|
2016-07-24 00:38:10 +05:30 |
|
Rushabh Mehta
|
71b6494395
|
Merge pull request #5845 from KanchanChauhan/quotation-fix
[Minor Fix]
|
2016-07-23 15:16:31 +05:30 |
|
Kanchan Chauhan
|
39c952a3f2
|
[Minor Fix]
|
2016-07-23 14:39:01 +05:30 |
|
Rushabh Mehta
|
e7399dff2d
|
[fix] homepage patch
|
2016-07-22 21:01:39 +05:30 |
|
Rushabh Mehta
|
29517d0b8c
|
[fix] purchase order dashboard
|
2016-07-22 21:01:39 +05:30 |
|
Neil Trini Lasrado
|
6cfb60dc98
|
Minor fixed for Schools
|
2016-07-22 19:08:18 +05:30 |
|
Anand Doshi
|
b2e1d54fce
|
bumped to version 7.0.0
|
2016-07-22 16:33:16 +06:00 |
|
Rohit Waghchaure
|
7d439ecc20
|
Demo records for Projects+Tasks+Billing, pos invoice
|
2016-07-22 15:56:20 +05:30 |
|
Nabin Hait
|
dcefd29e3f
|
Merge pull request #5839 from saurabh6790/payment_request_demo
Payment request demo
|
2016-07-22 15:53:26 +05:30 |
|
Rushabh Mehta
|
5340cadcf9
|
Merge pull request #5827 from neilLasrado/student_batch
Added Student Batch
|
2016-07-22 15:47:48 +05:30 |
|
Neil Trini Lasrado
|
f521a9c601
|
Added Student Batch
|
2016-07-22 15:45:42 +05:30 |
|
Saurabh
|
6e0a00b537
|
[minor][fix] flag fix for payment entry creation via payment request
|
2016-07-22 15:43:27 +05:30 |
|
Saurabh
|
90c0b7fbea
|
[fix] payment request demo
|
2016-07-22 15:43:27 +05:30 |
|
Saurabh
|
e4e8954a19
|
[fix] make payment request without payment gateway
|
2016-07-22 15:43:26 +05:30 |
|
Umair Sayyed
|
6fcfc87d60
|
Documentation of Timesheet, Budgeting and Payment Entry
|
2016-07-22 15:22:56 +05:30 |
|
Nabin Hait
|
13e248af8d
|
Merge pull request #5833 from nabinhait/fix_108
Validate warehouse if update stock checked in Purchase Invoice
|
2016-07-22 13:21:43 +05:30 |
|
Nabin Hait
|
db4aca3eaf
|
Merge pull request #5823 from nabinhait/fix_107
Update opening stock on creation if item, only if it is non-serialized and does maintain batch
|
2016-07-22 13:17:26 +05:30 |
|
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 |
|