mbauskar
|
6b0b7912c4
|
Merge branch 'master' into develop
|
2017-08-08 12:54:12 +05:30 |
|
mbauskar
|
35167be0d9
|
Merge branch 'hotfix'
|
2017-08-08 12:54:11 +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
|
e770824568
|
Merge branch 'master' into develop
|
2017-08-04 14:08:57 +05:30 |
|
mbauskar
|
320fb13b37
|
Merge branch 'hotfix'
|
2017-08-04 14:08:56 +05:30 |
|
mbauskar
|
4796e8e317
|
bumped to version 8.7.2
|
2017-08-04 14:38:56 +06:00 |
|
rohitwaghchaure
|
87b6498e02
|
Merge pull request #10287 from rohitwaghchaure/fixed_test_case
Fixed test cases for dynamic link order
|
2017-08-04 14:00:41 +05:30 |
|
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
|
f3be738b68
|
resolved merge conflicts
|
2017-08-04 11:07:07 +05:30 |
|
mbauskar
|
139db5ffe7
|
Merge branch 'hotfix'
|
2017-08-04 11:05:01 +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 |
|
mbauskar
|
329aae2458
|
Merge branch 'develop' into staging
|
2017-08-03 16:17:24 +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
|
f7c1c2c812
|
Merge pull request #10260 from KanchanChauhan/field-name-change
[Minor] Changed country field name from "data_6" to "country"
|
2017-08-03 10:21:42 +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 |
|