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
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
Nabin Hait
3a512af0e2
Merge pull request #10202 from nabinhait/hotfix
...
Minor fix in bom_stock_qty patch
2017-08-01 16:05:44 +05:30
Nabin Hait
1012bcdde5
Merge pull request #10210 from KanchanChauhan/this-is-me
...
[URGENT] "this" is "me"
2017-08-01 16:03:54 +05:30
Kanchan Chauhan
d0c5b3eb07
[URGENT] this is me
2017-08-01 16:02:01 +05:30
Nabin Hait
9b2b42dfc1
Minor fix in bom_stock_qty patch
2017-08-01 11:10:29 +05:30
Makarand Bauskar
317888211a
merged hotfix branch into staging ( #10191 )
...
* [Fix] Error in sales invoice and POS if customer group not defined in the customer (#10148 )
* Revert "[Fix] Error in sales invoice and POS if customer group not defined in the customer (#10148 )" (#10159 )
This reverts commit 4d2e782e42e9875429b5c55934c41dbc5d1d7b20.
* [Fix] Unable to save asset because of float error issue (#10157 )
* bumped to version 8.6.4
* [Fix] Error in sales invoice and POS if customer group not defined in the customer (#10160 )
* Set billing hours to 0 in timesheet #9535 (#10139 )
* `update_billing_hours` to use flt not cint
* if not billable, reset billable hours
* if not billable, reset time rates
* test
* [Fix] Timesheet Company Issue
* Added delivery date in SO parent form. Fixes #10104 (#10155 )
* Added delivery date in SO parent form. Fixes #10104
* UI tests for sales order delivery date
* bumped to version 8.6.5
2017-08-01 11:06:41 +05:30
Nabin Hait
cd95134267
Rounding issue in tax calculation ( #10135 )
...
* Adjust rounding loss of discount in the last item row. Fixes #8952
* Fixed rounding issue in tax calculation. Fixes #8953 , #8952 , #8893 , #6954 , #8910
* Rounding related fixes for purchase cycle
2017-07-31 18:07:45 +05:30
Rushabh Mehta
1fb4abc322
[docs] cleanup
2017-07-31 17:40:17 +05:30
Vishal Dhayagude
95dfe27bf7
[UI Test] Sales Order with multi currency and tax ( #10189 )
...
* [UI Test] Sales Order with multi currency and tax
* [fix]Codacy fixed
* [fix] tests.txt
2017-07-31 17:29:25 +05:30
Rushabh Mehta
4920d73adb
[docs] remove {{docs_base_url}}
2017-07-31 16:41:35 +05:30
Rushabh Mehta
95349fe360
[docs] add headings
2017-07-31 16:21:12 +05:30
Faris Ansari
40d3ad2bb4
Add erpnext-grey.png, add logo in footer ( #10101 )
...
* Add erpnext-grey.png, footer html
* Sent via ERPNext
2017-07-31 16:16:22 +05:30
Makarand Bauskar
98b52a7245
resolved merge conflicts on develop ( #10185 )
...
* resolved merge conflicts on develop
* [minor] removed the validate_activity
2017-07-31 15:09:52 +05:30
mbauskar
8b6f7914b0
resolved merge conflicts
2017-07-31 12:30:53 +05:30
mbauskar
4d185f3541
Merge branch 'hotfix'
2017-07-31 12:21:35 +05:30
mbauskar
892cd615f8
bumped to version 8.6.5
2017-07-31 12:51:35 +06:00
Nabin Hait
495ef67caa
Added delivery date in SO parent form. Fixes #10104 ( #10155 )
...
* Added delivery date in SO parent form. Fixes #10104
* UI tests for sales order delivery date
2017-07-31 11:25:51 +05:30
Zarrar
35d3190822
[ui test] Setting up school course+program and their dependencies ( #10142 )
...
* setting up course and its dependencies
* rebasing with develop branch
* codacy fix
* added test for Program
* updated test-dada to maintain consistency with future tests
2017-07-31 11:05:52 +05:30
Ameya Shenoy
4e91f28ce5
[ui-testing] added test for production order ( #10138 )
...
* temporary commit for switching branches
* [ui-tests] added bill_of_materials test
* added warehouses required for production order
* [ui-test] added production order test
* debugging travis failure
2017-07-31 11:02:28 +05:30
Nabin Hait
3beb1ba667
Merge pull request #10165 from rohitwaghchaure/production_order_company_issue
...
[Fix] Timesheet Company Issue
2017-07-29 18:20:12 +05:30
Rohit Waghchaure
33977827c4
[Fix] Timesheet Company Issue
2017-07-29 14:15:50 +05:30
Nabin Hait
e09b507b6c
Merge pull request #10062 from rohitwaghchaure/set_defualt_mode_payment
...
[enhance] Provision to set default mode of payment for the POS in POS profile
2017-07-28 21:10:05 +05:30
Nabin Hait
1fcd2b0676
Merge branch 'develop' into set_defualt_mode_payment
2017-07-28 21:09:42 +05:30
tundebabzy
41c954b8b3
Set billing hours to 0 in timesheet #9535 ( #10139 )
...
* `update_billing_hours` to use flt not cint
* if not billable, reset billable hours
* if not billable, reset time rates
* test
2017-07-28 21:05:15 +05:30
Faris Ansari
482331b987
[fix] Default Warehouse not obeying form value ( #10153 )
2017-07-28 20:58:39 +05:30
rohitwaghchaure
e2176b852e
[Fix] Error in sales invoice and POS if customer group not defined in the customer ( #10160 )
2017-07-28 20:52:02 +05:30
Utkarsh Yadav
8990af458b
[ui test] leave application in HR ( #10151 )
...
* added test for leave application
* minor changes and path added
* travis fixes
* minor changes
2017-07-28 19:37:15 +05:30
Vishal Dhayagude
569011fb21
[UI Test] Test for Product Bundle added ( #10158 )
2017-07-28 19:36:50 +05:30
Britlog
4c7709efbd
Portal breadcrumbs ( #10095 )
2017-07-28 18:54:22 +05:30
Rushabh Mehta
11a3d51774
[test] test_sales_order.py
2017-07-28 17:11:11 +05:30
