mbauskar
|
5088ad11ee
|
Merge branch 'master' into staging
|
2017-08-21 08:58:52 +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 |
|
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 |
|
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 |
|
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
|
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 |
|
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 |
|
mbauskar
|
40377e87de
|
Merge branch 'master' into staging
|
2017-08-14 12:33:56 +05:30 |
|
mbauskar
|
7b7a77a551
|
Merge branch 'hotfix'
|
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 |
|
mbauskar
|
f03afe0878
|
Merge branch 'master' into staging
|
2017-08-14 09:31:01 +05:30 |
|
mbauskar
|
41d77e8d86
|
Merge branch 'hotfix'
|
2017-08-14 09:31:00 +05:30 |
|
mbauskar
|
b2f160eef0
|
bumped to version 8.8.2
|
2017-08-14 10:01:00 +06:00 |
|
tundebabzy
|
041b9c3c32
|
make item name read only and add hide if not saved (#10382)
|
2017-08-14 09:16:07 +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 |
|
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 |
|
mbauskar
|
08c3f4758e
|
Merge branch 'develop' into staging
|
2017-08-10 10:58:17 +05:30 |
|
mbauskar
|
5039d6de6f
|
Merge branch 'develop' into staging
|
2017-08-10 10:56:33 +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
|
353956a864
|
Merge branch 'hotfix'
|
2017-08-09 11:17:55 +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
|
39ec7dc658
|
Merge branch 'staging'
|
2017-08-08 16:07:56 +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 |
|