1553 Commits

Author	SHA1	Message	Date
marination	1e754b161c	fix: Fetching catched meta and removed description fetch from Search Fields ... Description is conditionally fetched and also used in WHERE clause, that is maintained. Improved naming	2019-10-30 18:33:44 +05:30
marination	3dbef9de74	fix: Search field entries included in Item Link field query	2019-10-28 15:48:10 +05:30
rohitwaghchaure	5d0362669d	Merge pull request #19386 from rohitwaghchaure/while_making_return_entry_not_able_to_select_null_batch ... fix: not able to select the zero qty batch while making the sales ret…	2019-10-23 18:35:58 +05:30
Rohit Waghchaure	d8ddd1e2ec	fix: not able to select the zero qty batch while making the sales return entry	2019-10-22 14:05:13 +05:30
Deepesh Garg	fbae893f07	Merge pull request #19306 from nabinhait/required_date_fix ... fix: Always set required date based on min date on item table	2019-10-21 15:25:23 +05:30
Nabin Hait	dd893254be	Update buying_controller.py	2019-10-21 13:40:00 +05:30
Nabin Hait	49a46f08de	fix: Set gross profit in SO item on updating rate after submission (#19311)	2019-10-21 13:35:43 +05:30
Nabin Hait	a113861b0c	fix: Always set required date based on min date on item table	2019-10-15 12:43:27 +05:30
Mangesh-Khairnar	4ed9b45fb8	feat(Sales Order): Allow to skip delivery note creation (#19222) ... * feat(sales-order): add option to skip delivery note creation for order type maintenance * fix(sales-order): hide delivery date on setting skip delivery note creation * fix: allow skipping delivery note for all order types * fix: bypass delivery note creation on setting skip delivery note creation * fix: show skip delivery note in list view * fix: check for duplicate project name after submitting prompt * fix: toggle delivery note reqd for skip delivery note * fix: update status based on skip delivery note	2019-10-12 19:33:11 +05:30
rohitwaghchaure	285344eb0e	fix: over-bill error while making debit note against purchase return e… (#19270) ... * fix: overbill error while making debit note against purchase return entry * Update accounts_controller.py	2019-10-11 11:02:11 +05:30
Marica	f067447d9c	fix: Margin and Discount percentage set correctly via 'Update Items' (#19276)	2019-10-11 10:47:09 +05:30
Faris Ansari	38ac7f7350	Enhancements to Supplier Portal (#19221) ... * fix: Add Purchase Order to portal * fix: Create Customer or Supplier on first login Based on default role set in Portal Settings, a Customer or Supplier will be created when the user logs in for the first time. * fix: Styling for transaction_row * fix: Styling for RFQ page * fix: Add Purchase Invoice route - Make Purchase Invoice from PO * fix: minor - Admissions for Student role - Remove print statement	2019-10-09 11:41:33 +05:30
Anurag Mishra	fe5890b828	fix: Query Condition On Billing date filters	2019-10-07 14:27:07 +05:30
Deepesh Garg	d138633c5b	Merge pull request #19163 from thefalconx33/small-fixes ... fix: Supplier field not getting populated in serial no on creation of asset	2019-09-25 22:09:41 +05:30
Marica	23d7b09389	fix: Item Rate within Update Items in Sales order (#19172) ... Blocked negative discount percentage, which affected the item rate every time Update Items action was taken	2019-09-25 17:17:36 +05:30
Rucha Mahabal	c6b548b5b2	fix(Stock): item variant description (#19134)	2019-09-24 19:17:13 +05:30
thefalconx33	c15cc8fc28	fix: #18624	2019-09-24 18:49:16 +05:30
Marica	bac4b93639	fix: Displaying manufacturer part no along with manufacturer and added Manufacturers validation in Item master (#19066) ... Manufacturer Link field options in Items Table of transactions will also display manufacturer part no. Manufacturers table in Item master will check for duplicate entries.	2019-09-16 19:44:28 +05:30
Mangesh-Khairnar	7bcb24efbf	fix(purchase-invoice): Update paid amount on creation of debit note (#18830) ... * fix(purchase-invoice): set paid amount for purchase return * fix(purchase-invoice): remove payment schedule on creation of debit note	2019-09-11 10:49:33 +05:30
rohitwaghchaure	358a01a226	fix: Quotation Trends report not working for filter group by customer (#18989)	2019-09-10 19:18:30 +05:30
Nabin Hait	88e8688a4b	fix: set raw material's batch based on main item's batch only if RM has batch no (#18977)	2019-09-10 14:07:45 +05:30
Anurag Mishra	ac0c1edd23	feat: added date filter based on billing date and based date (#18936)	2019-09-06 12:10:10 +05:30
KanchanChauhan	d114c8f88f	fix(Purchase Order): Status updater (#18612)	2019-09-05 15:11:43 +05:30
Suraj Shetty	f75481fa23	Merge branch 'develop' of github.com:frappe/erpnext into feature-pick-list	2019-08-30 15:45:18 +05:30
Rohit Waghchaure	13c7e183a6	fix: not able to save sales order	2019-08-29 20:03:52 +05:30
Suraj Shetty	8de8a78235	Merge branch 'develop' of github.com:frappe/erpnext into feature-pick-list	2019-08-26 10:51:12 +05:30
Deepesh Garg	f3d78dd29c	fix: Duplicate items check in Sales Invoice (#18660) ... * fix: Duplicate items check in sales Invoice * fix: Commonified function for duplicate items check in selling controller * fix: Set valuation rate and transaction date in child tabel	2019-08-23 11:42:35 +05:30
Mangesh-Khairnar	5619db28cb	fix: fetch capital work in progress as expense account (#18780)	2019-08-21 14:49:24 +05:30
Suraj Shetty	da2a623e38	Merge branch 'develop' of github.com:frappe/erpnext into feature-pick-list	2019-08-21 11:48:27 +05:30
Sahil Khan	5f2c030ddc	Merge branch 'version-12-hotfix' into merge_v12_hotfix_1	2019-08-20 16:22:49 +05:30
Suraj Shetty	5124b2806d	Merge branch 'develop' of github.com:frappe/erpnext into feature-pick-list	2019-08-20 12:05:51 +05:30
Deepesh Garg	33b392ac2b	Update erpnext/controllers/sales_and_purchase_return.py ... Co-Authored-By: Mangesh-Khairnar <mkhairnar10@gmail.com>	2019-08-19 17:43:10 +05:30
Deepesh Garg	3965451c7a	Update erpnext/controllers/sales_and_purchase_return.py ... Co-Authored-By: Mangesh-Khairnar <mkhairnar10@gmail.com>	2019-08-19 17:40:29 +05:30
deepeshgarg007	0487ad5515	fix: Code cleanup	2019-08-19 16:40:29 +05:30
deepeshgarg007	e2acc748c8	fix: Check for return against delivery noteas well	2019-08-19 16:38:04 +05:30
deepeshgarg007	7d288437d8	fix: Assignment	2019-08-19 16:19:48 +05:30
deepeshgarg007	c80e5fe7a1	fix: Failing sales and purchase return test cases	2019-08-19 14:38:15 +05:30
Deepesh Garg	5efedd7a60	fix: Travis (#18772)	2019-08-19 12:56:22 +05:30
Anurag Mishra	19c3cb0d5b	fix: removed filters(not required) (#18729)	2019-08-19 10:31:02 +05:30
Suraj Shetty	182f4def00	fix: Delivery note creation from pick list ... - Changes in serial no and batch no seletion - Changes in warehouse overrwite logic Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2019-08-16 08:16:22 +05:30
Suraj Shetty	83705af0b3	fix: Filters for portal quotation list (#18689) ... * fix: Filters for portal quotation list * fix: Remove unwanted import	2019-08-12 11:51:27 +05:30
rohitwaghchaure	5790fabd54	Merge pull request #18669 from rohitwaghchaure/removed_stock_item_condition_for_sub_contract_v12 ... fix: allow to subcontract service raw materials	2019-08-09 15:18:38 +05:30
Rohit Waghchaure	10e8073204	fix: allow to subcotract service raw materials	2019-08-08 18:20:53 +05:30
Mangesh-Khairnar	a3d5200194	fix(sales-order): update items (#18535) ... * fix(sales-order): update items * fix: minor changes * Update: accounts controller	2019-08-05 10:16:40 +05:30
Mangesh-Khairnar	9accae3ddc	fix(sales-order): update items (#18536) ... * fix(sales-order): update items * fix: minor changes	2019-08-05 10:16:25 +05:30
Deepesh Garg	8b0302bab9	fix: Make conversion rate optional for non itemized items (#18540)	2019-08-05 10:14:19 +05:30
Deepesh Garg	cfb899451f	fix: Make conversion rate optional for non itemized items (#18541)	2019-08-05 10:14:05 +05:30
Suraj Shetty	580fa48642	fix: Quotation list in customer portal (#18579) ... * fix: Quotation list in customer portal Customers were not able to see their quotations because of the recent customer field removal from quotation * fix: Remove duplicate code	2019-08-05 10:08:35 +05:30
deepeshgarg007	b656529818	fix: Error handling in taxes and totals	2019-08-03 13:49:33 +05:30
deepeshgarg007	8bf19ce81a	fix: Error handling in taxes and totals	2019-08-03 13:44:44 +05:30
Deepesh Garg	d301d26fda	fix: Enhancement in credit note (#18511) ... * fix: Credit note enhancement * Fix: Print format for Sales Invoice Return * fix: Zero quantity validation fix for credit note	2019-07-31 15:58:19 +05:30
Deepesh Garg	b65c761b16	fix: Enhancement in credit note (#18510) ... * fix: Credit note enhancement * Fix: Print format for Sales Invoice Return * fix: Zero quantity validation fix for credit note	2019-07-31 15:58:01 +05:30
Mangesh-Khairnar	3f8326358b	fix: remove wrong status update for order type maintenance (#18444)	2019-07-22 16:24:56 +05:30
Anurag Mishra	305da799a4	Handling case for Material Request type 'Manufacture' v12 (#18365) ... * fix: status for 'material request type == Manufacture' * Patch: for setting status * fix: list view status	2019-07-22 11:35:16 +05:30
Faris Ansari	7ed5919d5b	fix(LoanApplication): Repayment amount check (#18376) ... * fix: Clickable Asset link * fix(LoanApplication): Repayment amount check	2019-07-22 11:30:05 +05:30
Mangesh-Khairnar	88620d6cbb	fix: precision on comparing with the outstanding amount (#18375)	2019-07-22 11:29:26 +05:30
Karthikeyan S	747c2624cd	fix(BOM): Sever Error due in bom query to new behaviour of db.escape in v12 (#18401) ... fixes bug introduced by commit 6a7969117f	2019-07-19 22:49:21 +05:30
Anurag Mishra	8a06b8fd38	fix precision	2019-07-17 14:55:16 +05:30
Deepesh Garg	322053ee1b	Merge pull request #18136 from nabinhait/inv-disc-improvements ... fix: set invoice status considering invoice discounting	2019-07-15 18:53:30 +05:30
Nabin Hait	868766ddf0	refactor: Refactored over delivery/receipt/billing fields (#17788) ... * refact: Refactored over delivery/receipt/billing fields * fix: test case	2019-07-15 18:02:58 +05:30
Nabin Hait	d83e39d0ac	Merge branch 'develop' of https://github.com/frappe/erpnext into inv-disc-improvements	2019-07-15 13:56:29 +05:30
Nabin Hait	b315acb5a7	fix: Calculate taxes and totals only if items added in transaction	2019-07-12 14:32:53 +05:30
Mangesh-Khairnar	6a7969117f	fix(bom): escape name with wildcard character (#18164)	2019-07-08 10:40:40 +05:30
rohitwaghchaure	334335a2ef	fix: not able to make credit note for the sales invoice in which item code is not set (#18184)	2019-07-08 10:26:29 +05:30
rohitwaghchaure	8a054e4b36	Merge pull request #18182 from rohitwaghchaure/provision_to_make_debit_credit_note_against_return_entry ... feat: provision to make debit / credit note against the stock returned entry	2019-07-07 00:51:46 +05:30
Rohit Waghchaure	5d4d70b75f	feat: provision to make debit / credit note against the stock returned entry	2019-07-05 17:06:25 +05:30
Nabin Hait	7b684a01d3	fix: merge conflict	2019-07-04 12:06:50 +05:30
Shivam Mishra	7dedd9a8cd	refactor: better error message when changing variant value (#18144)	2019-07-03 17:29:29 +05:30
Anurag Mishra	841d852f41	refactor: added missing translation functions (#18143) ... * fix: Translating Error and Messages * Update erpnext/controllers/item_variant.py Co-Authored-By: Shivam Mishra <scmmishra@users.noreply.github.com> * Update erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py Co-Authored-By: Shivam Mishra <scmmishra@users.noreply.github.com>	2019-07-03 15:15:08 +05:30
Nabin Hait	34c551d9a5	fix: Missing commits from hotfix branch (#17997) ... * fix: merge conflict * fix: restored missing set_gst_state_and_state_number function * fix: style linting as per codacy * fix: Fixes related to customer/lead merging * fix: merge conflict * fix: Fixes related to customer/lead merging * fix: Assign isue/opportunity to user * fix: Assign isue/opportunity to user * fix: Replaced Invoice type by GST Category * fix: merge conflict * fix: merge conflict * fix: test cases * fix: test cases	2019-07-03 10:34:31 +05:30
Nabin Hait	3bbcd491e4	fix: set invoice status considering invoice discounting	2019-07-02 15:31:24 +05:30
Nabin Hait	126a02e208	fix: set invoice status considering invoice discounting	2019-07-02 15:28:57 +05:30
Deepesh Garg	78a86af7fd	fix: Fiter passing fix in get batch query (#18131)	2019-07-02 10:10:55 +05:30
Nabin Hait	659a01d819	Update accounts_controller.py	2019-07-01 15:16:49 +05:30
Mangesh-Khairnar	8c621ab90c	fix: precision for certain calculations in buying controller (#18008) ... * fix: precision for certain numbers * fix: check precision of the received_qty * Update buying_controller.py	2019-06-26 11:10:17 +05:30
Deepesh Garg	ea0574679f	fix: Removed submitted status from Quotation (#18055) ... * fix: Change in list view and status updater * fix: Change status in doctype * fix: Patch for submitted status	2019-06-26 11:05:51 +05:30
deepeshgarg007	e8d21cd8fa	fix: Division by zero error fix in group similar item	2019-06-24 18:49:24 +05:30
Anurag Mishra	4c1639305f	feat: creating stock entry against purchase receipt	2019-06-14 12:31:08 +05:30
Deepesh Garg	0d7d4879a9	Merge pull request #17920 from Anurag810/stock_balance_report ... fix: fetch item on the base of item group	2019-06-13 10:49:30 +05:30
Anurag Mishra	bbe2c4fb01	fix: fetch item on the base of item group	2019-06-12 19:09:51 +05:30
Rohit Waghchaure	3cf24366a9	feat: provision to set multiple manufacturer in the item master	2019-06-06 19:53:32 +05:30
Rushabh Mehta	6744febedd	Merge pull request #17769 from deepeshgarg007/dimensions ... feat: Configurable Accounting Dimensions	2019-06-03 17:00:58 +05:30
Nabin Hait	37fdeee367	Merge pull request #17805 from nabinhait/discount-rounding-adjustment-dev ... fix: Rounding adjustment while additional discount amount is applied on grand total	2019-06-03 13:09:04 +05:30
deepeshgarg007	2580075583	Merge branch 'develop' of https://github.com/frappe/erpnext into dimensions	2019-05-30 22:11:27 +05:30
Nabin Hait	1bb3fc3c19	Merge pull request #17789 from sunnyakaxd/patch-2 ... fix: Dont fetch all orders to update a few	2019-05-30 17:24:49 +05:30
Nabin Hait	4d58734492	fix: Rounding adjustment while additional discount amount is aplied on grand total	2019-05-30 15:51:29 +05:30
Anurag Mishra	62d58acea9	fix: Added description if item variants does not have description in map(v12) (#17796) ... * fix: variant item description based on attribute * style: removed unwanted changes	2019-05-30 14:04:08 +05:30
Himanshu Mishra	70029b818b	Update status_updater.py	2019-05-29 14:19:35 +05:30
deepeshgarg007	acc2422167	Merge branch develop into dimensions	2019-05-28 12:18:32 +05:30
Nabin Hait	ca8dae183a	Merge branch 'develop' into opening-stock-entry-dev	2019-05-27 11:50:16 +05:30
Nabin Hait	5cd04a6d30	fix: payment reconciliation against expense claim (#17729) ... * fix: payment reconciliation against expense claim * feat: Added dashboard for expense claim	2019-05-27 11:44:06 +05:30
deepeshgarg007	d330519f7c	fix: Merge branch develop into dimensions	2019-05-25 18:18:08 +05:30
Nabin Hait	8770ea2631	fix: Opening accounting entry for stock entry	2019-05-23 11:15:04 +05:30
deepeshgarg007	3d11ac0e75	fix: Accounting dimensions for child tables	2019-05-19 00:02:01 +05:30
Nabin Hait	3f119ec256	fix: GL Entry for opening stock reconciliation	2019-05-16 17:29:10 +05:30
rohitwaghchaure	d07a3e1de2	fix: limit offset was missing in the get_delivery_notes_to_be_billed method (#17611)	2019-05-15 07:46:28 +05:30
deepeshgarg007	60f4dd0736	Merge branch 'develop' of https://github.com/frappe/erpnext into dimensions	2019-05-14 15:51:12 +05:30
rohitwaghchaure	39be1d43bc	Merge pull request #17546 from rohitwaghchaure/incorrect_payment_amount_if_advance_amount_in_si_develop ... fix: incorrect payment amount in the payment terms if the sales invoice has the advance amount	2019-05-14 11:15:14 +05:30
deepeshgarg007	d83cf65be1	fix: Added dimensions in financial reports and general ledger	2019-05-12 18:34:23 +05:30
Rohit Waghchaure	4a267b9340	fix: incorrect payment amount in the payment terms if the sales invoice has the advance amount	2019-05-09 19:52:53 +05:30
rohitwaghchaure	4d2c307d6d	Merge pull request #17475 from netchampfaris/item-variant-attributes-optional ... fix: Allow variant attributes to be optional	2019-05-09 00:54:45 +05:30
Faris Ansari	ab14892fc5	fix: Variant naming if optional attributes	2019-05-03 13:57:20 +05:30
Faris Ansari	cb03bb1c00	fix: Allow variant attributes to be optional	2019-05-03 13:41:50 +05:30
deepeshgarg007	bffa060ff6	Merge branch 'develop' of https://github.com/frappe/erpnext into notification	2019-05-01 16:33:11 +05:30
Nabin Hait	b8103ac077	Merge branch 'develop' into item-discount	2019-05-01 12:23:30 +05:30
deepeshgarg007	f2fb0e03e6	fix: Add status for partial received	2019-04-29 21:42:48 +05:30
deepeshgarg007	c23b70950e	Merge branch 'develop' of https://github.com/frappe/erpnext into notification	2019-04-26 16:43:06 +05:30
Nabin Hait	4a994d4eb8	fix: Don't allocate advance if pos	2019-04-25 17:49:38 +05:30
Nabin Hait	64bfdd9596	fix: test cases	2019-04-23 13:37:19 +05:30
Nabin Hait	593242fa5c	fix: Calculate rate based on discount on server side only if not rate or pricing rule applied	2019-04-23 13:22:38 +05:30
deepeshgarg007	06c20400ee	feat: Track purchase receipt status in Material Request	2019-04-22 12:25:14 +05:30
Mangesh-Khairnar	3ab2a18088	Merge branch 'develop' into so-on-hold	2019-04-11 15:49:06 +05:30
Faris Ansari	6472ed2c1e	Merge pull request #16941 from Mangesh-Khairnar/po-on-hold ... Feature: Purchase order on hold	2019-04-11 15:36:54 +05:30
Nabin Hait	89206e74d0	fixed merge conflict	2019-04-11 12:31:14 +05:30
Nabin Hait	0f62b13dd8	Merge pull request #17159 from rohitwaghchaure/sales_return_not_working_for_bundle_items ... fix: sales return not working for product bundle items	2019-04-11 11:44:57 +05:30
Rohit Waghchaure	9665a531fc	fix: item variant test cases	2019-04-11 09:56:00 +05:30
Rohit Waghchaure	f3a9552e48	fix: item variant test cases	2019-04-10 17:57:09 +05:30
Anurag Mishra	ed82e8ba3b	fix: removed before from accounts_controlle.pyr and fetch the gl from frontend	2019-04-09 15:19:05 +05:30
Mangesh-Khairnar	16c4fd6733	Merge branch 'develop' of https://github.com/frappe/erpnext into so-on-hold	2019-04-09 12:13:45 +05:30
Rohit Waghchaure	3771db92b8	fix: sales return not working for bundle items	2019-04-06 17:34:40 +05:30
Rohit Waghchaure	9835c89e17	Added test cases	2019-04-06 12:29:05 +05:30
Mangesh-Khairnar	3d667b4c94	Merge branch 'develop' of https://github.com/frappe/erpnext into po-on-hold	2019-04-05 12:11:26 +05:30
Nabin Hait	88f036a171	fix: Validate returned qty with ref qty considering field precision	2019-04-01 18:41:31 +05:30
Rohit Waghchaure	5fa9a7a1b4	feat: unlink advance payment entry on cancelation of order	2019-04-01 00:40:38 +05:30
Rohit Waghchaure	e540534e42	fix: Pricing rule not working for POS	2019-03-31 17:13:18 +05:30
Saurabh	84a18f5b18	Merge branch 'master' into develop	2019-03-28 13:54:34 +05:30
Suraj Shetty	a7992ecb62	style: Fix formatting	2019-03-27 20:32:42 +05:30
Suraj Shetty	abc2a64d5e	fix: Commonify get gl_entry code by moving it to accounts_controller	2019-03-27 20:25:18 +05:30
Rohit Waghchaure	5816fc2801	Renamed subcontract to Send to Subcontractor	2019-03-26 12:52:49 +05:30
Mangesh-Khairnar	324e06cba0	Merge branch 'develop' of https://github.com/frappe/erpnext into so-on-hold	2019-03-25 18:51:13 +05:30
Mangesh-Khairnar	5e474f4664	fix: add server-side validation for closed sales order for linked material request	2019-03-25 17:28:20 +05:30
Frappe Bot	b07a5d449d	Merge branch 'master' into develop	2019-03-23 07:25:03 +00:00
Rohit Waghchaure	8bfe330b37	feat: pricing rule enhancements	2019-03-19 12:44:30 +05:30
Mangesh-Khairnar	439546c83c	feat: add on hold status in purchase order	2019-03-18 12:14:25 +05:30
Frappe Bot	7e67a400cd	Merge branch 'master' into develop	2019-03-08 09:39:33 +00:00
Rohit Waghchaure	6b33c9b934	fix: purchase receipt not able to submit because default inventory account has not selected in another company	2019-03-08 11:13:35 +05:30
Rohit Waghchaure	2bfb063fdb	fix(sales order item): not able to search item by description	2019-03-02 21:47:55 +05:30
Mangesh-Khairnar	86e650c1ed	feat: validate linked sales order on material request creation	2019-03-02 20:48:04 +05:30
Mangesh-Khairnar	5eb66aed77	feat: add on hold status check	2019-03-02 20:48:03 +05:30
Mangesh-Khairnar	e17b7095bf	feat(sales order on hold): check status of sales order to validate entry	2019-03-02 20:48:03 +05:30
Saurabh	482ebd2c7c	Merge branch 'master' into develop	2019-02-20 18:14:18 +05:30
rohitwaghchaure	c18e925d61	fix: Moved regional methods from controller to hooks (#16736)	2019-02-20 17:13:15 +05:30
Sagar Vora	cc6e51c62d	Merge branch 'master' into develop	2019-02-19 18:09:49 +05:30
Gaurav	f1e28e0e8d	mod(regional,italy): Updates to Italian Localization ... fixes: removed cleanup_files from italy/utils removed extract_doc_number from italy/utils added country filter to italian localization patch replaced dict assignment with dot operator in prepare_invoice correcions in e-invoice xml following changes in prepare_invoice added setup_report in patch added section for e-invoicing custom fields in company added Italy in test_company	2019-02-19 10:39:22 +05:30
Aditya Hase	13808b4cc9	fix(py3): Convert to float before comparison	2019-02-08 12:03:25 +05:30
Aditya Hase	d9ce732d3e	fix(py3): Explicitly convert to float for comparison	2019-02-07 22:21:05 +05:30
Saif Ur Rehman	1a441b267d	Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12 ... # Conflicts: # erpnext/patches.txt	2019-02-01 19:17:04 +05:00
Sagar Vora	f97c5dad82	Merge branch 'staging' into develop	2019-01-29 18:39:14 +05:30
Sagar Vora	f3cfad7595	Merge branch 'master' into staging-fixes	2019-01-29 17:20:46 +05:30
Saif Ur Rehman	3d275af67b	Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12 ... # Conflicts: # erpnext/buying/doctype/supplier/supplier.json # erpnext/patches.txt # erpnext/selling/doctype/customer/customer.json	2019-01-24 23:40:16 +05:00
Frappe Bot	e415cce1a9	Merge branch 'staging' into develop	2019-01-23 08:19:00 +00:00
Nabin Hait	d2e2ca31ac	Merge pull request #16460 from nabinhait/pricing-rule-issue ... fix: Enforce pricing rule based on rate on server side	2019-01-23 12:09:12 +05:30
Nabin Hait	fb8c0bd664	Merge pull request #16464 from adityahase/flakes ... style: Linting fixes	2019-01-23 12:08:57 +05:30
Nabin Hait	4ef578e1c4	Merge pull request #16406 from rohitwaghchaure/newchanges_in_tds_reports ... fix: Multiple fixes in the reports	2019-01-23 12:05:36 +05:30
Aditya Hase	f79937d64b	style: Remove unused imports	2019-01-23 00:28:37 +05:30
Nabin Hait	da32916396	fix: Enforce pricing rule based on rate on server side	2019-01-22 19:06:06 +05:30
Saif Ur Rehman	74a3370095	Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12 ... # Conflicts: # erpnext/buying/doctype/purchase_order/purchase_order.json # erpnext/patches.txt # erpnext/selling/doctype/quotation/quotation.json # erpnext/selling/doctype/sales_order/sales_order.json	2019-01-22 16:20:40 +05:00
Sagar Vora	4d1a9b10ed	Merge branch 'staging' into develop	2019-01-22 15:56:39 +05:30
Saif Ur Rehman	398f593e5f	Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12 ... # Conflicts: # erpnext/patches.txt	2019-01-18 17:33:19 +05:00
Nabin Hait	bace4d3e6d	Merge pull request #16358 from adityahase/naming-series ... feat(naming): Deferred naming for SLE and GL Entry	2019-01-18 10:55:30 +05:30
Nabin Hait	bef2c22d23	Fix: merge conflict	2019-01-18 10:15:47 +05:30
Rohit Waghchaure	f725816809	Enhance: Added field limit in the Payment Reconciliation to handle large entries	2019-01-17 12:54:14 +05:30
Nabin Hait	983d102a19	Merge branch 'staging-fixes' into Quality-inspection-fix	2019-01-16 17:52:30 +05:30
Sahil Khan	34766c0c50	BIS issue fixes	2019-01-16 15:59:39 +05:30
Saif Ur Rehman	5085673030	test: fix for Item Tax Template v12	2019-01-11 03:53:43 +05:00
Saif Ur Rehman	8d61794540	Merge branch 'Item-Tax-Template' of https://github.com/SaiFi0102/erpnext.git into Item-Tax-Template-V12 ... # Conflicts: # erpnext/patches.txt # erpnext/stock/doctype/item/item.json	2019-01-10 04:23:40 +05:00
Saif Ur Rehman	eb7277d2d4	Merge branch 'staging-fixes' of https://github.com/frappe/erpnext.git into Item-Tax-Template ... # Conflicts: # erpnext/patches.txt	2019-01-09 11:25:53 +05:00
Nabin Hait	bf0b6fd8a9	Merge pull request #16342 from finbyz/staging-fixes ... fix: rounded total if available while caclulating advance paid	2019-01-08 20:29:32 +05:30
Saurabh	afec3ca89a	Merge branch 'staging' into develop	2019-01-08 17:09:36 +05:30
Saif Ur Rehman	380b4b0926	Merge branch 'staging-fixes' of https://github.com/frappe/erpnext.git into Item-Tax-Template ... # Conflicts: # erpnext/accounts/doctype/accounts_settings/accounts_settings.json # erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json # erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json # erpnext/accounts/doctype/sales_invoice/sales_invoice.json # erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json # erpnext/buying/doctype/purchase_order/purchase_order.json # erpnext/buying/doctype/purchase_order_item/purchase_order_item.json # erpnext/buying/doctype/supplier/supplier.json # erpnext/buying/doctype/supplier_quotation/supplier_quotation.json # erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json # erpnext/selling/doctype/quotation/quotation.json # erpnext/selling/doctype/quotation_item/quotation_item.json # erpnext/selling/doctype/sales_order/sales_order.json # erpnext/selling/doctype/sales_order_item/sales_order_item.json # erpnext/setup/doctype/item_group/item_group.json # erpnext/stock/doctype/delivery_note/delivery_note.json # erpnext/stock/doctype/delivery_note_item/delivery_note_item.json # erpnext/stock/doctype/item/item.json # erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json	2019-01-08 13:41:46 +05:00
Aditya Hase	0c16424d7d	fix(naming): Use creation instead of name to order SLEs	2019-01-08 00:09:36 +05:30
Sagar Vora	f5a00dc0c1	Merge branch 'hotfix' into is_fixed_asset_checkbox_not_copied	2019-01-07 15:45:33 +05:30
Sagar Vora	f733a39089	fix: remove trailing whitespace	2019-01-07 14:24:01 +05:30
Saif Ur Rehman	7ea6554f1f	Merge branch 'staging' of https://github.com/frappe/erpnext.git into Item-Tax-Template ... # Conflicts: # erpnext/selling/doctype/quotation_item/quotation_item.json # erpnext/stock/doctype/item/item.json	2019-01-06 04:43:13 +05:00
finbyz	5efc7973ea	Minor Fix for Rounded Total	2019-01-05 11:12:11 +05:30
Saif Ur Rehman	648bd15b2a	Force item_tax_rate on setting item details server-side	2019-01-03 04:03:54 +05:00
Anurag Mishra	0885485a61	changes	2019-01-01 15:00:16 +05:30
Anurag Mishra	0c8411d085	test cases sucess	2018-12-28 16:53:00 +05:30
deepeshgarg007	77cde832d6	Added validation for update items in purchase order as well	2018-12-27 15:56:51 +05:30
deepeshgarg007	ffb411d9e2	Validation while updating items in sales order	2018-12-27 14:12:05 +05:30
Frappe Bot	9e09b3adbe	Merge branch 'staging' into develop	2018-12-26 12:16:20 +00:00
Frappe Bot	e8c2fdfb8c	Merge branch 'master' into staging-fixes	2018-12-26 11:44:09 +00:00
Rushabh Mehta	fafbb0278f	fix: reload parent after setting children	2018-12-24 22:09:15 +05:30
Rushabh Mehta	c9b1a35ac3	fix: set explicit idx for new item in update_child_qty_rate	2018-12-24 20:55:35 +05:30
Nabin Hait	5a9579bae4	feat(quality): Check quality status before receipt/delivery (#16169)	2018-12-24 14:54:42 +05:30
Shreya Shah	d2b9093ecc	fix: Check if items exist (#16248)	2018-12-24 14:21:07 +05:30
Rohit Waghchaure	f6f503a1f6	[Fix] Is fixed asset checkbox not checked if user duplicate the existing invoice	2018-12-19 15:15:35 +05:30
Stavros Anastasiadis	3d82b74ea4	Update Items in Submit state can add new row (#15644) ... * Update Items in Sumbit state can add new row In Sales Order and Purchase Order when docstatus is submitted user can use Update Item btn to add new child Items * Remove unused code line * Remove blocking db save thread line * Remove Company as not standard Field in Purchase Order Item * Minor indentation fix * Add Unit Test, add new row in update_child_qty_rate * Codacy fix	2018-12-10 17:30:55 +05:30
Frappe Bot	7c2a5bddb1	Merge branch 'staging' into develop	2018-12-06 09:50:25 +00:00
Frappe Bot	ee5d7e6d0f	Merge branch 'master' into staging-fixes	2018-12-06 09:26:42 +00:00
Ameya Shenoy	fe1f532bc0	Merge branch 'staging' into develop	2018-11-28 08:28:37 +00:00
Ameya Shenoy	2806d83362	Merge branch 'master' into staging-fixes	2018-11-28 08:12:48 +00:00
Nabin Hait	96598936ad	fix(test): Fixed tests for discount with margin and period closing voucher	2018-11-27 17:48:13 +05:30
Nabin Hait	e4cc062cf1	Merge pull request #16109 from rohitwaghchaure/while_pulling_advanced_entry_system_uses_grand_total ... [Fix] System allocated grand total amount instead of non zero rounded total for advanced entry in the sales invoice	2018-11-27 13:22:50 +05:30
Nabin Hait	72fc1b57be	Merge pull request #16083 from Anurag810/new-fix-branch ... [fix] delivery note with quantity equal 0 #14211	2018-11-27 13:10:31 +05:30
Nabin Hait	6743219dc2	Merge pull request #16094 from rohitwaghchaure/validate_due_date_for_purchase_invoice ... [Fix] Due Date cannot be before Posting Date should consider supplier invoice date for purchase invoice	2018-11-27 13:09:16 +05:30
Rohit Waghchaure	6cc2f52fa4	[Fix] System allocated grand total amount instead of non zero rounded total for advanced entry in the sales invoice	2018-11-27 12:07:03 +05:30
Saif Ur Rehman	5fdbc68ca3	Set Gross Profit on server-side validation of Sales Order	2018-11-26 19:32:16 +05:00
Rohit Waghchaure	d1a85a3637	[Fix] Due date can not be greter than posting date validation should consider supplier invoice date for purchase invoice	2018-11-26 18:42:29 +05:30
Anurag Mishra	e657fe84b8	making validation generic for sales order,sales invoice,purchase order etc.	2018-11-26 17:13:10 +05:30
Rohit Waghchaure	f4dc71661d	[Fix] Address not set from the API	2018-11-15 17:04:02 +05:30
Frappe Bot	eb4969d24f	Merge branch 'staging' into develop	2018-11-15 09:26:03 +00:00
Nabin Hait	367a076fa4	fix(discount): Fixed item discount amount calculation	2018-11-13 18:41:58 +05:30
Nabin Hait	688758a56f	fix(test): Fixed item discount amount calculation and test cases related to pricing rule	2018-11-13 16:13:16 +05:30
Himanshu Mishra	35b2627112	Item qty based tax (CESS) calculation support (#15456) ... * fix conflicts * added test case for qty cess * use company specified in document to get region	2018-11-13 11:13:04 +05:30
Frappe Bot	1ff9c691b7	Merge branch 'staging' into develop	2018-11-09 10:21:07 +00:00
patilsangram	667f0fbd6d	[fix] Invoice/Delivery note customer po_no overwritten by Sales order null po_no (#15785)	2018-11-08 12:51:41 +05:30
Zarrar	5be6d19f4d	[Minor] Display Discount Amount when Tax table is empty (#15812) ... * show discount amount even when tax table is empty * negate the value for discount while printing	2018-11-08 12:16:26 +05:30
Ameya Shenoy	c1231d65fd	Merge branch 'staging' into develop	2018-10-19 13:27:07 +00:00
Saif	3c9155e406	[Minor Fix] Force toggle display Net Total field when default taxes are fetched (#15532) ... * Minor fix for the problem that Net Total, Net Rate, Net Amount field would not be shown when default taxes were fetched * Prevent net_rate from becoming NaN * -Fixed problem that party_account_currency was not set in mapped document -Fixed problem that discount amount was not recalculated (in mapped document) -Fixed problem that set_dynamic_fields would work only on certain condition that led to showing Total (Company Currency) field even when using company currency	2018-10-18 17:57:56 +05:30
Ameya Shenoy	606c504f28	Merge branch 'staging' into develop	2018-10-15 12:25:03 +00:00
Shreya Shah	314c97cbf1	Fix for supplier quotation (#15659)	2018-10-11 16:59:40 +05:30
Ameya Shenoy	f90af80344	Merge branch 'staging' into develop	2018-10-11 06:58:53 +00:00
Shreya Shah	785f1aa96d	fix(print): Update idx if grouping same items (#15647)	2018-10-11 10:14:25 +05:30
Shreya Shah	2291323c65	fix(shipping-address-display): Fetch shipping address display as per the shipping address (#15643)	2018-10-11 10:13:27 +05:30
Ameya Shenoy	f174c95d80	Merge branch 'staging' into develop	2018-10-07 06:24:12 +00:00
Shreya Shah	5615cb4735	Set default only if customer_address not found (#15605) ... * Set default only if customer_address not found * Similar fix for Purchase Invoice and shipping_address	2018-10-07 11:42:07 +05:30
Ameya Shenoy	da10f6ebd8	Merge branch 'staging' into develop	2018-10-04 11:51:30 +00:00
Ameya Shenoy	7d929c508f	Merge branch 'master' into staging-fixes	2018-10-04 09:25:07 +00:00
Neil Trini Lasrado	55a53e0bec	Added ability to have a default return warehouse for Sales Returns (#15491)	2018-09-30 21:22:50 +05:30
Suraj Shetty	4b404c4f1e	Avoid multiple escapes (#15509)	2018-09-27 15:39:34 +05:30
Nabin Hait	c22ba2ec26	fix(sales return): validation message fix	2018-09-26 18:56:45 +05:30
Suraj Shetty	6ea3de9521	Fix quote issues (#15497) ... * Fix quotes issues * Remove frappe.db.escape - Handle escape in the update_linked_doctypes method	2018-09-26 18:15:53 +05:30
Nabin Hait	1e7c32b909	Payroll fixes and more (#15475) ... * fix(payroll): multiple minor fixes related to salary structure * Added GSTR-1 and GSTR-2 report in Accounts module page * delete asset movement records on cancellation of Purchase Receipt * Update consolidated_financial_statement.py * minor fix * minor fix * add filters on item prices report (#15495)	2018-09-26 18:01:00 +05:30
Suraj Shetty	bfc195dd8b	Changes to support refactor in frappe pg-poc branch (#15287) ... * Remove quotes from sql to make it compatible with postgres as well * Fix queries - Replace mysql specifc queries with standard ones * Make repo URL chages to test pg-poc * Add root passowrd to test site config * Fix quotes issue * Remove debug flag from a pricing rule query * Remove python 3.6 version from travis.yml * Fix improper query issue * Fix incorrect query * Fix a query - This fix need to be changed when we will start supporting postgres since date_format is not supported by postgres * Get price list map as dict * Convert price_list_currency_map to dict	2018-09-21 10:20:52 +05:30
Faris Ansari	2ab6e0e39b	fix(translations): Replace translations by keyword with indexed version (#15426) ... * fix(translations): Replace translations by keyword with indexed version Keywords in the translation also gets translated which results in an error because python cannot find the key * Update buying_controller.py	2018-09-19 13:13:59 +05:30
Alchez	e52ae4eacb	[Fix] 'To Bill' status even if the amount is zero (#14784) ... * Fix 'To Bill' status even if the invoice amount is zero * Modify fix to only apply on Delivery Note documents	2018-09-06 18:27:06 +05:30
Bassam Ramadan	8d7c1868d6	fix for fields names at sales invoice return payments and verifying the payment amount (#15245) ... * fix for payments field names in sales invoice return * add verification for payment amount at sales invoice return adding verification to be sure the payment amount is negative at sales invoice return * correction for precision field name	2018-08-30 19:15:15 +05:30
Nabin Hait	a804d6d487	Fixed merge conflict	2018-08-29 13:34:58 +05:30
Nabin Hait	6b539d65d7	Restored missing rounded_total fields	2018-08-29 12:41:23 +05:30
rohitwaghchaure	e33047250e	[Fix] Speacial character issue in searching project in sales invoice (#15220)	2018-08-27 11:43:57 +05:30
Zlash65	4d462d637f	indentation fix	2018-08-21 18:19:26 +05:30
Rushabh Mehta	9a29bfa49e	fix(indentation): sales_and_purchase_return.py	2018-08-21 17:53:25 +05:30
Bassam Ramadan	1ff2315899	Trial balance and payable accounts reports and sales return fixes (#15000) ... * adding supplier type filter to payable accounts and payable accounts summary reports adding supplier type filter to payable accounts and payable accounts summary reports as customer group at receivable accounts and summary reports as its important and easier to put this filter * fix trial balance opening and closing values the removed mathematical operations was causing showing incorrect values at opening and closing columns where the total row was correct so the operation deleted to view the correct values to be equal to the total row and to stop confusing the user due to different values between the total row and the the values in front of each account * fix for supplier type filter field on payable accounts reports rename the supplier type filter field to supplier group in payable accounts and summary reports * fix for paid amount in returned sales invoice the current paid amount not change from source value if you deleted any item if the invoice contain for example 3 items and you only need to return on item the current steps is to open the original invoice and press on make return then you delete the unwanted items but in this case the paid amount will not change and you will get an alert from the system until you change it manually but with this modification it works very well. * fixing trial balance values and totals fixing trial balance opening and closing ( DR - CR ) values and totals	2018-08-20 17:58:28 +05:30
rohitwaghchaure	b800382abf	[Fix] Due to incorrect conversion factor user not able to make purchase return entry (#15163)	2018-08-20 17:50:31 +05:30
Charles-Henri Decultot	bd06a5b0ee	Small python 3 compatibility correction (#15151)	2018-08-16 10:32:49 +05:30
Rushabh Mehta	8705371ef0	fix(product-listing): fix variant selection in website	2018-08-16 09:22:45 +05:30
Nabin Hait	c35271aef5	fix(various)	2018-08-10 19:01:13 +05:30
Nabin Hait	6a5695fe17	minor fix	2018-08-09 11:30:21 +05:30
Nabin Hait	9a33bc6417	optimizing transactions by caching	2018-08-09 10:47:09 +05:30
Nabin Hait	50238c3049	[optimize] tree conditions for pricing rule	2018-08-08 18:43:04 +05:30
Himanshu Mishra	859d942b22	Cached calls (#15109) ... * [optimize]: bin updates * [optimise]: use frappe.get_cached_value instead of get_value for item * [fix]: change db.get_cached_value to get_cached_value	2018-08-08 18:33:50 +05:30
Rushabh Mehta	708e47aadf	optimize(various)	2018-08-08 16:37:31 +05:30
Saurabh	824b388631	Resolved merge conflicts	2018-08-07 13:01:11 +05:30
Doridel Cahanap	59e4c32e9f	Allow Disabling Batch and edit Validations (#15076)	2018-08-06 14:45:18 +05:30
Jignesh Greycube	b2d16aca74	Updated Spelling Maxiumm to Maximum (#15090)	2018-08-06 14:32:05 +05:30
rohitwaghchaure	ae4ff5a403	[Fix] In words showing grand total instead of rounded total (#15065)	2018-08-01 18:09:51 +05:30
Nabin Hait	041a5c2d3b	Get Advances and auto allocate (#14970)	2018-08-01 18:07:39 +05:30
Saurabh	d7897f1c53	Resolved merge conflicts	2018-07-18 17:08:16 +05:30
Shreya Shah	3c9839f832	Defaults in Item Group (#14874) ... * Add Defaults table in Item Group * Fetch defaults from Item group if not found in Item * Add patch * Remove default fields from Item Group * Set query for defaults * Fix Codacy * Modify test records * Modify budget.py and sales_order.py * Remove join from query * Else condition to avoid error if no defaults found * refrain from making item test records before item_group * default cost center fetch correction * Remove tab item group from query	2018-07-17 18:01:44 +05:30
rohitwaghchaure	3ffe89659a	[Fix] System always fetches the payment terms template from the company even if it's removed from the sales invoice (#14879)	2018-07-13 17:40:48 +05:30
Nabin Hait	b2da082798	Fixed logic and tests	2018-07-13 17:02:08 +05:30
Doridel Cahanap	6f06cc27e6	Update Qty and Rate in PO and SO	2018-07-13 17:02:08 +05:30
Alchez	9155e40bc7	[Fix] Set default CF in case none exist (#14829)	2018-07-09 16:57:42 +05:30
Alchez	8f2a0f3d79	[Fix] Incorrect assignment of Serial No in POS Invoice (#14772) ... * Fix incorrect assignment of serial no in Sales Invoice through POS * Add conversion factor to quantity check	2018-07-06 14:36:52 +05:30
Saurabh	1cfcf70905	Resolved merge conflicts	2018-07-06 13:18:44 +05:30
Manas Solanki	da486eeebd	Loyalty Program (#12631) ... * First Cut for the Loyalty Program * finished the collection part * redmeption for the loyalty point update the loyalty point entry in the FIFO style make the accounting entry knocking the debtors account against the expense account selected in the loyalty program update the outstanding balance in the client side * completed for the desk viewe * wrap up for the desk and shopping cart * pos * fix and test the travis	2018-07-06 12:36:57 +05:30
rohitwaghchaure	ea943c6fe4	[Fix] Due date validate issue in the POS (#14825)	2018-07-06 12:28:58 +05:30
Ameya Shenoy	935f4a474b	Prevent creation of more than 500 item variants (#14790)	2018-07-03 10:48:59 +05:30
Charles-Henri Decultot	6d97ab6f78	Make fields translatable (#14786)	2018-07-03 10:32:53 +05:30
rohitwaghchaure	01fe4a3726	[Fix] Consider the cancelled purchase receipt in backflush raw materials (#14753)	2018-07-01 16:41:39 +05:30
Rohit Waghchaure	ed71c36748	[Fix] Not able to save subcontracted purchase receipt	2018-06-28 18:36:35 +05:30
rohitwaghchaure	34c187706d	[Enhance] Added Budget exception approver role in company (#14645) ... * [Enhance] Added Budget exception approver role in company * Added test cases for budget	2018-06-25 10:31:08 +05:30
rohitwaghchaure	3a595d07d0	[Fix] POS Closing Voucher, on save collected amount becomes zero issue and added test cases (#14649) ... * [Fix] POS Closing Voucher, on save collected amount becomes zero * Added test cases for the POS Closing Voucher	2018-06-25 10:10:29 +05:30
rohitwaghchaure	d3fb0fbb20	Added test cases for asset accounting, asset value adjustment (#14572) ... * Added test cases for asset accounting, asset value adjustment * Accounting entry for the asset created manually * Added asset movement test cases and validation * Added validation to make asset from purchase receupt, invoice only	2018-06-22 15:40:59 +05:30
Saurabh	59798b4e88	resolved merge conflict	2018-06-20 15:23:25 +05:30
Nabin Hait	0bef91c241	minor fix in item type validation	2018-06-18 17:41:27 +05:30
rohitwaghchaure	77a45b43aa	Added expense account, cost center in the purchase order and material request item doctype and fix the code (#14535)	2018-06-15 18:03:31 +05:30
Ameya Shenoy	22c2f472e3	Merge branch 'master' into develop	2018-06-15 09:35:06 +00:00
Nabin Hait	d1f40ad0b6	minor fix	2018-06-14 17:09:55 +05:30
Nabin Hait	b2d3c0f040	Update ordered qty in blanket order	2018-06-14 15:56:29 +05:30
Manas Solanki	2df1b31707	[minor] minor fixes along with the codacy	2018-06-14 15:55:38 +05:30
Manas Solanki	e5e87f7137	[feature] Blanket Order ... - Creaete Sales or Purchase order from the blanket order - If there is any blanket order for the customer/supplier rates will be fetched from that order - Manually selecting the Blanket order will change the rates accordingly - Upon submission of the order, the ordered qty will be updated in the Blanket Order	2018-06-14 15:55:38 +05:30
Rohit Waghchaure	0eef3f665d	[Fix] Travis for stock entry	2018-06-13 13:06:25 +05:30
Rohit Waghchaure	b6381c66d8	[Fix] Purchase receipt test cases	2018-06-12 13:54:40 +05:30
Rohit Waghchaure	647d595158	Code cleanup and fixes for the asset	2018-06-11 19:15:08 +05:30
Prateeksha Singh	ea7533fa75	[tax-breakup] store itemized tax by item_name when can	2018-06-11 13:31:33 +05:30
rohitwaghchaure	7048925016	[Enhance] Standalone debit/credit note (#14269) ... * [Enhance] Standalone debit/credit note * Test cases * Test cases and documentation * Removed credit, debit note links from accounts module	2018-06-11 12:02:14 +05:30
Ameya Shenoy	873e28d9b8	Merge branch 'master' into develop	2018-06-06 05:53:19 +00:00
rohitwaghchaure	50d8c4a10f	[Fix] Not able to save purchase invoice, due to invalid condition (#14355)	2018-06-05 13:08:10 +05:30
rohitwaghchaure	2da6b3d628	[enhance] Provision to backflush raw materials based on stock entries for subcontracted items (#14296)	2018-06-05 13:06:52 +05:30
Zarrar	7c088ff623	dont validate items if item_code not found (#14344) ... item_code field is not set when created using invoice creation tool	2018-06-05 10:32:09 +05:30
Zarrar	fc03a0463c	[Fix] Validate items for saleable, purchaseable or subcontractable in transactions (#14316) ... * validate items to see if they are saleable * check if items are subcontractable or saleable * improvise name,error message and code Validate type function validates item if they are of proper type for that transaction and throws descriptive error.	2018-06-04 12:52:52 +05:30
Saurabh	0eb622f7da	[fix] resolve conflicts	2018-05-31 17:32:17 +05:30
Zarrar	b9f54ca946	[Enhance] Group same items during printing Delivery Note, Invoices, etc (#14250) ... * add doctypes allowed to group items, average the rate * add check field to group items during print * call common before_print in delivery note * fix precision issue while calculating average	2018-05-28 17:41:09 +05:30
Shreya Shah	e329038aaa	Total Quantity in Sales and Purchase DocTypes (#14114) ... * Add field to all sales and purchase doctypes * Add patch to update existing records * Modify taxes_and_totals.py	2018-05-28 11:49:08 +05:30
rohitwaghchaure	a8fb2db001	[Fix] If two po consolidated in one purchase invoice, Total Net Weight not get summed (#14230)	2018-05-26 09:23:02 +05:30
Nabin Hait	33df0b4fbf	Test case fixes (#14219) ... * Test case fixes * fetch_from fixes	2018-05-26 09:09:02 +05:30
Nabin Hait	5f861756a2	Item Default fixes	2018-05-23 19:37:06 +05:30
Ameya Shenoy	1cc7500be9	Merge branch 'master' into develop	2018-05-22 09:18:38 +00:00
mnatalia	5f0e8d6e09	Added possibility to translate (#14173)	2018-05-22 09:08:50 +05:30
Prateeksha Singh	984a7a7e61	[item-query] change order of description terms, name first	2018-05-17 17:29:36 +05:30
Rohit Waghchaure	992fb34c95	[Fix] Asset adjustment issues	2018-05-17 11:22:59 +05:30
Rohit Waghchaure	585945e65d	Allow to select Asset Received But Not Billed in expense account head	2018-05-17 00:23:27 +05:30
Rohit Waghchaure	2868840e6b	[Fix] Validation issue	2018-05-16 23:57:28 +05:30
rohitwaghchaure	4ea97c84ac	Merge pull request #14092 from rohitwaghchaure/enterprise_develop_asset_fixes_for_perpetual ... [Fix] Asset gl entry not creating for non perpetual	2018-05-16 18:21:20 +05:30
Rohit Waghchaure	421697250b	[Fix] Asset gl entry not creating for non perpetual	2018-05-16 18:20:52 +05:30
Manas Solanki	5b93562ce3	create default on making of invoice	2018-05-16 17:44:51 +05:30
Manas Solanki	e3bb1d0e3b	more fixes for the item defaults	2018-05-16 17:14:59 +05:30
Manas Solanki	64614374d8	fix codacy	2018-05-16 13:00:56 +05:30
Manas Solanki	bbd8508783	optimize the patch	2018-05-16 13:00:56 +05:30
Manas Solanki	087a2259d9	update for default warehouse	2018-05-16 12:44:07 +05:30
Rohit Waghchaure	144e9b178a	Added project condition in budget validation	2018-05-16 12:15:57 +05:30
tundebabzy	ad08d4ce96	Ability to hold payment for disputed invoices #12048 (#13298) ... * add new fields to Supplier Master: - on_hold: To signal the Customer is blocked from completing certain transactions - hold_type: 3 options - All, invoices and payments * sanitize `on_hold` field input * show hold status in list view * add `release_date` field to Supplier Master: - specifies the date when transaction restraint will be removed * reset release date if supplier is not on hold * add validation to stop transactions when Supplier is blocked * add test cases * return empty list for outstanding references if supplier is blocked * block make button:payment if supplier is blocked * adjust test cases * PEP 8 clean up * more tests * adds new fields to Purchase Invoice: - release_date: once set, invoice will be on hold until set date - hold_comment: so user can add comment pertaining to why invoice is on hold * implement individual purchase invoice on hold logic * allow user to change release date * update manual * final cleanup including more validation and tests * update supplier manual * make default for release_date argument todays date * remove Auto Repeat added by mistake * add on_hold_field to purchase invoice * add 'On Hold' or 'Temporarily on Hold' status for purchase invoice in list view * implement explicit payment hold in purchase invoice * update manual * add dialog for saving comment * bug fix, refactor, clean up * more test cases	2018-05-16 11:31:41 +05:30
Shreya Shah	1906cadd94	[Fix] Currency field in Pricing rule (#14004) ... * some minor changes * Set query for price list based on currency * Validate Price list with currency	2018-05-16 11:20:30 +05:30
Rohit Waghchaure	a02640e249	[Minor] Is fixed asset checkbox not set at server side if duplicate	2018-05-16 10:49:12 +05:30
rohitwaghchaure	f9fa588ddc	Merge pull request #14061 from rohitwaghchaure/budget_validation_enhance_in_mr_po ... [Enhance] Budget validation on material request, purchase order	2018-05-15 22:18:17 +05:30
Rohit Waghchaure	4d4fb6dcbc	[Enhance] Budget validation on material request, purchase order	2018-05-15 22:12:44 +05:30
rohitwaghchaure	c3b9eabe5e	Merge pull request #14048 from shreyashah115/exchange-rate ... [Enhancement] Buying and Selling checkboxes in Currency Exchange	2018-05-15 17:55:09 +05:30
Shreya	3f77852e93	Pass buying or selling as filter parameters ... Wherever get_exchange_rate is called, pass filter buying or selling on the basis of doctype.	2018-05-15 17:22:06 +05:30
Saurabh	62a59301ef	[fix] resolved merge conflicts	2018-05-15 13:02:40 +05:30
Saurabh	2ca83d61ea	Resolve merge conflicts from enterprise_sprint branch	2018-05-14 21:15:46 +05:30
rohitwaghchaure	7c6bef4905	Merge branch 'enterprise_sprint' into supplier-group	2018-05-14 20:39:01 +05:30
Rohit Waghchaure	d644e6da16	Code cleanup	2018-05-14 19:09:44 +05:30
Rohit Waghchaure	16bc853f6a	Reschedule for future depreciations and booked difference amount in accumulated depreciation account	2018-05-14 19:07:40 +05:30
Rohit Waghchaure	aa7b434270	Create asset adjustment doctype, post gl entry for the asset	2018-05-14 19:07:40 +05:30
Rohit Waghchaure	0ea6fe4397	Added new doctype Finance Book Detail in asset, asset category	2018-05-14 19:07:40 +05:30
Rohit Waghchaure	f2684ae83a	Commonify get_asset_category_account and get_fixed_asset_account method	2018-05-14 19:07:40 +05:30
Rohit Waghchaure	af05995418	Asset accounting	2018-05-14 19:07:39 +05:30
Rohit Waghchaure	c6deb13fb4	Added account fields in the company, fixes in auto creation of the asset from PR	2018-05-14 19:07:39 +05:30
Rohit Waghchaure	ab84254188	Asset linked to purchase receipt and serial no	2018-05-14 19:07:39 +05:30
Faris Ansari	69b0535e10	[fix] Incorrect currency conversion in Itemised Tax Breakup (#14006)	2018-05-14 14:19:31 +05:30
Zlash65	2e0809801d	controller and other changes	2018-05-14 11:45:38 +05:30
creador30	dae8f1b353	Search for item_code (#13912) ... Item query can be called from custom script to search for an additional field. In this case the item_name, item_group and item_description are still searchable, but not item_code. As the item code is a must have field in search results, I have added this to the non-changable search fields in this query.	2018-05-04 18:12:03 +05:30
Prateeksha Singh	a7c6ff8f3e	Merge pull request #13837 from shreyashah115/serial-batch-linking ... Serial No. and Batch No. linking	2018-05-02 15:11:19 +05:30
Saurabh	e85a43c1c6	Merge branch 'master' into develop	2018-05-02 14:48:10 +05:30
Faris Ansari	eae2ddac69	validate_conversion_rate in taxes_and_totals (#13880)	2018-05-02 12:19:30 +05:30
Faris Ansari	30304e68ff	[fix] Current stock qty calculation in case of different UOM	2018-04-30 15:44:49 +05:30
Shreya	14bd43d5eb	minor changes	2018-04-30 15:30:42 +05:30
Saurabh	63590496c1	[fix] resolved merge conflicts	2018-04-25 11:32:54 +05:30
rohitwaghchaure	57914f140e	[HotFix] Taxes not adding in POS sales invoice (#13776)	2018-04-24 19:19:47 +05:30
hiousi	38de994788	do not copy template description to variant if not in allow fields (#13726)	2018-04-24 12:10:45 +05:30
Zarrar	0e3b000e81	sql syntax fix (#13529)	2018-04-05 10:34:30 +05:30
Nabin Hait	2b682c82e8	Fixed merge conflict	2018-04-04 11:40:16 +05:30
Rushabh Mehta	d5f9ebd008	[optimize] item queries (#13480)	2018-04-02 23:37:33 +05:30
Manas Solanki	a7f5589564	fix for the update button in the sales invoice (#13435)	2018-04-02 10:32:00 +05:30
rohitwaghchaure	a3c3dec5a2	[enhance] Item Alternative (#13121) ... * [enhance] Item Alternative * Added two way provision in item alternative * Test Cases * documentation	2018-03-28 11:51:44 +05:30
Nabin Hait	b9c82b9790	Fixed merge conflict	2018-03-27 14:25:27 +05:30
rohitwaghchaure	85f63a3866	[Fix] Showing to bill even if per deliverd in sales order is 99.9996 (#13392)	2018-03-27 11:31:44 +05:30
Nabin Hait	061d912749	Fixed merge conflict	2018-03-23 16:20:27 +05:30
rohitwaghchaure	23fa8893a8	[Fix] Division by zero issue (#13362)	2018-03-22 11:16:00 +05:30
rohitwaghchaure	93779c21a7	[Fix] Project not set in the stock ledger entry (#13357)	2018-03-21 17:52:41 +05:30
Shreya	4d347b1ca0	travis fix	2018-03-19 17:31:19 +05:30
Shreya	f7b39438d2	travis fix	2018-03-19 14:19:55 +05:30
Nabin Hait	c8cd4ba6f7	Merge branch 'master' into develop	2018-03-15 12:38:43 +05:30
Nabin Hait	1e4cfb4bf5	Fixes in setting po nos manually in sales invoice	2018-03-15 12:27:24 +05:30
Nabin Hait	3707242770	Fixed merge conflict	2018-03-13 16:15:41 +05:30
Nabin Hait	96f4b22589	Set po nos in DN and SI (#13290)	2018-03-13 15:46:59 +05:30
Nabin Hait	2f493731ec	Fixed merge conflict	2018-03-12 15:49:59 +05:30
Shreya Shah	aa54d934b8	make stock qty negative (#13276)	2018-03-12 15:23:28 +05:30