Nabin Hait
7b684a01d3
fix: merge conflict
2019-07-04 12:06:50 +05:30
Mangesh-Khairnar
359a73e1aa
fix: invoice cancellation ( #18152 )
2019-07-04 11:37:20 +05:30
rohitwaghchaure
ca9d13cc9b
Merge pull request #18135 from rohitwaghchaure/all_default_values_not_moved_to_item_default_table_develop
...
fix: as limit 100 was set in the query therefore not all item's default value moved to the Item Default table
2019-07-04 00:48:57 +05:30
Deepesh Garg
a37c51f93e
Merge pull request #18149 from deepeshgarg007/trial_balance_dimensions
...
fix: Add filters for accounting dimensions in trial balance report
2019-07-03 22:00:25 +05:30
rohitwaghchaure
465196b0c7
Merge pull request #18155 from scmmishra/accounts-rec-report
...
fix: format values for charts
2019-07-03 19:26:08 +05:30
Shivam Mishra
bb02c5105e
fix: format values for charts
2019-07-03 19:22:21 +05:30
deepeshgarg007
58b4644c1a
fix: Add filtesr for accounting dimensions in trial balance report
2019-07-03 18:08:41 +05:30
Deepesh Garg
e5f8d24ead
Merge pull request #18034 from rohitwaghchaure/payment_reconciliation_enhancements_for_dr_or_cr_and_gain_or_loss
...
feat: payment reconciliation enhancements
2019-07-03 17:46:00 +05:30
Shivam Mishra
7dedd9a8cd
refactor: better error message when changing variant value ( #18144 )
2019-07-03 17:29:29 +05:30
Deepesh Garg
af4f7b4ea1
Merge branch 'develop' into payment_reconciliation_enhancements_for_dr_or_cr_and_gain_or_loss
2019-07-03 16:31:48 +05:30
Deepesh Garg
55fbddbee6
Add missing semicolon
2019-07-03 16:31:06 +05:30
Anurag Mishra
841d852f41
refactor: added missing translation functions ( #18143 )
...
* fix: Translating Error and Messages
* Update erpnext/controllers/item_variant.py
Co-Authored-By: Shivam Mishra <scmmishra@users.noreply.github.com>
* Update erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
Co-Authored-By: Shivam Mishra <scmmishra@users.noreply.github.com>
2019-07-03 15:15:08 +05:30
Deepesh Garg
824ad34270
Merge branch 'develop' into payment_reconciliation_enhancements_for_dr_or_cr_and_gain_or_loss
2019-07-03 13:28:49 +05:30
Deepesh Garg
8929c62113
Merge pull request #18145 from deepeshgarg007/gstr-itc-rev
...
fix: Multiple fixes in GSTR-3b Report
2019-07-03 13:11:14 +05:30
Deepesh Garg
0891728705
Merge pull request #18142 from frappe/surajshetty3416-patch-1
...
refactor: Remove an unwanted debug flag
2019-07-03 12:18:30 +05:30
rohitwaghchaure
f078031c60
fix: multiple minor issues in delayed order report ( #18134 )
2019-07-03 11:43:38 +05:30
Deepesh Garg
1a6bfe986e
Merge pull request #18113 from deepeshgarg007/gstr1-total
...
fix: Add total row in GSTR-1 report
2019-07-03 11:12:43 +05:30
Suraj Shetty
247d50e552
refactor: Remove unwanted debug flag
2019-07-03 10:47:35 +05:30
Nabin Hait
34c551d9a5
fix: Missing commits from hotfix branch ( #17997 )
...
* fix: merge conflict
* fix: restored missing set_gst_state_and_state_number function
* fix: style linting as per codacy
* fix: Fixes related to customer/lead merging
* fix: merge conflict
* fix: Fixes related to customer/lead merging
* fix: Assign isue/opportunity to user
* fix: Assign isue/opportunity to user
* fix: Replaced Invoice type by GST Category
* fix: merge conflict
* fix: merge conflict
* fix: test cases
* fix: test cases
2019-07-03 10:34:31 +05:30
Mangesh-Khairnar
7763d0a059
Merge pull request #18139 from deepeshgarg007/travix-fix-erpnext
...
fix: Travis
2019-07-02 23:54:27 +05:30
deepeshgarg007
723e76f2ac
fix: fix for test test_contact_search_in_foreign_language
2019-07-02 21:01:57 +05:30
Deepesh Garg
f866020f26
Merge branch 'develop' into gstr1-total
2019-07-02 19:59:53 +05:30
deepeshgarg007
3a83c7bd7d
fix: Multiple fixes in GSTR-3b Report
2019-07-02 19:56:33 +05:30
Nabin Hait
05fee62314
fix: inv status
2019-07-02 17:55:26 +05:30
Nabin Hait
3bbcd491e4
fix: set invoice status considering invoice discounting
2019-07-02 15:31:24 +05:30
Nabin Hait
126a02e208
fix: set invoice status considering invoice discounting
2019-07-02 15:28:57 +05:30
Rohit Waghchaure
09b44345df
fix: as limit 100 was set in the query therefore not all item's default value moved to the Item Default table
2019-07-02 15:18:02 +05:30
Frappe PR Bot
f773c8e8a3
feat: Updated translation ( #18125 )
2019-07-02 10:14:53 +05:30
Mangesh-Khairnar
98409159c8
Merge pull request #18120 from Mangesh-Khairnar/fix-leaderboard
...
fix: leaderboard charts
2019-07-02 10:13:15 +05:30
Deepesh Garg
78a86af7fd
fix: Fiter passing fix in get batch query ( #18131 )
2019-07-02 10:10:55 +05:30
rohitwaghchaure
f949c5ddf7
Merge pull request #18104 from rohitwaghchaure/incorrect_value_of_accumualated_depreciation_in_the_sales_invoice_develop
...
fix: incorrect value booked in the accumulated depreciation account on sell of the asset
2019-07-02 01:23:56 +05:30
Rohit Waghchaure
8847ecfe25
fix: incorrect value booked in the accumulated depreciation account on sell of the asset
2019-07-01 20:47:35 +05:30
Aditya Hase
8d70073cf8
refactor: Remove implicit auto assignment feature ( #18124 )
...
This behaviour now can be replicated with Assignment Rule configurations.
2019-07-01 19:35:17 +05:30
Mangesh-Khairnar
fc3731f15e
Merge pull request #18107 from Mangesh-Khairnar/mapped_doc_fix
...
fix: clear duplicates in mapped doc
2019-07-01 17:04:12 +05:30
Faris Ansari
8d2c996b50
feat: Call Popup and Exotel Integration ( #17763 )
...
feat: Call Popup and Exotel Integration
2019-07-01 16:36:32 +05:30
Shivam Mishra
43cebdff4d
fix: translated title ( #18119 )
2019-07-01 11:01:28 +00:00
Nabin Hait
659a01d819
Update accounts_controller.py
2019-07-01 15:16:49 +05:30
Deepesh Garg
71359cc18b
Merge branch 'develop' into gstr1-total
2019-07-01 14:49:59 +05:30
Suraj Shetty
8e65d5bd5b
chore: Delete unwanted files
2019-07-01 14:32:29 +05:30
Suraj Shetty
b2e321686d
Merge branch 'develop' into call-summary-dialog
2019-07-01 14:29:49 +05:30
Suraj Shetty
56242a5077
Merge branch 'call-summary-dialog' of github.com:surajshetty3416/erpnext into call-summary-dialog
2019-07-01 14:29:05 +05:30
Suraj Shetty
502565ff56
fix: Make required changes
2019-07-01 14:28:59 +05:30
Mangesh-Khairnar
4aed7cc310
Merge branch 'develop' into mapped_doc_fix
2019-07-01 13:40:52 +05:30
rohitwaghchaure
c77bd82083
Merge pull request #18118 from rohitwaghchaure/asset_staus_not_showing_in_the_listview
...
fix: asset status not showing in the list view
2019-07-01 13:32:39 +05:30
Deepesh Garg
0cdf55033a
Merge branch 'develop' into gstr1-total
2019-07-01 12:36:35 +05:30
Rohit Waghchaure
7729fcea19
fix: asset status not shwoing in the list view
2019-07-01 12:26:34 +05:30
Mangesh-Khairnar
9955b189e4
fix: leaderboard chart
2019-07-01 12:20:09 +05:30
rohitwaghchaure
9c1dbc5e39
Merge pull request #18117 from rohitwaghchaure/accounts_receivable_not_working_if_company_not_selected
...
fix: accounts receivable / payable not working if the company is not seletced in filter
2019-07-01 12:05:14 +05:30
Rohit Waghchaure
2fa6224f8f
fix: accounts receivable / payable not working if the company is not seletced in filter
2019-07-01 11:55:12 +05:30
Suraj Shetty
edee06fc90
Merge branch 'develop' into call-summary-dialog
2019-07-01 11:05:59 +05:30
