Nabin Hait
868766ddf0
refactor: Refactored over delivery/receipt/billing fields ( #17788 )
...
* refact: Refactored over delivery/receipt/billing fields
* fix: test case
2019-07-15 18:02:58 +05:30
rohitwaghchaure
3643d67249
Merge pull request #18023 from fproldan/fix_by_voucher_order_develop
...
fix: General Ledger Group by Voucher not ordering by posting_date for develop
2019-07-14 17:23:54 +05:30
rohitwaghchaure
f414c8945f
Merge pull request #18295 from rohitwaghchaure/fixed_dr_cr_issue_account_tree
...
fix: Dr / Cr label for balance of the ledgers in the account tree
2019-07-14 17:00:58 +05:30
Rohit Waghchaure
8412f847d4
fix: dr / cr label for balance of the ledgers in the account tree
2019-07-12 15:44:58 +05:30
Deepesh Garg
ed9ac14f70
fix: Usability fixes for chart of Accounts Importer ( #18285 )
...
* fix: Usablity fixes for chart of Accounts Importer
* fix: Provide Row no with error messages
2019-07-12 14:47:00 +05:30
Deepesh Garg
91417646b1
Fix: Add fieldtype as currency
2019-07-12 12:24:05 +05:30
Shivam Mishra
020f405367
Merge branch 'develop' into cash-flow-chart
2019-07-11 10:12:45 +05:30
Mangesh-Khairnar
bfcc84789f
fix(sales-invoice): get items from quotation ( #18237 )
2019-07-11 10:04:46 +05:30
deepeshgarg007
285701d9f1
fix: Add missing Cost Center filter in cash flow statement
2019-07-10 22:22:14 +05:30
Shivam Mishra
f2f1e81a3f
feat: added chart to cash-flow report
2019-07-10 20:28:52 +05:30
Don-Leopardo
365a572073
Merge branch 'develop' into fix_by_voucher_order_develop
2019-07-10 10:52:59 -03:00
Suraj Shetty
61d8088be4
fix: Return fieldtype so that the client-side can format chart values ( #18211 )
2019-07-10 17:05:25 +05:30
Mangesh-Khairnar
3d28c065db
fix(exchange-rate-revaluation): change create to view button on creation of journal entry ( #18201 )
2019-07-10 17:03:23 +05:30
Suraj Shetty
bef897602d
fix: Use db_set since it triggers on_update event ( #18175 )
2019-07-08 10:30:26 +05:30
Deepesh Garg
6252c0490a
Merge pull request #18194 from deepeshgarg007/dimensions_reports
...
fix: Add accounting dimensions to various reports and fixes
2019-07-07 22:40:57 +05:30
deepeshgarg007
6bb5ade667
fix: Add accounting dimensions to various reports and fixes
2019-07-07 21:24:45 +05:30
Mangesh-Khairnar
48d61fb072
Merge branch 'develop' into handle_large_outstanding_invoices_code_refactored
2019-07-07 20:17:07 +05:30
rohitwaghchaure
8a054e4b36
Merge pull request #18182 from rohitwaghchaure/provision_to_make_debit_credit_note_against_return_entry
...
feat: provision to make debit / credit note against the stock returned entry
2019-07-07 00:51:46 +05:30
rohitwaghchaure
d8196ced76
Merge pull request #18179 from rohitwaghchaure/income_booked_for_deferred_debit_and_credit_note_develop
...
fix: on credit note / debit note deferred reversed instead of income
2019-07-05 17:28:50 +05:30
Rohit Waghchaure
5d4d70b75f
feat: provision to make debit / credit note against the stock returned entry
2019-07-05 17:06:25 +05:30
Rohit Waghchaure
909d773462
fix: on credit note / debit note deferred reversed instead of income
2019-07-05 15:12:14 +05:30
Rohit Waghchaure
0f065d5de1
Added due date in the gl entry
2019-07-05 14:54:15 +05:30
Rohit Waghchaure
2f3f7507c4
fix: browser hangs while making payment entry for large number of outstaning invoices
2019-07-05 14:38:46 +05:30
karthikeyan5
7fc6021ca5
feat(setup): adding selling buying filter in terms and conditions
2019-07-04 22:46:16 +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
Don-Leopardo
85e2fd965a
Merge branch 'develop' into fix_by_voucher_order_develop
2019-07-03 08:15:08 -03:00
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
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
Don-Leopardo
46b21f88e1
Merge branch 'develop' into fix_by_voucher_order_develop
2019-07-02 14:03:45 -03:00
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
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
rohitwaghchaure
4c2eb0f13b
Merge pull request #17981 from rohitwaghchaure/added_include_default_finance_book_in_reports_develop
...
fix: finance book filters includes the gl data which don't have finance book
2019-06-29 15:06:34 +05:30
Don-Leopardo
b2b5c3ac0a
Merge branch 'develop' into fix_by_voucher_order_develop
2019-06-28 19:36:25 -03:00
Mangesh-Khairnar
4000fb5bb8
fix: add a more descriptive message when no records are found ( #18082 )
...
* fix: add a more descriptive message when no records are found
* fix: translation by passing string to translation function
2019-06-28 12:38:40 +05:30
Don-Leopardo
c3f6bed650
Merge branch 'develop' into fix_by_voucher_order_develop
2019-06-27 18:09:19 -03:00
Faris Ansari
fbc861320f
fix: Don't append None values in against_account ( #18031 )
2019-06-26 13:31:31 +05:30
Nabin Hait
40d25f4010
fix: Show close button if per_ordered is less than 99.999999 ( #18067 )
2019-06-26 10:57:45 +05:30
Rohit Waghchaure
a2408a63da
feat: payment reconciliation enhancements
2019-06-24 02:11:51 +05:30
NahuelOperto
4448e2d66b
fix order in general ledger
2019-06-21 08:50:37 -03:00
Aditya Hase
bb5ca5a01f
fix(py3): Convert filter to list
2019-06-20 20:10:53 +05:30
Faris Ansari
2632107129
fix: User MultiSelectList control for Party filter ( #17943 )
...
* fix: User MultiSelectList control for Party filter
The comma based filter wouldn't work for values that had comma in them
* fix: Replace with MultiSelectList in reports
* fix: Parse json instead of string split
2019-06-19 12:15:37 +05:30
Rohit Waghchaure
5f9793e081
fix: finance book filters includes the gl data which don't have finance book
2019-06-18 21:09:52 +05:30
rohitwaghchaure
226ff5a797
Merge pull request #17964 from rohitwaghchaure/bank_guarantee_project_not_found_error_develop
...
fix: bank guarantee, not able to select the purchase order
2019-06-18 11:31:01 +05:30
