brotherton-erpnext

Author	SHA1	Message	Date
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
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
Nabin Hait	1245139c51	Merge branch 'develop' into invoice-d	2019-04-09 15:27:13 +05:30
Anurag Mishra	67e6da2086	fix: Removed Extra page on generating pdf in print formats	2019-04-09 15:19:05 +05:30
Anurag Mishra	ef11d378d4	fix: UI on generating pdf in print format	2019-04-09 15:19:05 +05:30
Anurag Mishra	ed82e8ba3b	fix: removed before from accounts_controlle.pyr and fetch the gl from frontend	2019-04-09 15:19:05 +05:30
Anurag Mishra	b62cfffdea	fix: Print Auditing print format	2019-04-09 15:19:05 +05:30
Mangesh-Khairnar	16c4fd6733	Merge branch 'develop' of https://github.com/frappe/erpnext into so-on-hold	2019-04-09 12:13:45 +05:30
Rushabh Mehta	0d3986c9f6	fix(dashboard): account timeline for balance sheet accounts	2019-04-09 11:36:41 +05:30
Rushabh Mehta	da3f07221c	fix(dashboard): accounting timeline query fix	2019-04-08 19:38:55 +05:30
Rushabh Mehta	3882a41c51	fix(dashboard): simpler way to get account timeline from first principles	2019-04-08 19:05:12 +05:30
Mangesh-Khairnar	1934a76cd8	feat: Add status field in multiple reports linked with purchase order and sales order creation (#17107 ) * enhancement: add status field in ordered itemd to be delivered * enhancement: add status field in purchase order itemd to be received * enhancement: add a status column in the billed reports	2019-04-08 16:29:59 +05:30
rohitwaghchaure	bc02ee23e0	Merge pull request #17078 from rohitwaghchaure/unlinked_advance_payment_on_cancellation_of_order feat: provision to unlink advance payment entry on cancelation of order	2019-04-06 12:30:05 +05:30
Rohit Waghchaure	9835c89e17	Added test cases	2019-04-06 12:29:05 +05:30
Nabin Hait	374b85b38e	Merge pull request #17140 from hrwX/pe_supp_inv_v12 fix(Payment Entry): Return Bill No on for Payment Entry	2019-04-05 15:59:58 +05:30
Mangesh-Khairnar	3d667b4c94	Merge branch 'develop' of https://github.com/frappe/erpnext into po-on-hold	2019-04-05 12:11:26 +05:30
Himanshu Warekar	b30f584410	fix: return bill_no	2019-04-04 19:55:13 +05:30
Himanshu Warekar	6443d7dd10	refactor: declare bill_on at function start	2019-04-04 19:54:23 +05:30
Himanshu Warekar	ad32324c4c	fix: get bill_no	2019-04-04 19:50:23 +05:30
Rohit Waghchaure	55d3bcac37	fix: not able to change pos profile	2019-04-04 15:26:00 +05:30
Nabin Hait	e0a9835f30	Merge pull request #16987 from SaiFi0102/Party-Ledger-Summary-Fix fix(Party Ledger Summary): Show all adjustment entries as columns	2019-04-04 11:45:36 +05:30
Nabin Hait	0747273ea4	Merge pull request #17028 from sagarvora/field_order fix(accounts): dependent field should be displayed after source link field	2019-04-04 11:45:01 +05:30
Nabin Hait	94c822f5f0	Merge pull request #17022 from hrwX/cost_center_fix fix(Purchase Invoice): Cost Centre as per company	2019-04-04 11:43:44 +05:30
Nabin Hait	9eeb3715f0	Merge pull request #16992 from hrwX/cost_center fix(Purchase Invoice): Cost Centre as per company	2019-04-04 11:43:35 +05:30
Nabin Hait	f4ae29320f	Merge pull request #17087 from deepeshgarg007/payment_entry Party type validation in payment entry	2019-04-04 11:39:00 +05:30
Nabin Hait	9ee417888e	Merge pull request #17092 from nabinhait/ar-ap-print fix: Show Sales Person in AR/AP print is optional	2019-04-04 11:02:26 +05:30
Nabin Hait	2092a8b1cf	Merge pull request #17100 from nabinhait/gl-entry-precision fix: Validate gl entry debit/credit as per field's precision	2019-04-04 10:59:06 +05:30
Nabin Hait	b1f3f04d71	fix: Validate gl entry debit/credit as per field's precision	2019-04-03 12:30:25 +05:30
deepeshgarg007	5ad7b655cf	fix: Divide by zero exception handling	2019-04-03 09:11:03 +05:30
Nabin Hait	b4263a41c6	fix: Validate gl entry debit/credit as per field's precision	2019-04-01 19:11:34 +05:30
Rohit Waghchaure	6f3f2185ab	fix: pos takes more time to add an item in the cart	2019-04-01 16:45:47 +05:30
Nabin Hait	51d08786dc	fix: Show Sales Person in AR/AP print is optional	2019-04-01 16:24:23 +05:30
deepeshgarg007	4614eb219b	Merge branch 'hotfix' of https://github.com/frappe/erpnext into payment_entry	2019-04-01 11:48:07 +05:30
Nabin Hait	093f4c529b	Merge pull request #17055 from deepeshgarg007/tds fix: TDS payable monthly report fix	2019-04-01 11:12:45 +05:30
Rohit Waghchaure	614f5adf6d	fix: code cleanup	2019-04-01 10:53:08 +05:30
Rohit Waghchaure	5fa9a7a1b4	feat: unlink advance payment entry on cancelation of order	2019-04-01 00:40:38 +05:30
Rohit Waghchaure	e540534e42	fix: Pricing rule not working for POS	2019-03-31 17:13:18 +05:30
deepeshgarg007	d0b98d74de	fix: Allow doctype only in party account types	2019-03-30 19:44:31 +05:30
rohitwaghchaure	43d79eaa92	Merge pull request #17057 from hrwX/bank_reconciliation_fix fix(Bank Reconciliation): get credit and debit as float and not string	2019-03-30 10:16:12 +05:30
rohitwaghchaure	9d159be826	Merge pull request #17064 from rohitwaghchaure/not_able_to_create_chart_of_account fix: user not able to create chart of account in parent if child has no chart of account	2019-03-30 10:14:19 +05:30
Rohit Waghchaure	cc59fcd75e	fix: user not able to create chart of account in parent if child has no chart of account	2019-03-29 19:23:04 +05:30
Rohit Waghchaure	fd2b1385a3	fix: user not able to create chart of account in parent if child has no chart of account	2019-03-29 19:20:47 +05:30
Himanshu Warekar	95003cbbca	fix: get credit and debit as float and not string	2019-03-29 16:21:59 +05:30
Himanshu Warekar	f7f85f7379	fix: get credit and debit in float and not string	2019-03-29 16:19:15 +05:30
deepeshgarg007	4092ead41e	fix: fetch account only if available	2019-03-29 16:19:04 +05:30
Nabin Hait	7b2c52b6f2	Merge branch 'hotfix' of https://github.com/frappe/erpnext into develop	2019-03-29 13:26:46 +05:30
Nabin Hait	862f77cc13	Merge branch 'deferred_revenue' into hotfix	2019-03-29 13:26:16 +05:30
Nabin Hait	66d07c2700	fix(accounts): Indentation	2019-03-29 13:25:11 +05:30
Nabin Hait	d4e038b6ca	Merge branch 'hotfix' of https://github.com/frappe/erpnext into develop	2019-03-29 12:41:48 +05:30
Nabin Hait	cf7538c17f	Merge pull request #17046 from nabinhait/deferred_revenue Refactor: deferred revenue booking logic	2019-03-29 12:39:36 +05:30
rohitwaghchaure	043cfe99ad	Merge pull request #17051 from rohitwaghchaure/accounts_receivable_summary_issue fix: accounts receivable summary	2019-03-29 09:28:21 +05:30
Rohit Waghchaure	9da14747aa	fix: accounts receivable summary	2019-03-29 09:26:40 +05:30
Rohit Waghchaure	573d1dd31f	fix: bank reconciliation not working	2019-03-28 20:39:49 +05:30
Nabin Hait	86fb523ea7	fix(accounts): codacy fixes	2019-03-28 20:06:57 +05:30
Nabin Hait	0a90ce5cf6	Refactored deferred revenue booking logic	2019-03-28 19:43:02 +05:30
Rohit Waghchaure	d5e45481cd	fix: code cleanup	2019-03-28 17:09:57 +05:30
rohitwaghchaure	a8c9b81d93	Merge pull request #17040 from rohitwaghchaure/pricing_rule_not_working_for_item_groups fix: pricing rule mixed connditions not working for item group	2019-03-28 16:52:55 +05:30
Rohit Waghchaure	39a41e7427	fix: pricing rule mixed connditions not working for item group	2019-03-28 16:51:57 +05:30
Saurabh	84a18f5b18	Merge branch 'master' into develop	2019-03-28 13:54:34 +05:30
Faris Ansari	8fdcda7d6d	Merge pull request #16411 from adityahase/dashboard feat: Accounting Dashboard	2019-03-28 11:16:41 +05:30
Suraj Shetty	abc2a64d5e	fix: Commonify get gl_entry code by moving it to accounts_controller	2019-03-27 20:25:18 +05:30
Sagar Vora	d20ecb0a71	fix(accounts): dependent field should be displayed after source link field	2019-03-27 17:42:42 +05:30
rohitwaghchaure	4510e3a836	Merge pull request #17020 from rohitwaghchaure/offline_pos_duplicate_records_making fix: offline pos, duplicate records creating	2019-03-26 22:49:42 +05:30
Himanshu Warekar	1b05ed042f	Cost Center as per company	2019-03-26 20:25:54 +05:30
Rohit Waghchaure	1df62097f6	fix: offline pos, duplicate records creating	2019-03-26 19:15:53 +05:30
Nabin Hait	411f66a177	Merge pull request #17006 from deepeshgarg007/account-fix fix: Ignore root company validation setting in company master	2019-03-26 17:49:21 +05:30
deepeshgarg007	3eeb1cacb0	fix: Change name to Allow Account Creation against Child Company in company master	2019-03-26 17:18:06 +05:30
Anurag Mishra	10c1db1b28	fix: removed empty row on getting invoices	2019-03-26 16:30:31 +05:30
Anurag Mishra	ca4117e652	feat: seting status and indicators on list view	2019-03-26 16:03:00 +05:30
Anurag Mishra	702c6e00da	fix: route on loan Disbursement and Closing	2019-03-26 16:00:43 +05:30
deepeshgarg007	c45c2bdabb	fix: Missing semicolon	2019-03-26 15:38:38 +05:30
deepeshgarg007	7aefc15352	fix: Allow to add child account if ignore validation checked	2019-03-26 15:09:29 +05:30
Anurag Mishra	78903b1e57	fix: test for invoice payment by setting default Bank Account	2019-03-26 12:59:30 +05:30
Rohit Waghchaure	c7b916ac46	fix: test cases	2019-03-26 12:52:32 +05:30
Rohit Waghchaure	4389cf0c48	feat: provision to make Maintenance Schedule from sales invoice	2019-03-26 12:52:32 +05:30
deepeshgarg007	1c785a99b1	fix: Added setting in company to ignore root company validation	2019-03-25 22:32:29 +05:30
Mangesh-Khairnar	324e06cba0	Merge branch 'develop' of https://github.com/frappe/erpnext into so-on-hold	2019-03-25 18:51:13 +05:30
Rohit Waghchaure	1c1d0bb1c7	feat: commonified item group wise target variance report	2019-03-25 17:56:43 +05:30
Faris Ansari	843b7f6dd5	fix: Reorder Currency column to fix print (#17008 ) Every Financial Report's 2nd column is Currency, which is an implicit requirement to Print them properly. In this case, Income column was not printed. This fixes that.	2019-03-25 15:50:36 +05:30
Rohit Waghchaure	4ed7d035cb	fix: incorrect paid amount in accounts receivable summary report	2019-03-25 15:37:25 +05:30
Rohit Waghchaure	4792a84b5f	fix: rename pricing rule child doctype names	2019-03-25 14:28:08 +05:30
rohitwaghchaure	794b6b6c0d	Merge pull request #17004 from surajshetty3416/fix-bank-reconciliation-entries-hotfix fix: Show consolidated amount of payment entries in Bank reconciliation	2019-03-25 14:11:47 +05:30
deepeshgarg007	4f9ac0ad55	fix: Child company account currency fix	2019-03-25 11:39:25 +05:30
Suraj Shetty	67876d1026	fix: Show amount of entry based on diff of credit and debit	2019-03-25 11:19:07 +05:30
Himanshu Warekar	92593bb717	fix: Cost center as per company	2019-03-23 19:46:31 +05:30
Frappe Bot	b07a5d449d	Merge branch 'master' into develop	2019-03-23 07:25:03 +00:00
Zarrar	963d62b701	feat: Chart of Accounts Importer (#16623 ) * bare doctype created for COA utility * improvise doctype's design * validation to check no transaction exist for the company * download file and import coa - client side logic added * download csv template to create custom chart * read the custom csv uploaded and parse it to appropriate format * convert list of list to nested tree structure * preview the uploaded chart before actual import * toggle field based on necessity * tweak create_charts and build_json logic to incorporate COA Import utility * code cleanify and validation call added * code enhancement for flexibility and validation added * show import button only if data is validated * unset existing data and load new accounts * disable coa fields if parent_company set, minor improv * file api fix * added progress bar * codacy fixes * fix: Add account number in template * fix: TDS account exception handling fix	2019-03-23 10:30:12 +05:30
Saif Ur Rehman	7d1c1aa28f	fix(Party Ledger Summary): Show all adjustment entries as columns Consider only Income Account or Expense Account account type for adjustment amounts Check if GL Entry's is_opening == "Yes"	2019-03-22 17:18:32 +05:00
rohitwaghchaure	56e491bccd	Merge pull request #16983 from rohitwaghchaure/allow_on_submit_for_budget_fields feat: enabled allow on submit for action fields in the Budget	2019-03-22 15:34:41 +05:30
Rushabh Mehta	da87a491ab	Merge pull request #16816 from finbyz/hotfix fix: Rounding adjustment in Rounded Total	2019-03-22 12:51:09 +05:30
Rushabh Mehta	7678c7b179	Merge pull request #16869 from rohitwaghchaure/not_able_to_submit_purchase_receipt fix: purchase receipt not able to submit because default inventory account has not selected in another company	2019-03-22 12:47:06 +05:30
Rushabh Mehta	9c43c8f00b	Merge pull request #16554 from SaiFi0102/Brand-Item-Defaults-V12 feat: Brand Item Defaults (v12)	2019-03-22 12:46:04 +05:30
Rushabh Mehta	7defd6f3b5	Merge pull request #16749 from Alchez/hotfix-cancelled-payments fix(payments): Only check for Draft or Submitted payments while cancelling payment requests	2019-03-22 12:43:52 +05:30
Rohit Waghchaure	9c214b6129	feat: enabled allow on submit for action fields in the Budget	2019-03-22 12:08:09 +05:30
Saurabh	3c95387926	Merge branch 'master' into develop	2019-03-20 14:39:49 +05:30
rohitwaghchaure	f45db71ba2	Merge pull request #16964 from rohitwaghchaure/fix_cost_center_mapping_not_working fix: Cost center from PO to PI is not mapping	2019-03-20 13:40:05 +05:30
Rohit Waghchaure	f288866130	fix: Cost center from PO to PI is not mapping	2019-03-20 13:34:28 +05:30
Rohit Waghchaure	a322687897	fix: Accounts receivable report, remarks showing in the sales person column	2019-03-19 18:10:08 +05:30
rohitwaghchaure	40046721b2	Merge pull request #16954 from rohitwaghchaure/pos_cost_center_not_added_against_debtors fix: POS, cost center not added against debtors	2019-03-19 16:38:07 +05:30
Rohit Waghchaure	8808a3fc8e	fix: POS, cost center not added against debtors	2019-03-19 15:32:05 +05:30
rohitwaghchaure	4904ce649e	Merge pull request #16952 from rohitwaghchaure/fixed_accounts_receivable_summary_advance_amt fix: advance amount is not calculating properly	2019-03-19 15:26:41 +05:30
Rohit Waghchaure	1a6e01542a	fix: advance amount is not calculating properly	2019-03-19 15:06:01 +05:30
Rohit Waghchaure	8bfe330b37	feat: pricing rule enhancements	2019-03-19 12:44:30 +05:30
Himanshu Warekar	642a5b69f5	fix: change customer to supplier	2019-03-18 21:53:33 +05:30
rohitwaghchaure	2046024de9	Merge pull request #16942 from hrwX/invoice-creation-tool fix(Invoice Creation Tool): Disable P/L validation for opening invoice creation	2019-03-18 15:48:55 +05:30
Himanshu	ac199580af	fix(Customer Ledger): ambiguous error in where clause (#16914 ) fix for error "InternalError: (1052, u"Column 'company' in where clause is ambiguous")" in Customer Ledger Summary	2019-03-18 15:44:54 +05:30
Rohit Waghchaure	d4e4316d0b	fix: test cases and codacy	2019-03-18 14:18:49 +05:30
Zlash65	01086ff60c	codacy fixes	2019-03-18 12:50:29 +05:30
Zlash65	11bba571af	test case added to check account syncing	2019-03-18 12:50:29 +05:30
Zlash65	f71cb8dc6d	fix: return if no descendants found	2019-03-18 12:50:28 +05:30
Zlash65	d787ef8b8e	feat: sync account created for a group company to all its descendants	2019-03-18 12:50:28 +05:30
Zlash65	88c990901d	fix: added validation to if account is being added to child company	2019-03-18 12:50:28 +05:30
Zlash65	0407bf1e00	fix: override primary action button, change filter to root company	2019-03-18 12:50:27 +05:30
Zlash65	2def228da8	feat: allow adding account only if topmost parent company - hidden filter for Parent Company added - Add button overriden with new condition	2019-03-18 12:50:27 +05:30
Himanshu Warekar	aa03ea2a56	disbale pl check for Sales and Purchase Invoice	2019-03-18 12:36:42 +05:30
Rohit Waghchaure	ace95d5a67	feat: added cost center filter in AR/AP reports	2019-03-18 12:21:00 +05:30
Mangesh-Khairnar	a1afd78723	feat: add validation for on hold purchase order	2019-03-18 12:14:25 +05:30
Aditya Hase	42640cb908	fix(dashboard): Add configuration to chart source	2019-03-18 11:18:43 +05:30
Deepesh Garg	3ead70ba3c	fix: Change IBAN Account length from 25 to 30 (#16847 )	2019-03-18 08:22:57 +05:30
Deepesh Garg	2ae7ed4cf0	fix: Gross profit report fix (#16935 )	2019-03-17 09:49:24 +05:30
rohitwaghchaure	fd33c55760	Merge pull request #16865 from rohitwaghchaure/purchase_invoice_asset_issue_not_able_to_submit feat: added provision to disable CWIP accounting in asset settings	2019-03-16 12:18:36 +05:30
Rushabh Mehta	349a1157ef	Merge pull request #16717 from jigartarpara/fix_payment_term_template fix: Add credit month in validation	2019-03-15 09:03:54 +05:30
Rushabh Mehta	59a3012a5c	Update payment_request.py	2019-03-15 08:57:49 +05:30
Anurag Mishra	ed190bb329	fix: codacy	2019-03-14 18:14:20 +05:30
Anurag Mishra	1c7baaeba5	test: tests for loan status Disbursed, Settled and on payment Entry for attached invoices	2019-03-14 16:45:02 +05:30
Anurag Mishra	6deffbd6e8	test: loan_return date and loan Sanctioned on submit	2019-03-14 16:44:49 +05:30
Anurag Mishra	4a538ba78a	Resolve merge conflict	2019-03-14 16:43:16 +05:30
Nabin Hait	ed96591618	feat(accounts): Invoice Discounting	2019-03-14 16:42:44 +05:30
Bassam Ramadan	e14758c897	fix: add returns field to cashier closing (#16911 )	2019-03-14 15:01:50 +05:30
Aditya Hase	3b75551739	feat(dashboard): Render Account Balance Timeline is a time series	2019-03-12 14:47:21 +05:30
Aditya Hase	59fc039c77	style: Linting fixes	2019-03-12 14:47:21 +05:30
Aditya Hase	1e0f9a2882	feat(dashboard): Use caching decorator for dashboard	2019-03-12 14:47:21 +05:30
Aditya Hase	76158e6643	feat(dashboard): Export chart source doc to JSON file	2019-03-12 14:47:21 +05:30
Aditya Hase	675c1d3a5a	refactor(dashboard): Move Soure settings to account_balance_timeline.js	2019-03-12 14:47:20 +05:30
Aditya Hase	09f2ed2e69	refactor(dashboard): Move dashboard.py to account_balance_timeline.py	2019-03-12 14:47:20 +05:30
Aditya Hase	d85b0ae602	fix(dashboard): Remove unused variables	2019-03-12 14:47:20 +05:30
Aditya Hase	2fa1d9caed	fix(dashboard): Remove print statement	2019-03-12 14:47:20 +05:30
Aditya Hase	15c0cfff0f	refactor(dashboard): Convert indentation to tabs	2019-03-12 14:47:20 +05:30
Aditya Hase	4b171ddebb	feat(dashboard): Remove hardcoded company filter	2019-03-12 14:47:20 +05:30
Aditya Hase	3b593e44c6	feat(dashboard): Set account from filters	2019-03-12 14:47:20 +05:30
Aditya Hase	5911e100ad	fix(dashboard): Consider opening balance	2019-03-12 14:47:20 +05:30
Aditya Hase	6cadf77073	feat(dashboard): Add Time Grain filter	2019-03-12 14:47:20 +05:30
Aditya Hase	c888e52788	feat(dashboard): Add missing dates	2019-03-12 14:47:20 +05:30
Aditya Hase	8896374413	feat(dashboard): Add timespan filter	2019-03-12 14:47:20 +05:30
Aditya Hase	953229fa47	feat(dashboard): Create Accounting dashboard from General Ledger Report	2019-03-12 14:47:20 +05:30
Frappe Bot	7e67a400cd	Merge branch 'master' into develop	2019-03-08 09:39:33 +00:00
Rohit Waghchaure	6b33c9b934	fix: purchase receipt not able to submit because default inventory account has not selected in another company	2019-03-08 11:13:35 +05:30
Rohit Waghchaure	821a002125	feat: added provision to disable CWIP accounting in asset settings	2019-03-08 10:51:37 +05:30
Saif Ur Rehman	e62bd893c5	Merge branch 'develop' of https://github.com/frappe/erpnext.git into Brand-Item-Defaults-V12 # Conflicts: # erpnext/stock/doctype/item/test_item.py	2019-03-08 01:29:39 +05:00
Rohit Waghchaure	db8500c03a	POS profile, account for change amount must be cash or bank account	2019-03-06 18:28:45 +05:30
Rushabh Mehta	1f0792d5ea	Merge pull request #16823 from jay-parikh/sales-return fix: Python 3 Sales Invoice Return Validation "validate_pos"	2019-03-05 08:05:00 +05:30
rohitwaghchaure	369d20ac2b	Merge pull request #16829 from rohitwaghchaure/gst_purchase_invoice_hsn_number fix: HSN code not disaplying for the GST Purchase Invoice print format	2019-03-04 16:58:58 +05:30
rohitwaghchaure	e552170ce6	Merge pull request #16704 from Anurag810/vedmata-print-formats feat: Auditors print formats	2019-03-04 16:58:31 +05:30
rohitwaghchaure	8c96e06e19	Merge pull request #16629 from Anurag810/gross-and-net-profit-report feat: Gross and Net Profit Report	2019-03-04 16:57:21 +05:30
Anurag Mishra	0c9945e0bf	Minor fixes	2019-03-04 16:14:53 +05:30
Anurag Mishra	02138b6bfc	fix: gross depends upon now report type	2019-03-04 14:46:28 +05:30
Rohit Waghchaure	9842ce5a79	fix: HSN code not disaplying for the GST Purchase Invoice print format	2019-03-04 13:39:52 +05:30
Deepesh Garg	44ff41188d	fix: Selling and buying amount precision fix (#16764 )	2019-03-04 12:56:27 +05:30
Deepesh Garg	40743840b7	fix: Print letter head only if checked in Print Settings (#16789 ) Letter head is printed in financial statements even if option is not checked ![letter head option](https://user-images.githubusercontent.com/42651287/53430759-26baa080-3a15-11e9-948a-bc95700a18d2.png)	2019-03-04 12:53:11 +05:30
Anurag Mishra	1e4e61bd94	Minor fixes	2019-03-04 12:36:51 +05:30
Anurag Mishra	f3bdeedc68	minor fixes	2019-03-04 12:27:41 +05:30
Mangesh-Khairnar	4f350fcadb	feat: validate sales order in sales invoice	2019-03-02 20:48:04 +05:30
Jay Parikh	c2090939d7	Fix Sales Invoice Return Validation "validate_pos"	2019-03-02 12:19:32 +00:00
Frappe Bot	8f0660ab31	Merge branch 'master' into develop	2019-03-01 09:22:36 +00:00
rohitwaghchaure	066da6b1b6	Merge pull request #16817 from gaurav-naik/italy-einvoice-bank-details-fix fix(regional,italy): bank details, custom button on sales invoice	2019-03-01 14:26:07 +05:30
Gaurav	b30a9b1869	fix(regional,italy): bank details, custom button on sales invoice Updates to Bank details in e-invoice XML Additional fields on Payment Schedule Button to Generate E-Invoice on Sales Invoice (generates and replaces attached e-invoice) Replaced `x.decode('utf-8')` with `frappe.safe_decode(x, encoding='utf-8')` in setup.py Updated italian localisation patch line in patches.txt	2019-03-01 12:38:35 +05:30
FinByz Tech Pvt. Ltd	6635583103	fix: Rounding adjustment in Rounded Total In Purchase Receipt and GST Purchase Receipt report, the Rounded Total column doesn't display rounding adjustment of Base Grand Total. So, we have created a fix for that rounding adjustment.	2019-03-01 11:57:06 +05:30
Rohit Waghchaure	c21cda2790	Removed validation for group by voucher in general ledger	2019-02-28 16:20:45 +05:30
Frappe Bot	1fcae10258	Merge branch 'master' into develop	2019-02-28 10:20:48 +00:00
Anurag Mishra	a9a1552e32	refactor	2019-02-27 14:10:24 +05:30
Rushabh Mehta	76f36f68d3	Merge pull request #16790 from crossxcell99/master fix: call base class onload method	2019-02-27 08:31:14 +05:30
crossxcell99	f95171e808	fix: call base clase onload method	2019-02-26 18:01:37 +01:00
Sagar Vora	e0eafb1c2c	Merge branch 'master' into develop	2019-02-26 17:08:59 +05:30
Suraj Shetty	5636f924a9	fix: get mode of payment while selecting payment term in payment term template (#16765 )	2019-02-25 12:43:34 +05:30
Saurabh	3dd7ddd838	Merge branch 'master' into develop	2019-02-21 18:25:29 +05:30
Saurabh	47738f9792	Merge pull request #16750 from nabinhait/cc-against-bs fix: Ignore cost center while fetching outstanding invoices if not allowed from accounts settings	2019-02-21 18:12:06 +05:30
Nabin Hait	e08cb3a49b	Merge pull request #16745 from nabinhait/manage-returned-qty fix: Consider returned qty while making invoice from DN / PR	2019-02-21 18:11:37 +05:30
Saurabh	a05ccb76f4	Merge pull request #16748 from nabinhait/multi-company-serial-invoicing fix: Validate serial no usage in invoice considering multi company transaction	2019-02-21 18:07:40 +05:30
Nabin Hait	e797ec7463	Merge pull request #16746 from deepeshgarg007/gross_profit fix: Decimal point issue in gross profit print	2019-02-21 18:07:14 +05:30
Rohit Waghchaure	90691dc0d8	(Profit and Loss Statement, fix): for parent account value was showing as zero	2019-02-21 17:18:28 +05:30
Nabin Hait	b24caad789	fix: Ignore cost center while fetching outstanding invocies if not allowed from accounts settings	2019-02-21 17:11:35 +05:30
Rohan Bansal	143973166f	fix(payments): Only check for Draft or Submitted paymentswhile cancelling payment requests	2019-02-21 15:57:06 +05:30
Nabin Hait	26972c954d	fix: Validate serial no usage in invoice considering multi company transaction	2019-02-21 14:32:41 +05:30
deepeshgarg007	14ff6bfc32	fix: Decimal point issue in gross profit print	2019-02-21 12:08:32 +05:30
Nabin Hait	816a4655a0	fix: Consider returned qty while making invoice from DN / PR	2019-02-21 12:02:36 +05:30
Saurabh	482ebd2c7c	Merge branch 'master' into develop	2019-02-20 18:14:18 +05:30
rohitwaghchaure	c18e925d61	fix: Moved regional methods from controller to hooks (#16736 )	2019-02-20 17:13:15 +05:30
Sagar Vora	cc6e51c62d	Merge branch 'master' into develop	2019-02-19 18:09:49 +05:30
Nabin Hait	2c23f98b65	Merge pull request #16721 from nabinhait/ar-ap-fix fix: AR/AP report based on account type	2019-02-19 17:45:30 +05:30
Nabin Hait	e4f73929c4	fix: AR/AP report based on account type	2019-02-19 17:11:50 +05:30
Nabin Hait	21706894af	Merge pull request #16705 from deepeshgarg007/pos-precision fix: Fetch precision form system settings in Sales invoice payment(POS)	2019-02-19 15:06:56 +05:30
Nabin Hait	818ead4041	Merge branch 'hotfix' into purchase-qty-fix	2019-02-19 15:06:10 +05:30
Nabin Hait	157526c978	Merge pull request #16711 from rohitwaghchaure/multi_uom_not_working_for_rate_pricing_rule fix: multi-uom not working for the pricing rule rate	2019-02-19 15:05:07 +05:30
Nabin Hait	6bd3098824	Merge pull request #16716 from deepeshgarg007/precision-fix fix: Removed precision from multiple doctypes	2019-02-19 15:03:00 +05:30
Gaurav	f1e28e0e8d	mod(regional,italy): Updates to Italian Localization fixes: removed cleanup_files from italy/utils removed extract_doc_number from italy/utils added country filter to italian localization patch replaced dict assignment with dot operator in prepare_invoice correcions in e-invoice xml following changes in prepare_invoice added setup_report in patch added section for e-invoicing custom fields in company added Italy in test_company	2019-02-19 10:39:22 +05:30
Jigar Tarpara	1ac17ec1c4	Add credit month in validation	2019-02-19 10:21:01 +05:30
deepeshgarg007	de0f59b818	fix: Removed precision from multiple doctypes	2019-02-19 08:40:16 +05:30
Rohit Waghchaure	5821b672ad	fix: multi-uom not working for the pricing rule rate	2019-02-18 20:07:44 +05:30
deepeshgarg007	9a19e06856	fix: Change Received qty to accepted qty and validation for indicators	2019-02-18 18:42:15 +05:30
deepeshgarg007	48a7262fae	fix: Precision issue in POS payment	2019-02-18 15:05:36 +05:30
Anurag Mishra	879e5fd8bb	remove print and codacy	2019-02-18 14:43:55 +05:30
Anurag Mishra	42a106c7ba	Auditors print formats	2019-02-18 14:35:33 +05:30
Anurag Mishra	61f981ae05	Changes Requested	2019-02-18 11:43:32 +05:30
Frappe Bot	74fd5daeb2	Merge branch 'master' into develop	2019-02-15 10:22:33 +00:00
Nabin Hait	eb0627356b	Merge pull request #16650 from nabinhait/general-ledger-fix fix: show values in account/party currency based in actual entry, no conversion	2019-02-15 14:53:12 +05:30
Nabin Hait	4df7679c65	fix: Get outstanding invoices	2019-02-15 13:08:04 +05:30
Nabin Hait	c3698e458f	Merge pull request #16666 from nabinhait/deferred-revenue-fix fix: errors in deferred revenue booking	2019-02-14 18:49:01 +05:30
Nabin Hait	1c6a1dd5c0	Merge branch 'hotfix' into general-ledger-fix	2019-02-14 18:37:40 +05:30
Nabin Hait	29fcb14c42	fix: errors in deferred revenue booking	2019-02-13 17:18:12 +05:30
Anurag Mishra	4f0fd38209	refractor	2019-02-13 16:46:05 +05:30
Sagar Vora	551f52fd25	Merge branch 'master' into develop	2019-02-12 16:41:24 +05:30
Nabin Hait	6447069e50	fix: show values in account/party currency based in actual entry, no conversion	2019-02-12 16:41:20 +05:30
Nabin Hait	fdefbdb23b	Merge pull request #16609 from nabinhait/multipel_fixes Multiple fixes	2019-02-12 13:56:06 +05:30
Nabin Hait	ab50211e18	fix: show project even if PI is directly created	2019-02-11 18:25:18 +05:30
Anurag Mishra	aaa57026ac	Merge branch 'gross-and-net-profit-report' of https://github.com/Anurag810/erpnext into gross-and-net-profit-report	2019-02-11 17:02:59 +05:30
Anurag Mishra	f70d4089bc	fix: codacy	2019-02-11 17:02:20 +05:30
Sagar Vora	4e92414850	Merge branch 'hotfix' into gross-and-net-profit-report	2019-02-11 16:00:28 +05:30
Anurag Mishra	a032f0528e	new report gross-and-net-profit-report	2019-02-11 13:12:44 +05:30
Nabin Hait	e3b0f4f9f6	fix: removed account type filter on employee advance account	2019-02-08 16:56:26 +05:30
Nabin Hait	27af6b377f	fix: defered accounting fixes	2019-02-08 16:56:26 +05:30
Aditya Hase	2a3c39f38a	fix(py3): Convert dict.values() to list for indexing	2019-02-08 12:02:57 +05:30
Aditya Hase	46d7456782	fix(py3): Convert list to filter for indexing	2019-02-08 12:02:14 +05:30
Aditya Hase	a86a569787	fix(py3): Convert dict.values() to list for indexing	2019-02-07 22:21:06 +05:30
Aditya Hase	3e954734d0	fix(py3): Convert filter to list for indexing	2019-02-07 22:21:05 +05:30
Aditya Hase	0b1dc32fcb	Merge pull request #16597 from adityahase/python3-fix fix(py3): Use range instead of xrange	2019-02-07 18:17:37 +05:30
Aditya Hase	b9dc031e86	fix(py3): Use range instead of xrange	2019-02-07 18:10:30 +05:30
Prateeksha Singh	ce27cffaad	refactor(desk_icon): Remove reference and patches to Desktop Icon	2019-02-07 09:58:21 +05:30
Sagar Vora	da1dc7fa52	Merge branch 'master' into develop	2019-02-05 18:40:39 +05:30
Nabin Hait	7b93e738ad	Merge pull request #16576 from nabinhait/pay_reco_fix fix: Optimising payment reconciliation queries	2019-02-05 10:28:03 +05:30
Nabin Hait	ac18498ca5	fix: Optimising payment reconciliation queries	2019-02-04 21:13:43 +05:30
Chinmay Pai	125505f2aa	fix(purchase_invoice): fix undefined variable fixes issue while creating purchase invoice Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>	2019-02-04 16:30:20 +05:30
Saif Ur Rehman	590491779a	Merge branch 'develop' of https://github.com/frappe/erpnext.git into Brand-Item-Defaults-V12 # Conflicts: # erpnext/stock/doctype/item/item.py	2019-02-02 02:49:04 +05:00
Saif Ur Rehman	00aaa48779	test(Item): test_item_defaults	2019-02-02 02:43:44 +05:00
Saif Ur Rehman	1a441b267d	Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12 # Conflicts: # erpnext/patches.txt	2019-02-01 19:17:04 +05:00
Sagar Vora	56cbfe4bb0	Merge branch 'master' into develop	2019-01-31 13:34:32 +05:30
Aditya Hase	66833f109b	fix(accounts): fetch subscription details only if required fields are populated	2019-01-30 19:40:40 +05:30
Sagar Vora	f97c5dad82	Merge branch 'staging' into develop	2019-01-29 18:39:14 +05:30
Sagar Vora	f3cfad7595	Merge branch 'master' into staging-fixes	2019-01-29 17:20:46 +05:30
rohitwaghchaure	a95ed44d3d	fix: test case for fiscal year (#16516 )	2019-01-29 16:24:53 +05:30
Nabin Hait	cc41b876fb	Merge pull request #16497 from nabinhait/bom_price BOM raw materials price	2019-01-29 14:58:40 +05:30
Sagar Vora	8f6509fa9a	Merge branch 'staging-fixes' into fiscal_year_should_always_be_for_12_months	2019-01-29 13:04:20 +05:30
Sagar Vora	9520e345bd	fix: better error messages	2019-01-29 13:03:46 +05:30
Nabin Hait	1df9a23e7b	Merge pull request #16513 from rohitwaghchaure/remove_zero_qty_items_on_click_os_pay feat: on click of pay button and on focus out of qty field remove the zero qty items from the cart	2019-01-29 13:02:56 +05:30
Rohit Waghchaure	07f75a3e54	feat: on click of pay button and on focus out of qty field remove the zero qty items from the cart	2019-01-29 13:00:18 +05:30
Rohit Waghchaure	a8e743e3c4	fix: fiscal year always be for 12 months	2019-01-29 12:55:04 +05:30
Deepesh Garg	a8cc4b105d	Merge branch 'staging-fixes' into pos_issue	2019-01-29 11:29:41 +05:30
Nabin Hait	3b8623e207	Merge pull request #16491 from adityahase/ar-fix fix(ar-summary): Changes to column list to match recent changes	2019-01-29 11:28:02 +05:30
Nabin Hait	ff2922cbbb	Merge pull request #16488 from deepeshgarg007/price_list fix(sales_invoice): fetch customer price list if available before pos price list	2019-01-29 11:24:22 +05:30
Nabin Hait	e8190473f5	Merge branch 'staging-fixes' into unicode	2019-01-29 11:13:04 +05:30
deepeshgarg007	f0cfe98860	fix: Added missing semicolon and removed null from parameter	2019-01-28 17:58:44 +05:30
deepeshgarg007	4e4b200972	Merge branch 'staging-fixes' of https://github.com/frappe/erpnext into pos_issue	2019-01-27 22:54:34 +05:30
deepeshgarg007	c2ffcc5e71	feat(POS): Customer wise price list in offline mode and enhancement in POS closing voucher	2019-01-27 16:09:07 +05:30
deepeshgarg007	76556e1a3e	Merge branch 'staging-fixes' of https://github.com/frappe/erpnext into price_list	2019-01-25 16:50:06 +05:30
deepeshgarg007	8c84b7b888	fix: Doctype Name correction	2019-01-25 16:44:45 +05:30
Nabin Hait	3476a457ad	fix: minor	2019-01-25 16:22:36 +05:30
deepeshgarg007	1f9a6febdd	fix: Assign given price list if POS price list is not available	2019-01-25 11:53:55 +05:30
Nabin Hait	596c1b3489	Merge pull request #16220 from SaiFi0102/Party-Ledger-Summary feat: Party Ledger Summary Report	2019-01-25 11:22:55 +05:30
Nabin Hait	e21bdf020c	Merge pull request #16472 from deepeshgarg007/cost_center fix(cost_center): Bug fix in update_cost_center_number argument name	2019-01-25 09:56:52 +05:30
Nabin Hait	a6ab38665d	Merge pull request #16487 from netchampfaris/fix-gst-pos-invoice fix: Dont show 0 amount taxes and tax breakup	2019-01-25 09:54:07 +05:30
Nabin Hait	393080ecbe	Merge pull request #16492 from rohitwaghchaure/ascii_code_issue_pos_offline_not_working fix: ascii codec while opening offline POS	2019-01-25 09:50:41 +05:30
Rohit Waghchaure	e14cc8f2b6	fix: bank reconcilliation showing multiple entries against one JV	2019-01-25 00:23:41 +05:30
Saif Ur Rehman	3d275af67b	Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12 # Conflicts: # erpnext/buying/doctype/supplier/supplier.json # erpnext/patches.txt # erpnext/selling/doctype/customer/customer.json	2019-01-24 23:40:16 +05:00
Rohit Waghchaure	74df01d3d1	fix: ascii code while opening offline POS	2019-01-25 00:03:35 +05:30
rohitwaghchaure	7e4cf62a15	Merge pull request #16370 from rohitwaghchaure/show_outward_entries_in_negative Show outward entries in negative for Bank Clearance Summary report	2019-01-24 22:13:40 +05:30
Aditya Hase	a40c43e414	fix(ar-summary): Changes to column list to match recent changes	2019-01-24 19:13:32 +05:30
deepeshgarg007	c48efaba6e	fix(sales_invoice): fetch customer price list if available before pos profile price list	2019-01-24 17:15:38 +05:30
Faris Ansari	d6f837c5e5	fix: Dont show 0 amount taxes and tax breakup	2019-01-24 17:10:33 +05:30
deepeshgarg007	19ab86a3a7	fix:(cost_center): fix for update cost center number	2019-01-23 17:28:13 +05:30
Frappe Bot	e415cce1a9	Merge branch 'staging' into develop	2019-01-23 08:19:00 +00:00
Nabin Hait	141c543f97	Update journal_entry.js	2019-01-23 12:14:55 +05:30
Nabin Hait	36706c04bb	Merge pull request #16451 from nabinhait/unicode-issue fix: Unicode issue in purchase invoice	2019-01-23 12:11:00 +05:30
Nabin Hait	fb8c0bd664	Merge pull request #16464 from adityahase/flakes style: Linting fixes	2019-01-23 12:08:57 +05:30
Nabin Hait	4ef578e1c4	Merge pull request #16406 from rohitwaghchaure/newchanges_in_tds_reports fix: Multiple fixes in the reports	2019-01-23 12:05:36 +05:30
Aditya Hase	f79937d64b	style: Remove unused imports	2019-01-23 00:28:37 +05:30
Aditya Hase	f3c22f342c	fix(unicode): Import unicode_literals in every file	2019-01-22 18:36:10 +05:30
Saif Ur Rehman	74a3370095	Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12 # Conflicts: # erpnext/buying/doctype/purchase_order/purchase_order.json # erpnext/patches.txt # erpnext/selling/doctype/quotation/quotation.json # erpnext/selling/doctype/sales_order/sales_order.json	2019-01-22 16:20:40 +05:00
Sagar Vora	4d1a9b10ed	Merge branch 'staging' into develop	2019-01-22 15:56:39 +05:30
Nabin Hait	a5270e561f	fix: Unicode issue in purchase invoice	2019-01-22 15:43:04 +05:30
Rohit Waghchaure	ddd9136d10	Renamed field and added finance book column in the trial balance simple report	2019-01-22 14:11:57 +05:30
Aditya Hase	d157ae17b7	fix(ar-summary-report): Changes to column list to match recent changes in AR report	2019-01-22 13:37:54 +05:30
Zlash65	270c4c2a87	fix: push party filter only if applicable	2019-01-22 12:47:25 +05:30
Zlash65	c8d632ddff	fix: add set query for payroll entry in JV	2019-01-22 12:46:13 +05:30
Nabin Hait	b9b8d575bc	Merge pull request #16435 from deepeshgarg007/support-fix fix(accounts_receivable): Bug fix in accounts receivable report	2019-01-22 09:59:17 +05:30
Rohit Waghchaure	de718dacb2	fix: Code cleanup	2019-01-21 19:47:17 +05:30
deepeshgarg007	3565395e7a	Merge branch 'email_digest' of https://github.com/deepeshgarg007/erpnext into email_digest	2019-01-21 15:03:51 +05:30
deepeshgarg007	aab6d0e028	fix(email_digest): Linkes annual income and annual expense to profit and loss statement	2019-01-21 15:01:40 +05:30
deepeshgarg007	ff1078f271	fix(minor): fetch payment terms if voucher nos are available	2019-01-21 09:43:56 +05:30
Deepesh Garg	f7fe08c487	Merge branch 'develop' into email_digest	2019-01-20 16:53:41 +05:30
Saif Ur Rehman	31d58eac01	fix(Party Ledger Summary): Added Supplier/Customer Name column	2019-01-19 15:28:53 +05:00
Saif Ur Rehman	55566b7f8e	fix(Party Ledger Summary): Codacy fix	2019-01-19 15:12:08 +05:00
Himanshu	79d4400c16	fix: Offline pos fix (#16424 ) * Offline POS fix * Fixed items search and load items	2019-01-19 14:01:38 +05:30
Saif Ur Rehman	fcaed12a53	Merge branch 'Party-Ledger-Summary' of https://saifi0102@github.com/SaiFi0102/erpnext.git into Party-Ledger-Summary	2019-01-19 13:18:23 +05:00
Saif Ur Rehman	398f593e5f	Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12 # Conflicts: # erpnext/patches.txt	2019-01-18 17:33:19 +05:00
Nabin Hait	bace4d3e6d	Merge pull request #16358 from adityahase/naming-series feat(naming): Deferred naming for SLE and GL Entry	2019-01-18 10:55:30 +05:30
Nabin Hait	bef2c22d23	Fix: merge conflict	2019-01-18 10:15:47 +05:30
Rohit Waghchaure	fa7ee0b3b6	Added dafult bank account in the customer/supplier	2019-01-17 15:45:27 +05:30
Rohit Waghchaure	f725816809	Enhance: Added field limit in the Payment Reconciliation to handle large entries	2019-01-17 12:54:14 +05:30
Nabin Hait	873442a55d	Merge branch 'staging-fixes' into Party-Ledger-Summary	2019-01-16 17:52:45 +05:30
Nabin Hait	28ccaa3c88	Merge branch 'staging-fixes' into Gross-Profit-Return-Fix	2019-01-16 17:49:22 +05:30
Saif Ur Rehman	fccb1e55ec	fix(Gross Profit Report): corrected fieldnames in return invoice query	2019-01-16 14:36:55 +05:00
Saurabh	7d630b3e29	Merge branch 'master' into staging-fixes	2019-01-15 19:41:09 +05:30
Rohit Waghchaure	affeb3dfec	Added on account amount field in Accounts Payable/Receivable Summary	2019-01-15 17:38:31 +05:30
Rohit Waghchaure	1a4c1e11cb	Fix: total invoiced amount in Accounts Receivable Summary report showing blank	2019-01-15 17:01:34 +05:30
Rohit Waghchaure	b2d08a498b	Added bank account field in the payment entry	2019-01-15 16:11:29 +05:30
Rohit Waghchaure	bdee57ca8d	Added finance book in trial balance and fixed cost center not working issue in trial balance	2019-01-15 15:52:52 +05:30
Saif Ur Rehman	f86123ad5a	feat(Party Ledger Summary): Include columns for discount and other adjustments	2019-01-15 15:18:43 +05:00
Rohit Waghchaure	df7215dcb2	Added supplier name in the tds report	2019-01-15 14:48:06 +05:30
Nabin Hait	4ed7cfc515	tests(cost-center-company): Validate cost center's company and revent tests	2019-01-14 17:14:39 +05:30
Saif Ur Rehman	502f15ba1b	test: test_party_details_tax_category	2019-01-12 19:07:39 +05:00
Saif Ur Rehman	bbd1e47758	test: test_tax_calculation_with_item_tax_template	2019-01-12 18:28:15 +05:00
rohitwaghchaure	ba54209c86	[Fix] Exchange rate revaluation, get entries not working if accounts of the other currency than company currency not available (#16379 )	2019-01-12 17:58:00 +05:30
Saif Ur Rehman	5085673030	test: fix for Item Tax Template v12	2019-01-11 03:53:43 +05:00
Nabin Hait	187bdf08a6	Merge pull request #16319 from SaiFi0102/Gross-Profit-Exclude-Opening-Invoice fix: Exclude Opening Invoice from Gross Profit Report and Company Dashboard Chart	2019-01-10 10:55:41 +05:30
Saif Ur Rehman	8d61794540	Merge branch 'Item-Tax-Template' of https://github.com/SaiFi0102/erpnext.git into Item-Tax-Template-V12 # Conflicts: # erpnext/patches.txt # erpnext/stock/doctype/item/item.json	2019-01-10 04:23:40 +05:00
deepeshgarg007	720020319f	fix(Codacy): removed unused variable	2019-01-09 21:56:45 +05:30
deepeshgarg007	c039f70496	Test Cases for account balance report	2019-01-09 21:56:45 +05:30
deepeshgarg007	8621869d24	Created multiple reports and linked them to email digest	2019-01-09 21:56:45 +05:30
Rohit Waghchaure	701c762a68	Show outward entries in negative for Bank Clearance Summary report	2019-01-09 14:21:03 +05:30
Saif Ur Rehman	eb7277d2d4	Merge branch 'staging-fixes' of https://github.com/frappe/erpnext.git into Item-Tax-Template # Conflicts: # erpnext/patches.txt	2019-01-09 11:25:53 +05:00
Saif Ur Rehman	091cfba5fc	test: Added test for get_item_tax_template and get_item_tax_map	2019-01-09 11:24:30 +05:00
Nabin Hait	142d8aa973	Merge pull request #16321 from rohitwaghchaure/fixed_bank_clearance_negtive_value_amt fix: negative amount showing in the bank clearance summary report	2019-01-08 20:25:26 +05:30
Nabin Hait	e6ec6cccfa	Merge pull request #16316 from Anurag810/purchase-invoice-fixes fix: expense head of asset items in purchase invoice	2019-01-08 20:23:14 +05:30
Saurabh	afec3ca89a	Merge branch 'staging' into develop	2019-01-08 17:09:36 +05:30
Saif Ur Rehman	380b4b0926	Merge branch 'staging-fixes' of https://github.com/frappe/erpnext.git into Item-Tax-Template # Conflicts: # erpnext/accounts/doctype/accounts_settings/accounts_settings.json # erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json # erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json # erpnext/accounts/doctype/sales_invoice/sales_invoice.json # erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json # erpnext/buying/doctype/purchase_order/purchase_order.json # erpnext/buying/doctype/purchase_order_item/purchase_order_item.json # erpnext/buying/doctype/supplier/supplier.json # erpnext/buying/doctype/supplier_quotation/supplier_quotation.json # erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json # erpnext/selling/doctype/quotation/quotation.json # erpnext/selling/doctype/quotation_item/quotation_item.json # erpnext/selling/doctype/sales_order/sales_order.json # erpnext/selling/doctype/sales_order_item/sales_order_item.json # erpnext/setup/doctype/item_group/item_group.json # erpnext/stock/doctype/delivery_note/delivery_note.json # erpnext/stock/doctype/delivery_note_item/delivery_note_item.json # erpnext/stock/doctype/item/item.json # erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json	2019-01-08 13:41:46 +05:00
Nabin Hait	c190192d5f	Merge pull request #16277 from deepeshgarg007/loyalty-program-fix fix: Loyalty program issue fix in customer dashboard	2019-01-08 12:15:57 +05:30
Nabin Hait	4e3e784691	Merge pull request #16335 from deepeshgarg007/accounts-receivable-fix perf: Customer contact column in accounts receivable report	2019-01-08 11:52:20 +05:30
Deepesh Garg	7c45f45ebc	fix: Divide by zero exception fix in item wise purchase register (#16247 ) * Do not prepare row if stock quantity is not available * Update item_wise_purchase_register.py	2019-01-08 08:34:28 +05:30
Aditya Hase	85c6a0f002	fix(test): Do not rely on order by name	2019-01-08 00:09:37 +05:30
Aditya Hase	0c16424d7d	fix(naming): Use creation instead of name to order SLEs	2019-01-08 00:09:36 +05:30
Aditya Hase	972f659fd5	fix(naming): Use creation instead of name to order GL Entries	2019-01-08 00:09:30 +05:30
Aditya Hase	7bc692d48d	feat(naming): Deferred naming for Stock Ledger Entry and GL Entry For fast lockless insertions use hash as autonaming method for temporarily naming Stock Ledger Entry and GL Entry In an hourly run scheduled job rename these entries using autoname options	2019-01-08 00:07:54 +05:30
Saif	e5091cbc0f	chore: Updated DocType JSON Files to Clean Up Git Diff of Other PRs (#16356 ) * chore: Updated DocType json files to clean up git diff of other PRs * fix: remove auto-generated file	2019-01-07 18:19:30 +05:30
Sagar Vora	cad20abe83	Merge branch 'staging-fixes' into loyalty-program-fix	2019-01-07 15:32:40 +05:30
Sagar Vora	92cab55c72	Merge branch 'staging-fixes' into purchase-invoice-fixes	2019-01-07 15:03:37 +05:30
Sagar Vora	1310c238a9	Merge pull request #16350 from rohitwaghchaure/code_cleanup_general_ledger fix: replaced str to cstr in genral ledger report	2019-01-07 14:28:27 +05:30
Sagar Vora	fbadb19d93	Merge branch 'staging-fixes' into Gross-Profit-Exclude-Opening-Invoice	2019-01-07 13:55:43 +05:30
Saif Ur Rehman	848bbac05e	Added patch for Item Tax Template	2019-01-07 05:32:38 +05:00
Saif Ur Rehman	f484f0d6e8	Added test for Tax Rule based on Tax Category	2019-01-07 00:37:01 +05:00
Rohit Waghchaure	ed6725172d	Replaced str to cstr in genral ledger report	2019-01-06 20:07:18 +05:30
Saif Ur Rehman	13a6c0aeff	Fix tests	2019-01-06 18:14:18 +05:00
Deepesh Garg	0eca1646e6	Merge branch 'staging-fixes' into loyalty-program-fix	2019-01-06 12:16:54 +05:30
Saif Ur Rehman	7ea6554f1f	Merge branch 'staging' of https://github.com/frappe/erpnext.git into Item-Tax-Template # Conflicts: # erpnext/selling/doctype/quotation_item/quotation_item.json # erpnext/stock/doctype/item/item.json	2019-01-06 04:43:13 +05:00
Saif Ur Rehman	b1288b75ba	fix: Test Records	2019-01-06 04:41:13 +05:00
Frappe Bot	fdd5d54d41	Merge branch 'staging' into develop	2019-01-05 09:11:15 +00:00
deepeshgarg007	eabf260706	fix :Test cases for accounts receivable report	2019-01-04 12:34:28 +05:30
deepeshgarg007	9de81cda77	Added Customer contact column in accounts Receivable	2019-01-04 10:54:24 +05:30
Rohit Waghchaure	1ff1fc4725	[Fix] Negative amount showing in the bank clearance summary	2019-01-02 17:56:08 +05:30
Saif Ur Rehman	016f29f09b	fix: error due to passing None in scrub	2019-01-02 16:22:22 +05:00
Saif Ur Rehman	e194a655df	fix: is_opening != 'Yes'	2019-01-02 16:09:34 +05:00
Anurag Mishra	5865fcca3c	fix: expense head of asset items in purchase invoice	2019-01-02 14:36:07 +05:30
Charles-Henri Decultot	94e35e7a7e	Fix #15917 (#16311 )	2019-01-01 22:25:13 +05:30
deepeshgarg007	8300f5ede7	fix: Codacy issues and added test case	2019-01-01 20:28:49 +05:30
deepeshgarg007	78ad6c4cb7	Merge branch 'staging-fixes' of https://github.com/frappe/erpnext into loyalty-program-fix	2019-01-01 19:46:08 +05:30
Saif Ur Rehman	fac6b59627	Exclude opening invoices in Gross Profit Report	2019-01-01 16:33:22 +05:00
Nabin Hait	137a24f457	Merge pull request #16253 from chdecultot/sales_summary_correction [Fix] Filter cancelled and draft payments in sales payment summary	2018-12-31 12:02:19 +05:30
Saif Ur Rehman	f6a83daae6	fix: update item_tax_template account_type server-side validation	2018-12-29 02:27:03 +05:00
Saif Ur Rehman	eeead1d777	fix: Only load transaction's company's tax accounts in item tax map	2018-12-29 02:25:00 +05:00
Saif Ur Rehman	fd531a6b5e	feat: Tax Category based on Address	2018-12-29 01:49:11 +05:00
Saif Ur Rehman	aca374e478	feat: add_taxes_from_item_tax_template	2018-12-28 04:53:25 +05:00
Charles-Henri Decultot	e87eb07e16	Correction for Travis	2018-12-27 17:38:57 +00:00
Charles-Henri Decultot	8d71015bf8	Cleanup journal entries	2018-12-27 16:43:26 +00:00
Charles-Henri Decultot	b7339d7dcb	Test travis	2018-12-27 15:30:56 +00:00
Charles-Henri Decultot	43c7bd57e4	Cancel existing payment entries for data integrity in test	2018-12-27 14:43:30 +00:00
Charles-Henri Decultot	641d3e0073	Add own records	2018-12-27 13:43:56 +00:00
Charles-Henri Decultot	0f9c47c242	Remove pricing rule from items	2018-12-27 10:10:18 +00:00
Charles-Henri Decultot	02aa9fb240	Understand Travis	2018-12-27 08:46:29 +00:00
Suraj Shetty	3de12db2b1	Merge branch 'develop' of github.com:frappe/erpnext into general-ui-fixes	2018-12-27 09:05:25 +05:30
Saif Ur Rehman	677866824a	More work on Tax Category and Item Tax Template	2018-12-27 02:11:07 +05:00
Charles-Henri Decultot	d7777696d7	Corrections for Travis	2018-12-26 14:08:00 +00:00
Frappe Bot	9e09b3adbe	Merge branch 'staging' into develop	2018-12-26 12:16:20 +00:00
Charles-Henri Decultot	9c1db688d1	Ignore pricing rule for Travis	2018-12-26 10:33:42 +00:00
rohitwaghchaure	53a38e8edc	Merge pull request #16257 from surajshetty3416/permission-fixes Fix user permission checks	2018-12-26 14:49:01 +05:30
Charles-Henri Decultot	899b9b1ea7	Codacy correction	2018-12-26 08:56:11 +00:00
Charles-Henri Decultot	9d31452c25	Remove ununsed variable	2018-12-26 08:38:42 +00:00
Charles-Henri Decultot	ed94317df9	Test cases	2018-12-26 08:36:32 +00:00
deepeshgarg007	a1d015cc2f	Initialized loyalty_point_details	2018-12-26 11:01:02 +05:30
deepeshgarg007	12f5cefc12	Loyalty program issue fix in customer dashboard	2018-12-25 16:06:19 +05:30
rohitwaghchaure	136c4c4820	Merge pull request #16016 from rohitwaghchaure/fixed_tax_withholding_issue [Fix] Tax Withholding, TDS is applying on the tax	2018-12-25 14:49:05 +05:30
Suraj Shetty	146be9f6a6	Merge branch 'develop' of github.com:frappe/erpnext into general-ui-fixes	2018-12-24 16:08:43 +05:30
Rushabh Mehta	5d11abb0a2	fix(escaping): accounts_receivable.py	2018-12-24 16:03:24 +05:30
Rohit Waghchaure	94500a9d62	[Fix] TDS is applying on the tax	2018-12-24 15:13:52 +05:30
Charles-Henri Decultot	052033a76e	[Fix] Pos bugs (#16256 ) * Remove hard-coded values * Fix change pos profile + add campaign * Test case for coveralls * Remove unnecessary method	2018-12-24 14:39:30 +05:30
Suraj Shetty	772e8780b4	Merge branch 'staging-fixes' into permission-fixes	2018-12-24 10:35:12 +05:30
Suraj Shetty	b2965001d1	Replace 'Make' with 'Create'	2018-12-23 13:25:58 +05:30
Saif Ur Rehman	8ac261750b	Add and Modified DocTypes for Item Tax Template	2018-12-22 02:51:59 +05:00
Frappe Bot	1b7c583c48	Merge branch 'staging' into develop	2018-12-21 05:46:23 +00:00
Charles-Henri Decultot	813485023b	Filter cancelled and draft payments	2018-12-20 14:04:00 +00:00
Nabin Hait	0866b2b75a	Update accounts_receivable.py	2018-12-20 14:11:20 +05:30
Suraj Shetty	7ed37ae6c3	Commonify code - use get_permitted_documents function to avoid code redundancy	2018-12-19 19:56:42 +05:30
deepeshgarg007	b645c2c75e	Rebase using staging-fixes and resolved conflicts	2018-12-19 18:47:36 +05:30
deepeshgarg007	530453e4fc	Added temp variables for outstanding, credit_note_amt instead of function calling	2018-12-19 18:43:07 +05:30
deepeshgarg007	5de603c6af	breaked up code into multiple functions	2018-12-19 18:43:06 +05:30
deepeshgarg007	4ac8fcf4af	Added test case for Accounts receivable report based on payment terms	2018-12-19 18:43:06 +05:30
deepeshgarg007	a944f88b94	Removed column for pdc date	2018-12-19 18:43:06 +05:30
deepeshgarg007	17544d7ad6	Refactored accounts receivable report for payment terms	2018-12-19 18:43:06 +05:30
deepeshgarg007	e7a91b9526	Credit note fix	2018-12-19 18:43:06 +05:30
deepeshgarg007	f98adf2be5	Changed columns and added currency conditions	2018-12-19 18:43:06 +05:30
deepeshgarg007	b6c083706a	Allocation of credit note amount and pdc in payment terms	2018-12-19 18:43:06 +05:30
deepeshgarg007	24f8d3ed0c	Add columns based on payment terms	2018-12-19 18:43:06 +05:30
deepeshgarg007	a8ab9b5c3d	Accounts Receivable report based on payment terms	2018-12-19 18:43:06 +05:30
Suraj Shetty	7ae2d59ffd	Merge branch 'staging-fixes' into permission-fixes	2018-12-18 15:41:03 +05:30
Faris Ansari	4994d84565	fix(pos-profile): Cleanup Form for POS Profile (#16208 ) - Remove pos_profile_name field and use `name` as Prompt - Reorganize form and label sections - Remove `apply_discount` which was not used	2018-12-14 14:19:14 +05:30
Saif Ur Rehman	b53231595d	Using same filter for Sales Person from Accounts Receivable Added Customer/Supplier Ledger Summary in Accounts Module page	2018-12-12 15:46:50 +05:00
Saif Ur Rehman	b07d108bee	feat: Supplier Ledger Summary	2018-12-12 05:45:49 +05:00
Saif Ur Rehman	41236ed0e5	feat: Customer Ledger Summary report	2018-12-12 05:12:20 +05:00
Frappe Bot	fb2fdc4f4e	Merge branch 'staging' into develop	2018-12-11 09:55:01 +00:00
Pawan Mehta	377511165e	Simple Trial Balance (#16060 )	2018-12-10 21:55:01 +05:30
Suraj Shetty	07e5786e1b	Fix user permission checks	2018-12-10 19:10:18 +05:30
Frappe Bot	5b50b2848d	Merge branch 'staging' into develop	2018-12-10 13:08:33 +00:00
Saif	b52bd9c093	AR/AP Report Enhancement (#16175 ) * Modified AR/AP print format * Filter Sales Person based on either Customer or Voucher's assigned Sales Person * -Added Sales Person column to Accounts Receivable Summary -Added all filters in AR/AP Summary Report as in AR/AP Report -Reordered filters for better grouping -Fixed a bug that customer_name was not unset after removing Customer from filter	2018-12-10 17:56:42 +05:30
rohitwaghchaure	5472fff027	Added disabled field in the address (#16114 )	2018-12-10 17:45:39 +05:30
RicardoJohann	bc0ef0beca	Add Serial Number button in Delivery Note and Sales Invoice's Packing List (#16080 )	2018-12-10 17:43:03 +05:30
Deepesh Garg	0c3c148316	Linking company address to pos profile (#16142 ) * Linking company address to pos profile * Translation fix	2018-12-10 16:22:38 +05:30
Frappe Bot	7c2a5bddb1	Merge branch 'staging' into develop	2018-12-06 09:50:25 +00:00
Frappe Bot	ee5d7e6d0f	Merge branch 'master' into staging-fixes	2018-12-06 09:26:42 +00:00
Nabin Hait	dd7b020b01	fix(test): Fixed tests for period closing voucher	2018-12-03 14:24:41 +05:30
Nabin Hait	eda0a6eb33	fix(test): Fixed tests for period closing voucher	2018-11-30 15:15:17 +05:30
deepeshgarg007	ee05e358d1	Rewrote query using orm	2018-11-29 16:24:28 +05:30
deepeshgarg007	c981fb389b	Merge branch 'staging-fixes' of https://github.com/frappe/erpnext into supplier-customer-dashboard-fix	2018-11-29 14:57:50 +05:30
Ameya Shenoy	fe1f532bc0	Merge branch 'staging' into develop	2018-11-28 08:28:37 +00:00
Ameya Shenoy	2806d83362	Merge branch 'master' into staging-fixes	2018-11-28 08:12:48 +00:00
deepeshgarg007	ebe1e12a82	Codacy issue fixes	2018-11-28 08:21:54 +05:30
Nabin Hait	f642f86982	Merge branch 'hotfix' into accounts_receivable_summary_print_issue	2018-11-27 17:56:49 +05:30
Nabin Hait	96598936ad	fix(test): Fixed tests for discount with margin and period closing voucher	2018-11-27 17:48:13 +05:30
Rohit Waghchaure	10bcd5113c	[Fix] Accounts receivable summary print is not working	2018-11-27 16:25:35 +05:30
deepeshgarg007	f31caffa74	Changes in get_dashboard_info	2018-11-27 15:04:12 +05:30
deepeshgarg007	6372fbba54	Merge branch 'staging-fixes' of https://github.com/frappe/erpnext into supplier-customer-dashboard-fix	2018-11-27 14:06:58 +05:30
Nabin Hait	218fa51dba	Merge branch 'staging-fixes' into validate_due_date_for_purchase_invoice	2018-11-26 20:23:00 +05:30
Nabin Hait	212a29ae2c	Merge pull request #16028 from rohitwaghchaure/not_able_to_view_general_ledger [Fix] Not able to view general ledger for purchase invoice	2018-11-26 19:57:24 +05:30
Nabin Hait	25e60f3934	Merge pull request #16044 from ESS-LLP/fix-trial-balance fix: Trial Balance print	2018-11-26 19:56:27 +05:30
Nabin Hait	4191d7eb52	Merge pull request #16045 from SaiFi0102/GrossProfit-Fix-Buying-Amount-Multiple-Invoice Fixed get_buying_amount in Gross Profit report:	2018-11-26 19:55:06 +05:30
Rohit Waghchaure	d1a85a3637	[Fix] Due date can not be greter than posting date validation should consider supplier invoice date for purchase invoice	2018-11-26 18:42:29 +05:30
Nabin Hait	73ca3cfca6	fix(test): removed test print	2018-11-26 16:16:42 +05:30
Nabin Hait	2665c37f38	temp(travis): Print statement to fix travis	2018-11-26 11:05:28 +05:30
Nabin Hait	2508d11097	fix(test): Test cases fixed	2018-11-26 11:05:28 +05:30
deepeshgarg007	5dbb9f5312	Accounts receivable summary print fix	2018-11-23 19:54:08 +05:30
deepeshgarg007	a1cffc3490	minor changes in dashboard	2018-11-23 16:51:35 +05:30
deepeshgarg007	920dc1400f	Customer/Supplier dashboard fix for multi company setup	2018-11-23 10:17:28 +05:30
Ranjith	1879e91148	fix: Trial Balance	2018-11-21 16:04:05 +05:30
Saif Ur Rehman	23eef11cf5	Fixed get_buying_amount in Gross Profit report: To handle the case where there may be multiple invoices for a single delivery	2018-11-21 15:32:37 +05:00
Rohit Waghchaure	770a13ebc3	[Fix] Not able to view general ledger for purchase invoice	2018-11-20 13:01:52 +05:30
Frappe Bot	8c7373dfd0	Merge branch 'staging' into develop	2018-11-15 09:45:05 +00:00
Frappe Bot	eb4969d24f	Merge branch 'staging' into develop	2018-11-15 09:26:03 +00:00
Nabin Hait	0aca5aad14	Merge pull request #15976 from deepeshgarg007/summary [Fix] Accounts receivable summary print format showing zero values	2018-11-15 14:52:16 +05:30
Rohit Waghchaure	704796b1cb	Code optimization for consolidated financial statement report	2018-11-15 13:46:18 +05:30
Rohit Waghchaure	9d0f90975b	[Fix] Consolidated financial statement report currency conversion issue	2018-11-15 12:55:20 +05:30
Deepesh Garg	3b8c84fa75	Merge pull request #15975 from nabinhait/staging-fixes fix(test): Fixed item discount amount calculation and test cases related to pricing rule	2018-11-15 12:01:09 +05:30
Rohit Waghchaure	a95697f506	Added currency filter in consolidated financial statement report	2018-11-14 19:55:44 +05:30
Frappe Bot	b5c7b96a73	Merge branch 'staging' into develop	2018-11-13 11:33:31 +00:00
deepeshgarg007	7bc6f3843a	Fix for accounts Receivable Summary Showing zero values	2018-11-13 16:54:54 +05:30
Nabin Hait	688758a56f	fix(test): Fixed item discount amount calculation and test cases related to pricing rule	2018-11-13 16:13:16 +05:30
Saif	60ec88bcc8	Added Default Warehouse field that sets all item's warehouse (#15462 ) * -Added field def_warehouse that sets warehouse of all items -Grouped warehouse fields together and put raw materies supplied before items table, it will only show if there are any items supplied * Set def_warehouse in test_sales_order.py * Changed from def_warehouse to set_warehouse * Rest of def_warehouse to set_warehouse	2018-11-13 12:37:53 +05:30
Britlog	9e9e37d39b	[Fix] Conversion factor in offline POS (#15867 )	2018-11-13 11:34:27 +05:30
Himanshu Mishra	35b2627112	Item qty based tax (CESS) calculation support (#15456 ) * fix conflicts * added test case for qty cess * use company specified in document to get region	2018-11-13 11:13:04 +05:30
Zarrar	6922415d1b	[New Feature]Scan Item Barcode label to quick create/update records in items child table (#15731 ) * Update transaction.js * setup barcode scan stock entry controller not inherited from transaction.js, need to call setup barcode scan from transaction.js * fix bug of item_code change always reset qty to 0 when calling frappe.model.set_value(dt,dn,'item_code',xxx), even qty is set, system always reset qty to 0. * Update transaction.js * Update transaction.js * Update transaction.js * Update transaction.js * Update transaction.js * Update transaction.js * clean up barcode logic for transactions * call scan_barcode method for stock entry * separate out logic for searching serial, batch or barcode number * added scan barcode field in transactions doctype * search barcode-serial-batch sequence, code rectify * hide all barcode related field if disabled from settings * remove print statement * Update stock_entry.py	2018-11-13 11:11:32 +05:30
rohitwaghchaure	ab76ff0836	Added new option group by voucher(consolidated) in the general ledger report (#15957 )	2018-11-12 16:58:24 +05:30
JodeQ	1b8e9cd3bb	Permission error for new Sales invoice (#15952 ) In version ``` Installed Apps ERPNext: v11.0.3-beta.20 () (staging) Frappe Framework: v11.0.3-beta.25 () (staging) ``` When creating a new Sales invoice without healthcare active we have this error ``` Not permitted Insufficient Permission for Patient ``` Console log ``` Traceback (most recent call last): File "/home/frappe/auroraone-v11/apps/frappe/frappe/app.py", line 61, in application response = frappe.handler.handle() File "/home/frappe/auroraone-v11/apps/frappe/frappe/handler.py", line 21, in handle data = execute_cmd(cmd) File "/home/frappe/auroraone-v11/apps/frappe/frappe/handler.py", line 56, in execute_cmd return frappe.call(method, *frappe.form_dict) File "/home/frappe/auroraone-v11/apps/frappe/frappe/__init__.py", line 1007, in call return fn(args, *newargs) File "/home/frappe/auroraone-v11/apps/frappe/frappe/desk/search.py", line 53, in search_link search_widget(doctype, txt, query, searchfield=searchfield, page_length=page_length, filters=filters, ignore_user_permissions=ignore_user_permissions) File "/home/frappe/auroraone-v11/apps/frappe/frappe/desk/search.py", line 149, in search_widget as_list=not as_dict) File "/home/frappe/auroraone-v11/apps/frappe/frappe/__init__.py", line 1235, in get_list return frappe.model.db_query.DatabaseQuery(doctype).execute(None, args, **kwargs) File "/home/frappe/auroraone-v11/apps/frappe/frappe/model/db_query.py", line 40, in execute raise frappe.PermissionError(self.doctype) PermissionError: Patient ```	2018-11-12 16:42:05 +05:30
Frappe Bot	1ff9c691b7	Merge branch 'staging' into develop	2018-11-09 10:21:07 +00:00
Frappe Bot	4df671585b	Merge branch 'master' into staging-fixes	2018-11-09 10:11:27 +00:00
rohitwaghchaure	a88eaa6e20	[Fix] User able to change discount if pricing rule has discount value as zero (#15921 )	2018-11-08 13:05:08 +05:30
Shreya Shah	9e484fbc12	fix(payment-entry): Take default value None for paid_from (#15777 )	2018-11-08 12:52:14 +05:30
Nabin Hait	6ff2f395f5	fix(gle): Post gl entry for booking COGS from Sales Invoice even if grand_total is zero (#15825 )	2018-11-08 12:30:44 +05:30
Bassam Ramadan	bf86953b4c	adding returns field to cashier closing (#15752 ) * adding returns field to cashier closing * Update cashier_closing.json	2018-11-08 12:26:24 +05:30
Shreya Shah	3f6eb6b393	fix: If party type is Shareholder, set appropriate name field (#15916 )	2018-11-08 11:51:13 +05:30
Shreya Shah	c704630d5f	fix: Return default if company not found (#15915 )	2018-11-06 17:24:45 +05:30
Ameya Shenoy	ea42980de6	Merge branch 'staging' into develop	2018-11-06 11:17:24 +00:00
rohitwaghchaure	9eafe8c23e	Update financial_statements.py	2018-11-06 13:28:18 +05:30
Nabin Hait	614b042ed3	fix(encoding): Fixed encoding issue in financial statements	2018-11-06 11:48:51 +05:30
Ameya Shenoy	8075a576f9	Merge branch 'staging' into develop	2018-11-05 06:53:27 +00:00
Ameya Shenoy	4a75d58d89	Merge branch 'master' into staging-fixes	2018-11-05 06:45:04 +00:00
rohitwaghchaure	c1d255e7bc	Merge pull request #15882 from Zlash65/fixtds [Minor] TDS not calculated properly fix	2018-11-02 13:18:09 +05:30
Zarrar	16d45c8e2e	safe encode non ascii characters (#15755 )	2018-11-02 13:17:24 +05:30
Navdeep Ghai	768513f2f9	fixed divided by zero error (#15885 )	2018-11-02 12:19:05 +05:30
rohitwaghchaure	dcb71a61ad	[Fix] Payment entry not able to submit (#15859 )	2018-11-02 12:12:42 +05:30
Charles-Henri Decultot	a89bce0b6e	Encoding correction (#15877 )	2018-11-01 13:18:49 +05:30
Zlash65	ab9852d31a	tds not calculated appropriately	2018-11-01 11:40:15 +05:30
Ameya Shenoy	f3f997f232	Merge branch 'staging' into develop	2018-10-31 13:51:52 +00:00
Ameya Shenoy	961849beb4	Merge branch 'master' into staging-fixes	2018-10-31 13:43:12 +00:00
deepeshgarg007	78b273af43	[Bug-Fix] Cannot Save Bank Statement Transaction Entry (#15793 ) * Create bank settings only if bank name is available * Minor bug-fix in validate_overlap	2018-10-31 18:12:03 +05:30
Shreya Shah	0c0e49a421	fix: Fix fieldnames in template (#15860 )	2018-10-31 18:00:09 +05:30
rohitwaghchaure	3f398d24f3	[Fix] Precision issue, not able to submit the stock entry (#15863 )	2018-10-31 17:58:26 +05:30
Ameya Shenoy	df62296a26	Merge branch 'staging' into develop	2018-10-30 12:54:16 +00:00
Rohit Waghchaure	152a0c86b0	[Fix] Delete button not working in POS for Ipad	2018-10-29 16:50:18 +05:30
Saurabh	6a916943aa	fix(P&L): sql query	2018-10-26 13:46:52 +00:00
Ameya Shenoy	7658bdc00a	Merge branch 'staging' into develop	2018-10-23 08:06:15 +00:00
Zlash65	635d4dbebe	subscriber deprecated test case fixes	2018-10-23 11:00:19 +05:30
Ameya Shenoy	a0e533ede5	Merge branch 'master' into staging-fixes	2018-10-22 10:37:14 +00:00
Nabin Hait	91eac5a7cf	fix(report): Optimization for financial statements	2018-10-22 15:05:40 +05:30
Ameya Shenoy	c1231d65fd	Merge branch 'staging' into develop	2018-10-19 13:27:07 +00:00
Ameya Shenoy	bbfdc13ab7	Merge branch 'master' into staging-fixes	2018-10-19 12:48:18 +00:00
Nabin Hait	5d1171678e	fix(perpetual inventory): Get warehouse account map only if perpetual inventory enabled (#15743 ) * fix(perpetual inventory): Get warehouse account map only if perpetual inventory enabled * fix(perpetual inventory): Get warehouse account map only if perpetual inventory enabled	2018-10-19 18:03:13 +05:30
Saif	3c9155e406	[Minor Fix] Force toggle display Net Total field when default taxes are fetched (#15532 ) * Minor fix for the problem that Net Total, Net Rate, Net Amount field would not be shown when default taxes were fetched * Prevent net_rate from becoming NaN * -Fixed problem that party_account_currency was not set in mapped document -Fixed problem that discount amount was not recalculated (in mapped document) -Fixed problem that set_dynamic_fields would work only on certain condition that led to showing Total (Company Currency) field even when using company currency	2018-10-18 17:57:56 +05:30
Nabin Hait	500ddc94c7	fix(gle): GL Entry for invoices before introduction of rounding_adjustment (#15732 )	2018-10-18 16:48:28 +05:30
Charles-Henri Decultot	7a7615ed66	Safe encode payer name (#15726 )	2018-10-18 12:28:06 +05:30
rohitwaghchaure	e2afbb7abe	Merge pull request #15703 from SaiFi0102/AR-AP-PDC-Fix [For staging-fixes] Fixed PDC data in AR/AP report	2018-10-17 15:57:28 +05:30
Ameya Shenoy	d1c467bcf5	Merge branch 'staging' into develop	2018-10-17 09:44:39 +00:00
Ameya Shenoy	77b60928bf	Merge branch 'master' into staging-fixes	2018-10-17 09:39:31 +00:00
deepeshgarg007	0cbb9b54fa	Deprecating subscriber doctype (#15695 ) * Depricating subscriber doctype * Removed naming series	2018-10-16 14:39:16 +05:30
rohitwaghchaure	b7debc8573	Merge pull request #15365 from SaiFi0102/AR-AP-PDC-Fix Fixed PDC data in AR/AP report	2018-10-16 11:27:53 +05:30
rohitwaghchaure	a5a926967b	Update accounts_receivable.py	2018-10-16 11:27:23 +05:30
Joe Paul	666e6e665b	feat: Add provision for prebilled subscription invoices (cherry picked from commit db33e6304d3167d0a2c0c9cee4a9405f5833120e)	2018-10-16 10:17:40 +05:30
Charles-Henri Decultot	615571dd21	Add safe decode for payer name (#15692 )	2018-10-15 18:26:02 +05:30
Bibin	7844b79274	[Bug-Fix] accounts_receivable.html (#15688 ) * Update accounts_receivable.html In the print format and PDF the total was showing as 0 (Zero) , when I made these changes it fixed the issue * Update accounts_receivable.html	2018-10-15 18:25:26 +05:30
Ameya Shenoy	606c504f28	Merge branch 'staging' into develop	2018-10-15 12:25:03 +00:00
rohitwaghchaure	0d2a4c6a59	[Fix] TDS Payable Monthly report is not working (#15666 )	2018-10-15 11:09:17 +05:30
deepeshgarg007	42510a411f	[Bug-Fix]V11 Accounts Receivable print showing zero values (#15667 ) * Bug Fix * Print report bug fixes	2018-10-15 11:08:04 +05:30
Chinmay Pai	905c0ff978	File api (#15637 ) * file-api: major refactor migrate from file_manager.py to file.py Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com> * file-api: migrate to file-api remove file_manager stuff and migrate to file-api Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>	2018-10-15 10:38:53 +05:30
Ameya Shenoy	f90af80344	Merge branch 'staging' into develop	2018-10-11 06:58:53 +00:00
Shreya Shah	2291323c65	fix(shipping-address-display): Fetch shipping address display as per the shipping address (#15643 )	2018-10-11 10:13:27 +05:30
Saurabh	99c064305f	Merge branch 'master' into staging-fixes	2018-10-09 17:55:33 +05:30
Shreya Shah	8a4bcefec4	fix(accounts-receivable): Column values in Print and PDF (#15621 )	2018-10-08 18:34:01 +05:30
Shreya Shah	5b34d00bc0	fix(accounts-receivable): Column values in Print and PDF (#15622 )	2018-10-08 18:20:51 +05:30
Ameya Shenoy	f174c95d80	Merge branch 'staging' into develop	2018-10-07 06:24:12 +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
Zlash65	58a080a1b1	add voucher detail no while creating gl entry	2018-10-06 16:34:58 +05:30
Zarrar	bc7a2c5cb3	Merge pull request #15602 from Zlash65/fix-mod [Minor] Deferred Expense	2018-10-06 16:21:06 +05:30
Zlash65	b4aeee776a	add voucher detail no while creating gl entry	2018-10-06 16:17:12 +05:30
Ameya Shenoy	1d5dc73dfd	Merge branch 'staging' into develop	2018-10-05 09:10:30 +00:00
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
Shreya	4f5214a136	Allow reverse jv for all submitted docs	2018-10-05 12:19:09 +05:30
Ameya Shenoy	da10f6ebd8	Merge branch 'staging' into develop	2018-10-04 11:51:30 +00:00
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
Zlash65	6e3b1a58a1	service_stop_date should be editable after submit	2018-10-04 09:30:27 +05:30
rohitwaghchaure	f9930ff2a4	Merge pull request #15573 from rohitwaghchaure/cost_center_issue_while_saving [Fix] Cost center issue	2018-10-03 18:47:28 +05:30
Shreya Shah	3204c94fdd	Merge pull request #15570 from shreyashah115/fix-filter-error [Bug] Item wise sales register filters	2018-10-03 17:38:41 +05:30
Shreya	cbb112f2db	Fix filter error	2018-10-03 17:37:40 +05:30
Zlash65	9d159ab95e	remove db.escape as back tick already used	2018-10-03 17:26:28 +05:30
Rohit Waghchaure	8bf9f377dd	[Fix] Cost center issue	2018-10-03 16:59:43 +05:30
Rohit Waghchaure	d1b87ba41c	Book cost of goods sold instead of stock adjustment	2018-10-03 16:29:43 +05:30
rohitwaghchaure	d6cacbe565	Merge pull request #15567 from rohitwaghchaure/fix_payment_request [Fix] Payment request not working	2018-10-03 16:03:48 +05:30
Rohit Waghchaure	210f4984f7	[Fix] Payment request not working	2018-10-03 15:55:51 +05:30
rohitwaghchaure	a5576f5b21	[Fix] Stock difference between gl entry and stock ledger entry booked in stock adjustment (#15374 )	2018-10-03 10:39:50 +05:30
deepeshgarg007	719701f2a4	Enhancement in Budget Variance and other reports (#15455 ) * Enhanced Budget Variance report and added filters and columns in other reports * Update budget_variance_report.js * Changes in budget variance report * Spacing in column names	2018-10-02 12:52:13 +05:30
Shreya Shah	7d115183e4	Improvise and fix indicators in Portal list (#15552 )	2018-10-02 12:46:26 +05:30
Saif	90cf2ddc01	Make pricing rule from Supplier and Customer Doc (#15533 ) * Make pricing rule from Supplier and Customer Doc * Make sure the "+" button also works the same way as the "Make" button	2018-09-30 22:16:31 +05:30
Zarrar	e4c9ac3961	[Minor] Cash Flow report - custom (#15522 ) * python 2-3 fix for filter * pass filters while fetching data to financial statement report	2018-09-30 21:19:01 +05:30
rohitwaghchaure	90f9f9d3d8	Code optimization for deferred revenue (#15527 )	2018-09-30 21:12:50 +05:30
Rohit Waghchaure	ea0ef95539	[Fix] Consolidated Financial Statement report	2018-09-28 17:05:55 +05:30
Suraj Shetty	6ea3de9521	Fix quote issues (#15497 ) * Fix quotes issues * Remove frappe.db.escape - Handle escape in the update_linked_doctypes method	2018-09-26 18:15:53 +05:30
Nabin Hait	1e7c32b909	Payroll fixes and more (#15475 ) * fix(payroll): multiple minor fixes related to salary structure * Added GSTR-1 and GSTR-2 report in Accounts module page * delete asset movement records on cancellation of Purchase Receipt * Update consolidated_financial_statement.py * minor fix * minor fix * add filters on item prices report (#15495)	2018-09-26 18:01:00 +05:30
Shreya Shah	352e6494f3	Contact and email fields in Payment Entry (#15490 ) * Add contact_person and contact_email fields to Payment Entry * Minor fix * Map contact details while making Payment Entry * Update payment_entry.py	2018-09-26 15:38:34 +05:30
rohitwaghchaure	0cf0ebf08b	[Refactored] Asset Depreciation Ledger report based on GL entries (#15415 ) * [Refactored] Asset Depreciation Ledger report is based on GL entries * Provision to make manual JV from the asset if Calculate Depreciation is disabled	2018-09-26 15:24:49 +05:30
Ameya Shenoy	b635a71247	Merge branch 'staging' into develop	2018-09-26 08:53:03 +00:00
Ameya Shenoy	12ec142a69	fix(multiple): syntax and patch - syntax fix for using super class - check "All Departments" in department name with translations	2018-09-26 14:05:48 +05:30
Ameya Shenoy	430c3c88ff	Merge branch 'staging' into develop	2018-09-26 07:32:45 +00:00
Ameya Shenoy	9d3a97fd15	Merge branch 'master' into staging-fixes	2018-09-26 07:28:53 +00:00
rohitwaghchaure	fafc277666	[Fix] BOM update tool, too many writes in one request. Please send smaller requests (#15432 )	2018-09-25 18:59:20 +05:30
Aditya Hase	a38b77cbfd	feature(chart-of-accounts): Rebuild HSM Tree after bulk insertion (#15457 ) * feature(chart-of-accounts): Rebuild HSM Tree after bulk insertion * Update chart_of_accounts.py	2018-09-25 18:10:50 +05:30
Rohit Waghchaure	c699b2a98a	[Fix] Key error while saving sales invoice	2018-09-24 11:57:48 +05:30
Ameya Shenoy	63ebeb432c	Merge branch 'staging' into develop	2018-09-21 11:04:20 +00:00
Suraj Shetty	dabaec0dc5	Revert bench-init changes (#15463 ) * Revert bench-init changes * Fix test * Remove debug flag	2018-09-21 15:46:44 +05:30
Zarrar	e83ff38c10	[Enhance] Deferred Expense (#15437 ) * added section for deferred expense in item master * added default expense account field in Company master * added deferred expense section in purchase invoice item * validation and getter code added * scheduler event to book expense every month * codacy, import fix and other minor fixes * rectify debit credit logic for expense * commonify js code for deferred expense and revenue * remove deferred calculation and validation * common file to calculate deferred revenue and expense * codacy fixes * expense account root_type - Asset, specific method naming	2018-09-21 15:45:40 +05:30
Suraj Shetty	bfc195dd8b	Changes to support refactor in frappe pg-poc branch (#15287 ) * Remove quotes from sql to make it compatible with postgres as well * Fix queries - Replace mysql specifc queries with standard ones * Make repo URL chages to test pg-poc * Add root passowrd to test site config * Fix quotes issue * Remove debug flag from a pricing rule query * Remove python 3.6 version from travis.yml * Fix improper query issue * Fix incorrect query * Fix a query - This fix need to be changed when we will start supporting postgres since date_format is not supported by postgres * Get price list map as dict * Convert price_list_currency_map to dict	2018-09-21 10:20:52 +05:30
Saurabh	75d90b9d8f	a[resolved] merge-conflicts	2018-09-20 13:28:23 +05:30
Saif	772dc6e82c	Various permission fixes (#15448 ) * Removed test letter head from Consolidated Financial Statement * Removed incorrect role permissions	2018-09-20 13:20:17 +05:30
rohitwaghchaure	550fc695f1	[Fix] Precision issue in the accounts receivable report (#15440 )	2018-09-19 19:03:40 +05:30
Faris Ansari	2ab6e0e39b	fix(translations): Replace translations by keyword with indexed version (#15426 ) * fix(translations): Replace translations by keyword with indexed version Keywords in the translation also gets translated which results in an error because python cannot find the key * Update buying_controller.py	2018-09-19 13:13:59 +05:30
Jamsheer	c07e8e5b0d	[Fix] Healthcare minor fixes and field rename (#15413 ) * Healthcare practitoiner in Clinical Procedure * Insert and Update Patient Medical Record from Healthcare DocTypes * vital signs remove extra columns * Rename Healthcare Field test_name * Healthcare Util - get_drugs_to_invoice - fix * Rename Healthcare Field test_code * Rename Healthcare Field test_comment * Rename Healthcare Field test_created * Rename Healthcare Field test_template * Rename Healthcare Field test_rate * Rename Healthcare Field test_description * Rename Healthcare Field test_groups * Rename Healthcare Field test_group * Rename Healthcare Field test_template_type * Rename Healthcare Field test_uom * Rename Healthcare Field test_normal_range * Rename Healthcare Field test_event * Rename Healthcare Field test_prescription * Rename Healthcare Field test_particulars * Patch - Rename healthcare fields * Sales Invoice - Filter updated for get drugs to invoice * Patient Appointment - fix - get_event	2018-09-18 10:54:03 +05:30
RicardoJohann	267e806d7f	added description field and changed to one filter datepicker (#15425 )	2018-09-18 10:48:20 +05:30
Charles-Henri Decultot	d6bce7429e	Bank statement import corrections (#15405 ) * Bank statement import corrections * Bank statement corrections * Missing semi-columns	2018-09-17 12:34:11 +05:30
theopen-institute	ba1c0c900d	Fix potential crash in payment_entry.py (#15411 ) The new code for cost center checking in payment_entry.py crashes if `voucher_type` is `None`, which is an explicit possibility if party type is Employee. This commit adds a simple check to make sure that voucher_type is not None before running `get_doc`.	2018-09-17 10:59:39 +05:30
Zlash65	2619596917	pass filters as parameter	2018-09-13 12:56:04 +05:30
Nabin Hait	9fde97cdd2	Fixed merge conflict	2018-09-12 15:45:20 +05:30
Zarrar	8dade79002	return blank if no data found (#15387 )	2018-09-12 14:24:23 +05:30
Nabin Hait	6173e091ee	fix(test): test cases fixed	2018-09-12 11:46:20 +05:30
Zarrar	2b6584a296	accounts table should be mandatory in budget (#15386 )	2018-09-12 11:14:24 +05:30
Nabin Hait	0669a0e18a	fix(bank account): import fixed	2018-09-12 10:50:10 +05:30
Nabin Hait	13beb3a008	fix(test): test cases fixed	2018-09-11 19:37:08 +05:30
rohitwaghchaure	713cfc786f	[enhance] Payment order (#15056 )	2018-09-11 17:40:37 +05:30
Zarrar	2859300fe6	update modified date to reload doc (#15385 )	2018-09-11 17:12:27 +05:30
Nabin Hait	2236f0aef0	fix(test): multiple test cases fixed	2018-09-11 16:50:46 +05:30
Saif Ur Rehman	423549e084	Fixed PDC data in AR/AP report: -Get PDC date from posting_date instead of reference date since posting_date is the date at which the post dated cheque can be cleared -Get PDC data from submitted documents only	2018-09-08 15:48:55 +05:00
Nabin Hait	431e2e1c6d	fix(payment entry): Changed modified	2018-09-07 14:31:34 +05:30
Nabin Hait	399f3ddf82	fix(sales invoice): Restored missing field group_same_items	2018-09-07 14:27:14 +05:30
Nabin Hait	3a342e8d93	fix(report): project filter in financial statement	2018-09-07 14:17:57 +05:30
Zlash65	635890187a	remove console statement	2018-09-07 14:04:46 +05:30
Zarrar	525a005b78	TDS Monthly report & TDS Computation Summary report (#15204 ) * tds computation report added * tds computation logic added * minor changes to commonify code * tds payable monthly report added * initial logic for monthly tds calculation added * added field for supplier type and pan * changes related to pan and entity type * date filter fix and cleanup	2018-09-07 13:27:10 +05:30
Zarrar	7737620ff4	[Staging] Patch fix - Shopify Settings (#15338 ) * keep enable_shopify in Shopify Settings disabled by default * patch fix for shopify refactor * minor fallback fix	2018-09-07 13:19:33 +05:30
Nabin Hait	b479a87031	fix(report): Cost center filters in financial statements and general ledger	2018-09-07 13:17:23 +05:30
Bassam Ramadan	574cd46e41	Adding cashier closing feature (#15273 ) * adding cashier closing feature cashier closing feature has been added as now the cashier can make a closure to record every thing from his pos as the expenses which has been paid and the custody which he had at the starting and the amount which is in his save and the system will record the date and time and the user and the total net amount automatically which supposed be equal to all of his sales invoices totals * add cashier closing link at pos menu * add cashier closing link to accounts config file adding cashier closing link at accounts config file to show it at the accounts module page * adding more features to cashier closing adding from time to the cashier closing in case the cashier working more than one shift also giving him the ability to add the type of payments to his cashier closure , also adding validation to be sure the from time is less than to time. * Update cashier_closing.py	2018-09-06 19:02:25 +05:30
Nabin Hait	a2a6568b7e	fix(reports): Made gstr1 ready for govt portal	2018-09-06 17:44:31 +05:30
Sanjay Kumar	1b49f3a4e7	Allow cost center in entry of balance sheet accounts (#14972 ) * Allow Cost Center In Entry of Balance Sheet Account * Add parent cost center in get payment entry * Add Tests for Allow Cost Center In Entry of Balance Sheet Account * Add tests for cost center wise account and party balance * set parent cost center in taxes * 1. Remove copy parent cost_center to child 2. Improve update party and account balance functionality on cost_center change 3. Add cost_center filter to get_outstanding_documents * fix Codacy and Travis issue	2018-09-06 14:39:35 +05:30
Zarrar	1b37186460	set POS Invoice format only if its enabled (#15326 )	2018-09-06 13:25:52 +05:30
Nabin Hait	f846c43361	Merge branch 'ESS-LLP-healthcare_v11_wip' into develop	2018-09-06 13:07:08 +05:30
Nabin Hait	e5a4037b57	minor fix in deferred revenue booking	2018-09-05 17:44:39 +05:30
Nabin Hait	aacb915cae	Merge branch 'healthcare_v11_wip' of https://github.com/ESS-LLP/erpnext-healthcare into ESS-LLP-healthcare_v11_wip	2018-09-05 17:21:47 +05:30
Zarrar	2705af488d	[Minor] [Staging] POS Profile (#15321 ) * update modified date to load field display_items_in_stock * stop dialog from popping up if no loyalty program found * warehouse not used for not is_pos type invoice	2018-09-05 17:20:07 +05:30
Nabin Hait	ed643d5a12	fix(email digest): Income/expenses value in case of last period of a fiscal year (#15320 )	2018-09-05 17:18:59 +05:30
Nabin Hait	5122a8e0d7	Merge branch 'staging' into develop	2018-09-05 11:47:30 +05:30
Zarrar	3cea3c46b6	change modified date of account to reload fields (#15317 )	2018-09-05 11:41:54 +05:30
Saif	8f00db58bd	-Moved JE's User Remark on the top of the generated remarks (#15314 ) -Added a field in JE's Account entries to add remarks in specific JE Account entry	2018-09-05 11:13:06 +05:30
Saurabh	1fe1884b73	Merge branch 'master' into develop	2018-09-03 17:00:17 +05:30
Nabin Hait	13109aef9d	fix: validate only if service stop date	2018-09-03 12:18:17 +05:30
Jamsheer	e82f27ac10	Healthcare - Invoice Drug Prescription	2018-09-03 11:26:17 +05:30
Jamsheer	8da6f4e30c	Healthcare - Invoice - Redesign	2018-09-03 11:26:17 +05:30
Jamsheer	c6974a79a8	Sales Invoice - show Healthcare Fields - Healthcare in active Domains	2018-09-03 11:26:15 +05:30
Jamsheer	54ae74eb28	Inpatient Billing	2018-09-03 11:26:14 +05:30
Jamsheer	ba11972302	Healthcare Service - Invoice Work Flow - Redesign	2018-09-03 11:26:14 +05:30
Rohit Waghchaure	12b4096e68	[Minor] Don't validate on cancelled budgest	2018-08-31 16:54:59 +05:30
Nabin Hait	1b73505391	Update sales_invoice.py	2018-08-31 14:56:16 +05:30
Nabin Hait	3c56aa9c1d	minor fixes	2018-08-31 14:51:01 +05:30
Nabin Hait	9cc28a77c9	minor fixes	2018-08-31 14:49:20 +05:30
Ameya Shenoy	203152d67e	indentation: fixes	2018-08-31 14:33:48 +05:30
Nabin Hait	e033df2757	minor fixes	2018-08-31 13:30:03 +05:30
Nabin Hait	b259e3eb06	Merge branch 'defer-stop-date' of https://github.com/Zlash65/erpnext into Zlash65-defer-stop-date	2018-08-31 12:39:46 +05:30
Bassam Ramadan	8d7c1868d6	fix for fields names at sales invoice return payments and verifying the payment amount (#15245 ) * fix for payments field names in sales invoice return * add verification for payment amount at sales invoice return adding verification to be sure the payment amount is negative at sales invoice return * correction for precision field name	2018-08-30 19:15:15 +05:30
Rushabh Mehta	49f9747385	major(manufacturing): fixes to ux, material requests to purchase order based on default supplier etc (#15267 ) * major(manufacturing): fixes to ux, material requests to purchase order based on default supplier etc * fix: remove debug	2018-08-30 18:50:48 +05:30
Zlash65	80f5cb05cc	fixes in setting end_date and manual provision of start&end date	2018-08-30 10:39:48 +05:30
Zlash65	91eae54383	manually provide start and end date	2018-08-30 10:39:48 +05:30
Zlash65	d0e37327e6	start date logic fix	2018-08-30 10:39:48 +05:30
Zlash65	7b3fd85943	end date / stop date calc fix	2018-08-30 10:39:48 +05:30
Zlash65	4ce8c7f383	end date should reset if start date is changed	2018-08-30 10:39:48 +05:30
Zlash65	d676a67769	validate changing service stop date once its set	2018-08-30 10:39:48 +05:30
Zlash65	339c2e9f15	book last gl_entry based on service stop date	2018-08-30 10:39:48 +05:30
Zlash65	243863a290	validation for stop date added	2018-08-30 10:39:48 +05:30
Zlash65	33cff7735e	service stop date field added	2018-08-30 10:39:48 +05:30
Rushabh Mehta	13bcc4e27e	perms: fix default import, export perms	2018-08-29 17:10:27 +05:30
Nabin Hait	28f9b0a9ab	(fix)test case: loyalty program, course schedule and more	2018-08-29 17:05:11 +05:30
Nabin Hait	a804d6d487	Fixed merge conflict	2018-08-29 13:34:58 +05:30
Aditya Hase	e3ac5ff9e3	erpnext: refactor async to is_async (#15231 )	2018-08-28 14:11:58 +05:30
Shreya Shah	a5add289bb	Refactor Naming Series (#15070 ) * Patch to create Property Setter for existing naming series * Update existing naming series options with new * Add patch link to patches.txt * Update patch * Fix codacy * Fix as per suggestions * Remove old patch for property setter * Improve as per suggested - Modified the naming - Also refactored naming for doctypes having autoname with series - Added a patch to make property setter for autoname * Fix Travis * Rebase with develop	2018-08-28 13:44:48 +05:30
Zarrar	93577665f2	[Enhance] Multiselect for Cost Center and Project (#15208 ) * add filter for Cost Center, make CC & Project multiselect field * update queries according to project/cost_center multiselect * add multiselect filter for cost_center and project * update query according to multiselect	2018-08-27 12:08:53 +05:30
Mario Monroy	fbc3df3247	Fix indentation accounts_receivable.py (#15203 )	2018-08-23 11:10:15 +05:30
Bassam Ramadan	1ff2315899	Trial balance and payable accounts reports and sales return fixes (#15000 ) * adding supplier type filter to payable accounts and payable accounts summary reports adding supplier type filter to payable accounts and payable accounts summary reports as customer group at receivable accounts and summary reports as its important and easier to put this filter * fix trial balance opening and closing values the removed mathematical operations was causing showing incorrect values at opening and closing columns where the total row was correct so the operation deleted to view the correct values to be equal to the total row and to stop confusing the user due to different values between the total row and the the values in front of each account * fix for supplier type filter field on payable accounts reports rename the supplier type filter field to supplier group in payable accounts and summary reports * fix for paid amount in returned sales invoice the current paid amount not change from source value if you deleted any item if the invoice contain for example 3 items and you only need to return on item the current steps is to open the original invoice and press on make return then you delete the unwanted items but in this case the paid amount will not change and you will get an alert from the system until you change it manually but with this modification it works very well. * fixing trial balance values and totals fixing trial balance opening and closing ( DR - CR ) values and totals	2018-08-20 17:58:28 +05:30
Saif	a09a8c3bf7	Fixed missing DocType info for Purchase Items (#15152 ) * Made Purchase Invoice Items' Batch No and Serial No fields non copyable. * Added appropriate currency field options to Purchase...Items DocFields: -Landed Cost Voucher Amount -Billed Amt	2018-08-20 17:55:18 +05:30
Saif	e3947296e8	Group by Voucher fix in General Ledger Report (#15169 ) * -Group by Voucher requires ordering the query not grouping the query -Summing fields is not necessary since grouping by 'name' is the same as getting individual entries * Group by Voucher show groups with totals at the end of group	2018-08-20 17:49:29 +05:30
Shreya Shah	80f30094fb	Fix error msg (#15146 )	2018-08-16 10:29:16 +05:30
rohitwaghchaure	6fb2117767	Allow to make budget for the same cost center with different account (#15149 )	2018-08-16 10:22:06 +05:30
rohitwaghchaure	7e36aa4162	Merge pull request #15150 from rohitwaghchaure/fix_consolidated_balance_sheet_report [Fix] Consolidated balance sheet report	2018-08-15 19:41:41 +05:30
Rohit Waghchaure	cafd61de85	[Fix] Consolidated balance sheet report	2018-08-15 16:18:46 +05:30
Zarrar	3523b779aa	rounding off fixes and conversion fix (#15140 )	2018-08-14 16:28:14 +05:30
Faris Ansari	4809f86035	fix(report): field -> fieldname, dateutil -> frappe.datetime (#15106 )	2018-08-14 10:56:18 +05:30
Shreya Shah	0631aed3d9	Discount amount field in all transactions' child tables (#15124 ) * Add discount_amount and base_discount_amount in Sales Invoice Item * Add patch for existing documents * Discount amount field in all child tables of Purchase and Selling * Remove console statements	2018-08-14 10:51:48 +05:30
rohitwaghchaure	88b0a1305f	Code optimization for accounts receivable report to avoid timeout error (#15114 ) * Code optimization for accounts receivable report to avoid timeout error * Added index for party_type	2018-08-14 10:51:13 +05:30
Nabin Hait	c35271aef5	fix(various)	2018-08-10 19:01:13 +05:30
Nabin Hait	8bf52fef42	minor fixes	2018-08-09 19:45:33 +05:30
Nabin Hait	9a33bc6417	optimizing transactions by caching	2018-08-09 10:47:09 +05:30
Nabin Hait	50238c3049	[optimize] tree conditions for pricing rule	2018-08-08 18:43:04 +05:30
Himanshu Mishra	859d942b22	Cached calls (#15109 ) * [optimize]: bin updates * [optimise]: use frappe.get_cached_value instead of get_value for item * [fix]: change db.get_cached_value to get_cached_value	2018-08-08 18:33:50 +05:30
Rushabh Mehta	708e47aadf	optimize(various)	2018-08-08 16:37:31 +05:30
rohitwaghchaure	8f0acf30bf	Merge pull request #15101 from rohitwaghchaure/ascii_issue_in_balance_sheet [Fix] 'ascii' codec can't encode error in balance sheet report	2018-08-07 16:53:21 +05:30
Rohit Waghchaure	9a9974f5c3	[Fix] 'ascii' codec can't encode error in balance sheet report	2018-08-07 16:51:56 +05:30
Meritsystems	1ad8eca4e8	Point of sale will list only items that are in stock based on option "Display Items in stock" in POS Profle. (#14895 ) * Update point_of_sale.py * Update point_of_sale.py Add custom field(Display Items In Stock) to POS Profile Doctype of type Check. * New field " Display Items in Stock" added * Update point_of_sale.py * Update point_of_sale.py ORM used instead of SQL used Bin to find actual quantity balances. * Update point_of_sale.py * Update point_of_sale.py * Update point_of_sale.py * Update point_of_sale.py * Update point_of_sale.py	2018-08-07 14:38:50 +05:30
Saurabh	824b388631	Resolved merge conflicts	2018-08-07 13:01:11 +05:30
Shreya Shah	f0ef673498	Accounts receivable aging based on supplier due date (#15080 ) * Accounts receivable aging based on supplier due date (#13801) * Remove spaces	2018-08-06 14:42:35 +05:30
Rohit Waghchaure	15f52e7b71	[Fix] Incorrect tax amount calculation because of same fieldname in the code	2018-08-06 14:29:34 +05:30
rohitwaghchaure	ae4ff5a403	[Fix] In words showing grand total instead of rounded total (#15065 )	2018-08-01 18:09:51 +05:30

... 18 19 20 21 22 ...

5801 Commits