Nabin Hait
bcb0f6038e
fix: Single gl entry should only be considered once either in opening or closing entry ( #18792 )
2019-08-21 14:47:33 +05:30
Sahil Khan
5f2c030ddc
Merge branch 'version-12-hotfix' into merge_v12_hotfix_1
2019-08-20 16:22:49 +05:30
rohitwaghchaure
16dda1a991
fix: group by voucher consolidated showing incorrect data for deferred entries ( #18779 )
2019-08-20 12:37:32 +05:30
rohitwaghchaure
d5b4b1fdaf
fix: group by voucher consolidated showing incorrect data for deferred entries ( #18777 )
2019-08-20 12:35:15 +05:30
Mangesh-Khairnar
c97a7fb845
fix: restrict the payment order to non received type payment entries
2019-08-20 00:27:43 +05:30
Rohit Waghchaure
1008e6e450
fix: debit note not reconciled with another purchase invoice using payment reconciliation
2019-08-19 20:27:15 +05:30
Mangesh-Khairnar
4645727163
Merge branch 'develop' into fix-payment-order
2019-08-19 16:29:30 +05:30
Deepesh Garg
960a1cbd8f
fix: Party dashboard heatmap not capturing sales, purchase and other activities ( #18753 )
2019-08-19 11:51:16 +05:30
Anurag Mishra
bc5712a1b3
fix: validated cost center in financial_statement ( #18733 )
...
* fix: validated cost center in financial_statement
* Update financial_statements.py
2019-08-19 10:24:44 +05:30
Deepesh Garg
77ec3cf402
Merge pull request #18757 from deepeshgarg007/accounting_dimension_fix
...
fix: Default dimensions in child doctypes
2019-08-16 17:27:14 +05:30
deepeshgarg007
42d9298318
fix: Remove extra space
2019-08-16 13:06:47 +05:30
Mangesh-Khairnar
4b71d9ca9f
Merge branch 'develop' into fix-payment-order
2019-08-16 12:42:26 +05:30
deepeshgarg007
2fb6bc9867
fix: Default dimensions in child doctypes
2019-08-15 17:06:32 +05:30
Deepesh Garg
98a6e5cb6c
Merge pull request #18742 from rohitwaghchaure/incorrect_sequnce_between_name_and_contact
...
fix: sequence of customer name and contact in the AR report
2019-08-14 23:20:55 +05:30
Rohit Waghchaure
c5d41af10f
fix: sequence of customer name and contact in the AR report
2019-08-14 18:49:19 +05:30
Mangesh-Khairnar
dbb44c8950
fix: restrict the payment order to non received type payment entries
2019-08-14 17:38:44 +05:30
Anurag Mishra
78690d7b8b
fix:payment ammount validation for pos invoices ( #18663 )
2019-08-14 15:03:58 +05:30
Deepesh Garg
2c5dcbe819
fix: Error handling in payment entry ( #18720 )
2019-08-14 14:26:37 +05:30
rohitwaghchaure
4d7a0aaee1
Merge pull request #18705 from surajshetty3416/fix-payment-entry-account-permission
...
fix: Check if account passed is accessible under Payment Entry
2019-08-13 18:37:17 +05:30
Anurag Mishra
d2f13fe0a6
fix: query ( #18709 )
2019-08-13 13:19:24 +05:30
Suraj Shetty
469e430d38
Merge branch 'fix-payment-entry-account-permission' of github.com:surajshetty3416/erpnext into fix-payment-entry-account-permission
2019-08-13 12:12:03 +05:30
Suraj Shetty
64a962ce97
fix: Re-organise code
2019-08-13 12:10:00 +05:30
Suraj Shetty
1a2600c9ea
fix: Ignore account permission check
2019-08-13 12:09:06 +05:30
Suraj Shetty
bd2e7c0e53
fix: Comment description
2019-08-12 16:32:14 +05:30
Suraj Shetty
3234f0d299
fix: Check if account passed is accessible under Payment Entry
2019-08-12 16:18:36 +05:30
Rohit Waghchaure
fb23773935
fix: reconciled entry has not clearance date set
2019-08-12 15:35:19 +05:30
Deepesh Garg
0b711d1f8a
Merge pull request #18684 from marination/fixes_v12
...
fix: Fixed error message in Payment Entry for outstanding invoices not found via filters
2019-08-10 17:26:54 +05:30
marination
9839a9afb0
fix: Fixed error message in Payment Entry for outstanding invoices not found via filters
2019-08-09 15:54:18 +05:30
marination
4583100537
fix: Fixed error message in Payment Entry for outstanding invoices not found via filters
2019-08-09 15:30:05 +05:30
rohitwaghchaure
536e6bf57c
fix: group by condition in the payment reconciliation ( #18657 )
2019-08-08 17:40:57 +05:30
Mangesh-Khairnar
f3a5188bec
fix: accounting period ( #18477 )
...
* fix: accounting period
* test: accounting period
* fix: account period creation
* fix: remove status field from accounting period
2019-08-08 17:39:13 +05:30
Deepesh Garg
f2bf76a2ef
fix: Show Cr or Dr symbol in chart of accounts based on balance ( #18653 )
...
* fix: Show Cr or Dr symbol in chart of accounts based on balance
* fix: Typo fix in comment
2019-08-08 15:52:39 +05:30
Deepesh Garg
f729eed035
fix: Show Cr or Dr symbol in chart of accounts based on balance ( #18654 )
...
* fix: Show Cr or Dr symbol in chart of accounts based on balance
* fix: Typo fix in comment
2019-08-08 15:52:25 +05:30
Deepesh Garg
065e8f3650
fix: Changes in print format due to attribute name changes in frappe ( #18639 )
2019-08-08 15:51:56 +05:30
Deepesh Garg
04b42600b0
fix: Changes in print format due to attribute name changes in frappe ( #18641 )
2019-08-08 15:51:50 +05:30
Mangesh-Khairnar
e5c733bdb3
fix: Accounting period ( #18630 )
...
* fix: accounting period
* test: accounting period
* fix: account period creation
* fix: remove status field from accounting period
2019-08-08 15:44:11 +05:30
Suraj Shetty
0c699f0726
fix: Paid amount 0 while creating advanced payment entry
...
Paid amount is set 0 while creating advanced payment entry
against multi-currency purchase order.
Solution: Populate paid amount value after applying conversion rate
2019-08-07 10:17:05 +05:30
Deepesh Garg
235166ec41
Merge pull request #18592 from deepeshgarg007/utils_fix_v12
...
fix: Ambigious column in query
2019-08-05 22:38:45 +05:30
Deepesh Garg
e4abaa7cdd
Merge pull request #18591 from deepeshgarg007/utils_fix_develop
...
fix: Ambigious column in query
2019-08-05 14:45:30 +05:30
deepeshgarg007
23f30cdb8b
fix: Aambigious column in query
2019-08-05 12:42:35 +05:30
deepeshgarg007
043f70e9a6
fix: Aambigious column in query
2019-08-05 12:40:50 +05:30
Anurag Mishra
08df6bda41
fix: query ( #18468 )
2019-08-05 10:27:25 +05:30
Anurag Mishra
7e1987ed48
feat: validate cwip accounts for journal Entry ( #18518 )
2019-08-05 10:18:57 +05:30
Anurag Mishra
f9fb92ebb0
feat: validate cwip accoutns in journal entry ( #18519 )
2019-08-05 10:18:37 +05:30
deepeshgarg007
a499079250
fix: Remove non standard fieldname
2019-08-03 10:27:33 +05:30
deepeshgarg007
75465775b4
Merge branch 'version-12-hotfix' of https://github.com/frappe/erpnext into error_report_v12
2019-08-03 10:26:46 +05:30
deepeshgarg007
b0916a35dc
fix: Remove payment order from bank dashboard
2019-08-03 10:24:04 +05:30
deepeshgarg007
93e46310b8
fix: Remove payment order from bank dashboard
2019-08-03 10:17:44 +05:30
Sahil Khan
8426ff726a
Merge branch 'version-12-hotfix' into version-12
2019-08-02 14:27:59 +05:30
deepeshgarg007
c16ef32b6b
fix: Payment Order link fix in bank dashboard
2019-08-01 14:10:03 +05:30
deepeshgarg007
8704bc6f39
fix: Payment Order link fix in bank dashboard
2019-08-01 13:24:48 +05:30
Deepesh Garg
d301d26fda
fix: Enhancement in credit note ( #18511 )
...
* fix: Credit note enhancement
* Fix: Print format for Sales Invoice Return
* fix: Zero quantity validation fix for credit note
2019-07-31 15:58:19 +05:30
Deepesh Garg
b65c761b16
fix: Enhancement in credit note ( #18510 )
...
* fix: Credit note enhancement
* Fix: Print format for Sales Invoice Return
* fix: Zero quantity validation fix for credit note
2019-07-31 15:58:01 +05:30
deepeshgarg007
107c07e5cb
fix: Opening balance not getting calculated in trail_balance_report
2019-07-29 15:01:22 +05:30
deepeshgarg007
4c652396d0
fix: Opening balance not getting calculated in trail_balance_report
2019-07-29 14:57:33 +05:30
deepeshgarg007
f37fb82069
fix: Code cleanup
2019-07-29 12:14:49 +05:30
deepeshgarg007
724be6eca2
fix: GL entry validation fix
2019-07-29 12:14:49 +05:30
deepeshgarg007
82661372f7
fix: Add accounting dimensions to subscription and opening invoice tool
2019-07-29 12:14:49 +05:30
deepeshgarg007
3d15128b91
fix: Test cases for accounting dimensions
2019-07-29 12:14:49 +05:30
deepeshgarg007
1c1f6f90bb
fix: Test Cases for accounting dimensions
2019-07-29 12:14:49 +05:30
deepeshgarg007
5dfe4df23b
fix: Set query fix
2019-07-29 12:14:49 +05:30
deepeshgarg007
22a4857a3c
fix: Codacy Fixes
2019-07-29 12:14:49 +05:30
deepeshgarg007
f1f79ff1e1
fix: Remove dimensions from boot
2019-07-29 12:14:49 +05:30
deepeshgarg007
7d270edf79
fix: Added default dimension and filter in bootinfo
2019-07-29 12:14:49 +05:30
deepeshgarg007
b590f89310
fix: Default Accounting Dimensions in doctypes
2019-07-29 12:14:49 +05:30
rohitwaghchaure
8c8b1f2da6
Merge pull request #18463 from rohitwaghchaure/bank_reco_consider_incorrect_paid_amount_field_v12
...
fix: multi currency bank reconciliation issue
2019-07-29 11:40:40 +05:30
deepeshgarg007
ec421df4e4
fix: Code cleanup
2019-07-29 08:58:56 +05:30
deepeshgarg007
a65ad10c62
fix: GL entry validation fix
2019-07-27 19:06:36 +05:30
deepeshgarg007
4fce891241
Merge branch 'develop' of https://github.com/frappe/erpnext into defaut_accounting_dimension
2019-07-27 18:11:34 +05:30
Aditya Hase
dc4452ffe3
perf(travis): Faster builds ( #18491 )
...
perf(travis): Faster builds
2019-07-26 13:44:05 +05:30
Deepesh Garg
c391d65dc3
Merge pull request #18488 from adityahase/faster
...
perf(travis): Faster builds
2019-07-26 12:41:01 +05:30
rohitwaghchaure
ad89b029c2
Merge pull request #18494 from netchampfaris/parent-account-child-account-currency-fp
...
fix(Account): Pass parent currency to child currency
2019-07-26 12:13:27 +05:30
rohitwaghchaure
a312f19fab
Merge pull request #18493 from netchampfaris/parent-account-child-account-currency
...
fix(Account): Pass parent currency to child currency
2019-07-26 12:12:15 +05:30
deepeshgarg007
dda6b5cd53
fix: Add accounting dimensions to subscription and opening invoice tool
2019-07-26 09:14:42 +05:30
deepeshgarg007
aa92df4ddc
fix: Test cases for accounting dimensions
2019-07-26 09:14:42 +05:30
deepeshgarg007
0ce2afc9bc
fix: Test Cases for accounting dimensions
2019-07-26 09:14:42 +05:30
deepeshgarg007
41a1cd954c
fix: Set query fix
2019-07-26 09:14:42 +05:30
deepeshgarg007
b124aff0bb
fix: Codacy Fixes
2019-07-26 09:14:42 +05:30
deepeshgarg007
6dd5f74671
fix: Remove dimensions from boot
2019-07-26 09:14:42 +05:30
deepeshgarg007
ada1ac8013
fix: Added default dimension and filter in bootinfo
2019-07-26 09:14:42 +05:30
deepeshgarg007
efd6307bc4
fix: Default Accounting Dimensions in doctypes
2019-07-26 09:14:42 +05:30
Faris Ansari
0ec747f57c
fix(Account): Pass parent currency to child currency
...
In a scenario where Parent Company Account's Currency is different
from it's default currency, the Account Currency of Child would be set
from the default currency of Company which might be wrong
2019-07-26 08:55:34 +05:30
Faris Ansari
6998412990
fix(Account): Pass parent currency to child currency
...
In a scenario where Parent Company Account's Currency is different
from it's default currency, the Account Currency of Child would be set
from the default currency of Company which might be wrong
2019-07-26 08:15:45 +05:30
Aditya Hase
0d333894c9
perf(tests): Use setUpClass and tearDownClass instead of setUp and tearDown
2019-07-26 05:54:04 +05:30
Aditya Hase
6a5b7f751c
perf(tests): Use setUpClass and tearDownClass instead of setUp and tearDown
2019-07-26 00:23:13 +05:30
deepeshgarg007
f56284b0c1
Dynamic link issue fix in Bank reconciliation statement
2019-07-25 12:47:32 +05:30
deepeshgarg007
53dc0c52ca
Dynamic link issue fix in Bank reconciliation statement
2019-07-25 12:44:50 +05:30
Rohit Waghchaure
6d0c6a17d9
fix: multi currency bank reco issue
2019-07-24 12:48:06 +05:30
Rushin Parikh
40240b7d96
fix: filter reference name by cost center in journal entry account ( #17948 )
...
* fix: filter reference name by cost center in journal entry account if reference_type is Sales Invoice or Purchase Invoice
* Update journal_entry.js
2019-07-22 11:54:26 +05:30
Mangesh-Khairnar
0bbfca8142
fix: payment document link fix ( #18301 )
2019-07-22 11:49:18 +05:30
Mangesh-Khairnar
64c780e8c7
fix: update percentage on creation of invoice for zero amt transaction ( #18382 )
2019-07-22 11:28:58 +05:30
Saurabh
90d7a8888f
fix: pass missing argument while generating consolidated financial statement for cash flow type ( #18398 )
2019-07-22 11:22:34 +05:30
Aditya Hase
dc42cc3998
fix(sales-invoice): Use orm instead of frappe.db.sql ( #18434 )
2019-07-22 11:19:07 +05:30
crescent28
b978c9173d
fix: added null check for filters ( #18416 )
...
filters when None, at `filters.get("outstanding_amt_greater_than")` would result in an Attribute Error. This PR just adds a simple null-check in the if conditions. I'm awesome!
Co-authored-by: Shivam Mishra <scm.mymail@gmail.com>
2019-07-22 11:13:27 +05:30
Rohit Waghchaure
93b7ece8b0
fix: disable field's fieldtype changed from data to check
2019-07-21 00:02:09 +05:30
deepeshgarg007
2ddbebfae0
fix: Condition fix
2019-07-20 14:52:59 +05:30
deepeshgarg007
e097d4f470
fix: Assignment fix
2019-07-20 14:49:32 +05:30
deepeshgarg007
1ee3d040a1
fix: Condition fix in get_balance_on function
2019-07-20 14:46:59 +05:30
rohitwaghchaure
8fedf53304
Merge pull request #18379 from rohitwaghchaure/pos_fixed_address_and_taxes_and_charges_not_set_as_per_profile
...
fix: address and taxes not set as per pos profile in the pos invoice
2019-07-19 08:00:33 +05:30
Anurag Mishra
0e23307dbf
fix: handled value Error ( #18361 )
2019-07-18 12:43:18 +05:30
rohitwaghchaure
6349f61882
Merge pull request #18385 from rohitwaghchaure/offline_pos_syncing_issue_for_customer_develop
...
fix: offline pos syncing issue for customer
2019-07-17 21:37:55 +05:30
Rohit Waghchaure
438efb4008
fix: cost center not able to access
2019-07-17 21:21:58 +05:30
Rohit Waghchaure
0851c94e9b
fix: offline pos syncing issue for customer
2019-07-17 20:36:33 +05:30
Rohit Waghchaure
dcf2d3532e
fix: address and taxes not set as per pos profile in the pos invoice
2019-07-17 19:28:36 +05:30
Deepesh Garg
902e5ab744
Merge branch 'develop' into ac_dim_usability_fixes
2019-07-16 16:17:07 +05:30
Mangesh-Khairnar
b560050334
fix(payment-entry):remove unused argument
2019-07-16 12:11:44 +05:30
Deepesh Garg
8c21703959
fix: Fixes in get_balance_on function ( #18324 )
2019-07-16 09:41:01 +05:30
Deepesh Garg
8fcd426dab
Merge pull request #18350 from rohitwaghchaure/added_payment_terms_in_accounts_payble_summary_develop
...
feat: added payment terms filter in the accounts payable summary
2019-07-16 08:39:30 +05:30
deepeshgarg007
af6c09ae09
fix: Codacy
2019-07-16 08:33:13 +05:30
Rohit Waghchaure
4c0dffe687
feat: added payment terms filter in the accounts payable summary
2019-07-16 02:00:41 +05:30
Deepesh Garg
322053ee1b
Merge pull request #18136 from nabinhait/inv-disc-improvements
...
fix: set invoice status considering invoice discounting
2019-07-15 18:53:30 +05:30
deepeshgarg007
84d1e12f34
fix: Typo
2019-07-15 18:42:22 +05:30
deepeshgarg007
2093ffc15b
fix: Usability fixes in accountng dimensions
2019-07-15 18:21:05 +05:30
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
deepeshgarg007
1cc46c06b0
Merge branch develop into ac_dim_usability_fixes
2019-07-15 15:34:40 +05:30
Nabin Hait
d83e39d0ac
Merge branch 'develop' of https://github.com/frappe/erpnext into inv-disc-improvements
2019-07-15 13:56:29 +05:30
Nabin Hait
5435b7e9eb
fix: Null issue
2019-07-15 13:56:09 +05:30
deepeshgarg007
a85db66146
fix: Usability fixes in accounting dimensions
2019-07-14 18:15:19 +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
deepeshgarg007
5ea542b08b
fix: Do not show Project, Cost Center and Accounting Dimension in ref doc
2019-07-13 11:39:32 +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
Nabin Hait
7b684a01d3
fix: merge conflict
2019-07-04 12:06:50 +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