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

9544 Commits

Author SHA1 Message Date
Rohit Waghchaure
560ba391f9 [Enhancement] Purchase return for rejected qty 2016-09-05 00:43:17 +05:30
manqala
b2b238323b Suggested Changes to School (#6223) 
* Linkage of academic term to academic year

* School improvements. Modifications to Academic Term, Assessment, Fees, Student Batch, Student Group. Addition of Grading System.

* Removed Grading System from Assessment and put it on Program

* Removed the field Grading System from Program and added it back to Assessment. Added some validations for dates in controller of Academic Term and Academic Year

* Added validation comparing term start dates with academic year start dates and term end dates with academic year end dates where both are available.

* Renamed Grading System to Grading Structure. Implemented the code in Assessment.js to derive the Grade Code from the result entered for the student. Assumes that result is always a number. Will rename the field result in Results to score.

* Added validation to check if any grade intervals were overlapping when a Grading Structure is being saved.

* Corrections to error in autonaming for Academic Term

* Correction in white_list method get_grade in Assessment. Solves problem with grades not being derived when the score is at the boundaries of a grade interval

* Correction to setup_wizard.py to make sure that creation of academic terms in create_academic_term includes the academic_year which is now mandatory

* Corrections to test_records.json for doctype Academic Term

* Correction of test_records.json in doctype Student Groups

* Correction of test_records.json for doctype Student Group 2

* Correction to test_course_schedule.py in doctype Course Schedule

* More corrections to test_course_schedule.py in doctype Course Schedule

* Corrections to test_course_schedule.py

* Updates to Student DocType. Enrollment date, Nationality

* Linkage of academic term to academic year

* School improvements. Modifications to Academic Term, Assessment, Fees, Student Batch, Student Group. Addition of Grading System.

* Removed Grading System from Assessment and put it on Program

* Removed the field Grading System from Program and added it back to Assessment. Added some validations for dates in controller of Academic Term and Academic Year

* Added validation comparing term start dates with academic year start dates and term end dates with academic year end dates where both are available.

* Renamed Grading System to Grading Structure. Implemented the code in Assessment.js to derive the Grade Code from the result entered for the student. Assumes that result is always a number. Will rename the field result in Results to score.

* Added validation to check if any grade intervals were overlapping when a Grading Structure is being saved.

* Corrections to error in autonaming for Academic Term
 2016-09-03 21:05:06 +05:30
pawan
bd9a275d5f [fix] #6254 2016-09-02 16:51:22 +05:30
Nabin Hait
23d79b7059 fixed version conflict 2016-09-02 16:19:54 +05:30
Nabin Hait
533e564867 bumped to version 7.0.38 2016-09-02 16:49:21 +06:00
Nabin Hait
88d7e419ad Merge pull request #6263 from nabinhait/timesheet_fix_101 
Migrate employee field to timesheet only if it exists in time log
 2016-09-02 16:18:12 +05:30
Nabin Hait
54254cca58 Update set_party_name_in_payment_entry.py 2016-09-02 16:17:42 +05:30
Nabin Hait
142f14dd5c Migrate employee field to timesheet only if it exists in time log 2016-09-02 14:47:14 +05:30
Nabin Hait
15b26d8b1a Fixed merge conflicts 2016-09-02 14:29:57 +05:30
Nabin Hait
e1e187bee1 bumped to version 7.0.37 2016-09-02 14:56:33 +06:00
Nabin Hait
5a4ca64c4a Party name in Payment Entry and cheque print format 2016-09-02 14:20:01 +05:30
Nabin Hait
47fd4c6521 Merge pull request #6261 from nabinhait/order_trends_fix 
Ignore closed sales/purchase order in trends report
 2016-09-02 14:17:30 +05:30
Nabin Hait
e58031ab49 Merge pull request #6249 from rohitwaghchaure/rfq_webform_issue 
[RFQ] Web form alignment issue
 2016-09-02 14:17:22 +05:30
Nabin Hait
f8e374643c Merge pull request #6257 from nabinhait/letter_head_in_report 
Default letter head in report printing based on selected company
 2016-09-02 14:17:12 +05:30
Nabin Hait
0ef9da65dc Merge pull request #6260 from rohitwaghchaure/timesheet_status_and_date_issue 
[Fix] Updated timesheet status, start date, end date
 2016-09-02 14:16:53 +05:30
Saurabh
ff910f4c72 [fixes] set filter for warehouse 2016-09-02 13:39:05 +05:30
Nabin Hait
5c69fed218 Ignore closed sales/purchase order in trends report 2016-09-02 12:53:18 +05:30
Rohit Waghchaure
d07557eaf6 [Fix] Updated timesheet status 2016-09-02 12:24:54 +05:30
Nabin Hait
13b37c6346 Default letter head in report printing based on selected company 2016-09-02 11:25:42 +05:30
Rohit Waghchaure
b34ba6bd6e [RFQ] Web form alignment issue 2016-09-01 19:10:58 +05:30
Rushabh Mehta
b2f0920346 [minor] new global for query report filters 2016-09-01 17:53:42 +05:30
Nabin Hait
5a101ef4c6 Fixed merge conflict 2016-09-01 12:43:24 +05:30
Nabin Hait
600ab0f7a0 bumped to version 7.0.36 2016-09-01 13:12:29 +06:00
Nabin Hait
9afee28c36 Merge pull request #6243 from rohitwaghchaure/timesheet_issue 
[Patch] Check table exist
 2016-09-01 12:38:30 +05:30
Rohit Waghchaure
86f143863f [Patch] Check table exist 2016-09-01 12:37:20 +05:30
Nabin Hait
2490ea0b91 Fixed merge conflict 2016-09-01 12:29:31 +05:30
Nabin Hait
b6f33c7c4f bumped to version 7.0.35 2016-09-01 12:56:11 +06:00
Nabin Hait
bb2bceef62 Merge pull request #6229 from rohitwaghchaure/pos_payment_issue 
[POS] Fixed POS Sales Invoice when Payment Table is Empty
 2016-09-01 12:25:31 +05:30
Rohit Waghchaure
7f165f19d2 [Fix] Timesheet employee is missing in patch 2016-09-01 12:07:21 +05:30
Rohit Waghchaure
774ce63b75 remove mode of payment, migrate mode of payment from v6 to v7 2016-08-31 21:21:41 +05:30
Rohit Waghchaure
879cb6ebee [POS] Fixed POS Sales Invoice when Payment Table is Empty 2016-08-31 14:41:48 +05:30
Nabin Hait
c0c2f75159 fixed conflict 2016-08-31 12:36:03 +05:30
Nabin Hait
16e15283b5 Imported unicode literals 2016-08-31 12:33:22 +05:30
Nabin Hait
566759acae Merge pull request #6211 from rohitwaghchaure/v7.1_fixes 
[Fix] Billing Hours showing blank on sales invoice
 2016-08-31 12:12:48 +05:30
Nabin Hait
88e3487f03 Merge pull request #6206 from neilLasrado/docs 
Updated Docs for Schools Module
 2016-08-31 12:12:17 +05:30
Nabin Hait
fa3146b444 Merge pull request #6218 from RobertSchouten/patch-20 
fix for duplicate to bill status comment on submit
 2016-08-31 11:09:47 +05:30
Rohit Waghchaure
d39f53319d Added zero value condition 2016-08-31 02:09:15 +05:30
Rohit Waghchaure
609e2b4ca3 [POS] Currency format issue 2016-08-31 02:04:53 +05:30
RobertSchouten
ba4456b42b dont run duplicate set status on submit 2016-08-30 08:21:20 +08:00
Rohit Waghchaure
da7fb70009 [Patch] Fixed error unknown column 'type' in 'field list' 2016-08-30 01:41:35 +05:30
Rohit Waghchaure
a57bf5ee2e [fix] Precision issue for field conversion rate in POS 2016-08-30 01:05:01 +05:30
Nabin Hait
d260602cae Merge pull request #6202 from KanchanChauhan/component-type-added 
'Type' field added to Salary Component
 2016-08-29 16:19:05 +05:30
Kanchan Chauhan
145f87c068 'Type' field added to Salary Component 2016-08-29 15:26:57 +05:30
Rohit Waghchaure
a2bf16bfaa [Fix] Billing Hours showing blank on sales invoice 2016-08-29 13:37:13 +05:30
Nabin Hait
338e63c448 Fixed version conflict 2016-08-29 11:47:50 +05:30
Nabin Hait
11c2207a8a bumped to version 7.0.34 2016-08-29 12:17:30 +06:00
Nabin Hait
a0da708d51 Merge pull request #6185 from rohitwaghchaure/fixes_and_cleanup_pos 
[POS] Fixes and cleanup
 2016-08-29 11:42:09 +05:30
Rushabh Mehta
9d1b56f423 [minor] validate permission in Process Payroll and all products fix for home page 2016-08-29 11:03:10 +05:30
Rohit Waghchaure
63bdd679d0 [POS] Fixes and cleanup 2016-08-27 02:53:36 +05:30
Kanchan Chauhan
dd96cbd012 Coded column deleted, column added from UI 2016-08-26 14:32:38 +05:30
Nabin Hait
4403cf71b5 Merge pull request #6152 from rohitwaghchaure/profitability_report 
[Report] Profitability Analysis
 2016-08-26 13:21:01 +05:30
Rohit Waghchaure
69aebf4db5 fixes test cases, added patch 2016-08-26 13:18:14 +05:30
Rohit Waghchaure
0cb171feb2 [Enhancement] Added billing hours for account user in timesheet 2016-08-26 13:17:46 +05:30
Nabin Hait
e334813daf Merge pull request #6166 from neilLasrado/demo 
Merged Schools Demo into ERPNext
 2016-08-26 13:05:43 +05:30
Rohit Waghchaure
6462ba4e0b minor changes 2016-08-26 12:42:52 +05:30
Nabin Hait
0da75aede3 Fixed merge conflict 2016-08-26 12:40:02 +05:30
Nabin Hait
6592899741 bumped to version 7.0.33 2016-08-26 13:07:19 +06:00
Nabin Hait
06b27757ab Merge pull request #6179 from rohitwaghchaure/minor_fix_patch 
[Sales Return] Minor fix in patch
 2016-08-26 12:33:33 +05:30
Rohit Waghchaure
e21e1ebae2 [Sales Return] Minor fix in patch 2016-08-26 12:31:41 +05:30
Nabin Hait
0a99b4347b Party mandatory message 2016-08-26 12:30:45 +05:30
Nabin Hait
a26bb96d2d Merge pull request #6178 from nabinhait/status_updater_fix 
Ignore validating billed amount against order if order item amount is zero
 2016-08-26 12:09:39 +05:30
Nabin Hait
e244cde9c3 Merge pull request #6158 from KanchanChauhan/salary-structure-layout 
Layout changes in Salary Structure
 2016-08-26 12:00:29 +05:30
Nabin Hait
c97f7cac80 Merge pull request #6162 from strixaluco/patch-1 
[minor] docs typo fix
 2016-08-26 11:59:11 +05:30
Nabin Hait
fbe1563101 Merge pull request #6168 from rohitwaghchaure/hotfix 
[POS] Fixed payment gl entry for sales return
 2016-08-26 11:58:46 +05:30
Nabin Hait
47a3f639ed Ignore validating billed amount against order if order item amount is zero 2016-08-26 11:39:39 +05:30
Nabin Hait
6b8435c902 Merge pull request #6172 from joopdorresteijn/patch-1 
Update user-restriction.md
 2016-08-26 10:50:54 +05:30
Neil Trini Lasrado
067245933e Fixed Demo 2016-08-25 18:31:42 +05:30
Rohit Waghchaure
efb5bf2cfc [POS] Fixed payment gl entry for sales return 2016-08-25 16:23:47 +05:30
Rushabh Mehta
cdfd35c9ca New Languages added: 
frappe/translations/am.csv
       	frappe/translations/en-US.csv
       	frappe/translations/en.csv
       	frappe/translations/es-AR.csv
       	frappe/translations/es-CL.csv
       	frappe/translations/es-GT.csv
       	frappe/translations/es-MX.csv
       	frappe/translations/es-NI.csv
       	frappe/translations/fr-CA.csv
       	frappe/translations/ku.csv
       	frappe/translations/lo.csv
       	frappe/translations/lt.csv
       	frappe/translations/ps.csv
       	frappe/translations/rw.csv
       	frappe/translations/sr-SP.csv
 2016-08-25 15:23:40 +05:30
joopdorresteijn
8da1e9eeb8 Update user-restriction.md 
Sales user also doesn't exist
 2016-08-25 15:46:24 +08:00
Rohit Waghchaure
0788ee62c1 Fixed patch, 'SalesInvoice' object has no attribute 'account_for_change_amount' 2016-08-25 12:46:34 +05:30
strixaluco
5380a1c56a Update price-lists.md 
Repetitive sentence removed.
 2016-08-25 10:40:42 +08:00
Rohit Waghchaure
1e8732abc2 removed old report 2016-08-24 19:20:58 +05:30
Rohit Waghchaure
5794ffd43d added filters project and cost center in profit and loss statement, open profit and loss statement on click of cost center/project in profitability analysis 2016-08-24 19:12:14 +05:30
Rohit Waghchaure
1255a6627e project based profitability Analysis 2016-08-24 18:01:39 +05:30
Rohit Waghchaure
78e08b8af5 [Report] Profitability Analysis 2016-08-24 18:00:22 +05:30
Rohit Waghchaure
fb432821bf [Report] Cost center wise profitability 2016-08-24 18:00:22 +05:30
Rushabh Mehta
b9b36a2062 [minor] update salary structure company if not set 2016-08-24 15:20:43 +05:30
Rushabh Mehta
caeb9dc025 [minor] update salary structure company if not set 2016-08-24 15:14:48 +05:30
Rushabh Mehta
5fb2bc2b87 [fix] [versioning] 2016-08-24 12:51:45 +05:30
Rushabh Mehta
547dff5d5b [version] 7.1-beta 2016-08-24 12:44:32 +05:30
strixaluco
7d60dd7e21 Update price-lists.md 2016-08-24 09:42:07 +08:00
strixaluco
a623a59f9e [minor] docs typo fix 
availale → available
 2016-08-24 09:36:17 +08:00
Rushabh Mehta
fcb793e4dd [minor] language fields are now links 2016-08-23 16:51:18 +05:30
Kanchan Chauhan
22073f3a7f Layout changes in Salary Structure 2016-08-23 16:14:04 +05:30
Nabin Hait
cfbd0199eb Merge branch 'master' into develop 2016-08-23 12:10:56 +05:30
Nabin Hait
db05ac2414 bumped to version 7.0.32 2016-08-23 12:40:56 +06:00
Rohit Waghchaure
ea6d7e9b09 [Fix] decimal button not working 2016-08-23 11:39:44 +05:30
Nabin Hait
26f9673ad9 Merge pull request #6126 from rohitwaghchaure/multiyear_financial_statements 
[Enhancement] Multi year financial statements
 2016-08-23 11:32:08 +05:30
Nabin Hait
423f39b4f0 Merge pull request #6101 from bcornwellmott/ppt_test2 
Upgraded PPT for more variety of MR creation options. Added tests
 2016-08-23 11:31:17 +05:30
Rushabh Mehta
3d93ddc606 [fix] docs links 2016-08-22 18:48:04 +05:30
Nabin Hait
c525449c13 Merge pull request #6139 from PawanMeh/fixes_6089 
[fix] #6089
 2016-08-22 18:10:14 +05:30
Rohit Waghchaure
ca4d9b54cd fixed accumulated values for cash flow 2016-08-22 17:51:58 +05:30
Pawan Mehta
bee3b40725 Update gross_profit.py 2016-08-22 17:47:13 +05:30
pawan
18bb431baa [fix] #6089 2016-08-22 17:27:22 +05:30
Nabin Hait
8f782e71af Merge pull request #6149 from nabinhait/change_log_v7 
Change logs for v7
 2016-08-22 15:56:32 +05:30
Nabin Hait
dac204b1e3 Merge pull request #6124 from rohitwaghchaure/hotfix 
[POS] Fixed issue of paid amount, write off account
 2016-08-22 15:56:20 +05:30
Nabin Hait
9c786948d5 Merge pull request #6125 from nabinhait/lcv_hotfix 
[fix] Repost only distinct purchase receipts and invoices
 2016-08-22 15:53:21 +05:30
Nabin Hait
6f1795cb3d Merge pull request #6146 from neilLasrado/operation 
Operations related fixes
 2016-08-22 15:52:57 +05:30
Nabin Hait
01b555edc7 Change logs for v7 2016-08-22 15:50:21 +05:30
Nabin Hait
c95a3180c2 Merge pull request #6127 from KanchanChauhan/demo-fixes-salary 
Demo updated for new salary structure
 2016-08-22 15:22:41 +05:30
Neil Trini Lasrado
20b01873ab Made operation mandatory and removed mandatory from operation desc in Production Order Operation, set operation name as desc in operation master if desc is blank 2016-08-22 15:05:50 +05:30
Faris Ansari
3a6155b1b9 add help_links.js 2016-08-22 14:37:22 +05:30
Nabin Hait
5c9a2b39bc Revert "Ignore validating mandatory fields on converting timelogs to timesheets" 2016-08-22 14:36:33 +05:30
Nabin Hait
1b9f8006c2 Merge pull request #6140 from nabinhait/timesheet_patch_fix 
Ignore validating mandatory fields on converting timelogs to timesheets
 2016-08-22 14:36:08 +05:30
Nabin Hait
9239ed5c44 Ignore validating mandatory fields on converting timelogs to timesheets 2016-08-22 14:35:06 +05:30
pawan
851e05672c [fix] #6089 2016-08-22 14:25:17 +05:30
Kanchan Chauhan
681a86d70e [Minor]Fixes 2016-08-22 00:28:20 +05:30
Rohit Waghchaure
26b646f8a3 Added validation for fiscal year 2016-08-21 17:14:12 +05:30
Kanchan Chauhan
db197d593a Demo updated for new salary structure 2016-08-20 00:30:59 +05:30
Rohit Waghchaure
713e2b7b62 [POS] Fixed issue of paid amount, write off account 2016-08-19 19:27:16 +05:30
Rohit Waghchaure
4275c30059 [Enhancement] Multi year financial statements 2016-08-19 18:04:32 +05:30
Nabin Hait
3b6dc141c6 [fix] Repost only distinct purchase receipts and invoices 2016-08-19 16:39:50 +05:30
Nabin Hait
4cda566139 Merge pull request #6120 from KanchanChauhan/images-for-salary-doc 
Better images for redesigned salary docs
 2016-08-19 12:50:25 +05:30
Kanchan Chauhan
3769996dfd Images for redesigned salary docs 2016-08-18 23:06:16 +05:30
Nabin Hait
6b3706aef8 Update move_employee_parent_to_child_in_salary_structure.py 2016-08-18 17:32:53 +05:30
Rushabh Mehta
69349f2672 [fix] [patch] column conversion before item reload 2016-08-18 17:06:55 +05:30
Nabin Hait
b5951b72f3 Merge pull request #5924 from KanchanChauhan/salary-structure-changes 
Formula based Salary Structure
 2016-08-18 16:39:58 +05:30
Nabin Hait
9a1bcac576 bumped to version 7.0.31 2016-08-18 16:45:49 +06:00
Nabin Hait
e68b089187 Query for warehouse in delivery note 2016-08-18 16:14:23 +05:30
Nabin Hait
d8a372587d [fix] Legend in support analytics chart 2016-08-18 16:14:23 +05:30
Nabin Hait
f04ce3c5a6 [fix] check expense agaist budget 2016-08-18 16:14:23 +05:30
Nabin Hait
50f8262ac7 Currency fix in reports 2016-08-18 16:14:23 +05:30
Nabin Hait
f0937bf722 bumped to version 7.0.30 2016-08-18 16:43:15 +06:00
Nabin Hait
4810831678 Merge pull request #6107 from neilLasrado/develop 
[Fix] Enroll Students from Student Applicants in Program Enrollment Tool.
 2016-08-18 14:21:11 +05:30
Nabin Hait
7cdc6fd789 Merge pull request #6115 from rohitwaghchaure/pos_stock_update_issue 
[POS] Fixed stock update issue
 2016-08-18 14:20:26 +05:30
Rushabh Mehta
03e5ea3a0d Merge pull request #6114 from hereabdulla/patch-1 
Update employee_list.js
 2016-08-18 14:05:58 +05:30
Rohit Waghchaure
9d5a07d101 [POS] Fixed stock update issue 2016-08-18 13:27:06 +05:30
Kanchan Chauhan
bccf0fa041 [WIP] Formula based Salary Structure and multiple employees for same Salary Structure 2016-08-18 13:02:39 +05:30
Rushabh Mehta
b7bc6bd75d [fix] better message for cost center, fixes #6109 2016-08-18 12:50:58 +05:30
Abdulla P I
23a6d05622 Update employee_list.js 2016-08-18 12:43:19 +05:30
Rushabh Mehta
b969c2cb60 [minor] budget link in cost center, fixes #6093 2016-08-18 12:36:20 +05:30
Ben Cornwell-Mott
a7c98ba0fe More formatting adjustments 2016-08-17 05:56:00 -07:00
Ben Cornwell-Mott
d5a9d475e7 Adjusted formatting 2016-08-17 05:45:43 -07:00
Ben Cornwell-Mott
06bfecea73 Fixed formatting of code and repositioned checkboxes in PPT. 2016-08-17 05:42:25 -07:00
Neil Trini Lasrado
c4e71fcc51 [Fix] Enroll Students from Student Applicants in Program Enrollment Tool. 2016-08-17 17:37:19 +05:30
Nabin Hait
734cf70b43 bumped to version 7.0.29 2016-08-17 17:41:09 +06:00
Nabin Hait
6fe3ac49cf Merge pull request #6039 from rohitwaghchaure/allow_to_edit_change_amount 
Allow to edit change amount
 2016-08-17 17:08:54 +05:30
Rohit Waghchaure
e4e69ec027 changed field name, validation for change amount account, validation for serial no qty 2016-08-17 16:20:13 +05:30
Nabin Hait
40c60b6182 Default material request type field restored 2016-08-17 16:14:24 +05:30
Nabin Hait
95c998109d Merge pull request #6043 from aruizramon/purchase-taxes-client-validation 
Validate on changing from Total to Valuation/Valuation&Total when add…
 2016-08-17 12:12:14 +05:30
Nabin Hait
33bcaa8a07 Merge pull request #6080 from bcornwellmott/quoteditem_picksupplier 
Quoted Item Comparison: Button for setting the default_supplier
 2016-08-17 11:36:55 +05:30
Nabin Hait
4da2c81641 Merge pull request #6094 from rmehta/sales-purchase-items 
[revert] is_sales_item, is_purchase_item back
 2016-08-17 11:30:37 +05:30
Ben Cornwell-Mott
e977fc5dee Upgraded PPT for more variety of MR creation options. Added tests 2016-08-16 06:01:52 -07:00
Nabin Hait
613ef344f3 Patch fixed for v6 to v7 migration 2016-08-16 18:31:26 +05:30
Nabin Hait
0c1be8df35 Merge pull request #6096 from rohitwaghchaure/minor_fix 
[Fix] lwp salary structure
 2016-08-16 18:17:14 +05:30
Umair Sayyed
8f7708ed5b docs updated 2016-08-16 18:13:12 +05:30
Umair Sayyed
1bd9f22add updated docsgd 2016-08-16 18:08:24 +05:30
Umair Sayyed
f369b5951e updated docs 2016-08-16 18:08:00 +05:30
Umair Sayyed
81995389ac updated docs 2016-08-16 18:08:00 +05:30
Neil Trini Lasrado
999f34a568 Updated Docs for Schools Module 2016-08-16 17:50:08 +05:30
Rohit Waghchaure
fe913c9969 [Fix] lwp salary structure 2016-08-16 15:43:50 +05:30
Nabin Hait
91d6544958 bumped to version 7.0.28 2016-08-16 15:55:33 +06:00
Nabin Hait
39bc4b2a4c Ignore overlap validation while creating timesheet from existing time logs 2016-08-16 15:18:28 +05:30
Rushabh Mehta
d973c1606a [revert] is_sales_item, is_purchase_item back 2016-08-16 11:32:08 +05:30
Nabin Hait
df9cf2ef8e Merge pull request #6068 from neilLasrado/develop 
Added image field to guardian, program enrollment, fixed some typos
 2016-08-16 11:01:58 +05:30
Nabin Hait
528ab53b3a Merge pull request #6067 from rohitwaghchaure/pos_fixes 
[POS] fixed issue of negative stock
 2016-08-16 11:00:31 +05:30
Rohit Waghchaure
9cd356c7f0 [POS] Fixed print qty decimal issue 2016-08-16 10:44:21 +05:30
Rushabh Mehta
de08639d49 [minor] fixes to patches while moving from v5 2016-08-16 10:01:56 +05:30
Neil Trini Lasrado
987009bf35 Update quotation.json 2016-08-12 16:44:00 +05:30
Rushabh Mehta
3f22ec9536 bumped to version 7.0.27 2016-08-12 12:23:08 +06:00
Rushabh Mehta
d643f2b249 [minor] fixes #6074; 2016-08-12 10:36:59 +05:30
Ben Cornwell-Mott
b739dd24b2 Added a button to assist in setting the default_supplier 2016-08-11 19:45:55 -07:00
Neil Trini Lasrado
c917423b01 Fixed typo in quotation, added image feild in Program Enrollment 2016-08-11 18:22:45 +05:30
Neil Trini Lasrado
6a23016f90 Added image feild to guardian 2016-08-11 17:28:21 +05:30
Rushabh Mehta
730f3e7aba [minor] remove validation #4904 2016-08-11 17:17:26 +05:30
Rohit Waghchaure
033ed00c56 [POS] fixed issue of negative stock 2016-08-11 16:37:29 +05:30
Rushabh Mehta
6c0d9579d2 Merge pull request #6055 from rohitwaghchaure/bank_reconciliation_statement_report_issue 
[Fix] No permission to read DocType for account user in bank reconciliation statement report
 2016-08-11 10:55:10 +05:30
Rohit Waghchaure
e78ef5f8c8 [Fix] No permission to read DocType for account user in bank reconciliation statement report 2016-08-11 00:46:15 +05:30
Rohit Waghchaure
315a5e1b4d [Fix] Debit and credit not equal for purchase invoice, if update stock is yes and taxes is defined 2016-08-11 00:35:00 +05:30
Rushabh Mehta
cf80f850bd bumped to version 7.0.26 2016-08-10 20:17:23 +06:00
Rushabh Mehta
36f2d4f81e [fix] patch for schools; 2016-08-10 19:46:12 +05:30
Rushabh Mehta
a7d92bc8f6 Merge pull request #6050 from rohitwaghchaure/pos_serial_no_search_issue 
[Fix] Serial no search issue, if serial no is similar with item code.
 2016-08-10 18:52:17 +05:30
Rushabh Mehta
18480bdc23 bumped to version 7.0.25 2016-08-10 18:49:14 +06:00
Rushabh Mehta
4b08f9ad1f [fix] patch 2016-08-10 18:18:14 +05:30
Rohit Waghchaure
ea5a32d304 [Fix] Searial no search issue, if serial no is similar with item code 2016-08-10 17:18:52 +05:30
Rushabh Mehta
d908b99b00 bumped to version 7.0.24 2016-08-10 15:04:39 +06:00
Rushabh Mehta
6646960e31 Merge pull request #6045 from bcornwellmott/quotereportcurrency 
Quoted item currency
 2016-08-10 14:26:25 +05:30
Rushabh Mehta
185c247286 Merge pull request #6024 from rohitwaghchaure/get_account_of_payment_mode_issue 
[Fix] Get account of the mode of payment on sales invoice and pos profile
 2016-08-10 14:25:42 +05:30
Rushabh Mehta
a56121a342 Merge pull request #6034 from netchampfaris/ui-fixes 
[ui] fix thumbnail for long images in image view frappe/erpnext#1939
 2016-08-10 14:24:58 +05:30
Rushabh Mehta
cc054a5bbc [minor] fix reload for school migrate patch 2016-08-10 14:24:16 +05:30
pawan mehta
399a4bf201 [fix] #5723 2016-08-10 13:20:16 +05:30
Rohit Waghchaure
70be24d6f0 [Fix] Get account of the mode of payment on sales invoice and pos profile 2016-08-10 13:16:39 +05:30
Rushabh Mehta
6ddbb8820a Merge pull request #6047 from revant/develop 
[fix] Issue #6046 group_name replaced with name
 2016-08-10 12:57:53 +05:30
Rushabh Mehta
6252e935a0 Merge pull request #5844 from bcornwellmott/quoteditemplot-1 
Added C3.JS Plot to compare quotes in Print view
 2016-08-10 12:50:36 +05:30
Revant Nandgaonkar
5bbc68df8b [fix] Issue #6046 group_name replaced with name 2016-08-10 11:06:31 +05:30
aruizramon
8bd2487533 semicolon 2016-08-09 16:04:45 -04:00
Alec Ruiz-Ramon
08fb39f1ba Validate on changing from Total to Valuation/Valuation&Total when add_deduct_tax is 'Deduct' 2016-08-09 15:38:34 -04:00
Rohit Waghchaure
baef2624a2 Given provision to enter write off and change amount on POS 2016-08-10 00:50:53 +05:30
Nabin Hait
f44b5152d2 Portal settings for schools 2016-08-09 17:08:13 +05:30
Rushabh Mehta
ec2d09c557 [minor] setting up website optional in setup wizard 2016-08-09 16:44:37 +05:30
Nabin Hait
08e2105b09 bumped to version 7.0.23 2016-08-09 16:00:31 +06:00
Nabin Hait
11d565b07c Update migrate_schools_to_erpnext.py 2016-08-09 15:23:01 +05:30
Nabin Hait
508542d4d9 bumped to version 7.0.22 2016-08-09 15:30:16 +06:00
Nabin Hait
50ff8471e0 Merge pull request #6023 from neilLasrado/docs 
Merged docs for schools to erpnext docs
 2016-08-09 14:23:48 +05:30
Nabin Hait
2275cd15e6 [patch] Reload Purchase Invoice in patch 2016-08-09 14:21:29 +05:30
Faris Ansari
d217387400 [ui] fix thumbnail for long images in image view 2016-08-09 14:15:59 +05:30
Nabin Hait
ee018b5ae1 [fix]Patch order changed. Fixed #6026 2016-08-09 11:27:28 +05:30
Rohit Waghchaure
c41ab8d15b Added change amount account 2016-08-08 23:19:18 +05:30
Rohit Waghchaure
7127a8f522 Allow user to edit change amount from sales invoice form for is pos 2016-08-08 23:19:18 +05:30
Neil Trini Lasrado
acf85dffc5 Merged docs for schools to erpnext docs 2016-08-08 18:59:15 +05:30
Nabin Hait
d5c83122f2 bumped to version 7.0.21 2016-08-08 16:20:00 +06:00
Nabin Hait
ae65172dca Added 'Ledger' button to show accounting entries against PCV 2016-08-08 15:44:45 +05:30
Nabin Hait
d261d40c7e Fixed test cases for period closing voucher 2016-08-08 15:44:45 +05:30
Nabin Hait
4b231c2692 Merge pull request #6018 from rohitwaghchaure/add_calendar_to_timesheets 
Added a Calendar view for timesheet logs
 2016-08-08 14:46:18 +05:30
Ben Cornwell-Mott
ed1b8cfe3f Added a Calendar view for timesheet logs 2016-08-08 14:17:06 +05:30
Nabin Hait
99d4ff4a29 Repost gle for future transactions if update stock checked in back dated purchase invoice 2016-08-08 14:12:58 +05:30
Nabin Hait
595dbd6dea Merge pull request #5963 from neilLasrado/assessment 
Assessment Groups
 2016-08-08 12:50:10 +05:30
Nabin Hait
f979b18ddb Merge pull request #6003 from neilLasrado/bug-fix 
[bug fix] Fixed bug in fee caclulation, renamed functions
 2016-08-08 12:44:27 +05:30
Nabin Hait
3ef6e7847e Merge pull request #6010 from rohitwaghchaure/minor_fix_pos 
[Fix] pos ambiguous issue
 2016-08-08 12:40:28 +05:30
Nabin Hait
2dba3b5e25 Merge pull request #6012 from bohlian/develop 
[Enhancement + Fix] Disable buttons when Production Order is Stopped, Fixed Stopping and Re-Opening of Production Order
 2016-08-08 12:40:00 +05:30
Nabin Hait
2cb8c6a867 Merge pull request #6015 from nabinhait/ar_ap_cols 
[fix] Label for ageing cols in AR/AP report
 2016-08-08 12:37:19 +05:30
Nabin Hait
c30c342bdf [fix] Label for ageing cols in AR/AP report 2016-08-08 11:47:13 +05:30
Neil Trini Lasrado
f02a0d4d24 [bug fix] Fixed bug in fee caclulation, renamed functions 2016-08-08 11:09:29 +05:30
Ben Cornwell-Mott
44f85fed26 Converted to a common currency (company) 2016-08-07 10:29:51 -07:00
Rohit Waghchaure
cd6c00d505 [Fix] pos ambiguous issue 2016-08-07 14:29:21 +05:30
Javier Wong
e6cd228288 [Enhancement + Fix] Disable buttons when Production Order is Stopped, Fixed Stopping and Re-Opening of Production Order 
Disabled the following buttons:
- Make Timesheet
- Start
- Finish `

- A better fix than 316f78f859
- Sets the Status to In Process or Not Started instead of Unstopped
- Displays this same status on the client prompt (msgprint)
 2016-08-07 16:01:49 +08:00
Saurabh
ec14c81ebd [minor][fix] return if account details not found 2016-08-07 08:52:45 +05:30
Nabin Hait
537301a210 bumped to version 7.0.20 2016-08-06 14:45:34 +06:00
Nabin Hait
f1d8fc3d51 Merge pull request #6008 from KanchanChauhan/leave-application-validation 
Leave Application Validation for processed salary
 2016-08-06 14:13:46 +05:30
Nabin Hait
20b4666e89 Merge pull request #5958 from rohitwaghchaure/minor_fixes_and_cleanups 
fixes and cleanups.
 2016-08-06 14:11:24 +05:30
Rushabh Mehta
84969bdb2d Merge pull request #6007 from KanchanChauhan/task-json-fixed 
[Minor] Removed hard coded success URL from task webform
 2016-08-06 13:42:50 +05:30
Kanchan Chauhan
705384d8fe Leave Application Validation for processed salary 2016-08-06 13:42:18 +05:30
Rohit Waghchaure
b77a1057ce fixes and cleanups. 2016-08-06 12:45:02 +05:30
Kanchan Chauhan
93b1f2ad72 [Minor] Removed hard coded success URL 2016-08-06 12:09:08 +05:30
Revant Nandgaonkar
9a433ffca1 [fix] success_url Issue #6004 2016-08-05 21:44:34 +05:30
Nabin Hait
82446bf83e bumped to version 7.0.19 2016-08-05 17:15:14 +06:00
Nabin Hait
c72f8976aa Merge pull request #5989 from umairsy/2aug 
updated docs
 2016-08-05 15:50:34 +05:30
Neil Trini Lasrado
50b2278eda Renamed fields in Examination Doctype, Renamed examination doctype to Assessment, Added Assessment Group, added patch 2016-08-05 15:09:49 +05:30
Nabin Hait
e1d85f2467 Payment Entry fix: Unallocated amount in payment entry considering deductions 2016-08-05 14:51:36 +05:30
Umair Sayyed
3962cded76 updated docs 2016-08-04 19:01:02 +05:30
Umair Sayyed
66360f694e updated docs 2016-08-04 19:01:02 +05:30
Umair Sayyed
5dba950afa docs update 2016-08-04 19:01:02 +05:30
Umair Sayyed
6a3f51bee2 updated docs 2016-08-04 19:01:02 +05:30
Rushabh Mehta
efe1ab742f [minor] fixes for demo 2016-08-04 17:29:46 +05:30
Rushabh Mehta
4d32d5301a Merge pull request #5996 from KanchanChauhan/users-selection-for-project 
'Project Users' role not required to add user to the project
 2016-08-04 14:25:52 +05:30
Kanchan Chauhan
58bc00f954 Project Users role not required to add user to the project 2016-08-04 14:21:20 +05:30
Nabin Hait
155074479b Merge pull request #5986 from nabinhait/pe_fix_101 
Set received amount based on paid amount if currency is same
 2016-08-03 17:54:01 +05:30
Nabin Hait
764e6ef210 default material request type field restored in item 2016-08-03 17:32:26 +05:30
Rushabh Mehta
f2d89987f5 [minor] ignore email validation if comes from email; 2016-08-03 16:42:29 +05:30
Rushabh Mehta
06c92a782a [fix] small text for route 2016-08-03 16:27:11 +05:30
Nabin Hait
f43e49f378 Set received amount based on paid amount if currency is same 2016-08-03 14:17:05 +05:30
Rushabh Mehta
ea5ad84c5e [minor] fix image for demo 2016-08-02 21:26:04 +05:30
Nabin Hait
1b9a01b6c3 bumped to version 7.0.18 2016-08-02 18:37:52 +06:00
Nabin Hait
ae921ce2c8 [patch] Set default material request type in Item based on default bom 2016-08-02 18:02:31 +05:30
Nabin Hait
cc13a9f2f6 bumped to version 7.0.17 2016-08-02 17:46:46 +06:00
Nabin Hait
97c74f9f8f Merge pull request #5925 from rohitwaghchaure/bcornwellmott-1 
PPT looks at default MR type in Item to set MR type.
 2016-08-02 17:15:02 +05:30
Nabin Hait
6620e2a494 Test case fixed for pos gl entry 2016-08-02 17:14:28 +05:30
Rohit Waghchaure
08aadb853c PPT looks at default MR type in Item to set MR type. 2016-08-02 16:59:03 +05:30
Nabin Hait
3bb1a421f0 Change amount calcualtion in POS if there is write off amount and gl entries in this scenario 2016-08-02 16:41:15 +05:30
Nabin Hait
afc0bbc8ff Merge pull request #5964 from frappe/neilLasrado-patch-1-1 
Fixes for patch - make_guardian.py
 2016-08-02 11:30:45 +05:30
Rohit Waghchaure
7f031d1bfd minor fix in payment entry 2016-08-02 11:07:40 +05:30
Neil Trini Lasrado
5bb2f56b47 Update make_guardian.py 2016-08-02 00:01:00 +05:30
Nabin Hait
94542e104c bumped to version 7.0.16 2016-08-01 18:37:20 +06:00
Nabin Hait
3b8109780f [patch] reload guardian interest 2016-08-01 17:59:46 +05:30
Nabin Hait
f863055b91 Merge pull request #5955 from umairsy/28jul 
added documentation for the new features
 2016-08-01 17:53:26 +05:30
Nabin Hait
ed75667f64 bumped to version 7.0.15 2016-08-01 18:18:27 +06:00
Nabin Hait
08aec855c4 [patch] fixed reload doc and permission issue in guardian patch 2016-08-01 17:46:56 +05:30
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
Nabin Hait
9db1b223da Payment Entry: Test cases and default remarks 2016-07-04 11:42:24 +05:30
Nabin Hait
13093b4b68 Make payment entry aginst order, payment request and patch to rename advance table fields 2016-07-04 11:42:24 +05:30
Nabin Hait
05aefbbf5d Payment Entry from invoice 2016-07-04 11:42:24 +05:30
Nabin Hait
221fa98b51 Payment Entry: Payment period based on invoice date 2016-07-04 11:42:24 +05:30
Nabin Hait
16d6959d01 Payment Entry included in Bank Reconciliation and related reports 2016-07-04 11:42:24 +05:30
Nabin Hait
1991c7b17d Payment Reconciliation changes for Payment Entry 2016-07-04 11:42:24 +05:30
Nabin Hait
28a0528ae4 Advance Payment Entry adjustment against Invoice 2016-07-04 11:42:04 +05:30
Nabin Hait
e3a10170f7 Payment Entry submission and more 2016-07-04 11:41:24 +05:30
Nabin Hait
12e2a51519 [new][feature] Payment Entry 2016-07-04 11:41:24 +05:30
Rushabh Mehta
4177504860 [fix] [patch] reload doctype missing in patch 2016-07-04 11:41:12 +05:30
Rushabh Mehta
b33df4afe8 [cleanup] link methods made common 2016-07-04 11:39:25 +05:30
Rushabh Mehta
5f5f0bec2c [fix] buttons for rfq and material request 2016-07-04 11:39:25 +05:30
Rushabh Mehta
dc8067eb33 [demo] new cleaner, more-flexible demo 2016-07-04 11:39:25 +05:30
Rushabh Mehta
8c2e79cf0d [minor] fixes 2016-07-04 11:39:25 +05:30
Rushabh Mehta
878dfec46a [minor] 2016-07-04 11:39:25 +05:30
Saurabh
f5ab5f3c0c [minor][fix] reload warehouse before executing patches 2016-07-04 11:38:58 +05:30
Rushabh Mehta
6703792472 Merge pull request #5618 from rohitwaghchaure/sq_field_and_rfq_fixes 
[Fixes] Fixed linked for MR to SQ from RFQ, changed field name in SQI
 2016-07-04 10:59:11 +05:30
Rushabh Mehta
2be94f7675 Merge pull request #5615 from rohitwaghchaure/v7_rfq_fixes 
[RFQ Enhancement] Added button on supplier row to download PDF for particular supplier
 2016-07-04 10:58:33 +05:30
Rushabh Mehta
bed5f9e9b3 Merge pull request #5614 from suryanamha/patch-1 
Update index.md
 2016-07-04 10:58:03 +05:30
Rohit Waghchaure
ad884b9fa9 [Fixes] Time sheet dependency removed from sales invoice and patch fixes 2016-07-02 22:28:29 +05:30
Saurabh
b35906efc1 [fix] load dependancies on page load event 2016-07-02 17:13:11 +05:30
Saurabh
feefaaf1ee [fix] Stock Analytics Report page fix 2016-07-01 18:15:17 +05:30
Rohit Waghchaure
4d8f4d76e1 [Fixes] Fixed linked for MR to SQ from RFQ, changed field name in SQI 2016-07-01 15:33:57 +05:30
Rohit Waghchaure
fc1fa9a774 [RFQ Enhancement] Added button on supplier row to download PDF for particular supplier 2016-07-01 14:53:11 +05:30
Rohit Sharma
c4fcd1996a Update index.md 
I have added few points and enhanced some of the existing text. Please accept the changes.
 2016-06-30 16:44:59 +05:30
Rushabh Mehta
465b753848 Merge pull request #5613 from saurabh6790/bom_tree_fixes 
[fix] BOM tree as default view
 2016-06-30 15:54:47 +05:30
Rushabh Mehta
1b8b0cc18f Merge pull request #5609 from KanchanChauhan/enable-shopping-cart-in-setup 
Enable shopping cart by default during company creation in setup
 2016-06-30 15:54:04 +05:30
Saurabh
621247807a [fix] BOM tree as default view 2016-06-30 15:05:06 +05:30
Kanchan Chauhan
9116a84969 Enable shopping cart by default during company creation in setup 2016-06-30 15:02:26 +05:30
Rushabh Mehta
cfb81205b3 Merge pull request #5612 from shubham7saxena/rfq-sidebar 
[minor][bug fix]added sidebar visibility to request for quotation link
 2016-06-30 14:39:55 +05:30
shubham7saxena
778184e5e0 added sidebar visibility to request for quotation link 2016-06-30 14:27:28 +05:30
Rohit Waghchaure
a314872cb5 [RFQ] Enhancement and minor fixes 2016-06-30 02:26:02 +05:30
Rushabh Mehta
65256ed8cb Merge pull request #5526 from KanchanChauhan/shopping-cart-dropdown-update 
Shopping cart dropdown update
 2016-06-29 21:59:29 +05:30
Rushabh Mehta
5b681666a0 Merge pull request #5605 from saurabh6790/warehouse_tree_fix_1 
while creating warehouse tree check for non company warehouse and is_group default value fix
 2016-06-29 21:58:31 +05:30
Rushabh Mehta
a11839307f Merge pull request #5553 from saurabh6790/pos_fixes 
[minor][fix] throw if payment modes are not set
 2016-06-29 21:56:20 +05:30
Saurabh
1301b3b3d1 [fix] set default value for is_group to 0 2016-06-29 19:48:44 +05:30
Rohit Waghchaure
3fa0b51e5e [Fixes] Time sheet fixes and changed timesheets to time_logs 2016-06-29 19:04:16 +05:30
Saurabh
028bbee317 [fix] nestedset warehouse fix 2016-06-29 19:03:40 +05:30
Saurabh
b8a57a4b4d [fix] wareehouse nestedset fix if company not associated with warehouse 2016-06-29 19:01:49 +05:30
Saurabh
d7d878b6db [fix] label fix 2016-06-29 18:48:20 +05:30
Rushabh Mehta
e6920f6a58 Merge pull request #5603 from KanchanChauhan/Maintenance-Module 
New Maintenance Module
 2016-06-29 16:08:46 +05:30
Kanchan Chauhan
fb3eb13ca4 New Maintenance Module 2016-06-29 15:51:02 +05:30
Anand Doshi
5b9c6e7fa6 [fix] [patch] remove default activity type "Planning" 2016-06-29 15:32:36 +05:30
Rushabh Mehta
da43539c53 Merge pull request #5558 from saurabh6790/doc_flow_fix 
[minor][fix] fix filter in previous link mapper
 2016-06-29 12:19:54 +05:30
Rushabh Mehta
26a76fb2d9 Merge pull request #5566 from KanchanChauhan/moving-newsletter-to-frappe 
Newsletter moved to Frappe
 2016-06-29 12:11:25 +05:30
Rohit Waghchaure
a62dcce46a [Fix] make_for field removed 2016-06-29 01:42:52 +05:30
Anand Doshi
0e4119b2de [fix] use get_domains to prevent mutation of nested dictionary 2016-06-28 21:37:28 +05:30
Kanchan Chauhan
65c8b5a216 Newsletter moved to Frappe 2016-06-28 17:28:40 +05:30
Saurabh
ee17e2f277 [fix] patch fix 2016-06-28 15:43:02 +05:30
Kanchan Chauhan
a756e3f765 Reverted changes 2016-06-28 15:02:35 +05:30
Saurabh
52c2affc9c [fix] check for parent account with type stock in patch if not exists get parent account from existing warehouse accounts 2016-06-28 14:41:48 +05:30
Kanchan Chauhan
c8d47da6bc Shopping cart and dropdown cart update 2016-06-28 11:29:43 +05:30
Saurabh
9a6c6663c1 [minor][fix] throw if payment modes are not set 2016-06-27 18:16:07 +05:30
Saurabh
82b8b38b3d [fix] fix filter in previous link mapper 2016-06-27 17:51:29 +05:30
Rushabh Mehta
4803376da8 Merge pull request #5507 from neilLasrado/develop 
Added Minimum Inventory level to Item Master
 2016-06-27 17:48:45 +05:30
Neil Trini Lasrado
b7ff027937 Added Safety Stock to Item Master 2016-06-27 17:45:08 +05:30
Saurabh
2f788a909f [fixes] time sheet patch fix 2016-06-27 17:44:12 +05:30
Rushabh Mehta
bff0cacd69 Merge pull request #5556 from rohitwaghchaure/time_sheet_wages 
[Fixes] Timesheet
 2016-06-27 17:31:43 +05:30
Rohit Waghchaure
e95ee43d51 [Fixes] Timesheet 2016-06-27 17:28:48 +05:30
Rushabh Mehta
d362b734a2 Merge pull request #5529 from saurabh6790/module_flow 
[fix] previous document links
 2016-06-27 17:23:46 +05:30
Saurabh
93d68ac0c2 [fixes] change is group to check box 2016-06-27 17:16:56 +05:30
Saurabh
99892c7ce7 [fix] provision to convert group to ledger and vice versa 2016-06-27 17:16:56 +05:30
Rushabh Mehta
822209cb03 Merge pull request #5538 from rohitwaghchaure/time_sheet_wages 
[Enhancement] Time log wages and multiple active salary structure
 2016-06-27 17:13:48 +05:30
Rushabh Mehta
3be51643cc [fix] ignore setup wizard updates 2016-06-27 17:16:00 +05:30
Rushabh Mehta
689130cf9b [minor] fix holiday_list validation 2016-06-27 17:16:00 +05:30
Saurabh
ce22d34fcf [fix] report Stock Projected Qty 2016-06-27 17:05:13 +05:30
Rohit Waghchaure
d6c986da8f [Enhancement] Time log wages and multiple active salary structure 2016-06-27 16:46:39 +05:30
Rushabh Mehta
18357664cb [fix] routing for item group 2016-06-27 15:42:48 +05:30
Rushabh Mehta
a2c4dad90e [fix] product search 2016-06-27 14:55:01 +05:30
Saurabh
b6d6b8420d [fix] add filters and child doc name in previous link mapper 2016-06-27 14:48:26 +05:30
Saurabh
2a0b111726 [fix] mark completed docuemts on document flow 2016-06-27 12:28:55 +05:30
Saurabh
8f24ecb173 [fix] set previous doc links for document flow 2016-06-27 12:28:55 +05:30
Saurabh
d9131ec4ff [minor][fix] remove website generator call on after rename 2016-06-27 12:25:05 +05:30
Anand Doshi
771ab0c8c3 [fix] [patch] re-route 2016-06-27 12:04:48 +05:30
Rushabh Mehta
ee3204373c Merge branch 'develop' of github.com:frappe/erpnext into develop 2016-06-27 10:14:39 +05:30
Anand Doshi
d6b734e2e3 [fix] DuplicateEntryError for Warehouse Account Creation 2016-06-26 17:43:14 +05:30
Saurabh
78333c7e07 [fixes] check group condition 2016-06-26 14:27:46 +05:30
Saurabh
7fecb50360 [enhance] rename warehouse account type to stock 2016-06-26 14:27:46 +05:30
Nabin Hait
2ee4d79609 Merge pull request #5540 from KanchanChauhan/customize-retirement-age 
Retirement Age option in HR Settings
 2016-06-26 14:25:45 +05:30
Kanchan Chauhan
68f5ae5cbf Changes done 2016-06-26 14:10:24 +05:30
Nabin Hait
14f0a6fa89 Merge pull request #5534 from KanchanChauhan/itemprice-update-in-pricelist 
Item Price update in Price List
 2016-06-26 13:07:35 +05:30
Rushabh Mehta
dad5140eac [minor] add task status 2016-06-26 12:21:20 +05:30
Saurabh
520fb73676 [fix] authorization rule fix for sales order 2016-06-26 12:09:49 +05:30
Nabin Hait
c65f160776 [fix] Identify account group for warehouse based on account type 2016-06-26 08:25:51 +05:30
Anand Doshi
f576f3b17b implemented get_site_info for erpnext and patch to move setup complete to system settings 2016-06-25 19:52:26 +05:30
Rushabh Mehta
5cba40b74f [fix] [bug] task deletion from project fixes #5470 2016-06-25 18:44:59 +05:30
Rushabh Mehta
723cd64249 [fix] tree view hooks and patch fix 2016-06-25 18:30:03 +05:30
Kanchan Chauhan
2ff7d2aade Fixed 2016-06-25 17:54:25 +05:30
Kanchan Chauhan
4c0df04db0 Retirement Age option in HR Settings 2016-06-25 17:45:16 +05:30
Nabin Hait
8942d1782c Merge pull request #5481 from bcornwellmott/patch-2 
Create Manufacture MRs for BOM Items
 2016-06-25 14:01:32 +05:30
Nabin Hait
4cc7bcc412 Merge pull request #5495 from bcornwellmott/patch-3 
Add "Get items from Material Request"
 2016-06-25 13:58:50 +05:30
Nabin Hait
2efecac823 Merge pull request #5522 from cgpurbaugh/patch-2 
Some minor grammatical and spelling changes
 2016-06-25 13:54:19 +05:30
Nabin Hait
173b328380 Merge pull request #5527 from bcornwellmott/patch-4 
Fix Percent Billed to show Percentage
 2016-06-25 13:53:55 +05:30
Nabin Hait
7b6cdf4a63 Merge pull request #5518 from saurabh6790/warehouse_tree 
Warehouse tree
 2016-06-25 13:49:15 +05:30
Nabin Hait
0420833a59 Merge pull request #5531 from saurabh6790/cheque_print_fixes 
[fixes] set default values to cheque print and set background image o…
 2016-06-25 13:43:56 +05:30
Saurabh
dc2fa86222 [fixes] rename ctype to doctype 2016-06-25 11:16:55 +05:30
Saurabh
001d4d74fa [fix] in set_valuation_method check for is group condition 2016-06-25 11:06:15 +05:30
Saurabh
3a0f96bd00 [patch] patch to move all warehouses under all warehouse group 2016-06-25 11:06:14 +05:30
Saurabh
4d02949814 [fixes] validate trash condition for warehouse and related account, move existing warehouses under all warehouse group, set account parent and is group for warehouse account 2016-06-25 11:06:14 +05:30
Saurabh
ec8babe7ac [minor][fix] 2016-06-25 11:06:14 +05:30
Saurabh
1702273968 [fix] rename account browser and sales browser to tree/doctype for view 2016-06-25 11:06:14 +05:30
Saurabh
ac53357f53 [fixes] renamed _treeview to _tree 2016-06-25 11:06:14 +05:30
Saurabh
a9ba7343c4 [fix] deprecate browser pages for accounts, cost_center, sales , bom, item group 2016-06-25 11:06:14 +05:30
Saurabh
9c7b0079c5 [fixes] warehose group wise stock report and test cases for warehouse hierarchy and warehouse group wise reorder level 2016-06-25 11:06:13 +05:30
Saurabh
3d6aecd618 [fixes] set warehouse group wise reorder level, validate ledger (leaf warehouse) on sle and bin 2016-06-25 11:06:13 +05:30
Saurabh
554f6f70aa [fixes] nested set fix for warehouse, tree for accounts and cost center 2016-06-25 11:06:13 +05:30
Saurabh
0e47bfeb16 [enhance] treeview to BOM, sales person, Cost Center and Chart of acounts 2016-06-25 11:06:13 +05:30
Saurabh
5f48cb6128 [enhancement] BOM treeview 2016-06-25 11:06:13 +05:30
Saurabh
d647945102 [fixes] 2016-06-25 11:06:13 +05:30
Saurabh
eda1afb4eb [fixes] comnify tree view 2016-06-25 11:06:13 +05:30
Saurabh
091ca75fa3 [enhance] warehouse browser page for warehouse tree 2016-06-25 11:06:12 +05:30
Saurabh
dfbcdeb8a0 [enhancement] warehouse tree structure 2016-06-25 11:06:12 +05:30
Saurabh
a4a3b022ee [fix] return route from make_route of child class 2016-06-25 10:43:02 +05:30
Kanchan Chauhan
5ee8fccb1a Item Price update in Price List 2016-06-24 17:11:15 +05:30
Rushabh Mehta
994fa8dcef Merge pull request #5530 from rmehta/website-route-fixes 
[redesign] website routing system
 2016-06-24 16:37:43 +05:30
Rushabh Mehta
bd9680f82e [added] web-forms 2016-06-24 16:41:33 +05:30
Rushabh Mehta
a334062b03 [redesign] website routing system 2016-06-24 16:18:07 +05:30
Nabin Hait
438565f678 Merge branch 'master' into develop 2016-06-24 16:12:26 +05:30
Nabin Hait
23b190414c bumped to version 6.27.25 2016-06-24 16:41:59 +06:00
Nabin Hait
0bfd4849ca minot fix 2016-06-24 16:04:31 +05:30
Nabin Hait
2effad33d0 Merge branch 'master' into develop 2016-06-24 12:48:24 +05:30
Nabin Hait
0e19e72a5d bumped to version 6.27.24 2016-06-24 13:16:27 +06:00
Nabin Hait
6dfc78b12a Item Valuation Rate in case of negative inventory 2016-06-24 12:28:55 +05:30
Saurabh
777f556b14 [fixes] set default values to cheque print and set background image only if attachment exist 2016-06-23 20:25:37 +05:30
bcornwellmott
813dddeb10 Fix Percent Billed to show Percentage 
Previously was showing Currency
 2016-06-22 14:49:31 -07:00
Rushabh Mehta
8a065e0028 [rename] Bulk Email to Email Queue 2016-06-22 12:58:39 +05:30
Rushabh Mehta
4d54fb258c Merge pull request #5514 from cgpurbaugh/patch-1 
Update tasks.md
 2016-06-22 12:09:21 +05:30
Rushabh Mehta
6e7dc12fde Merge pull request #5476 from umairsy/14-jun 
In the Setup Wizard, changed field label from Bank Account to Bank Name
 2016-06-22 12:09:01 +05:30
Rushabh Mehta
560ee7bb12 Merge pull request #5480 from vjFaLk/restrict-newsletter-list 
Added code to Restrict Newsletter List Recipients
 2016-06-22 12:08:41 +05:30
Rushabh Mehta
4cf914d902 [minor] added mins to first response for opportunity 2016-06-22 11:22:12 +05:30
Christopher G. Purbaugh
01d4d30e8a Some minor grammatical and spelling changes 2016-06-21 15:42:20 -04:00
Nabin Hait
a531ebea8a Merge branch 'master' into develop 2016-06-21 16:44:05 +05:30
Nabin Hait
a5162b7529 Merge branch 'hotfix' 2016-06-21 16:42:40 +05:30
Nabin Hait
2eb9b34ff2 bumped to version 6.27.23 2016-06-21 17:11:34 +06:00
Nabin Hait
5db108116a Merge pull request #5446 from rohitwaghchaure/purchase_register_total_amount_issue 
[Fixes] Purchase register, showing wrong value for total amount if tax has deducted.
 2016-06-21 16:29:27 +05:30
Nabin Hait
bf3e26dd2d Merge pull request #5466 from rohitwaghchaure/shipping_address_autocomplete_issue 
[Fix] Shipping address's get_query not working on autocomplete.
 2016-06-21 16:28:12 +05:30
Christopher G. Purbaugh
55990efe29 Update index.md 
Removed some repetitive text, changed some of the wording.
 2016-06-20 15:08:08 -04:00
Christopher G. Purbaugh
22e0489ac7 Update tasks.md 2016-06-20 14:36:28 -04:00
Christopher G. Purbaugh
7f89c1aec0 Update tasks.md 
Just some small grammatical corrections
 2016-06-20 14:28:44 -04:00
Umair Sayyed
5918dc87f3 small fixes 2016-06-17 12:28:21 +05:30
bcornwellmott
9af68078f6 Add "Get items from Material Request" 
Allows users to pull items from multiple Material Requests into a Request for Quotation
 2016-06-16 14:10:57 -07:00
Rohit Waghchaure
c65c38d293 [POS] Minor fixes 2016-06-16 11:49:37 +05:30
bcornwellmott
c0a3311836 Create Manufacture MRs for BOM Items 
Corrects an issue where items with BOMs have Purchase material request submitted instead of Manufacture material requests.
 2016-06-15 11:16:12 -07:00
Rushabh Mehta
2cb7a9f235 [ux] taxes table editable 2016-06-15 16:45:03 +05:30
Valmik Jangla
2225decb2b Restrict Newsletter lists 2016-06-15 16:04:17 +05:30
Rushabh Mehta
b5f2c78f8f [list] reports for item list 2016-06-15 12:57:22 +05:30
Rushabh Mehta
dc1758b36e [report] minutes to first response for issues 2016-06-14 18:26:09 +05:30
Rushabh Mehta
f7e6ec0654 [report] minutes to first response for issues 2016-06-14 18:08:51 +05:30
Rushabh Mehta
57f35ddb4a [minor] fix update_mins_to_first_response patch 2016-06-14 16:29:33 +05:30
Rushabh Mehta
1d1bc27a57 [minor] fix update_mins_to_first_response patch 2016-06-14 16:27:50 +05:30
Rushabh Mehta
a55fb6426c [patch] mins_to_first_response in opporutnity and issue 2016-06-14 15:54:54 +05:30
Maxwell Morais
f8122646ba Set get_contact_details and get_address_display to the right standard! 2016-06-14 15:19:00 +05:30
Umair Sayyed
9a0ff298ce Changed field label from Bank Account to Bank Name 2016-06-14 12:25:34 +05:30
Nabin Hait
1df75c930f Merge pull request #5390 from MaxMorais/patch-5 
get_address_display cannot be called directly
 2016-06-14 11:32:06 +05:30
Rohit Waghchaure
9fe40d557f [POS] Enhancement to set default payment as cash, functionality to clear amount value, renamed doctype Payments and some fixes. 2016-06-14 01:11:09 +05:30
Rushabh Mehta
d1eba515e9 [cleanup] fixes to v7 2016-06-13 17:47:13 +05:30
Anand Doshi
7f8142d30d [fix] reuse user.reset_password in RFQ 2016-06-13 17:23:18 +05:30
Rushabh Mehta
dd7524f844 [minor] msgprint as alert 2016-06-12 11:16:23 +05:30
Rushabh Mehta
538607e6b6 [cleanup] a better message for insufficient stock 2016-06-12 11:03:00 +05:30
Rohit Waghchaure
2dd26055c9 [Fix] Shipping address's get_query not working on autocomplete. 2016-06-11 01:48:00 +05:30
Rushabh Mehta
e0686b32f3 [minor] cleanups 2016-06-10 12:38:52 +05:30
Rohit Waghchaure
28c02fe51d [Fix] POS page loading issue, if system has only one item 2016-06-10 00:48:03 +05:30
Anand Doshi
51ad436e16 [fix] sales and accounts browser name 2016-06-09 19:37:35 +05:30
Anand Doshi
34482788f4 [fix] removed bad import 2016-06-09 16:57:16 +05:30
Anand Doshi
8f6e6ff543 [fix] removed bad import 2016-06-09 16:57:08 +05:30
Anand Doshi
d492b675a7 [fix] removed bad import 2016-06-09 16:56:54 +05:30
Anand Doshi
754f8b42f5 [version] changed to 7.0.0-beta 2016-06-09 16:31:57 +05:30
Anand Doshi
227b238fb1 [fix] change in versioning: store __version__ in __init__.py 2016-06-09 16:31:01 +05:30
Anand Doshi
36a0c5c564 [fix] change in versioning: store __version__ in __init__.py 2016-06-09 16:29:46 +05:30
Anand Doshi
db6b832302 [fix] change in versioning: store __version__ in __init__.py 2016-06-09 16:29:12 +05:30
Rushabh Mehta
d56306add0 [minor] [fix] quotation cancelled status issue, fixes #5221 2016-06-09 15:56:48 +05:30
Rushabh Mehta
743de9b306 [minor] website field in customer and allow_import for purchase receipt, fixes #5227 2016-06-09 15:11:45 +05:30
Rushabh Mehta
cb29d9886c [minor] fixes #5252 2016-06-08 17:31:11 +05:30
Rushabh Mehta
e9d2c3d46e [fix] report requested items to be transferred, fixes #5295 2016-06-08 16:41:09 +05:30
Rushabh Mehta
6e837599b1 [minor] added cost center to item wise sales register, fixes #5301 2016-06-08 16:35:10 +05:30
Rushabh Mehta
e778e59e4c [minor] always show issues in sidebar 2016-06-08 15:34:54 +05:30
Rushabh Mehta
7ce345a827 [minor] re-organize issue 2016-06-08 11:10:34 +05:30
Rushabh Mehta
0b955e6c33 [minor] production planning, fix description 2016-06-08 11:10:34 +05:30
Anand Doshi
16e2442278 [cleanup] document flow 2016-06-07 18:55:23 +05:30
Saurabh
a8217dc7e9 [fixes] build json fixes 2016-06-07 17:19:36 +05:30
Saurabh
7d0e78d399 [fixes] this.frm instead of cur_frm 2016-06-07 17:19:36 +05:30
Saurabh
2966d89e2a [fixes] create module flow list 2016-06-07 17:19:36 +05:30
Saurabh
9df3d0fb8a [enhance] show module flow on top of document 2016-06-07 17:19:36 +05:30
RobertSchouten
f28a5da952 [fix] show company in list view 
allows address and contact to only contain company not customer or supplier or sales partner
 2016-06-07 17:03:41 +08:00
Maxwell Morais
1ea13f1f49 Set get_contact_details and get_address_display to the right standard! 2016-06-07 02:35:11 -03:00
Maxwell Morais
57b6b1dc85 Set get_contact_details to the right standard! 2016-06-07 02:32:47 -03:00
Rushabh Mehta
6125abc495 Merge pull request #5430 from shreyasp/issue/prod-order-qty 
[Fix] Allow user to quantity in fraction while transferring material using production order
 2016-06-07 10:58:20 +05:30
Rohit Waghchaure
690a0805f6 [Fixes] Purchase register, showing wrong value for total amount if tax has deducted. 2016-06-07 10:46:59 +05:30
ShashaQin
6cac50b52e Update bom.py 2016-06-07 09:38:57 +08:00
Nabin Hait
3bc300a207 Merge branch 'master' into develop 2016-06-03 11:57:30 +05:30
Nabin Hait
ef7b6ab8ef bumped to version 6.27.22 2016-06-03 12:20:19 +06:00
Rushabh Mehta
eb1e0673e2 Merge pull request #5354 from saurabh6790/cheque_print 
Cheque print
 2016-06-02 17:48:58 +05:30
Rushabh Mehta
c5c0d96064 Merge pull request #5395 from saurabh6790/payment_request_ux 
[enhance] ux fixes for payment request, added jinja for payment reque…
 2016-06-02 17:48:36 +05:30
Rushabh Mehta
aed79e993f [fix] item attribute validation, fixes #5308 2016-06-02 17:49:16 +05:30
Rushabh Mehta
675f9c6e6e [minor] reset barcode if item is changed, fixes #5314 2016-06-02 16:34:00 +05:30
Rushabh Mehta
af7d929386 [minor] fix supplier/customer and editable columns in BOM 2016-06-02 12:39:36 +05:30
bcornwellmott
c39c665136 [BUG] Fix Create Material Request OperationalError 
The call was invalid because "it.name" doesn't exist. Needs to be replaced with "item.name"
 2016-06-01 08:31:05 -07:00
shreyas
3b79f19614 [Fix] Allow user to quantity in fraction while transferring material using production order 2016-06-01 17:45:10 +05:30
Nabin Hait
9f98296c9c minor fix 2016-06-01 16:21:43 +05:30
Rushabh Mehta
7db1793543 [fix] notification control UX - add update to top, fixes #5349 2016-06-01 13:24:28 +05:30
Nabin Hait
2460ee897a Merge pull request #5367 from KanchanChauhan/job_openings_public 
[Minor Fix] Job Opening should not require login
 2016-06-01 13:18:26 +05:30
Nabin Hait
8e4ec8d84a Merge pull request #5416 from nabinhait/tax_rule_based_on_county 
Tax Rule based on County
 2016-06-01 13:09:53 +05:30
Nabin Hait
cc07148336 Merge pull request #5428 from ShashaQin/patch-21 
Update fiscal_year.py
 2016-06-01 12:58:13 +05:30
Nabin Hait
29d85b0ab8 test case fixed 2016-06-01 12:54:26 +05:30
Nabin Hait
9a5cf6000e [fix] Test cases and editable fields settings for request for quotation 2016-06-01 12:54:26 +05:30
Nabin Hait
4eaeda710d Tax Rule based on County 2016-06-01 12:54:26 +05:30
Rushabh Mehta
535f3b0975 [minor] make task editable in project and add description to designation fixing #5361 2016-06-01 12:52:50 +05:30
Rushabh Mehta
277cda195c [fix] for #5419 2016-06-01 12:29:08 +05:30
Rushabh Mehta
aa60fd9037 [fix] new_doc to frappe.new_doc 2016-06-01 11:46:33 +05:30
ShashaQin
5dd72fe196 Update fiscal_year.py 2016-06-01 11:39:53 +08:00
Nabin Hait
919b1b9d5b Merge pull request #5408 from neilLasrado/hotfix-2 
Fixed error in Gross Profit report
 2016-05-31 17:41:19 +05:30
Nabin Hait
54f723b654 Merge pull request #5413 from kressi/patch-1 
[doc] fixed typo
 2016-05-31 17:40:54 +05:30
Nabin Hait
7ab088ed3f Merge pull request #5414 from nabinhait/journal_entry_ux 
Fetch party info in Journal Entry on selection of reference Invoice
 2016-05-31 17:38:22 +05:30
Nabin Hait
6a110331e8 Merge pull request #5415 from nabinhait/company_permissions_fix 
Ignore permissions for account/warehouse creation from Company
 2016-05-31 17:38:08 +05:30
Nabin Hait
bb502f8588 Merge pull request #5417 from nabinhait/grid_editable_fields 
[fix] Enabled editable fields in Budget
 2016-05-31 17:37:36 +05:30
Nabin Hait
b0f7e5b23f Merge pull request #5424 from shreyasp/issue/delete-root-account 
[Fix] User allowed to delete the root account in Chart of Accounts
 2016-05-31 17:37:08 +05:30
shreyas
2bb845e53f [Fix] User allowed to delete the root account in Chart of Accounts 2016-05-31 17:15:28 +05:30
Rushabh Mehta
0dcb861b56 [minor] 2016-05-31 07:22:51 +05:30
Rushabh Mehta
bc92824bc4 [minor] rename item_name if same as item, on rename and removed item selector 2016-05-31 07:22:51 +05:30
Nabin Hait
37c53f0a04 [fix] Enabled editable fields in Budget 2016-05-30 18:20:31 +05:30
Nabin Hait
f169e5c04d Ignore permissions for account/warehouse creation from Company 2016-05-30 12:15:36 +05:30
Nabin Hait
9fdd37e1ad Fetch party info in Journal Entry on selection of reference Invoice 2016-05-30 11:49:16 +05:30
Michael Kressibucher
f96ec0950d [doc] fixed typo 2016-05-29 17:57:37 +02:00
Neil Trini Lasrado
efccb8a704 Fixed error in Gross Profit report 2016-05-27 13:24:02 +05:30
Neil Trini Lasrado
45328f7729 Fixed error in bom autoname 2016-05-27 13:04:20 +05:30
Nabin Hait
a60ceba6d4 [fix] reload gl entry doctype in patch 2016-05-27 12:44:18 +05:30
Nabin Hait
0014aa9c26 [fix] Charts in report 2016-05-27 12:21:36 +05:30
Nabin Hait
591a5aba56 Added Project in GL Entry and General Ledger report 2016-05-26 17:51:20 +05:30
Nabin Hait
37b5e0c99f Merge pull request #5399 from nabinhait/report-graph 
Charts on reports / activity page, deprecated financial analytics report
 2016-05-26 17:42:36 +05:30
Nabin Hait
1ade5927c4 fixed conflict 2016-05-26 16:56:30 +05:30
Nabin Hait
01eb7d02cc bumped to version 6.27.21 2016-05-26 17:25:34 +06:00
Nabin Hait
5af737dd67 Update sales_order.py 2016-05-26 16:54:25 +05:30
Anand Doshi
07dfb475ca [fix] newsletter progress percentage 2016-05-26 16:41:14 +05:30
Anand Doshi
ac7c81bb98 [fix] compiled erpnext.less to erpnext.css 2016-05-26 16:41:04 +05:30
Nabin Hait
310d64d565 Fixed conflict 2016-05-26 16:10:02 +05:30
Nabin Hait
c5d186c497 bumped to version 6.27.20 2016-05-26 16:15:34 +06:00
Nabin Hait
b46d021f2a Charts on reports / activity page, deprecated financial analytics report 2016-05-26 15:26:01 +05:30
Nabin Hait
44c1b8e63b Line/Bar chart in Balance Sheet / Profit and Loss statement 2016-05-26 15:26:01 +05:30
Nabin Hait
28bdff5a55 Pie chart for ageing analysis in accounts receivale/payable 2016-05-26 15:26:01 +05:30
Nabin Hait
8ed2f87480 Update company.py 2016-05-25 20:06:24 +05:30
Rohit Waghchaure
f2aa1764cc [POS] enhancement and minor fixes 2016-05-25 15:04:46 +05:30
Saurabh
ed0816832d [enhance] ux fixes for payment request, added jinja for payment request message 2016-05-25 11:55:30 +05:30