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 |
|
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
|
99350db5e1
|
Merge branch 'staging'
|
2017-08-02 18:35:51 +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
|
22a5e79b9a
|
Merge branch 'hotfix'
|
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 |
|