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
Nabin Hait
0650d8e155
Merge branch 'bcornwellmott-no_quote' into develop
2017-08-17 12:03:01 +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
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
7b7a77a551
Merge branch 'hotfix'
2017-08-14 12:33:55 +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
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
41d77e8d86
Merge branch 'hotfix'
2017-08-14 09:31:00 +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