3929 Commits

Author	SHA1	Message	Date
Saurabh	2e7a45dbb4	resolved merge conflicts	2018-04-24 11:16:13 +05:30
Deepak kumar	022ac50160	Reverse Journal Entry (#13637) ... * [Fix] #13605 * fixes codacy * minor changes * Added naming series for reverse journal entry * added reference_type and reference_name	2018-04-24 10:52:28 +05:30
tundebabzy	dbdf462e56	fix conflict	2018-04-22 23:49:26 +01:00
tundebabzy	f65ee888c0	spelling: canceled --> cancelled	2018-04-22 23:43:08 +01:00
Nabin Hait	c36524ec54	Update chart_of_accounts.py	2018-04-20 11:00:20 +05:30
Shreya Shah	44e719d64c	[Enhancement] Leave Application and Expense Claim (#13645) ... * child table employee expense approver * set query in department * mandatory approver check in hr settings * triggers on leave and expense approver * fetch all parent approvers from department hierarchy * fixes * patch to move employee approvers from employee to department * removed hard coding of roles * modify approvers list query * commonified functions * patch * renamed standard reply occurrences * removed leave approvers table from Employee master * email templates for leave application notification * set default email templates for leave in hr settings * notify by email template * approval status in expense claim * render template in patch * removed unused code * Single child table department approver * read instead of render template	2018-04-19 20:58:52 -08:00
Saurabh	5b7503c074	Merge pull request #13691 from saurabh6790/supp_180417_1 ... [hotfix] multiple fixes	2018-04-19 15:57:35 +05:30
Zarrar	59f7b8c4a1	issue routing to report (#13710)	2018-04-18 02:56:02 -08:00
Saurabh	46ffbb74ff	fix cheque print measurements	2018-04-17 20:44:37 +05:30
tundebabzy	caae0f4dcc	Merge branch 'develop' into new-subscription	2018-04-17 09:34:04 +01:00
matmyers	742da8cfce	removed duplicate keys (#13675)	2018-04-17 12:20:57 +05:30
Saurabh	46743d00d6	Merge branch 'master' into develop	2018-04-17 12:00:21 +05:30
Saurabh	f2a941b1a4	[fix] check if supplier value exists (#13616)	2018-04-15 21:37:14 -08:00
Sathisha Poojary	16ce8ed7d5	Merge branch 'develop' of https://github.com/frappe/erpnext into develop	2018-04-14 12:05:11 +05:30
Faris Ansari	ed34a442a8	Obey currency filter in financial statement prints #pdd (#13648)	2018-04-13 21:34:00 -08:00
Nabin Hait	642d39098a	Fixed merge conflict	2018-04-13 14:38:57 +05:30
Faris Ansari	f8dd4c2d7b	[fix] Financial report column values during print (#13627)	2018-04-12 17:28:40 +05:30
Siddhi Sawant	a0bbc0846b	GST purchase invoice with tax breakup details (#13561)	2018-04-12 14:50:48 +05:30
rohitwaghchaure	2ea593bdd8	[Fix] POS Profile data not set in the sales invoice (#13568)	2018-04-12 13:37:08 +05:30
Sathisha Poojary	99e3ca0f67	Create a new doctype for bank so that we can suport other ... bank statements dynamically.	2018-04-07 19:00:05 +05:30
Sathisha Poojary	6b8eb645c4	Merge branch 'develop' of https://github.com/frappe/erpnext into develop	2018-04-07 16:41:43 +05:30
Nabin Hait	e9638be032	fixed merge conflict	2018-04-06 15:18:27 +05:30
Rushabh Mehta	dccfb54a0f	[fix] [ux] allow account to be created via form (#13509)	2018-04-06 10:28:08 +05:30
rohitwaghchaure	aa7cddef5c	Merge pull request #13511 from rohitwaghchaure/table_styling ... [Fix] Width and margin for account receivable pdc print format	2018-04-04 16:34:21 +05:30
Rohit Waghchaure	3d2b3d37d4	[Fix] Width and margin for account receivable pdc print format	2018-04-04 16:01:33 +05:30
Nabin Hait	2b682c82e8	Fixed merge conflict	2018-04-04 11:40:16 +05:30
rohitwaghchaure	eedc0ac681	[Fix] chart of accounts root type is mandatory issue in charts.erpnext.com (#13467)	2018-04-02 12:49:38 +05:30
Britlog	220864b4f7	Allow decimal quantities in pos (#13471)	2018-04-02 10:55:04 +05:30
Nabin Hait	c825e914d1	Added indexes for lft, rgt on nestedset doctypes (#13420)	2018-04-02 10:43:46 +05:30
Zarrar	e9ca5e81d2	hide add_child for root node (#13444)	2018-04-02 10:40:39 +05:30
Nabin Hait	edd320e338	Optimisation of warehouse_account_map (#13454)	2018-04-02 10:30:17 +05:30
Nabin Hait	af98f5d14d	Sort accounts by account number in financial statements (#13423)	2018-04-02 10:14:32 +05:30
Manas Solanki	0289ad285f	fix the route filters and payment account (#13447)	2018-04-02 10:13:22 +05:30
Sathisha Poojary	1de5669574	Rename Bank Statement Settings appropriately and allow auto ... populating some settings for supported banks	2018-03-31 10:30:34 +05:30
Sathisha Poojary	f698a1bcbe	Minor typo with major error	2018-03-31 01:19:52 +05:30
Sathisha Poojary	f069e1c83c	Merge branch 'develop' of https://github.com/frappe/erpnext into develop	2018-03-31 00:55:56 +05:30
Nabin Hait	ff2e4c898a	Fixed merge conflict	2018-03-29 13:57:39 +05:30
Rohit Waghchaure	ace68cd283	[Fix] Alignment and date issue in PDC report	2018-03-28 15:53:29 +05:30
Nabin Hait	6c35822a35	Merge branch 'master' into develop	2018-03-28 10:40:14 +05:30
Sathisha Poojary	148c4f9724	Merge branch 'develop' of https://github.com/frappe/erpnext into develop	2018-03-28 00:27:32 +05:30
Sathisha Poojary	0512eec54b	Some minor changes addressing manual doctype renaming issues	2018-03-28 00:22:59 +05:30
Shreya Shah	c0201877dd	fixed column fieldnames for translations (#13406)	2018-03-27 18:45:42 +05:30
Nabin Hait	b9c82b9790	Fixed merge conflict	2018-03-27 14:25:27 +05:30
Shreya Shah	149f7ee875	[Fix] General Ledger Report (#13374) ... * error fix if party_type = student or shareholder * clear party filter when party_type changes to avoid error throw * dict with values of party_name in utils.js * fetch party_name from erpnext.utils.get_party_name * Update general_ledger.py	2018-03-27 11:29:25 +05:30
Sathisha Poojary	0b5fea1491	Initial changes to manually migrating bank statemet work from ... app to erpnext	2018-03-26 01:12:18 +05:30
Nabin Hait	061d912749	Fixed merge conflict	2018-03-23 16:20:27 +05:30
Shreya Shah	9bcadf8126	Tax Id in some reports and print formats (#13373) ... * tax-id in sales and purchase registers * tax-id in general ledger print_format * tax-id in accounts payable * tax-id in accounts receivable	2018-03-23 15:04:37 +05:30
Nabin Hait	80a9f523d5	Minor fix AR/AP summary report	2018-03-23 13:02:27 +05:30
pawan	53a4d2c430	[fix] #13352	2018-03-21 09:19:36 +05:30
Siddhi Sawant	c672530210	[hotfix] Added 'Paid Amount' and 'Change Amount' in POS print formats (#13316) ... * Added 'Paid Amount' and 'Change Amount' in GST POS Invoice and POS Invoice print formats * Update gst_pos_invoice.json Updated its 'disabled' property. * Update pos_invoice.json Updated its 'disabled' property. * Shows change amount only if it exists * Updated disable property of print formats	2018-03-20 14:31:14 +05:30
Nabin Hait	8a8966ce9b	minor fix	2018-03-20 11:19:57 +05:30
Saurabh	2777fd4332	[fix] validate minimum transaction amount in Payment Request for selected payment gateway (#13328)	2018-03-19 18:29:01 +05:30
Achilles Rasquinha	1e95323679	Fixed dict_keys concatenation	2018-03-18 10:08:43 +05:30
Nabin Hait	c8cd4ba6f7	Merge branch 'master' into develop	2018-03-15 12:38:43 +05:30
Nabin Hait	70abac0061	Get territory from sales invoice	2018-03-15 12:19:16 +05:30
Nabin Hait	3707242770	Fixed merge conflict	2018-03-13 16:15:41 +05:30
Nabin Hait	89346967da	Reverted #13259 (#13291)	2018-03-13 16:01:11 +05:30
Nabin Hait	97e890d0b3	Fix in unallocated amount calc in payment entry (#13288)	2018-03-13 15:57:34 +05:30
Nabin Hait	96f4b22589	Set po nos in DN and SI (#13290)	2018-03-13 15:46:59 +05:30
tundebabzy	0125f7b130	rename to Subscription and transfer present Subscription records to Auto Repeat in frappe	2018-03-12 13:51:47 +01:00
Nabin Hait	2f493731ec	Fixed merge conflict	2018-03-12 15:49:59 +05:30
Nabin Hait	2c7a6e6b43	Reserve for subcontracting (#13195) ... * [fix] #8427 * review comments changes * Validation for reserved warhouse * code improvements * alignment * test case * message changes * default warehouse / remove validation / change sql * fix * patch * Fixed merge conflict * Fixes and cleanups of reserve qty for subcontracting * set from_warehouse only if purchase_order and purpose found (#12398) * [HotFix] Validation issue for subcontract stock entry (#12127) * [Fix] Validation issue for subcontract stock entry * Update stock_entry.py * Fixes and cleanups of reserve qty for subcontracting * patch fixed * Reload bin in patch * [fix] set source warehouse in stock entry for manufacture * [fix] #8540 * code alignment * code alignment * Move target warehouse validation to submit * validation code improvement * code changes for single stock entry * validation fix * call make_rm_stock_entry * remove old stock entry method/rewrite test case * Don't set bom_no against raw materials while trasferring items for sub-contracting * minor fix	2018-03-12 14:12:12 +05:30
Shreya Shah	69d9f51dbb	if price list not found, set default selling/ buying price list from settings (#13259)	2018-03-12 11:15:49 +05:30
Prateeksha Singh	9362cf37e0	[charts] update charts API	2018-03-12 09:54:56 +05:30
tundebabzy	2970630ed2	Merge branch 'develop' into new-subscription	2018-03-12 02:00:34 +01:00
Nabin Hait	5e63c265db	Fixed merge conflict	2018-03-09 17:34:39 +05:30
Achilles Rasquinha	138a4850fe	Merge pull request #13252 from achillesrasquinha/py3 ... sort by name accounts for trial balance.	2018-03-09 15:23:28 +05:30
Achilles Rasquinha	dc61c6b975	sort by name accounts	2018-03-09 15:23:08 +05:30
Achilles Rasquinha	1d7665fca1	sort by name accounts	2018-03-09 15:22:20 +05:30
tundebabzy	3d26003c1f	add column breaks to Subscription	2018-03-09 09:37:06 +01:00
tundebabzy	8889b70ba1	Merge branch 'develop' into new-subscription	2018-03-09 09:10:48 +01:00
Achilles Rasquinha	b4de7e3d07	removed has_key, used pythonic in (#13236) ... * removed has_key, used pythonic in * Update bom.py	2018-03-09 12:35:47 +05:30
tundebabzy	e69747ca6d	[Feature Request] Add Payment Mode field on Payment Terms Template #13117 (#13243) ... * add mode of payment field to Payment Term * add mode of payment field to Payment Terms Template Detail * add mode of payment field to Payment Schedule * add mode of payment in `get_payment_term_details`	2018-03-09 12:23:53 +05:30
rohitwaghchaure	acd3479269	Bank POS transactions in bank reconciliation (#13225)	2018-03-08 16:22:39 +05:30
rohitwaghchaure	a32e57ae82	[Fix] Discount in offline POS is enabled even is it's disabled in POS Profile (#13233)	2018-03-08 16:21:13 +05:30
Achilles Rasquinha	908289d40a	[FIX] filter to list	2018-03-08 13:10:51 +05:30
Achilles Rasquinha	9050998e06	[FIX] use text_type instead of unicode, use cmp from past.builtins	2018-03-08 12:55:41 +05:30
tundebabzy	1643cce479	fetch journal entry details (#13218)	2018-03-08 11:17:17 +05:30
rohitwaghchaure	bbd9b71547	Provision to include exploded items while making transfer entry of raw materials for subcontrtacted item (#13043)	2018-03-07 15:39:40 +05:30
Nabin Hait	c50d7446b5	Merge branch 'master' into develop	2018-03-07 13:09:07 +05:30
Saurabh	a65b28772f	[fix] setup_party_account_field on init	2018-03-06 18:22:01 +05:30
Nabin Hait	c43c95e0aa	Fixed merge conflict	2018-03-05 14:54:44 +05:30
tundebabzy	458a1fe61a	codacy	2018-03-03 18:11:48 +01:00
tundebabzy	ef605d5f00	codacy	2018-03-03 18:03:04 +01:00
tundebabzy	3b1251ef47	codacy tinzz	2018-03-03 17:36:07 +01:00
tundebabzy	2379451b68	codacy tinzz	2018-03-03 17:18:47 +01:00
tundebabzy	fbdd5d30e9	more tests and bug fixes	2018-03-03 11:19:18 +01:00
tundebabzy	024c28acf7	fix proration logic to reduce possibility of rounding errors	2018-03-03 10:32:02 +01:00
tundebabzy	79a01561d5	enhancement: do nothing if cancel_sbscription is called for cancelled subscription	2018-03-03 07:39:44 +01:00
tundebabzy	d43422c18e	enhancement: ensure subscription is cancelled before attempting to restart	2018-03-03 07:37:59 +01:00
tundebabzy	e13570f343	codacy review	2018-03-02 12:27:12 +01:00
tundebabzy	9e863b9572	Merge branch 'develop' into new-subscription	2018-03-02 11:10:27 +01:00
tundebabzy	c15dc21b7d	clean up	2018-03-02 11:00:15 +01:00
tundebabzy	49d34df8f4	more tests	2018-03-02 10:16:57 +01:00
tundebabzy	688fd6b205	prorate invoice when cancelling subscription	2018-03-02 10:16:42 +01:00
tundebabzy	16afa8765e	tiny refactor of invoice setting logic	2018-03-01 17:16:41 +01:00
tundebabzy	9df4f0bd43	fix: apply_discount_on field should be of type Select not Data	2018-03-01 17:12:43 +01:00
tundebabzy	8670c85827	make sure default apply_discount_on is set when creating invoice	2018-03-01 17:11:14 +01:00
tundebabzy	ca5cf35a99	fix: task should explicitly call commit and rollback if error	2018-03-01 17:06:39 +01:00
tundebabzy	36c18c913e	docstrings	2018-03-01 16:44:10 +01:00
tundebabzy	0ec445214c	hook to hourly scheduler	2018-03-01 11:54:32 +01:00
tundebabzy	78fb12663a	fix test	2018-03-01 11:27:48 +01:00
tundebabzy	b91ec79494	update tests and more tweaks	2018-03-01 10:47:00 +01:00
tundebabzy	7eabbd93e1	update start date alone after restarting subscription	2018-03-01 09:09:23 +01:00
tundebabzy	2a11c18383	set initial invoice period based on subscription start	2018-03-01 08:47:38 +01:00
tundebabzy	a93fa16bce	freeze screen while waiting for updates on subscription	2018-03-01 08:45:56 +01:00
tundebabzy	328adedbc8	adds start field to record subscrption start date	2018-03-01 08:45:01 +01:00
Nabin Hait	c10bbd6aa7	Editable unallocated amount in pe (#13130) ... * editable unallocated amount in payment entry to handle multi currency * set unallocated amount on server side * some minor fixes * Fixes in territory patch * removed print * minor fixes	2018-03-01 13:14:14 +05:30
Rohit Waghchaure	855d843e55	[Fix] Sales invoice email prompt not working	2018-03-01 13:06:01 +05:30
Charles-Henri Decultot	bc7a549fdb	Gocardless integration (#13008) ... * GoCardless integration * Addition of a method for determining if the email should be sent or not * Correction for Tests * Codacy fix * Documents moved to ERPNext * Codacy fix * Codacy fixes * Remove method where not necessary and replace with hasattr	2018-03-01 10:59:21 +05:30
tundebabzy	d9fec69a70	update test case, fix bugs	2018-03-01 05:34:02 +01:00
tundebabzy	8f37926ca8	add ability to cancel, restart and refresh subscription	2018-03-01 04:57:23 +01:00
Achilles Rasquinha	646522886c	self.assertEqual	2018-02-28 21:13:51 +05:30
tundebabzy	2cccad0274	more tests and quick fix	2018-02-28 12:45:09 +01:00
tundebabzy	a5bc057ad4	adds missing 'translatability'	2018-02-28 12:24:16 +01:00
tundebabzy	86ee455cbc	more tests and bug fix	2018-02-28 12:21:08 +01:00
tundebabzy	b3d5777e55	more test cases and bug fixes	2018-02-28 12:11:19 +01:00
Achilles Rasquinha	96698c9a77	Use range instead xrange (#13128) ... * Use range instead of xrange * convert float to int	2018-02-28 16:12:51 +05:30
Faris Ansari	72d8509b3d	python 3 fix (#13127)	2018-02-28 12:53:34 +05:30
tundebabzy	3aaf693abd	adds task -process	2018-02-28 05:12:18 +01:00
tundebabzy	95a4ca9429	update test cases	2018-02-27 18:09:06 +01:00
tundebabzy	9bf029a16e	generate new invoice only when current_invoice_end is past	2018-02-27 15:19:02 +01:00
Achilles Rasquinha	11a5f78d3e	Merge pull request #13070 from achillesrasquinha/py3 ... [FIX] sorting multiple compares	2018-02-27 19:48:25 +05:30
tundebabzy	45b6a1719f	refactor: ... - current_invoice _start and end should be determined by trial period or billing period - adds new functions to get billing period data	2018-02-27 15:14:19 +01:00
tundebabzy	c634ca8737	adds validation to billing_interval_count in Subscription Plan	2018-02-27 14:12:39 +01:00
tundebabzy	3c26a7e862	adjusts query so multiple plans can be used to create single invoice	2018-02-27 09:36:29 +01:00
tundebabzy	559d01e176	allows to rename subscription plan	2018-02-27 09:13:35 +01:00
tundebabzy	07313c281a	adds more assertions to test cases	2018-02-27 09:00:13 +01:00
tundebabzy	048bcbf080	more tests and code fixes	2018-02-26 22:17:06 +01:00
tundebabzy	b84e9519c2	Subscriptions doctype - subscriber should be set only once	2018-02-26 20:35:20 +01:00
tundebabzy	1ea5055967	fix another date comparison bug	2018-02-26 20:17:59 +01:00
tundebabzy	4d8175f9d9	adds test cases and fix resulting bugs	2018-02-26 18:56:05 +01:00
tundebabzy	cd700efc0b	only generate invoice after_insert if subscription is not in trial period	2018-02-26 16:26:36 +01:00
tundebabzy	0091c86e80	fix date comparison bug	2018-02-26 16:18:55 +01:00
tundebabzy	08a11b4d1f	sets default for days_until_due to 0	2018-02-26 16:13:45 +01:00
tundebabzy	d3fdcd9da5	set after_insert methods: ... - if subscription is not in trial period, generate sales invoice	2018-02-26 16:10:47 +01:00
tundebabzy	b72aac6729	adds validation: ... - ensure trial period dates are in order	2018-02-26 15:56:47 +01:00
tundebabzy	7a2c6df645	sets Subscription doc status in before_save	2018-02-26 15:55:32 +01:00
tundebabzy	3010996cc5	adds before_insert methods: ... - set current_invoice_start - set current_invoice_end	2018-02-26 15:51:32 +01:00
tundebabzy	35e92c7d29	removes start field from Subscriptions	2018-02-26 15:25:26 +01:00
tundebabzy	6e014331c5	removes end_date from Subscriptions doctype	2018-02-26 14:05:54 +01:00
tundebabzy	2b5298238e	adds prorate field to Subscription Settings	2018-02-26 13:58:29 +01:00
tundebabzy	2dee342501	Subscriptions doctype - trial start and end are set_only_once	2018-02-26 13:34:25 +01:00
tundebabzy	cbe4f5b6b3	changes to subscription settings	2018-02-26 11:22:53 +01:00
tundebabzy	066958a794	subscription_invoice doctype changes	2018-02-26 11:22:05 +01:00
tundebabzy	8457bb2c7e	change in Subscription Settings	2018-02-26 08:13:41 +01:00
tundebabzy	9016890ecf	adds Subscription Settings doctype	2018-02-26 06:15:31 +01:00
tundebabzy	988f5ca38b	hide trial_period_end and invoices if empty	2018-02-26 05:14:10 +01:00
tundebabzy	bbac07d9d2	use naming series for Subscriptions	2018-02-26 05:07:56 +01:00
tundebabzy	dda6234cab	remove subscription name and name by subscriber	2018-02-26 04:52:13 +01:00
tundebabzy	7c455ad4b6	display invoices section field only if there are invoices	2018-02-26 04:50:45 +01:00
tundebabzy	4ca5e81aa3	adds description for billing_interval_count in subscription plan	2018-02-26 04:47:19 +01:00
tundebabzy	4d31255d5c	customer field in Subscriber should be Link	2018-02-26 04:40:53 +01:00
tundebabzy	a07811b67f	adds new doctype - Subscriptions ... - encapsulates subscription - linked to a subscriber - subscription can contain many plans - contains history of generated invoices	2018-02-26 04:25:30 +01:00
tundebabzy	2581e2e5d7	New doctype - Subscription Plan: ... - Plan is to be linked to a Product - Plan will be used to create Invoice items - Subscriber can have multiple plans - Contains billing cycle information	2018-02-24 11:31:42 +01:00
tundebabzy	007919c03f	New doctype - Subscriber: ... - Encapsulates a subscriber to a service or product - Contains subscription specific information	2018-02-24 11:19:06 +01:00
Achilles Rasquinha	a3555aa7bd	[FIX] sorting multiple compares	2018-02-23 17:22:07 +05:30
Nabin Hait	7570774ebe	Merge branch 'master' into develop	2018-02-23 16:49:43 +05:30
Ameya Shenoy	82048cf3ce	verify payment entry amount is positive (#13066) ... * verify payment entry amount is positive * Update sales_invoice.py * Update sales_invoice.py	2018-02-23 16:33:28 +05:30
rohitwaghchaure	4d76269eeb	[Fix] Item wise sales register report (#13055)	2018-02-23 16:25:30 +05:30
rohitwaghchaure	dd0fc1084e	[Fix] PDC amount, PDC print layout issue (#13062)	2018-02-23 16:20:46 +05:30
Nabin Hait	cf72d7f135	Fixed merge conflict	2018-02-22 14:47:26 +05:30
tundebabzy	cad22dbe39	Cutomisable Cash Flow Reports (#12969) ... * add child doctype - Cash Flow Mapping Account * adds new doctype - Cash Flow Mapping * adds new doctype - Cash Flow Mapper * adds new doctype Cash Flow Mapping Template * adds new doctype Cash Flow Mapping Template * adds adjustments to Cash Flow Mapper: - remove fields from Cash Flow Mapping Template Details - update in Cash FLow Mapper * get cash_flow_accouts from Cash Flow Mapping * change `tmp` to `mappers` and make sure `mappers` is sorted by its `position` field * changes description from 'Net Profit/Loss' to 'Profit for the year' * set `net_profit_loss` `parent_account` properly * modify `get_account_type_based_data`: - changed signature such that `account_type` parameter is now `account_name` - where clause in query is now based on `name` * remove zero rows * de-duplicates row, summing similar accounts in the process * makes gl sum calculation use `parent_account` as a condition * add the `section_leader` immediately after adding net profit, sorts `accounts` by `is_working_capital` field * adds `is_working_capital` to "account_types" so that we can use this to determine when to add "Changes in working capital" for operating activities * add "Movement in working capital" subheader * refactor code for readability * adds new fields to `Cash Flow Mapping`: - `is_interest_paid` to allow me recognise accounts for 'Interest Paid' - `is_income_tax_paid` to allow me recognise accounts for 'Income Taxes Paid' * allow `Cash Flow Mapping` to be renamable * adds new field - `section_subtotal` useful for only Operating Activities * changes `Cash Flow Mapping` doctype fields: - remove `is_income_tax`_field - add `is_income_tax_liability` field to identify tax payable accounts - add `is_income_tax_expense` field to identify tax expense accounts in P or L * calculates and shows tax paid adjustment in cash flow statement * renames `is_interest_paid` to `is_finance_cost` * - adds finance costs calculation - correctly sets opening balance dates * prevents users from selecting extra options in Cash Flow Mapping * adds validation to prevent selecting multiple options * adds new fields to Cash Flow Mapping * calculate non cash p or l items (2nd pass) * separates default cash flow generation from custom * adds new setting to Accounts Settings: - allow user elect to use customised cash flow report * clean up * removes mandatory constraint from accounts field * allow rename, disallow create and delete * adds patch to add default Cash Flow Mappers * refactors custom_cashflow * add article to explain configuration * refactor * further refactor * final clean up (hopefully) * clean up for codacy * more codacy fixes * more codacy fixes * fix broken patch * rename article to .md * create default mappers after install * PEP 8 * create the tables in `after_install` call	2018-02-22 11:08:36 +05:30
tundebabzy	27d558c9ef	Optionally allow overlap on Timesheet #12893 (#13018) ... * give user option to ignore time overlap validation * move settings to new Projects Settings * clean up - remove trailing space	2018-02-22 11:05:49 +05:30
tundebabzy	637b242a34	Credit card default account should be debtors #12989 (#13029) ... * allow receivable account type in mode of payment * update `default_account` field description	2018-02-22 10:51:57 +05:30
Shreya Shah	8a77a0e1e4	Add total row in all trends reports (#13010) ... * total in sales order trends report * total in all trends reports	2018-02-21 14:46:07 +05:30
Pawan Mehta	244e235c48	Sales Payment Summary - fix for change amount (#12981) ... * [fix] #12980 * apply change amount to cash	2018-02-20 12:15:10 +05:30
Shreya Shah	f718b0c0df	Currency filter in Pricing Rule (#11776) ... * added currency filter * modified files * pull margin only if currency matches * Renamed price to rate in pricing rule * fetch rate only if currency matches * rebase with develop * rebase with develop * patch to set currency in existing docs * currency field mandatory in pricing rule * modified test cases * rebase with develop * fixed test case	2018-02-20 11:26:46 +05:30
rohitwaghchaure	554f2de23d	Code cleanup online POS (#12985)	2018-02-20 11:18:01 +05:30
tundebabzy	6c5d7986ab	Outstanding Amount not getting updated in Payment Entry #12713 (#12975) ... * allow to `set_missing_ref_details` by force * update payment entry references during submit and cancel	2018-02-19 13:11:56 +05:30
Pawan Mehta	174a18399c	Added Payment Details to Sales Payment Summary Report (#12358) ... * [fix] #12357 * label changes	2018-02-19 12:39:13 +05:30
Shreya Shah	093e7e6e98	Refactor Expense Claim (#12883) ... * patch for custom workflow * deleted field approval_status * replaced approval_status with workflow_state * updated test cases * validation to check expense approver * check if workflow_state_name already exists * fixes * modified notifications.py * removed field exp_approval and modified test cases	2018-02-16 14:49:39 +05:30
Zarrar	441a1e1b8a	Validate Bank name in Setup wizard on the same slide (#12968) ... * validate bank name before moving on to next slide * Update setup_wizard.js	2018-02-16 14:44:42 +05:30
Nabin Hait	b95ecd7fcd	Gstr reports (#12940) ... * GSTR1 for B2B (#12296) * [minor] Modified GSTR1 report to identify missing GST Account in GST Settings (#12426) * [minor] Modified GSTR1 report to identify missing GST Account in GST Settings * Update gstr_1.py * GSTR1 for B2B, B2CL and B2CS (#12459) * [Report] GSTR - 1 CDNR Report (#12554) * [wip] cdnr * [WIP] cdnr with optional data * [wip] Export GSTR-1 * [minor] Minor changes in export * [new] Custom field added for GST * [fix] Minor changes in GSTR1 Report * [minor] Minor changes in gstr1 * [fix] Codacy Fixed * Update setup.py * [wip] Gstr2 * [fix] Fetch correct Tax Details * [minor] ITC data append to row * [fix] CDNR negative value * Cleanup and fixes on GSTR-2 * Minor fixes in gstr reports (#12848) * [new] B2C limit fetch from GST Settings (#12905) * [new] b2c limit fetch from gst setting * [fix] Patch Added for b2c limit * Update gstr_1.py * Update utils.py * Cusotm fields related GSTR2 * minor fixes * minor fixes * some more fixes * Added duplicate patch and some tests as not required on develop	2018-02-16 13:19:04 +05:30
Nabin Hait	cc98d40ff7	Payment reco auto allocation and maintain same order of records (#12963) ... * Automatically allocate amount after selecting invoice against a payment entry * codacy fixes	2018-02-16 13:14:20 +05:30
Vishal Dhayagude	1e0ae07bff	[fix] Validate Party in not present in Party Type (#12910) ... * [fix] Validate Party in not present in Party Type * [fix] Minor Changes * [fix] Valid Customer and Supplier fetch * [WIP] Allow and prevent for creating party * [fix] minor changes * [fix] Requested Changes * [fix] Codacy issue * Update opening_invoice_creation_tool.py	2018-02-16 13:13:37 +05:30
Shreya Shah	3a9eec2e92	Calculate due date in Purchase Invoice on the basis of Supplier invoice date (#12913) ... * pass bill_date as parameter and calculate due_date on that basis * calculate payment_schedule on the basis of bill_date if present else posting_date * add bill_date as an argument to get_party_details * pass bill_date on supplier trigger in purchase invoice	2018-02-16 13:05:21 +05:30
rohitwaghchaure	103c4e9b92	[Fix] Incorrect rate in item-wise sales register (#12943)	2018-02-16 12:57:35 +05:30
Achilles Rasquinha	0bf19a1ac5	Merge pull request #12931 from achillesrasquinha/py3-iteritems ... Py3 iteritems	2018-02-15 13:49:43 +05:30
Achilles Rasquinha	1697a7aa81	replaced string_types with basestring	2018-02-15 11:39:45 +05:30
Achilles Rasquinha	714c7465fb	Updated Python 3 fixes	2018-02-15 11:31:05 +05:30
Nabin Hait	e6d65bc2a1	Fixed translations and tests (#12900) ... * Fixed translations and tests * minor fixes * minor test fixes	2018-02-14 17:44:06 +05:30
Achilles Rasquinha	361366ebe6	Python 3 fixes. (#12916) ... * Fixed iteritems and exceptions * python3-fixes * fixed iteritems	2018-02-14 17:08:59 +05:30
Saurabh	2735701aab	resolved merge conflicts	2018-02-14 11:51:09 +05:30
Achilles Rasquinha	56b2e12af8	Python 3 fixes [merge asap] (#12884) ... * Python 3 fixes * fixed compare	2018-02-13 14:42:40 +05:30
Nabin Hait	e21e59614f	Fixed merge conflict	2018-02-12 15:59:55 +05:30
tundebabzy	c89782502c	Report presentation currency (#12670) ... * Add new Select to filters * get the currencies from database rather than hardcoded * label report columns: - If presentation currency is available in filters, use it or - If company is available in filters, use it or - use default company currency * add new function - get_currency * tweak new function `get_currency` * add new function `convert` to convert a value to another currency * add new function `convert_to_presentation_currency` * clean up `get_currency` first pass * memoise the exchange rates * limit fetched GL entries to to_date * check if account type is p&l or not and use appropriate exchange rate based on that * change EXCHANGE RATE to a dict, use for memoisation * rename EXCHANGE_RATE * cache exchange rates and use them as needed * add docstrings * add presentation currency logic to financial statement reports * move new functions from `general_ledger.py` to new module * clean up * PEP 8 clean up * move function to util.py * PEP 8 clean up * remove presentation currency option from cashflow * adjust currency as needed * allow users to save presentation currency in Accounts Settings * add new function `get_presentation_currency_list` * refactor query_report modules with no promises * Revert "allow users to save presentation currency in Accounts Settings" This reverts commit 3b58a6296cf3f7b4d80ac55b03f9d5d4887b796b. * show print page in correct currency * Update utils.py	2018-02-12 15:04:50 +05:30
joezsweet	f9cb7ea611	removed extra spaces	2018-02-12 10:05:59 +01:00
rohitwaghchaure	6e7e70c977	Added PDC from journal entry in AR report (#12844)	2018-02-12 11:55:07 +05:30
Ameya Shenoy	5c33a04043	Shareholder and related doctypes (#12215) ... * Added doctypes related to shares - Shareholder doctype, the entity who does the transaction - Share doctype, a child table to kepp list of all shares - Share Transfer doctype, Logs of all made transactions * Added logic for share transfer - update shareholder automatically on share transfer/issue/purchase - purchase and transfer have method remove_share which doesn't get executed because of some bug * Added report view for share ledger * Removed share number tracking - removed share number tracking from Share Ledger child table for Shareholder doctype - new doctype Share Type created * Share Balance report added - math behind Share Balance report needs fixing * Changes in shareholder - Share numbers are not tracked in Shareholder - Share Ledger doctype deleted - Share Balance Report bug fixed * Shareholder - fixed report for share balance - remove bug from share transfer by making share type mandatory - added buttons to shareholder for direct link to report * Added tests for Share Transfer * minor codacy fixes * Added Shareholder to Party Type * rate in share ledger & balance report is currency * First attempt at modelling shares after Item * Share Manager changes - on creation of shareholder party it should check if the same combo exists - in shareholder party make report button visible iff folio no exists - create folio no on creation of share transfer iff it doesnt already exist - move reports from shareholder to shareholder party * Shareholder chages - delete share child table doctype - autoname added to folio no - modify tests for share transfer * minor changes * removed share_no child doctype * Restructured Share Transfer Logic (not tested) - Everything revolves around Share Balance child table in Shareholder Party - is_company flag still to be utilized * Tested Share Tranfer * minor fixes * started new shareholder structure * modified shareholder * renamed Shareholder Party to Shareholder * Shareholder rewrite complete * new tests for shareholder written * codacy fixes * Added documentation	2018-02-12 11:32:47 +05:30
rohitwaghchaure	7477899d2e	Formatter, code cleanup (#12852)	2018-02-12 11:25:58 +05:30
rohitwaghchaure	7e75165826	Merge branch 'develop' into fixes_12829	2018-02-09 12:01:41 +05:30
pawan	83b1b802d1	print hide and pos.less changes	2018-02-08 19:56:12 +05:30
pawan	33571dc567	print hide changes	2018-02-08 19:35:48 +05:30
pawan	31d37f110a	print hide changes	2018-02-08 19:25:30 +05:30
Pawan Mehta	e2bc8bb644	Update sales_invoice.json	2018-02-08 16:35:03 +05:30
pawan	735b8c6094	[fix] #12829	2018-02-08 16:20:46 +05:30
Saurabh	ab8c7e616e	resolved merge conflicts	2018-02-08 15:17:15 +05:30
Saurabh	1a4d77a962	Fixes #12810 for Offline POS	2018-02-08 01:32:48 +05:30
rohitwaghchaure	b553b7a69d	PDC Enhancements (#12462)	2018-02-07 18:32:51 +05:30
Nabin Hait	c224d34a2c	Merge branch 'master' into develop	2018-02-07 16:07:20 +05:30
Nabin Hait	33f967d97c	Account name length fixed in HUngary and Germen COA	2018-02-07 16:00:42 +05:30
Nabin Hait	4b1bd15f7e	Draft status in pos print format	2018-02-07 12:40:45 +05:30
rohitwaghchaure	9a5037193f	Removed DR/CR from balance column (#12791) ... * Removed DR/CR from balance column * Update general_ledger.html * Update general_ledger.py	2018-02-07 12:10:14 +05:30
Saurabh	50f7e29814	[New] Added Draft status in POS Invoice print formats if a Draft POS Invoice is printed	2018-02-06 00:23:21 +05:30
joezsweet	a8d5ef4891	space to tabs	2018-02-05 13:06:30 +01:00
rohitwaghchaure	a4c40e0fd6	[Fix] After accesing POS page, it does not work when going back from another page (#12763)	2018-02-05 12:24:06 +05:30
Nabin Hait	2ef1f84041	Fixed merge conflict	2018-02-03 09:14:53 +05:30
Helkyd	5e93b02c85	Update trial_balance.py ... Assuming that Account_number has NUMBERs will sort.	2018-02-02 12:27:30 +00:00
rohitwaghchaure	cf6360d825	Merge pull request #12739 from jay-parikh/hotfix ... Enable/Disable Discount in POS using POS Profile #11748	2018-02-02 13:12:38 +05:30
Helkyd	b258686b00	Update trial_balance.py ... Fix to order only if account starts with Number ... while for others not required....	2018-02-01 15:53:30 +00:00
Nabin Hait	cae13bf048	Fixes in purchase register report (#12737)	2018-02-01 18:58:14 +05:30
Jay Parikh	d4359faa31	Enable/Disable Discount in POS using POS Profile #11748	2018-02-01 04:26:24 -08:00
rohitwaghchaure	441032d39c	Merge branch 'develop' into develop	2018-02-01 16:54:10 +05:30
Nabin Hait	ec2c9ec897	Merge branch 'master' into develop	2018-01-31 15:39:16 +05:30
Nabin Hait	7918b92d95	Invalid date value comparison, fixes for mariadb 10.2.3+	2018-01-31 15:30:03 +05:30
Nabin Hait	585254456e	Check credit limit while making DN, if bypassed on SO (#12702)	2018-01-30 12:11:22 +05:30
rohitwaghchaure	ce5b93ca77	[Fix] Allow user to edit rate in online POS (#12701)	2018-01-30 10:39:46 +05:30
Helkyd	d6a61ad0c3	Trial Balance sort by Account Name ... Trial Balance order by Account Name Used Sorted under Prepare_data Function.	2018-01-29 13:47:12 +00:00
Saurabh	59c915f599	Merge branch 'master' into develop	2018-01-29 18:53:54 +05:30
Shreya Shah	406d449e12	fix posting date in journal entry on load (#12694)	2018-01-29 18:01:20 +05:30
Saurabh	d581ff40ea	Merge branch 'master' into develop	2018-01-29 17:42:37 +05:30
rohitwaghchaure	86c7ede321	Merge pull request #12690 from rohitwaghchaure/subscription_sent_email_issue ... [Fix] Subscription send notification issue	2018-01-29 17:01:00 +05:30
Rohit Waghchaure	7e033aae11	[Fix] Subscription send notification issue	2018-01-29 16:53:37 +05:30
Nabin Hait	1e1b2364ab	Optimization: don't update outstanding amount while cancelling payment entry for advance adjustment (#12689)	2018-01-29 16:45:43 +05:30
Cesar	58c040cffb	Revert "Sort by account name" ... This reverts commit 5cf01d9702.	2018-01-29 11:57:15 +01:00
Saurabh	03f6b3e588	resolved merge conflicts	2018-01-29 16:25:33 +05:30
Cesar	5cf01d9702	Sort by account name ... Trial balance not sorted .. by adding those changes fixes the problem.	2018-01-29 11:54:12 +01:00
Nabin Hait	cfa9d1adb7	Patch: Create Payment Terms based on default credit days set in company and use it while setting due_date (#12685) ... * Patch: Create Payment Terms based on default credit days set in company and use it while setting due_date * Payment Terms patch for credit days defined in customer group	2018-01-29 16:07:21 +05:30
rohitwaghchaure	d36ac27f94	Update accounts_receivable.py	2018-01-29 12:35:19 +05:30
rohitwaghchaure	62b31bf708	Update accounts_receivable.py	2018-01-29 12:34:19 +05:30
Aditya Duggal	2136a7bded	Resolves Issue #12630 -Added Filters to AR ... - Added Territory Filter to AR report - Added Sales partner filter - Added Sales person filter -Terrtory filter is needed since if you need to see AR in North Inda you get with filter not with column -Similarly there was a need for Sales Partner and sales person filter in the AR report which is being fulfilled now.	2018-01-24 18:16:08 +05:30
Saurabh	fb2f97391f	resolved merge conflicts	2018-01-24 11:24:10 +05:30
Saurabh	6cc10104f0	[fix] enable rename for payment terms and payment term template	2018-01-24 11:15:02 +05:30
Saurabh	3a609108ae	Codacy changes	2018-01-23 17:23:26 +05:30
Saurabh	32695a938f	[Mod] Refactored the code for fetching allow_print_before_pay check value	2018-01-23 17:23:26 +05:30
Saurabh	3959aeb848	[fix] parse value before setting it to dissable_rounded_total on Purchase Invoice	2018-01-23 15:40:43 +05:30
britlog	ddd2bc9aac	Translate payment request subject	2018-01-22 23:23:31 +01:00
Saurabh	ef31637549	Merge branch 'master' into develop	2018-01-22 15:29:15 +05:30
Saurabh	e72915847c	Merge pull request #12570 from rohitwaghchaure/currency_in_balance_column ... Added currency in balance column in general ledger print	2018-01-22 16:35:37 +07:00
Rohit Waghchaure	bc94914338	[Fix] Sales payment summary issue	2018-01-20 17:01:31 +05:30
Rohit Waghchaure	edef642794	Added currency in balance column in general ledger print	2018-01-20 12:54:25 +05:30
Zlash65	93344dff26	group_by_account not displayed fix	2018-01-19 19:06:39 +05:30
Rohit Waghchaure	c987500e08	Merge branch 'master' into develop	2018-01-19 13:29:57 +05:30
Rohit Waghchaure	de420322b5	[Fix] Sales payment summary issue	2018-01-18 17:20:21 +05:30
rohitwaghchaure	bd47abdc9a	[Enhance] Running Balance in GL Report (#12491) ... * Running Balance in GL Report * Supplier invoice no in GL Report/Print Format	2018-01-18 09:32:43 +05:30
Nabin Hait	f1b098e03c	payment terms filter in AR Summary report (#12529)	2018-01-18 09:23:32 +05:30
Nabin Hait	570e29d5e7	Fixed merge conflict	2018-01-17 18:56:02 +05:30
Nabin Hait	91fd29a963	Remove enqueuing update_total_sales method, sometimes it does not include current invoice (#12522)	2018-01-17 16:14:31 +05:30
rohitwaghchaure	60febc5465	[Fix] Gross profit validation issue (#12516)	2018-01-17 14:40:59 +05:30
Nabin Hait	2bfa1803e9	GL Entry on asset sale (#12514) ... * GL Entry on asset sale * Asset sale test case fixed	2018-01-17 14:39:05 +05:30
Saurabh	4b0dd8a159	Merge branch 'master' into develop	2018-01-15 18:36:35 +05:30
Faris Ansari	f18cd2eaf7	[fix] is_root check	2018-01-15 18:30:01 +05:30
Saurabh	35d8ce4fbd	resolved merge conflicts	2018-01-12 16:58:32 +05:30
rohitwaghchaure	7b78f6bee6	Added rounded total in the POS and fix rounded issue in js side (#12457)	2018-01-12 16:28:16 +05:30
tundebabzy	df023bff7f	add posting_date/transaction_date to list_view (#12453)	2018-01-12 16:27:29 +05:30
rohitwaghchaure	9fbed5617f	[Fix] Wrong batch showing in the popup (#12421)	2018-01-12 16:22:33 +05:30
rohitwaghchaure	02302ff009	[Fix] Incoming rate for gross profit report (#12422)	2018-01-11 12:58:46 +05:30
tundebabzy	76dddbf26e	Merge branch 'develop' into multi-barcode	2018-01-10 21:49:27 +01:00
Nabin Hait	619c42b934	GSTR1 for B2B (#12296)	2018-01-10 17:48:03 +05:30
Nabin Hait	6b89644ca7	Payment terms filter in AR report	2018-01-09 15:39:35 +05:30
Saurabh	892a7a6980	resolved merge conflicts	2018-01-09 12:05:20 +05:30
Zarrar	0f458b1260	show balance if permitted to view gl entry (#12385)	2018-01-09 11:27:14 +05:30
tundebabzy	da22167741	Purchase Invoice - Due Date reverts to first time value on save #12340 (#12382) ... * add handler for due_date: if due_date is changed and payment terms template or payment schedule is set, ask user to clear them. * ui test cases * cleanup	2018-01-09 10:58:44 +05:30
Pawan Mehta	5b069a4e25	Added Payment Details to Sales Payment Summary Report (#12358) ... * [fix] #12357 * label changes	2018-01-09 10:53:13 +05:30
rohitwaghchaure	bf4c114c58	[Enhance] Provision to show inclusive tax in print (#12345) ... * [Enhance] Provision to show inclusive tax in print * POS Print format	2018-01-08 15:20:15 +05:30
Zlash65	745c2658eb	delete root node allow	2018-01-08 11:53:52 +05:30
ci2014	5d3e486415	Fix english typo in source code ... Fix english typo in source code	2018-01-06 04:04:06 +01:00
Nabin Hait	07e5376043	Fixes and cleanups of reserve qty for subcontracting	2018-01-05 18:19:59 +05:30
Saurabh	eac2e369cf	[fix] setup alias for ifnull condition (#12327)	2018-01-05 12:48:08 +05:30
rohitwaghchaure	bc2c83ee3c	Companywise default tax template (#12290) ... * Companywise default tax template * Fix test cases	2018-01-05 12:42:02 +05:30
rohitwaghchaure	c5c6f82623	[Hotfix] Tax rate not showing in the report (#12324)	2018-01-05 12:16:16 +05:30
Nabin Hait	42688f0636	Minor fix	2018-01-04 18:12:21 +05:30
Nabin Hait	76625b359e	Removed naming series from set_only_once in pos profile	2018-01-03 14:03:53 +05:30
Nabin Hait	96b264b314	Minor fixes	2018-01-02 11:50:29 +05:30
Saurabh	2ac1835f7d	[fix] if is_root is true make parent account empty (#12255)	2018-01-01 16:17:43 +05:30
Saurabh	a6b41e855b	[fix] check if null for mode of payments (#12264)	2018-01-01 16:16:50 +05:30
rohitwaghchaure	2640c7eec5	[Fix] Validation issue for online POS profile (#12276)	2018-01-01 16:15:41 +05:30
rohitwaghchaure	fe22686a8f	Update last purchase rate from the purchase invoice (#12189)	2017-12-28 16:11:27 +05:30
rohitwaghchaure	dbb5ae9a9e	[fix] Closing balance showing at wrong side (#12220)	2017-12-28 13:15:21 +05:30
Nabin Hait	123759aff7	Fixes for travis (#12161) ... * Fixes for travis * Testcase fixes for get_item_details * Testcase fixes for get_item_details * Travis fixes * Travis fixes	2017-12-26 17:50:34 +05:30
Nabin Hait	ed13b3c19a	Fixed minor issue	2017-12-25 15:11:56 +05:30
Nabin Hait	92615901a7	Fixed merge conflict	2017-12-25 13:41:04 +05:30
Nabin Hait	e9dabd5cec	Settings to show payment schedule in print (#12158)	2017-12-25 13:30:01 +05:30
Prateeksha Singh	b61d091f4c	[setup] remove sample data commit, fix namespace	2017-12-25 12:30:35 +05:30
rohitwaghchaure	75789b65c2	[Fix] Sales payment summary report (#12151)	2017-12-25 11:26:15 +05:30
rohitwaghchaure	443691aaf8	[Fix] Allow to change exchange rate in the payment entry if allow stale is enabled (#12128)	2017-12-22 10:59:01 +05:30
tunde	e3104938ff	fix typo	2017-12-21 16:25:44 +01:00
Nabin Hait	a5cc84f8af	Reverted gl entry splitting based on payment terms (#12117) ... * Reverted gl entry splitting based on payment terms * changed modified date	2017-12-21 11:37:18 +05:30
Nabin Hait	2f9f4f9c01	Multiple fixes related to payment terms (#12115)	2017-12-20 12:24:59 +05:30
Manas Solanki	8413f76c19	set the mandatory field in the backend (#12102)	2017-12-20 12:03:19 +05:30
tundebabzy	dbd068c44b	Sales Order With Payment Terms Not Split In Payment Entry #12051 (#12065) ... * validate schedule dates in non-invoice documents * change query for orders * take care of orders with/without payment schedule * clean up, refactor, PEP8	2017-12-19 14:36:39 +05:30
tundebabzy	90076bc3b5	Make Journal entry from Invoice based on Payment Terms (due date) #11989 (#12047) ... * split journal entry according to invoice due date * fix bug where reference_due_dates options are not populated: - after making JE, add options to _onload - use __onload to add options * cater for case where no payment_schedule	2017-12-19 11:58:31 +05:30
Vishal Dhayagude	7c57b6ecd8	[fix] Column Heading in received item to be billed report (#12083)	2017-12-19 11:23:34 +05:30
rohitwaghchaure	e3b5c0f727	[fix] Regional print format showing for other countries users (#12045)	2017-12-16 10:53:53 +05:30
rohitwaghchaure	938a1fee80	[minor] Tax id of supplier not fetching in purchase invoice (#12052)	2017-12-16 10:51:07 +05:30
Nabin Hait	2a9dc9019a	Fixed closing debit/credit in general ledger report	2017-12-15 19:41:20 +05:30
Nabin Hait	2afcff1852	Get outstanding invoices on payment entry	2017-12-15 17:32:03 +05:30
Nabin Hait	6a640b78c4	Minor fixes in payroll entry and opening invoice tool	2017-12-15 15:34:14 +05:30
Nabin Hait	9771b9376d	Merge branch 'master' into develop	2017-12-15 12:53:56 +05:30
tundebabzy	1d459c4327	Make Journal entry from Invoice based on Payment Terms (due date) #11989 (#12019) ... * don"t summarise due_dates query * reference_due_date to fetch outstanding based on due date * use if else so that no need to do useless checks * clear debit and credit fields before fetching outstanding * grid keeps forgetting drop down so add to options * clear debit and credit fields before fetching outstanding properly	2017-12-15 11:29:27 +05:30
Pawan Mehta	d6cb617520	Fix 11948 - Sales Payment Summary (#11950) ... * [fix] #11948 * [fix] #11948 * [fix] #11948 * codacy issues	2017-12-14 18:04:31 +05:30
Nabin Hait	d0249b0880	Employee advance (#11875) ... * Employee Advances against Expense Claim * added employee advance test cases and docs * Default Employee Advance Account field in company * Cleanup and fixes of employee advance	2017-12-14 13:25:57 +05:30
Shreya Shah	a2cfd97cd7	fetch party name (#11985)	2017-12-14 12:42:01 +05:30
rohitwaghchaure	5759258dcf	[fix] Added total closing in general ledger (#11961)	2017-12-13 18:57:37 +05:30
Charles-Henri Decultot	d18423d9c7	Project Margin Calculation Improvement (#11911) ... * Project Margin Calculation Improvement * Documentation modification * Change Total Planned Sales to Total Sales Amount * Change documentation screenshot	2017-12-12 14:59:59 +05:30
rohitwaghchaure	4e17fae63b	[enhance] UAE/KSA VAT/Excise implementation (#11923)	2017-12-12 14:40:52 +05:30
Shreya Shah	ea723e59c6	POS Profile validation message rephrased (#11934) ... * pos validation message improvised * removed unused field	2017-12-12 14:24:00 +05:30
tundebabzy	f628184c68	Error in Opening Invoice creation Tool (#11938) (#11941) ... * add qty field * cast qty to float * PEP8 compliance	2017-12-12 14:19:07 +05:30
pawan	1892454036	Add Total Row	2017-12-11 17:48:56 +05:30
Giovanni	2a098ada7c	- bug fix	2017-12-10 20:33:20 +01:00
Giovanni	2144e02d3c	- Added multiple barcode feature per item	2017-12-10 17:27:09 +01:00
Zarrar	17fd6610dc	Fix travis (#11882) ... * fieldname wrong * bifurcated test into two - error when both were running async * minor fixes with link and route * move school domain rename up * fix async creation of operations test * edit-in-full-page is button, not link * set_route issue in production order test * minor changes * fix task tree test * more fixes * fix server side issue * improvising ui tests	2017-12-08 14:57:38 +05:30
Vishal Dhayagude	6d250f8789	[fix] Missing value Net Weight Added in Calculate Based On select field (#11883)	2017-12-08 11:35:18 +05:30
Nabin Hait	5de499e5d5	Minor cleanups	2017-12-07 12:01:06 +05:30
pawan	271b7cd4f9	codacy issues	2017-12-07 12:01:00 +05:30
pawan	19f09b0b69	fix codacy issues	2017-12-07 12:00:06 +05:30
pawan	d8e91982ca	Fixed Merge conflict	2017-12-07 12:00:01 +05:30
Nabin Hait	97b8a7b237	Minor fixes in payroll entry	2017-12-06 19:55:57 +05:30
Nabin Hait	c84476bd27	Fixed merge conflict	2017-12-06 14:17:51 +05:30
Manas Solanki	a160879159	set the reference document in the payment entry while creating from fees (#11861) ... * set the reference document in the payment entry while creating from fees * allocate the paid amount in the reference document	2017-12-06 14:05:39 +05:30
tundebabzy	6a418f2a9b	change Purchase Taxes and Charges default to 'Total' (#11857)	2017-12-06 13:15:33 +05:30
rohitwaghchaure	d52c64ff11	[fix] Show total for opening and closing dr/cr (#11860)	2017-12-06 13:14:28 +05:30
rohitwaghchaure	3a5ca927e7	[Fix] Asset depreciations and balances report showing wrong accumulated depreciation amount if multiple asset against same asset category (#11848) ... * [Fix] Asset depreciations and balances report showing wrong accumulated depreciation amount if multiple asset against same asset category * Update asset_depreciations_and_balances.py	2017-12-04 19:29:03 +05:30
Nabin Hait	a11dcb6e59	Pull items in Stock Entry from Purchase Invoice (#11839)	2017-12-04 13:36:50 +05:30
tundebabzy	1fb285c165	hide html example in print (#11830)	2017-12-04 11:13:36 +05:30
Shreya Shah	11938a47ec	fixed typo (#11825)	2017-12-01 17:38:26 +05:30
Nabin Hait	7a294e6ef5	Update asset_category.json	2017-11-30 18:02:22 +05:30
Nabin Hait	5e801955f1	Update asset_category.json	2017-11-30 18:01:56 +05:30
Saurabh	34a0e90115	[fix] merge conflicts	2017-11-30 16:45:01 +05:30
Faris Ansari	ec3be9eebf	[hotfix] Party Type name (#11797)	2017-11-30 15:53:39 +05:30
Nabin Hait	e761b9de40	Rearranged fields due to merge conflict messup	2017-11-30 14:29:10 +05:30
Rohit Waghchaure	17e03cf3fc	[minor] Removed hidden for field pos profile	2017-11-29 17:40:42 +05:30
Vishal Dhayagude	855e390265	[fix] Sales Invoice json conflict (#11779)	2017-11-29 16:25:24 +05:30
Vishal Dhayagude	d42242df22	[Feature] Shipping Rule Calculation based on Net Weight (#11770) ... * [new] Calculate shipping tax based on weight * [fix] Change field name weight to weight_per_unit in SI Item * [new] Shipping Rule based tax for selling module * [new] Shipping rule based on weight added to Buying module * [fix] Conflict in jsons * [fix] Removed Redudant add_fetch * [fix] Codacy fixed * [fix] Print hide added	2017-11-29 16:09:59 +05:30
rohitwaghchaure	f591a220c9	Fetch items of item groups defined in the pos profile (#11763)	2017-11-29 13:55:13 +05:30
Nabin Hait	cf9573ab2f	Removed asset doctypes files from accounts module and patches	2017-11-28 16:56:53 +05:30
rohitwaghchaure	c037dc775e	Refactor multi pos profile selection in the pos invoice (#11721)	2017-11-28 16:11:15 +05:30
Kanchan Chauhan	e58a41a8a2	Added maintenance to Asset and enhanced maintenance for Asset Maintenance	2017-11-28 15:14:56 +05:30
Saurabh	b750b304dd	fixed merge-conflicts	2017-11-28 11:02:28 +05:30
Saurabh	ab5e77ecf1	[fix] do not pull disabled pos profiles (#11733)	2017-11-27 11:26:13 +05:30
Nabin Hait	57952f6946	Merge branch 'develop' into feature_10861	2017-11-23 16:12:55 +05:30
Nabin Hait	82027ea3bf	Set print hide property for payment terms	2017-11-23 12:49:42 +05:30
Helkyd	0195528798	Merge branch 'develop' of https://github.com/Helkyd/erpnext-1 into develop	2017-11-22 14:51:18 +01:00
Helkyd	2b6bf82d61	Default Payment Mode ... POS drafted, user retrieves the record and sets the default payment mode so that Zero payment is not done.	2017-11-22 14:49:51 +01:00
Saurabh	ed4191ec5b	[fix] merge-conflicts	2017-11-22 18:01:56 +05:30
Nabin Hait	96abfd2ab9	[fix] In payment entry, run some events serially to avoid async issue	2017-11-22 15:13:16 +05:30
Nabin Hait	32a62a02df	Fixed merge conflict	2017-11-21 20:18:03 +05:30
Nabin Hait	0551f7bb00	Cleanup and fixes of payment terms feature	2017-11-21 19:58:16 +05:30
rohitwaghchaure	179e0c1d8d	Added party name in accounts receivable/payable report (#11656)	2017-11-20 11:18:55 +05:30
Rohit Waghchaure	77940493a8	[fix] Price list not loaded from pos profile, auto set outstanding amount in the mode of payment	2017-11-18 19:06:31 +05:30
Zarrar	1b4894c33a	make root_type null if not root (#11626)	2017-11-17 14:32:12 +05:30
Rushabh Mehta	30dc9a14c6	[feature] [refactor] Shipping Rule for Buying + Refactor (#11628) ... * Shipping rule for Buying * [refactor] shipping rule	2017-11-17 14:31:09 +05:30
Saurabh	66e65dc104	[fix] merge-conflicts	2017-11-17 14:03:13 +05:30
Rohit Waghchaure	44f7b157ff	[fix] POS redirect issue	2017-11-17 13:52:11 +05:30
Nabin Hait	7fa111de45	Update sales_invoice.py	2017-11-17 12:55:08 +05:30
Nabin Hait	6b70906deb	Update purchase_invoice.py	2017-11-17 12:54:32 +05:30
Nabin Hait	1c4653ed97	Merge branch 'develop' into payment-terms	2017-11-17 12:41:56 +05:30
Nabin Hait	877e1bb377	Post GL Entry based on rounded total in Sales/Purchase Invoice (#11542)	2017-11-17 12:27:43 +05:30
Nabin Hait	1749b7c16b	Minor fixes related to account renaming and deletion	2017-11-16 17:49:54 +05:30
Nabin Hait	46be9896a9	Account number in chart of accounts (#10551) ... * Account number in chart of accounts * Include account number while renaming account * Test case fixed * Standard coa with and without numbers * Standard coa with and without numbers	2017-11-16 16:51:55 +05:30
augustinfotech	135a54ca93	Allow print before pay in POS (#11590)	2017-11-16 15:28:42 +05:30
Manas Solanki	eb3982044b	convert html into text in the taxes description as it can break the reports (#11603)	2017-11-16 14:11:39 +05:30
Pawan Mehta	bda07c6db4	Added Warehouse, Cost Center, Owner filters to Sales Register (#11600) ... * [fix] #3668 * fix codacy space issue	2017-11-16 14:09:17 +05:30
rohitwaghchaure	21cbbae88f	[fix] Payment reconcillation showing linked journal entries (#11611)	2017-11-16 14:05:57 +05:30
ashish	f67372cfb3	removed logic from delivery note for checking bypass credit limit flag	2017-11-16 10:58:25 +05:30
ashish	62155fa0e5	Merge branch 'feature_10861' of https://github.com/ashish-greycube/erpnext into feature_10861	2017-11-16 10:47:44 +05:30
Rushabh Mehta	d3f5d0961a	[feature] Opening Invoice Creation Tool (#11589) ... * [enhance] Opening Invoice Tool create Opening Sales/Purchase Invoices * [minor] added progress bar while creating invoice * [minor] allow bulk upload for the invoices * [minor] calculate item rate from net total * [minor] added defaults for invoices fields, create gl entries only if grand_total is greater than 0 * [minor] check mandatory values before making opening invoices * [minor] enable primary button if there is any error while creating invoices * [minor] minor fixes, set company currency as invoice currency added tests * [dashboard] added Opening Invoice Summery section in Dashboard * [minor] added total invoices count on dashboard * [minor] don't show dashboard if there are no opening invoices available * [minor] added Opening Invoice Tools to Account's Tools section * [minor] codecy fixes * [fix] refactored general ledger and buttons on charts * [fix] tests	2017-11-15 16:29:53 +05:30
Zarrar	24b8aa2e80	set field dependent on link field fix (#11580)	2017-11-15 14:27:00 +05:30
Nabin Hait	6fd163bc55	Merge branch 'master' into develop	2017-11-15 14:08:17 +05:30
Umair Sayed	3a9ca883b9	Update party.py (#11584)	2017-11-15 13:44:04 +05:30
Shreya Shah	be690ef817	Rate with margin in customer and company currency (#11437) ... * field for company margin * added base_rate_with_margin * calculate company margin * test for item price * test for delivery note * test for sales order * test for quotation * test for sales invoice	2017-11-14 17:22:41 +05:30
Nabin Hait	cd13a28417	Get items from quotation in sales invoice	2017-11-14 17:13:53 +05:30
AravindPranera	0ebd3c373c	Getting Quotation Document in Sales Invoice	2017-11-14 17:13:53 +05:30
tunde	ffa659fd2c	Merge branch 'develop' into payment-terms	2017-11-14 09:59:45 +01:00
Nabin Hait	ec8a0a22d7	Merge branch 'master' into develop	2017-11-13 15:10:17 +05:30
Nabin Hait	6605919ecd	GL Entries on sale of an asset (#11538)	2017-11-13 15:06:35 +05:30
Nabin Hait	deeb1380b1	Ignore paid credit note in outstanding invoices in Payment Entry (#11534)	2017-11-13 13:52:05 +05:30
Saurabh	0f86d86e27	[fix] validate party account (#11517)	2017-11-10 19:21:09 +05:30
Prateeksha Singh	17b7209032	remove erroneous column breaks (#11522)	2017-11-10 18:54:03 +05:30
Prateeksha Singh	731b66b788	remove erroneous column breaks (#11523)	2017-11-10 18:53:52 +05:30
Rushabh Mehta	4313326ba0	[fix] treeview for tasks (#11515) ... [fix] treeview for tasks	2017-11-10 18:52:21 +05:30
Saurabh	7ab28ec562	[fix] give preference to gateway selected on shopping cart settings (#11393)	2017-11-10 11:17:01 +05:30
Nabin Hait	15753074bf	Nestedset model fixes for changing parent and renaming (#11467)	2017-11-10 11:12:43 +05:30
Nabin Hait	ff73646212	Made POS Profile mandatory and changed test order	2017-11-08 14:34:38 +05:30
Saurabh	98aa544f25	Merge branch 'master' into staging	2017-11-08 12:18:50 +05:30
Saurabh	f41b13b736	[fix] merge-conflicts	2017-11-08 12:18:41 +05:30
Sushant Nadkar	72c40f0383	Enabled track seen for Sales Order, Sales Invoice, Production Order, and Delivery Note (#11440)	2017-11-08 11:35:46 +05:30
rohitwaghchaure	f688af3809	[fix] Offline pos name is not defined issue in the POS (#11469)	2017-11-08 11:33:39 +05:30
Rohit Waghchaure	35fc45eff9	[fix] POS Profile test cases	2017-11-07 10:43:16 +05:30
Nabin Hait	e552a51266	Minor cleanups	2017-11-06 17:39:31 +05:30
pawan	436f7b980c	codacy issues	2017-11-06 17:39:31 +05:30
pawan	438dfc081b	fix codacy issues	2017-11-06 17:39:30 +05:30
pawan	d59225635d	remove old report	2017-11-06 17:39:30 +05:30
pawan	b699b86b76	Add Total Row	2017-11-06 17:39:30 +05:30
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