Nabin Hait
2e4de83df6
Rounding Adjustment via a separate field, instead of last tax row ( #10659 )
...
* Rounding Adjust via a separate field, instead of last tax row
* Fixed test cases
2017-09-19 14:53:16 +05:30
Rohit Waghchaure
c15a3bd379
[fix] Subscription patch broken if reference document has been cancelled
2017-09-19 12:53:11 +05:30
Nabin Hait
caf9891075
Fixed merge conflict
2017-09-19 12:06:22 +05:30
Nabin Hait
bd4b80e3d8
Merge branch 'master' into develop
2017-09-19 12:05:41 +05:30
Nabin Hait
703e837125
bumped to version 8.11.4
2017-09-19 12:35:39 +06:00
rohitwaghchaure
4f0f144142
Merge pull request #10831 from rohitwaghchaure/cherry_pick_subscription_staging_to_develop
...
Cherry pick staging to develop for subscription cleanup
2017-09-19 10:26:20 +05:30
Nabin Hait
cf36534eed
Gross profit report considering returned items ( #10734 )
2017-09-18 19:13:45 +05:30
AravindPranera
cb6774e373
Files added with all functions
2017-09-18 17:37:37 +05:30
AravindPranera
1276893550
Files added with all functions
2017-09-18 17:30:20 +05:30
rohitwaghchaure
d02744b436
[fix] Subscription patch ( #10827 )
2017-09-18 17:23:00 +05:30
rohitwaghchaure
850eaa73b0
Move subscription module to accounts ( #10772 )
2017-09-18 17:23:00 +05:30
Nabin Hait
e859671eb3
Revert "Added ability to disable auto creation of Sales Invoice when customer pays a payment request ( #10706 )" ( #10830 )
...
This reverts commit d258372f9e
2017-09-18 17:22:46 +05:30
Neil Trini Lasrado
d258372f9e
Added ability to disable auto creation of Sales Invoice when customer pays a payment request ( #10706 )
2017-09-18 17:12:16 +05:30
tundebabzy
f6d738b3c5
Delivery note to billing issue ( #10726 ) ( #10766 )
...
* allow invoices to be made from sales returns
* Update queries.py
2017-09-18 17:10:09 +05:30
Utkarsh Goswami
b98359f4a7
Payment entry ( #10668 )
2017-09-18 17:06:13 +05:30
Makarand Bauskar
5c1d15f015
[change-log] added change log for v9.0.0 ( #10756 )
...
* [change-log] added change log for v9.0.0
* Update v9_0_0.md
2017-09-18 17:03:21 +05:30
Manas Solanki
a22c94c246
refactored assessment result tool ( #10633 )
...
* save the assessment instead of submit
* Added comments in the artool
* remove the cur_frm and message for submitted result
* link field for the assessment result
2017-09-18 16:59:54 +05:30
Faris Ansari
aebcb17daf
Show thumbnail image in daily work summary ( #10605 )
...
* Show thumbnail image in daily work summary
* Crop thumbnail image into square
* fix codacy
2017-09-18 16:58:24 +05:30
rohitwaghchaure
6cea73b834
[fix] Subscription patch ( #10827 )
2017-09-18 16:58:05 +05:30
Utkarsh Goswami
bd0beb6c02
[fix] unknown column in production order ( #10828 )
2017-09-18 16:48:45 +05:30
Utkarsh Goswami
e78d5a240a
[fix] unknown column in production order ( #10828 )
2017-09-18 16:44:11 +05:30
Neil Trini Lasrado
de3429280b
Made Template link in variant (Item Master) intro linkable ( #10696 )
...
* Made Template link in variant (Item Master) intro linkable
* Update item.js
2017-09-18 16:42:10 +05:30
Neil Trini Lasrado
8c9f2a1be6
Add communication entry to Sales Order only if payment entry email is sent to customer ( #10716 )
2017-09-18 16:41:49 +05:30
Prateeksha Singh
9b4f3cf9de
Leaderboard cleanup ( #10638 )
...
* [leaderboard] wip
* [leaderboard] filter for selecting leaderboard criteria, single col
* [leaderboard] doctypes in sidebar
* hide graph if no results
2017-09-18 16:41:04 +05:30
Saurabh
9c334c34a6
[fix]remove employee field from tab salary structure
2017-09-18 16:17:13 +05:30
Manas Solanki
e716da04ec
add the newsletter in the standard portel ( #10784 )
2017-09-18 16:00:34 +05:30
Saurabh
590d401e5f
[fix] if bom specified on purchase order item then don't pull default bom in purchase receipt ( #10793 )
...
* [fix] if bom specified on purchase order item then don't pull default bom in purchase receipt
* Update bom.js
* Update stock_entry.py
2017-09-18 15:49:19 +05:30
ci2014
9bc197cfd5
Update project.js ( #10796 )
...
* Update project.js
Move indicators to setup to be less buggy
* fixed codecy trailing whitespace issues
2017-09-18 15:44:36 +05:30
Saurabh
d7e1869a70
[fix] if item code not exists then exclude item in validate_selling_price ( #10800 )
2017-09-18 15:43:35 +05:30
Saurabh
3f15bf9828
[fix] query fix for match conditions ( #10810 )
2017-09-18 15:27:24 +05:30
Nabin Hait
9744aa21af
Minor fix in tax rule
2017-09-18 15:25:33 +05:30
Adam Dawoodjee
91eda6dad4
Update creating-custom-link-field.md ( #10822 )
...
Grammer improvements
2017-09-18 15:11:57 +05:30
Zarrar
8f957ef6e6
fetching data from last route ( #10816 )
2017-09-18 15:11:20 +05:30
Utkarsh Goswami
11bd5fc3b1
Description moved next to item code ( #10820 )
2017-09-18 15:05:50 +05:30
Saurabh
2222f10720
[patch] remove employee name salary structure ( #10817 )
...
* [patch] remove employee name salary structure
* Update remove_employee_from_salary_structure_parent.py
2017-09-18 15:05:18 +05:30
Nabin Hait
bc9006ff30
Delete GST related doctypes and reports if account is from outside India ( #10808 )
2017-09-18 13:16:04 +05:30
rohitwaghchaure
70ef09aa8f
Merge pull request #10809 from rohitwaghchaure/fixed_test_cases_issue
...
[fix] Test cases for tax rule
2017-09-16 22:55:16 +05:30
Rohit Waghchaure
2cb2064c6f
Fixed test cases tax rule
2017-09-15 23:10:27 +05:30
Nabin Hait
21617da619
More fixes for UI tests
2017-09-15 21:22:16 +05:30
Nabin Hait
628ca2a2ec
Minor fix for ui tests
2017-09-15 19:35:12 +05:30
Nabin Hait
46941e8b35
Time out increased for appraisal template
2017-09-15 18:56:49 +05:30
Prateeksha Singh
d1ce7bfff4
[fix] set item valuation rates ( #10681 )
2017-09-15 16:17:29 +05:30
rohitwaghchaure
dd092e30fb
Move subscription module to accounts ( #10772 )
2017-09-15 16:16:36 +05:30
Makarand Bauskar
5ac01a2bf7
[minor] translate the action name in get_slide_settings ( #10740 ) ( #10790 )
2017-09-15 12:10:29 +05:30
AravindPranera
27bbb561d2
removed whitespace
2017-09-15 11:04:14 +05:30
AravindPranera
2c1f44ecfa
Trailing space removed in line 275
2017-09-15 10:57:23 +05:30
AravindPranera
c73383c34c
Trailing whitespace in Line 207 and 276
2017-09-15 10:34:21 +05:30
Nabin Hait
43268bd350
Fixed salary structure tests
2017-09-14 19:39:10 +05:30
Nabin Hait
2f64f0f5fa
Fixed salary structure tests
2017-09-14 19:08:15 +05:30
Nabin Hait
427172c941
Update test_salary_structure.js
2017-09-14 17:57:21 +05:30
Nabin Hait
41146657de
Set default customer group and territory after install
2017-09-14 17:26:23 +05:30
Nabin Hait
092f6d3739
Fixes ui tests
2017-09-14 16:45:47 +05:30
mbauskar
f41cff27e6
resolved merge conflicts
2017-09-14 15:32:55 +05:30
mbauskar
ea832b8157
resolved merge conflicts
2017-09-14 15:32:10 +05:30
mbauskar
8ea3bb0d90
bumped to version 8.11.3
2017-09-14 15:58:44 +06:00
Nabin Hait
45dce89cae
Print Settings for printing taxes with zero amount ( #10782 )
...
* Print Settings for printing taxes with zero amount
* added __init__.py file to patch module v8_9
2017-09-14 15:17:38 +05:30
Rushabh Mehta
bf8e331135
[fix] unset default customer group ( #10689 )
...
* [fix] unset default customer group
* added __init__.py file for patch v8.9 directory
2017-09-14 15:03:45 +05:30
Nabin Hait
a6d78ef842
Added Supplier Bill Date in Itemised Purchase Register ( #10783 )
2017-09-14 15:01:04 +05:30
Nabin Hait
77b225e021
Fetch BOM items in Production Order in the same order as BOM
2017-09-14 13:22:45 +05:30
Nabin Hait
3f583b6dd2
Merge branch 'sort_bom_items' of https://github.com/creamdory/erpnext into creamdory-sort_bom_items
2017-09-14 12:59:31 +05:30
Vishal Dhayagude
d3e22ac09e
[UI Test] Modified Sales Order UI Test ( #10770 )
...
* [UI Test] Modified Sales Order UI Test
* [fix] Codacy fixed
2017-09-14 12:51:22 +05:30
Nabin Hait
f6b132f78e
Update test_quotation.js
2017-09-14 11:55:31 +05:30
Nabin Hait
c7c141a5a0
Update test_setup_wizard.py
2017-09-14 11:51:43 +05:30
rohitwaghchaure
f8458ed9e4
Merge pull request #10771 from nabinhait/pro_order_99
...
Update actual dates in Production Order from Timesheet
2017-09-14 10:53:48 +05:30
rohitwaghchaure
9a0db392de
[Fix] Only typed keywords displying in the field on selection of customer ( #10778 )
2017-09-14 10:51:21 +05:30
Nabin Hait
92309afea1
Update test_setup_wizard.py
2017-09-13 22:37:14 +05:30
Prateeksha Singh
242218d2b7
Progress fixes ( #10710 )
...
* [progress] sales target slide
* [fix] rerun patch for sales target slide
2017-09-13 18:41:01 +05:30
tundebabzy
c050c6945c
show error message if cannot get accounts details ( #10768 )
2017-09-13 15:27:30 +05:30
Nabin Hait
c443c9f05d
Update actual dates in Production Order from Timesheet
2017-09-13 15:14:40 +05:30
Nabin Hait
78baebfe0d
Setup wizard test fix
2017-09-13 15:12:45 +05:30
Rushabh Mehta
f056974bc5
[domain] Healthcare ( #10664 )
...
* Medical module for erpnext
* Changes in core for Medical module
* patient registration updated
* fix - appointment invioce - fields missing
* pages- indicator instead of bg-color
* Lab Test field renamed service type
* Department added Lab Test
* procedure name in prescription
* fixes sample collection
* filter disabled patient
* fix patient admission
* updated patient age
* availability check msg updated
* fixes, removed procedure from invoice
* sample print renamed
* fixes, validation
* service desk physician in filter
* refactor scheduler
* Appointment -field property - set only once = 1
* Appointment - Mark closed and pending buttons removed
* Appointment - readonly = 1 if value set
* Appointment - availabilty
* Appointment - Cancel - info - cancel invoice
* Appointment - set pending appointments
* Dosage form - new DT
* Drug Prescription - Dosage form added
* Facility - Floor - removed from Fecility
* Floor - removed
* Lab Test Template - item creation validation
* Procedure - Create Procedure
* Procedure Appointment - new DT
* Service Unit - Floor reference removed
* Zone Fcilities - Unused DT removed
* Appointment Desk - fixed
* Service Desk - method pointing from procedure changed to procedure_appointment
* Consultation print - got featured
* Consultation - removed patient refernce to procedure prescription
* Procedure Prescription - removed patient refernce
* Lab Test - Changed field properties and value
* Lab Test - field property changed
* Lab Test - methods rewrite - lab test doc creation
* Lab Test - create lab test from invoice and consultaion - got changed
* Button History changed to Medical Record
* Service Desk - Updated
* Notification - Procedure Appointment
* fix-get procedure prescription
* fix field added to test prescription
* msgprint on invoice creation
* fix data on install
* Merge branch erpnext/develop
* fixes- minor
* Setup wizard - Create Sensitivity
* Appointment - Validate and Save if there is no schedule for Physician
* Consultation - Button create vital signs and medical record
* Review Type - New DocType
* Review Detail and Treatment Plan - Childs - Consultation
* Patient Medical Record - field Attach doc
* Consultation - New Fields
* Consultation - Manage new Fields - Medical record add action
* Patient Relation - Child DocType - Patient
* Patient - Patient Relation added
* Patient - collapsible = 1
* Laboratory Settings - fields - message for lab test
* Laboratory Settings - get message for lab test
* SMS text for lab test and invoice test report
* Procedure Stock Detail - Stock detail for Procedure and Template
* Template Stage Detail - Stage detail for Procedure Template
* Procedure Stage Detail - Stage detail for Procedure
* Service Unit - field - warehouse
* Scheduler - msg - content changed
* Laboratory Settings - defualt - msg content
* Invoice Test Report - msg print
* Print Format-Changed-Consultation-Invoice Test Report-Lab Test
* OP Settings - Expnse Account for Stock Entry in Procedure
* Procedure and Procedure Template - Manage Stock Stage and Sample Collection
* Procedure Appointment - Manage Stock and Stage
* Lab Test - fixed - resource not find
* Invoice Test Report - fixed - resource not find
* Procedure - doc reload after insert
* Patient Medical Record - fixed - refernce missed
* Create Vital Signs -on client side
* Rename module Medical to Healthcare
* Remove In Patient (IP) Feature.
* Rename - Procedure to Clinical Procedure
* Remove spaces in Naming Series
* Rename Duration to Drug Prescription Duration
* Duration to Drug Prescription Duration
* Merge All Settings to Healthcare Settings
* Healthcare settings - import fixed
* Procedure related documents are removed
* Appointment Desk and Sevrvice Desk are removed
* Consultation - minimal
* Consultation - minimal
* Consultation - minimal - patient detials in collapsible section
* Message Print to Alerts
* Patient - some fields removed
* Patient - create consultation - message print to alerts
* Consultation - show patient details updated
* Setup wizard - Duration to Drug Prescritpion Duration
* Healthcare Settings - patient registration - fee collection
* Lab Test - Create Sales Invoice bug fixed
* Healthcare menu rearranged
* Healthcare Settings - Optimised and Rearragnged
* Healthcare Settings - Expense account removed
* Receivable account removed from patient
* Patient - Optimised and Rearragnged
* Removed Referring Physician
* Healthcare Settings - bold headings removed
* Physician - Patient - Fields are Segregated
* Remove Service Unit
* Remove - Service Type
* Consultation invoice
* Lab Test - invoice
* Patient - Invoice
* Rename Appointment to Patient Appointment
* wip
* Patient Dashboard, Physician Form cleanup
* Dosage renamed to Prescription Dosage
* Renamed Drug Prescription Duration to Prescription Duration
* Patient Appointment booking modal
* Patient Age - calculate by dob
* Remove - scheduler
* Consultation - Appointment to Patient Appointment
* Patient Dashboard - rearranged
* Patient Appointment
* Removed rer_physician from lab test and consultation
* Patient Appontment Changes
* Appointment and Consultation - optimized
* Patient Appointment - fee validity code optimized
* Consultation and Patient Appointment - Invoice validate two side
* fix : #13 remove relation to admission
* Healthcare - Patient Portal
* fix import error
* domain Healthcare added on install
* Removed - Invoice Test Report
* Physician Schedule - menu
* Consultation - patient details - re write
* New Doctype-Medical Code
* Consultation - Daignosis codification
* Medical Code - Codification - Settings
* Medical Code Standard - Medical Code - Codification - Settings
* fix appointment calendar
* fix appointment analytics
* Menu Medical Code Standard
* New Doctype - Medical Code Standard
* Set Physician Role insted of IP Physician and OP Physician Role
* fixed some json files
* Medical code - permission to physician
* Unused Childs - Work Schedule and User List - Removed
* Label Procedure to Lab Test
* Lab Test and Patient - code optimised
* Add Item Groups - setup wizard
* Healthcare Settings - add Role - Medical Administrator
* Healthcare - Demo setup - Make Demo
* Fee Validity - Logic Test
* Test Fee Validity - Optimised
* Healthcare Doctypes - Restricted to Domain Healthcare
* Domainify - remove Healthcare Roles - Other Domains
* Healthcare doctypes - beta checked
* Codacy fixes
* Codacy - fixes
* Codacy - fixes
* Codacy - fixes
* Codacy - fixes
* Codacy - fixes
* Lab Test - print hide =1 for some fields
* Consultation - Codification field label to Medical Coding
* Codacy fixes - import frappe and etc.
* Codacy fixes - import frappe in test_vital_signs
* Codacy fixes
* Codacy fixes
* Codacy fixes and remove delete perm for patient
* send_sms - import form frappe
* Healthcare Settings
* Lab Prescription - Consultation - Test Code - read_only = 0
* Portal fixes
* Patient Appointment - filter physician - if has schedule
* Physician - IP Charge - Removed
* test - files
* Web Form - Patient Profile - removed
* Role Medical Administrator to Healthcare Administrator
* WIP healthcare documentation
* Coday - fixes
* Travis - fixes
* Lab Test Report - menu
* Reorder Healthcare settings - group lab config to bottom
* Sample Collection - New - allow Sample and patient Selection
* Rate - similar behaviour and Label as in Item Standard Selling Rate
* Healthcare documentation
* Lab Test Samples to Lab Test sample
* Commplaints to Complaint
* Commplaints to Complaint
* Antibiotics to Antibiotic
* Appointment Token Number - remove
* View - Medical record
* Codacy fixes
* update healthcare docs
* Cleanup Docs - Search, quick entry, trsck change, etc.
* [minor] ux changes
2017-09-13 12:52:30 +05:30
Nabin Hait
ff667695ad
timeout in setup wizard test
2017-09-13 11:26:55 +05:30
Rushabh Mehta
f849915c13
[fix] label
2017-09-13 10:48:53 +05:30
Nabin Hait
231c324589
Merge branch 'master' into staging
2017-09-12 16:26:31 +05:30
Nabin Hait
f8f29677fd
Merge branch 'master' into develop
2017-09-12 16:16:57 +05:30
Nabin Hait
e47bd4f477
bumped to version 8.11.2
2017-09-12 16:46:55 +06:00
rohitwaghchaure
67dfd26639
[fix] Production planning tool, unable to download material required report ( #10704 )
2017-09-12 15:54:27 +05:30
rohitwaghchaure
54099e592e
[fix] Serial No has already been received error while making purchase receipt entry for the returned serial no ( #10736 )
2017-09-12 15:51:52 +05:30
Manas Solanki
580f39a12c
check the instructor table before querying ( #10754 )
2017-09-12 15:49:36 +05:30
Nabin Hait
c9e96c15af
Rate and amount in a single row in tax breakup
2017-09-12 15:45:49 +05:30
Nabin Hait
de9eebe51c
Fixed multiple ui tests
2017-09-12 15:40:33 +05:30
Sagar Vora
d54d6bc572
[fix] use stock_qty in reports instead of qty to match with stock_uom ( #10727 )
2017-09-12 11:31:10 +05:30
rohitwaghchaure
38830e54d8
[fix] No module namd student_batch_name.student_batch_name error in the patch ( #10745 )
2017-09-12 11:25:02 +05:30
Rohit Waghchaure
1a77922e85
rename Is Online field to Use POS in Offline Mode in pos settings
2017-09-12 11:01:48 +05:30
Makarand Bauskar
d0823adf42
[minor] translate the action name in get_slide_settings ( #10740 )
2017-09-12 10:52:24 +05:30
rohitwaghchaure
80b902cea6
Merge pull request #10732 from rohitwaghchaure/rename_pos_field_in_pos_settings
...
Rename Is Online field to Use POS in Offline Mode in pos settings
2017-09-11 22:36:38 +05:30
Nabin Hait
e5716e3b1e
Default view of BOM is Listview
2017-09-11 19:21:47 +05:30
rohitwaghchaure
47605cae16
Merge pull request #10737 from nabinhait/budget_variance_for_project
...
[fix] Actual amount for budget variance report
2017-09-11 16:47:16 +05:30
Frappe PR Bot
8a803a2310
[Translation] Updated Translations ( #10741 )
2017-09-11 16:31:10 +05:30
rohitwaghchaure
e2149cb46f
Merge pull request #10697 from rohitwaghchaure/customer_search_optimization
...
[Fix] Customer search optimization for the offline POS
2017-09-11 16:23:15 +05:30
Nabin Hait
509bca36b1
Reverse charge in gst print format
2017-09-11 15:19:07 +05:30
Nabin Hait
cfb9310d13
Removed commit after creating custom gst fields
2017-09-11 15:00:16 +05:30
Rohit Waghchaure
4e006b0bc5
rename Is Online field to Use POS in Offline Mode in pos settings
2017-09-11 14:51:50 +05:30
Nabin Hait
f5cbb9c7b9
[fix] Actual amount for budget variance report
2017-09-11 13:58:15 +05:30
mbauskar
336c9b23d6
Merge branch 'master' into staging
2017-09-10 12:32:21 +05:30
mbauskar
dfeadf876e
Merge branch 'master' into develop
2017-09-10 12:32:21 +05:30
mbauskar
438088f69d
bumped to version 8.11.1
2017-09-10 13:02:20 +06:00
Makarand Bauskar
80b2ba2b9a
[hotfix] fixed Not Permitted issue for System user while accessing documents on portal ( #10725 )
...
* [hotfix] dont allow guest user to list the invoices or orders
* [hotfix] fixed Not Permitted issue for System user while accessing documents on portal
* [codecy] removed trailing whitespace
* [fixes] added filters for supplier in RFQ and other minor fixes
2017-09-10 12:04:28 +05:30
Faris Ansari
425f1df799
[fix] Tax area alignment ( #10690 )
2017-09-08 15:56:34 +05:30
Nabin Hait
d4e57a38a4
Fixed multiple ui test cases
2017-09-07 19:16:38 +05:30
Rohit Waghchaure
06b22e9ac1
[Fix] Customer search optimization for the offline POS
2017-09-07 17:44:42 +05:30
rohitwaghchaure
1b65575860
Merge branch 'develop' into pos-refactor
2017-09-07 17:15:58 +05:30
rohitwaghchaure
166b78f022
[Enhance] Subscription module ( #10089 )
...
* [Enhance] Subscription module
* Added view documents from the subscription form
* Test cases
* documentation
* UI Test cases, fixes
* Removed child table in the subscription
* Provision to make subscription from the document, added subscription in the dashboard for the sales and buying flow
* added patch to make subscription from the recurring data
* Rename field subscriptio to subscription_id, added new test cases, remove recurring_document from controller
* renamed subscription_id to subscription
2017-09-07 16:14:22 +05:30
Vishal Dhayagude
c79d14190f
[fix] travis failed ( #10702 )
2017-09-07 16:05:41 +05:30
Rushabh Mehta
2e8e5354e9
[fix] trainig_feedback.py
2017-09-07 10:43:36 +05:30
Rushabh Mehta
290e066633
[rename] /test_training_event_attendance.js
2017-09-07 09:07:15 +05:30
Rushabh Mehta
134d59949a
[minor] update warehouse_group in item.reorder_levels
2017-09-07 09:04:24 +05:30
Prateeksha Singh
2697e332f3
[fix] wizard UI test order ( #10663 )
...
* [fix] wizard ui test order
* [setup] remove old test
* [fix] commit to remove lock from defaults table during setup
2017-09-07 09:03:16 +05:30
Rohit Waghchaure
c72d08e8b9
Added indicator to show stock is available or not
2017-09-06 14:56:08 +05:30
rohitwaghchaure
ec46e51ed4
Merge pull request #10426 from nabinhait/payment_entry_deductions
...
Unallocated and difference amount calculation in Payment Entry
2017-09-06 13:04:25 +05:30
Rohit Waghchaure
7419c4b577
Fixed test cases
2017-09-06 12:44:51 +05:30
rohitwaghchaure
914fd197fc
Update test_payment_against_invoice.js
2017-09-06 12:42:58 +05:30
Faris Ansari
8868ae22be
[fix] Tax area alignment ( #10690 )
2017-09-06 12:17:12 +05:30
Nabin Hait
ded8d11728
Js tests added for write off difference amount
2017-09-06 12:11:48 +05:30
Nabin Hait
6c3618be37
Unallocated and difference amount calculation in Payment Entry
2017-09-06 12:10:52 +05:30
Rushabh Mehta
6ef741554c
[fix] [patch] rename_company_sales_target_field.py
2017-09-06 10:53:26 +05:30
mbauskar
668d04548a
Merge branch 'master' into develop
2017-09-05 20:45:00 +05:30
mbauskar
d4316f0264
bumped to version 8.11.0
2017-09-05 21:14:58 +06:00
Faris Ansari
4bcaeb312c
fix codacy
2017-09-05 17:30:22 +05:30
Faris Ansari
e4434d3200
Merge branch 'develop' into pos-refactor
2017-09-05 17:18:04 +05:30
Faris Ansari
62b1dc777e
Namespace PointOfSale class
2017-09-05 17:10:24 +05:30
Nabin Hait
799619b6b0
Fixed multiple uom in selling
2017-09-05 15:52:12 +05:30
Makarand Bauskar
3ad045302b
[minor] set abbreviation on company name trigger ( #10671 )
...
* [minor] set abbreviation on company name trigger
* [minor] codecy fixes
2017-09-05 15:23:55 +05:30
Nabin Hait
499fbe90dc
Test case fixed for multi-currency and multi-uom BOM ( #10679 )
2017-09-05 15:16:32 +05:30
Francisco Roldán
c929e88b97
Company Dashboard Title Translatable ( #10673 )
2017-09-05 15:09:35 +05:30
creamdory
05885ca184
Sorting in Production Order BOM Items
2017-09-05 17:02:54 +08:00
Rohit Waghchaure
2967d7ed01
Merge branch 'bom_currency' into develop
2017-09-05 11:26:22 +05:30
Rohit Waghchaure
c872095d76
update rate based on uom conversion factor
2017-09-05 11:25:05 +05:30
Frappe PR Bot
8054d962cf
[Translation] Updated Translations ( #10669 )
2017-09-05 09:19:06 +05:30
Nabin Hait
22cff25bf5
BOM rates as per selected currency and UOM
2017-09-04 18:31:45 +05:30
mbauskar
7faac85fff
Merge branch 'master' into staging
2017-09-04 14:50:32 +05:30
mbauskar
d32f08f6ec
Merge branch 'master' into develop
2017-09-04 14:50:31 +05:30
mbauskar
11cf44986b
bumped to version 8.10.2
2017-09-04 15:20:30 +06:00
Prateeksha Singh
95d8fd38f5
User Progress ( #10336 )
...
* [user-progress] first cut
* [user-progress] Add users slide, remove taxes, make sample data
* wip tests
* [setup-wiz] UI test
* [user-progress] notif test, docs trim
* wip
* [user-progress] Setup Progress single to update action states, fixtures
* setup progress actions patch
* rename sales_target field patch
* [progress] wip reform slide data
* [progress] remove slide data
* [setup] add roles for GST doctypes, remove commit from fixtures
2017-09-04 11:14:04 +05:30
Makarand Bauskar
cf9e986f82
[hotfix] fixed the invalid variable name lead.name ( #10648 )
2017-09-04 10:25:37 +05:30
rohitwaghchaure
fd39d6bd3c
[Enahance] Provision to select customer, item code while making an invoice from timesheet ( #10616 )
2017-09-04 10:20:40 +05:30
Arundhatii
2e6db4d928
Help pages for Attendance ( #10634 )
...
* Help pages for Schools setup
* Documentation of Schools module
* Help pages for Student
* Help pages for Student
* Help pages for Schools Student and Admission Module
* Documentation for Schools Attendance
2017-09-04 10:17:18 +05:30
Saurabh
21833413b0
[fix] ERPNext signup link fix on demo page ( #10649 )
2017-09-04 10:15:24 +05:30
Francisco Roldán
11355cd3c9
Set at lost translated in quotation ( #10652 )
2017-09-04 10:14:58 +05:30
Nabin Hait
baacf51a00
Fixed merge conflict
2017-09-04 10:13:29 +05:30
Zarrar
85eeafdccc
added filter for grading scale selection ( #10639 )
2017-09-01 21:45:10 +05:30
Makarand Bauskar
d6922b2de3
[hotfix] lead name should available before creating new customer from quotations ( #10642 )
2017-09-01 18:45:40 +05:30
Rohit Waghchaure
6ab630371d
Fixed serial no trigger not working from dialog box
2017-09-01 17:02:42 +05:30
Umair Sayed
f1881065a8
Merging Help Articles (Q & A) into Manual (Part 2) ( #10629 )
...
* adding articles in the manual
* adding articles in the manual 2
* migrating help articles to manuals
* migrating help articles to manuals
2017-09-01 16:26:41 +05:30
Rushabh Mehta
fc1c00716c
[test] test_account.js - more timeout?
2017-09-01 12:41:12 +05:30
Rushabh Mehta
baabb07e00
[test] test_account.js
2017-09-01 12:12:39 +05:30
Rushabh Mehta
7d868e41a6
[test] test_account.js
2017-09-01 11:46:11 +05:30
Nabin Hait
a9c9b69c22
Change actual charges based on exchange rate ( #10619 )
...
* Change actual charges based on exchange rate
* Update transaction.js
2017-08-31 19:40:09 +05:30
Frappe PR Bot
d112ee5244
[Translation] Updated Translations ( #10628 )
2017-08-31 19:38:41 +05:30
Rohit Waghchaure
3e43927767
Test cases
2017-08-31 18:21:27 +05:30
Saurabh
60739847ab
[minor][fix] change price field type from float to currency ( #10626 )
2017-08-31 17:08:30 +05:30
mbauskar
9012a9b414
Merge branch 'master' into staging
2017-08-31 15:31:48 +05:30
mbauskar
2965f92be3
Merge branch 'master' into develop
2017-08-31 15:31:47 +05:30
mbauskar
2a4328b4f5
bumped to version 8.10.1
2017-08-31 16:01:47 +06:00
Nabin Hait
d7ff9dca1d
Fixed rounding issue in Process Payroll, fixes #9300 ( #10586 )
2017-08-31 15:17:01 +05:30
Nabin Hait
e7e29b7f10
GST print format for POS ( #10590 )
...
* Serial no added in GST tax invoice
* GST print format for POS
2017-08-31 15:06:12 +05:30
Umair Sayed
84be137b4e
Migrating Help Articles (Q&A format) into User Manual ( #10608 )
...
* adding articles in the manual
* adding articles in the manual 2
* migrating help articles to manuals
2017-08-31 14:53:47 +05:30
Vishal Dhayagude
1252c30edf
[UI Test] UI test for Repack and Sales Invoice with Serialize item Added ( #10583 )
...
* [UI Test] UI test for Repack and Sales Invoice with Serialize item Added
* [Fix] Fixed path for sales invoice"
2017-08-31 14:47:56 +05:30
Vishal Dhayagude
1458d7fea6
[UI Test] Stock Entry for material issue with serialize item ( #10592 )
2017-08-31 14:47:01 +05:30
tundebabzy
7f8a259beb
Fixer Always Fetches Latest Exchange Rate Even When Date is Specified ( #10596 ) ( #10597 )
...
* test that confirms the bug. Same test should pass after fix
* make use of correct api url
2017-08-31 14:30:15 +05:30
rohitwaghchaure
56e31d05e9
[Fix] POS customer field is hang while searching customer, make error log if sync has failed ( #10607 )
2017-08-31 14:19:58 +05:30
krnkris
3c635e219e
Rename fr_plan_comptable_général.json to fr_plan_comptable_general.json ( #10601 )
2017-08-31 14:17:46 +05:30
Makarand Bauskar
de278635a3
[hotfix] fixes for UnicodeDecodeError ( #10620 )
2017-08-31 13:36:56 +05:30
Rohit Waghchaure
7e752c4ebf
Added patch, fixed codacy issue
2017-08-31 00:31:35 +05:30
Faris Ansari
6163a397df
Disable eslint in lib
2017-08-30 12:54:16 +05:30
Faris Ansari
1116f96aee
Grand Total Value width
2017-08-30 12:53:08 +05:30
Faris Ansari
491108a198
Merge branch 'develop' into pos-refactor
2017-08-30 12:37:05 +05:30
mbauskar
5096c45dec
Merge branch 'master' into hotfix
2017-08-29 20:42:06 +05:30
mbauskar
a896e52489
resolved merge conflicts
2017-08-29 20:41:59 +05:30
mbauskar
c0f34f454b
bumped to version 8.10.0
2017-08-29 21:08:21 +06:00
Rohit Waghchaure
70aaff46be
minor fix in item group search
2017-08-29 19:19:58 +05:30
tundebabzy
1a947dbf6a
Item Name not loaded in Material Request via BOM ( #10535 ) ( #10555 )
...
* adds item_name to child table
* adds two new functions to utils:
- first_row_is_empty: to check if first row in child table is empty
- remove_empty_first_row: to remove the empty first row in a child table
* removes empty first row after getting from BOM
* ui test
2017-08-29 18:18:27 +05:30
Faris Ansari
c70bbacd34
Add online, offline option, fix search
2017-08-29 15:27:17 +05:30
Faris Ansari
655f86d5e2
UI fixes
2017-08-29 14:27:01 +05:30
Faris Ansari
b9939a6449
Merge pull request #10448 from joelios/selfpostback
...
improvement for self-postbacks
2017-08-29 14:05:13 +05:30
Faris Ansari
6f50b3a5b2
handle both cases
2017-08-29 14:02:49 +05:30
Rohit Waghchaure
ba3f0e6b70
Added serial no, batch no, item group functionality
2017-08-28 19:45:58 +05:30
Aditya Hase
6ccb6562f1
Python 3 compatibility syntax error fixes ( #10519 )
...
* Use Python 3 style print function
* Use 'Exception as e' instead of 'Exception, e'
* Unpack tuple arguments explicitly in instead of relying on auto unpacking
* Use consistent indentation
* Use 0 if stock_frozen_upto_days is None
2017-08-28 18:17:36 +05:30
Faris Ansari
847f9f80c1
Merge pull request #10559 from mntechnique/pos_scanner_hotfix
...
[Fix] POS Scanner
2017-08-28 16:54:01 +05:30
Vishal Dhayagude
7ed4bfe7ee
[UI Test] UI Test for Material Receipt with Serialize Item Added ( #10565 )
...
* [UI Test] UI Test for Material Receipt with Serialize Item Added
* [fix]Codacy fixed
2017-08-28 16:53:25 +05:30
Faris Ansari
8fbc08f91f
Decrease timeout to 400
2017-08-28 16:52:20 +05:30
Vishal Dhayagude
872bebbbf8
[UI Test] Stock Entry for Subcontract ( #10574 )
2017-08-28 15:33:21 +05:30
Vishal Dhayagude
f8e6c44996
[UI Test] Stock Entry for Material Transfer to Manufacture ( #10572 )
2017-08-28 15:32:33 +05:30
mbauskar
5d0c4361ab
resolved merged conflicts
2017-08-28 11:58:44 +05:30
mbauskar
aaec42ebc2
resolved merged conflicts
2017-08-28 11:57:56 +05:30
mbauskar
d44af40de8
bumped to version 8.9.2
2017-08-28 12:26:17 +06:00
Nabin Hait
2df0788c11
Validate for negative outstanding reference only if party is Customer or Supplier ( #10568 )
2017-08-28 11:23:33 +05:30
Vishal Dhayagude
914b8463b7
[UI Test] UI Test for Payment Request Added: ( #10553 )
2017-08-28 11:14:28 +05:30
Utkarsh Goswami
7ba2a83182
Tests for Loan ( #10557 )
2017-08-28 11:13:16 +05:30
Vishal Dhayagude
554cf9be44
[UI Test] UI Test Added for Bank Reconciliation ( #10563 )
2017-08-28 11:11:36 +05:30
Vishal Dhayagude
da2164373c
[UI Test] UI Test added for Batch ( #10564 )
2017-08-28 11:10:26 +05:30
Vishal Dhayagude
c3a2204653
[UI Test] UI Test for Sales Order Cancel, amend and save ( #10570 )
2017-08-28 11:09:35 +05:30
Faris Ansari
3ae9e91bcd
Add memoization in search
2017-08-27 14:04:23 +05:30
Faris Ansari
d733b7d7d0
Styling and code fixes
2017-08-27 13:56:33 +05:30
Rohit Waghchaure
5e2d2059fe
Added email, edit on form view from POS, pay using numpad functionality
2017-08-27 08:54:40 +05:30
Revant Nandgaonkar
2558daf6b7
Allow search without keypress enter
2017-08-26 15:52:35 +05:30
Revant Nandgaonkar
2f7cb82ca0
[Fix] POS Scanner
...
Search item based on key press instead of 1sec wait
Fast Scanning needs this to avoid 1sec delay
2017-08-26 09:58:15 +05:30
Zarrar
7dc113e977
instructor-naming ( #10550 )
2017-08-25 17:48:36 +05:30
Utkarsh Goswami
579c8e68f9
Tests for Expense Claims [HR] ( #10514 )
2017-08-25 16:12:49 +05:30
Ashwini Save
e33a1e0515
Hide "Help Article" button for timeline Communication type "Comment". ( #10541 )
2017-08-25 12:44:33 +05:30
Nabin Hait
bf4a974124
IMproved print format for AR/AP report ( #10528 )
2017-08-25 12:10:49 +05:30
Utkarsh Goswami
9a04da27b0
Test for training ( #10545 )
2017-08-25 12:01:04 +05:30
AravindPranera
764bb30d2d
Fetching Opportunity items into Request for Quotation
2017-08-24 18:34:45 +05:30
AravindPranera
6544a85f1e
Opportunity Items fetching into Request for quotation
2017-08-24 18:32:40 +05:30
Manas Solanki
8de7c0245c
Fixes in the naming series ( #10480 )
...
* rewrite the js
* fix the space issue in the naming series
2017-08-24 17:51:23 +05:30
Vishal Dhayagude
17b2720f5b
[UI Test] UI Test for Payment Entry ( #10521 )
2017-08-24 17:50:28 +05:30
Faris Ansari
5d9196960e
new form improvements
2017-08-24 17:09:34 +05:30
Nabin Hait
caab582943
Tax breakup for actual amount and fixes in itemised purchase register ( #10515 )
...
* Tax breakup for actual amount and fixes in itemised pur register
* Rounding of itemised tax breakup amount
2017-08-24 16:22:28 +05:30
Zarrar
1010a2a2a4
Resolving some issues in school [ issue no:- #10464 ] ( #10529 )
...
* guardian_name issue fix
* guardian table issue resolved
* resolved fetching issue + unnecessary code removed
2017-08-24 16:22:06 +05:30
Utkarsh Goswami
3da5574d79
Test for appraisal ( #10525 )
2017-08-24 15:48:57 +05:30
Rushabh Mehta
6b651d734e
[fix] status in purchase_receipt.py ( #10534 )
2017-08-24 15:47:49 +05:30
Rohit Waghchaure
e5f6b4d640
Added print, make new invoice from POS functionality
2017-08-24 15:27:55 +05:30
Rushabh Mehta
7e506af0b9
[fix] warehouse query fixes https://github.com/frappe/erpnext/issues/10537 ( #10538 )
2017-08-24 15:23:33 +05:30
Rushabh Mehta
72fa958f2c
[layout] lead and opportunity ( #10487 )
2017-08-23 18:47:57 +05:30
Vishal Dhayagude
641d88fd6b
[UI Test] UI Test added for Journal Entry ( #10512 )
...
* [UI Test] UI Test added for Journal Entry
* [mod] Edited date in journal Entry
* [fix] Codacy fixed
2017-08-23 18:32:12 +05:30
Faris Ansari
6d2f6c2e4d
Search improved, code refactor
2017-08-23 16:25:16 +05:30
Rushabh Mehta
4a546e6c18
[minor] delivery note standard filter
2017-08-23 16:16:43 +05:30
Makarand Bauskar
dd8c0febd5
[minor] changed the modified date for bom for rename_bom_update_tool patch ( #10509 )
2017-08-23 13:17:37 +05:30
Faris Ansari
26df5b8c00
Connect Numpad events with POSCart
2017-08-23 13:12:12 +05:30
mbauskar
06f5ae0e78
Merge branch 'master' into develop
2017-08-23 13:06:43 +05:30
mbauskar
918f029d98
bumped to version 8.9.1
2017-08-23 13:36:43 +06:00
Nabin Hait
cb40bd86f8
Supplier bill no in GST itemised purchase register ( #10513 )
2017-08-23 13:04:50 +05:30
Rohit Waghchaure
b73321c577
Item search refactor
2017-08-23 12:15:10 +05:30
Saurabh
b903c86076
Merge pull request #10506 from nabinhait/hotfix677
...
Minor fix in itemised sales register
2017-08-23 11:13:31 +05:30
Nabin Hait
fcb2462902
Minor fix in itemised sales register
2017-08-23 09:44:33 +05:30
mbauskar
b69ec059fe
Merge branch 'master' into develop
2017-08-22 20:22:24 +05:30
mbauskar
d46a9572af
bumped to version 8.9.0
2017-08-22 20:52:24 +06:00
rohitwaghchaure
7379e4e5de
Merge pull request #10195 from nabinhait/auto_update_bom_cost
...
Update BOM cost in all BOMs based on latest rm rate
2017-08-22 19:14:53 +05:30
Nabin Hait
bb326f2bbd
Chart of accounts for Taiwan ( #10435 )
2017-08-22 19:07:42 +05:30
Nabin Hait
34c218b2de
Minor improvements based on skip_transfer ( #10457 )
2017-08-22 19:07:16 +05:30
Nabin Hait
382f5eb1b1
Run sales/purchase register for one month by default ( #10493 )
2017-08-22 19:06:21 +05:30
Doridel Cahanap
a6a93cbe06
[Fix] Request for Quotation Portal Title ( #10489 )
2017-08-22 18:39:38 +05:30
Vishal Dhayagude
a1637d8343
[UI Test] UI test for Sales Invoice with Payment Entry ( #10483 )
...
* [UI Test] UI test for Sales Invoice with Payment Entry
* Update test_purchase_order_receipt.js
2017-08-22 18:33:17 +05:30
Utkarsh Goswami
5cf3bdd593
Travis fix for purchase order receipt ( #10498 )
2017-08-22 17:39:06 +05:30
mbauskar
4396a0e9a8
Merge branch 'master' into staging
2017-08-22 15:42:10 +05:30
mbauskar
3b3ab4d574
Merge branch 'master' into develop
2017-08-22 15:42:10 +05:30
mbauskar
974cfd2895
bumped to version 8.8.6
2017-08-22 16:12:09 +06:00
rohitwaghchaure
187cea3602
[Fix] Accepting duplicate serial no is purchase receipt ( #10469 )
...
* [Fix] Accepting duplicate serial no is purchase receipt
* Fixed test cases
2017-08-22 15:38:32 +05:30
Nabin Hait
28d8557905
[fix] Taxes in itemised purchase register ( #10494 )
2017-08-22 15:30:45 +05:30
mbauskar
7716a08b5d
Merge branch 'master' into staging
2017-08-22 12:03:47 +05:30
mbauskar
7d9452f4e4
Merge branch 'master' into develop
2017-08-22 12:03:47 +05:30
mbauskar
4cbd43cb40
bumped to version 8.8.5
2017-08-22 12:33:46 +06:00
Makarand Bauskar
11224eaf06
[hotfix] fixes for TypeError: 'NoneType' object is not iterable ( #10484 )
2017-08-22 12:03:02 +05:30
rohitwaghchaure
02bad86037
Merge pull request #10473 from rohitwaghchaure/item_group_issue_in_pos
...
[Fix] Pricing rule applying only on item groups defined in POS profile
2017-08-22 11:34:49 +05:30
Nabin Hait
6c6e45157b
Fixed test case for replace bom
2017-08-22 10:49:58 +05:30
Nabin Hait
52cc08dd2d
Test case added for replacing BOM
2017-08-22 10:49:57 +05:30
Nabin Hait
adbf8adfb9
Update BOM cost in all BOMs based on latest rm rate
2017-08-22 10:49:57 +05:30
Makarand Bauskar
a591d1df5f
[minor] ingore user permission for old_parent fields ( #10471 )
2017-08-21 19:04:49 +05:30
Rohit Waghchaure
33326fe90e
[Fix] Pricing rule applying only on item groups defined in POS profile
2017-08-21 16:30:21 +05:30
Faris Ansari
78c81d9c6c
Refactor payment code
2017-08-21 15:05:33 +05:30
Ameya Shenoy
c87c1dbbbf
converted production tests to INR from USD ( #10472 )
2017-08-21 14:10:04 +05:30
Rushabh Mehta
575ab3ab70
[docs] for print style ( #10452 )
2017-08-21 12:24:28 +05:30
mbauskar
5088ad11ee
Merge branch 'master' into staging
2017-08-21 08:58:52 +05:30
mbauskar
62f0722325
resolved merge conflicts
2017-08-21 08:58:42 +05:30
mbauskar
ddb26d02e5
bumped to version 8.8.4
2017-08-21 09:27:32 +06:00
Nabin Hait
879e162cce
Additional GST related fields in Invoice and Sales/Purchase Register reort ( #10405 )
2017-08-21 08:28:55 +05:30
Zarrar
196b491ac4
[ui test ] Travis failing fix ( #10468 )
...
* Value in assertion was wrong
* Update test_purchase_order_receipt.js
2017-08-21 08:07:42 +05:30
Nabin Hait
1f49f511aa
Tax rate in Itemised sales/purchase register and cleanups ( #10439 )
2017-08-21 08:05:12 +05:30
rohitwaghchaure
0d9ab86496
[Fix] Making of production order from so, system not fetched the items from the sales order item if packing list has items and vice versa ( #10453 )
2017-08-21 07:52:49 +05:30
rohitwaghchaure
6b1624cfee
[Fix] Tax rule is not working for the parent customer groups ( #10458 )
2017-08-21 07:38:37 +05:30
Makarand Bauskar
222e86bb13
[hotfix] fixed the mysql syntax error issue on stock ledger report ( #10442 )
2017-08-21 07:35:16 +05:30
Makarand Bauskar
80d06da978
[hotfix] fixed mysql syntax error in Student and Guardian Contact Details report ( #10450 )
2017-08-21 07:34:45 +05:30
KanchanChauhan
dd351c585a
[Minor] Title added to rfq web view ( #10454 )
2017-08-20 11:00:43 +05:30
Vishal Dhayagude
8fd5b325e0
[UI Test] travis.yml modified for fresh UI Test ( #10446 )
...
* [UI Test] travis.yml modified for fresh UI Test
* [fix] travis
* Update test_production_order.js
* Update test_production_order.js
* Update test_purchase_order_receipt.js
* Update tests.txt
* Update test_purchase_order_receipt.js
2017-08-20 10:59:48 +05:30
Faris Ansari
eba50c6860
Merge branch 'pos-refactor' of https://github.com/netchampfaris/erpnext into pos-refactor
2017-08-18 17:00:02 +05:30
Vishal Dhayagude
592e8c2e77
[UI Test] UI Test added for Stock Reconciliation ( #10432 )
...
* [UI Test] UI Test added for Stock Reconciliation
* [fix] Codacy
2017-08-18 15:01:20 +05:30
Utkarsh Goswami
5a27aead06
Test for Process Payroll ( #10447 )
2017-08-18 13:12:53 +05:30
Rohit Waghchaure
f03a73466c
Added modal for multi mode payment, provision to add write off and change amount
2017-08-18 12:15:19 +05:30
Utkarsh Goswami
ca63cc6439
[UI Test Recruitment] To test Recruitment in HR module ( #10441 )
...
* Tests for Recruitment
* Codacy fix
2017-08-18 11:57:01 +05:30
Vishal Dhayagude
2890fa74a2
[UI Test] UI Test for Purchase Receipt Added ( #10434 )
2017-08-18 11:55:14 +05:30
Joel Mesmer
97c1bcf14f
improvement for self-postbacks
2017-08-17 22:20:18 +02:00
Zarrar
780f11ec16
path to test updated ( #10438 )
2017-08-17 18:36:33 +05:30
Makarand Bauskar
fe43ecb5ee
[hotfix] fixed type in gst_state_code_data.json file ( #10437 )
2017-08-17 17:34:25 +05:30
rohitwaghchaure
fff56530c4
[Fix] Due date not fetching on the payment entry against the invoices ( #10419 )
2017-08-17 14:47:25 +05:30
Nabin Hait
5b266eff89
Update patches.txt
2017-08-17 14:42:50 +05:30
Faris Ansari
0f3d431476
Update cart ui from cur_frm, Add number pad
2017-08-17 12:56:14 +05:30
Rohit Waghchaure
b1daab4284
Added functional part
2017-08-17 12:56:14 +05:30
Faris Ansari
7bcb1cfc42
more styling
2017-08-17 12:56:14 +05:30
Faris Ansari
a0f8687945
Styling for search fields
2017-08-17 12:56:14 +05:30
Faris Ansari
03e7ec29e7
Add clusterize, move customer field to POSCart, get POS profile
2017-08-17 12:56:14 +05:30
Faris Ansari
6e7db034f2
[wip] New POS UI
2017-08-17 12:56:14 +05:30
Makarand Bauskar
446c2b0e91
[hotfix] fixes for https://github.com/frappe/erpnext/issues/9782 calculate leave without pay before subtracting holidays ( #10355 )
2017-08-17 12:39:35 +05:30
Ben Cornwell-Mott
ee9f9863ff
MORE CODACY
2017-08-17 11:29:11 +05:30
Ben Cornwell-Mott
9727a3fe50
More codacy issues
2017-08-17 11:27:31 +05:30
Rohit Waghchaure
df83191ea0
Set write permission to sales manger for permlevel 1 in Quotation doctype
2017-08-17 11:27:30 +05:30
Ben Cornwell-Mott
13218f7d76
Fixed codacy issues
2017-08-17 11:25:12 +05:30
Ben Cornwell-Mott
bea7d9f919
Added tests
2017-08-17 11:25:12 +05:30
Ben Cornwell-Mott
1b43515160
Codacy fixes
2017-08-17 11:18:49 +05:30
Ben Cornwell-Mott
48058a88e5
Minor cleanup
2017-08-17 11:18:49 +05:30
Ben Cornwell-Mott
f7e42211b9
Added Quote Status to RFQ Suppliers with No Quote
2017-08-17 11:18:49 +05:30
Zarrar
abd3419632
made test less dependent on python test data ( #10424 )
2017-08-17 11:04:16 +05:30
Shreya Shah
b5ed6823d6
[UI Test] Buying - Create Purchase receipt ( #10421 )
...
* Create purchase receipt after submitting the purchase order
* Checks quantity and rate in stock ledger
2017-08-17 11:03:43 +05:30
Vishal Dhayagude
f37eacdee5
[UI Test] Purchase Invoice ( #10422 )
...
* [UI Test] Purchase Invoice
* [fix] Travis failed
2017-08-17 11:01:59 +05:30
Nabin Hait
64c32dcd59
[fix] Update monthly sales value on Company ( #10417 )
...
* [fix] Update monthly sales value on cancellation of invoice, also update modified datestamp
* Company monthly sales: patches and test cases
2017-08-16 15:04:18 +05:30
Zarrar
9eb8680ec9
travis failing issue fix ( #10420 )
2017-08-16 13:25:31 +05:30
tundebabzy
f35710db15
remove empty first row if needed ( #10378 )
...
refactor code: move global functions to callback scope
2017-08-16 13:25:18 +05:30
tundebabzy
258faab761
Transaction Forms (Payment Entry, Sales Invoice, Purchase Invoice) can forget company currency ( #10409 ) ( #10410 )
...
* properly keep track of document currency and company currency
* Update taxes_and_totals.js
2017-08-16 13:16:46 +05:30
tundebabzy
5fc5b68a49
update multi currency accounting documentation to remove incorrect info ( #10404 )
2017-08-16 11:41:56 +05:30
Manas Solanki
0371d5a326
new item group filter in the stock ledger report ( #10400 )
2017-08-16 11:35:04 +05:30
Utkarsh Goswami
44b088c6b3
[UI Test Salary] To test the salary structure and the salary slip ( #10407 )
...
* Test for salary structure and salary slip
* Test for salary structure and salary slip
* Test for salary structure and salary slip
* Travis CI fixes
* Updated
* Updated
* travis fixes
* Travis fixes
2017-08-16 11:32:04 +05:30
Shreya Shah
289400d944
[UI Test] Buying module - Multiple tests for Purchase orders ( #10414 )
...
* Extended timeout to avoid rare failures
* Get purchase orders with discount on grand total
* Get purchase orders with discount on individual items
* Get purchase orders and calculate taxes
* Added paths
2017-08-16 11:31:34 +05:30
Faris Ansari
21fc26c2a2
Update cart ui from cur_frm, Add number pad
2017-08-14 18:25:59 +05:30
Shreya Shah
f6544e95d4
[UI Tests] Buying Module - Supplier quotations and Purchase orders ( #10397 )
...
* Get Supplier Quotation with item wise discount
* Get purchase orders
* Added paths
* Codacy fix
2017-08-14 17:29:09 +05:30
Rushabh Mehta
4f366e9c38
[fix] conflicts
2017-08-14 16:15:20 +05:30
Rushabh Mehta
683b015951
[fix] email alert
2017-08-14 15:03:33 +05:30
Makarand Bauskar
0973161ae5
[docs] Translate the Schools Assessment section documentation to Spanish ( #10398 )
...
* [docs] Translate the Schools app documentation to Spanish
* [docs] Translate the Schools Student section documentation to Spanish
* [docs] Translate the Schools SETUP section documentation to Spanish
* [docs] Translate the Schools ADMISSION section documentation to Spanish
* [docs] Translate the Schools FEES section documentation to Spanish
* [docs] Translate the Schools SCHEDULE section documentation to Spanish
* [docs] Translate the Schools Assessment section documentation to Spanish
2017-08-14 14:55:48 +05:30
mbauskar
40377e87de
Merge branch 'master' into staging
2017-08-14 12:33:56 +05:30
mbauskar
4ca3e8f70a
Merge branch 'master' into develop
2017-08-14 12:33:55 +05:30
mbauskar
e0cc7c64a1
bumped to version 8.8.3
2017-08-14 13:03:55 +06:00
Makarand Bauskar
e5ae4d3bd3
send email via the background jobs ( #10374 ) ( #10393 )
...
* send the email via the background worker in the payment request (#10350 )
* send email via the background jobs (#10374 )
2017-08-14 12:22:50 +05:30
Vishal Dhayagude
7186131d65
[UI Test] sales invoice ( #10394 )
...
* [UI Test] Sales Invoice
* [UI Test] Sales Invoice
2017-08-14 12:22:04 +05:30
Rushabh Mehta
1132502e14
[fix] test
2017-08-14 12:09:30 +05:30
Rushabh Mehta
ea573e2421
[training] update names
2017-08-14 11:53:34 +05:30
Rushabh Mehta
1fe1a47658
[docs] update docs
2017-08-14 11:53:34 +05:30
Rushabh Mehta
6cb14cfc04
[docs] update docs
2017-08-14 11:53:34 +05:30
Rushabh Mehta
89505522d3
[docs] update docs
2017-08-14 11:53:34 +05:30
Rushabh Mehta
550b0fab84
[fixes] email notifications by email alert on training event and result
2017-08-14 11:53:34 +05:30
Ben Cornwell-Mott
35a4e587ee
Fixes for camel_case and translations
2017-08-14 11:53:34 +05:30
Ben Cornwell-Mott
e92b4737e3
codacy fixes
2017-08-14 11:53:34 +05:30
Ben Cornwell-Mott
94c6b7409b
Updated documentation
2017-08-14 11:53:34 +05:30
Ben Cornwell-Mott
e9dbafcc10
Improve email format for training event, add ui test
2017-08-14 11:53:34 +05:30
Rohit Waghchaure
854d335ab1
Added functional part
2017-08-14 11:34:42 +05:30
Manas Solanki
a5cb9ae8bd
send email via the background jobs ( #10374 )
2017-08-14 09:50:15 +05:30
mbauskar
f03afe0878
Merge branch 'master' into staging
2017-08-14 09:31:01 +05:30
mbauskar
2fa8af3b02
Merge branch 'master' into develop
2017-08-14 09:31:01 +05:30
mbauskar
b2f160eef0
bumped to version 8.8.2
2017-08-14 10:01:00 +06:00
Shreya Shah
67e2ef30c4
[UI test] Buying module - Get Supplier Quotations ( #10375 )
...
* Get quotations for Suppliers
* Calculate taxes and charges for Supplier quotations
* Added paths for tests
* Codacy fix
* Improvised the page route function
2017-08-14 09:17:00 +05:30
tundebabzy
041b9c3c32
make item name read only and add hide if not saved ( #10382 )
2017-08-14 09:16:07 +05:30
Vishal Dhayagude
22baba2cff
[UI TEST] Test added for Delivery Note ( #10376 )
2017-08-11 17:17:30 +05:30
Faris Ansari
7273cb7f54
Track changes in Account doctype ( #10373 )
2017-08-11 16:19:28 +05:30
Faris Ansari
5a13087939
more styling
2017-08-11 15:49:23 +05:30
Vishal Dhayagude
4157b64776
[UI Test] Multiple UI Test for Stock Entry added ( #10354 )
2017-08-11 12:06:16 +05:30
Shreya Shah
9e30969243
Fetching items from material requests doctype ( #10363 )
2017-08-11 12:02:35 +05:30
Rushabh Mehta
dbb5154f37
Fixes in Order / Quotation ( #10361 )
...
* Additions in Order Page for Sidebar Menu with "Order" page route
* Adjust Columns in order_taxes.html to avoid number breaks for more precisions
* Fields additions in transaction_row.html
* [fix] style for order pages, indicator for quotation etc
* [fix] style for order pages, indicator for quotation etc
* [test] add timeout
2017-08-10 21:06:09 +05:30
Faris Ansari
f7c7ff4aae
Styling for search fields
2017-08-10 18:28:05 +05:30
Faris Ansari
65c4bd6db6
Add clusterize, move customer field to POSCart, get POS profile
2017-08-10 17:17:49 +05:30
Faris Ansari
519cc09979
[wip] New POS UI
2017-08-10 17:17:49 +05:30
Shreya Shah
5ae39ae79a
Get Quotation requests and send emails to suppliers ( #10356 )
2017-08-10 16:20:47 +05:30
rohitwaghchaure
2e8232e7aa
[Fix] Getting an error cost center is not defined in the purchase receipt, even if it's defined in the company ( #10320 )
2017-08-10 11:32:59 +05:30
Makarand Bauskar
aac8349391
[hotfix] remove the white spaces from condition and formula fields ( #10331 )
...
* [hotfix] remove the white spaces from condition and formula fields
* [tests] added tests cases for whitespaces in formula and condition fields
2017-08-10 11:25:49 +05:30
Manas Solanki
a854ea00a5
mark holiday in the employee monthly attendance sheet ( #10349 )
2017-08-10 11:20:58 +05:30
Manas Solanki
e97f587411
send the email via the background worker in the payment request ( #10350 )
2017-08-10 11:17:38 +05:30
rohitwaghchaure
35438b6fc0
[Fix] Opportunity status has not changed after making of quotation against it if items has not added in the opportunity ( #10351 )
2017-08-10 11:15:50 +05:30
Zarrar
14468e79a3
[ui test] Student assessment and result ( #10353 )
...
* updated to test more thoroughly
* backbone set to generate result
* rebased with develop
2017-08-10 10:56:22 +05:30
Shreya Shah
243f091b30
Get supplier details ( #10352 )
2017-08-10 10:51:47 +05:30
Vishal Dhayagude
e05c2e5d95
[UI Test] for Stock Entery ( #10346 )
2017-08-09 17:36:04 +05:30
rohitwaghchaure
5999ade43a
[Fix] Auto batch creation not working for purchase invoice is update stock is enabled ( #10348 )
2017-08-09 17:24:13 +05:30
Vishal Dhayagude
bde05e96a6
[UI TEST] Multiple test for Materail request ( #10347 )
2017-08-09 16:56:14 +05:30
Vishal Dhayagude
da30a69ee7
[UI Test] test added for Material Request ( #10338 )
...
* [UI Test] test added for Material Request
* [mod] date in material request
2017-08-09 13:08:38 +05:30
mbauskar
42251da131
Merge branch 'master' into develop
2017-08-09 11:17:55 +05:30
mbauskar
3e29a28cee
bumped to version 8.8.1
2017-08-09 11:47:55 +06:00
Makarand Bauskar
60fcf47f6a
[hotfix] changed the modified date for quotation ( #10337 )
2017-08-09 11:15:18 +05:30
Rushabh Mehta
dfd8f9b0ce
[docs] move calculate-incentive-for-sales-team.md
2017-08-09 10:49:59 +05:30
Rushabh Mehta
c957ce161f
[fix] titles
2017-08-09 10:46:17 +05:30
Rushabh Mehta
67884cb7cf
[fix] remove 2fa from wizard docs
2017-08-09 10:46:17 +05:30
Zarrar
17e35e6ac7
[ui tests] Student attendance and leave application ( #10326 )
...
* spelling error rectified
* setting up leave application
* marking attendance and checking
* typo error fixed
2017-08-08 18:24:15 +05:30
Vishal Dhayagude
135560e170
[UI Test] Multiple UI Test for Quotation ( #10330 )
2017-08-08 18:22:53 +05:30
rohitwaghchaure
468fb97c81
[Fix] Lead address not able to select on the quotation ( #10328 )
2017-08-08 17:27:58 +05:30
Doridel Cahanap
96e52be5f1
[Enhancement] Allow Sidebar Menu record search using text from Item Name of a record ( #10324 )
...
* Search Record in Sidebar Menu Using Item Name for Order Page
* Test Case to create 2 Quotations with different Items
2017-08-08 17:12:50 +05:30
mbauskar
53f0f62f1c
Merge branch 'master' into develop
2017-08-08 16:07:57 +05:30
mbauskar
e77102ea47
bumped to version 8.8.0
2017-08-08 16:37:56 +06:00
Nabin Hait
7f476b4528
The series added for Asset Depreciation Entry ( #10268 )
2017-08-08 15:01:02 +05:30
Makarand Bauskar
b985ad2a8e
[minor] fixes for pos_profile in make-demo ( #10289 )
2017-08-08 15:00:30 +05:30
ckosiegbu
1ac6bcba23
Removal of SMS Settings and SMS Parameters from ERPNext ( #10033 )
...
* Removal of SMS Settings and SMS Parameter from ERPNext.
* [DOCS]Documentation for Two Factor Authentication
* [Patch]Point SMS module to frappe core
* Rearrange doc help index.txt to fit
* [DOCS]Update Documentation for Two Factor Authentication
2017-08-08 14:55:30 +05:30
Nabin Hait
32992d555d
Added chart of accounts for Argentina, France, Brazil and Hungary ( #10312 )
2017-08-08 14:42:04 +05:30
KanchanChauhan
71088aa2bd
Supplier Part No in Purchase Receipt since it exits in Purchase Order ( #10314 )
2017-08-08 14:41:35 +05:30
mbauskar
1065679720
Merge branch 'master' into staging
2017-08-08 12:54:12 +05:30
mbauskar
6b0b7912c4
Merge branch 'master' into develop
2017-08-08 12:54:12 +05:30
mbauskar
1846d0fa2f
bumped to version 8.7.3
2017-08-08 13:24:11 +06:00
Rushabh Mehta
09d1eaa87b
[minor] standard filters
2017-08-08 12:00:04 +05:30
Zarrar
40343da1b0
Student group creation ( #10308 )
...
* auto-fills groups with students
* improvised and rectified tests
* increased timer to avoid rare failures
* removed duplicate code
* requested changes implemented
* changes implemented
2017-08-08 11:43:28 +05:30
Saurabh
3a4b6c2cba
[fix] redirect to payment url if paying via web portal ( #10265 )
...
* [fix] redirect to payment url if paying via web portal
* [fix] test case fix
* [fix] test case fixes
2017-08-08 11:29:11 +05:30
KanchanChauhan
255c5f4407
Supplier Delivery Note field added to Purchase Receipt, good to have for future references ( #10309 )
2017-08-08 11:23:45 +05:30
rohitwaghchaure
9ef1d0f5a5
[Fix] Balance sheet not working ( #10311 )
2017-08-08 11:23:25 +05:30
Nabin Hait
738d8c2e0f
Changed patch order to reload domain
2017-08-08 11:15:13 +05:30
Manas Solanki
c0fb428075
print format for the assessment report ( #10227 )
...
* print format for the assessment report
* fix for the comma in assessment plan
2017-08-07 13:54:39 +05:30
Nabin Hait
632f7673d5
Added total row in GST reports ( #10292 )
2017-08-07 13:50:16 +05:30
Nabin Hait
79005e83d7
Merge pull request #10293 from ashwinisave35/knowledge_base_button
...
Changed Text of Knowledge base button to Help Article
2017-08-07 13:50:02 +05:30
Nabin Hait
19128134a8
Merge pull request #10295 from tundebabzy/issue-10099-2
...
BOM Currency symbol issue (#10099 ) - Stock Ledger report
2017-08-07 13:49:22 +05:30
tunde
80a9f37272
add options in get_columns
2017-08-04 12:08:09 +01:00
Ashwini Save
cbef770ed7
Changed Text of Knowledge base button to Help Article
2017-08-04 16:14:38 +05:30
Nabin Hait
51b4167cdd
Merge pull request #10269 from tundebabzy/currency-issues
...
BOM - Currency symbol issue (#10099 )
2017-08-04 15:36:35 +05:30
Zarrar
82d2828be6
[ui test] Student Group - manually and using creation tool ( #10283 )
...
* fixing issues in original files
* creating a student log
* student group - manually and using creation tool
2017-08-04 15:33:27 +05:30
mbauskar
4ef1e2046b
Merge branch 'master' into staging
2017-08-04 14:08:57 +05:30
mbauskar
e770824568
Merge branch 'master' into develop
2017-08-04 14:08:57 +05:30
mbauskar
4796e8e317
bumped to version 8.7.2
2017-08-04 14:38:56 +06:00
Rohit Waghchaure
499144fd86
Fixed test cases for dynamic link order
2017-08-04 13:30:59 +05:30
Makarand Bauskar
b96e239cc0
[hotfix] ignore if project type is None ( #10284 )
2017-08-04 11:40:23 +05:30
mbauskar
cce79255fe
resolved merge conflicts
2017-08-04 11:07:49 +05:30
mbauskar
f3be738b68
resolved merge conflicts
2017-08-04 11:07:07 +05:30
mbauskar
8cf951b574
bumped to version 8.7.1
2017-08-04 11:35:01 +06:00
rohitwaghchaure
0c1d441aa3
Test case for dynamic link order ( #10276 )
2017-08-04 10:55:46 +05:30
rohitwaghchaure
5906ddf804
[Fix] View ledger button not disaplying in the head of an account ( #10254 )
...
* [Fix] View ledger button not disaplying in the head of an account
* Show view ledger button in account if user has permission to read GL Entry data
2017-08-04 10:52:01 +05:30
Zarrar
326acc3ecb
[ui test] fixed tests that used fees in any way ( #10279 )
...
* course table dependency on fee structure bypassed
* testing related to fees removed
* added more students data
* codacy fix
2017-08-04 10:51:26 +05:30
Vishal Dhayagude
592add9f0a
[UI Test] Sales Order with Shipping Rule and Pricing Rule Added ( #10270 )
...
* [UI Test] Sales Order with Shipping Rule Added
* [UI Test] Sales Order with Pricing Rule Added
2017-08-04 10:51:08 +05:30
Rushabh Mehta
1696294847
[fix] remove property setter for project type ( #10277 )
...
* [fix] remove property setter for project type
* [patch] project type
2017-08-04 10:50:56 +05:30
Ameya Shenoy
4331067e57
[ui-test] completed tests for manufacturing ( #10218 )
...
* modified test_item to include child table assertions
* minor travis fixes
* removed css selectors and used cur_frm
2017-08-04 10:50:32 +05:30
rohitwaghchaure
046e1a6e28
[Fix] Patch broken if serial no has single quote ( #10262 )
2017-08-03 17:38:03 +05:30
Nabin Hait
ee5ff805e9
Book expense included in valuation only if perpetual inventory enabled ( #10271 )
2017-08-03 17:37:23 +05:30
Saurabh
33aaebac2b
[fix] encode title and description in payment request ( #10240 )
2017-08-03 11:47:05 +05:30
Nabin Hait
af01f5154b
Merge pull request #10251 from rohitwaghchaure/permlevel_1_write_permission
...
Set write permission to sales manger for permlevel 1 in Quotation doctype
2017-08-03 10:45:17 +05:30
Nabin Hait
b554f9077c
Update set_write_permission_for_quotation_for_sales_manager.py
2017-08-03 10:44:55 +05:30
Nabin Hait
bfb3de771b
Merge pull request #10255 from tundebabzy/issue-10215
...
Error when creating Bank Entry from Process Payroll (#10215 )
2017-08-03 10:20:31 +05:30
Nabin Hait
21045c456e
Update process_payroll.py
2017-08-03 10:20:10 +05:30
Nabin Hait
5ebb9a0fc7
Merge pull request #10259 from pratu16x7/hotfix
...
[hotfix] website stock not shown due to discount not set
2017-08-03 10:19:13 +05:30
Kanchan Chauhan
1fd17a9a67
[Minor] Country field name should be country
2017-08-03 10:18:43 +05:30
tunde
7663bbadb9
edit Doctypes to use company currency
2017-08-03 00:05:56 +01:00
tunde
4a263c714d
get_party_detail should use default currency of party
2017-08-02 22:26:39 +01:00
pratu16x7
7587b19d1b
[fix] website stock not shown due to discount not set
2017-08-02 22:14:51 +05:30
tunde
919c9db1b0
indicator should be red
2017-08-02 15:19:24 +01:00
Nabin Hait
f5dee777dd
minor fix in applying pricing rule
2017-08-02 19:08:39 +05:30
tunde
3b8b3fe766
Merge branch 'hotfix' into issue-10215
2017-08-02 14:27:56 +01:00
tunde
85adbd7eae
show message if there's no submitted salary slip
2017-08-02 14:20:24 +01:00
tunde
c697526382
except in python 3 compatible style
2017-08-02 14:20:23 +01:00
mbauskar
2dd57acdef
removed merge conflicts
2017-08-02 18:39:04 +05:30
mbauskar
478ffb9ae3
bumped to version 8.7.0
2017-08-02 19:05:51 +06:00
mbauskar
73dc35ddbf
resolved merge conflicts
2017-08-02 18:24:03 +05:30
Rohit Waghchaure
250e964205
Set write permission to sales manger for permlevel 1 in Quotation doctype
2017-08-02 18:23:39 +05:30
mbauskar
ee090a9a3c
Merge branch 'master' into develop
2017-08-02 18:18:14 +05:30
mbauskar
4d49a7f6d1
bumped to version 8.6.6
2017-08-02 18:48:14 +06:00
Makarand Bauskar
ce436b7698
[minor] set description to '' if template description is not available ( #10244 )
2017-08-02 18:16:53 +05:30
rohitwaghchaure
ec9430dae7
[Fix] Default selling settings not fetched on customer quick entry form ( #10243 )
2017-08-02 18:16:13 +05:30
Faris Ansari
578624db1f
Fix column width in GST Tax Breakup ( #10230 )
2017-08-02 17:44:32 +05:30
Vishal Dhayagude
ed0b107a9f
[UI Test] UI test added for Pricing Rule ( #10237 )
...
* [UI Test] UI test added for Pricing Rule
* [mod]minor chages in pricing rule test
* [fix] codacy fixed
2017-08-02 17:31:20 +05:30
Vishal Dhayagude
f9e4893d9d
[UI Test] Test added for Shipping Rule ( #10229 )
...
* [UI Test] Test added for Shipping Rule
* [fix]Travis Failed
2017-08-02 17:16:46 +05:30
Vishal Dhayagude
f1f1b60a62
[UI Test ] Sales Order with tax and discount ( #10225 )
...
* [new] UI Test for Sales Order
* [fix] Codacy fixed
* Update test_sales_order_with_discount_on_grand_total.js
* Update test_sales_order_with_taxes_and_charges.js
2017-08-02 17:15:47 +05:30
Zarrar
78c6e34106
[ui test] student applicant and various actions that can be taken ( #10221 )
...
* msgprint error fixed
* student applicant, various actions and its dependencies
2017-08-02 11:25:49 +05:30
Nabin Hait
9641d5b1f4
Make payment entry button in expense claim and some minor cleanup
2017-08-01 17:38:48 +05:30
Nabin Hait
edba79e8f0
Update utils.py
2017-08-01 17:38:48 +05:30
Ben Cornwell-Mott
38d4be8325
Update manuals. Fix codacy issues
2017-08-01 17:38:47 +05:30
Ben Cornwell-Mott
118ceda46f
Add Payment Entry for Expenses
2017-08-01 17:35:50 +05:30
Vishal Dhayagude
316477b422
[UI Tests] All sales order test in tests folders ( #10211 )
...
* [new] Sales order with_discount, multi_uom, delivery_date added
* [fix] All sales order test in tests folder
2017-08-01 17:16:21 +05:30
Nabin Hait
564e8b74dc
Minor fixing in setting cumulative tax amount
2017-08-01 16:35:22 +05:30
Nabin Hait
4ada637b17
Update taxes_and_totals.js
2017-08-01 16:20:59 +05:30
Kanchan Chauhan
d0c5b3eb07
[URGENT] this is me
2017-08-01 16:02:01 +05:30
Nabin Hait
9b2b42dfc1
Minor fix in bom_stock_qty patch
2017-08-01 11:10:29 +05:30
Makarand Bauskar
317888211a
merged hotfix branch into staging ( #10191 )
...
* [Fix] Error in sales invoice and POS if customer group not defined in the customer (#10148 )
* Revert "[Fix] Error in sales invoice and POS if customer group not defined in the customer (#10148 )" (#10159 )
This reverts commit 4d2e782e42#10157 )
* bumped to version 8.6.4
* [Fix] Error in sales invoice and POS if customer group not defined in the customer (#10160 )
* Set billing hours to 0 in timesheet #9535 (#10139 )
* `update_billing_hours` to use flt not cint
* if not billable, reset billable hours
* if not billable, reset time rates
* test
* [Fix] Timesheet Company Issue
* Added delivery date in SO parent form. Fixes #10104 (#10155 )
* Added delivery date in SO parent form. Fixes #10104
* UI tests for sales order delivery date
* bumped to version 8.6.5
2017-08-01 11:06:41 +05:30
Nabin Hait
cd95134267
Rounding issue in tax calculation ( #10135 )
...
* Adjust rounding loss of discount in the last item row. Fixes #8952
* Fixed rounding issue in tax calculation. Fixes #8953 , #8952 , #8893 , #6954 , #8910
* Rounding related fixes for purchase cycle
2017-07-31 18:07:45 +05:30
Rushabh Mehta
1fb4abc322
[docs] cleanup
2017-07-31 17:40:17 +05:30
Vishal Dhayagude
95dfe27bf7
[UI Test] Sales Order with multi currency and tax ( #10189 )
...
* [UI Test] Sales Order with multi currency and tax
* [fix]Codacy fixed
* [fix] tests.txt
2017-07-31 17:29:25 +05:30
Rushabh Mehta
4920d73adb
[docs] remove {{docs_base_url}}
2017-07-31 16:41:35 +05:30
Rushabh Mehta
95349fe360
[docs] add headings
2017-07-31 16:21:12 +05:30
Faris Ansari
40d3ad2bb4
Add erpnext-grey.png, add logo in footer ( #10101 )
...
* Add erpnext-grey.png, footer html
* Sent via ERPNext
2017-07-31 16:16:22 +05:30
Makarand Bauskar
98b52a7245
resolved merge conflicts on develop ( #10185 )
...
* resolved merge conflicts on develop
* [minor] removed the validate_activity
2017-07-31 15:09:52 +05:30
mbauskar
8b6f7914b0
resolved merge conflicts
2017-07-31 12:30:53 +05:30
mbauskar
892cd615f8
bumped to version 8.6.5
2017-07-31 12:51:35 +06:00
Nabin Hait
495ef67caa
Added delivery date in SO parent form. Fixes #10104 ( #10155 )
...
* Added delivery date in SO parent form. Fixes #10104
* UI tests for sales order delivery date
2017-07-31 11:25:51 +05:30
Zarrar
35d3190822
[ui test] Setting up school course+program and their dependencies ( #10142 )
...
* setting up course and its dependencies
* rebasing with develop branch
* codacy fix
* added test for Program
* updated test-dada to maintain consistency with future tests
2017-07-31 11:05:52 +05:30
Ameya Shenoy
4e91f28ce5
[ui-testing] added test for production order ( #10138 )
...
* temporary commit for switching branches
* [ui-tests] added bill_of_materials test
* added warehouses required for production order
* [ui-test] added production order test
* debugging travis failure
2017-07-31 11:02:28 +05:30
Rohit Waghchaure
33977827c4
[Fix] Timesheet Company Issue
2017-07-29 14:15:50 +05:30
Nabin Hait
1fcd2b0676
Merge branch 'develop' into set_defualt_mode_payment
2017-07-28 21:09:42 +05:30
tundebabzy
41c954b8b3
Set billing hours to 0 in timesheet #9535 ( #10139 )
...
* `update_billing_hours` to use flt not cint
* if not billable, reset billable hours
* if not billable, reset time rates
* test
2017-07-28 21:05:15 +05:30
Faris Ansari
482331b987
[fix] Default Warehouse not obeying form value ( #10153 )
2017-07-28 20:58:39 +05:30
rohitwaghchaure
e2176b852e
[Fix] Error in sales invoice and POS if customer group not defined in the customer ( #10160 )
2017-07-28 20:52:02 +05:30
Utkarsh Yadav
8990af458b
[ui test] leave application in HR ( #10151 )
...
* added test for leave application
* minor changes and path added
* travis fixes
* minor changes
2017-07-28 19:37:15 +05:30
Vishal Dhayagude
569011fb21
[UI Test] Test for Product Bundle added ( #10158 )
2017-07-28 19:36:50 +05:30
Britlog
4c7709efbd
Portal breadcrumbs ( #10095 )
2017-07-28 18:54:22 +05:30
Rushabh Mehta
11a3d51774
[test] test_sales_order.py
2017-07-28 17:11:11 +05:30
mbauskar
3b27382013
Merge branch 'master' into develop
2017-07-28 16:03:52 +05:30
mbauskar
2b420f7038
bumped to version 8.6.4
2017-07-28 16:33:52 +06:00
rohitwaghchaure
353af64197
[Fix] Unable to save asset because of float error issue ( #10157 )
2017-07-28 15:55:46 +05:30
Rushabh Mehta
be4fd1100d
[fix] test
2017-07-28 15:54:07 +05:30
Makarand Bauskar
8bccaed35a
Revert "[Fix] Error in sales invoice and POS if customer group not defined in the customer ( #10148 )" ( #10159 )
...
This reverts commit 4d2e782e42
2017-07-28 15:43:23 +05:30
Rushabh Mehta
8af33a513b
[fix] test
2017-07-28 15:34:20 +05:30
rohitwaghchaure
4d2e782e42
[Fix] Error in sales invoice and POS if customer group not defined in the customer ( #10148 )
2017-07-28 15:21:22 +05:30
Rushabh Mehta
e16ec0c891
[minor] change docs_base_url
2017-07-28 14:56:59 +05:30
Makarand Bauskar
20f4d7f559
Merge branch 'develop' into set_defualt_mode_payment
2017-07-28 14:41:48 +05:30
Rushabh Mehta
0fcf44e1a2
User Permissions Redesign ( #10006 )
...
* [fixes] for user permission
* [docs] updated docs for user permissions
* [docs] updated docs for user permissions
* [docs] updated docs for user permissions
2017-07-28 14:33:15 +05:30
bcornwellmott
bab0c5a8a5
Add disable check for Activity Type ( #10120 )
...
* Add disable check for Activity Type
* Add check for disabled in Timesheet
* Codacy fixes
* Fixed bugs
* Restore permissions
2017-07-28 14:32:45 +05:30
Rushabh Mehta
bead70b43a
Docs in website ( #10149 )
...
* [docs] move to erpnext.org
* [docs]
* [minor] add title
2017-07-28 11:44:08 +05:30
Utkarsh Yadav
1c8d8a9720
[ui test] leave type,leave control panel and leave allocation in HR ( #10136 )
...
* changes in attendance
* added test for leave type
* added test for leave control panel
* added test for leave allocation
* codacy fixes
2017-07-28 11:40:29 +05:30
Rushabh Mehta
d50da78f28
[fixes] errors caught on flake8 ( #10126 )
2017-07-28 11:39:01 +05:30
Rohit Waghchaure
120b6c0b3c
UI test cases and documentation
2017-07-28 01:52:10 +05:30
Rohit Waghchaure
5296e3c321
[enhance] Provision to set default mode of payment for the POS in POS profile
2017-07-27 19:17:05 +05:30
Saurabh
c07741d36f
Merge branch 'master' into staging
2017-07-27 17:50:28 +05:30
Saurabh
8907f1d2c3
Merge branch 'master' into develop
2017-07-27 17:50:27 +05:30
Saurabh
6f9ef5b890
bumped to version 8.6.3
2017-07-27 18:20:27 +06:00
Zarrar
c54510660e
[ui test] Minor files ( #10133 )
...
* added permissions for Administrator user
* updated files
* minor files for future tests
* added entry for all tests
2017-07-27 17:19:06 +05:30
Makarand Bauskar
145393b12f
[hotfix] set the account name in GL entry instead of warehouse ( #10134 )
2017-07-27 16:46:40 +05:30
Makarand Bauskar
9c6e2c3637
[hotfix] included the get_purchase_trends_filters instead of get_sales_trends_filters in Purchase Receipts trends ( #10127 )
2017-07-27 16:23:57 +05:30
mbauskar
7b764d03c2
Merge branch 'master' into develop
2017-07-27 12:18:15 +05:30
mbauskar
448d919cc1
bumped to version 8.6.2
2017-07-27 12:48:15 +06:00
Vishal Dhayagude
b528411ed1
[ui test]sales and taxes charges template ( #10116 )
2017-07-27 12:15:06 +05:30
Utkarsh Yadav
b8b01928d3
[ui test] employee attendance tool and attendance in HR ( #10112 )
...
* added test for attendance tool
* added test for attendance
* minor changes
* minor changes
* path added in tests.txt
* codacy fixes
2017-07-27 11:49:10 +05:30
tundebabzy
296603a861
auto populate all rows ( #10090 )
2017-07-27 11:47:56 +05:30
tundebabzy
84227a6c54
Employee Loan Should Be Limited To Employee Company ( #10039 ) ( #10093 )
...
* filter employee drop down by company name
* codacy fix
2017-07-27 11:47:03 +05:30
tundebabzy
9281013d51
add transaction date call to get_exchange_rate ( #10109 )
2017-07-27 11:43:32 +05:30
tundebabzy
87ec6a12ef
adds options to currency fields ( #10118 )
2017-07-27 11:38:17 +05:30
rohitwaghchaure
059f99e621
[Fix] Wrong avg. buying rate in the Gross Profit report ( #10110 )
2017-07-27 11:37:30 +05:30
rohitwaghchaure
8579dd1d78
[minor] If customer has removed getting an error ( #10107 )
2017-07-27 11:21:54 +05:30
cclauss
6848708377
old style exception, raise --> new style for Python 3 ( #10082 )
...
* old style raise --> raise() for Python 3
* old style exception --> new style for Python 3
* old style exception --> new style for Python 3
* old style exception --> new style for Python 3
* old style exception --> new style for Python 3
* old style exception --> new style for Python 3
* old style exception --> new style for Python 3
* old style exception --> new style for Python 3
* old style exception --> new style for Python 3
* old style exception --> new style for Python 3
* old style raise --> raise() for Python 3
* old style raise --> raise() for Python 3
* old style exception, raise --> new style for Python 3
2017-07-27 10:38:35 +05:30
Vishal Dhayagude
c67bf5026e
[UI Test] Create tax account in Charts of account ( #10105 )
...
* [new]tax creation added
* [new]path added test.txt
2017-07-27 09:11:08 +05:30
Faris Ansari
fbec103ae7
Remove inline styling, add css classes ( #10077 )
2017-07-26 18:46:13 +05:30
Makarand Bauskar
1d9fd9aa52
[minor][wiz] fix company image alignment ( #10114 ) ( #10117 )
2017-07-26 18:19:41 +05:30
KanchanChauhan
58c9934452
[fix] company graph based on base currency ( #9950 )
2017-07-26 18:17:11 +05:30
Prateeksha Singh
83535811ad
[minor][wiz] fix company image alignment ( #10114 )
2017-07-26 18:11:37 +05:30
KanchanChauhan
7800bd89dc
Added Project Type new doctype to be added as link field for Project Type field in project instead of select field ( #9929 )
2017-07-26 17:55:25 +05:30
Utkarsh Yadav
53b877bd8f
[ui test] Employee in HR ( #10103 )
...
* added test for employee
* names changed
* path added in tests.txt
2017-07-26 16:32:16 +05:30
Utkarsh Goswami
40937083bf
[UI-Test Project] To check a billing cost of a project with multiple tasks ( #10084 )
...
* Updated test for Project Timesheet with multiple tasks
* Updated test for Project Timesheet with multiple tasks
* Updated test for Project Timesheet with multiple tasks
* updated:
* Updated
* Updated
2017-07-26 16:31:08 +05:30
Makarand Bauskar
d0109a6fc0
[minor] enable all roles and domain before running tests cases ( #10108 )
...
* [minor] enable all roles and domain before running tests cases
* Update utils.py
2017-07-26 16:29:22 +05:30
Utkarsh Yadav
b8a4a584e6
[ui test] test for department, designation, company and leave block list ( #10085 )
...
* added test for required items
* minor fixes for travis
* name changed
* added test for employment type
* travis fixes
2017-07-26 13:14:34 +05:30
Prateeksha Singh
cda6206c1f
[minor][wiz] remove header brand image ( #10016 )
2017-07-26 13:05:48 +05:30
Saurabh
7bdc45eceb
Merge branch 'master' into develop
2017-07-25 18:02:58 +05:30
Saurabh
394dbca0e4
bumped to version 8.6.1
2017-07-25 18:32:58 +06:00
Saurabh
4c1caa7e98
[hot][fix] updated modified date for sales order
2017-07-25 17:35:14 +05:30
Saurabh
dc6e369172
Merge branch 'master' into develop
2017-07-25 16:42:28 +05:30
Saurabh
bb5812cf0f
bumped to version 8.6.0
2017-07-25 17:12:26 +06:00
Saurabh
36645e4e2f
Merge branch 'master' into staging
2017-07-25 16:15:51 +05:30
Saurabh
fb4f320df4
Merge branch 'master' into develop
2017-07-25 16:15:50 +05:30
Saurabh
e7c14fcc3d
bumped to version 8.5.5
2017-07-25 16:45:49 +06:00
Rohit Waghchaure
d62fa84ed9
[Fix] Calendar view for sales order
2017-07-25 15:34:20 +05:30
Rohit Waghchaure
baa937aa52
[Fix] Negative amount showing in the grand total for multicurrency if discount has applied
2017-07-25 15:26:01 +05:30
Ameya Shenoy
08450878f1
[ui-test] added test for bill_of_materials ( #10063 )
...
* temporary commit for switching branches
* [ui-tests] added bill_of_materials test
* fixed minor codacy problems
* added minor requested changes
2017-07-25 15:23:58 +05:30
Ashwini Save
2ffe878999
Timeline Title for small resolution Add to knowledge base button. ( #9926 )
...
* Add to Knowledge Base button class updated to hide for mobile view.
* Updated code to avoid multiple occurance of Knowledge Base button while updating comment.
2017-07-25 14:16:48 +05:30
rohitwaghchaure
49a6b4a4fa
[Fix] RFQ list showing to all supplier in the portal ( #10023 )
2017-07-25 14:12:58 +05:30
bcornwellmott
05e51d6c83
Add Get Suppliers dialog ( #10025 )
...
* Add Get Suppliers dialog
* Commonize code, use depends_on
* Update request_for_quotation.js
2017-07-25 14:10:23 +05:30
rohitwaghchaure
4cccdbdbf9
[Fix] Validating price list currency even if price list is not defined ( #10056 )
2017-07-25 14:05:01 +05:30
KanchanChauhan
4b888b95d0
[Minor] Added filter condition to Customer Query ( #10057 )
2017-07-25 14:03:01 +05:30
Zarrar
b5ec8381a6
[UI Tests] School Academic Term test ( #10050 )
2017-07-25 11:46:34 +05:30
Frappe PR Bot
3b128cabb2
[Translation] Updated Translations ( #10047 )
2017-07-25 11:46:16 +05:30
Zarrar
1c6828e5d6
[UI Tests] School Academic Year test ( #10049 )
2017-07-25 11:45:39 +05:30
KanchanChauhan
d65b4b4238
Patch was faling, reload doc was missing ( #10072 )
2017-07-25 11:39:46 +05:30
ci2014
13abada526
Update email-account.md ( #10066 )
...
* Update email-account.md
Add information to conditional import
* Add files via upload
2017-07-25 11:06:03 +05:30
tundebabzy
de54f3019f
use api to get default cost center for chosen company ( #10067 )
2017-07-25 11:05:07 +05:30
bcornwellmott
d023d9a0bd
Add RFQ email sent check ( #10068 )
...
* Add RFQ email sent check
* remove blankspace
* Removed debugger
2017-07-25 11:03:12 +05:30
Vishal Dhayagude
edb2749dfd
Timesheet web ( #10037 )
...
* [new]Timesheet added
* [new] Customer wise timesheet on webportal added
2017-07-25 10:53:12 +05:30
Makarand Bauskar
fcaf313c0f
[minor] make-demo fixes for manufacturing domain ( #10029 )
2017-07-25 10:49:35 +05:30
Makarand Bauskar
dfc5a454b3
[minor] fixed the delivery date issue in Ordered Item to be Dellivered report ( #10028 )
2017-07-25 10:48:43 +05:30
bcornwellmott
1c32f5ace9
Whitelist method for adding production orders ops ( #9997 )
2017-07-24 22:43:44 +05:30
bcornwellmott
96381da547
Supplier Scorecard ( #9294 )
...
* Initial start of scorecard docs
* Got basic functionality working
* Fixed doc names and added key functions
* Basic functional version minus Actions
* Hide scorecard docs until functional
* Created supplier scorecard documentation
* Added default variables and standings. Added restrictions for PO + RFQ
* Automatic daily scorecard creation + on save
* Added warning for PO nd RFQs
* Minor fixes for codepy, automatically add variables for criteria, fix hooks.py typo
* Added tests, fixed codacy formatting, small improvements
* Fixed test bug w/ criteria. Codacy cleanup
* Fixed codacy issues. Fixed sticky criteria
* Fixed bug with period search. Remove blank variable child.
* Updated docs, automatically add criteria and standings, clean up period create message
* Uncommented test, set docs to beta
* Fix for nabinhait review
* Fix codacy issue. Fix dict assignment for records
2017-07-24 22:42:30 +05:30
Ameya Shenoy
91b2833708
[ui-tests] added workstation and operation ( #10044 )
...
* [ui-test] workstation and operation testing added
* [ui-tests] removed unnecessary assertions and used logical names for operations and workstations
2017-07-24 14:34:30 +05:30
Utkarsh Yadav
20a862a6b9
[ui test] holiday list and branch in HR ( #10045 )
...
* added test for holiday list
* codacy fixes
* added check for all days in list
* added test for branch
* codacy fixe
* minor fixes
2017-07-24 14:33:42 +05:30
tundebabzy
65656ec2df
hide salution and gender if company type is Company ( #10040 )
2017-07-24 11:32:26 +05:30
Makarand Bauskar
9306aff1bb
[minor] moved the patch to v8_5 and other minor fixes ( #10012 )
...
* Quotation and Supplier Quotation Route and Permission Edits
* [minor] moved the patch to v8_5 and other minor fixes
2017-07-21 15:19:47 +05:30
Ameya Shenoy
73f969fd7f
[ui-test] manufacturing item creation testing ( #10009 )
2017-07-21 14:22:08 +05:30
Prateeksha Singh
283d5550e6
[fix] set sales base field as base_grand_total ( #10008 )
2017-07-21 14:21:35 +05:30
Rushabh Mehta
dda608dd00
[fix] update_company_current_month_sales in company.py ( #10005 )
2017-07-21 11:58:14 +05:30
Faris Ansari
e355f99786
Remove ellipsis in title and description ( #9992 )
2017-07-20 17:51:19 +05:30
mbauskar
6c8d4678db
Merge branch 'master' into develop
2017-07-20 16:49:30 +05:30
mbauskar
ea50c9d1be
bumped to version 8.5.4
2017-07-20 17:19:30 +06:00
Rushabh Mehta
35da7d1fb4
[minor] we buy is also checked by default
2017-07-20 15:58:20 +05:30
Rushabh Mehta
ced14cc789
[fix] setup-wizard
2017-07-20 15:55:54 +05:30
Rushabh Mehta
9d27cf3c62
[tests] refactored ( #9984 )
...
* [tests] refactored
* [fix] test_quotation.js
* [fix] tests.text
* [fix] fiscal year not needed
* [test] add long test
* [fix] add timeout in lead
2017-07-20 15:35:03 +05:30
mbauskar
0e6933a1e8
resolved merge conflicts
2017-07-20 14:19:47 +05:30
mbauskar
a919be111a
bumped to version 8.5.3
2017-07-20 14:46:57 +06:00
Nabin Hait
9c42161061
Itemised tax breakup fix in docs other than invoice ( #9961 )
...
* Itemised tax breakup fix in docs other than invoice
* Set itemised tax breakup and hsn code in existing docs
2017-07-20 13:32:01 +05:30
rohitwaghchaure
79d6266c7b
[Fix] Unable to create production order from the sales order for the bundle items ( #9976 )
2017-07-20 10:35:51 +05:30
tundebabzy
11d23f84d7
Can't set Start and End Dates in Salary Slip ( #9513 ) ( #9944 )
...
* remove trigger from end_date
* adds new function `get_end_date`:
- it tries to calculate the appropriate end date for a given frequency
- returns an empty string if frequency is 'biweekly'
- adds test cases
* changes logic in `set_start_end_dates`:
- if start_date is empty in form, call process_payroll.get_start_end_dates
- else, call process_payroll.get_end_date
* `get_end_date` should return a dict
* changed "biweekly" to "bimonthly"
* change the behaviour of process payroll start and end date:
- when payroll frequency is changed, change start/end date as usual
- if start date is manually changed, use the frequency to calculate the end date
* clean up
* further cleanup
* in `get_end_date`, if `frequency` isn"t given, "monthly"
* remove end_date from cscript and introduce `set_end_date`
* fix tests
* removed whitespaces
2017-07-20 10:33:03 +05:30
Nabin Hait
8e0f23efc7
Multiple delivery dates in Sales Order and make DN based on selected delivery dates ( #9933 )
...
* Multiple delivery dates in Sales Order and make DN based on selected delivery dates
* Test case and some other minor fixes
* Updated docs for multi delivery date
* removed the trailing whitespace
* removed the trailing whitespace
* removed trailing whitespace
2017-07-20 10:30:59 +05:30
Makarand Bauskar
ac9b1332d2
[minor] set no copy to sales goal fields ( #9956 )
2017-07-19 18:55:12 +05:30
