Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
29,979 Commits 3 Branches 0 Tags 1 GiB
6870161292
Commit Graph

5150 Commits

Author SHA1 Message Date
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
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
Nabin Hait
05fee62314 fix: inv status 2019-07-02 17:55:26 +05:30
Nabin Hait
126a02e208 fix: set invoice status considering invoice discounting 2019-07-02 15:28:57 +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
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
Rohit Waghchaure
4803e817e9 fix: bank guarantee, not able to select the purchase order 2019-06-17 17:40:40 +05:30
Rushabh Mehta
803f784351 fix(minor): format date in user format for accounting dashboard 2019-06-17 17:33:24 +05:30
Rohit Waghchaure
b821af44b6 fix: revert group by voucher general ledger changes 2019-06-17 07:42:53 +05:30
rohitwaghchaure
a030138df8 fix: trial balance opening balance not showing in the debit side for the liability account (#17944) 2019-06-14 11:57:14 +05:30
Anurag Mishra
122cdaf87b fix: column width (#17935) 2019-06-14 11:29:18 +05:30
rohitwaghchaure
da0d056a06
Merge pull request #17924 from rohitwaghchaure/cost_center_added_in_the_opening_invoice_creation 
feat: added cost center in the opening invoice creation tool
 2019-06-13 16:27:18 +05:30
Rohit Waghchaure
033ed93586 fix: taxes are not overriding after changing the taxes template 2019-06-13 15:47:42 +05:30
Rohit Waghchaure
02ae934d5c feat: added cost center in the opening invoice creation tool 2019-06-13 12:00:30 +05:30
Rushabh Mehta
26dba8bb89
Merge pull request #17801 from deepeshgarg007/dashboards 
fix: Dashboards for doctypes in accounts module
 2019-06-12 17:15:58 +05:30
Anurag Mishra
ff99cea1c4
Merge branch 'develop' into report_trial_balance_fix 2019-06-11 14:17:54 +05:30
rohitwaghchaure
ba715feb7f
Merge pull request #17899 from rohitwaghchaure/general_ledger_group_by_voucher_consolidated_issue_develop 
fix: debit and credit showing in the same row if the group by is set as group by voucher (consolidated)
 2019-06-11 11:39:48 +05:30
Anurag Mishra
0ef811d92d
Merge branch 'develop' into report_trial_balance_fix 2019-06-11 11:14:02 +05:30
Anurag Mishra
acae7a903b fix: requested changes 2019-06-11 11:12:28 +05:30
Rohit Waghchaure
ef5dd87928 fix: debit and credit showing in the same row if the group by is set as group by voucher (consolidated) 2019-06-10 18:34:18 +05:30
rohitwaghchaure
3199f695aa
Merge pull request #17897 from rohitwaghchaure/fixed_print_format_for_ar_for_120_days_develop 
fix: accounts receivable for PDC not showing 120 days column
 2019-06-10 18:16:59 +05:30
Rohit Waghchaure
5f41a3333b fix: accounts receivable for PDC not showing 120 days column 2019-06-10 18:15:43 +05:30
Deepesh Garg
ebeafa55ca fix: Total Amount fix in journal entry (#17880) 2019-06-10 17:42:52 +05:30
Rohit Waghchaure
3cf24366a9 feat: provision to set multiple manufacturer in the item master 2019-06-06 19:53:32 +05:30
Anurag Mishra
fd19678bc7 fix: show cost center in print fromat of report trial balance 2019-06-06 18:37:10 +05:30
Prasann Shah
829172c267 [Add] GSTIN filters in hsn wise summary and itemised reports 2019-06-06 12:08:09 +05:30
Nabin Hait
68eaaa068b
fix: Removed unwanted total row from financial statement and general ledger print (#17860) 2019-06-05 20:29:24 +05:30
Aditya Hase
811bed32c1 fix(naming): Limit number of docs to be renamed to 50000 per doctype (#17827) 
If total docs to be renamed goes over 100000 then the total number of
writes exceed 200000 and check_transaction_status (database.py)
raises a Validation Error

This causes failure in the job being executed currently and every single job
triggered afterwards.
 2019-06-05 10:26:26 +05:30
Mangesh-Khairnar
da2e009990 fix(payment-order): filter already created payment entries (#17843) 2019-06-05 10:22:05 +05:30
deepeshgarg007
1831844fcf fix: Dashboard for cost center 2019-06-03 21:53:58 +05:30
Rohit Waghchaure
8309582cca fix: report Payment Period Based On Invoice Date not working 2019-06-03 18:23:54 +05:30
deepeshgarg007
290847df46 fix: Fixes in accounting doctype dashboards 2019-06-02 19:35:18 +05:30
deepeshgarg007
6d313c72e1 fix: Remove diemnsion from value list if present 2019-06-01 23:26:42 +05:30
deepeshgarg007
55b894bfef Merge branch develop into dimensions 2019-06-01 23:13:36 +05:30
deepeshgarg007
223225e785 fix: Update function name 2019-06-01 23:09:04 +05:30
deepeshgarg007
ce15591872 Merge branch 'develop' of https://github.com/frappe/erpnext into dashboards 2019-06-01 22:57:51 +05:30
Deepesh Garg
25857d6ee3
Merge pull request #17816 from deepeshgarg007/ar_translations_develop 
fix: Add translations for missing labels in AR report
 2019-05-31 12:37:36 +05:30
Rohit Waghchaure
840244c562 fix: pricing rule is applying on the incorrect item 2019-05-31 12:16:35 +05:30
deepeshgarg007
480586152b fix: Label translations 2019-05-30 22:34:00 +05:30
deepeshgarg007
da2e456f70 fix: Add translations for missing labels in AR report 2019-05-30 22:30:32 +05:30
Rohit Waghchaure
ac8f4b449d fix: pricing rule not exists issue 2019-05-30 22:24:24 +05:30
deepeshgarg007
52ea2874ec fix: Multiple fixes in accounting dimensions 2019-05-30 22:09:36 +05:30
deepeshgarg007
a9b2e4e4a8 fix: White space in subscription plan dashboard 2019-05-30 12:18:10 +05:30
deepeshgarg007
e233708754 fix: Tax category dashboard 2019-05-30 12:14:16 +05:30
deepeshgarg007
4baf69656d Merge branch 'develop' of https://github.com/frappe/erpnext into dashboards 2019-05-30 11:54:31 +05:30
deepeshgarg007
8f3a6c1596 fix: Dashboards for doctypes in accounting modules 2019-05-30 11:53:12 +05:30
deepeshgarg007
c97c7c51a9 fix: Test cases for accounting dimension 2019-05-28 18:51:10 +05:30
deepeshgarg007
233b88dc52 fix: Test case fixes 2019-05-28 17:58:22 +05:30
deepeshgarg007
ffec8be85f fix: Styling and test case fixes 2019-05-28 17:56:07 +05:30
deepeshgarg007
a8cb00f31f fix: Styling and test case fixes 2019-05-28 16:03:08 +05:30
deepeshgarg007
adccb2c3a4 fix: Remove print statements 2019-05-28 12:24:28 +05:30
deepeshgarg007
acc2422167 Merge branch develop into dimensions 2019-05-28 12:18:32 +05:30
deepeshgarg007
f5b6ee9ae7 fix: Multiple fixes in accounting doctype 2019-05-28 12:15:56 +05:30
deepeshgarg007
7dfffb5f73 fix: Updated test cases for accounting dimensions 2019-05-28 12:09:45 +05:30
Nabin Hait
60f04d181d
Merge pull request #17756 from nabinhait/property-decorator 
fix(subscription): Remove property decorator (#17395)
 2019-05-27 19:11:17 +05:30
Joe Paul
4a8ed90255 fix(subscription): Remove property decorator (#17395) 2019-05-27 14:14:26 +05:30
Kenneth Sequeira
a29ed40ad3 fix: Improve error message (#17747) 
Change ```Allocated amount can not greater than unadjusted amount``` to ```Allocated amount cannot be greater than unadjusted amount```

```Allocated amount can not be negative``` to ```Allocated amount cannot be negative```
 2019-05-27 11:47:07 +05:30
Nabin Hait
5cd04a6d30
fix: payment reconciliation against expense claim (#17729) 
* fix: payment reconciliation against expense claim

* feat: Added dashboard for expense claim
 2019-05-27 11:44:06 +05:30
deepeshgarg007
e9c6e644f7 fix: Multiple changes in dimension creation logic 2019-05-26 12:34:13 +05:30
deepeshgarg007
6f6636abfe fix: Add dimension section in multiple doctypes 2019-05-26 12:31:01 +05:30
deepeshgarg007
d330519f7c fix: Merge branch develop into dimensions 2019-05-25 18:18:08 +05:30
Rushabh Mehta
2d7993592f
Merge pull request #17703 from rmehta/yeah-form-js 
refactor: deprecate old API as per https://github.com/frappe/frappe/pull/7537
 2019-05-24 11:36:16 +05:30
rohitwaghchaure
0c2e3c77a3 fix: range 4 for ageing filter added in the AP/AR report (#17715) 2019-05-23 15:27:47 +05:30
Saurabh
ba04c3e5bb fix: table name alias (#17706) 2019-05-23 14:16:56 +05:30
deepeshgarg007
7de05ae8f3 fix: Dashboards for doctypes in accounting module 2019-05-23 11:29:39 +05:30
Rushabh Mehta
04e89ce808 refactor: deprecate old API 2019-05-22 16:52:36 +05:30
deepeshgarg007
ff717a7c16 fix: List view button for dimensions 2019-05-20 18:35:38 +05:30
Deepesh Garg
9982576ea6
Merge pull request #17678 from rohitwaghchaure/show_opening_entries_gl_report_v12 
feat: added checkbox in the filter of general ledger to show opening entries
 2019-05-20 15:20:53 +05:30
Himanshu
29d4ae6716 feat(Communication): Move Timeline DocType and Name to Dynamic Links (#17593) 
* fix: ambigious error
 2019-05-20 15:14:07 +05:30
Faris Ansari
a1f31e8444
feat(regional): Bank remittance report (#17524) 
feat(regional): Bank remittance report
 2019-05-20 15:00:48 +05:30
Rohit Waghchaure
97d2a46052 feat: added checkbox in the filter of general ledger to show opening entries 2019-05-20 12:28:57 +05:30
deepeshgarg007
4541605e27 fix: Test Case for accounting dimension 2019-05-19 11:13:42 +05:30
deepeshgarg007
a285e4c73e fix: Rename function in accounting dimension 2019-05-19 11:13:21 +05:30
deepeshgarg007
3d11ac0e75 fix: Accounting dimensions for child tables 2019-05-19 00:02:01 +05:30
deepeshgarg007
d0a1ed9017 fix: Ability to disable dimensions 2019-05-18 23:47:42 +05:30
Anurag Mishra
fc86df6453 fix: Allow return if delivery note or sales order is required in selling settings(v12) (#17631) 
* fix: Allow retrun if delivery note or sales order is required in selling settings

* fix: combined condition

* style: refactor
 2019-05-18 13:03:08 +05:30
deepeshgarg007
a4c9134d33 fix: Inactive Sales Item report fixes 2019-05-17 16:19:15 +05:30
deepeshgarg007
705c03c093 fix: Added dashboard and module links for accounting dimensions 2019-05-17 10:23:00 +05:30
Saurabh
1bcdb094ea
Merge pull request #17630 from nabinhait/multi-fixes-dev 
fix: Multiple small fixes
 2019-05-16 15:21:15 +05:30
Nabin Hait
ab1c43dbee fix: To allow creation of sales invoice without customer 2019-05-16 13:45:36 +05:30
Nabin Hait
6b9d64ce1d
refator: Payroll processing and tax calculation (#17617) 
* refactor: Payroll processing and tax calculation

* fix: payroll test cases

* fix: Codacy fixes

* fix: payroll test cases

* fix: removed unwanted code
 2019-05-16 11:23:04 +05:30
Mangesh-Khairnar
6e3586423f fix: multiple changes 2019-05-15 15:50:50 +05:30
Deepesh Garg
0ae1c293d3 fix: Status updater fixes in PO and SO and test coverage for return (#17491) 
* fix: Status updator fixes in sales and purchase cycle

* fix: Test cases for return in so and po

* fix: Resolve conflicts
 2019-05-15 12:23:24 +05:30
deepeshgarg007
073f36b766 fix: Create property setter for budget if dimension is created 2019-05-15 12:20:37 +05:30
Mohamed Al Zubaidi
4c0f754a96 Fix typos (#17601) 2019-05-15 11:38:56 +05:30
rohitwaghchaure
32d91b2c00 fix: not able to create the sales invoice without item code (#17612) 2019-05-15 07:41:44 +05:30
Mangesh-Khairnar
cf71a84976 style: formatting changes 2019-05-14 18:50:40 +05:30
Mangesh-Khairnar
cd59263736 fix: reload doc on generation of text file 2019-05-14 18:34:14 +05:30
Mangesh-Khairnar
c68ee1fcc6 feat: add account field in payment order 2019-05-14 18:31:14 +05:30
Mangesh-Khairnar
d9140dc772 feat: add party bank account field 2019-05-14 18:28:24 +05:30
deepeshgarg007
60f4dd0736 Merge branch 'develop' of https://github.com/frappe/erpnext into dimensions 2019-05-14 15:51:12 +05:30
deepeshgarg007
d9a22726f1 fix: Make territory filter mandatory 2019-05-14 14:36:40 +05:30
Deepesh Garg
571c5c8bf1
Merge branch 'develop' into inactive_items_row_develop 2019-05-14 11:54:08 +05:30
rohitwaghchaure
39be1d43bc
Merge pull request #17546 from rohitwaghchaure/incorrect_payment_amount_if_advance_amount_in_si_develop 
fix: incorrect payment amount in the payment terms if the sales invoice has the advance amount
 2019-05-14 11:15:14 +05:30
deepeshgarg007
4dcba49b5f fix: Do not append row if item is sold within days since last order 2019-05-14 08:53:24 +05:30
deepeshgarg007
e64c357216 fix: Commified function to get dimensions 2019-05-14 08:50:45 +05:30
Suraj Shetty
c24ace48a6
Merge pull request #17554 from surajshetty3416/fix-rename-account-develop 
fix: Show "Merge Account" button only to users with write access
 2019-05-13 10:04:01 +05:30
deepeshgarg007
0c874d915b fix: Indentation fixes 2019-05-12 18:38:57 +05:30
deepeshgarg007
7c12cfcb63 fix: Show all territories and items in inactive sales item report 2019-05-12 18:38:49 +05:30
deepeshgarg007
d83cf65be1 fix: Added dimensions in financial reports and general ledger 2019-05-12 18:34:23 +05:30
Mangesh-Khairnar
cd4289e10e feat: remove button on import of an order 2019-05-11 20:04:03 +05:30
Suraj Shetty
b68ae15dec fix: Check permissions before renaming the account 2019-05-10 14:42:07 +05:30
Suraj Shetty
699f132d05 fix: Show "Merge Account" button only to users with write access 2019-05-10 14:41:40 +05:30
Rohit Waghchaure
5c27791382 fix: test cases 2019-05-10 14:31:07 +05:30
deepeshgarg007
9a05ce10d9 Merge branch 'develop' of https://github.com/frappe/erpnext into dimensions 2019-05-09 14:43:45 +05:30
Mangesh-Khairnar
644e181729 feat: remove first row if empty 2019-05-08 16:17:31 +05:30
Mangesh-Khairnar
3ca8976037 feat: add validation for fetching doc status 2019-05-08 16:06:26 +05:30
Mangesh-Khairnar
f353f1d805 feat: add status field to create payment order 2019-05-08 16:04:48 +05:30
Mangesh-Khairnar
a4d55c9858 feat: assign pe status on creation of payment order 2019-05-08 16:04:18 +05:30
Mangesh-Khairnar
8aa9589aaf fix: display generate txt on submission 2019-05-08 15:58:26 +05:30
Rohit Waghchaure
7bee502d72 fix: get totals of gross profit amount on call of the method get_invoiced_item_gross_margin 2019-05-08 15:38:34 +05:30
Rohit Waghchaure
1d6f2c3b5d feat: Get invoiced item's gross margin using API 2019-05-08 15:38:05 +05:30
Mangesh-Khairnar
b8d0dec7f5 feat: filter bank from company account 2019-05-07 11:29:20 +05:30
Mangesh-Khairnar
e8bea2e936 feat: set payment order type on mapping 2019-05-06 19:54:11 +05:30
Mangesh-Khairnar
f709f330ce feat: show generate txt button for payment entry 2019-05-06 19:50:17 +05:30
Mangesh-Khairnar
525d8cefc1 fix: post process mapping 2019-05-05 22:37:21 +05:30
Mangesh-Khairnar
c448664e6b feat: generate file name 2019-05-05 22:37:21 +05:30
Mangesh-Khairnar
0fac6f1c4b feat: check bulk update option 2019-05-05 22:37:21 +05:30
Mangesh-Khairnar
08a375beb8 feat: add advice row 2019-05-05 22:37:21 +05:30
Mangesh-Khairnar
6bc48b8bfb fix: pass account paid information to postprocess 2019-05-05 22:37:21 +05:30
Mangesh-Khairnar
07a5471dd2 feat: add payment entry field 2019-05-05 22:37:21 +05:30
Mangesh-Khairnar
e56eaf6364 perf: improve mapping function speed 2019-05-05 22:37:21 +05:30
Mangesh-Khairnar
48d88b0478 feat: add generate txt file button for india region 2019-05-05 22:37:20 +05:30
Mangesh-Khairnar
0faf9f5f8c feat: add mapping logic for creating payment order 2019-05-05 22:37:20 +05:30
Mangesh-Khairnar
f5a1bea189 feat: create payment order from payment entry 2019-05-05 22:37:20 +05:30
Himanshu
5cf12a4640 fix(Purchase Order): fetch payment terms (#17121) 
* fix: fetch payment terms

* fix: test fixes

* fix: test cases

* fix: test case

* fix: check for payment terms fetching

* fix: test cases

* refactor: fetch payment terms in account settings

* fix: add fetch terms to account settings
 2019-05-04 22:37:35 +05:30
deepeshgarg007
b4ad5c0158 feat: Ability to add custom dimensions 2019-05-04 20:29:21 +05:30
deepeshgarg007
6c6b24011f Merge branch 'develop' of https://github.com/frappe/erpnext into inactive-items-fix-develop 2019-05-02 23:03:59 +05:30
Saurabh
7c5d3873fe
Merge branch 'develop' into auto-account-creation-company-tree-dev 2019-05-02 12:01:46 +05:30
Rushabh Mehta
27a30c842d fix: simplify sort condition 2019-05-02 09:23:56 +05:30
Nabin Hait
7ca243094e
Merge branch 'develop' into coa-sorting 2019-05-02 00:58:56 +05:30
Nabin Hait
9d04b67f46 fix: Validate parent account of child company while creating new account based on parent company 2019-05-01 20:26:36 +05:30
Nabin Hait
9ccdf594c3
Merge pull request #17445 from rmehta/refactor-child-tables 
fix(item-tables): add missing "item_tax_template" in purchase order detail and reorganize sequence of all child table
 2019-05-01 19:31:00 +05:30
deepeshgarg007
1cfe96193f Merge branch 'develop' of https://github.com/frappe/erpnext into rename_report_develop 2019-05-01 18:14:07 +05:30
Rushabh Mehta
c3aecb1fbd fix(item-tables): add missing "item_tax_template" in purchase order detail and reorganize sequence of all child table 2019-05-01 18:04:22 +05:30
Nabin Hait
dc86bc756e
Merge pull request #17441 from nabinhait/pe-ref-exchange-rate-dev 
fix: Always fetch exchange rate from ref document
 2019-05-01 17:18:35 +05:30
Aditya Hase
8b8e3e7890
Merge pull request #17424 from adityahase/fix-py3-misc 
fix: Python 3 compatibility fixes
 2019-05-01 16:45:11 +05:30
Nabin Hait
6d9334810e fix: reverted fetch from as the field does not exists for some ref doctypes 2019-05-01 15:40:00 +05:30
Nabin Hait
3191d072f0 fix: Always fetch exchange rate from ref document 2019-05-01 15:37:03 +05:30
deepeshgarg007
db999e293b fix: Rename Inactive Items report to Inactive Sales Item 2019-05-01 14:06:06 +05:30
Rushabh Mehta
43958dcd11 fix(minor): chart of accounts sorting and message 2019-05-01 13:53:05 +05:30
Nabin Hait
316c3b3f9d fix: Fetch exchange rate from invoice on server side 2019-05-01 13:34:17 +05:30
Aditya Hase
ee0093c593
Merge branch 'develop' into fix-py3-misc 2019-05-01 11:55:28 +05:30
Aditya Hase
234d35781c fix: Python 3 compatibility fixes 
import reduce from functools

Undefined variable
 2019-05-01 11:52:37 +05:30
Nabin Hait
39f58ae92b
Merge pull request #17392 from ashish-greycube/develop_allow_bank_account_import 
fix: allow_import_of_bank_account_by_account_manager
 2019-05-01 11:16:33 +05:30
Nabin Hait
8dc7401ddf
Merge pull request #17388 from ashish-greycube/correct_party_type_values 
fix: show only party_type doctypes in Party Type field of bank account
 2019-05-01 11:15:02 +05:30
Faris Ansari
1e55c2e713
Remove old style custom scripts (#17077) 
* fix: Move Newsletter script from frappe to erpnext

* fix: Remove old style client scripts

* C-Form

* fix: Cost Center

* fix: Fiscal Year

* fix: Monthly Distribution

* fix: Payment Gateway Account

* fix: Pricing Rule

* fix: Missing semicolon
 2019-04-30 10:18:09 +05:30
ashish-greycube
e4e8197f46 codacy review 2019-04-26 14:06:21 +05:30
ashish-greycube
0ed9ec9a03 fix : allow_import_of_bank_account_by_account_manager 2019-04-26 12:42:14 +05:30
ashish-greycube
467609b193 show only party_type doctypes in Party Type field of bank account 2019-04-26 11:35:04 +05:30
Nabin Hait
4fcefda6c7
Merge pull request #17332 from deepeshgarg007/automatic_so_po 
feat: Automatic inter company Sales and Purchase order
 2019-04-26 00:24:08 +05:30
Nabin Hait
1d21d89d2f
Merge pull request #17378 from rohitwaghchaure/trial_balance_error_finance_book_develop 
fix: Trial balance finance book issue
 2019-04-25 20:34:38 +05:30
Rohit Waghchaure
c181064782 fix: Trial balance finance book issue 2019-04-25 17:51:09 +05:30
Nabin Hait
4a994d4eb8 fix: Don't allocate advance if pos 2019-04-25 17:49:38 +05:30
deepeshgarg007
f34e4f0e36 fix: Test case for inter-company-transaction 2019-04-25 14:28:57 +05:30
deepeshgarg007
4a4ce12eb4 fix: Commonfied code for inter-company-transaction 2019-04-25 14:28:19 +05:30
Nabin Hait
aa028d7856 fix: don't allocate advances if POS 2019-04-23 21:44:21 +05:30
Nabin Hait
8624957cbc
Merge pull request #17291 from prasadarr/listing-fixes 
fix: Allow system manager to access share ledger
 2019-04-22 15:35:35 +05:30
Saif Ur Rehman
a216844d2c fix: Set Allocate Advance Automatically disabled by default 2019-04-22 12:10:40 +05:00
Faris Ansari
733ff48d51
fix: Refactor for Print Format changes (#17242) 
- Rename Server to Jinja
- Rename Js to JS
 2019-04-22 12:08:18 +05:30
Nabin Hait
d21bacfc21 fix: Total row alignment in AR report 2019-04-20 10:58:58 +05:30
Nabin Hait
c8b1351e87 fix: fetch party account as discounted receivable account in payment entry 2019-04-19 21:33:29 +05:30
Nabin Hait
4a5bed5c07 fix: fetch party account as discounted receivable account in payment entry 2019-04-19 21:33:29 +05:30
Nabin Hait
06f992f850
Merge pull request #17299 from nabinhait/inv-disc-fixes 
fix: Close loan considering latest invoice outstanding balance
 2019-04-19 21:27:02 +05:30
Nabin Hait
375f051b24
Merge pull request #17277 from nabinhait/invoice-discounting-fixes 
Invoice discounting fixes
 2019-04-19 20:00:18 +05:30
Nabin Hait
d2797be1cd fix: Close loan considering latest inv outstanding balance 2019-04-19 15:33:05 +05:30
Nabin Hait
8da71cebb7 fix: test cases 2019-04-19 15:10:02 +05:30
Prasad R
e1a6022c8c fix: Allow system manager to access share ledger 2019-04-19 10:57:21 +05:30
Rohit Waghchaure
376db4f6b7 fix: credit amount in account's currency not be consider if debit amount is present in the general ledger 2019-04-18 22:06:22 +05:30
Nabin Hait
c99c712913 fix: Validate and update invoice discounting status on JE submit/cancel 2019-04-18 15:52:50 +05:30
Nabin Hait
8170585faf fix: Don't fetch already discounted invoice 2019-04-18 15:13:18 +05:30
Nabin Hait
36bb3f55f2 fix: Added invoice discounting dashboard 2019-04-18 14:47:44 +05:30
Rohit Waghchaure
7aee809571 fix: If finance book filter is not set then show all the entries 2019-04-16 19:35:18 +05:30
Rushabh Mehta
59c5a16037 fix(account_balance_timeline): remove unused import 2019-04-16 15:11:45 +05:30
Rushabh Mehta
1c2eb51a91 fix(api) 2019-04-16 11:12:34 +05:30
Rushabh Mehta
6dff8038e6 fix(account_balance_timeline) 2019-04-16 09:35:46 +05:30
Rushabh Mehta
7efe01578d fix(account_balance_timeline) 2019-04-16 09:33:21 +05:30
Nabin Hait
e9d9576cd7
Merge pull request #17231 from nabinhait/Anurag810-invoice-discounting 
Invoice Discounting
 2019-04-15 21:14:19 +05:30
Nabin Hait
076cc38c29 fix: Outstanding amount on making payment against discounted invoice 2019-04-15 18:42:10 +05:30
Rushabh Mehta
44b0cb6383
Merge pull request #17194 from rmehta/dashboard-refactor 
fix(dashboard): as per new features
 2019-04-15 16:52:54 +05:30
Nabin Hait
d584cfbf43 Fixed merge conflict 2019-04-15 16:16:25 +05:30
Nabin Hait
9fd3f10b67
Merge pull request #17220 from Anurag810/payment-entry-fix 
fix: handle for party type member in payment entry (v12)
 2019-04-15 10:06:08 +05:30
rohitwaghchaure
033b1babe8
Merge pull request #17186 from rohitwaghchaure/bank_account_in_bank_reconcilliation 
feat: Added bank account no in bank reconcilliation
 2019-04-14 16:10:19 +05:30
Anurag Mishra
95714297a4 fix: handle for party type member in payment entry 2019-04-12 15:03:46 +05:30
Nabin Hait
165e92ad5b
Merge pull request #17210 from rohitwaghchaure/fix_taxes_and_charges_are_adding_multiple_times 
fix: Taxes and charges table not clear the existing rows if the template is changed
 2019-04-12 11:02:37 +05:30
Rohit Waghchaure
72cc37e8da fix: Taxes and charges table not clear the existing rows if the template is changed 2019-04-11 18:35:15 +05:30
Rushabh Mehta
d625c32ab1 fix(dashboard): for frappe updates, and a new splash logo 2019-04-11 16:13:58 +05:30
Mangesh-Khairnar
3ab2a18088
Merge branch 'develop' into so-on-hold 2019-04-11 15:49:06 +05:30
Faris Ansari
6472ed2c1e
Merge pull request #16941 from Mangesh-Khairnar/po-on-hold 
Feature: Purchase order on hold
 2019-04-11 15:36:54 +05:30
Nabin Hait
89206e74d0 fixed merge conflict 2019-04-11 12:31:14 +05:30
Anurag Mishra
4c29d80cf1 fix: minor fixes 2019-04-11 11:14:32 +05:30
Anurag Mishra
accf310aa3 fix: start date and loan period should be mandatory 2019-04-11 11:08:07 +05:30
rohitwaghchaure
6cd114b467
Merge pull request #17198 from rohitwaghchaure/fix_auto_assign_payment_entry_to_invoice 
fix: don't assign the advance payment entries if Allocate Advances Automatically is disabled
 2019-04-11 09:57:45 +05:30
Rohit Waghchaure
49907e746b fix: test cases 2019-04-10 17:33:32 +05:30
Rohit Waghchaure
b286fc99b8 fix: don't assign the advance payment entries if Allocate Advances Automatically is disabled 2019-04-10 16:16:30 +05:30
Rohit Waghchaure
30fda3ee54 feat: Added bank account no in bank reconcilliation 2019-04-09 18:58:23 +05:30
Rushabh Mehta
bead5b33f4 fix(dashboard): as per new features 2019-04-09 18:38:03 +05:30