3784 Commits

Author	SHA1	Message	Date
pawan	8d1d64aa29	[fix] #11449	2017-11-06 17:39:30 +05:30
pawan	e61a275651	[fix] #11427	2017-11-06 17:39:30 +05:30
rohitwaghchaure	bcb7854340	Merge pull request #10982 from netchampfaris/multiple-users-pos-profile ... [Enhancement] Allow Multiple users in POS Profile	2017-11-06 16:45:01 +05:30
Manas Solanki	b1616a0cb3	changes in thepos profile	2017-11-06 13:53:52 +05:30
Manas Solanki	3f0dfd720f	set the pos profile in the sales invoice	2017-11-06 13:53:52 +05:30
Manas Solanki	76ce074c63	return the account details if and only if there is single account of that type (#11407)	2017-11-02 18:12:47 +05:30
Saurabh	62fd4007b0	Merge branch 'master' into staging	2017-11-02 12:14:42 +05:30
Saurabh	3be72ef187	Merge branch 'master' into develop	2017-11-02 12:14:41 +05:30
Rohit Waghchaure	99748dbacf	[Fix] Wrong difference amount in the payment entry for the internal transfer type	2017-11-01 11:45:02 +05:30
Faris Ansari	3d59179205	Load default pos profile if not found	2017-10-31 21:56:16 +05:30
Manas Solanki	160e710ebf	set bank account only if there is single bank type account (#11363) ... * set bank account only if there is single bank type account * Update journal_entry.py	2017-10-31 13:04:02 +05:30
Prateeksha Singh	6b26e391b8	use the new frappe charts :D (#11391)	2017-10-31 12:58:48 +05:30
Faris Ansari	895aa7b7ac	fix codacy	2017-10-30 17:12:50 +05:30
Faris Ansari	7095de03ef	Merge branch 'develop' into multiple-users-pos-profile	2017-10-30 15:00:55 +05:30
Faris Ansari	8c1099d236	Add POS Profile User DocType	2017-10-27 16:48:07 +05:30
ashish	ca2250c440	sales_invoice.py -- Check credit limit when make delivery is done from sales invoice.We need to check the credit limit as there could be multiple partially paid sales order(note we are bypassing credit check at sales order) so we need to recheck credit balance of customer to avoid any delivery crossing credit limit from sales invoice.cint function is added.	2017-10-26 20:22:34 +05:30
tunde	14e97ce0c8	Merge branch 'develop' into payment-terms	2017-10-26 13:35:42 +01:00
Nabin Hait	c799a22d55	Merge branch 'master' into staging	2017-10-26 14:35:34 +05:30
Nabin Hait	edef9811f9	Merge branch 'master' into develop	2017-10-26 14:35:34 +05:30
Nabin Hait	52909b73bb	[test] Fixed advance jv cancellation (#11333)	2017-10-26 11:06:07 +05:30
Saurabh	b445633e56	Merge branch 'master' into staging	2017-10-26 09:59:22 +05:30
Saurabh	0d597cef8d	Merge branch 'master' into develop	2017-10-26 09:59:22 +05:30
rohitwaghchaure	2e6f6d6749	[minor] cleanup code (#11331)	2017-10-25 17:03:49 +05:30
ashish	ff20182d03	sales_invoice.py -- Check credit limit when make delivery is done from sales invoice.We need to check the credit limit as there could be multiple partially paid sales order(note we are bypassing credit check at sales order) so we need to recheck credit balance of customer to avoid any delivery crossing credit limit from sales invoice	2017-10-25 16:11:58 +05:30
Nabin Hait	4d22b6db30	Fixed Merge Conflict	2017-10-25 14:09:46 +05:30
Nabin Hait	cd3dbcb2ef	Fixed Merge Conflict	2017-10-25 14:07:25 +05:30
tundebabzy	40a02769c5	Error in the Address fetched in Sales Order.(#11129) (#11145) ... * add new function - `get_party_shipping_address` * `swap `get_default_address` with `get_party_shipping_address` * test cases * properly sets order by direction * move `get_party_shipping_address` to party.py * fix test module import	2017-10-25 12:24:34 +05:30
Makarand Bauskar	e6712c129c	[hotfix] fixed Permissions Error while fetching allow_stale field value from Accounts Settings (#11182) ... * [hotfix] fixed Permissions Error while fetching allow_stale field value from Accounts Settings * [minor] renamed the allow_stale_rate method to stale_rate_allowed	2017-10-25 12:17:40 +05:30
Nabin Hait	1c1237537b	Subscription fixes (#11292) ... * Subscription fixes * Removed recurring fields, cleanup code	2017-10-25 12:10:44 +05:30
rohitwaghchaure	2672c331af	Validation for duplicate offline pos (#11281)	2017-10-25 11:47:18 +05:30
Nabin Hait	8a0943ead7	Unlink reference doc on Journal Cancellation only if advance (#11285)	2017-10-25 11:46:35 +05:30
Charles-Henri Decultot	7862eb444f	[Hotfix] Addition of an empty tax group in the french CoA (#11306)	2017-10-25 11:44:46 +05:30
Nabin Hait	6c06e700d6	[Fix] Unallocated amount considering deductions (#11314)	2017-10-25 11:42:05 +05:30
tunde	c8d2361b81	Merge branch 'develop' into payment-terms	2017-10-24 12:25:29 +01:00
Nabin Hait	7533101d4b	Merge branch 'master' into develop	2017-10-21 11:29:40 +05:30
rohitwaghchaure	5fdd26f1e7	[fix] Discount amount not reset for new order in offline pos (#11258)	2017-10-21 11:23:45 +05:30
tunde	09ce68ec19	Merge branch 'develop' into payment-terms	2017-10-19 17:47:31 +01:00
Nabin Hait	bb60a59b96	Fixed asset test cases due to tax rule (#11247) ... * Fixed asset testcases due to tax rule * Delete tax rule record after running test cases * Fixed test cases * Fixed test cases * Fixed subscription tests due to tax rule	2017-10-19 12:14:37 +05:30
Saurabh	5fa2adcca9	Merge branch 'master' into develop	2017-10-18 16:23:44 +05:30
Brown-Harry Boma	11e964d442	Set transaction type in pricing rule only if unavailable (#11229) ... * Set transaction type in pricing rule only if unavailable * Update pricing_rule.py	2017-10-18 11:07:09 +05:30
rohitwaghchaure	a516856c32	[Fix] Getting an error duplicate name while making an invoice in draft mode (#11230)	2017-10-18 11:05:10 +05:30
Javier Wong	84f7ba8699	[hotfix] Allow Sales User and Purchase User to Read Account Settings (#11233) ... * [hotfix] Allow Sales User and Purchase User to Read Account Settings This fixes https://discuss.erpnext.com/t/not-permitted-message-for-new-quotation-and-sales-order/29261/4. * Added back Accounts Manager Permissions	2017-10-18 11:04:15 +05:30
Prateeksha Singh	bfb108d722	Replace c3 (#11112) ... * [charts] replace in asset.js * replace in reports	2017-10-17 12:03:02 +05:30
Nabin Hait	45a640df08	Update payment_entry_reference.json	2017-10-16 12:58:32 +05:30
Nabin Hait	53659cf0bd	Update payment_entry_reference.json	2017-10-16 12:57:51 +05:30
Makarand Bauskar	80f333950b	[minor] fixed AttributeError: 'GrossProfitGenerator' object has no attribute 'grouped_data' (#11195)	2017-10-16 11:27:22 +05:30
mbauskar	cd4202c2f7	Merge branch 'master' into develop	2017-10-15 19:10:56 +05:30
rohitwaghchaure	496174bbdf	[Fix] Naming series not copy from referebce document to new document in subscription (#11196)	2017-10-15 19:08:42 +05:30
Saurabh	5ffed60916	Merge branch 'master' into develop	2017-10-11 14:39:11 +05:30
Makarand Bauskar	4cdb9dee09	[minor] changed the modified date for the subscription doctype (#11142)	2017-10-10 18:41:00 +05:30
tunde	37c2b6116c	Merge branch 'develop' into payment-terms	2017-10-09 15:42:47 +01:00
mbauskar	966b3c156a	[conflicts] resolved merge conflicts	2017-10-09 15:20:30 +05:30
Rohit Waghchaure	beeba8b37a	[Fix] Discount field not displaying in offline POS	2017-10-06 09:50:43 +05:30
Rohit Waghchaure	b870d0081b	[fix] Online print format in pos profile field not displaying	2017-10-06 09:31:40 +05:30
tunde	d82677f1e6	Merge branch 'develop' into payment-terms	2017-10-06 02:23:45 +01:00
Utkarsh Goswami	4cb4d2f155	Tests for payment entry against purchase invoice (#10930)	2017-10-05 16:51:42 +05:30
mbauskar	74ce391303	Merge branch 'master' into develop	2017-10-05 13:36:50 +05:30
Nabin Hait	729aa2025a	Show commission section for pos as well (#11059)	2017-10-05 12:21:36 +05:30
rohitwaghchaure	e87a076f1d	Update link in the pos for offline and online mode from pos settings (#11061)	2017-10-05 12:20:20 +05:30
Nabin Hait	3d0d4b2157	update subscription period only if relevant date field exists (#11046)	2017-10-04 15:51:55 +05:30
Nabin Hait	b779644493	Merge branch 'master' into develop	2017-10-04 14:52:32 +05:30
Makarand Bauskar	eaec4695f7	[hotfix] filter doctype if the doctype has subscription field (#11038)	2017-10-04 14:34:45 +05:30
Saurabh	ee4a2dd26f	[fix] resolved merge conflicts	2017-10-03 18:02:09 +05:30
Rohit Waghchaure	445e8a2e57	[Fix] Subscription end date, cancel issue, added from and to date	2017-10-03 17:45:11 +05:30
tunde	19e63b73ed	Merge branch 'develop' into payment-terms	2017-10-03 12:02:38 +01:00
Nabin Hait	7eba1a35d3	Controller init args fix (#11015) ... * Controller init args fix * cleanup useless code	2017-10-02 15:59:27 +05:30
Nabin Hait	8919669ac2	Merge branch 'master' into develop	2017-10-02 12:28:27 +05:30
rohitwaghchaure	88491715e0	[Fix] select batch not displaying in the modal, duplicate invoice making after sync (#11005)	2017-10-02 12:13:36 +05:30
tunde	c49e748c85	Merge branch 'develop' into payment-terms	2017-09-29 13:30:22 +01:00
Rushabh Mehta	912ae24ca2	Merge branch 'master' into develop	2017-09-29 16:22:02 +05:30
Faris Ansari	8ac56b26e0	[Enhancement] Allow Multiple users in POS Profile	2017-09-29 16:15:15 +05:30
Pawan Mehta	5d8fd477bd	[fix] #10840 (#10844)	2017-09-29 15:23:54 +05:30
tunde	25275077ab	Merge branch 'develop' into payment-terms	2017-09-29 10:47:01 +01:00
Makarand Bauskar	9c339145b2	[Enhance] Custom notification messages for subscription documents (#10970) ... * [minor] configurable subscription email message and subject for notification * [minor] added description for subject field	2017-09-29 15:02:51 +05:30
tunde	3415ac6e9c	Merge branch 'develop' into payment-terms	2017-09-29 10:10:24 +01:00
Rushabh Mehta	3c14c5a16c	[fix] tax_rule.py args	2017-09-29 13:21:22 +05:30
Nabin Hait	c314485d55	Fixes based on test case	2017-09-28 18:55:49 +05:30
Nabin Hait	fce14fdcf0	Fixed merge conflict	2017-09-27 17:21:21 +05:30
Rohit Waghchaure	566a0a05c8	[fix] 'NoneType' object is not iterable while saving quotation	2017-09-27 15:57:48 +05:30
Nabin Hait	76e1ca35ad	Merge branch 'master' into develop	2017-09-27 13:05:21 +05:30
Makarand Bauskar	70eaf2da95	[minor] removed the default precision for the margin_rate_or_amount field (#10923)	2017-09-27 12:49:16 +05:30
tunde	567119170e	Merge branch 'develop' into payment-terms	2017-09-26 17:28:07 +01:00
Nabin Hait	51a07d19c8	Merge branch 'master' into develop	2017-09-26 15:59:15 +05:30
Nabin Hait	b0ba55e52f	Set bill no while making payment entry from purchase invoice	2017-09-26 15:56:58 +05:30
tunde	095cfc9cfc	disable some Payment Schedule fields	2017-09-26 10:25:49 +01:00
tunde	9e4dcdfbc8	rename Payment Terms Schedule section break to Payment Terms	2017-09-26 09:44:23 +01:00
tunde	192587fe56	UI test cases	2017-09-26 01:32:08 +01:00
tunde	c4b0d17c08	fix bug: can't make PE for invoice with multi due date	2017-09-26 01:02:43 +01:00
tunde	31ddbe36c0	fix bug: cast to flt	2017-09-25 23:24:32 +01:00
tunde	94c3c13ba6	fix failing tests	2017-09-25 14:47:48 +01:00
Nabin Hait	3b61552836	Revert "Advance against expense claim (#10632)" (#10877) ... This reverts commit cdd6ded790.	2017-09-25 11:27:39 +05:30
tunde	77ecacc379	validation to check for possible duplicate payment terms	2017-09-22 23:12:55 +01:00
tunde	cf42d1db5c	more tests	2017-09-22 17:20:33 +01:00
tunde	3aec78b472	make due date, invoice_portion mandatory	2017-09-22 16:22:15 +01:00
tunde	e6b3fe1215	add tests for payment term template	2017-09-22 16:04:07 +01:00
tunde	62af5c5693	more validation checks and test fixes	2017-09-22 15:16:38 +01:00
tunde	73a83a472d	validation for Payment Terms Template	2017-09-22 11:05:40 +01:00
tunde	d7d306bfdb	fix final failing test	2017-09-21 13:43:38 +01:00
Nabin Hait	cdd6ded790	Advance against expense claim (#10632) ... * Adds Whitelist Method for Advance Entry * Adds changes required for managing Advance Payments in Expense Claim including new fields and documentation. Also resolved merge conflict by using the more recent modified date * Adds changes for managing advance payments using Default Account and Party * Removed console.log from the JS file * Advance Payment Patch - Fixed Codacy errors * Removed stray file * Fixed conflicts due to changes in upstream * Fixed Codacy errors * Fixed Codacy errors * Fixed Codacy errors * Fixed Codacy errors * Fixed Codacy errors * Fixed pending Codacy error * Updated JS code by removing cur_frm which is soon to be deprecated * Advance against Expense Claim: cleanup and fixes * Test case fixed	2017-09-21 18:03:45 +05:30
tunde	82de375ba0	Merge branch 'develop' into payment-terms	2017-09-21 11:21:05 +01:00
tunde	951092eecd	fix sales order and pricing rule failing tests	2017-09-21 11:14:53 +01:00
tunde	99849f8eab	fix failing tests	2017-09-21 10:23:40 +01:00
tundebabzy	ab5b03011d	Enhance Currency Exchange Management (#10482) ... * add new settings in Accouts Settings * patch for new settings * refactor `get_exchange_rate` * adds validation * tests validation * disables conversion rate field if stale rates not allowed * more test cases more test case... test `get_exchange_rate` behaviour with stale not allowed in sett.. fix currency exchange test case do housekeeping after running accounts settings test * clean up * documentation * make use of correct api url * Fix tests failing due to wrong exchange rate from fixer.io * remove mandatory constraint from `allow_stale` * added info to documentation	2017-09-21 14:50:39 +05:30
Nabin Hait	24ec3c7dcb	Fixed merge conflict	2017-09-21 12:53:41 +05:30
tunde	ae0eb718a3	Merge branch 'develop' into payment-terms	2017-09-21 08:12:23 +01:00
Manas Solanki	1c1dd08a34	only validate party account and ref doc party account in selected case (#10863) ... * only validate party account and ref doc party account in selected case * fix for fee structure test * fix the assessment result test	2017-09-21 12:01:20 +05:30
tunde	c02f332565	Merge branch 'develop' into payment-terms	2017-09-20 15:37:34 +01:00
tunde	35c84fe4f2	fix failing test case	2017-09-20 12:26:19 +01:00
Nabin Hait	b2dca79d89	Updated modified timestamp in sales/purchase transaction doctypes	2017-09-20 09:56:06 +05:30
tunde	4712ed6377	remove logging statement	2017-09-19 21:30:34 +01:00
tunde	3387d026b1	Merge branch 'develop' into payment-terms	2017-09-19 18:07:12 +01:00
tunde	da17954919	fix failing tests	2017-09-19 17:53:31 +01:00
Manas Solanki	1bcc6c661a	minor changes	2017-09-19 17:23:03 +05:30
Manas Solanki	9b44c16a32	add the fee schedule in config	2017-09-19 17:23:03 +05:30
Manas Solanki	1299d56e85	cleanup of the fee module	2017-09-19 17:23:03 +05:30
Manas Solanki	152ba1eccb	fixes as per the review	2017-09-19 17:23:03 +05:30
Manas Solanki	4e0559bc79	make payment entry for the fees	2017-09-19 17:23:03 +05:30
Manas Solanki	2b39d5d6d5	make gl_entry on submission of fees	2017-09-19 17:23:02 +05:30
Manas Solanki	e4acf763a5	make payment request for the fee	2017-09-19 17:23:02 +05:30
Nabin Hait	2e4de83df6	Rounding Adjustment via a separate field, instead of last tax row (#10659) ... * Rounding Adjust via a separate field, instead of last tax row * Fixed test cases	2017-09-19 14:53:16 +05:30
Nabin Hait	caf9891075	Fixed merge conflict	2017-09-19 12:06:22 +05:30
Nabin Hait	bd4b80e3d8	Merge branch 'master' into develop	2017-09-19 12:05:41 +05:30
rohitwaghchaure	4f0f144142	Merge pull request #10831 from rohitwaghchaure/cherry_pick_subscription_staging_to_develop ... Cherry pick staging to develop for subscription cleanup	2017-09-19 10:26:20 +05:30
Nabin Hait	cf36534eed	Gross profit report considering returned items (#10734)	2017-09-18 19:13:45 +05:30
rohitwaghchaure	850eaa73b0	Move subscription module to accounts (#10772)	2017-09-18 17:23:00 +05:30
Nabin Hait	e859671eb3	Revert "Added ability to disable auto creation of Sales Invoice when customer pays a payment request (#10706)" (#10830) ... This reverts commit d258372f9e.	2017-09-18 17:22:46 +05:30
Neil Trini Lasrado	d258372f9e	Added ability to disable auto creation of Sales Invoice when customer pays a payment request (#10706)	2017-09-18 17:12:16 +05:30
Utkarsh Goswami	b98359f4a7	Payment entry (#10668)	2017-09-18 17:06:13 +05:30
Neil Trini Lasrado	8c9f2a1be6	Add communication entry to Sales Order only if payment entry email is sent to customer (#10716)	2017-09-18 16:41:49 +05:30
Saurabh	3f15bf9828	[fix] query fix for match conditions (#10810)	2017-09-18 15:27:24 +05:30
Nabin Hait	9744aa21af	Minor fix in tax rule	2017-09-18 15:25:33 +05:30
rohitwaghchaure	70ef09aa8f	Merge pull request #10809 from rohitwaghchaure/fixed_test_cases_issue ... [fix] Test cases for tax rule	2017-09-16 22:55:16 +05:30
Rohit Waghchaure	2cb2064c6f	Fixed test cases tax rule	2017-09-15 23:10:27 +05:30
Nabin Hait	21617da619	More fixes for UI tests	2017-09-15 21:22:16 +05:30
rohitwaghchaure	dd092e30fb	Move subscription module to accounts (#10772)	2017-09-15 16:16:36 +05:30
Nabin Hait	092f6d3739	Fixes ui tests	2017-09-14 16:45:47 +05:30
mbauskar	f41cff27e6	resolved merge conflicts	2017-09-14 15:32:55 +05:30
mbauskar	ea832b8157	resolved merge conflicts	2017-09-14 15:32:10 +05:30
Nabin Hait	45dce89cae	Print Settings for printing taxes with zero amount (#10782) ... * Print Settings for printing taxes with zero amount * added __init__.py file to patch module v8_9	2017-09-14 15:17:38 +05:30
rohitwaghchaure	9a0db392de	[Fix] Only typed keywords displying in the field on selection of customer (#10778)	2017-09-14 10:51:21 +05:30
tundebabzy	c050c6945c	show error message if cannot get accounts details (#10768)	2017-09-13 15:27:30 +05:30
Nabin Hait	231c324589	Merge branch 'master' into staging	2017-09-12 16:26:31 +05:30
tunde	1255aa0f11	Merge branch 'develop' into payment-terms	2017-09-12 11:54:52 +01:00
Nabin Hait	f8f29677fd	Merge branch 'master' into develop	2017-09-12 16:16:57 +05:30
Sagar Vora	d54d6bc572	[fix] use stock_qty in reports instead of qty to match with stock_uom (#10727)	2017-09-12 11:31:10 +05:30
Rohit Waghchaure	1a77922e85	rename Is Online field to Use POS in Offline Mode in pos settings	2017-09-12 11:01:48 +05:30
rohitwaghchaure	47605cae16	Merge pull request #10737 from nabinhait/budget_variance_for_project ... [fix] Actual amount for budget variance report	2017-09-11 16:47:16 +05:30
Rohit Waghchaure	4e006b0bc5	rename Is Online field to Use POS in Offline Mode in pos settings	2017-09-11 14:51:50 +05:30
Nabin Hait	f5cbb9c7b9	[fix] Actual amount for budget variance report	2017-09-11 13:58:15 +05:30
rohitwaghchaure	225ac0dac3	[Enhance] Subscription module (#10089) ... * [Enhance] Subscription module * Added view documents from the subscription form * Test cases * documentation * UI Test cases, fixes * Removed child table in the subscription * Provision to make subscription from the document, added subscription in the dashboard for the sales and buying flow * added patch to make subscription from the recurring data * Rename field subscriptio to subscription_id, added new test cases, remove recurring_document from controller * renamed subscription_id to subscription	2017-09-08 10:31:21 +01:00
tunde	24cb494a3b	Revert "Revert "make payment_schedule field no-copy"" ... This reverts commit fbd895d781.	2017-09-08 10:07:39 +01:00
tunde	fbd895d781	Revert "make payment_schedule field no-copy" ... This reverts commit 4f4148b0da.	2017-09-08 10:06:46 +01:00
tunde	199daf7ac5	Merge branch 'develop' into payment-terms	2017-09-08 09:59:13 +01:00
tunde	4f4148b0da	make payment_schedule field no-copy	2017-09-07 18:49:10 +01:00
tunde	2d3a575f29	more test cases for purchase/sales invoice	2017-09-07 14:50:20 +01:00
Nabin Hait	d4e57a38a4	Fixed multiple ui test cases	2017-09-07 19:16:38 +05:30
tunde	b0f6b068ef	remove test based on deleted recurring_document.py	2017-09-07 13:50:46 +01:00
Rohit Waghchaure	06b22e9ac1	[Fix] Customer search optimization for the offline POS	2017-09-07 17:44:42 +05:30
tunde	ad7d3a1733	Merge branch 'develop' into payment-terms	2017-09-07 13:13:59 +01:00
rohitwaghchaure	1b65575860	Merge branch 'develop' into pos-refactor	2017-09-07 17:15:58 +05:30
rohitwaghchaure	166b78f022	[Enhance] Subscription module (#10089) ... * [Enhance] Subscription module * Added view documents from the subscription form * Test cases * documentation * UI Test cases, fixes * Removed child table in the subscription * Provision to make subscription from the document, added subscription in the dashboard for the sales and buying flow * added patch to make subscription from the recurring data * Rename field subscriptio to subscription_id, added new test cases, remove recurring_document from controller * renamed subscription_id to subscription	2017-09-07 16:14:22 +05:30
tunde	353099d7ad	Merge branch 'develop' into payment-terms	2017-09-07 11:31:26 +01:00
tunde	788de8001c	more tests	2017-09-07 11:30:06 +01:00
tunde	32aa7c1e68	Automatically set payment schedule if not specified ... - fix failing test cases - fix failing tests for recurring documents - others	2017-09-07 06:52:15 +01:00
tunde	e7da1c5500	refactor: DRY for disable due date logic	2017-09-06 12:36:45 +01:00
rohitwaghchaure	914fd197fc	Update test_payment_against_invoice.js	2017-09-06 12:42:58 +05:30
Nabin Hait	ded8d11728	Js tests added for write off difference amount	2017-09-06 12:11:48 +05:30
Nabin Hait	6c3618be37	Unallocated and difference amount calculation in Payment Entry	2017-09-06 12:10:52 +05:30
tunde	8173239f63	Merge branch 'develop' into payment-terms	2017-09-06 04:18:40 +01:00
tunde	e5973e45f1	fix test	2017-09-05 18:11:58 +01:00
tunde	a496c43581	fix test	2017-09-05 17:36:21 +01:00
Faris Ansari	e4434d3200	Merge branch 'develop' into pos-refactor	2017-09-05 17:18:04 +05:30
Nabin Hait	799619b6b0	Fixed multiple uom in selling	2017-09-05 15:52:12 +05:30
tunde	7f9a462506	Merge branch 'develop' into payment-terms	2017-09-05 01:35:51 +01:00
tunde	ed86efb1fd	modify get_due_date to check Supplier Type if needed	2017-09-05 01:15:31 +01:00
tunde	2fdb857fed	fix due date disable bug	2017-09-05 00:21:54 +01:00
tunde	635423d70f	rewrite Supplier test cases	2017-09-04 19:37:54 +01:00
tunde	4163c9529d	fix get_due_date function to return date as string	2017-09-04 19:30:01 +01:00
Rohit Waghchaure	6ab630371d	Fixed serial no trigger not working from dialog box	2017-09-01 17:02:42 +05:30
tunde	cbd72f6113	adjust failing tests	2017-09-01 11:48:00 +01:00
tunde	7b7dcddf86	modify get_due_date call from sales/purchase invoice	2017-09-01 11:36:08 +01:00
Rushabh Mehta	fc1c00716c	[test] test_account.js - more timeout?	2017-09-01 12:41:12 +05:30
Rushabh Mehta	baabb07e00	[test] test_account.js	2017-09-01 12:12:39 +05:30
Rushabh Mehta	7d868e41a6	[test] test_account.js	2017-09-01 11:46:11 +05:30
tunde	8935f6546c	removes get_credit_days function as it is no longer useful	2017-08-31 16:31:15 +01:00
tunde	3b4bd3791d	adjust get_due_date to calculate based on payment term template	2017-08-31 16:28:47 +01:00
tunde	229b583715	disable due date field if form has payment schedule data	2017-08-31 14:30:53 +01:00
tunde	50ec45d3b6	Merge branch 'develop' into payment-terms	2017-08-31 13:46:02 +01:00
tunde	400d046653	set payment terms template in get_party_details	2017-08-31 13:44:57 +01:00
Saurabh	60739847ab	[minor][fix] change price field type from float to currency (#10626)	2017-08-31 17:08:30 +05:30
mbauskar	9012a9b414	Merge branch 'master' into staging	2017-08-31 15:31:48 +05:30
mbauskar	2965f92be3	Merge branch 'master' into develop	2017-08-31 15:31:47 +05:30
Nabin Hait	e7e29b7f10	GST print format for POS (#10590) ... * Serial no added in GST tax invoice * GST print format for POS	2017-08-31 15:06:12 +05:30
Vishal Dhayagude	1252c30edf	[UI Test] UI test for Repack and Sales Invoice with Serialize item Added (#10583) ... * [UI Test] UI test for Repack and Sales Invoice with Serialize item Added * [Fix] Fixed path for sales invoice"	2017-08-31 14:47:56 +05:30
rohitwaghchaure	56e31d05e9	[Fix] POS customer field is hang while searching customer, make error log if sync has failed (#10607)	2017-08-31 14:19:58 +05:30
krnkris	3c635e219e	Rename fr_plan_comptable_général.json to fr_plan_comptable_general.json (#10601)	2017-08-31 14:17:46 +05:30
Makarand Bauskar	de278635a3	[hotfix] fixes for UnicodeDecodeError (#10620)	2017-08-31 13:36:56 +05:30
tunde	6de18ce589	codacy fixes	2017-08-30 21:20:41 +01:00
tunde	93c015a42b	add due_date in GL Entry from Journal Entry	2017-08-30 21:05:38 +01:00
tunde	501ef8733b	fix due_date autopopulate commit	2017-08-30 21:02:20 +01:00
Rohit Waghchaure	7e752c4ebf	Added patch, fixed codacy issue	2017-08-31 00:31:35 +05:30
tunde	08d8ca0184	enhance reference_due_date behaviour: ... - creates new api - get_invoice_due_dates - when reference_name is changed, populate reference_due_date	2017-08-30 13:55:32 +01:00
tunde	2883662ccb	change due_date to reference_due_date in Journal Entry Account	2017-08-30 08:45:28 +01:00
Faris Ansari	491108a198	Merge branch 'develop' into pos-refactor	2017-08-30 12:37:05 +05:30
mbauskar	5096c45dec	Merge branch 'master' into hotfix	2017-08-29 20:42:06 +05:30
tunde	a19ea6e2f3	Merge branch 'develop' of https://github.com/frappe/erpnext into payment-terms	2017-08-29 15:26:50 +01:00
Faris Ansari	c70bbacd34	Add online, offline option, fix search	2017-08-29 15:27:17 +05:30
Rohit Waghchaure	ba3f0e6b70	Added serial no, batch no, item group functionality	2017-08-28 19:45:58 +05:30
Aditya Hase	6ccb6562f1	Python 3 compatibility syntax error fixes (#10519) ... * Use Python 3 style print function * Use 'Exception as e' instead of 'Exception, e' * Unpack tuple arguments explicitly in instead of relying on auto unpacking * Use consistent indentation * Use 0 if stock_frozen_upto_days is None	2017-08-28 18:17:36 +05:30
Faris Ansari	847f9f80c1	Merge pull request #10559 from mntechnique/pos_scanner_hotfix ... [Fix] POS Scanner	2017-08-28 16:54:01 +05:30
Faris Ansari	8fbc08f91f	Decrease timeout to 400	2017-08-28 16:52:20 +05:30
mbauskar	5d0c4361ab	resolved merged conflicts	2017-08-28 11:58:44 +05:30
mbauskar	aaec42ebc2	resolved merged conflicts	2017-08-28 11:57:56 +05:30
Nabin Hait	2df0788c11	Validate for negative outstanding reference only if party is Customer or Supplier (#10568)	2017-08-28 11:23:33 +05:30
Vishal Dhayagude	914b8463b7	[UI Test] UI Test for Payment Request Added: (#10553)	2017-08-28 11:14:28 +05:30
Vishal Dhayagude	554cf9be44	[UI Test] UI Test Added for Bank Reconciliation (#10563)	2017-08-28 11:11:36 +05:30
tunde	63c8cb2fd1	add due_date to Journal Entry Account doctype	2017-08-27 17:56:47 +01:00
Revant Nandgaonkar	2558daf6b7	Allow search without keypress enter	2017-08-26 15:52:35 +05:30
Revant Nandgaonkar	2f7cb82ca0	[Fix] POS Scanner ... Search item based on key press instead of 1sec wait Fast Scanning needs this to avoid 1sec delay	2017-08-26 09:58:15 +05:30
Nabin Hait	bf4a974124	IMproved print format for AR/AP report (#10528)	2017-08-25 12:10:49 +05:30
Vishal Dhayagude	17b2720f5b	[UI Test] UI Test for Payment Entry (#10521)	2017-08-24 17:50:28 +05:30
Nabin Hait	caab582943	Tax breakup for actual amount and fixes in itemised purchase register (#10515) ... * Tax breakup for actual amount and fixes in itemised pur register * Rounding of itemised tax breakup amount	2017-08-24 16:22:28 +05:30
Vishal Dhayagude	641d88fd6b	[UI Test] UI Test added for Journal Entry (#10512) ... * [UI Test] UI Test added for Journal Entry * [mod] Edited date in journal Entry * [fix] Codacy fixed	2017-08-23 18:32:12 +05:30
mbauskar	06f5ae0e78	Merge branch 'master' into develop	2017-08-23 13:06:43 +05:30
Saurabh	b903c86076	Merge pull request #10506 from nabinhait/hotfix677 ... Minor fix in itemised sales register	2017-08-23 11:13:31 +05:30
Nabin Hait	fcb2462902	Minor fix in itemised sales register	2017-08-23 09:44:33 +05:30
Nabin Hait	bb326f2bbd	Chart of accounts for Taiwan (#10435)	2017-08-22 19:07:42 +05:30
Nabin Hait	382f5eb1b1	Run sales/purchase register for one month by default (#10493)	2017-08-22 19:06:21 +05:30
tunde	d13fe18d30	Merge branch 'develop' into payment-terms	2017-08-22 14:18:11 +01:00
Vishal Dhayagude	a1637d8343	[UI Test] UI test for Sales Invoice with Payment Entry (#10483) ... * [UI Test] UI test for Sales Invoice with Payment Entry * Update test_purchase_order_receipt.js	2017-08-22 18:33:17 +05:30
mbauskar	4396a0e9a8	Merge branch 'master' into staging	2017-08-22 15:42:10 +05:30
mbauskar	3b3ab4d574	Merge branch 'master' into develop	2017-08-22 15:42:10 +05:30
Nabin Hait	28d8557905	[fix] Taxes in itemised purchase register (#10494)	2017-08-22 15:30:45 +05:30
mbauskar	7716a08b5d	Merge branch 'master' into staging	2017-08-22 12:03:47 +05:30
mbauskar	7d9452f4e4	Merge branch 'master' into develop	2017-08-22 12:03:47 +05:30
Makarand Bauskar	11224eaf06	[hotfix] fixes for TypeError: 'NoneType' object is not iterable (#10484)	2017-08-22 12:03:02 +05:30
tunde	10fc880b06	Merge branch 'develop' into payment-terms	2017-08-21 18:27:46 +01:00
Rohit Waghchaure	33326fe90e	[Fix] Pricing rule applying only on item groups defined in POS profile	2017-08-21 16:30:21 +05:30
mbauskar	5088ad11ee	Merge branch 'master' into staging	2017-08-21 08:58:52 +05:30
mbauskar	62f0722325	resolved merge conflicts	2017-08-21 08:58:42 +05:30
Nabin Hait	879e162cce	Additional GST related fields in Invoice and Sales/Purchase Register reort (#10405)	2017-08-21 08:28:55 +05:30
Nabin Hait	1f49f511aa	Tax rate in Itemised sales/purchase register and cleanups (#10439)	2017-08-21 08:05:12 +05:30
rohitwaghchaure	6b1624cfee	[Fix] Tax rule is not working for the parent customer groups (#10458)	2017-08-21 07:38:37 +05:30
tunde	fb144303f5	codacy and typo fixes	2017-08-20 17:23:55 +01:00
tunde	c7f46218d7	tests and test fixes ... fixes test case: make sales invoice using customer that does not have credit_days_based_on 'Last Day Of Next Month' so that it doesn't conflict with payment term due date fix test case: create purchase invoice with new supplier with credit_days_based_on "Fixed Days" as the default "Last Day of Month" does not apply when using payment terms	2017-08-20 17:23:27 +01:00
tunde	43870aa8db	moves set_payment_schedule and validate_payment_schedule to accounts_controller	2017-08-20 16:56:43 +01:00
tunde	20c041cea4	add Payment Term to Purchase Invoice	2017-08-20 16:52:05 +01:00
Nabin Hait	9275969b51	Payment Terms: doctypes, schedule, payments and more ... fix payment terms template setup: - add_fetch to correct credit_days and credit_months not credit_days_months fixed bug in `make_customer_gl_entry` and `make_supplier_entry: all sales invoice were failing because they were all attempting to make gl entry from payment schedule. Same with purchase invoices	2017-08-20 16:51:29 +01:00
Vishal Dhayagude	8fd5b325e0	[UI Test] travis.yml modified for fresh UI Test (#10446) ... * [UI Test] travis.yml modified for fresh UI Test * [fix] travis * Update test_production_order.js * Update test_production_order.js * Update test_purchase_order_receipt.js * Update tests.txt * Update test_purchase_order_receipt.js	2017-08-20 10:59:48 +05:30
rohitwaghchaure	fff56530c4	[Fix] Due date not fetching on the payment entry against the invoices (#10419)	2017-08-17 14:47:25 +05:30
Faris Ansari	6e7db034f2	[wip] New POS UI	2017-08-17 12:56:14 +05:30
Vishal Dhayagude	f37eacdee5	[UI Test] Purchase Invoice (#10422) ... * [UI Test] Purchase Invoice * [fix] Travis failed	2017-08-17 11:01:59 +05:30
Nabin Hait	64c32dcd59	[fix] Update monthly sales value on Company (#10417) ... * [fix] Update monthly sales value on cancellation of invoice, also update modified datestamp * Company monthly sales: patches and test cases	2017-08-16 15:04:18 +05:30
mbauskar	40377e87de	Merge branch 'master' into staging	2017-08-14 12:33:56 +05:30
Makarand Bauskar	e5ae4d3bd3	send email via the background jobs (#10374) (#10393) ... * send the email via the background worker in the payment request (#10350) * send email via the background jobs (#10374)	2017-08-14 12:22:50 +05:30
Vishal Dhayagude	7186131d65	[UI Test] sales invoice (#10394) ... * [UI Test] Sales Invoice * [UI Test] Sales Invoice	2017-08-14 12:22:04 +05:30
mbauskar	f03afe0878	Merge branch 'master' into staging	2017-08-14 09:31:01 +05:30
mbauskar	2fa8af3b02	Merge branch 'master' into develop	2017-08-14 09:31:01 +05:30
Faris Ansari	7273cb7f54	Track changes in Account doctype (#10373)	2017-08-11 16:19:28 +05:30
Manas Solanki	e97f587411	send the email via the background worker in the payment request (#10350)	2017-08-10 11:17:38 +05:30
rohitwaghchaure	5999ade43a	[Fix] Auto batch creation not working for purchase invoice is update stock is enabled (#10348)	2017-08-09 17:24:13 +05:30
Nabin Hait	7f476b4528	The series added for Asset Depreciation Entry (#10268)	2017-08-08 15:01:02 +05:30
Nabin Hait	32992d555d	Added chart of accounts for Argentina, France, Brazil and Hungary (#10312)	2017-08-08 14:42:04 +05:30
mbauskar	1065679720	Merge branch 'master' into staging	2017-08-08 12:54:12 +05:30
mbauskar	6b0b7912c4	Merge branch 'master' into develop	2017-08-08 12:54:12 +05:30
Saurabh	3a4b6c2cba	[fix] redirect to payment url if paying via web portal (#10265) ... * [fix] redirect to payment url if paying via web portal * [fix] test case fix * [fix] test case fixes	2017-08-08 11:29:11 +05:30
rohitwaghchaure	9ef1d0f5a5	[Fix] Balance sheet not working (#10311)	2017-08-08 11:23:25 +05:30
Nabin Hait	19128134a8	Merge pull request #10295 from tundebabzy/issue-10099-2 ... BOM Currency symbol issue (#10099) - Stock Ledger report	2017-08-07 13:49:22 +05:30
Nabin Hait	51b4167cdd	Merge pull request #10269 from tundebabzy/currency-issues ... BOM - Currency symbol issue (#10099)	2017-08-04 15:36:35 +05:30
mbauskar	4ef1e2046b	Merge branch 'master' into staging	2017-08-04 14:08:57 +05:30
mbauskar	e770824568	Merge branch 'master' into develop	2017-08-04 14:08:57 +05:30
Rohit Waghchaure	499144fd86	Fixed test cases for dynamic link order	2017-08-04 13:30:59 +05:30
mbauskar	cce79255fe	resolved merge conflicts	2017-08-04 11:07:49 +05:30
mbauskar	f3be738b68	resolved merge conflicts	2017-08-04 11:07:07 +05:30
rohitwaghchaure	0c1d441aa3	Test case for dynamic link order (#10276)	2017-08-04 10:55:46 +05:30
rohitwaghchaure	5906ddf804	[Fix] View ledger button not disaplying in the head of an account (#10254) ... * [Fix] View ledger button not disaplying in the head of an account * Show view ledger button in account if user has permission to read GL Entry data	2017-08-04 10:52:01 +05:30
Nabin Hait	ee5ff805e9	Book expense included in valuation only if perpetual inventory enabled (#10271)	2017-08-03 17:37:23 +05:30
Saurabh	33aaebac2b	[fix] encode title and description in payment request (#10240)	2017-08-03 11:47:05 +05:30
tunde	4a263c714d	get_party_detail should use default currency of party	2017-08-02 22:26:39 +01:00
Nabin Hait	f5dee777dd	minor fix in applying pricing rule	2017-08-02 19:08:39 +05:30
mbauskar	2dd57acdef	removed merge conflicts	2017-08-02 18:39:04 +05:30
Vishal Dhayagude	ed0b107a9f	[UI Test] UI test added for Pricing Rule (#10237) ... * [UI Test] UI test added for Pricing Rule * [mod]minor chages in pricing rule test * [fix] codacy fixed	2017-08-02 17:31:20 +05:30
Vishal Dhayagude	f9e4893d9d	[UI Test] Test added for Shipping Rule (#10229) ... * [UI Test] Test added for Shipping Rule * [fix]Travis Failed	2017-08-02 17:16:46 +05:30
Nabin Hait	9641d5b1f4	Make payment entry button in expense claim and some minor cleanup	2017-08-01 17:38:48 +05:30
Nabin Hait	edba79e8f0	Update utils.py	2017-08-01 17:38:48 +05:30
Ben Cornwell-Mott	38d4be8325	Update manuals. Fix codacy issues	2017-08-01 17:38:47 +05:30
Ben Cornwell-Mott	118ceda46f	Add Payment Entry for Expenses	2017-08-01 17:35:50 +05:30
Makarand Bauskar	317888211a	merged hotfix branch into staging (#10191) ... * [Fix] Error in sales invoice and POS if customer group not defined in the customer (#10148) * Revert "[Fix] Error in sales invoice and POS if customer group not defined in the customer (#10148)" (#10159) This reverts commit 4d2e782e42. * [Fix] Unable to save asset because of float error issue (#10157) * bumped to version 8.6.4 * [Fix] Error in sales invoice and POS if customer group not defined in the customer (#10160) * Set billing hours to 0 in timesheet #9535 (#10139) * `update_billing_hours` to use flt not cint * if not billable, reset billable hours * if not billable, reset time rates * test * [Fix] Timesheet Company Issue * Added delivery date in SO parent form. Fixes #10104 (#10155) * Added delivery date in SO parent form. Fixes #10104 * UI tests for sales order delivery date * bumped to version 8.6.5	2017-08-01 11:06:41 +05:30
Nabin Hait	cd95134267	Rounding issue in tax calculation (#10135) ... * Adjust rounding loss of discount in the last item row. Fixes #8952 * Fixed rounding issue in tax calculation. Fixes #8953, #8952, #8893, #6954, #8910 * Rounding related fixes for purchase cycle	2017-07-31 18:07:45 +05:30
mbauskar	8b6f7914b0	resolved merge conflicts	2017-07-31 12:30:53 +05:30
Nabin Hait	1fcd2b0676	Merge branch 'develop' into set_defualt_mode_payment	2017-07-28 21:09:42 +05:30
rohitwaghchaure	e2176b852e	[Fix] Error in sales invoice and POS if customer group not defined in the customer (#10160)	2017-07-28 20:52:02 +05:30
mbauskar	3b27382013	Merge branch 'master' into develop	2017-07-28 16:03:52 +05:30
rohitwaghchaure	353af64197	[Fix] Unable to save asset because of float error issue (#10157)	2017-07-28 15:55:46 +05:30
Makarand Bauskar	8bccaed35a	Revert "[Fix] Error in sales invoice and POS if customer group not defined in the customer (#10148)" (#10159) ... This reverts commit 4d2e782e42.	2017-07-28 15:43:23 +05:30
rohitwaghchaure	4d2e782e42	[Fix] Error in sales invoice and POS if customer group not defined in the customer (#10148)	2017-07-28 15:21:22 +05:30
Makarand Bauskar	20f4d7f559	Merge branch 'develop' into set_defualt_mode_payment	2017-07-28 14:41:48 +05:30
Rushabh Mehta	d50da78f28	[fixes] errors caught on flake8 (#10126)	2017-07-28 11:39:01 +05:30
Rohit Waghchaure	120b6c0b3c	UI test cases and documentation	2017-07-28 01:52:10 +05:30
Rohit Waghchaure	5296e3c321	[enhance] Provision to set default mode of payment for the POS in POS profile	2017-07-27 19:17:05 +05:30
Saurabh	c07741d36f	Merge branch 'master' into staging	2017-07-27 17:50:28 +05:30
mbauskar	7b764d03c2	Merge branch 'master' into develop	2017-07-27 12:18:15 +05:30
Vishal Dhayagude	b528411ed1	[ui test]sales and taxes charges template (#10116)	2017-07-27 12:15:06 +05:30
tundebabzy	9281013d51	add transaction date call to get_exchange_rate (#10109)	2017-07-27 11:43:32 +05:30
rohitwaghchaure	059f99e621	[Fix] Wrong avg. buying rate in the Gross Profit report (#10110)	2017-07-27 11:37:30 +05:30
rohitwaghchaure	8579dd1d78	[minor] If customer has removed getting an error (#10107)	2017-07-27 11:21:54 +05:30
cclauss	6848708377	old style exception, raise --> new style for Python 3 (#10082) ... * old style raise --> raise() for Python 3 * old style exception --> new style for Python 3 * old style exception --> new style for Python 3 * old style exception --> new style for Python 3 * old style exception --> new style for Python 3 * old style exception --> new style for Python 3 * old style exception --> new style for Python 3 * old style exception --> new style for Python 3 * old style exception --> new style for Python 3 * old style exception --> new style for Python 3 * old style raise --> raise() for Python 3 * old style raise --> raise() for Python 3 * old style exception, raise --> new style for Python 3	2017-07-27 10:38:35 +05:30
Vishal Dhayagude	c67bf5026e	[UI Test] Create tax account in Charts of account (#10105) ... * [new]tax creation added * [new]path added test.txt	2017-07-27 09:11:08 +05:30
tundebabzy	de54f3019f	use api to get default cost center for chosen company (#10067)	2017-07-25 11:05:07 +05:30
Rushabh Mehta	9d27cf3c62	[tests] refactored (#9984) ... * [tests] refactored * [fix] test_quotation.js * [fix] tests.text * [fix] fiscal year not needed * [test] add long test * [fix] add timeout in lead	2017-07-20 15:35:03 +05:30
mbauskar	0e6933a1e8	resolved merge conflicts	2017-07-20 14:19:47 +05:30
Nabin Hait	9c42161061	Itemised tax breakup fix in docs other than invoice (#9961) ... * Itemised tax breakup fix in docs other than invoice * Set itemised tax breakup and hsn code in existing docs	2017-07-20 13:32:01 +05:30
Nabin Hait	8e0f23efc7	Multiple delivery dates in Sales Order and make DN based on selected delivery dates (#9933) ... * Multiple delivery dates in Sales Order and make DN based on selected delivery dates * Test case and some other minor fixes * Updated docs for multi delivery date * removed the trailing whitespace * removed the trailing whitespace * removed trailing whitespace	2017-07-20 10:30:59 +05:30
_JG_	96bb6099d6	[fix] correctly choice 'Credit Limit' (#9932) ... * [fix] correctly choice 'credit limit' If 'Credit Days Based On' is empty in 'Supplier Type/Customer Group' then value 'Due Date' in 'Purchase/Sales Invoice' doesn't taken from the default settings * Update party.py * [fix] correctly choice 'Credit Limit'	2017-07-19 10:27:09 +05:30
Nabin Hait	bc3acdd0ba	Merge pull request #9510 from tundebabzy/issue-9166 ... Unable to create Manual Depreciation of Asset due to Error #9166	2017-07-18 15:44:18 +05:30
Nabin Hait	338c28e78e	Merge pull request #9902 from rohitwaghchaure/sales_invoice_serial_no_issue_from_dn ... [Fix] Sales invoice serial no validation issue	2017-07-18 13:05:50 +05:30
Rohit Waghchaure	7e14996995	[Fix] Sales invoice serial no validation issue	2017-07-18 12:59:55 +05:30
Makarand Bauskar	c446bf6117	Merge branch 'develop' into rejected_expense_claim_issue	2017-07-18 10:54:13 +05:30
Prateeksha Singh	e012e24423	Sales Goal by Company (#9723) ... * [sales goal] in company; dashboard, graph, notifs, wiz * [test] target notifications * cache past year monthly sales of every company daily, patch * [minor] query fixes * update sales goal docs	2017-07-18 10:35:12 +05:30
tunde	78d2f542d0	code fix as per review	2017-07-17 15:00:45 +01:00
Nabin Hait	b962fc1573	Show hsn code in tax breakup for India and render via template (#9866) ... * Show hsn code in tax breakup for India and render via template * tax breakup if gst_tax_field does not exists * Fixed tax-breakup test cases	2017-07-17 18:02:31 +05:30
tunde	1ee534889f	Revert "adds if statement for reference_type === "Asset"" ... This reverts commit c7e3a09cfb.	2017-07-17 13:27:59 +01:00
Rohit Waghchaure	8333b5754b	[Fix] Expense claim status issue	2017-07-17 16:38:20 +05:30
Nabin Hait	35d0de8276	Merge pull request #9858 from mbauskar/expense-claim ... [minor] don't trigger the expense type trigger if value is not set	2017-07-14 15:28:34 +05:30
Rushabh Mehta	812853aa86	[refactor] account.js to new style (#9787) ... * [fix] conference site update * [test] run all js tests	2017-07-14 15:28:04 +05:30
mbauskar	00e825a8af	[minor] check if account is selected or not in Payment Entry	2017-07-14 11:38:39 +05:30
Nabin Hait	57d3cecd68	Merge pull request #9811 from rohitwaghchaure/pricing_rule_issue_for_discount ... [Fix] Manual discount is not applying in the transaction if discount amount is zero in the pricing rule	2017-07-13 11:14:53 +05:30
Nabin Hait	7312186c76	Set corrected states list in GST State field's options	2017-07-13 10:41:15 +05:30
Nabin Hait	0a32b7a6eb	Set company address while making invoice from SO, don't show taxes in print if amount is zero, fixed state code	2017-07-12 19:21:05 +05:30
Rohit Waghchaure	b12f2109b5	[Fix] Manual discount is not applying on the pricing rule if discount amount is zero in the pricing rule	2017-07-12 18:02:02 +05:30
rohitwaghchaure	860144feb7	[Fix] User not able to search an Item if description is null in the item (#9793)	2017-07-12 15:01:56 +05:30
Nabin Hait	2bedca04ae	Merge pull request #9750 from rohitwaghchaure/taxable_amount_issue ... [Fix] Taxable amount in tax breakup showing wrong value for duplicate items in the invoice	2017-07-11 11:16:56 +05:30
Rohit Waghchaure	296fbfeaac	[Fix] Taxable amount in tax breakup showing wrong value for duplicate items in the invoice	2017-07-10 23:06:49 +05:30
Nabin Hait	0ac8542eaa	Merge pull request #9772 from tundebabzy/issue-9595 ... Wrong Exchange Rate when making payment against Journal Entry (#9595)	2017-07-10 19:12:48 +05:30
Nabin Hait	5b2d3222f3	Merge pull request #9710 from rohitwaghchaure/sales_invoice_dn_link_revert ... Revert sales invoice dn link issue	2017-07-10 18:47:38 +05:30
Nabin Hait	cf82c3828e	Merge pull request #9769 from manassolanki/payment-entry ... frappe call if posting date is defined	2017-07-10 17:57:26 +05:30
tunde	46ef26df71	treat use case where Journal entry is contained in outstanding_invoices in get_outstanding_reference_documents function	2017-07-10 13:05:29 +01:00
Manas Solanki	99d571a786	frappe call if posting date is defined	2017-07-10 17:33:27 +05:30
Rohit Waghchaure	e3ae600277	[Fix] Budget against the field in the validation message	2017-07-10 17:06:54 +05:30
Rohit Waghchaure	8f2c8f6e9d	Revert sales invoice dn link issue	2017-07-07 17:07:59 +05:30
Rohit Waghchaure	9589527784	Fixed the issue Serial No serial no not found	2017-07-07 15:34:28 +05:30
Nabin Hait	8b486b0f28	Fixed state code of WB and allowed invoice_copy to edit after submit	2017-07-07 13:14:25 +05:30
Nabin Hait	fbb5945ff3	Fixed itemised tax calc to fix pos loading	2017-07-07 12:58:22 +05:30
Nabin Hait	7773ee8960	Sales invoice dashboard, multiple letter head in report and email alert docs	2017-07-07 12:49:05 +05:30
Rohit Waghchaure	6d03790b44	Revert sales invoice serial no issues	2017-07-06 15:58:50 +05:30
Nabin Hait	f3f0dfef2a	Invoice copy, state code in gst print format, hsn code in other sales/purchase docs (#9658) ... * Invoice copy, state code in gst print format, hsn code in other sales/purchase docs * Formatted Net Amount in item-tax-breakup * GST print format fixes * removed trailing whitespace * removed trailing whitespace	2017-07-06 14:49:34 +05:30
Makarand Bauskar	48af4289d3	Revert "[enhance] Provision to set the currency in the pricing rule for the price" (#9636)	2017-07-05 15:17:02 +05:30
Nabin Hait	852cb64e4f	GST tax invoice print format and more (#9616) ... * GST Tax Invoice print format and more. Fixes #9545 #9566 #9608 * Reload gst print format only for Indian users * Fixes as Codacy	2017-07-05 12:58:19 +05:30
mbauskar	b66fb9a4c0	Merge branch 'master' into develop	2017-07-05 11:25:15 +05:30
rohitwaghchaure	e5ca48a76a	[fix] Don't update the sales invoice number into the serial no if update stock is disabled in the invoice (#9593)	2017-07-04 10:54:23 +05:30
rohitwaghchaure	3e4bcfe2d8	[Fix] Opening Entry, Unknown column 'warehouse' in 'where clause' (#9585) ... * [Fix] Opening Entry, Unknown column 'warehouse' in 'where clause' * escaped company name in get_opening_accounts	2017-07-04 10:49:37 +05:30
Makarand Bauskar	960208bae0	Merge pull request #9426 from tundebabzy/issue-9096 ... Gross Profit Does not display Reversal of sales invoice #9096	2017-07-03 15:23:21 +05:30
Rushabh Mehta	43ef4e9047	Added first UI tests (#9532) ... * [wip] * [tests] wip * [ui-tests] first-cut * [minor] remove old tests	2017-07-03 11:53:07 +05:30
mbauskar	a06a600d0a	Merge branch 'master' into develop	2017-07-01 14:16:46 +05:30
Makarand Bauskar	1589ada04d	Merge pull request #9473 from rohitwaghchaure/pricing_rule_currency ... [enhance] Provision to set the currency in the pricing rule for the price	2017-06-30 18:58:30 +05:30
Charles-Henri Decultot	53de2f1b57	Translation correction in P&L report (#9436)	2017-06-30 16:45:11 +05:30
mbauskar	22aaf0cbd0	[minor] fixed AttributeError: 'dict' object has no attribute 'company' in sales register	2017-06-30 16:43:25 +05:30
Rohit Waghchaure	b801357ecf	[minor] Total amount not showing value in bank reconcillation	2017-06-29 18:40:01 +05:30
tunde	690de64734	Merge branch 'develop' into issue-9166	2017-06-28 13:37:04 +01:00
tunde	c7e3a09cfb	adds if statement for reference_type === "Asset"	2017-06-28 13:23:18 +01:00
rohitwaghchaure	4b33b7e1c1	Merge pull request #9418 from nick9822/nick9822-patch-3 ... Removed "Asset" filter on payment account	2017-06-28 16:38:21 +05:30
Rushabh Mehta	f4e908bd91	[minor] general_ledger.js	2017-06-27 11:56:30 +05:30
Makarand Bauskar	5d8803b23e	Merge pull request #9435 from rmehta/gst ... GST (India) Setup and Invoices #8711	2017-06-27 11:44:33 +05:30
Rohit Waghchaure	0b078fb4cb	[enhance] Provision to set the currency in the pricing rule for the price	2017-06-27 00:06:40 +05:30
tunde	67cbeb1bb0	Merge branch 'develop' into issue-9096	2017-06-26 12:11:07 +01:00
nick9822	82e816054e	Added report_type to payment account filter	2017-06-26 15:29:44 +05:30
rohitwaghchaure	8f51a5e527	In POS on click of delete button, remove the selected item from the cart (#9428)	2017-06-23 18:17:04 +05:30
Makarand Bauskar	4eced4acec	Merge pull request #9445 from rohitwaghchaure/column_width_issue_bank_reco ... [minor] Fix grid column of the Bank Reconciliation	2017-06-23 17:24:50 +05:30
Rohit Waghchaure	8326028d33	Don't validate delivery note and sales order required for the POS invoice	2017-06-23 12:56:12 +05:30
Rohit Waghchaure	666d004b40	[minor] Fix grid column of the Bank Reconciliation	2017-06-23 12:10:21 +05:30
Rushabh Mehta	919a74ad88	[gst] adde reports + docs	2017-06-22 22:32:08 +05:30
Rushabh Mehta	b3c8f44b3e	[wip] GST for India. Pending reports	2017-06-22 22:31:32 +05:30
mbauskar	66e2a510b9	[minor] deleted deprecated reprots and changed the lead.json modified time	2017-06-22 16:57:46 +05:30
tunde	96e629a635	adds credits notes to report since double entry for P or L affects sales	2017-06-22 10:04:33 +01:00
Makarand Bauskar	e995371b08	Merge pull request #9355 from rohitwaghchaure/company_wise_manufacturing_settings ... [Enhance] Company wise perpetual inventory settings	2017-06-22 12:35:41 +05:30
nick9822	881491cd2b	Removed "Asset" filter on payment account	2017-06-21 19:51:08 +05:30
Vishal Dhayagude	310d4dc9e0	UOM column in Batch Wise Balance History Report (#9359) ... * Training Events/Results link to employee dashbord * [minor]Improve validation message for Buying / Selling Setting * [minor]Added UOM cloumn in Batch Wise Balance History Report * modified validation message for buying / selling setting	2017-06-20 13:02:35 +05:30
Rohit Waghchaure	e9ff1914fc	Added is_perpetual_inventory_enabled method	2017-06-20 11:26:37 +05:30
Rohit Waghchaure	6945d0dd8a	fixed test cases	2017-06-20 10:21:33 +05:30
Rohit Waghchaure	a5f40941ae	[Enhance] Companywise perpetual inventory setting	2017-06-20 10:21:33 +05:30
Charles-Henri Decultot	2305eda82e	Addition of new fields for POS Profile in Sales Invoice and POS Profile User link modification (#9339)	2017-06-19 09:25:54 +05:30
Sagar Vora	5f407907a2	fix logic of quantity validation (#9311)	2017-06-16 11:43:36 +05:30
mbauskar	f9e2bf1ab4	fixed merge conflicts	2017-06-15 13:42:47 +05:30
Nabin Hait	6e9a146f2b	Merge pull request #9193 from tundebabzy/issue_9180 ... Payment Entry - Latest Exchange Rate not fetched	2017-06-15 12:34:27 +05:30
Makarand Bauskar	428e5b7172	Merge pull request #9299 from rohitwaghchaure/refernce_name_issue ... [fix] Payment Entry - draft sales invoices should not be selectable	2017-06-15 12:32:00 +05:30
Nabin Hait	2153399c39	Create journal_entry.py	2017-06-15 12:30:58 +05:30
Rohit Waghchaure	5ea8c97b7c	[fix] Payment Entry - draft sales invoices should not be selectable	2017-06-15 12:16:15 +05:30
Nabin Hait	6d7b0ce794	Warehouse Account Linking (#9292) ... * [enhance] Added account in the warehouse * documentation * patch to move account head from account to warehouse * fixed test cases * Fixes in warehouse-account linking * minor fix in test case	2017-06-15 11:09:27 +05:30
rohitwaghchaure	03ba66d0d8	[Fix] In sales invoice, delivery note link not showing in the dashboard if delivery note has made from sales invoice (#9290)	2017-06-14 19:41:11 +05:30
tunde	3514332cd8	changes journal_entry.get_exchange_rate to return exchange rate at date not average exchange rate	2017-06-14 13:14:40 +01:00
tundebabzy	f5604c101c	Once primary key is generated, do not allow changing Series #8911 (#9265) ... * changes set_only_once field for tabDocField to 1 * changes all affected doctypes `set_only_once` option to 1 * add patch name to text file * adds test cases * Revert "add patch name to text file" This reverts commit fc7cb6b4557217cee61abfbbf42ff6f40099f23c. * Revert "changes set_only_once field for tabDocField to 1" This reverts commit 2b1f7f31a0d6491056d809f319bae0f7b84be435.	2017-06-14 16:10:09 +05:30
tundebabzy	5c9dd42547	fixes #9098: don't skip calculation if income or expense is [] (#9267)	2017-06-14 14:57:34 +05:30
rohitwaghchaure	4c0f9dac94	Total amount not showing for credit note column in the print (#9278)	2017-06-14 12:54:48 +05:30
Makarand Bauskar	0da5f23db6	[minor] fixed Cannot read property 'default_letter_head' of undefined (#9268)	2017-06-14 12:52:13 +05:30
rohitwaghchaure	1b2b4a626f	[Fix] Accounts receivable report showing wrong currency for total amount against the customer (#9276)	2017-06-14 12:32:52 +05:30
KanchanChauhan	1dc26b127b	Salutation and Gender in Lead and Customer (#9199)	2017-06-13 15:26:35 +05:30
Saurabh	797f2030f8	Merge branch 'master' into develop	2017-06-13 15:20:13 +05:30
Ashwini Save	7f14f28099	Account Receivable - Credit Note column added to print format. (#9230) ... * Account Receivable - Credit Note column added to print Format. * Review changes for translation: Account Receivable add credit note column * Review changes for translation: Account Receivable add credit note column * Review changes for translation: Account Receivable add credit note column	2017-06-13 11:18:39 +05:30
Nabin Hait	d0ac0bdc18	Merge branch 'master' into develop	2017-06-12 13:50:12 +05:30
Rohit Waghchaure	782d477be0	[fix] Due Date cannot be before Posting Date	2017-06-12 12:35:40 +05:30
Rohit Waghchaure	c8490626f9	[minor] added mobile no to search customer in POS	2017-06-10 12:21:37 +05:30
tunde	5127da952e	changes expected payment_account in test case according to the fact that exchange rate should return latest saved rate	2017-06-09 17:11:41 +01:00
tunde	7bf4b121f3	Merge branch 'hotfix' into issue_9180	2017-06-09 13:58:22 +01:00
rohitwaghchaure	97fd21a01d	[Fix] Accounts receivable summary report not loading data because credit note column was missing (#9191) ... * [Fix] Accounts receivable summary report not loading data because credit note column was missing * Create accounts_receivable_summary.py	2017-06-09 14:05:10 +05:30
tunde	0a5db528b1	makes sure latest test fixtures for currency exchange is retrieved before running test	2017-06-09 08:14:10 +01:00
tunde	9b827e5b95	makes set_exchange_rate retrieve the latest exchange rate not average for "pay" and "internal transfer" payment entries	2017-06-08 20:54:01 +01:00
tunde	6148fe0909	adds test case to confirm that latest exchange rate is automatically selected	2017-06-08 20:50:11 +01:00
tunde	3eb5cb14d1	calls erpnext.setup.utils.get_exchange_rate instead of get_average_exchange_rate	2017-06-08 14:23:49 +01:00
Nabin Hait	2c808c578d	Merge branch 'master' into develop	2017-06-08 10:34:45 +05:30
rohitwaghchaure	1607125815	[minor] POS customer creation was disabled in offline mode (#9169)	2017-06-07 20:06:58 +05:30
Makarand Bauskar	59a1540898	[minor] removed the deprecated inList method from eval (#9177)	2017-06-07 20:02:09 +05:30
tundebabzy	98f8da1294	hides payments field when is_pos is checked (#9174)	2017-06-07 20:01:51 +05:30
Nabin Hait	a128b21baa	Fixed merge conflict	2017-06-07 12:17:17 +05:30
rohitwaghchaure	d2be55b2e0	[Fix] Orders not creating from the POS for new customer if customer name is based on naming series (#8933) ... * [Fix] Orders not creating from the POS for new customer if customer name is based on naming series * [fix] Disabled price field in POS, if Allow User to Edit Rate field is disabled in POS profile * added customer name in the search bar of the customer * search customer by phone number and email id in the POS	2017-06-07 12:04:01 +05:30
Nabin Hait	17378e8a29	Added a new column for Credit/Debit Note in AR/AP report (#9123)	2017-06-07 11:56:53 +05:30
Prateeksha Singh	3a18dea8a4	[fix][multiselect] don't show completed PRECs for a PINV (#9125)	2017-06-07 11:55:25 +05:30
rohitwaghchaure	ce6e621c18	[fix] Not able to cancel the invoice if it's linked with the timesheet (#9157)	2017-06-07 11:52:04 +05:30
Faris Ansari	5f27c94100	Merge pull request #9078 from netchampfaris/remove-globals ... Lint and fix JS files	2017-06-06 11:35:42 +05:30
Ashwini Save	2020dd37e8	Fixed issue : Payment Entry allocating amount more than invoice amount. (#9084) ... * Fixed issue : Payment Entry allocating amount more than invoice amount. * Added condition to solve issue when allocated amount is null * Code review Changes for payment entry	2017-06-01 19:00:34 +05:30
Nabin Hait	c9fa07b16d	Merge branch 'master' into develop	2017-05-30 15:59:04 +05:30
Nabin Hait	ac3b2aa913	Set change amount automatically only if it is a cash transaction (#9065)	2017-05-30 15:35:01 +05:30
Faris Ansari	ab74ca7fff	Lint and fix JS files	2017-05-30 12:54:42 +05:30
Nabin Hait	6a541a6f7a	Merge branch 'master' into develop	2017-05-26 21:35:42 +05:30
Prateeksha Singh	e38c70c8bc	[fix] uppercase filter frappe/erpnext#8996 (#9026)	2017-05-26 21:34:18 +05:30
Nabin Hait	4b12896941	Party Dashboard: Consider any random company if default company not set (#9046)	2017-05-26 21:25:36 +05:30
Ashwini Save	d702cbfbfa	Update code to fix issue #erpnext WN-SUP25349 : ValueError: max() arg is an empty sequence. (#9025)	2017-05-25 15:48:08 +05:30
Nabin Hait	45d337a016	Merge branch 'master' into develop	2017-05-25 14:19:51 +05:30
Nabin Hait	7e7dc0f254	Update party.py	2017-05-25 14:18:20 +05:30
Nabin Hait	c795386230	Fixed merge conflict	2017-05-24 18:39:16 +05:30
Nabin Hait	b3d4326dcc	Revert "Prompt for mandatory batch number in POS (#8928)" ... This reverts commit ce9ac7885e.	2017-05-24 17:33:07 +05:30
Charles-Henri Decultot	ce9ac7885e	Prompt for mandatory batch number in POS (#8928) ... * Prompt for mandatory batch number in POS * Whitespaces correction	2017-05-24 17:29:23 +05:30
Nabin Hait	258f7da778	Paid amount + Write Off Amount can not be greater than Grand Total in return POS	2017-05-24 17:12:07 +05:30
Nabin Hait	24f0b13b22	Total unpaid amount in party is based on GLE	2017-05-24 16:46:56 +05:30
Nabin Hait	2d79a641c2	Annual billing amount in party dashboard based on grand total	2017-05-24 16:46:56 +05:30
Makarand Bauskar	3b9c2a4438	Added a reference of Sales Invoice in Serial No (#8855) ... * [enhance] added Sales Invoice reference in Serial Number * [patch] added test cases for Sales Invoice and added patch to copy sales invoice * [minor] minor fixes in validate_serial_against_delivery_note * [minor] fixes in sales invoice serial number validation	2017-05-23 18:45:34 +05:30
Nabin Hait	dce8dfc4fe	Merge branch 'master' into develop	2017-05-23 17:48:43 +05:30
Makarand Bauskar	724cc35421	[minor] added columns to pos print_template (#8978)	2017-05-23 17:43:42 +05:30
Nabin Hait	c9f5d84742	Merge branch 'master' into develop	2017-05-23 17:16:19 +05:30
Faris Ansari	29d64cae34	POS print format fix (#8973)	2017-05-23 17:12:51 +05:30
Rushabh Mehta	2b06633919	Merge branch 'master' into develop	2017-05-19 19:24:43 +05:30
rohitwaghchaure	177a26849d	[fix] Trial balance not working (#8937)	2017-05-19 18:56:25 +05:30
Charles-Henri Decultot	8bec0239b9	Prompt for mandatory batch number in POS (#8928) ... * Prompt for mandatory batch number in POS * Whitespaces correction	2017-05-19 16:02:30 +05:30
Ayush Shukla	ae696d005a	Changed report_hide=0 for reference_name (#8902)	2017-05-19 12:38:08 +05:30
Rushabh Mehta	6799e27390	[fix] chart of accounts root sorting, #8784, #8897 (#8904)	2017-05-18 16:21:21 +05:30
Nabin Hait	61ac683847	Fixed chart of accounts for Indonesia (#8900)	2017-05-18 11:58:38 +05:30
Nabin Hait	8fac2ad183	Don't set batch nos automatically on saving, if already set and validate qty with batch (#8887)	2017-05-18 11:54:24 +05:30
Nabin Hait	08ea710c8f	Minor fix in creating chart of accounts based on existing (#8890)	2017-05-17 19:43:12 +05:30
Nabin Hait	4b544347a9	Hide 'Edit Posting Time' from printing (#8888)	2017-05-17 19:42:38 +05:30
tundebabzy	cf7df5d106	fixes #8883 (#8885)	2017-05-17 19:17:04 +05:30
Sagar Vora	3b04b030eb	Fix cost center not getting pulled in DN and SINV (#8878) ... * Fixes for getting selling cost center instead of company's default cost center. * fix error in update_item	2017-05-17 19:16:27 +05:30
Nabin Hait	1e2d7b3519	Filters for multiselect dialog for DN/PR in Sales/Purchase Invoice (#8882)	2017-05-17 13:52:21 +05:30
rohitwaghchaure	3da400b532	[fix] Due Date cannot be before Posting Date during amendement of an invoice (#8841)	2017-05-16 12:43:18 +05:30
rohitwaghchaure	654f186f95	[fix] Apply pricing rule on the item based on quantity as per stock uom (#8792)	2017-05-16 08:54:29 +05:30
rohitwaghchaure	09483d3c0f	[fix] Numeric keypad not displaying after creation of new customer (#8797)	2017-05-16 08:51:24 +05:30
rohitwaghchaure	d678809939	[fix] Party balance field showing wrong currency symbol (#8832)	2017-05-16 08:06:45 +05:30
Faris Ansari	769b6bada8	[POS] Add Pay menu item in mobile view (#8801) (#8845)	2017-05-16 07:31:10 +05:30
Prateeksha Singh	edeb4dc7e0	Multiselect dialog for getting items (#8583) ... * Concatenate docnames and send to mapper * Multiselect with checkboxes * set setters as separate filters * Map filter fields to target_doc * Get items from quotation (in SO) working * [major] Set dialog setters for all forms * Add date field * Specify non-default date_fields * [minor] add test_mapper.py * [minor] remove cur_frm * [minor][fix] test * [minor] fix test with make_test_records	2017-05-15 11:32:06 +05:30
Nabin Hait	5ad6126832	On saving of Accounts Settings, only save enabled warehouses (#8772)	2017-05-11 13:34:04 +05:30
Makarand Bauskar	0e4c5c9efb	[minor] renamed a Total Margin field to Rate With Margin (#8720) ... * [minor] renamed a Total Margin field to Rate With Margin * [minor] minor fixes in field lable	2017-05-11 11:40:02 +05:30
Faris Ansari	734d7795f8	Show party name in General Ledger print report (#8760)	2017-05-11 11:38:30 +05:30
Makarand Bauskar	464f108586	[minor] added currency in Totals for Trial Balance report (#8757) ... * [minor] added currency in Totals for Trial Balance report * [minor] used erpnext.get_default_currency to fetch the company currency	2017-05-10 19:40:36 +05:30
Saurabh	9df45bbc42	[fix] Reference Document is required to create Payment Request (#8729) ... * [fix] Referene Document is required to create Payment Request * Update payment_request.py	2017-05-08 17:24:23 +05:30
Ishan Loya	120ee275cc	Fix typo (#8719)	2017-05-06 12:48:22 +05:30
Nabin Hait	3257aeeb55	Price list rate fix multiple uom and validation with prev doc (#8718)	2017-05-06 12:47:14 +05:30
Nabin Hait	6e7407962f	Get exchange rate only if date and currency is present (#8712) ... * Get exchange rate only if date and currency is present * Update transaction.js	2017-05-06 12:45:16 +05:30
Nabin Hait	d2a966eef3	Update general_ledger.py	2017-05-05 10:41:16 +05:30
Nabin Hait	932423ecba	Balance Sheet always shows accumulated values from previous fiscal year (#8668)	2017-05-04 12:12:29 +05:30
rohitwaghchaure	a1923574c6	Merge pull request #8657 from rohitwaghchaure/pos_email_id_issue ... [fix] Contact not creating if only email id has entered in the POS	2017-05-03 12:56:13 +05:30
Nabin Hait	ef027e9030	Correct args to the fmt_money function	2017-05-03 11:51:47 +05:30
Rohit Waghchaure	fd37516165	[fix] Contact not creating if only email id has entered in the POS	2017-05-02 18:27:09 +05:30
Rohit Waghchaure	61165127fc	[fix] Default pos profile's customer not working for the POS	2017-05-02 13:04:08 +05:30
Rohit Waghchaure	3df7eef6cc	[fix] Unable to create an asset due to rounding issue	2017-05-02 09:49:02 +05:30
Nabin Hait	2afb9b96cd	pricing rule fix	2017-04-28 15:20:49 +05:30
Nabin Hait	8c9fb76854	Remove pricing rules if 'Ignore Pricing Rule' manually triggered	2017-04-28 15:20:49 +05:30
Rohit Waghchaure	0e6ac8b9b4	Enabled option User Cannot Search for the gl entry doctype	2017-04-28 10:03:18 +05:30
Nabin Hait	d5d8db7a3f	Cleanup on financial statement PR	2017-04-25 16:26:33 +05:30
Nabin Hait	39bcb3de4b	Merge branch 'accumulated_header_std' of https://github.com/RicardoJohann/erpnext into RicardoJohann-accumulated_header_std	2017-04-25 16:13:54 +05:30
Ishan Loya	17737e4ab1	Change permissions, change account fieldname and add notes section	2017-04-25 16:08:22 +05:30
Ishan Loya	2fca72ae8e	Change owner	2017-04-25 16:08:22 +05:30
Ishan Loya	0dbe8547e7	Add screenshot to documentation, change naming series to BG-#####, make Bank Guarantee number unique	2017-04-25 16:08:22 +05:30
Ishan Loya	e1ed5ba726	Remove commented out code	2017-04-25 16:08:22 +05:30
Ishan Loya	0fc57a7df2	Change doctype owner	2017-04-25 16:08:22 +05:30
Ishan Loya	c7a72684fd	Add bank guarantee doctype with documentation	2017-04-25 16:08:22 +05:30
Nabin Hait	9b20e07431	[fix] currency field precision	2017-04-25 14:09:29 +05:30
mbauskar	9cf6d630e9	[minor] fixes for expense claim status	2017-04-25 13:15:50 +05:30
Nabin Hait	e3c122d8c4	AR report: filter based on customer group and credit days based on field. Fixed #8214	2017-04-24 19:06:07 +05:30
Rohit Waghchaure	dd70fbfdae	[fix] Letter head not showing in the report	2017-04-24 18:57:51 +05:30
mbauskar	bb2670d57a	[fixes] minor fixes in bank reconciliation form and report	2017-04-24 10:23:50 +05:30
mbauskar	c3d642e5d1	[minor] allow bulk edit for doctype	2017-04-21 17:50:40 +05:30
Nabin Hait	68ae9f3f88	Merge branch 'develop' into allow_on_submit_fix	2017-04-19 21:10:23 +05:30
mbauskar	8f3cc81302	[minor] minor fixes in pricing_rule and set_missing_value	2017-04-19 21:05:37 +05:30
mbauskar	9e9d242a24	[minor] fixes in test cases and added the test case for multiple uom in selling	2017-04-19 21:05:37 +05:30
mbauskar	287fe81329	[minor] calculate price list rate based on items uom	2017-04-19 21:05:37 +05:30
Nabin Hait	f382373cf4	Merge branch 'develop' into develop	2017-04-19 21:01:19 +05:30
Nabin Hait	8691e0777b	Update purchase_invoice_item.json	2017-04-19 20:58:09 +05:30
Nabin Hait	2de3bf7a0f	Fixed indexes on sales and purchase transactions	2017-04-19 20:58:09 +05:30
Rohit Waghchaure	f4f774d1df	[fix] offline_pos_name is not defined during print from the POS	2017-04-19 20:50:35 +05:30
Nabin Hait	2704162f5a	Fixes allowd on submit	2017-04-19 16:25:39 +05:30
Nabin Hait	117be7ddd5	Added a settings in Accounts Settings to disable booking depreciation entry automatically	2017-04-18 14:03:06 +05:30
Nabin Hait	8a01980757	Unlink Journal Entry reference from Asset	2017-04-18 13:11:10 +05:30
Rohit Waghchaure	d7de3c606b	[fix] Pricing rule for pos	2017-04-17 17:32:36 +05:30
Nabin Hait	e2431fd5e9	minor fix	2017-04-17 15:35:36 +05:30
Nabin Hait	83ca262e38	Merge pull request #8453 from StrellaGroup/develop ... [fix] Stock Entry - Change "Is Sample Item" to "Allow Zero Valuation Rate"	2017-04-17 14:00:12 +05:30
mbauskar	22cedeb006	[minor] POS & RFQ format_number fixes	2017-04-17 12:24:24 +05:30
Javier Wong	54d9c9eaf4	Merge branch 'develop' into develop	2017-04-14 18:33:44 +08:00
Javier Wong	9b11d9b45d	[fix] Stock Entry - Change "Is Sample Item" to "Allow Zero Valuation Rate"	2017-04-14 18:24:04 +08:00
mbauskar	1e05077b1f	[minor] sales register report fixes	2017-04-14 09:59:49 +05:30
Faris Ansari	185762aeeb	update label	2017-04-13 12:36:08 +05:30
Faris Ansari	19f90e984e	[POS] Show stock quantity of items ... - frappe/erpnext#8247	2017-04-12 16:06:31 +05:30
Faris Ansari	b5608f9b14	[fix] Default Print Format for Sales Invoice (#8419) ... - frappe/erpnext#8416	2017-04-12 15:31:01 +05:30
rohitwaghchaure	5adce495aa	Merge pull request #8417 from rohitwaghchaure/due_date_issue ... [fix] POS, Due Date cannot be before Posting Date	2017-04-12 14:43:21 +05:30
Rohit Waghchaure	2192c244c0	[fix] POS, Due Date cannot be before Posting Date	2017-04-12 13:19:05 +05:30
mbauskar	2f9703c20e	[minor] set company_currency as account_currency in general ledger if party type is employee	2017-04-11 18:56:41 +05:30
joezsweet	768a888bf2	[fix] validate supplier invoice ... - modified to check for the selected supplier only	2017-04-11 18:52:46 +05:30
Rohit Waghchaure	87ad6d074a	[enhance] Stock qty added in purchase invoice	2017-04-11 18:29:52 +05:30
Kanchan Chauhan	95108ac80b	[Minor] Party validation for Employee	2017-04-11 18:29:27 +05:30
mbauskar	236f7aac7f	[minor] track changes for transaction documents	2017-04-10 14:48:54 +05:30
Nabin Hait	549a2827e5	Merge pull request #8300 from rohitwaghchaure/customer_edit_issue_v8 ... [fix] Customer edit issue in offline POS	2017-04-05 14:51:44 +05:30
Rohit Waghchaure	2861955632	[fix] Customer edit issue in offline POS	2017-04-04 09:59:29 +05:30
Nabin Hait	731efe3a95	Minor fix in gross profit report	2017-04-03 12:11:36 +05:30
Nabin Hait	2c892c7e7f	Indentation fixed in gross profit report	2017-04-03 12:05:35 +05:30
Nabin Hait	b15d999147	Merge branch 'develop' into gross_profit_issue_v_8	2017-03-31 17:39:45 +05:30
Rushabh Mehta	f0b4562a95	[refactor] move purchase_common.js -> public/js/controllers/buying.js	2017-03-31 17:36:48 +05:30
Rushabh Mehta	cc8b2b2fdb	[fix] [refactor] demo for v8 and remove purchase common	2017-03-31 17:36:48 +05:30
Rohit Waghchaure	34b1dba9aa	[fix] get_valuation_rate takes 4 arguments 3 given in gross profit report	2017-03-31 12:44:10 +05:30
Ricardo Johann	033e2fa8b6	changed accumulated header	2017-03-31 02:18:54 -03:00
Nabin Hait	620bde7144	Updated modified date to reload sales uom	2017-03-30 19:50:45 +05:30
Nabin Hait	e503f68ec7	Merge pull request #8229 from rohitwaghchaure/pos_highlight_issue ... [fix] POS cart item's highlighted issue	2017-03-30 19:26:33 +05:30
Rohit Waghchaure	a86bb69adf	[fix] POS cart item's highlighted issue	2017-03-30 19:16:38 +05:30
Nabin Hait	1f6bd0ad37	Fixed merge conflict	2017-03-30 13:15:22 +05:30
Ricardo Johann	3d1434afe7	Export total labels	2017-03-29 17:44:17 +05:30
Makis Etzoglou	82e6bc45e4	tax_id add to Sales Order, Delivery Note, and Sales Invoice	2017-03-29 17:39:08 +05:30
mbauskar	de98ff6bb9	[minor] hide the stock details section if update_stock is unchecked	2017-03-29 17:29:58 +05:30
Nabin Hait	da749f716b	Merge pull request #8172 from rohitwaghchaure/credit_note_serial_no_issue ... [fix] During making credit note from sales invoice, system fetching new serial no instead of old serial no from the sales invoice	2017-03-28 13:49:32 +05:30
Nabin Hait	77c970549b	In gross profit report, if incoming rate not found from last sle, consider average valuation rate	2017-03-28 12:20:31 +05:30
Rohit Waghchaure	5ecbaa408b	[fix] During making credit note from sales invoice, system fetching new serial no instead of old serial no from the sales invoice	2017-03-28 12:09:07 +05:30
Nabin Hait	8bf58367b8	Fixed merge conflict	2017-03-27 12:30:01 +05:30
Nabin Hait	9c8159be8f	Merge pull request #8129 from rohitwaghchaure/pos_v8_enhance_and_issue ... [fix] customer edit, numeric keypad visibility, on selection of item highlight the background issue in the pos	2017-03-27 12:25:18 +05:30
Rohit Waghchaure	b719dc53fc	[fix] customer edit and numeric keypad visibility issue in the pos	2017-03-24 17:03:50 +05:30
Nabin Hait	bf2a7efca4	Account name changed in standard chart of accounts	2017-03-24 13:01:35 +05:30
Nabin Hait	f44f04e33a	Merge pull request #8063 from khrlzhfr/patch-1 ... Update standard_chart_of_accounts.py	2017-03-23 17:01:34 +05:30
Nabin Hait	c7dc838306	Merge pull request #8068 from rohitwaghchaure/asset_depreciation_issue ... [fix] Precision issue during making of depreciation schedule	2017-03-23 16:59:12 +05:30
Rohit Waghchaure	57f35a25a1	[fix] UnpickleError, removed _ method from the argument of the function	2017-03-23 14:55:52 +05:30
Rohit Waghchaure	6ee91ec9c6	on selection of row highlight the background in the cart	2017-03-21 15:55:09 +05:30
Faris Ansari	e1acb766ac	[fix] asset image in image view	2017-03-21 14:18:30 +05:30
Rohit Waghchaure	b69d311268	[fix] precision issue during making of depreciation schedule	2017-03-20 16:30:34 +05:30
Khairil Zhafri	4d6d456a0d	Update standard_chart_of_accounts.py ... Minor spelling edits	2017-03-20 00:15:34 +08:00
rohitwaghchaure	2b9c95a940	Merge pull request #8043 from rohitwaghchaure/pos_issue_v8 ... [fix] POS, amount not updating on change of price, on zero of discount rate has not reset, pricing rule not working for brand	2017-03-16 17:56:20 +05:30
Rohit Waghchaure	75177c0e35	[fix] POS, amount not updating on change of price, on zero of discount rate has not reset, pricing rule not working for brand	2017-03-16 15:47:25 +05:30
mbauskar	27efc91db0	[minor] make item code mandatory if update_stock is selected	2017-03-15 18:57:18 +05:30
Rushabh Mehta	f340e19ea7	[minor] field re-arrangements in sales invoice, purchase invoice, stock reco	2017-03-15 15:12:43 +05:30
Nabin Hait	ee7b4f2882	Merge pull request #8016 from rmehta/posting-date-option ... [feature] posting date, time is always current unless explicitly set	2017-03-15 11:22:04 +05:30
Nabin Hait	505ed25f10	Merge pull request #8017 from nabinhait/develop ... Field order changed for 'Qty as per Stock UOM'	2017-03-14 22:39:36 +05:30
Nabin Hait	79bce2a71d	Merge pull request #8019 from rohitwaghchaure/pos_serial_no_issue ... [fix] User sales one serial number multiple time from the POS	2017-03-14 22:38:28 +05:30
Rushabh Mehta	4f3da42b75	[fixes] for tests	2017-03-14 21:29:55 +05:30
Rushabh Mehta	131866a11a	[fixes] for tests	2017-03-14 21:06:15 +05:30
Rushabh Mehta	82c258948d	[fixes] for recurring and tests	2017-03-14 19:13:39 +05:30
Rohit Waghchaure	e259a9b068	[fix] User sales one serial number multiple time from the POS	2017-03-14 19:05:21 +05:30
Nabin Hait	3d731df7e3	Field order changed for 'Qty as per Stock UOM'	2017-03-14 17:24:57 +05:30
Rushabh Mehta	6d4a52562b	[fix] posting date, time is always current unless explicitly set	2017-03-14 17:06:51 +05:30
Rushabh Mehta	6b53792aea	[fix] posting date, time is always current unless explicitly set	2017-03-14 17:06:51 +05:30
Rohit Waghchaure	faedf8274c	[fix] gross profit permission issue	2017-03-14 14:56:24 +05:30
Saurabh	0d47d51407	[fix] modified payment request to cope with new payment structure (#7957) ... * [fix] modified payment request to cope with new payment structure * [fix] moved payment gateway doctype from accounts to core	2017-03-14 14:46:05 +05:30
Rohit Waghchaure	cc034a8983	[fix] Value assignment issue for country in the pos profile	2017-03-13 22:44:48 +05:30
Nabin Hait	1ed8bc4c36	Gross Profit report: Consider Sales team table only if grouped by sales person	2017-03-12 17:10:41 +05:30
Nabin Hait	fb4b8d926f	Company based on exising company fix	2017-03-12 16:55:05 +05:30
Nabin Hait	d0d22ff203	copy letter head from invoice to payment entry	2017-03-12 16:55:05 +05:30
Nabin Hait	c5204f56e2	Merge pull request #7909 from KanchanChauhan/employee-loan-jv ... JV on submitting Employee Loan	2017-03-12 16:50:48 +05:30
Rohit Waghchaure	87fa59a710	[Fix] Customer delete, customer edit functionality, added country field in the pos profile	2017-03-10 19:37:02 +05:30
Faris Ansari	1fe1518398	[pos] ui cleanup	2017-03-10 17:00:43 +05:30
Rohit Waghchaure	6068aecc2e	minor fix	2017-03-10 17:00:43 +05:30
Faris Ansari	07c9f35779	ui cleanup	2017-03-10 17:00:42 +05:30
Faris Ansari	45510109b6	[pos] cleanup	2017-03-10 17:00:42 +05:30
Rohit Waghchaure	017f5005e0	fixed pos numeric keypad functionality	2017-03-10 17:00:42 +05:30
Faris Ansari	339d9c954a	minor changes	2017-03-10 17:00:42 +05:30
Rohit Waghchaure	1312fe31a9	Provision to edit customer and address details	2017-03-10 17:00:42 +05:30
Rohit Waghchaure	56a7974b58	added event on numeric keypad	2017-03-10 17:00:41 +05:30
Rohit Waghchaure	86ab6a93b4	[Enhancement] POS, numeric keypad	2017-03-10 17:00:41 +05:30
Faris Ansari	1f261a8695	UI changes	2017-03-10 17:00:41 +05:30
Rohit Waghchaure	b5097ec161	offline email for POS	2017-03-10 17:00:41 +05:30
Rohit Waghchaure	f0c7ba4b1f	added event on numeric keypad	2017-03-10 17:00:40 +05:30
Rohit Waghchaure	e30f83a8af	[Enhancement] POS, numeric keypad	2017-03-10 17:00:40 +05:30
Kanchan Chauhan	ffd1f112e6	JV on submitting Employee Loan	2017-03-09 12:21:37 +05:30
Nabin Hait	52daaca885	Fixed merge conflict	2017-03-08 14:30:38 +05:30
mbauskar	02198ec8b0	removed the test_clear_blank_rows test case from JE	2017-03-08 12:34:36 +05:30
Nabin Hait	33fb6ae323	Fixed merge conflict	2017-03-08 11:18:15 +05:30
mbauskar	c03f275e7a	[minor] allowed the credit and debit amount to be 0 in JE	2017-03-07 11:59:55 +05:30
Rohit Waghchaure	9f4317e9b8	minor fix	2017-03-06 23:42:45 +05:30
Nabin Hait	b3ffd6b282	Merge pull request #7828 from rohitwaghchaure/update_user_roles_to_roles ... Changed userrole to has role, commonify role editor of the user	2017-03-06 18:44:53 +05:30
Nabin Hait	fe876c0805	Test case fixed for multiple uom in selling	2017-03-06 16:41:13 +05:30
Nabin Hait	e68f32cf19	UOM Conversion in selling	2017-03-06 16:41:13 +05:30
Kanchan Chauhan	5a980ac87a	UOM Conversion in Selling	2017-03-06 16:41:12 +05:30
Rohit Waghchaure	611a70a12a	changes in the report roles	2017-03-06 16:36:46 +05:30
Rohit Waghchaure	e7485150a1	added roles in the report	2017-03-06 14:26:09 +05:30
Nabin Hait	c642f76a4d	Fixed merge conflict	2017-02-27 14:40:53 +05:30
Rohit Waghchaure	b983f26b98	[Fix] Payment entry account Paid To Show receivable accounts for supplier	2017-02-24 15:07:54 +05:30
Nabin Hait	ff5bd680c2	Merge pull request #7840 from rmehta/new-buttons ... [enhance] connect new buttons on dashboard to custom make buttons and fix text for payment request	2017-02-24 12:57:13 +05:30
Rushabh Mehta	509543752c	[enhance] connect new buttons on dashboard to custom make buttons and fix text for payment request	2017-02-23 17:03:46 +05:30
mbauskar	d6e409ea92	[minor] hide recurring section if document is in __local state	2017-02-22 18:22:14 +05:30
Nabin Hait	5079c9ef47	Fixed merge conflict	2017-02-22 15:31:31 +05:30
mbauskar	a8fa10d2a9	[minor] minor fixes for journal entry get_exchange_rate trigger	2017-02-22 14:51:09 +05:30
Kanchan Chauhan	f2803ac427	[Fix] Throw error if item is added multiple time	2017-02-22 10:40:38 +05:30
Rohit Waghchaure	49523d7f80	[Fix] Company fiscal year issue in financial statement	2017-02-21 14:20:26 +05:30
Nabin Hait	aa968cd12e	Merge pull request #7751 from nick9822/patch-3 ... Next Depreciation Date is entered as past date	2017-02-20 19:11:31 +05:30
Nabin Hait	8bb69ff8bf	Fixed merge conflict	2017-02-20 19:01:04 +05:30
Nabin Hait	589f4656ad	Merge branch 'develop' into in_global_search	2017-02-20 15:04:52 +05:30
Nabin Hait	9f4cb0c097	Fixed merge conflict	2017-02-20 15:00:04 +05:30
Nabin Hait	fd3ec066ce	Added fields in global search	2017-02-20 13:38:31 +05:30
Rohit Waghchaure	f73d459c80	[Fix] Removed employee party type from the payment entry	2017-02-19 17:46:05 +05:30
Nabin Hait	02d987ed13	Minor fix for common tree view	2017-02-17 15:50:53 +05:30
Rohit Waghchaure	a020e4eba4	Payment entry fields issue, added total billed hours in timesheet	2017-02-17 14:51:57 +05:30
Kanchan Chauhan	1b204c8e4e	Accrual Payroll System	2017-02-16 16:30:51 +05:30
nick9822	23e174c270	Validation for purchase_date ... Separate validation for purchase date.	2017-02-16 16:26:38 +05:30
mbauskar	e7b87ad071	[minor] timestamp fixes for heatmap	2017-02-16 16:05:46 +05:30
Nabin Hait	d13d198dc8	Merge pull request #7747 from KanchanChauhan/item-name-asset ... [Minor] Item Name in Asset	2017-02-16 15:15:23 +05:30
Nabin Hait	ea1cb68fe7	Merge branch 'master' into develop	2017-02-16 14:37:50 +05:30
Nabin Hait	99c6c79834	Update payment_entry.js	2017-02-16 14:21:04 +05:30
nick9822	e5cb3e34fe	nowdate changed to purchase_date ... next depreciation date should be compared with purchase_date instead of nowdate.	2017-02-15 15:32:50 +05:30
Kanchan Chauhan	2307f57f19	[Minor] Item Name in Asset	2017-02-15 11:52:29 +05:30
Rohit Waghchaure	ff41c82c2b	[Fix] Payment Entry currency symbol issue	2017-02-15 11:44:15 +05:30
Rushabh Mehta	e6aa3b435a	[minor] added make material request from Stock Entry and removed cur_frm	2017-02-09 17:47:22 +05:30
mbauskar	d487bf77e1	[minor] payment entry company trigger	2017-02-09 12:57:25 +05:30
khatrijitendra	d262eb1a1c	issue in type and rate ... 1. there is not such field, "type" it is "margin_type" 2. there is not such field, "rate" it is "margin_rate_or_amount"	2017-02-08 14:59:59 +05:30
Nabin Hait	6ff0caa87a	Fixed merge conflict	2017-02-08 11:33:33 +05:30
Nabin Hait	6f93cd5bd0	Merge pull request #7692 from rohitwaghchaure/minor_fixes_v_7_2 ... Minor fixes	2017-02-08 11:21:54 +05:30
Nabin Hait	533d22e88b	Merge pull request #7606 from rohitwaghchaure/data_import_tool_for_cost_center ... [Fix] Allow data import tool for cost center	2017-02-08 11:21:25 +05:30
Rohit Waghchaure	b3489548a9	minor fix	2017-02-08 11:20:04 +05:30
Nabin Hait	70fd8546ce	Merge pull request #7677 from KanchanChauhan/serial-no-in-return ... [Fix] Serial No if is_return	2017-02-07 13:28:30 +05:30
Nabin Hait	0a6aaf4257	Get standard/historical valuation rate where missing: some minor fixes	2017-02-07 12:50:22 +05:30
Kanchan Chauhan	4f3b0aa249	[Fix]Serial No if is_return	2017-02-07 11:28:34 +05:30
Nabin Hait	ea8fab52c6	Get standard/historical valuation rate where missing, if item is not a sample item	2017-02-07 01:24:32 +05:30
mbauskar	c874a82559	[minor] index out of range fixes for JE	2017-02-06 15:41:34 +05:30
Rushabh Mehta	6ede4a3809	[enhance] production order from sales order	2017-02-02 17:42:01 +05:30
Rushabh Mehta	a3d0bea375	Merge branch 'develop' into remove-party-status	2017-02-02 15:42:04 +05:30
Rohit Waghchaure	69060a8177	Minor fix	2017-02-01 19:14:53 +05:30
Rushabh Mehta	3714626dd0	[minor] enhance BOM view	2017-02-01 18:35:53 +05:30
rohitwaghchaure	c13dbd408f	[Enhancement] POS Redesign (#7639) ... * item group, discount * POS Redesign * offline customer * removed offline records from modal view	2017-02-01 18:07:22 +05:30
Rohit Waghchaure	38f808cfae	[Fix] Buying rate in gross profit report	2017-02-01 13:34:06 +05:30
rohitwaghchaure	ea092a7b24	[Enhancement] Booking of an employee's expense claim (#7267) ... * [Enhancement] Auto book of an employee's expense claim * test cases * documentation * fixes and changes * removed payable from employee and added into the company * Added party in account, patch to update party type for customer and supplier accounts * added party type in erpnext, fix patch * fixed travis	2017-02-01 12:02:08 +05:30
KanchanChauhan	fbaa6197f9	Employee Loan Management (#7126) ... * [WIP] Employee Loan Management * EMI calculation * Fixing PR	2017-01-30 15:15:58 +05:30
Rushabh Mehta	87037bdd56	[minor] remove party status as it leads to duplicate notifications fixes #7346, also fix for #7568	2017-01-30 13:22:51 +05:30
Rohit Waghchaure	b327429db7	[Fix] Allow data import tool for cost center	2017-01-30 11:34:29 +05:30
Ricardo Johann	34354237fd	added project filter to gl and carry project filter from P&L	2017-01-24 06:46:07 -03:00
Nabin Hait	349d520ae2	Fixed merge conflict	2017-01-20 15:44:35 +05:30
Nabin Hait	bd1a628c55	Merge pull request #7545 from rohitwaghchaure/minor_issue ... [Fix] Account user not able to access the report Payment Period Based On Invoice Date	2017-01-20 14:36:48 +05:30
Rohit Waghchaure	93c001455f	[Fix] Account user not able to access the report	2017-01-20 14:18:17 +05:30
Rohit Waghchaure	84b827efcd	[Fix] Budget not working properly	2017-01-20 12:33:50 +05:30
Rohit Waghchaure	2b97cee32c	[Fix] POS print issue	2017-01-18 13:21:27 +05:30
robert schouten	c0888637cc	[fix] accounts heatmaps now covering 366 days not 20	2017-01-18 15:25:58 +08:00
Nabin Hait	dd839055e3	Fixed merge conflict	2017-01-17 15:52:56 +05:30