brotherton-erpnext

Author	SHA1	Message	Date
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
Nabin Hait	041a5c2d3b	Get Advances and auto allocate (#14970 )	2018-08-01 18:07:39 +05:30
Zarrar	7f8024c516	[Enhancement] Tax Withholding Category (#15064 ) * add single, cumulative threshold, remove checkboxes * remove tds child table from supplier & add tds link field * add description field in tax withholding category * add tax withholding data for indian setup, some fixes * add a checkbox for tax withholding in purchase invoice * remove supplier's child table for tds * enable tds field if supplier has tds set inits master * move rates data to child table - adding fiscal year support * change bootstrap data according to child table config of tds * show category name in list view * loyalty program fixes * moved tax calculation to tax_withholding.py - calculation for tds amount for cumulative threshold from gl entry * add fiscal year dependency in company test * minor loyalty program fix * minor tier calculation fix * minor handling duplicate exception * toggle apply_tds according to supplier, code rectify * minor fixes for loyalty program * test case for single and cumulative threshold * codacy fix	2018-08-01 17:45:05 +05:30
Nabin Hait	eed3d4c1b3	Fixed Merge Conflict	2018-07-31 12:36:16 +05:30
Nabin Hait	d53c2c031d	more payroll improvements and tests fixes	2018-07-30 20:17:15 +05:30
Zarrar	89c87fd6a6	[Minor] Patch fix (#15041 ) * update modified date * remove extra parameter from function call	2018-07-30 10:57:47 +05:30
rohitwaghchaure	91d2ace9bb	Account no + account name in trial balance and financial statements reports (#15038 )	2018-07-30 10:38:51 +05:30
Shreya Shah	91a9ee5179	Merge accounts functionality (#14993 ) * Add dialog to merge accounts * Add conditions and merge functionality * Fix travis * Add test case * Add more test scenarios	2018-07-28 10:26:11 +05:30
Nabin Hait	fa06ee80e9	Fixed merge conflict	2018-07-27 12:54:00 +05:30
Shreya Shah	eed0a4e2df	Do not copy remarks field while duplicating (#15023 )	2018-07-27 11:26:35 +05:30
Yaqin Shurrab	cc56ff5c37	Get the correct Summation of Closing Balances (#14990 ) Fix total raw values for Closing Credit and Closing Debit	2018-07-27 11:13:00 +05:30
rohitwaghchaure	20d3bef3c3	[Fix] Deducted tax amount adding up in the total amount in the GST Itemised Purchase Register report (#14994 )	2018-07-27 11:03:53 +05:30
Saurabh	f86224e6f7	Merge pull request #14945 from chdecultot/gocardless_corrections Gocardless improvement and payment request correction	2018-07-26 11:41:43 +05:30
Shreya Shah	cd717e422f	Modify renaming process of Account (#14839 ) * Disable renaming for Account Master * Update account name along with account number * Fix as per suggestions * Update account.js * Fix typo * Remove after_rename and before_rename methods * Modify test case * Modify field placement * Remove unused method	2018-07-23 14:15:20 +05:30
Saurabh	a638400e5d	Merge pull request #14707 from chdecultot/stripe_improvements_4 Stripe Subscriptions	2018-07-23 12:11:58 +05:30
Faris Ansari	5e096df5ae	columnDef => column	2018-07-20 16:35:51 +05:30
Faris Ansari	e7f864a4dd	Return early if filters not initialized	2018-07-20 16:31:01 +05:30
Faris Ansari	5986d59b01	Financial Reports - Update formatter for use with DataTable - Fetch Currency from filters and fallback to company currency	2018-07-20 15:11:55 +05:30
Nabin Hait	47ce481394	Minor fix	2018-07-19 11:10:46 +05:30
Prateeksha Singh	627d0d58be	[fiscal-year] use to_date property	2018-07-18 18:09:28 +05:30
Prateeksha Singh	8ecfaaa707	[fix] format fiscal year docname to proper date before using 🤦 (#14955 )	2018-07-18 18:03:27 +05:30
Saurabh	0bfbf8aa6f	[minor] remove conflicts	2018-07-18 17:21:07 +05:30
Saurabh	d7897f1c53	Resolved merge conflicts	2018-07-18 17:08:16 +05:30
Faris Ansari	9e874af9ba	Query report print (#14935 ) * QueryReport - Only print visible columns in report - Use get_columns_for_print method instead of directly accessing report.columns * Query Report - Replace frappe.query_report_filters_by_name with new API	2018-07-18 09:28:44 +05:30
Charles-Henri Decultot	9d09343e57	Gocardless improvement and payment request correction	2018-07-17 16:15:30 +00:00
Rushabh Mehta	69fa808def	[minor] fixes + patch (#14937 )	2018-07-17 18:22:51 +05:30
Shreya Shah	3c9839f832	Defaults in Item Group (#14874 ) * Add Defaults table in Item Group * Fetch defaults from Item group if not found in Item * Add patch * Remove default fields from Item Group * Set query for defaults * Fix Codacy * Modify test records * Modify budget.py and sales_order.py * Remove join from query * Else condition to avoid error if no defaults found * refrain from making item test records before item_group * default cost center fetch correction * Remove tab item group from query	2018-07-17 18:01:44 +05:30
rohitwaghchaure	6863b03790	Naming series increase even if there is an exception while saving the invoice from the backend (#14938 )	2018-07-17 17:20:15 +05:30
rohitwaghchaure	a76067eea1	[Fix] Per billed showing as 100% in the sales order even if sales return has made against the sales order (#14899 ) * [Fix] Per billed showing as 100% in the sales order even if sales return has made against the sales order * Added test cases	2018-07-17 16:50:50 +05:30
Saurabh	e78a877202	patch fixes (#14936 )	2018-07-17 16:38:11 +05:30
Nabin Hait	26786bd35d	minor route fix for general ledger	2018-07-17 15:59:15 +05:30
Zarrar	26c9b94cc6	[ Improv ] Loyalty Program more fixes and test case (#14888 ) * remove console statements * set account & cost center for redemption * add test case for single/multi tier & is_return scenario * reset tier when changing loyalty program * make loyalty fields non copy type * fix test case - delete si after every test to avoid interference	2018-07-16 18:11:53 +05:30
rohitwaghchaure	a3e070bc6b	[Fix] Invoices not showing in the gross profit report against which sales return entry has created (#14914 )	2018-07-16 18:11:19 +05:30
Charles-Henri Decultot	3fa3104dcc	Debug cleanup	2018-07-13 14:00:42 +00:00
Charles-Henri Decultot	c047bf88db	Rebase following Subscription corrections	2018-07-13 13:25:53 +00:00
Charles-Henri Decultot	7722b81c8e	Variable correction	2018-07-13 13:15:59 +00:00
Charles-Henri Decultot	a0b7236f66	Corrections following Saurabh's comments	2018-07-13 13:15:59 +00:00
Charles-Henri Decultot	90669a03b3	Test correction	2018-07-13 13:15:59 +00:00
Charles-Henri Decultot	da8b11fd12	Travis correction	2018-07-13 13:15:59 +00:00
Charles-Henri Decultot	8b3e841fbf	Travis correction	2018-07-13 13:15:59 +00:00
Charles-Henri Decultot	cde1f08af6	Review corrections	2018-07-13 13:15:59 +00:00
Charles-Henri Decultot	5a2ee41af3	Test correction	2018-07-13 13:15:59 +00:00
Charles-Henri Decultot	19a47c3e0a	Codacy corrections	2018-07-13 13:15:59 +00:00
Charles-Henri Decultot	244b638fe3	Dev cleanup	2018-07-13 13:15:59 +00:00
Charles-Henri Decultot	a8d766f5f7	Remove payment plan reference	2018-07-13 13:15:59 +00:00
Charles-Henri Decultot	0134e13631	Subscription integration	2018-07-13 13:15:59 +00:00
Charles-Henri Decultot	f7ca908ea9	Corrections to Subscriptions	2018-07-13 13:15:59 +00:00
Charles-Henri Decultot	ba6f6d976d	Stripe integration corrections	2018-07-13 13:05:54 +00:00
Charles-Henri Decultot	6a40164dad	Payment Request modifications	2018-07-13 13:05:54 +00:00
Saurabh	3d825e5689	Subscription test and fixes (#14875 ) * Add dashboard on subscriber screen * Add Subscription and Subscription Plan to Account Dashboard * Fetch customer name while creating subscriber * [fix] add section for Subscription Period * minor fixes * optimization	2018-07-13 17:41:36 +05:30
rohitwaghchaure	3ffe89659a	[Fix] System always fetches the payment terms template from the company even if it's removed from the sales invoice (#14879 )	2018-07-13 17:40:48 +05:30
Ameya Shenoy	a559b0de5a	Role modifications for Shareholder (#14872 ) - Added roles: Accounts User, Accounts Manager, Sales Manager, Sales User, Sales Master Manager to Shareholder, Share Type and Share Transfer doctype	2018-07-13 11:34:19 +05:30
Zarrar	5899d98077	[ Major ] Loyalty Program Fixes (#14863 ) * fix checking of customer_group & territory of customer in loyalty program * fetch and set applicable loyalty program - in customer.py if found 1 program, set it or show a message to set it manually - in sales invoice, if found 1 program for selected customer with no program set, set it else open a dialog with applicable options * removed disabled field, added from_date & to_date * loyalty program section made collapsible, added redeem check in it * setting loyalty program improvised, manual selection if multiple found * get_query added, amount calculation updated * args passed rectified for expiry_date * get loyalty_points logic improv, redemption_details logic added * improv based on from/to date and other rectification * code rectified based on different scenarios - is_return, cancel, make loyalty points entry improv	2018-07-11 14:35:43 +05:30
Zarrar	9a3b785a03	[Minor] Employee Separation Fix (#14867 ) * delete associated task & project forcefully in Employee Seapration cancel trigger * remove leftover print statement * remove console statements	2018-07-11 14:34:55 +05:30
Shreya Shah	21d3352aa2	Merge pull request #14835 from shreyashah115/print-hide Print hide loyalty program related fields	2018-07-06 18:36:47 +05:30
Shreya	9bcb959f81	Print hide loyalty program related fields	2018-07-06 18:17:02 +05:30
Zlash65	1aeca1d349	change name that fetches numbered value from acc & cc	2018-07-06 17:15:33 +05:30
Zarrar	17705f932d	[ Minor ] Cost Center Number field added in field's dialog (#14781 ) * cost center number field when creating new added field in the tree's dialog, necessary changes in the autoname function * rename function's name appropriately	2018-07-06 14:44:44 +05:30
Saurabh	1cfcf70905	Resolved merge conflicts	2018-07-06 13:18:44 +05:30
rohitwaghchaure	3f5e80ebe3	Allow bulk edit for the sales invoice item (#14826 )	2018-07-06 12:39:04 +05:30
Manas Solanki	da486eeebd	Loyalty Program (#12631 ) * First Cut for the Loyalty Program * finished the collection part * redmeption for the loyalty point update the loyalty point entry in the FIFO style make the accounting entry knocking the debtors account against the expense account selected in the loyalty program update the outstanding balance in the client side * completed for the desk viewe * wrap up for the desk and shopping cart * pos * fix and test the travis	2018-07-06 12:36:57 +05:30
rohitwaghchaure	839320dca5	[Fix] Original Invoice outstanding is not updating after making Debit Note (#14821 )	2018-07-06 10:42:15 +05:30
bobzz-zone	58236ffc1e	Update budget_variance_report.py (#14798 ) Make sure GL Entry only called once in each row	2018-07-06 10:39:00 +05:30
Zarrar	a3f6856d81	python 3 fix for sorted (#14814 )	2018-07-05 10:37:39 +05:30
Rohit Waghchaure	5005e467a0	[Fix] POS Profile ignore pricing rule not working for online pos	2018-07-04 12:37:38 +05:30
Mohammed R Abukhamseen	8662a4f677	POS - Translate some text & numpad (#14765 ) * make label & placeholder translatable * numpad translatable * Update point_of_sale.js remove debugger	2018-07-01 16:44:09 +05:30
Nabin Hait	104f62090d	Add filters for cost center in Budget Variance report	2018-06-29 12:25:03 +05:30
Himanshu Mishra	7aabef2026	Add configurable frequency in Selling Settings for update of project … (#14670 ) * Add configurable frequency in Selling Settings for update of project and company * remove redundant code * remove redundant code, only trigger calculation if order/invoice is present * removed dangling commas as per common convention in hooks * fix:handling multiple documents * Update selling_settings.json	2018-06-28 23:43:23 +05:30
rohitwaghchaure	191876f51b	[Fix] Bank Account mandatory (#14734 )	2018-06-28 23:28:58 +05:30
Charles-Henri Decultot	52fb43fc4f	Add no copy to payment terms template (#14725 )	2018-06-28 23:06:30 +05:30
Charles-Henri Decultot	8b22310d66	Allow auto repeat update (#14706 ) * Allow auto repeat update * Allow auto-repeat reference update	2018-06-28 14:27:58 +05:30
Zarrar	254ce645b1	[ Enhance ] Setup Wizard - Chart of Accounts (#14698 ) * enable selection of coa for user Give user option to select coa that's been verified along with standard and standard with numbers. Also added a button that opens a dialog and renders the selected chart * read chart from file and make a tree render-able dict of it * tree method to return node data for coa setup wizard	2018-06-28 14:15:34 +05:30
Shreya Shah	2fbc8509f5	Fix error message (#14716 )	2018-06-28 14:14:28 +05:30
Manas Solanki	4933e6bfeb	Update test_finance_book.py (#14703 )	2018-06-27 17:30:09 +05:30
Manas Solanki	b912374b96	[test] check the finance book via the journal entry	2018-06-27 15:07:15 +05:30
rohitwaghchaure	67d87e29e3	[Fix] Wrong rate calculation in Itemwise sales register report for multi uom (#14690 )	2018-06-27 11:22:03 +05:30
mnaim-cloude8	56e4346ead	To fixed if if no schedule and disposal is NOT within the period. (#14637 ) * To fixed if if no schedule and disposal is NOT within the period, then opening accumulated depreciation not included. If no schedule, and disposal is within period, accumulated dep is the amount eliminated. * Update asset_depreciations_and_balances.py	2018-06-25 15:05:26 +05:30
rohitwaghchaure	34c187706d	[Enhance] Added Budget exception approver role in company (#14645 ) * [Enhance] Added Budget exception approver role in company * Added test cases for budget	2018-06-25 10:31:08 +05:30
rohitwaghchaure	3a595d07d0	[Fix] POS Closing Voucher, on save collected amount becomes zero issue and added test cases (#14649 ) * [Fix] POS Closing Voucher, on save collected amount becomes zero * Added test cases for the POS Closing Voucher	2018-06-25 10:10:29 +05:30
Sushant Nadkar	00f0f0f5fc	Added adational filters to Tax Rule doctype (#14639 )	2018-06-22 15:57:19 +05:30
Ameya Shenoy	4e96f55eff	Merge branch 'master' into develop	2018-06-22 05:10:29 +00:00
Zlash65	4cf46edabc	expense_claim related fix in payment entry outstanding amount calculation fix, manual entry of expense trigger calculation of allocation added	2018-06-21 15:18:13 +05:30
rohitwaghchaure	79e5b07e62	[Fix] Subscription method (#14604 ) * [Fix] Subscription method path * [Fix] Condition	2018-06-21 12:58:14 +05:30
rohitwaghchaure	4d80c05125	[Fix] Deferred account must be liability account (#14612 )	2018-06-21 11:55:49 +05:30
Zarrar	e25dcd2737	[Minor] Report related fixes (#14620 ) * fix in query incase list is empty * periodicity not found error when called from consolidated financial statements and custom cash flow is activated * unset currency filter to apply default currency or so * python 2 - 3 fix	2018-06-21 10:53:12 +05:30
Saurabh	59798b4e88	resolved merge conflict	2018-06-20 15:23:25 +05:30
rohitwaghchaure	fd5ac45775	[Fix] Not able to make invoice in the subscription (#14594 )	2018-06-20 10:47:55 +05:30
Nabin Hait	a125a6199c	Allowed paid amount against debit/credit note	2018-06-19 12:07:02 +05:30
Shreya Shah	97124e92fa	[Fixes] Tax withholding category and Bank Guarantee (#14576 ) * Fetch withheld percentage * Set query for accounts on the basis of company * Fix bank guarantee error on submit * Remove errors caused by fields which are removed	2018-06-19 10:46:41 +05:30
Zarrar	80ff296e97	data not filled in acc. receivable report for some field fix (#14546 )	2018-06-17 11:21:10 +05:30
rohitwaghchaure	83a2612a18	[Fix] Consolidated Financial Statement report (#14537 )	2018-06-15 18:03:50 +05:30
rohitwaghchaure	77a45b43aa	Added expense account, cost center in the purchase order and material request item doctype and fix the code (#14535 )	2018-06-15 18:03:31 +05:30
Shreya Shah	27eff99190	[minor] Fixes for Exchange rate revaluation doctype (#14533 ) * Add set query for account and party_type * Fix asset category error	2018-06-15 16:30:15 +05:30
Shreya Shah	5f855d5da4	Add test case for Inter company Journal Entry (#14531 )	2018-06-15 15:33:21 +05:30
Ameya Shenoy	22c2f472e3	Merge branch 'master' into develop	2018-06-15 09:35:06 +00:00
rohitwaghchaure	e647c1f3cb	Renamed asset adjustment to asset value adjustment (#14532 )	2018-06-15 13:06:28 +05:30
Shreya Shah	0b9b8d6826	Remove unused code (#14526 )	2018-06-14 17:57:39 +05:30
Rushabh Mehta	1198d94904	[rename] Email Alert -> Notification	2018-06-14 13:18:21 +05:30
Zarrar	6ffdf94003	[Fixes] Defaults and User-Permission based fixes in treeview (#14501 ) * utility function added for treeview function to distinguish defaults from user permission and return appropriate data * make use of utility function for treeview	2018-06-14 12:24:16 +05:30
IOWEB TECHNOLOGIES	62805e2101	Fix unicode literal issue that prevents payment entries to be created (#14515 )	2018-06-14 09:14:07 +05:30
Shreya Shah	3d73a6f7f2	Fetch details from Journal Entry in Accounts Payable report (#14495 ) * Fetch bill_no, bill_date from Journal Entry * Fix as per suggestion * Fetch details only if bill_no exists	2018-06-13 16:33:06 +05:30
Jamsheer	30f37b2eb1	Payroll Entry - Separate JE for flexi salary component (#14502 ) * Payroll Entry - Accrual entry - exclude only tax impact - and separate JE for Flexi in Bank Entry * Journal Entry - validate cheque info on submit * Payroll Entry - Make Bamk Entry - Separate JE for benefit component	2018-06-13 15:29:38 +05:30
Rohit Waghchaure	647d595158	Code cleanup and fixes for the asset	2018-06-11 19:15:08 +05:30
Manas Solanki	7e8cbf288c	Update cost_center.py	2018-06-11 14:25:27 +05:30
rohitwaghchaure	7048925016	[Enhance] Standalone debit/credit note (#14269 ) * [Enhance] Standalone debit/credit note * Test cases * Test cases and documentation * Removed credit, debit note links from accounts module	2018-06-11 12:02:14 +05:30
Zarrar	88a90ff3b5	minor fix in account and account utils (#14432 )	2018-06-11 11:21:17 +05:30
Zarrar	44175904c6	Tree fix (#14425 ) * use frm.set_value instead of this.set_value * generic methods moved to accounts/utils * clean up code, and make use of methods added in utils	2018-06-08 16:35:21 +05:30
Zarrar	7ab70ca2d7	[ Fixes ] v11 Tree based doctype testing (#14419 ) * location tree fixes validate if child present while deleting, filter lists down only group enabled node * department tree fixes Adding child fix if added from rootnode with company filter applied. Rename consistency added. Validation added in on_trash * Company tree fix Check if child exist while deleting a node validation added. * Supplier Group tree fixes on_trash validation added if child node present * Cost Center tree fixes Adding child to root node throws error because parent_cost_center picks up root name	2018-06-08 14:33:15 +05:30
Zarrar	8cd0f67b25	query fix if name contains apostrophe (#14370 )	2018-06-07 16:48:31 +05:30
rohitwaghchaure	2704bef0b3	Merge pull request #14368 from shreyashah115/fix-trav Some more travis fixes	2018-06-07 14:14:33 +05:30
Shreya	4638d1ab97	Fix POS Profile test	2018-06-06 16:23:16 +05:30
Charles-Henri Decultot	a774f3d7a0	POS closing voucher (#14270 ) * POS closing voucher * Codacy corrections + improvements * Codacy corrections * POS Closing Voucher improvements	2018-06-06 10:22:13 +05:30
Shreya	9c801b976d	Fix share transfer test	2018-06-06 02:58:23 +05:30
Shreya Shah	630721aacc	Travis (#14354 ) * Fix Purchase Receipt tests * Fix Item test * Fix daily work summary test * Modify currency exchange test cases * Fix Leave Application test * Update working hours when making salary slip from timesheet * Replace fixer.io with exchangeratesapi * Fix codacy	2018-06-05 12:56:10 +05:30
Shreya Shah	4fa600a8dd	Apply GST based on Origin and Place of supply GST Code (#14288 ) * Add new gst field in Taxes and Charges template - is_inter_state * Add a patch * Add a regional function to fetch taxes on the basis of GSTin * Add regional function to hooks.py * Fetch taxes for Purchase Invoice on the basis of Supplier GSTIN * Fixes in the setup.py for India region * Set is_inter_state field For the existing Taxes and Charges templates, if an account_head with igst account (which is set in GST Settings) is found, set the checkbox and also check if it doesn't have a cgst account. * Fix as per review comment	2018-06-05 11:27:53 +05:30
Saurabh	0eb622f7da	[fix] resolve conflicts	2018-05-31 17:32:17 +05:30
Ahmad M Abdelrahman	f12b446dc8	Bank Account #13714 PR (#14295 )	2018-05-31 08:58:23 +05:30
Saurabh	e5d076d495	[minor][fix] fix query syntax (#14294 ) * [minor][fix] fix query syntax * Update pos.py	2018-05-31 08:54:31 +05:30
Rohit Waghchaure	7c0dd7a142	Rearrange fields	2018-05-31 00:27:05 +05:30
Zarrar	58200182b4	update timeline data form Activity Log (#14276 ) Documents updated are stored in Activity Log rather than Communication	2018-05-30 11:56:23 +05:30
Zarrar	b9f54ca946	[Enhance] Group same items during printing Delivery Note, Invoices, etc (#14250 ) * add doctypes allowed to group items, average the rate * add check field to group items during print * call common before_print in delivery note * fix precision issue while calculating average	2018-05-28 17:41:09 +05:30
rohitwaghchaure	65684564c2	Merge pull request #14253 from rohitwaghchaure/financial_report_issue [Fix] Data not displaying in financial reports	2018-05-28 15:03:43 +05:30
Rohit Waghchaure	c89a84b61e	Fixed data not displaying in financial reports	2018-05-28 15:01:57 +05:30
Shreya Shah	13f39eb821	Display rate on the basis of stock UOM (#14246 )	2018-05-28 11:50:28 +05:30
Shreya Shah	e329038aaa	Total Quantity in Sales and Purchase DocTypes (#14114 ) * Add field to all sales and purchase doctypes * Add patch to update existing records * Modify taxes_and_totals.py	2018-05-28 11:49:08 +05:30
tundebabzy	3eb235a53b	Sales Payment Summart Report Improvement (#14243 ) * fix iteritems() takes exactly 1 argument (2 given) * adds new helper functions * use new functions to make POS invoices filterable on warehouse and cost center * more PEP8 fixes	2018-05-28 10:26:45 +05:30
Suraj Shetty	084b0b3a67	Treeview permission (#14232 ) * Replace frappe.db.sql to frappe.get_list to apply permissions (#14037) * Replace frappe.db.sql to frappe.get_list to apply permission - All get_children method had frappe.db.sql in them which had no permission check, now its replaced with frappe.get_list which will check permission based on the user. * Fix codacy - Remove trailing whitespace * Add parent filter * Add ifnull checks	2018-05-26 09:12:59 +05:30
Nabin Hait	33df0b4fbf	Test case fixes (#14219 ) * Test case fixes * fetch_from fixes	2018-05-26 09:09:02 +05:30
Nabin Hait	f87ec61043	Test case fixes for item defaults	2018-05-24 18:19:21 +05:30
Nabin Hait	b903fc4e71	Item defaults query fixes	2018-05-24 17:07:51 +05:30
neckos	7663bb91c5	return list(filter()) not filter() (#14191 ) filter constructs an iterator that is iterable only once	2018-05-23 19:45:34 +05:30
Nabin Hait	5f861756a2	Item Default fixes	2018-05-23 19:37:06 +05:30
Rushabh Mehta	315dbd2ed1	[minor] chart_of_accounts.py for python3	2018-05-23 16:14:35 +05:30
Rushabh Mehta	8788688431	[fix] inconsistent indentation	2018-05-23 16:14:35 +05:30
Achilles Rasquinha	efb731941d	ran 2to3, evaluation (#13499 ) * ran 2to3, evaluation * Update update_gstin.py * Update accounts_receivable_summary.py	2018-05-23 11:31:24 +05:30
Zarrar	c141eb00ee	[Enhance] Department added wherever applicable (#14121 ) * set All Department as default parent_department * add department field in employee_transfer * copied data from options to fetch_from * add department field wherever employee's link field present * empty options field where fetch_from is added	2018-05-23 11:11:36 +05:30
Deepak kumar	e4c2ef03e1	Link Share Transfer to Account (#14127 ) * Link Share Transfer to Account * minor changes * minoor changes	2018-05-23 10:50:22 +05:30
OSS Technolab	4fb4ca6b10	Project Budget does not filter per Project (#14179 ) * Project Budget does not filter per Project Project Budget does not filter per Project and always return actual expense amount of all entries tagged to a project. * Update budget.py	2018-05-23 10:47:53 +05:30
Ameya Shenoy	1cc7500be9	Merge branch 'master' into develop	2018-05-22 09:18:38 +00:00
Rohit Waghchaure	7529bbb7b4	[Fix] 'SalesInvoice' object has no attribute 'inter_company_invoice_reference'	2018-05-22 11:55:48 +05:30
rohitwaghchaure	742d3e5549	[Fix] General ledger default_currency issue for member party type (#14172 )	2018-05-22 09:10:01 +05:30
rohitwaghchaure	734b874f3e	Merge pull request #14166 from rohitwaghchaure/version_11_patch_budget [Fix] Patch, default cost center, expense account for the item	2018-05-21 17:18:58 +05:30
Rohit Waghchaure	0ca7ba3247	[Fix] Patch, default cost center, expense account for the item	2018-05-21 16:43:50 +05:30
Valmik	bfb8a73377	Append company after (#14119 )	2018-05-21 10:44:35 +05:30
Valmik	c28378f448	[fix] get barcode string instead of dict (#14139 ) * [fix] get barcode string instead of dict * Update pos.py	2018-05-21 10:06:05 +05:30
Rohit Waghchaure	f61e94e162	Changed condition of finance book in reports	2018-05-18 09:10:07 +05:30
Rohit Waghchaure	f689d01a0c	Added finance book in Asset Depreciation Ledger report, fixed asset issue	2018-05-17 23:29:37 +05:30
Valmik Jangla	b52d5b21a1	Add UOM to Item View with Price	2018-05-17 00:09:21 -07:00
Rohit Waghchaure	585945e65d	Allow to select Asset Received But Not Billed in expense account head	2018-05-17 00:23:27 +05:30
rohitwaghchaure	e8ef69ec33	Merge pull request #14103 from rohitwaghchaure/asset_validation_issue_for_multiple_qty [Fix] Validation issue	2018-05-16 23:58:09 +05:30
Rohit Waghchaure	2868840e6b	[Fix] Validation issue	2018-05-16 23:57:28 +05:30
Rohit Waghchaure	44fda65b1d	[Fix] Company mandatory issue	2018-05-16 23:31:09 +05:30
Rohit Waghchaure	a91765707a	[Fix] TDS issue	2018-05-16 23:13:02 +05:30
rohitwaghchaure	64e81b436e	Merge pull request #14098 from rohitwaghchaure/minor_button_not_showing [Fix] Custom buttons not showing	2018-05-16 21:45:12 +05:30
Rohit Waghchaure	976af6b422	[Fix] Cystom buttons not showing	2018-05-16 21:43:16 +05:30
rohitwaghchaure	660ca9b6c0	Merge pull request #14097 from rohitwaghchaure/purchase_invoice_gl_entry_issue [Fix] Gl Enrty issue	2018-05-16 21:34:44 +05:30
Rohit Waghchaure	1a328d02d2	[Fix] Gl Enrty issue	2018-05-16 21:34:06 +05:30
Rohit Waghchaure	8e4f676c8c	[Fix] onload set default employee, leave approver, company	2018-05-16 19:55:52 +05:30
rohitwaghchaure	4ea97c84ac	Merge pull request #14092 from rohitwaghchaure/enterprise_develop_asset_fixes_for_perpetual [Fix] Asset gl entry not creating for non perpetual	2018-05-16 18:21:20 +05:30
Rohit Waghchaure	421697250b	[Fix] Asset gl entry not creating for non perpetual	2018-05-16 18:20:52 +05:30
Shreya	63d14cfac8	Instead of throwing error, just return	2018-05-16 17:30:58 +05:30
Shreya	df9516e906	Add Finance Book to route options	2018-05-16 17:30:35 +05:30
Ameya Shenoy	6e92958578	spaces to tabs	2018-05-16 16:11:20 +05:30
rohitwaghchaure	9122f19e69	Merge pull request #14079 from saurabh6790/TDS_sprint [fix] calculate withholding only on invoice	2018-05-16 15:01:46 +05:30
Saurabh	3c204122cd	[fix] calculate withholding only on invoice	2018-05-16 15:00:19 +05:30
Charles-Henri Decultot	2f822476dd	Removal of debugging print	2018-05-16 08:40:16 +00:00
rohitwaghchaure	eff678d2d6	Merge pull request #13918 from manassolanki/item-level-defualts [enhancement] add the item defaults in the child-table for multi-company	2018-05-16 14:04:47 +05:30
Charles-Henri Decultot	dcfe19d868	Missing parentheses in price list rate determination	2018-05-16 08:34:41 +00:00
Suraj Shetty	fbb6b3da5f	Undo replace of frappe.db.sql with frappe.get_list (#14074 )	2018-05-16 13:53:31 +05:30
Ranjith Kurungadam	cdd4704485	Fixes, fields in Salary Component (#14071 ) * remove duplicate fields * Salary Component - fields is_tax_applicable, is_payable * fix intendation	2018-05-16 13:10:08 +05:30
Rushabh Mehta	0b628386de	[minor] remove in_dialog old property	2018-05-16 12:51:22 +05:30
Manas Solanki	087a2259d9	update for default warehouse	2018-05-16 12:44:07 +05:30
Rohit Waghchaure	144e9b178a	Added project condition in budget validation	2018-05-16 12:15:57 +05:30
Rushabh Mehta	b56f3d0689	[fix] syntax errors	2018-05-16 12:03:39 +05:30
tundebabzy	ad08d4ce96	Ability to hold payment for disputed invoices #12048 (#13298 ) * add new fields to Supplier Master: - on_hold: To signal the Customer is blocked from completing certain transactions - hold_type: 3 options - All, invoices and payments * sanitize `on_hold` field input * show hold status in list view * add `release_date` field to Supplier Master: - specifies the date when transaction restraint will be removed * reset release date if supplier is not on hold * add validation to stop transactions when Supplier is blocked * add test cases * return empty list for outstanding references if supplier is blocked * block make button:payment if supplier is blocked * adjust test cases * PEP 8 clean up * more tests * adds new fields to Purchase Invoice: - release_date: once set, invoice will be on hold until set date - hold_comment: so user can add comment pertaining to why invoice is on hold * implement individual purchase invoice on hold logic * allow user to change release date * update manual * final cleanup including more validation and tests * update supplier manual * make default for release_date argument todays date * remove Auto Repeat added by mistake * add on_hold_field to purchase invoice * add 'On Hold' or 'Temporarily on Hold' status for purchase invoice in list view * implement explicit payment hold in purchase invoice * update manual * add dialog for saving comment * bug fix, refactor, clean up * more test cases	2018-05-16 11:31:41 +05:30
Shreya Shah	1906cadd94	[Fix] Currency field in Pricing rule (#14004 ) * some minor changes * Set query for price list based on currency * Validate Price list with currency	2018-05-16 11:20:30 +05:30
rohitwaghchaure	e8358f33a3	Refactor party type (#13831 )	2018-05-16 11:02:26 +05:30
Suraj Shetty	8501010f12	Replace frappe.db.sql to frappe.get_list to apply permissions (#14037 ) * Replace frappe.db.sql to frappe.get_list to apply permission - All get_children method had frappe.db.sql in them which had no permission check, now its replaced with frappe.get_list which will check permission based on the user. * Fix codacy - Remove trailing whitespace	2018-05-16 10:44:38 +05:30
rohitwaghchaure	f9fa588ddc	Merge pull request #14061 from rohitwaghchaure/budget_validation_enhance_in_mr_po [Enhance] Budget validation on material request, purchase order	2018-05-15 22:18:17 +05:30
Rohit Waghchaure	4d4fb6dcbc	[Enhance] Budget validation on material request, purchase order	2018-05-15 22:12:44 +05:30
rohitwaghchaure	c3b9eabe5e	Merge pull request #14048 from shreyashah115/exchange-rate [Enhancement] Buying and Selling checkboxes in Currency Exchange	2018-05-15 17:55:09 +05:30
Zlash65	36cb8fb153	removed hard coded account_type from tree's add_child entry	2018-05-15 17:36:01 +05:30
Shreya	3f77852e93	Pass buying or selling as filter parameters Wherever get_exchange_rate is called, pass filter buying or selling on the basis of doctype.	2018-05-15 17:22:06 +05:30
Manas Solanki	1879f08c7c	Merge branch 'develop' into deferred-account	2018-05-15 15:20:44 +05:30
Manas Solanki	0b7f64924d	booking via the schedular	2018-05-15 13:04:01 +05:30
Manas Solanki	0393848f60	deferred account in the item and company master	2018-05-15 13:04:01 +05:30
Saurabh	2ca83d61ea	Resolve merge conflicts from enterprise_sprint branch	2018-05-14 21:15:46 +05:30
Saurabh	4ae089d6a1	Provision to deduct TDS on Advance	2018-05-14 20:42:08 +05:30
Saurabh	f3f438ad18	tds fixed for PI	2018-05-14 20:42:08 +05:30
Saurabh	b9d3385fec	calculate TDS on Sales Invoice Amount	2018-05-14 20:42:08 +05:30
Saurabh	2d8a7ee81f	Bootstrap 'TDS' via fixture	2018-05-14 20:41:38 +05:30
rohitwaghchaure	7c6bef4905	Merge branch 'enterprise_sprint' into supplier-group	2018-05-14 20:39:01 +05:30
rohitwaghchaure	67da5f7671	Merge pull request #14023 from mntechnique/accounting_period Accounting Period	2018-05-14 20:33:09 +05:30
Rohit Waghchaure	16bc853f6a	Reschedule for future depreciations and booked difference amount in accumulated depreciation account	2018-05-14 19:07:40 +05:30
Rohit Waghchaure	f2684ae83a	Commonify get_asset_category_account and get_fixed_asset_account method	2018-05-14 19:07:40 +05:30
Rohit Waghchaure	f41e1ed191	Added default asset accounts in COA, CWIP account in asset category	2018-05-14 19:07:40 +05:30
Rohit Waghchaure	af05995418	Asset accounting	2018-05-14 19:07:39 +05:30
Rohit Waghchaure	c6deb13fb4	Added account fields in the company, fixes in auto creation of the asset from PR	2018-05-14 19:07:39 +05:30
Rohit Waghchaure	ab84254188	Asset linked to purchase receipt and serial no	2018-05-14 19:07:39 +05:30
rohitwaghchaure	17aec2d16c	Merge pull request #13808 from mntechnique/cost-center-number Cost center number	2018-05-14 18:35:38 +05:30
rohitwaghchaure	044d6908cf	Merge pull request #13564 from sathishpy/develop Bank Statement Import	2018-05-14 18:27:53 +05:30
Gaurav Naik	21b2df41ac	[Fix] len() instead of .length	2018-05-14 18:15:47 +05:30
Gaurav Naik	caaebb9d2a	[WIP] Accounting Period Test cases	2018-05-14 18:11:09 +05:30
Gaurav Naik	52571a80da	Bootstrap documents for closing (js)	2018-05-14 18:06:50 +05:30
Gaurav Naik	2fe38c3ff5	Bootstrap documents for closing	2018-05-14 18:06:34 +05:30
Gaurav Naik	32b3aa257c	[Fix] Indentation for accounting_period overlap	2018-05-14 18:02:24 +05:30
Zlash65	890707854d	config/utility level changes	2018-05-14 11:45:38 +05:30
Zlash65	0a50554417	doctype level changes	2018-05-14 11:45:38 +05:30
Zlash65	4437a5ed18	json level changes	2018-05-14 11:45:38 +05:30
rohitwaghchaure	a8c49f26d3	Merge pull request #14002 from rohitwaghchaure/search_item_spelling_issue Fixed spelling	2018-05-14 00:44:29 +05:30
Rohit Waghchaure	eee830eafe	Fixed spelling	2018-05-13 16:17:18 +05:30
Gaurav Naik	9502476c67	Accounting Period overlap validation	2018-05-11 07:53:12 +05:30
Gaurav Naik	6c92cff226	Accounting Period autoname	2018-05-11 07:52:50 +05:30
Nabin Hait	b9fed2aa38	Removed company from Finance Book and related changes	2018-05-09 15:10:29 +05:30
Gaurav Naik	a78a0e241f	Added finance book filtering logic to financial_statements.py	2018-05-09 15:03:40 +05:30
Gaurav Naik	40559d5f5c	Added finance book filter logic to ReceivablePayable	2018-05-09 15:02:55 +05:30
Gaurav Naik	70ac2d2c51	Added finance book filter in accounts_receivable.js	2018-05-09 15:02:23 +05:30
Gaurav Naik	cddda8ac5f	Added finance book filter in accounts_payable.js	2018-05-09 15:02:11 +05:30
Gaurav Naik	57856b475c	Added finance book filter logic in general_ledger.py	2018-05-09 14:58:15 +05:30
Gaurav Naik	460d96f16d	Added finance book filter to General Ledger	2018-05-09 14:57:36 +05:30
Gaurav Naik	a6d3cbfbc5	Added finance book field to GL Entry doctype	2018-05-09 14:56:52 +05:30
Gaurav Naik	30f9e0f547	Set finance book in make_gl_entries	2018-05-09 14:56:39 +05:30
Gaurav Naik	a948726ddd	Added Finance Book doctype	2018-05-09 14:53:51 +05:30
Manas Solanki	fbe548e4be	[Enterprise] Bank Guarantee Enhancements (#13960 )	2018-05-09 14:49:53 +05:30
Nabin Hait	b2800eeb2a	Merge branch 'develop' of https://github.com/frappe/erpnext into develop	2018-05-08 16:34:35 +05:30
Nabin Hait	9036b9ee85	Merge branch 'master' into develop	2018-05-08 16:31:42 +05:30
Zarrar	f2df7f32fa	update subscription to auto_repeat across dashboards (#13956 )	2018-05-08 16:06:36 +05:30
Saurabh	b36517158b	[fix] cheque print template coordinates (#13959 )	2018-05-08 15:23:29 +05:30
Nabin Hait	330fae8652	minor fixes	2018-05-07 16:11:35 +05:30
Nabin Hait	fdc67a577f	Merge branch 'multi-company-transations' of https://github.com/shreyashah115/erpnext into shreyashah115-multi-company-transations	2018-05-07 13:12:16 +05:30
Rah Yuliantoro	b3882cacd9	update coa and company default (#13937 ) * Update standard_chart_of_accounts.py adding account for employee advances * Update standard_chart_of_accounts_with_account_number.py adding account for employee advances * Update company.py adding accounts for default fields in company doctypes * Update company.py Missing some default accounts for fields in company doctype	2018-05-07 11:39:35 +05:30
Nabin Hait	ba70ff0904	Exchange rate revaluation (#13932 ) * Added account data on child table * Added Journal Entry button and functionality * Add docs * Refactoring and cleanup of Exchange Rate Revaluation	2018-05-05 18:22:56 +05:30
Nabin Hait	338e1b6e91	Merge branch 'master' into develop	2018-05-05 14:33:35 +05:30
Nabin Hait	161f35a687	Update sales_invoice.py	2018-05-05 14:32:31 +05:30
Nabin Hait	4bbe5fbefc	Fixes related to auto repeat	2018-05-05 12:32:59 +05:30
Nabin Hait	abd0325acd	Fixed merge conflict	2018-05-05 12:19:14 +05:30
Rohit Waghchaure	3e0a937cb8	[Fix] Tax not changes when user change the POS profile in the sales invoice	2018-05-04 19:20:20 +05:30
Suraj Shetty	dcc90e3312	Add fix to support changes in user permission (#13923 ) https://github.com/frappe/frappe/pull/5494	2018-05-04 17:52:57 +05:30
Suraj Shetty	00cced12a0	Success Action (#13666 ) * success action config for sales invoice * remove "Notification Control" doctype and its usage * add default success action after_install or while migration (patch) * rename for_doctype to ref_doctype * case change * minor fix * Remove unnecessary code * Replace message with translatable message * Fix 'cannot import error'	2018-05-03 19:06:32 +05:30
Shreya Shah	ecb9315ea1	Inter Company Journal Entry (#13683 ) * rebase with enterprise_sprint * Add Inter company account checkbox in Account master * Add Inter Company Journal Entry Voucher Type in Journal Entry * Make Inter Company Journal Entry button * Dialog to select company for Inter Company Journal Entry * Map relevant fields in the Inter Company Journal Entry and reference links * Rebase * Add Documentation	2018-05-03 19:04:36 +05:30
Zarrar	6f3594b2e4	[Enhance] GL Entry - ability to multiselect party (#13769 ) * change dynamic link to multiselect field and improv * print based fix * refactor changes according to multiselect changes	2018-05-03 19:00:43 +05:30
rohitwaghchaure	1aa3a11546	On auto-creation of new Fiscal Year, send Email notification to the account users (#13789 )	2018-05-03 18:59:26 +05:30
Saurabh	e85a43c1c6	Merge branch 'master' into develop	2018-05-02 14:48:10 +05:30
Shreya	27e4e244b6	fix codacy	2018-05-02 14:34:14 +05:30
Shreya	ae0b31c31d	changes as per the reviews	2018-05-02 14:34:14 +05:30
Shreya	b47302dd52	unlink reference on cancellation of any invoice	2018-05-02 14:34:14 +05:30
Shreya	c804f424ab	update reference fields on both invoices	2018-05-02 14:34:14 +05:30
Shreya	79584b1cbd	validations to check price list and currencies	2018-05-02 14:34:14 +05:30
Shreya	99ae0439d7	mapping of relevant fields	2018-05-02 14:34:14 +05:30
Shreya	0bd987ab03	validations before routing to invoice	2018-05-02 14:34:14 +05:30
Shreya	ed80cf1f2e	Inter company invoice reference link field	2018-05-02 14:34:14 +05:30
Shreya	30b2480cfe	make inter company invoice button on Invoices	2018-05-02 14:34:14 +05:30
Shreya	462e18ad2e	Allowed To Transact With child table in Customer & Supplier	2018-05-02 14:34:14 +05:30
Faris Ansari	5df63e36d4	Merge branch 'hotfix' of https://github.com/frappe/erpnext into hotfix	2018-05-01 10:52:15 +05:30
Faris Ansari	bd99606a14	Change msgprint to unobtrusive alert	2018-05-01 10:52:02 +05:30
Zarrar	b0a46f397a	display customer's name while printing receivable report (#13830 )	2018-04-30 19:40:18 +05:30
Nabin Hait	3652a62b55	minor fixes	2018-04-30 19:32:29 +05:30
Faris Ansari	8be895091e	Set is_pos to 0 in Opening Invoice Tool (#13810 )	2018-04-30 11:13:06 +05:30
AravindPranera	805f09a3fe	Accounts receivable aging based on supplier due date (#13801 )	2018-04-26 18:02:37 +05:30
deepak-mnt	b712d1905d	Override after_rename method to fetch cost center number on changing from title	2018-04-26 17:04:06 +05:30
deepak-mnt	b379998961	Added Update Cost Center Number button and it's functionality	2018-04-26 17:00:08 +05:30
Nabin Hait	dc75be8b6c	Show company column in order in consolidated financial statement	2018-04-26 12:16:38 +05:30
Rohit Waghchaure	4110e00b2d	[Fix] general ledger group by validation	2018-04-26 12:16:38 +05:30
Rohit Waghchaure	26decaad6c	[Fix] Profit and loss statment	2018-04-26 12:16:38 +05:30
Nabin Hait	f164203520	Fixed merge conflict	2018-04-26 12:16:18 +05:30
rohitwaghchaure	efff6e53de	Consolidated financial statement (#13678 ) * added fields to support treeview * tree file added, nestedset implemented * patch added to reload doc and configure lft rgt * Added consolidated financial statement report	2018-04-26 12:16:18 +05:30
rohitwaghchaure	fb9af38106	Group by party in general ledger report (#13649 ) * Group wise Ledger for Customer and Supplier * commonify group by fields	2018-04-26 12:16:18 +05:30
Nabin Hait	1c13e70d13	New doctypes for HR and Accounting (#13652 )	2018-04-26 12:12:29 +05:30
Saurabh	63590496c1	[fix] resolved merge conflicts	2018-04-25 11:32:54 +05:30
rohitwaghchaure	57914f140e	[HotFix] Taxes not adding in POS sales invoice (#13776 )	2018-04-24 19:19:47 +05:30
Shreya Shah	4dc453d131	Loan Management for the Members (Non Profit Module) (#13149 ) * Renamed - Employee Loan Application to Loan Application, Employee Loan to Loan and field Employee Loan Account to Loan Account * Patch added * Dynamic link fields 'applicant' and 'applicant_type' * Member link visible only if domain non profit is active * Modified loan_dashboard * Make Repayment Entry button * Common file loan_common.js for loan and loan_application * repayment schedule rows selection in dialog * validation if repayment amount > total paid amount * repayment only if disbursement is done, make repayment by selecting the installment which falls in the current month * fetch nowdate if disbursement date not found * Rebased with develop * updated non-profit module page * updated patch for renamed fields * dialog to select repayment entries * hidden field to store reschedule paid status * update paid check in loan on journal entry updation * calculate total paid * updated docs * codacy fix	2018-04-24 12:19:36 +05:30
Saurabh	9738d52d5f	Merge branch 'master' into develop	2018-04-24 12:09:40 +05:30
Rohit Waghchaure	31edddace6	[Fix] Tax not changes when user change the POS profile in the sales invoice	2018-04-24 11:43:31 +05:30

... 12 13 14 15 16 ...

4929 Commits