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
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
