RobertSchouten
f4498307c6
fix allow negatives in leave type check
2016-09-09 11:35:51 +08:00
RobertSchouten
b64fc33be1
stock entries from production_order dont fetch serial number of project
2016-09-09 11:08:39 +08:00
RobertSchouten
2efe20bd9a
stock entries from production_order dont fetch serial number of project
2016-09-09 11:05:22 +08:00
RobertSchouten
b7fc4b76e4
stock entries from production_order dont fetch serial number of project
...
stock entries from production_order dont fetch serial number of project
2016-09-09 11:02:33 +08:00
RobertSchouten
2ecddf58d2
leave balance now fy not calendar
...
changed the default from_date and to_date of Leave Balance Report to FY
2016-09-09 10:48:34 +08:00
RobertSchouten
93c095bf16
allow users without employee with hr permission to view all calendars
2016-09-09 10:15:56 +08:00
RobertSchouten
e4d3809c87
allow users without employee with hr permission to view all calendars
2016-09-09 10:14:07 +08:00
Nabin Hait
e5d13f3156
Update set_student_guardian.py
2016-09-08 17:57:55 +05:30
Neil Trini Lasrado
1e060e98c5
Rearranged feilds in Student Applicant & Student, Split address feild
2016-09-08 16:12:39 +05:30
Rohit Waghchaure
aaa6d1f1bc
patch fix
2016-09-08 12:34:36 +05:30
Nabin Hait
3e669ca656
bumped to version 7.0.42
2016-09-07 17:50:14 +06:00
Nabin Hait
1bf8e70339
Update convert_timelog_to_timesheet.py
2016-09-07 17:19:27 +05:30
Nabin Hait
7c9d981614
Update convert_timelog_to_timesheet.py
2016-09-07 17:17:47 +05:30
Nabin Hait
0a0df2e433
fixed version conflict
2016-09-07 17:01:47 +05:30
Nabin Hait
094d3adba3
bumped to version 7.0.41
2016-09-07 17:31:17 +06:00
Nabin Hait
23147ff881
Patch fixed
2016-09-07 16:59:55 +05:30
Nabin Hait
c16c0ca944
Merge pull request #6310 from rohitwaghchaure/pos_itemwise_tax_issue
...
[Fix] Item level taxes are not getting calculated in POS
2016-09-07 15:59:32 +05:30
Rohit Waghchaure
525900c5c1
[Fix] Item level taxes are not getting calculated in POS
2016-09-07 15:01:08 +05:30
Ben Cornwell-Mott
0261889c0f
Fixed spelling
2016-09-07 02:28:50 -07:00
pawan
7b2bd20a09
[fix] #6254
2016-09-06 18:28:41 +05:30
Nabin Hait
b8b228ed14
Fixed version conflict
2016-09-06 17:56:32 +05:30
Nabin Hait
9b54b78794
bumped to version 7.0.40
2016-09-06 18:25:55 +06:00
Neil Trini Lasrado
52891b55d2
Fixed Student Guardian patch - reload issue
2016-09-06 17:50:42 +05:30
Nabin Hait
f79d7188de
Patch fixed
2016-09-06 17:47:19 +05:30
Rohit Waghchaure
b44efef094
[Issue] Fixed, supplier quotation item uom conversion
2016-09-06 17:21:38 +05:30
Neil Trini Lasrado
6a95723a70
Fixed Student Guardian patch - permission issue
2016-09-06 17:11:13 +05:30
Nabin Hait
194fbaca13
Merge pull request #6291 from RobertSchouten/patch-21
...
fix for closing balance typo
2016-09-06 17:06:56 +05:30
Nabin Hait
06792a93cd
Merge pull request #6289 from KanchanChauhan/barcode-in-stock-reconciliation
...
Barcode added to Stock Reconciliation
2016-09-06 17:06:06 +05:30
Neil Trini Lasrado
49da25dd57
Added patch
2016-09-06 15:45:17 +05:30
RobertSchouten
5ae21053bd
fix for closing balance typo
2016-09-06 15:44:09 +08:00
Neil Trini Lasrado
c20adb532f
Added student Category
2016-09-06 13:08:07 +05:30
Neil Trini Lasrado
d878b66936
Updated Student Doctype
2016-09-06 13:08:07 +05:30
Neil Trini Lasrado
a477e411aa
Updated Guardian Doctype; Added new fields
2016-09-06 13:08:07 +05:30
Kanchan Chauhan
366ba04823
Barcode added to Stock Reconciliation
2016-09-06 12:44:57 +05:30
Rohit Waghchaure
377c7acd53
[POS] Added offline_pos_name in print format
2016-09-05 17:59:01 +05:30
Nabin Hait
ca627fb806
[fix] Fetch advance journal entry in invoice if it is tagged against linked order
2016-09-05 16:17:08 +05:30
Nabin Hait
406f0a38de
Fixed merge conflicts
2016-09-05 15:44:18 +05:30
Nabin Hait
911e9caa43
bumped to version 7.0.39
2016-09-05 16:13:48 +06:00
Nabin Hait
b239a09951
Merge pull request #6282 from nabinhait/maintenance_schedule_fix
...
Minor fix in maintenance schedule
2016-09-05 15:39:54 +05:30
Nabin Hait
4cb58c410a
Minor fix in maintenance schedule
2016-09-05 15:14:26 +05:30
Nabin Hait
906552a401
Notifications filters for DN, PR and PI
2016-09-05 14:35:40 +05:30
Nabin Hait
8693b5c93a
Minor fixes
2016-09-05 11:51:45 +05:30
Rohit Waghchaure
cc1c7ad2df
added test cases
2016-09-05 00:43:17 +05:30
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