Ameya Shenoy
|
ecba14e6cf
|
Merge branch 'master' into staging-fixes
|
2018-10-08 09:39:49 +00:00 |
|
Ameya Shenoy
|
ee3b788024
|
Merge branch 'hotfix'
|
2018-10-08 09:37:37 +00:00 |
|
Ameya Shenoy
|
b509b06edf
|
bumped to version 10.1.57
|
2018-10-08 09:37:37 +00:00 |
|
Zarrar
|
87441bf62e
|
columns without fieldname's data not shown (#15618)
|
2018-10-08 14:34:34 +05:30 |
|
Zarrar
|
5fcccda883
|
[Minor] Supplier Quotation (#15578)
* throw meaningful error if RFQ does not have selected supplier
* Update supplier_quotation.py
* codacy fix
|
2018-10-08 14:30:53 +05:30 |
|
Shreya Shah
|
4fb9230d16
|
Add missing method link_to_mrs to buying.js (#15613)
|
2018-10-08 14:18:03 +05:30 |
|
Shreya Shah
|
95d93913ce
|
fix(link_to_mr): Add missing method to buying.js (#15616)
|
2018-10-08 14:17:37 +05:30 |
|
Shreya Shah
|
37d3686372
|
fix(setup_taxes): Pop if frappe.message_log (#15615)
|
2018-10-08 14:17:16 +05:30 |
|
Ameya Shenoy
|
8cafb5fbbb
|
Merge branch 'staging-fixes' into staging
|
2018-10-08 07:27:35 +00:00 |
|
Ameya Shenoy
|
0bd254b02b
|
bumped to version 11.0.3-beta.8
|
2018-10-08 07:27:35 +00:00 |
|
rohitwaghchaure
|
5e466bace4
|
Removed update_job_card_reference method (#15614)
|
2018-10-08 12:36:45 +05:30 |
|
Shreya Shah
|
c2857fd2cc
|
fix(setup_taxes): Pop if frappe.message_log (#15611)
|
2018-10-08 12:35:18 +05:30 |
|
Jamsheer
|
063cf9c582
|
Jam staging fixes (#15608)
* Test Inpatient Record - Fix
* Test Inpatient Record - Fix
|
2018-10-08 10:48:42 +05:30 |
|
Ameya Shenoy
|
36be62b927
|
Merge branch 'staging-fixes' into staging
|
2018-10-07 07:59:34 +00:00 |
|
Ameya Shenoy
|
cfdd629fd7
|
bumped to version 11.0.3-beta.7
|
2018-10-07 07:59:34 +00:00 |
|
Ameya Shenoy
|
272956980d
|
Merge pull request #15606 from codingCoffee/abc
fix: make location from warehouse patch
|
2018-10-07 13:25:05 +05:30 |
|
Ameya Shenoy
|
f7b5b7beb4
|
fix: make location from warehouse patch
- optimization by preventing patch execution if Asset doesn't exist
|
2018-10-07 13:08:00 +05:30 |
|
Ameya Shenoy
|
39903647ae
|
Merge branch 'staging-fixes' into staging
|
2018-10-07 06:23:22 +00:00 |
|
Ameya Shenoy
|
cd9be8f0a6
|
bumped to version 11.0.3-beta.6
|
2018-10-07 06:23:22 +00:00 |
|
Shreya Shah
|
5615cb4735
|
Set default only if customer_address not found (#15605)
* Set default only if customer_address not found
* Similar fix for Purchase Invoice and shipping_address
|
2018-10-07 11:42:07 +05:30 |
|
Shreya Shah
|
e7e269d4a4
|
[Error] Display appropriate msg if company is different for TDS (#15601)
* fix(tds): Display appropriate msg if company is different
* Update tax_withholding_category.py
|
2018-10-06 17:56:21 +05:30 |
|
Ameya Shenoy
|
b8c1897a80
|
Merge pull request #15603 from Zlash65/rectify
[Minor] Deferred Expense
|
2018-10-06 16:43:22 +05:30 |
|
Zlash65
|
58a080a1b1
|
add voucher detail no while creating gl entry
|
2018-10-06 16:34:58 +05:30 |
|
Ameya Shenoy
|
29fe8ce114
|
Merge branch 'staging-fixes' into staging
|
2018-10-05 09:09:53 +00:00 |
|
Ameya Shenoy
|
538678afc4
|
bumped to version 11.0.3-beta.5
|
2018-10-05 09:09:53 +00:00 |
|
Ameya Shenoy
|
ad908779be
|
Merge branch 'master' into staging-fixes
|
2018-10-05 08:54:58 +00:00 |
|
Ameya Shenoy
|
5eafa5a487
|
Merge branch 'hotfix'
|
2018-10-05 08:54:46 +00:00 |
|
Ameya Shenoy
|
97dbb4d125
|
bumped to version 10.1.56
|
2018-10-05 08:54:46 +00:00 |
|
Shreya Shah
|
5cff01634e
|
Merge pull request #15593 from Zlash65/fix-mod
[Minor] Item master - get_query for deferred accounts
|
2018-10-05 14:14:46 +05:30 |
|
Shreya Shah
|
32206029ac
|
Fix Codacy
|
2018-10-05 14:14:33 +05:30 |
|
Shreya Shah
|
deb9f0e03c
|
Merge pull request #15594 from shreyashah115/tds-report
Handle IndexError if no data found
|
2018-10-05 14:11:43 +05:30 |
|
Shreya Shah
|
db5ffce742
|
Merge pull request #15592 from shreyashah115/jv
Allow Reverse JV for all submitted docs
|
2018-10-05 13:33:11 +05:30 |
|
Shreya
|
0d7bd43367
|
Handle IndexError if no data found
|
2018-10-05 13:22:09 +05:30 |
|
Zlash65
|
2123b97d31
|
add get_query for revenue and expense account
|
2018-10-05 12:26:32 +05:30 |
|
Shreya
|
4f5214a136
|
Allow reverse jv for all submitted docs
|
2018-10-05 12:19:09 +05:30 |
|
Saif
|
00a16a9337
|
set_item_default was referencing a variable company of "company" (#15576)
|
2018-10-05 11:54:03 +05:30 |
|
Shreya Shah
|
17ac38ff29
|
Enable save before saving to update form after save (#15579)
|
2018-10-05 11:51:13 +05:30 |
|
Jamsheer
|
be6e426fe0
|
Healthcare Service Unit - added company abbr as suffix (#15590)
|
2018-10-05 11:38:15 +05:30 |
|
Ranjith Kurungadam
|
dc2bab2b72
|
fix healthcare patch (#15584)
|
2018-10-05 11:36:58 +05:30 |
|
Valmik
|
4c61861163
|
Add Delivery Trip to Delivery Note dashboard (#15587)
|
2018-10-05 11:36:31 +05:30 |
|
Saif
|
4faea037bb
|
Remove Test Letter Head from GSTR-1 (#15591)
|
2018-10-05 11:35:01 +05:30 |
|
Ameya Shenoy
|
c4ebbd1322
|
Merge branch 'staging-fixes' into staging
|
2018-10-04 13:14:29 +00:00 |
|
Ameya Shenoy
|
2291558c5f
|
bumped to version 11.0.3-beta.4
|
2018-10-04 13:14:29 +00:00 |
|
rohitwaghchaure
|
d69dc954c7
|
Merge pull request #15580 from sagarvora/fix-TabError
fix TabError in install_fixtures.py
|
2018-10-04 17:22:44 +05:30 |
|
Ameya Shenoy
|
c6eac7c60b
|
Merge branch 'staging-fixes' into staging
|
2018-10-04 11:42:56 +00:00 |
|
Ameya Shenoy
|
5ae344593e
|
bumped to version 11.0.3-beta.3
|
2018-10-04 11:42:56 +00:00 |
|
Ameya Shenoy
|
6dc4cdca3a
|
Merge pull request #15585 from rohitwaghchaure/fix_asset_depreciation_ledger_report
Fix issue after merging hotfix into staging-fixes
|
2018-10-04 16:47:43 +05:30 |
|
Rohit Waghchaure
|
18678696db
|
Fix issue after merging hotfix into staging-fixes
|
2018-10-04 16:33:43 +05:30 |
|
Ameya Shenoy
|
7d929c508f
|
Merge branch 'master' into staging-fixes
|
2018-10-04 09:25:07 +00:00 |
|
Ameya Shenoy
|
65652071ff
|
Merge branch 'hotfix'
|
2018-10-04 09:11:50 +00:00 |
|