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 |
|
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
|
9d6900bd3b
|
Merge branch 'hotfix'
|
2017-08-21 08:57:32 +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 |
|
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 |
|
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 |
|
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 |
|