Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
16,052 Commits 3 Branches 0 Tags 1 GiB
2e31d7c7bf
Commit Graph

8786 Commits

Author SHA1 Message Date
Umair Sayyed
e96b3ce725 added documentation for the new features 2016-08-01 17:42:30 +05:30
Nabin Hait
798f3897a3 bumped to version 7.0.14 2016-08-01 18:05:02 +06:00
Nabin Hait
29a8a93aa1 Run guardian patch only if student doctype exists and there is father_name column 2016-08-01 17:31:17 +05:30
Nabin Hait
cd339b2ecf bumped to version 7.0.13 2016-08-01 16:54:53 +06:00
Nabin Hait
c9d04ab1fc Merge pull request #5952 from nabinhait/lcv_reference 
[patch] Update refdoc in Landed Cost Voucher
 2016-08-01 16:23:33 +05:30
Nabin Hait
6f84026c24 Merge pull request #5951 from nabinhait/patch_fix_104 
[patch] Reload RFQ and timesheet before removing customer/supplier roles
 2016-08-01 16:15:47 +05:30
Rushabh Mehta
24f45af27e [fix] minor dont make lead for invalid email 2016-08-01 16:07:56 +05:30
Nabin Hait
3c364dd5b8 [patch] Update refdoc in Landed Cost Voucher 2016-08-01 15:53:36 +05:30
Nabin Hait
5940dc1a8e [patch] Reload RFQ and timesheet before removing customer/supplier roles 2016-08-01 15:30:44 +05:30
Neil Trini Lasrado
3e78558357 Moved Intrest to HR module 2016-08-01 15:18:36 +05:30
Neil Trini Lasrado
74dbd168c2 [new Feature] Added guardian master 2016-08-01 15:08:04 +05:30
Nabin Hait
de745e1df6 bumped to version 7.0.12 2016-08-01 14:42:47 +06:00
Nabin Hait
77dd190cc8 Merge pull request #5939 from rohitwaghchaure/pos_batch_no_fixes 
[Fix] batch no searching in pos & minor fixes
 2016-08-01 13:17:00 +05:30
Nabin Hait
ddde4bec39 Merge pull request #5932 from rohitwaghchaure/demo_records 
[demo] sales and purchase returns
 2016-08-01 13:11:54 +05:30
Nabin Hait
9ed1891440 Merge pull request #5931 from neilLasrado/student-log 
[new feature] Added Student Log
 2016-08-01 13:10:19 +05:30
Nabin Hait
dfcf55d010 Merge pull request #5948 from nabinhait/department_role 
Assigned permissions for Academic User role in Department
 2016-08-01 13:07:02 +05:30
Nabin Hait
66126ffc7a Merge pull request #5938 from nabinhait/salary_renaming 
Delete old salary earning and deduction doctypes
 2016-08-01 13:06:52 +05:30
Rohit Waghchaure
a88dec8775 [Fix] batch no searching in pos 2016-08-01 13:01:13 +05:30
Nabin Hait
86a477d07e Assigned permissions for Academic User role in Department 2016-08-01 12:51:04 +05:30
Nabin Hait
bc691dccba Changed the order of the patch 2016-08-01 12:36:28 +05:30
Nabin Hait
e9674f8866 Create columns for custom fields in new table Salary Detail and Component 2016-08-01 12:13:11 +05:30
Nabin Hait
84306ccc4c Salary component fixtures 2016-08-01 11:54:19 +05:30
Nabin Hait
feed313a66 Delete old salary earning and deduction doctypes 2016-08-01 11:54:19 +05:30
Nabin Hait
981f6ea34e minor fix for item and employee link formatter 2016-07-31 11:44:43 +05:30
Nabin Hait
ba1c34eef3 Merge pull request #5919 from bcornwellmott/timesheet_dates 
Timesheets update on date changes in Salary Slip
 2016-07-29 20:31:01 +05:30
Rushabh Mehta
3e001b5fac Merge branch 'develop' 2016-07-29 18:55:48 +05:30
Rushabh Mehta
6201068f8f bumped to version 7.0.11 2016-07-29 19:25:48 +06:00
Rushabh Mehta
9421a109cf [fix] reports template 2016-07-29 18:52:00 +05:30
Rushabh Mehta
26005c25b2 [minor] fix filter for item-code 2016-07-29 18:52:00 +05:30
Rushabh Mehta
180e43585f [minor] formatter for item and employee 2016-07-29 18:52:00 +05:30
Rohit Waghchaure
05cc36a864 [demo] sales and purchase returns 2016-07-29 18:26:02 +05:30
Neil Trini Lasrado
1e5c251ce2 [new feature] Added Student Log 2016-07-29 17:05:49 +05:30
Nabin Hait
95c2ba9736 Merge pull request #5901 from bcornwellmott/fix_employee_lookup 
Fix Timesheet employee query to show names
 2016-07-29 16:28:18 +05:30
Kanchan Chauhan
db0e57cdce Demo data for Leave Allocation, Leave Application and Attendance 2016-07-29 15:59:39 +05:30
Revant Nandgaonkar
cc8fb1a8d6 changed path to login 
frappe.templates.pages.login.login_via_google changed to frappe.www.login.login_via_google
 2016-07-28 19:50:15 +05:30
Nabin Hait
3bf486c5c6 bumped to version 7.0.10 2016-07-28 18:56:23 +06:00
Nabin Hait
6b8024a834 Merge pull request #5909 from nabinhait/fix_113 
[fix] Show supplier name field if it is different from supplier id
 2016-07-28 17:52:02 +05:30
Nabin Hait
7bae70a993 [fix] Show supplier name field if it is different from supplier id 2016-07-28 17:19:35 +05:30
Nabin Hait
e7d0639edc Set difference amount in Payment Entry as per field precision 2016-07-28 16:56:59 +05:30
Nabin Hait
a163299991 bumped to version 7.0.9 2016-07-28 16:31:00 +06:00
Nabin Hait
e72ff9377a Added converted status in Opportunity 2016-07-28 15:59:20 +05:30
Nabin Hait
ee70f26131 bumped to version 7.0.8 2016-07-28 16:16:35 +06:00
akshay
14384c2787 [fix] serial no button 2016-07-28 13:53:17 +05:30
Nabin Hait
fa97b3cac7 [fix] repost gle only if there is any stock account without warehouse 2016-07-27 17:33:32 +05:30
Nabin Hait
95f53cca44 Merge pull request #5885 from nabinhait/payment_entry_fix12 
[fix] Set amounts only if party and bank account exists
 2016-07-27 16:45:20 +05:30
Nabin Hait
7590b8fff1 minor fix for stock ledger entry 2016-07-27 16:44:26 +05:30
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
Ben Cornwell-Mott
590d2d524b Updated html file to use c3.js instead of Google Charts 2016-07-25 18:03:01 -07:00
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
Ben Cornwell-Mott
fe11e71084 Removed hover tooltip 2016-07-22 10:02:41 -07:00
Ben Cornwell-Mott
2c76aec119 Added Google Chart to compare quotes in Print view 2016-07-22 09:56:29 -07:00
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
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
Rushabh Mehta
4beba3aff9 Merge pull request #5705 from KanchanChauhan/fixed-employee-holiday-attendance-report 
Added Holiday List filter
 2016-07-12 11:11:43 +05:30
Dony Sukardi
84c9e6bb4a [fix] Documentation Fixes 
Fixes for the following issues:
- Render code block
- Fix ordered-list numbering
 2016-07-12 04:01:06 +08:00
Rushabh Mehta
29b80b2233 Merge pull request #5701 from saurabh6790/item_reorder 
[fix] fix get query for sub warehouse in reorder level table
 2016-07-11 17:14:50 +05:30
Nabin Hait
cc2083ebd0 [fix] Advance payment adjustment in sales/purchase invoice 2016-07-11 16:12:18 +05:30
Rushabh Mehta
3ce24d64c2 [cleanup] payment entry form view 2016-07-11 16:08:46 +05:30
Kanchan Chauhan
54860cd57d Added Holiday List filter 2016-07-11 15:16:47 +05:30
Rohit Waghchaure
3e012b7e16 [Fix] Time sheet rename issues 2016-07-11 15:00:38 +05:30
Saurabh
7151f91862 [fix] fix get query for sub warehouse in reorder level table 2016-07-11 13:19:06 +05:30
Rushabh Mehta
391c0efcee [fix] make grids editable 2016-07-11 13:01:58 +05:30
Rushabh Mehta
cca33b2ff0 [cleanup] 2016-07-11 13:01:58 +05:30
Nabin Hait
e37625b0c2 Merge pull request #5693 from rohitwaghchaure/v7_pos_issue 
[Fix] POS minor fixes.
 2016-07-11 12:52:47 +05:30
Nabin Hait
54bd79bd93 Merge pull request #5690 from nabinhait/fix100 
Deleted report Customers Not Buying Since Long Time
 2016-07-11 12:52:35 +05:30
Nabin Hait
bbc394fd72 Changed patch order to fix old patches 2016-07-11 12:40:18 +05:30
Rohit Waghchaure
89ee3091af [Fix] POS minor fixes. 2016-07-08 15:17:04 +05:30
Nabin Hait
f176cc03df Deleted report Customers Not Buying Since Long Time 2016-07-08 09:03:13 +05:30
Nabin Hait
12e8277b6b Merge pull request #5681 from nabinhait/sal_slip_print 
Print formats for salary slip
 2016-07-08 08:35:31 +05:30
Rohit Waghchaure
0d4a9c225f [Salary Structure] Make salary_component field mandatory if salary_slip_based_on_timesheet is true 2016-07-07 17:04:54 +05:30
Rushabh Mehta
408d2c5db3 Merge pull request #5683 from rohitwaghchaure/v7_pos_issue_and_enhancement 
[Fix] Access is pos from sales invoice form.
 2016-07-07 16:46:32 +05:30
Rohit Waghchaure
539e913b46 [Fix] Access is pos from sales invoice form. 2016-07-07 16:44:40 +05:30
Rushabh Mehta
7333eb280f [minor] typo in customer.js 2016-07-07 15:34:01 +05:30
Rushabh Mehta
ea0ff23891 [cleanup] form dashboards 2016-07-07 14:28:05 +05:30
Rushabh Mehta
964ad0fcae [cleanup] rename "links" to "dashboard" 2016-07-07 14:28:05 +05:30
Rushabh Mehta
2a1e3bb31b [fix] sender name in lead 2016-07-07 14:28:05 +05:30
Nabin Hait
027acde4f4 Print formats for salary slip 2016-07-07 13:17:21 +05:30
Nabin Hait
cfa9df2842 Merge pull request #5679 from nabinhait/pull_button_visibility 
[fix] Condition for visibility of 'Get Items from Open Material Requests' in PO
 2016-07-07 12:47:58 +05:30
Nabin Hait
ade217c0e0 Merge pull request #5678 from nabinhait/exchange_rate_issue 
[fix] Dont set currency and exchange rate while Quotation made from Opportunity for lead
 2016-07-07 12:47:36 +05:30
Nabin Hait
804b8f7baf Merge pull request #5645 from KanchanChauhan/task-status-update-in-website 
Task statuses updated in website
 2016-07-07 12:46:46 +05:30
Rohit Waghchaure
2b590fd804 [Fix] Pricing rule issue 2016-07-07 12:22:22 +05:30
Kanchan Chauhan
6d76359c31 [WIP] Task statuses updated in website 2016-07-07 12:19:01 +05:30
Nabin Hait
a9d3981c86 [fix] Condition for visibility of 'Get Items from Open Material Requests' in PO 2016-07-07 11:34:34 +05:30
Nabin Hait
3950507d4b [fix] Currency and exchange rate while Quotation made from Opportunity for lead 2016-07-07 11:12:44 +05:30
Nabin Hait
821367fee8 [fix] Dont set currency and exchange rate while Quotation made from Opportunity for lead 2016-07-07 10:55:47 +05:30
Nabin Hait
6a66138764 Merge pull request #5675 from rohitwaghchaure/rename_time_sheet_doctype 
Rename Time Sheet doctype
 2016-07-07 10:38:55 +05:30
Nabin Hait
8019ea73aa Merge pull request #5653 from saurabh6790/V7_fixes_2 
[fix] task visibility fix #5601
 2016-07-07 10:35:02 +05:30
Nabin Hait
b71a14ceca minor fix 2016-07-06 23:38:05 +05:30
Nabin Hait
378f5c48e5 [fix] Test cases 2016-07-06 23:38:05 +05:30
Nabin Hait
c19691632e Button to make Depreciation Entry manually 2016-07-06 23:38:05 +05:30
Nabin Hait
e417000bbb Fetch Fixed Asset property from item in Sales / Purchase Invoice 2016-07-06 23:38:05 +05:30
Nabin Hait
cea353a638 Validate expected value after useful life 2016-07-06 23:38:05 +05:30
Nabin Hait
e3e1b80fcc Editable grid and query in asset category 2016-07-06 23:38:05 +05:30
Nabin Hait
b30acc7ddb Fixes in Account 2016-07-06 23:38:04 +05:30
Nabin Hait
668d090eed Fetch deatils from Item and Asset Category 2016-07-06 23:38:04 +05:30
Nabin Hait
abd6c5debb Fixed asset item property and validations 2016-07-06 23:38:04 +05:30
Nabin Hait
2dec0db3bd Is Fixed Asset and Asset Category field added in Item 2016-07-06 23:38:04 +05:30
Rohit Waghchaure
e94d18b4cd Rename Time Sheet doctype 2016-07-06 20:38:50 +05:30
Nabin Hait
21f443e37c Merge pull request #5674 from rohitwaghchaure/v7_fixes 
[Fixes] RFQ contact and multiple creation of supplier quotation issue
 2016-07-06 17:51:56 +05:30
Saurabh
38d261653f [fix] load task table for project on saving of project 2016-07-06 17:26:21 +05:30
Rohit Waghchaure
f154c611bb [Fixes] RFQ contact and multiple creation of supplier quotation issue 2016-07-06 17:26:15 +05:30
Saurabh
838dd6c530 [fix] task visibility fix #5601 2016-07-06 17:00:30 +05:30
Nabin Hait
70a1ddb6a1 Merge pull request #5671 from nabinhait/fixes90 
Multiple fixes
 2016-07-06 16:53:31 +05:30
Rohit Waghchaure
53bea82514 [Fixes] POS amount calculation issue 2016-07-06 16:15:10 +05:30
Nabin Hait
819ed21ab5 Removed Pro Order from Quick Entry 2016-07-06 16:13:44 +05:30
Nabin Hait
df2200b417 Added Valuation Rate field in Item for opening stock 2016-07-06 16:05:15 +05:30
Nabin Hait
4671038211 Item Name added in Stock Reconciliation 2016-07-06 16:05:15 +05:30
Nabin Hait
5f82a5387d Query for warehouse and editable fields in grid 2016-07-06 15:35:23 +05:30
Nabin Hait
f3090b01c1 Merge pull request #5662 from KanchanChauhan/template-selection-salesorder 
template selection of item disabledin Sales Order
 2016-07-06 15:27:42 +05:30
Rohit Waghchaure
3188b56694 [Fixes] Time sheet fixes 2016-07-06 14:31:14 +05:30
Kanchan Chauhan
6cb5710ffc template selection of item disabledin Sales Order 2016-07-06 13:25:44 +05:30
Nabin Hait
7796c2f0c0 Update rename_salary_components.py 2016-07-06 13:11:51 +05:30
Rohit Waghchaure
c8d231b26b [Fix] Patch salary component 2016-07-06 12:33:54 +05:30
Rohit Waghchaure
a71d9d33af Rename prevdoc field in purchase order and purchase receipt doctype 2016-07-06 12:13:29 +05:30
Nabin Hait
4647f24865 Merge pull request #5625 from KanchanChauhan/salary-component-cleanup 
Salary component cleanup
 2016-07-06 12:06:05 +05:30
Kanchan Chauhan
d963b76a4b Salary component cleanup 2016-07-06 12:04:38 +05:30
Nabin Hait
d1a83d43ab Merge pull request #5652 from saurabh6790/V7_fixes_1 
[fix] link fixes for tree structures #5651
 2016-07-06 10:54:54 +05:30
Anand Doshi
3177138655 [fix] moved disable setup wizard access to frappe 2016-07-05 21:34:21 +05:30
Saurabh
52ec0ed134 [fix] link fixes for tree structures #5651 2016-07-05 18:05:45 +05:30
Saurabh
c03a3bf580 [minor][fix] fix base_grand_total 2016-07-05 15:58:14 +05:30
Saurabh
1c5c511d2e [fix] add payment entry in document flow 2016-07-05 12:46:38 +05:30
Saurabh
066ae8e4c4 [fix] make cheque print compatible with payment entry 2016-07-05 12:46:38 +05:30
Nabin Hait
04f0e61331 Merge pull request #5639 from saurabh6790/customer_save_fix 
[fix] set addr_list and contact_list attr #5635
 2016-07-05 10:57:34 +05:30
Nabin Hait
1e42a05c2d Merge pull request #5636 from nabinhait/payment_entry_fix 
Payment entry fix
 2016-07-05 10:56:54 +05:30
Saurabh
bce02c4364 set addr_list and contact_list attr #5635 2016-07-04 18:28:20 +05:30
Nabin Hait
281b07cdb6 Warehouse patch fix 2016-07-04 18:17:57 +05:30
Nabin Hait
7f3938b19f Warehouse patch fix 2016-07-04 18:12:08 +05:30
Rushabh Mehta
e38872294a [fix] [patch] 2016-07-04 17:34:25 +05:30
Nabin Hait
f6a0d789d0 Payment entry fixes 2016-07-04 17:26:02 +05:30
Nabin Hait
e4bbb696ab Payment Entry minor improvements 2016-07-04 17:26:02 +05:30
Rushabh Mehta
1d797f717b [fix] warehouse validation for parent_account 2016-07-04 17:07:08 +05:30
Rushabh Mehta
bc10431b7d Merge pull request #5631 from KanchanChauhan/address-viewww-fixed 
Address view fixed for website
 2016-07-04 15:50:40 +05:30
Kanchan Chauhan
1605ff02c6 [WIP] Address view fixed 2016-07-04 15:41:07 +05:30
Rushabh Mehta
a123025d78 Merge pull request #5630 from rohitwaghchaure/v7_time_log_batch_patch_fixes 
[Fixes] Time log batch patch
 2016-07-04 14:07:58 +05:30
Rohit Waghchaure
240407b155 [Fixes] Time log batch patch 2016-07-04 13:21:54 +05:30
Saurabh
51f66efc7a [minor][fix] set transactions_exist on load of company 2016-07-04 13:06:29 +05:30
Saurabh
c2934ba9da [minor][fix] holiday list exception message fix 2016-07-04 13:06:29 +05:30
Rushabh Mehta
c1d2247f2c Merge pull request #5620 from nabinhait/payment_entry 
Payment Entry
 2016-07-04 13:01:16 +05:30
Nabin Hait
ff2f3ef1b1 Test Case Fixes 2016-07-04 11:42:25 +05:30
Nabin Hait
e196190d10 minor fix 2016-07-04 11:42:25 +05:30
Nabin Hait
56548cbfa2 Payment against negative invoice, negative outstanding allocation and much more 2016-07-04 11:42:25 +05:30