4608 Commits

Author	SHA1	Message	Date
Deepesh Garg	1a4390de44	Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters	2020-11-25 14:51:11 +05:30
Deepesh Garg	6b9dda5f3e	fix: Move filter setup to doctype controllers	2020-11-25 14:49:10 +05:30
Marica	df17b4ff83	Merge branch 'develop' into pr-dn-return	2020-11-25 10:43:55 +05:30
Rucha Mahabal	6b57cf3285	feat: Quality Inspection on Job Card (#23964) ... * feat: Quality Inspection on Job Card * fix(Job Card): quality inspection filter query * fix: sider issues	2020-11-25 09:17:16 +05:30
marination	2ed80656aa	chore: Code Cleanup ... - Validate capacity < stock level only on new rule - Mention stock uom while validating capacity in new rule - Separate function to format and display unassigned items - Format ORM args	2020-11-24 21:07:56 +05:30
marination	2fbaa5dc58	Merge branch 'putaway' of https://github.com/marination/erpnext into putaway	2020-11-24 17:39:19 +05:30
marination	68a49efc80	chore: Added Putaway Rule to Desk Page and added Priority to List View	2020-11-24 17:38:34 +05:30
Marica	e762bc67eb	Merge branch 'develop' into putaway	2020-11-24 17:28:34 +05:30
Anurag Mishra	927106f552	fix: maintain stock can't be changed it there is product bundle	2020-11-24 15:02:52 +05:30
marination	ccbd432b56	chore: Added Tests ... - Fixed Sider Issues - Added perms to Putaway Rule - Added Unit Tests to check warehouse assignment	2020-11-24 12:47:13 +05:30
marination	0cec1477f2	chore: Format unassigned Items dialog and add freeze message	2020-11-23 19:19:35 +05:30
marination	90598ea19c	chore: Multi UOM support for Putaway ... - Added UOM & conversion factor field in Putaway Rule - Items are split and assigned as per UOM - Handled Whole UOMs too	2020-11-23 17:35:13 +05:30
Rucha Mahabal	9a73a67dcd	Merge pull request #23982 from pateljannat/track-changes-in-stock-settings ... fix: enabling track changes for stock settings	2020-11-23 15:57:48 +05:30
pateljannat	34f381df17	fix: enabling track changes for stock settings	2020-11-23 15:31:08 +05:30
marination	9596276b95	fix: Linter and Sider	2020-11-23 10:32:17 +05:30
Jannat Patel	34d07b6306	fix: purchase receipt to purchase invoice bill date mapping (#23967) ... Co-authored-by: pateljannat <jannatpatel@MacBook-Air.local>	2020-11-20 19:22:35 +05:30
marination	c7991f8561	feat: Putaway Rule	2020-11-20 11:53:20 +05:30
marination	86e03325c3	Merge branch 'develop' of https://github.com/frappe/erpnext into putaway	2020-11-19 14:07:48 +05:30
Marica	9b897c4073	Merge branch 'develop' into pr-dn-return	2020-11-19 12:21:38 +05:30
Rucha Mahabal	14514f776b	fix: Enable Allow Auto Repeat for standard doctypes having auto_repeat field (#23776) ... Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>	2020-11-19 08:17:16 +05:30
Marica	6dafe1eabf	feat: Formula based Quality Inspection (#23916) ... * feat: Formula based Quality Inspection * chore: Added Test for Formula Based QI reading	2020-11-19 08:12:58 +05:30
Shivam Mishra	3bec3cfef1	fix: don't use primary action for create	2020-11-18 17:10:02 +05:30
rohitwaghchaure	67ba0462e9	Merge pull request #23408 from kevingdc/fix/item-price-duplicate-checking ... fix: Item price duplicate checking	2020-11-18 16:41:48 +05:30
Rushabh Mehta	542bc01718	fix(minor): update routes	2020-11-18 15:00:34 +05:30
Shivam Mishra	e0b2e31f86	Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui	2020-11-17 12:28:14 +05:30
rohitwaghchaure	7aa60d1dea	fix: stock ageing report not working (#23923)	2020-11-17 12:10:27 +05:30
rohitwaghchaure	1c8c1d78e9	fix: default cost center in item master not set in stock entry (#23877) ... Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-11-15 09:40:44 +05:30
Shivam Mishra	bed717b442	Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui	2020-11-12 11:32:59 +05:30
Jannat Patel	0ea0a7495c	fix: making company address read-only in delivery note (#23890)	2020-11-12 11:10:59 +05:30
marination	c1b0e65f9f	feat: Putaway	2020-11-12 09:54:44 +05:30
Marica	2b44f22cf4	Merge branch 'develop' into fix-po-no-fetching	2020-11-11 11:10:34 +05:30
Marica	63d1a0436c	Merge branch 'develop' into fix-po-no-fetching	2020-11-09 12:59:10 +05:30
Marica	7e1511f527	Merge branch 'develop' into purchase-invoice-payment-terms	2020-11-06 12:28:55 +05:30
Afshan	4d3e83682e	fix: showing error for wrong filters.	2020-11-06 12:25:46 +05:30
Marica	d845e8a53a	Merge branch 'develop' into pr-dn-return	2020-11-06 12:25:11 +05:30
Marica	6d2bcd2404	Merge branch 'develop' into purchase-invoice-payment-terms	2020-11-05 12:25:38 +05:30
Marica	fd2b7d3c1d	Merge branch 'develop' into dialog-cleanup	2020-11-05 12:22:50 +05:30
rohitwaghchaure	64059db69f	Merge pull request #23814 from Anurag810/stock_ledger_report ... fix: list index out of range on including UOM	2020-11-05 11:49:46 +05:30
Afshan	cdc17bb9f3	fix: added code for testing	2020-11-04 19:28:55 +05:30
Anurag Mishra	09b8ca0ddb	fix: list index out of range on incilding uom	2020-11-04 15:04:50 +05:30
marination	7837161a3f	fix: Sider	2020-11-03 22:09:42 +05:30
Marica	7b42e8e27c	Merge branch 'develop' into dialog-cleanup	2020-11-03 16:26:06 +05:30
marination	f21e3fbf04	chore: Tests ... - Added test for mapping secnd return doc - Added test for billing % of partially returned doc - Handled PR with 0 billing amount	2020-11-03 12:01:56 +05:30
Kevin Chan	a2ba8ea74a	style: Clean up code formatting	2020-11-03 10:57:52 +08:00
Kevin Chan	312561fd77	Merge branch 'develop' into fix/item-price-duplicate-checking	2020-11-03 10:56:23 +08:00
marination	3991b84b2b	chore: Avoid multiline string in Translation & remove print statement	2020-11-02 15:23:41 +05:30
marination	28dd90f3dc	Merge branch 'develop' of https://github.com/frappe/erpnext into pr-dn-return	2020-11-02 15:16:31 +05:30
marination	d6596a169c	fix: Billing % Logic and Map Pending Qty only in PR and DN ... - Billing % should consider unreturned amount as total - While mapping to return doc, map unreturned amount - Added field Received Qty in Stock UOM, to tally against Returned Qty in PR - PR billing percentage updation custom function - In patch set received qty in stock uom first, then update returned qty and billing	2020-11-02 15:07:48 +05:30
marination	542ae6ab97	chore: Linter and Sider fixes ... - Translatable strings cannot be multi line or be formatted by '+' - Reduce no of tabs in stock_entry.js	2020-11-02 08:50:48 +05:30
marination	66b2b544f8	chore: Purchase Receipt, added required by date in PO popup	2020-10-30 17:45:28 +05:30
marination	e14fdf4a3c	chore: RFQ cleanup and Title case for 'Get Items From' ... - Cleanup up RFQ Get Items From Dialogs - Title cased 'Get items from' to 'Get Items From'	2020-10-30 17:06:00 +05:30
Rohit Waghchaure	71913c36a7	fix: po_detail field has no value for subcontracted stock entry	2020-10-30 14:35:16 +05:30
marination	6bf507a54b	chore: (MR)Added delivery date in SO dialog	2020-10-30 13:59:47 +05:30
Deepesh Garg	9c67629e28	fix: Ignore cancelled entries instock balance report (#23757) ... Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-10-29 19:51:57 +05:30
prssanna	71e5b60df1	refactor: refactor contextual print setting implementation	2020-10-29 14:19:34 +05:30
Marica	7496ac0fe2	Merge branch 'develop' into pr-dn-return	2020-10-28 11:54:01 +05:30
Rushabh Mehta	1dd54e457d	Merge pull request #23734 from rmehta/quality-form-cleanup ... fix(cleanup): Quality Module, cleanup of forms, dashboards etc.	2020-10-28 11:36:00 +05:30
Marica	cf8698fb0b	Merge branch 'develop' into pr-dn-return	2020-10-27 15:34:51 +05:30
marination	67f2c82d90	chore: Test case for Payment Terms in PI from PR	2020-10-27 14:49:43 +05:30
marination	fa085d7f4b	fix: Payment Terms not fetched in Purchase Invoice from Purchase Receipt	2020-10-27 13:18:30 +05:30
Afshan	bd987e56bc	fix: showing error for wrong filters. (#23726) ... * fix: showing error for wrong filters. * style: formatting translation	2020-10-26 19:37:33 +05:30
Rushabh Mehta	ea49e30bfd	fix(cleanup): cleaned up forms	2020-10-26 15:30:52 +05:30
Saqib	34873bf26b	fix: multiple pos issues (#23725) ... * fix: point of sale search * fix: pos fetches expired serial nos * fix: pos doesn't refresh on route change * fix: opening balances not set in opening entry * fix: remove debug statement * fix: invalid query if no serial no is reserved by pos invoice * chore: make new order btn primary * chore: filter warehouse by company * chore: add shortcuts for new order and email * fix: cannot fetch serial no if no batch control * chore: add shortcuts for menu items * feat: standard keyboard shortcuts for pos page * feat: display only items that are in stock * fix: empty point of sale page if opening entry dialog is closed * feat: conversion factor in pos item details * fix: show all invalid mode of payments * chore: show all items if allow negative stock is checked * fix: -ve amount set when changing mode of payment * fix: pos closing validations * fix: test * fix: non expired serial no fetching query * fix: cannot dismiss pos opening creation dialog * fix: transalation strings * fix: msgprint to throw * chore: use as_list in frappe.throw * chore: clean up pos invoice.js & .py * fix: codacy * fix: transalation syntax * fix: codacy * fix: set_missing_values called twice from pos page * fix: mode selector with double spaces * fix: do not allow tables in pos additional fields * fix: pos is not defined * feat: set mode of payments for returns * fix: remove naming series from pos profile * fix: error message * fix: minor bugs * chore: re-arrange pos closing entry detail fields * fix: sider & frappe linter * fix: more translation strings * fix: travis * fix: more translation strings * fix: sider * fix: travis * fix: unexpected end of string * fix: travis	2020-10-26 13:24:47 +05:30
Rohit Waghchaure	103ecec9d4	fixed translation syntax	2020-10-26 12:20:11 +05:30
Rohit Waghchaure	9caac6976c	fix: incorrect supplied qty error	2020-10-26 12:19:00 +05:30
rohitwaghchaure	4c688b71f3	fix: consumed qty logic for subcontracted raw materials (#23314) ... * fix: consumed qty logic for subcontracted raw materials * added test case * fix: sales order workflow test case	2020-10-26 12:19:00 +05:30
rohitwaghchaure	1cfa61628d	fix: incorrect calculation for consumed qty for subcontract item (#23257) ... * fix: incorrect calculation for consumed qty for subcontract item * added test case	2020-10-26 12:19:00 +05:30
Saqib	60212ff9b9	fix: multiple pos issues (#23347) ... * fix: point of sale search * fix: pos fetches expired serial nos * fix: pos doesn't refresh on route change * fix: opening balances not set in opening entry * fix: remove debug statement * fix: invalid query if no serial no is reserved by pos invoice * chore: make new order btn primary * chore: filter warehouse by company * chore: add shortcuts for new order and email * fix: cannot fetch serial no if no batch control * chore: add shortcuts for menu items * feat: standard keyboard shortcuts for pos page * feat: display only items that are in stock * fix: empty point of sale page if opening entry dialog is closed * feat: conversion factor in pos item details * fix: show all invalid mode of payments * chore: show all items if allow negative stock is checked * fix: -ve amount set when changing mode of payment * fix: pos closing validations * fix: test * fix: non expired serial no fetching query * fix: cannot dismiss pos opening creation dialog * fix: transalation strings * fix: msgprint to throw * chore: use as_list in frappe.throw * chore: clean up pos invoice.js & .py * fix: codacy * fix: transalation syntax * fix: codacy * fix: set_missing_values called twice from pos page * fix: mode selector with double spaces * fix: do not allow tables in pos additional fields * fix: pos is not defined * feat: set mode of payments for returns * fix: remove naming series from pos profile * fix: error message * fix: minor bugs * chore: re-arrange pos closing entry detail fields * fix: sider & frappe linter * fix: more translation strings * fix: travis * fix: more translation strings * fix: sider * fix: travis * fix: unexpected end of string * fix: travis Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-10-26 11:17:04 +05:30
Nabin Hait	da301b0b7a	fix: merge conflict	2020-10-25 13:07:59 +05:30
rohitwaghchaure	8be296b343	Merge pull request #23675 from rohitwaghchaure/feat-added-balance-serial-no-column-develop ... feat: balance serial nos in stock ledger report	2020-10-24 19:04:31 +05:30
Michelle Alva	b39c17dd55	fix: Typo/Grammatical fixes in Settings (#23612) ... * fix(Stock Settings): Type/Grammatical fixes in Settings * fix: grammatical fixes in manufacturing settings * fix: typo fix in accounting settings * fix: typo fixes in HR settings * fix: typo fixes in buying settings * fix: typo fixes in Selling Settings * Update erpnext/accounts/doctype/accounts_settings/accounts_settings.json Co-authored-by: Sagar Vora <sagar@resilient.tech> * Apply suggestions from code review Co-authored-by: Sagar Vora <sagar@resilient.tech> * Apply suggestions from code review Co-authored-by: Sagar Vora <sagar@resilient.tech> * Update accounts_settings.json Co-authored-by: Marica <maricadsouza221197@gmail.com> Co-authored-by: Nabin Hait <nabinhait@gmail.com> Co-authored-by: Rushabh Mehta <rmehta@gmail.com> Co-authored-by: Sagar Vora <sagar@resilient.tech>	2020-10-23 18:22:26 +05:30
rohitwaghchaure	4eb87ea8e2	Merge pull request #23695 from rohitwaghchaure/fix-stock-entry-consumption-issue ... fix: incorrect backflush qty in manufacture entry	2020-10-23 15:43:43 +05:30
Rohit Waghchaure	558879fad7	fix: Translation Syntax	2020-10-23 13:42:51 +05:30
Nabin Hait	9ff4a2ebd8	Merge branch 'develop' into feat-added-balance-serial-no-column-develop	2020-10-22 21:40:29 +05:30
Marica	3b1be2b1de	fix: Add Taxes if missing via Update Items (#23702) ... * fix: Add Taxes if missing via Update Items * chore: PO Test for adding tax row via Update Items * chore: SO Test for adding tax row via Update Items	2020-10-22 17:04:31 +05:30
rohitwaghchaure	cc5171a324	Merge branch 'develop' into stock_entry_conversion_factor	2020-10-22 15:20:32 +05:30
Rohit Waghchaure	fa842e8774	fix: incorrect backflush qty in manufacture entry	2020-10-22 13:35:27 +05:30
Shivam Mishra	5e00ed926c	feat: update icons	2020-10-21 12:30:22 +05:30
Shivam Mishra	9d468a8daf	Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui	2020-10-21 11:38:31 +05:30
Rohit Waghchaure	09572f10f8	fix: overproduction, not allowed to transfer extra materials	2020-10-20 11:01:36 +05:30
Deepesh Garg	8859b71956	fix: Check for backdated validation only for transaction company (#23639) ... * fix: Check SLE only for transaction company * fix: Add tests * fix: Move backdated entry validation from transaction base to stock ledger entry * chore: Add tests Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-10-19 16:56:45 +05:30
rohitwaghchaure	3a17147a32	refactor: book loss amount in the COGS instead of stock received but not billed (#23671)	2020-10-19 16:54:11 +05:30
rohitwaghchaure	2fbeb7c1dd	refactor: added new filters in the Batch-wise balance history report (#23676) ... * refactor: added new filters in the Batch-wise balance history report * fix: added semicolon Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-10-19 11:37:54 +05:30
rohitwaghchaure	5d6686bd8c	Fixed stock ageing report data develop (#23673) ... * fix: stock ageing report * Update stock_ageing.py	2020-10-19 10:39:20 +05:30
Rohit Waghchaure	e6a29cc33a	fix: performance issue while adding template item in the cart	2020-10-16 17:59:54 +05:30
Rohit Waghchaure	76fafe8842	feat: balance serial nos in stock leder report	2020-10-16 17:58:54 +05:30
Deepesh Garg	775e689ba9	fix: Add tests	2020-10-15 22:09:05 +05:30
Deepesh Garg	01a7297f69	Merge branch 'develop' of https://github.com/frappe/erpnext into stock_entry_conversion_factor	2020-10-15 17:13:29 +05:30
Rohit Waghchaure	5f465394a7	fix: serial no field is blank in stock reconciliation	2020-10-15 15:56:50 +05:30
Shivam Mishra	cb8457b9ae	feat: add description to Accounts onboarding	2020-10-15 13:53:12 +05:30
Shivam Mishra	55f52e8135	Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui	2020-10-13 20:09:22 +05:30
Marica	50b708f615	Merge branch 'develop' into pr-dn-return	2020-10-13 16:57:11 +05:30
Marica	c5e139a542	fix: Travis (#23606) ... * fix: Rename `make_supplier_quotation` to `make_supplier_quotation_from_rfq` in missing places * fix: Item Barcode and Test * fix: Over Receipt on subcontracting test * fix: POS Invoice and Loyalty Program Tests * fix: POS serialized item test and subcontracting exploded items in PO * fix: Subcontracting test considering sourced_by_supplier items * fix: Make only one Additonal Salary List with overwrite set	2020-10-13 16:53:10 +05:30
Saqib	ebb0a6266a	fix: last purchase rate in item prices report (#23506) ... * fix: last purchase rate in item prices report * fix: last purchase rate in item prices report * fix: last purchase rate in item prices report * chore: fetch last purchase rate from update stock purchase invoices	2020-10-12 17:09:09 +05:30
Marica	e9f0268d32	Merge branch 'develop' into item-attribute-validation-on-non-template-item	2020-10-12 15:26:34 +05:30
Marica	aeba75cd08	Merge branch 'develop' into mr-ux	2020-10-12 15:17:32 +05:30
rohitwaghchaure	4e59abf0bf	Merge pull request #23583 from anupamvs/item-price ... fix: can't save item price after adding child table	2020-10-12 15:15:50 +05:30
Kevin Chan	f6bcd5c2b2	test: Add test case for duplicate checking	2020-10-12 16:57:33 +08:00
Kevin Chan	58389ebd40	style: Collapse whitespace	2020-10-12 15:20:11 +08:00
marination	03975a692e	fix: Perform Item Attribute Value Validation on Variants Only	2020-10-12 12:03:07 +05:30
Kevin Chan	39bed3a65e	fix: Add null or empty checking to validation ... This commit adds null or empty checking in the **Item Price** DocType's `check_duplicates()`. This was done to fix a bug where some prices are shown to be duplciates even though they aren't because they don't have values in some fields.	2020-10-12 11:42:05 +08:00
Kevin Chan	a322f0d0b3	chore: Fix error message grammar	2020-10-12 11:38:55 +08:00
Anupam	2be23309bb	fix: can't add child table in item price	2020-10-11 14:14:50 +05:30
marination	bd6d5eb5ac	fix: Remove Production Order reference from Item Validation	2020-10-09 20:57:17 +05:30
Deepesh Garg	8242da6310	Merge branch 'develop' of https://github.com/frappe/erpnext into stock_entry_conversion_factor	2020-10-08 16:23:34 +05:30
michellealva	3525ddabc5	fix: Add links in Stock desk page	2020-10-07 19:02:19 +05:30
marination	c213cd96c5	fix: Handle Blank from/to range in Numeric Item Attribute	2020-10-02 12:22:28 +05:30
marination	0bc61b31f7	chore: Move Qty fields (received qty,etc.) close to Qty/Stock UOM	2020-10-02 11:54:54 +05:30
Sagar Vora	382676d875	Merge branch 'develop' into mr-stock-uom-v13	2020-09-27 20:09:00 +05:30
prssanna	fec4ea5643	fix: set stock uom in tem while creating material request from stock entry	2020-09-25 18:01:12 +05:30
Shivam Mishra	9a4d603403	Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui	2020-09-25 11:44:37 +05:30
Michelle Alva	879a8ef26b	fix: Change button label in Item (#23410)	2020-09-23 15:36:07 +05:30
Deepesh Garg	2bf4245334	fix: Conversion factor fixes in Stock Entry	2020-09-23 12:50:06 +05:30
Marica	ef2b5e8284	Merge branch 'develop' into pr-dn-return	2020-09-22 15:39:25 +05:30
rohitwaghchaure	7230b0f9a0	Merge pull request #23360 from anupamvs/batch-wise ... fix: Batch-Wise Balance History filter validation	2020-09-22 10:32:51 +05:30
Saqib	f2ea3877c8	fix: depreciation start date ux fixes (#23339)	2020-09-20 19:31:18 +05:30
Deepesh Garg	e3ee63f677	Merge pull request #23346 from AfshanKhan/stock-entry-warehouse-address-filter ... fix: warehouse address filtered based on warehouse	2020-09-19 18:17:08 +05:30
marination	b782d2a99d	fix: Added back accidentally deleted field	2020-09-19 01:04:28 +05:30
marination	90d9d80ef9	fix: More MR UX fixes	2020-09-19 00:43:53 +05:30
Abhishek Balam	4e6733293f	fix(DocTypes): Reset "owner" values in DocTypes to Administrator (#23350) ... * fix: reset owner values in doctype to Administrator * fix: updated modified value * fix: also fixed modified by * fix: change modified_by to Administrator	2020-09-18 18:27:24 +05:30
Anupam	bf166736b0	fix: Batch-Wise Balance History filter validation	2020-09-18 17:15:49 +05:30
Afshan	d5710b4d6f	style: removed extra spaces	2020-09-17 13:01:47 +05:30
Afshan	e813684433	fix: warehouse address filtered based on warehouse	2020-09-17 12:57:26 +05:30
Marica	c4a8c9eb26	Merge branch 'develop' into pr-dn-get-items	2020-09-14 11:09:32 +05:30
marination	9205101ecf	fix: Make Reference fields mandatory in Quality Inspection	2020-09-12 16:17:13 +05:30
marination	0a688005be	fix: Make sure Supplier/Customer is selected before fetching Items.	2020-09-12 15:39:27 +05:30
Suraj Shetty	67095d239f	fix: Custom dashboard sections	2020-09-10 17:15:52 +05:30
marination	83a03689a1	fix: Use independent item for DN Test	2020-09-09 20:51:01 +05:30
marination	efb211af6d	chore: Fix Received/Delivered Items to Billed Logic	2020-09-09 16:24:11 +05:30
Marica	52e87d1a4f	Merge branch 'develop' into pr-dn-return	2020-09-09 11:56:26 +05:30
marination	8484d1cd95	fix: Patch and test codacy	2020-09-08 20:58:33 +05:30
marination	315bf3051c	chore: Tests for Delivery Note	2020-09-08 19:27:36 +05:30
marination	e35fd5e305	chore: Tests for Purchase Receipt	2020-09-08 16:24:10 +05:30
Afshan	9691422fb7	feat: added report for mismatch in serial nos and stock quantity in warehouse (#22669) ... * feat: added report for mismatch in serial nos and stock quantity in warehouse * style: removed print statement * fix: rename of reports and refactor of code * fix: handled null condition for actual qty and added report link in stock desk page * style: breaking code in multiple lines	2020-09-08 11:57:15 +05:30
Marica	0411026ad6	Merge branch 'develop' into pr-dn-return	2020-09-08 10:48:44 +05:30
rohitwaghchaure	515d8b9e50	Merge pull request #23259 from anupamvs/se-quntity ... fix: SE quantity data type issue	2020-09-04 16:07:13 +05:30
Anupam K	faebef21b7	fix: SE quantity data type issue	2020-09-04 15:09:16 +05:30
Rohit Waghchaure	68b0108301	fix: incorrect qty after transaction in stock ledger entry	2020-09-03 15:10:07 +05:30
marination	731bae170e	fix: Test for Over Receipt via PRs on a PO	2020-08-28 14:09:02 +05:30
Suraj Shetty	f39bb116cc	Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui	2020-08-27 19:27:49 +05:30
prssanna	a324e9bd12	fix: remove text-muted and small class fromtree items	2020-08-27 19:26:14 +05:30
Suraj Shetty	b6ebcd7559	refactor: Replace darkgray indicator with gray indicator	2020-08-27 18:57:18 +05:30
prssanna	744169833c	fix: replace indicator color darkgrey with darkgray	2020-08-27 17:06:10 +05:30
Shivam Mishra	7556517a4f	feat: validate if removed item attributes exist in variants (#22911) ... * feat: validate if removed item attributes exist in variants * Update erpnext/stock/doctype/item/item.py Co-authored-by: Marica <maricadsouza221197@gmail.com> * Update erpnext/stock/doctype/item/item.py Co-authored-by: Marica <maricadsouza221197@gmail.com> * refactor: smaller loop Co-authored-by: marination <maricadsouza221197@gmail.com> * feat: don't run validation for new entries Co-authored-by: Marica <maricadsouza221197@gmail.com> * fix: use tuple as is Co-authored-by: Marica <maricadsouza221197@gmail.com> * refactor: error description Co-authored-by: Marica <maricadsouza221197@gmail.com> * refactor: remove unused variable Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-08-24 19:37:09 +05:30
rohitwaghchaure	cf4268e21a	Merge pull request #23116 from nabinhait/subcontracted-pr-gle ... fix: GLE for subcontracted PR is fg item rate is zero	2020-08-24 16:07:32 +05:30
Deepesh Garg	8331a38ace	fix: Test Case for qty less than 1	2020-08-23 21:23:26 +05:30
Deepesh Garg	cb0bc2dcaf	fix: Negative SLE not created for fraction qty or qty less than 1	2020-08-23 20:43:50 +05:30
Suraj Shetty	a43e760703	fix: Item dashboard style	2020-08-23 16:36:28 +05:30
Suraj Shetty	6f9f40992c	Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui	2020-08-23 16:33:50 +05:30
Nabin Hait	337ee0a4bf	test: Test case for GLE in subcontracted PR if FG item rate is zero	2020-08-22 20:02:27 +05:30
Nabin Hait	df175cc8fc	fix: GLE for subcontracted PR is fg item rate is zero	2020-08-22 19:17:18 +05:30
Anupam Kumar	674d1b0803	feat: Material Request and Stock Entry Enhancement (#22671) ... * feat: send to warehouse * adding warehouse validation * fix: review changes * fix: review changes * stock entry enhancement * fix: review changes	2020-08-12 17:55:02 +05:30
Rucha Mahabal	e0cc421e50	fix: TypeError while setting transfer_qty in Stock Entry (#22929) ... Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-08-12 14:33:30 +05:30
Shivam Mishra	2fe5d76fe4	Merge branch 'develop' into item-image-alt	2020-08-11 14:45:55 +00:00
Anupam Kumar	79d731dcd8	feat: Naming series for Sales/Purchase Return (#22942) ... * feat: adding return naming series * Update purchase_invoice.json Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-08-11 16:11:20 +05:30
Shivam Mishra	ded9f41cce	refactor: update confusing label	2020-08-10 12:45:07 +05:30
Shivam Mishra	b1f8859121	feat: add alt value in product page	2020-08-07 14:38:40 +05:30
Shivam Mishra	ba4c4f107e	feat: add image alt field in items	2020-08-07 14:34:28 +05:30
Afshan	085061fa21	fix: show or hide section or attributes depending on other attributes… (#22861) ... * fix: show or hide section or attributes depending on other attributes for better UI * Update erpnext/stock/doctype/item/item.js Co-authored-by: Marica <maricadsouza221197@gmail.com> * fix: made has_variants checkbox to read_only if stock_exists Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-08-06 14:36:34 +05:30
Suraj Shetty	8d05514260	refactor: Format and sanitise user inputs to search queries. (#22922) ... * refactor: Sanitize whitelisted method inputs Co-authored-by: Prssanna Desai <prssud@gmail.com> Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com> * refactor: Format and sanitize tax_account_query inputs Co-authored-by: Nabin Hait <nabinhait@gmail.com> Co-authored-by: Prssanna Desai <prssud@gmail.com> Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com> * refactor: Validate and sanitize search inputs via decorator Co-authored-by: Nabin Hait <nabinhait@gmail.com> Co-authored-by: Prssanna Desai <prssud@gmail.com> Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com> * style: Minor formatting fix * refactor: Validate and sanitize search inputs using decorator * fix: Typo * fix: Remove unwanted import statement * refactor: Repalce validate_and_sanitize_search_inputs() with validate_and_sanitize_search_inputs Co-authored-by: Prssanna Desai <prssud@gmail.com> Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com> Co-authored-by: Prssanna Desai <prssud@gmail.com> Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com> Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-08-05 20:07:30 +05:30
Suraj Shetty	1923ef052c	refactor: Format and sanitise user inputs to search queries. (#22913) ... * refactor: Sanitize whitelisted method inputs Co-authored-by: Prssanna Desai <prssud@gmail.com> Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com> * refactor: Format and sanitize tax_account_query inputs Co-authored-by: Nabin Hait <nabinhait@gmail.com> Co-authored-by: Prssanna Desai <prssud@gmail.com> Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com> * refactor: Validate and sanitize search inputs via decorator Co-authored-by: Nabin Hait <nabinhait@gmail.com> Co-authored-by: Prssanna Desai <prssud@gmail.com> Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com> * style: Minor formatting fix * refactor: Validate and sanitize search inputs using decorator * fix: Typo * fix: Remove unwanted import statement * refactor: Repalce validate_and_sanitize_search_inputs() with validate_and_sanitize_search_inputs Co-authored-by: Prssanna Desai <prssud@gmail.com> Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com> Co-authored-by: Prssanna Desai <prssud@gmail.com> Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com> Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-08-05 19:42:25 +05:30
Marica	e211bb7a53	fix: Reposition description in Warehouse (#22895)	2020-08-03 20:40:09 +05:30
Marica	4e0989d0cb	fix: Misleading description in Warehouse (#22878)	2020-08-03 14:56:20 +05:30
Marica	dd97524db5	fix: Misleading description in Warehouse (#22877) ... Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2020-08-03 14:55:40 +05:30
marination	d36df92750	fix: Codacy and repositioned Returned Qty in DN Item	2020-07-31 20:22:55 +05:30
marination	ba37fe796c	chore: Delivery Note Return status	2020-07-31 20:01:06 +05:30
marination	66069df020	feat: Return tracking in PR/DN	2020-07-31 15:54:05 +05:30
Shivam Mishra	11111cd9a9	Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui	2020-07-30 21:29:02 +05:30
prssanna	60cdef7d57	fix: add range filters to oldest items chart	2020-07-29 18:06:54 +05:30
Prssanna Desai	9e81bb9a11	fix: add range filters to oldest items chart (#22842)	2020-07-29 17:28:30 +05:30
Deepesh Garg	9119b4c538	fix: Unable to submit backdated stock transactions for different items (#22648) ... * fix: Unable to submit backdated stock transactions for different items * fix: Test cases * fix: Test Cases * fix: Test Cases * fix: Test for stock account JV * fix: Journal Entry Test	2020-07-28 08:49:44 +05:30
Deepesh Garg	fa28e600b5	fix: Unable to submit backdated stock transactions for different items (#22822) ... * fix: Unable to submit backdated stock transactions for different items * fix: Test cases * fix: Test Cases * fix: Test Cases * fix: Test for stock account JV * fix: Journal Entry Test * fix: Delete unwanted code	2020-07-28 08:49:21 +05:30
Nabin Hait	a8efe8eb5f	Merge branch 'develop' into version-13-beta-pre-release	2020-07-24 11:15:13 +05:30
Afshan	73b86d241c	fix: conversion to float	2020-07-23 21:09:27 +05:30
Afshan	13d2a34548	Merge remote-tracking branch 'upstream' into add-age-range-in-stock-ageing ... Merge remote-tracking branch 'upstream' into add-age-range-in-stock-ageing	2020-07-23 20:35:21 +05:30
Afshan	7965f655a2	Merge branch 'add-age-range-in-stock-ageing' of https://github.com/AfshanKhan/erpnext into add-age-range-in-stock-ageing ... Merge branch 'add-age-range-in-stock-ageing' of https://github.com/AfshanKhan/erpnext into add-age-range-in-stock-ageing	2020-07-23 20:33:43 +05:30
Afshan	775fbe74c5	fix: fixed the logic	2020-07-23 20:33:07 +05:30
Abhishek Balam	d05a98517d	Fix: Increase Length Of "In Words" and "In Words (Company Currency)" fields (#22732) ... * new parent updating logic, made requested changes * fix: Increase Length of In Words fields Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-07-23 19:01:31 +05:30
Nabin Hait	9389b3625a	Merge branch 'develop' into add-age-range-in-stock-ageing	2020-07-23 18:53:00 +05:30
Saqib	a6f98d48bc	refactor: POS workflow (#20789) ... * refactor: add pos invoice doctype replacing sales invoice in POS * refactor: move pos.py to pos invoice * feat: add pos invoice merge log doctype * feat: ability to merge pos invoices into a sales invoice * feat: [wip] new ui for point of sale * fix: pos.py moved to pos_invoice * feat: loyalty points for POS Invoice * fix: loyalty points on merging * feat: return against pos invoices * Merge 'fork/serial-no-selector' into refactor-pos-invoice * chore: status fix and set warehouse from pos profile * fix: naming series * feat: merge pos returns into credit notes * feat: add pos list action for merging into sales invoices * feat[UX]: add shortcuts & focus on search after customer selection * feat: stock validation from previous pos transactions * Merge 'fork/serial-no-selector' into refactor-pos-invoice * chore: fix df not found for base_amount precision * feat: serial no validation from previous pos transactions * chore: move pos.py into pos page * feat: pos opening voucher * feat: link pos closing voucher with opening voucher * chore: use map_doc instead of get_mapped_doc for better perf * feat: enforce opening voucher on pos page * feat: [ui] [wip] point of sale beta ui refactor * fix: auto fetching serial nos with batch no * feat: [ui] item details section for new pos ui * feat: remove item from cart * refactor: [ui] [wip] split point_of_sale into components * new payment component * new numberpad * fix pos opening status * move from flex to grids * fix: search from item selector * feat: loyalty points as payment method * feat: pos invoice status * fix a bug with invalid JSON * fix: loyalty program ui fixes * feat: past order list and past order summary * feat: (minor) setting discount from item details * fix: adding item before customer selection * feat: post order submission summary * save and open draft orders * fix: item group filter * fix: item_det not defined while submitting sle * fix: minor bugs * fix: minor ux fixes * feat: show opening time in pos ui * feat: item and customer images * feat: emailing and printing an invoice * fix: item details field edit shows empty alert * fix: (minor) ux fixes * chore: rename pos opening voucher to pos opening entry * chore: (minor) rename pos closing voucher and sub doctypes * chore: add patch for renaming pos closing doctypes * fix: negative stock not allowed in pos invoices* default is_pos in pos invoices* fix: transalation * fix: invoices not getting fetched on pos closing * fix: indentation * feat: view / edit customer info * fix: minor bugs * fix: minor bug * fix: patch * fix: minor ux issues * fix: remove uppercase status * refactor: pos closing payment reconciliation * fix: move pos invoice print formats to pos invoice doctype * fix: ui issues * feat: new child doctype to store pos payment mode details * fix: add to patches.txt * feat: search by serial no * chore: [wip] code cleanup * fix: item not selectable from cart * chore: [wip] code cleanup * fix: minor issues * loyalty points transactions * default payment mode * fix: minor fixes * set correct mop amount with loaylty points * editing draft invoices from UI * chore: pos invoice merge log tests * fix: batch / serial validation in pos ui and on submission * feat: use onscan js for barcode scan events * fix: cart header with amount column * fix: validate batch no and qty in pos transactions * chore: do not fetch closing balances as opening balance * feat: show available qty in item selector * feat: shortcuts * fix: onscan.js not found * fix: onscan.js not found * fix: cannot return partial items * fix: neagtive stock indicator * feat: invoice discount * fix: change available stock on warehouse change * chore: cleanup code * fix: pos profile payment method table * feat: adding same item with different uom * fix: loyalty points deleted after consolidation * fix: enter loyalty amount instead of loyalty points * chore: return print format * feat: custom fields in pos view * chore: pos invoice test * chore: remove offline pos * fix: cyclic dependency * fix: cyclic dependency * patch: remove pos page and order fixes * chore: little fixes * fix: patch perf and plural naming * chore: tidy up pos invoice validation * chore: move pos closing to accounts * fix: move pos doctypes to accounts * fix: move pos doctypes to accounts * fix: item description in cart * fix: item description in cart * chore: loyalty tests * minor fixes * chore: rename point of sale beta to point of sale * chore: reset past order summary on filter change * chore: add point of sale to accounting desk * fix: payment reconciliation table in pos closing * fix: travis * Update accounting.json * fix: test cases * fix: tests * patch loyalty point entries * fix: remove test * default mode of payment is mandatory for pos transaction * chore: remove unused checks from pos profile * fix: loyalty point entry patch * fix: numpad reset and patches * fix: minor bugs * fix: travis * fix: travis * fix: travis * fix: travis Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-07-23 18:51:26 +05:30
Marica	3c8c346227	fix: Pick List empty table and Serial-Batch items handling (#22426) ... * chore: Pick List empty table and serial-batch items handling * fix: Remove console statement * chore: Added tests for batched and batched-serialised item	2020-07-23 17:52:06 +05:30
Shivam Mishra	1358efe896	feat: update icons	2020-07-23 17:02:32 +05:30
Afshan	767ee1cdb8	fix: logic to get other items also other than just 1st one	2020-07-23 15:39:27 +05:30
rohitwaghchaure	d45ff31ff0	fix: incorrect stock after merging the items (#22526) ... * fix: incorrect stock after merging items * fix: Readability fix Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-07-22 18:24:01 +05:30
Marica	514366654e	fix: Serial No Rename does not affect Stock Ledger Entry (#22746) ... * Revert "fix: Remove rename related code from Serial No (#22627)" This reverts commit 1ec2d962db. * fix: Rename fails on Stock Ledger Entry * fix: Allow Rename in Serial No	2020-07-22 16:40:24 +05:30
Marica	53646cb360	chore: Export Stock Dashboard (#22768)	2020-07-22 16:17:40 +05:30
Afshan	871889220b	style: moved parent warehouse to top section also added a section bre… (#22708) ... * style: moved parent warehouse to top section also added a section break for better look * style: changes display depends on for HTML field Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-07-21 20:39:00 +05:30
Afshan	66d4b42df0	fix: update set query for warehouse after changing the company (#22632) ... * fix: update set query for warehouse after changing the company * fix: changed set_query to get_query * fix: variable filter doesn't get updated once set on load hence removed Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-07-21 19:59:30 +05:30
rohitwaghchaure	f4db8c1c11	Merge pull request #22724 from rohitwaghchaure/fixed-incorrect-currency-symbol-in-stock-balance-report-develop ... fix: currency symbol not showing as per company currency in stock balance report	2020-07-17 16:56:22 +05:30
Rohit Waghchaure	2347e69cb9	fix: for past dated stock reco, batched item showing the current available qty instead of quantity as per posting date	2020-07-17 14:50:49 +05:30
Rohit Waghchaure	848568d023	fix: currency symbol not showing as per company currency in stock balance	2020-07-17 14:49:12 +05:30
michellealva	d02465a68f	fix: Update modified timestamp for Delivery Note Item	2020-07-17 10:35:16 +05:30
Rohit Waghchaure	132376750c	fix: incorrect balance qty in stock ledger report	2020-07-15 17:23:17 +05:30
rohitwaghchaure	30030230bf	Merge pull request #22675 from marination/material-request-warehouse ... fix: Dont overwrite default warehouse in Material Request	2020-07-15 15:35:38 +05:30
Rohit Waghchaure	e1b3f16abd	fix: project field added two time in purchase receipt	2020-07-15 12:28:19 +05:30
marination	392f323d2d	fix: Dont overwrite default warehouse in Material Request	2020-07-14 17:03:17 +05:30
Marica	82a606d04b	fix: Added Project Field in Purchase Receipt for Stock Ledger Tagging (#22666)	2020-07-14 13:16:28 +05:30
rohitwaghchaure	ac984eb37c	Merge branch 'develop' into project-link-for-all-accounts	2020-07-13 11:50:11 +05:30
Afshan	ccf6b5f640	Merge remote-tracking branch 'upstream/develop' into add-age-range-in-stock-ageing ... Merge remote-tracking branch 'upstream/develop' into add-age-range-in-stock-ageing	2020-07-13 11:45:33 +05:30
Deepesh Garg	8cdf33f618	Merge pull request #22635 from deepeshgarg007/item_tax_test ... fix(travis): Item Tax template test	2020-07-11 21:04:31 +05:30
Deepesh Garg	46bcb46422	fix: Do not use random customers	2020-07-11 18:36:32 +05:30
Deepesh Garg	f15ff5fbfa	fix: Test	2020-07-11 13:58:53 +05:30
rohitwaghchaure	d14666e419	fix: incorrect delivered qty in Supplier-Wise Sales Analytics (#22631)	2020-07-09 20:07:10 +05:30
Marica	1ec2d962db	fix: Remove rename related code from Serial No (#22627)	2020-07-09 20:02:18 +05:30
Afshan	a629c9e1bc	style: remove import comment	2020-07-08 19:28:28 +05:30
Afshan	d16d0efde5	feat: added range for age in stock ageing	2020-07-08 19:23:13 +05:30
Michelle Alva	5d514fe4df	fix: grammatical fixes in module onboarding (#22580) ... * fix: grammatical fixes in module onboarding * fix: more grammatical changes for consistency * fix: Reorder Stock Onboarding * fix: update success message * fix: change order of stock onboarding steps Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-07-08 14:25:51 +05:30
rohitwaghchaure	41c9708f99	Merge branch 'develop' into project-link-for-all-accounts	2020-07-08 13:11:37 +05:30
rohitwaghchaure	fae570e0a2	Merge pull request #22612 from netchampfaris/fix-item-price-labels ... fix: Remove trailing spaces from labels	2020-07-08 12:14:21 +05:30
Deepesh Garg	addd1e842b	Merge pull request #22568 from ahmadpak/develop ... fix: Item Tax Template permissions as per company	2020-07-08 10:08:53 +05:30
Faris Ansari	8c5c74ca06	fix: Remove trailing spaces from labels	2020-07-08 09:20:13 +05:30
marination	32f3d24dac	fix: Employee benefit application & quality inspection whitelist	2020-07-07 14:31:49 +05:30
Marica	7860d9e699	Merge branch 'develop' into whitelist-query	2020-07-07 11:53:19 +05:30
Deepesh Garg	92a03aa5db	Merge branch 'develop' of https://github.com/frappe/erpnext into project-link-for-all-accounts	2020-07-06 12:37:28 +05:30
mohammadahmad1990	261ecba3d6	Company field removed from Item Taxes Table	2020-07-03 15:04:28 +05:00
mohammadahmad1990	ad3d44d622	fix: Item Tax Template check on company field	2020-07-03 15:02:39 +05:00
mohammadahmad1990	e39649bc9e	fix: Item Tax Template with no validity	2020-07-03 15:02:03 +05:00
mohammadahmad1990	41c0c9f46b	fix: Item Tax Template	2020-07-03 15:01:49 +05:00
Andy Zhu	b60abb0158	fix: fetch item price in sales invoice ... When create standalone sales invoice, the item price will not be created fetch. By adding "posting_date" to dict: item_price_args, it will be fetch on building the condition of SQL.	2020-07-03 14:13:15 +12:00
Afshan	bfffd9b01b	made "Subscription Section", "Auto Repeat" and Hub Publishing" collapsible by default (#22521) ... Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-07-02 15:11:45 +05:30
Chinmay D. Pai	ed0bb20e6f	chore: add query functions to whitelist ... Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>	2020-07-02 12:35:41 +05:30
mergify[bot]	47a3524a7d	fix: Stock Onboarding typo and reorder (#22499) (#22503) ... (cherry picked from commit 8732b8caf6) Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-06-29 18:24:25 +05:30
Marica	8732b8caf6	fix: Stock Onboarding typo and reorder (#22499)	2020-06-29 17:38:42 +05:30
rohitwaghchaure	4cc2e70348	Merge pull request #22454 from wojosc/patch-10 ... refactor: update customs_tariff_number.json	2020-06-28 15:07:19 +05:30
Wolfram Schmidt	a97715e464	Update customs_tariff_number.json	2020-06-26 10:24:48 +02:00
Wolfram Schmidt	7f2a3e8c7d	Update customs_tariff_number.json ... Main information of tariff numbers are the number. A description is more or less double information as this is mostly the number. Thus a description should not be mandetory.	2020-06-25 13:56:32 +02:00
marination	f311f52f6e	fix: Disable Renaming in Serial No	2020-06-25 16:02:18 +05:30
John Clarke	6fd1068af3	Update stock_ageing.py	2020-06-24 07:31:21 -06:00
Deepesh Garg	51ce1e1d4e	fix: Test Cases ... (cherry picked from commit ded3ab1cd7)	2020-06-24 05:38:33 +00:00
Deepesh Garg	12f1f8e111	fix: Move check from Stock Settings to Company Master ... (cherry picked from commit 53d5d16abb)	2020-06-24 05:38:33 +00:00
Deepesh Garg	6e2ca779c5	feat: Accounting entries for service item in Purchase receipt ... (cherry picked from commit c258ac82c5)	2020-06-24 05:38:32 +00:00
rohitwaghchaure	d63c59ced4	Merge branch 'develop' into grn_posting	2020-06-24 10:23:23 +05:30
mergify[bot]	ca8894b0fc	fix: alternative item not working for subcontract (#22386) ... (cherry picked from commit 171699537c3e7d7632f45123c6d30012c8de7281) Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>	2020-06-23 10:42:32 +05:30
Marica	bd5c8573de	fix: Unable to create batched Item (#22393)	2020-06-23 10:32:51 +05:30
Deepesh Garg	edd4aa6faa	Merge branch 'develop' of https://github.com/frappe/erpnext into project-link-for-all-accounts	2020-06-22 09:59:39 +05:30
Deepesh Garg	ded3ab1cd7	fix: Test Cases	2020-06-22 09:40:15 +05:30
Deepesh Garg	c70eb30e7e	Merge branch 'develop' of https://github.com/frappe/erpnext into grn_posting	2020-06-20 11:56:25 +05:30
Deepesh Garg	53d5d16abb	fix: Move check from Stock Settings to Company Master	2020-06-20 11:55:56 +05:30
Marica	383807f72e	feat: Selling Desk, Dashboard and Onboarding (#22055) ... * feat: Selling Desk, Dashboard and Onboarding * chore: Selling Onboarding and fixes in Other onboardings * chore: Dashboard and Number card Fixtures * fix: Escape filters and Reposition Accounts Dashboard shortcut. Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-06-19 15:33:21 +05:30
Deepesh Garg	3c63f5b76b	Merge branch 'develop' of https://github.com/frappe/erpnext into project-link-for-all-accounts	2020-06-19 11:41:21 +05:30
rohitwaghchaure	d8683d381b	Merge pull request #22205 from deepeshgarg007/fiscal_year_travis ... fix: Travis(develop)	2020-06-15 16:12:10 +05:30
rohitwaghchaure	25f49d59c5	Merge pull request #22233 from deepeshgarg007/pi_billing_address ... fix: Billing address in for Purchase documents	2020-06-14 15:10:43 +05:30
Deepesh Garg	6760077674	fix: Billing address in for Purchase documents	2020-06-13 22:40:23 +05:30
John Clarke	15e4ea0472	Merge branch 'develop' into clarkejj-patch-1	2020-06-12 07:55:49 -06:00
John Clarke	85f237257a	Thanks so much for your pointer Marica - that violation is clear and obvious to me in retrospect, but a good relearning experience in any case	2020-06-12 07:22:14 -06:00
Deepesh Garg	c258ac82c5	feat: Accounting entries for service item in Purchase receipt	2020-06-12 18:33:42 +05:30
John Clarke	677978dd00	Update stock_ageing.py ... As reviewer Deepesh Garg advised thanks! batch[0] can be int of float - see line 49 - so change proposed cint to flt	2020-06-12 05:53:24 -06:00
Alirio Castro	faf33072c8	fix: key was mispelled	2020-06-11 23:32:53 -04:00
John Clarke	6b55f66f02	Stock Ageing TypeError: ‘<’ not supported between instances of ‘int’ and ‘str’ ... Proposed fix re this error report https://discuss.erpnext.com/t/stock-ageing-report-typeerror-not-supported-between-instances-of-int-and-str/62605	2020-06-11 10:24:48 -06:00
Deepesh Garg	9df4532d14	fix: Travis(develop)	2020-06-11 21:33:43 +05:30
Rohan	d60d2e1826	fix: only auto-set serial nos and batches if allowed in Stock Settings (develop) (#21781) ... * fix: only auto-set serial nos and batches if allowed in Stock Settings * fix: bug with setting disabled batch no in Pick List * fix: remove auto-set batch variable Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-06-10 19:10:56 +05:30
rohitwaghchaure	3a9c1b23db	Merge pull request #22096 from marination/valuation-rate ... fix: '>=' not supported between instances of 'str' and 'int'	2020-06-10 14:12:13 +05:30
marination	f5b9deea5b	fix: Finished Product Valuation at Repack	2020-06-08 13:02:00 +05:30
Deepesh Garg	407c7bc113	Merge pull request #22067 from marination/item-attribute ... fix: Misleading Error message for Item Attribute.	2020-06-05 11:21:08 +05:30
P-Froggy	6f87f97efe	fix: Wrong Ordered-Status Indicator for Material Request Items (#22118) ... The indicator displaying if a material request item has been ordered or not (green/orange) used the wrong quantity field for determining the status. The qty field used in the code is not in stock uom while the ordered_qty field is. Now, the stock_qty field is used for correct comparison with ordered_qty.	2020-06-05 10:57:07 +05:30
marination	6f7e9d2904	fix: '>=' not supported between instances of 'str' and 'int'	2020-06-03 17:13:58 +05:30
Myuddin khatri	9276d16420	fix(stock): able to create purchase invoice from purchase receipt dashboard ... able to create purchase invoice from purchase receipt dashboard	2020-06-03 11:22:49 +05:30
marination	0df7f0fe9d	fix: Misleading Error message for Item Attribute.	2020-06-01 11:56:33 +05:30
Deepesh Garg	c96bf870e4	fix: Test Cases	2020-05-30 11:46:39 +05:30
Deepesh Garg	36f7710356	Revert "fix: tests depending on global default company" ... This reverts commit 1f20c99ecf.	2020-05-30 11:38:04 +05:30
Deepesh Garg	c897e800ed	Merge branch 'develop' of https://github.com/frappe/erpnext into project-link-for-all-accounts	2020-05-29 11:04:20 +05:30
Marica	c2aabb0fbf	fix: Buying Module fixes (#21965) ... * fix: Buying Module fixes * fix: Delete Report files as well * fix: Add Purchase Order Analysis to Stock & Accounting	2020-05-27 20:56:39 +05:30
Marica	a49f045d14	fix: Grammar fixes (#21970)	2020-05-27 20:28:37 +05:30
Rohan	d28854b3c2	fix: throw error if no serial numbers are found in Pick List (#21915) ... Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-05-26 18:13:25 +05:30
Marica	74a910ae92	fix: title for onboarding step (#21933) ... Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com> Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>	2020-05-26 17:49:34 +05:30
Marica	07f305a1d6	refactor: open link in new tab (#21910)	2020-05-25 16:30:59 +05:30
Rohan	e5395c3ae8	fix: filter batches based on item and warehouse in Pick List (#21780) ... Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-05-25 15:25:21 +05:30
Marica	dd3e52184c	fix: Added Inactive serial no status (#21848)	2020-05-22 10:48:35 +05:30
rohitwaghchaure	7978907cc8	feat: BOM template (#21262) ... Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-05-21 18:10:13 +05:30
marination	7afee887a8	fix: Fetch customer into Delivery Note from Pick List	2020-05-21 13:11:48 +05:30
Nabin Hait	939441117a	Merge branch 'marination-purchase-dashboard' into develop	2020-05-19 20:22:48 +05:30
Nabin Hait	e005078c0d	feat: buying module dashboard and onboarding	2020-05-19 20:22:25 +05:30
rohitwaghchaure	aa85e511da	feat: Production Planning Against Sales Order/Material Request/Work Order (#21763) ... Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-05-19 19:51:45 +05:30
Nabin Hait	ddec05ee07	Merge branch 'marination-stock-dashboard' into develop	2020-05-19 19:08:58 +05:30
Nabin Hait	8b686a5721	feat: stock module dashboard and onboarding	2020-05-19 19:08:30 +05:30
rohitwaghchaure	f128b1c0c5	refactor: changed the fieldtype from data to small text (#21782)	2020-05-19 19:05:42 +05:30
Marica	e50ca69bb9	Merge branch 'develop' into stock-dashboard	2020-05-19 14:39:31 +05:30
marination	658f29915a	fix: PR and DN trend report charts, group by fixes	2020-05-19 13:58:13 +05:30
marination	64b36dba4f	fix: Changed Form Tour order and grammar fixes.	2020-05-19 13:27:10 +05:30
marination	a5fcaf66f9	fix: Added filters in number Cards	2020-05-19 13:05:22 +05:30
Rohit Waghchaure	34f4a2398b	feat: manufacturing dashboards	2020-05-18 11:57:25 +05:30
rohitwaghchaure	8e3fc5ee6e	fix: incorrect stock valuation for repack entry (#21736)	2020-05-17 20:28:39 +05:30
rohitwaghchaure	5cfbdf4bcb	fix: user not able to view product (#21740)	2020-05-15 19:36:23 +05:30
marination	be5c45a9ae	chore: Fixtures and empty state handling in chart widgets	2020-05-15 13:21:58 +05:30
Saqib	41b47a68b3	fix: item price not fetching when customer is unset in item price (#21488) ... * fix: item price not fetching when customer is unset in item price * fix: item price of selling type has hidden supplier value * fix: remove test variable * fix: test * patch: invalid customer/supplier based on item price type * fix: invalid query * fix: patch Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-05-15 04:24:36 +05:30
marination	3f7678416f	chore: Stock Onboarding	2020-05-15 04:13:02 +05:30
marination	bb95cd5fd8	chore: Added Dynamic Charts to DN and PR Trends Reports	2020-05-15 01:33:43 +05:30
marination	10bd2417ff	feat: Custom Dashboard 'Warehouse wise Stock Value' with Chart Source	2020-05-14 15:35:18 +05:30
marination	021acd0a01	chore: Stock Ageing and Item Shortage Reports with Charts	2020-05-14 13:20:43 +05:30
Marica	97715f2877	fix: Message for missing valuation rate (#21686)	2020-05-11 20:45:37 +05:30
Deepesh Garg	ece1b4bc5a	Merge pull request #21676 from rohitwaghchaure/fixed-qty-validation-in-stock-entry ... fix: '<' not supported between instances of 'str' and 'int'	2020-05-11 12:27:20 +05:30
Rohit Waghchaure	3a914a7cd7	fix: '<' not supported between instances of 'str' and 'int'	2020-05-11 11:44:45 +05:30
marination	65123d2adc	fix: Item Barcode stays the same after updation.	2020-05-08 16:30:46 +05:30
rohitwaghchaure	8b9574d434	Merge pull request #21657 from rohitwaghchaure/fixed-stock-and-account-value-comparison-report ... fix: local variable 'lft' referenced before assignment	2020-05-08 15:39:24 +05:30
Rohit Waghchaure	074ea2f882	fix: local variable 'lft' referenced before assignment	2020-05-08 15:33:35 +05:30
rohitwaghchaure	9de26f6648	fix: list index out of range (#21613)	2020-05-07 12:06:47 +05:30
Marica	5e3d8050aa	fix: Handle rows with same item code from Purchase Receipt to Invoice. (#20724) ... * fix: Handle rows with same item code from Purchase Receipt to Invoice. * fix: Added patch, fixed tests, fixed delivery note behaviour * chore: Added comments amd fixed typo * fix: Added patch to patches.txt * fix: Patch fix and simplification, json timestamp updation. Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-05-05 14:37:39 +05:30
Deepesh Garg	6df581f78b	Merge pull request #21375 from marination/commonify-warehouse-autofill ... chore: Commonify auto-filling warehouses in child tables	2020-05-03 20:33:45 +05:30
rohitwaghchaure	268df35d80	Merge pull request #21516 from marination/stock-balance-cleanup ... chore: Added company filter and minor cleanup in Stock Balance Report	2020-05-03 16:31:34 +05:30
Nabin Hait	da17f9cb05	feat: Run MRP at parent level in the production plan (#21545) ... * enhance: provision to make material request from other location * fix: source warehouse for material transfer from production plan Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>	2020-05-01 18:16:25 +05:30
Deepesh Garg	998364d636	fix: Update timestamp	2020-05-01 12:04:13 +05:30
Deepesh Garg	6cce75a230	Revert "fix: Update in field type"	2020-05-01 12:03:18 +05:30
Deepesh Garg	e2de2923e2	Merge pull request #21420 from wojosc/patch-8 ... fix: Update in field type	2020-05-01 11:38:23 +05:30
rohitwaghchaure	be16e5cccc	fix: 'NoneType' object is not iterable (#21537)	2020-05-01 10:50:17 +05:30
marination	3568dc75be	fix: Make Company the first filter	2020-05-01 00:01:37 +05:30
marination	89c41d8384	chore: Added company filter and minor cleanup in Stock Balance Report	2020-04-30 13:56:49 +05:30
Deepesh Garg	758f0f0780	Merge branch 'develop' into patch-8	2020-04-30 11:37:27 +05:30
Deepesh Garg	2a9c5badc6	feat: Immutable ledger (#18740) ... * fix: Reverse GL entry on cancellation of document * fix: Removed set posting time field for multiple docs * fix: Stop future reposting and reverse entry for purchase receipt and delivery note * fix: Change is_cancelled field from select to check * Revert "fix: Removed set posting time field for multiple docs" This reverts commit 81fb808db7da69ab1e58ba226c0cd0b77e5b90c8. * fix: Multiple fixes in GL Entry * fix: Remove future reporting from doctypes * fix: Canceled entry filters in Stock Ledger and General Ledger Report * fix: Remove print statement * fix: Validation for back dated entries * fix: Codacy fixes * fix: Add ignore links to multiple doctypes * fix: Codacy Fixes * fix: Ignore GL Entry and Stock Ledger entry while cancel * fix: Test case fixes * fix: Patch * fix: Codacy * fix: Budget Test Cases * fix: Patch * fix: Patch * fix: Multiple test cases * fix: changes in make_reverse_entry function * fix: Update patch * fix: Test Cases * fix: Test Case fixes * fix: Move patch upward in patches.txt * fix: Budget Test Cases * fix: Test Case and codacy * fix: Patch * fix: Minor label and UX fixes * fix: Move freezing date check * fix: Test Cases * fix: Test cases * fix: Test Cases * fix: Test Case * fix: Remove update_gl_entries_after function * fix: Remove update_gl_entries_after function * fix: Test Cases * fix: Fiscal Year wise backdated entry * fix: Update entries only for current SLE * fix: Remove is_cancelled * fix: Test Cases * fix: Test cases * fix: Test Cases * fix: Uncomment account and stock balance sync logic * fix: Stock balance and Account balance out of sync fixes * fix: Test Cases * fix: Test cases for POS, Stock Reco and Purchase Receipt * fix: Stock Reco tests * fix: Test stock reco precision * fix: Test stock reco for fifo precision * fix: Test stock reco for fifo precision * fix: Stock Entry test case Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-04-30 10:38:58 +05:30
rohitwaghchaure	20fa73ff9c	Merge pull request #21388 from marination/stock-entry-form-cleanup ... chore: Stock Entry Form Cleanup	2020-04-29 03:13:12 +05:30
marination	6c871d6bcf	fix: Removed Finished Product and Finished Qty columns from Stock Ledger Report	2020-04-28 21:28:53 +05:30
Deepesh Garg	57bfd38944	Merge pull request #21436 from deepeshgarg007/ewb_bill_error_message ... fix: E-Way bill error message	2020-04-27 15:04:32 +05:30
Wolfram Schmidt	acfe8f020f	added time stamp to commit ... added time stamp to commit	2020-04-27 08:48:34 +02:00
Rucha Mahabal	f40a431d8c	fix: delivery trip form	2020-04-27 11:29:56 +05:30
Deepesh Garg	4eecc65cff	fix: E-way bill fix in Delivery Note	2020-04-27 10:50:59 +05:30
Himanshu	c9a1aa8eaa	fix: add dashboard to quality inspection template (#21423)	2020-04-26 23:28:33 +05:30
rohitwaghchaure	733b47c5e6	Merge pull request #21389 from marination/stock-entry-qty ... fix: Issues on qty trigger in Stock Entry Detail	2020-04-26 17:59:45 +05:30
marination	de33029393	fix: Remove callback outside if condition	2020-04-26 17:16:21 +05:30
Wolfram Schmidt	64c7eeed24	Update in field type ... Warrenty Period (in Days) changed from "Data" to "Int".	2020-04-26 10:56:08 +02:00
rohitwaghchaure	8b1c71ea44	fix: work order creation message against material request (#21413)	2020-04-26 09:38:18 +05:30
marination	e1e98fe116	fix: Issues on qty trigger in Stock Entry Detail	2020-04-23 20:18:52 +05:30
marination	f7aa6a8357	chore: Stock Entry Form Cleanup	2020-04-23 19:27:50 +05:30
rohitwaghchaure	28deddeb6f	fix: incorrect out value in stock balance due to precision issue (#21379)	2020-04-23 09:44:58 +05:30
marination	8a30cb2565	chore: Commonify autofilling warehouses in child tables	2020-04-23 00:18:21 +05:30
Nabin Hait	a529a5078f	Update purchase_receipt.json	2020-04-21 13:50:26 +05:30
Marica	bda0ddf1cf	fix: Purchase Receipt Form Cleanup (#21232)	2020-04-21 13:15:05 +05:30
Marica	9942acd9d4	fix [ux]: Material Request Form Cleanup and UX (#20810) ... * fix (ux): Material Request Form Cleanup * fix: Get Items from popup UX Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-04-21 13:13:39 +05:30
Marica	9ea1ad4051	fix: Re-order Item Error Email format (#21342) ... * fix: Re-order Item Error Email format * fix: Translated strings	2020-04-21 12:52:29 +05:30
rohitwaghchaure	a92eaff83b	fix: scrap items order not showing correctly in stock entry (#21346)	2020-04-21 11:27:10 +05:30
Deepesh Garg	3cec5cbb0f	fix: Total amount field ordering in transactions (#21313)	2020-04-18 22:13:48 +05:30
rohitwaghchaure	866867661e	Merge pull request #21204 from rohitwaghchaure/fixed_internal_issue_develop ... fix: minor issues	2020-04-18 02:08:26 +05:30
Nabin Hait	7eaa7f2e41	fix: requested qty for customer provided item and rate for sales (#21299) ... * fix: requested qty for customer provided item and rate for sales * fix: requested qty for material transfer * fix: customer provided item can be sales item * fix: requested qty test cases	2020-04-17 10:52:28 +05:30
Nabin Hait	03af0299a6	fix: requested qty calculation and some other small fixes (#21296) ... * fix: Made received qty readonly and no-copy * fix: Made release date mandatory * fix: requested qty calculation fix for UOM	2020-04-16 20:11:32 +05:30
Deepesh Garg	44c0c6c159	Merge branch 'develop' into asset-cat-validation	2020-04-16 11:23:52 +05:30
rohitwaghchaure	65628ac3e2	Merge pull request #21283 from marination/stock-entry-get-items-mr ... fix: Fetch Material Requests with type Issue as well in Stock Entry via Get Items from	2020-04-16 00:33:03 +05:30
marination	0b98a6296b	fix: Fetch Material Requests with type Issue as well in Stock Entry via Get Items from	2020-04-15 21:19:04 +05:30
rohitwaghchaure	c3f994b15e	Merge pull request #21197 from marination/default-item-manufacturer ... feat: Provision to set Default Item Manufacturer	2020-04-15 16:35:08 +05:30
Saqib Ansari	1f20c99ecf	fix: tests depending on global default company	2020-04-14 19:40:25 +05:30
Rohit Waghchaure	d0f6f1808b	fix: minor issues	2020-04-14 17:26:58 +05:30
Saqib	b52cd59dc3	Merge branch 'develop' into project-link-for-all-accounts	2020-04-14 14:05:32 +05:30
Marica	3ce23858bf	Merge branch 'develop' into batch_message_v13	2020-04-13 13:20:25 +05:30
vishdha	cfaf638cc2	fix: batch message ux improved	2020-04-13 12:31:26 +05:30
Saqib	2e45076dcf	Merge branch 'develop' into asset-cat-validation	2020-04-12 13:39:43 +05:30
Deepesh Garg	5e274965cc	Merge pull request #21201 from marination/serial-no-status ... fix: Added Status field in Serial No for filter and report builder	2020-04-10 20:48:06 +05:30
Shivam Mishra	ebcc46d837	feat: updated desk pages (#21138)	2020-04-10 18:52:05 +05:30
rohitwaghchaure	cf17809c3f	Merge pull request #21156 from marination/mr-customer-provided-to-stock-entry ... fix: Mapping Customer Provided Material Request to Stock Entry	2020-04-09 13:18:25 +05:30
vishdha	0b34b90e71	fix: item_name added for message	2020-04-09 11:46:46 +05:30
marination	86e8b2a1c6	fix: Status field in Serial No for filter and report builder	2020-04-08 15:38:28 +05:30
Saqib	562fd0eab0	fix: purchase return are allowed even when assets are not cancelled (#20797) ... * fix: purchase return are allowed even when assets are not cancelled * chore: test case * fix: error message Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-04-08 12:11:40 +05:30
rohitwaghchaure	47c8ddb29b	Merge pull request #20962 from marination/pick-list-enhance ... fix: Pick List Enhancements	2020-04-08 12:09:10 +05:30
Suraj Shetty	da6806e6bc	fix: Translation strings with trailing spaces (#21192)	2020-04-08 09:32:41 +05:30
marination	3e7a8abf29	feat: Provision to set Default Item Manufacturer ... - Is Default checkbox added in Item Manufacturer - Default Item Manufacturer and Part No fields added to Item Master - Manufacturer Part No field editable in all child tables with validation - Manufacturer and Part No auto fetched via get_item_details in child table	2020-04-07 21:00:57 +05:30
rohitwaghchaure	36459c052f	Merge branch 'develop' into pick-list-enhance	2020-04-07 18:04:39 +05:30
rohitwaghchaure	0672b6b2e8	Merge pull request #21170 from rohitwaghchaure/get_serial_nos_based_on_posting_date_and_time_develop ... fix: get serial nos based on posting date and time	2020-04-07 18:02:49 +05:30
Nabin Hait	c9f08bed2b	fix: set batch qty in batch master and test cases	2020-04-07 17:33:10 +05:30
Rohan Bansal	f92a5f32bd	fix: set batch ID as title instead of item code	2020-04-07 17:33:10 +05:30
Rohan Bansal	d2d73e6cb7	fix: prioritize empty over expired as batch status	2020-04-07 17:33:10 +05:30
Rohan Bansal	ba03853b2a	fix: update Batch schema	2020-04-07 17:33:10 +05:30
Rohan Bansal	ced78cf116	fix(stock): make requested changes	2020-04-07 17:33:10 +05:30
Rohan Bansal	92669eae66	fix(stock): batch list view statuses	2020-04-07 17:33:10 +05:30
Rohan Bansal	4a50c99867	fix(stock): Update batch quantity whenever stock in it is moved	2020-04-07 17:33:10 +05:30
Rohan Bansal	1bd7ea99f4	fix(batch): Only consider valid stock ledger entries	2020-04-07 17:33:10 +05:30
Rohan Bansal	658ed14e40	feat(batch): Add total quantity and dashboard to Batch	2020-04-07 17:33:10 +05:30
rohitwaghchaure	d313a239de	Merge pull request #21065 from marination/bin-requested-qty ... fix: Updated Bin Requested Qty logic	2020-04-07 14:50:19 +05:30
Rohit Waghchaure	560f822dbf	fix: get serial nos based on posting date and time	2020-04-07 14:42:02 +05:30
rohitwaghchaure	55ea142afd	Merge pull request #21181 from marination/purchase-receipt-scan-barcode ... feat: Scan Barcode in Purchase Receipt	2020-04-07 14:36:56 +05:30
Marica	c732e9967d	fix: Validate Serial/Batch No naming series in Item itself (#21167) ... * fix: Validate Serial/Batch No naming series in Item itself * fix: Consider '#' too	2020-04-07 14:16:14 +05:30
Marica	048de30cb5	Merge branch 'develop' into pick-list-enhance	2020-04-07 14:05:05 +05:30
rohitwaghchaure	f8e8333d77	Merge pull request #21174 from rohitwaghchaure/material_request_incorrect_filter_issue_develop ... fix: material request type manufacture shows items with Is Purchase I…	2020-04-07 12:06:18 +05:30
marination	e05013ede3	feat: Scan Barcode in Purchase Receipt	2020-04-06 22:13:13 +05:30
Rohit Waghchaure	5317907e15	fix: material request type manufacture shows items with Is Purchase Item enabled	2020-04-06 17:53:16 +05:30
Marica	e58d1b1b9f	Merge branch 'develop' into bin-requested-qty	2020-04-06 15:54:51 +05:30
Saqib Ansari	474222074b	fix: tests	2020-04-06 12:40:41 +05:30
Deepesh Garg	aa775f87b2	fix: Setting to toggle customer and supplier warehouse for inter warehouse transfer (#21142) ... * fix: Setting to toggle customer and supplier warehouse for inter warehouse transfer * fix: Use cint	2020-04-06 10:23:06 +05:30
marination	2a9a5352bb	fix: Test Cases and block expense on outward entry ... - Throw error if rate present against Customer Provided Item in DN and SI - Added test cases for Sales Invoice and Delivery Note - Allow SI and DN with 0 rate in Test	2020-04-03 18:25:21 +05:30
marination	fd04e96bdd	fix: Mapping Customer Provided Material Request to Stock Entry ... - Fixed inability to map Material Request to Stock Entry - Commonified Customer Provided Item validation	2020-04-03 15:46:48 +05:30
Marica	66c4a08703	fix: Update Received Qty in Material Request as per Stock UOM (#21054) ... * fix: Update Received Qty in Material Request as per Stock UOM * fix: Process each PR only once * fix: minor suggested changes Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-04-03 10:07:06 +05:30
Saqib	438e0433a3	fix: cannot set warehouse on deleting all so items and updating them (#21078) ... * fix: cannot set warehouse on deleting all so items and updating them * fix: travis * fix: docname is editable in update items dialog	2020-04-03 10:02:56 +05:30
marination	9a39bcd031	fix: Fixed Test Cases for Material Request ... - Reduce quantity on Material Transfer/Issue - No effect on Customer Provided Material Request	2020-04-02 19:36:21 +05:30
marination	686a09620d	fix: Commonified code and added server side validation	2020-04-02 13:51:25 +05:30
marination	6f0dc8257c	fix: Typo in stock level validation in Stock Ledger	2020-04-01 11:04:14 +05:30
rohitwaghchaure	98a91f489d	Merge pull request #21015 from marination/so-mr-mapping-uom ... fix: UOM fixes in Sales Order,Material Request & Production Plan	2020-03-31 16:24:37 +05:30
Deepesh Garg	eeb9ba81d7	Merge branch 'develop' into project-link-for-all-accounts	2020-03-31 16:07:23 +05:30
rohitwaghchaure	7845961d46	Merge pull request #21017 from Alchez/dev-remove-same-item-validation ... feat: allow BOM to use same item as raw material (develop)	2020-03-31 16:04:26 +05:30
rohitwaghchaure	bc415331a2	Merge pull request #21003 from Alchez/dev-stock-entry-fg-validation ... fix: allow target warehouses to be changed for work order stock entries (develop)	2020-03-31 15:44:13 +05:30
Saqib	25846cccbd	fix: warehouse_account_map not getting reset for diff company transac (#20995) ... * fix: warehouse_account_map not getting reset for diff company transaction * fix: potential key errors while fetching warehouse_account_map * fix: travis Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-03-31 15:31:15 +05:30
rohitwaghchaure	86aff0de1f	fix: serial no scan not adding the serial nos in stock entry (#21083)	2020-03-31 15:26:45 +05:30
Deepesh Garg	fbf6e56d86	fix: Expense account currency validation in Landed Cost voucher (#21073) ... * fix: Expense account currency validation in Landed Cost voucher * fix: Remove unused imports	2020-03-31 10:45:32 +05:30
Deepesh Garg	a47e42c515	Merge pull request #21087 from nabinhait/item_defaults_fix_dev ... fix: Add item defaults based on global settings only if default company and warehouse is mentioned	2020-03-29 21:55:25 +05:30
Deepesh Garg	f9f39f5a7e	Merge pull request #21103 from nextchamp-saqib/stock-ledger-warehouse-filter ... chore: [ux] filter warehouse based on company	2020-03-28 21:09:46 +05:30
Saqib Ansari	ed3553f795	chore: [ux] filter warehouse based on company	2020-03-28 19:12:59 +05:30
Deepesh Garg	c12a8040ef	Merge branch 'develop' into item_defaults_fix_dev	2020-03-27 21:51:00 +05:30
Nabin Hait	fe000e20e8	fix: Add item defaults based on global settings only if default company and warehouse is mentioned	2020-03-27 19:24:47 +05:30
marination	815c36a4eb	fix: Updated Bin Requested Qty logic	2020-03-26 15:46:27 +05:30
Marica	38cba153b5	fix: Make shelf life mandatory in Batched Item if it has expiry date (#21044)	2020-03-26 13:29:02 +05:30
Marica	b856aae651	fix: Project field in Stock Entry Detail should be editable (#20999)	2020-03-26 13:23:49 +05:30
Saqib	faea85451f	feat: auto set batch no on serial no selection (#20757) ... * feat: auto set batch no on serial no selection * fix: dialog not shown if set warehouse selected * fix: typo * fix: merge conflict * fix: callback no getting called after serial no selected * fix: available batch qty not fetched without set_warehouse selected * fix: item batch not synced with dialog batch table	2020-03-26 13:18:57 +05:30
rohitwaghchaure	b6bb56e9bf	Merge pull request #21037 from rohitwaghchaure/fixed_batch_selector_popup_develop ... fix: batch selection popup not coming for stock entry	2020-03-24 16:32:21 +05:30
Rohit Waghchaure	5c1404e878	fix: batch selection popup not coming for stock entry	2020-03-24 11:40:03 +05:30
Rohan	7ea79933b3	fix: handle error handling (#20815)	2020-03-23 14:54:33 +05:30
Rohan	879c6bfb44	Merge branch 'develop' into dev-stock-entry-fg-validation	2020-03-23 14:50:02 +05:30
Deepesh Garg	f8b54bd301	Merge pull request #21005 from rohitwaghchaure/qty_must_be_positive_for_stock_entry_develop ... fix: stock entry qty must be positive	2020-03-21 20:46:10 +05:30
Rohan	b7d84725e8	fix: add warehouse check for FG item	2020-03-20 18:49:11 +05:30
marination	73c8d23a79	fix: UOM fixes in Sales Order,Material Request & Production Plan	2020-03-20 17:52:28 +05:30
Rohit Waghchaure	5e4e2dbd03	fix: stock entry qty must be positive	2020-03-19 14:53:37 +05:30
Rohan	ce90848161	fix: allow target warehouses to be changed for work order stock entries	2020-03-19 13:22:58 +05:30
Deepesh Garg	dbeb77e745	fix: Unable to submit landed cost voucher (#20977)	2020-03-19 11:03:03 +05:30
Deepesh Garg	fa6454b9c5	fix: Update is_tree field in Tree doctypes (#20981)	2020-03-19 11:01:23 +05:30
rohitwaghchaure	e4cd12506c	Merge pull request #20991 from rohitwaghchaure/fixed_reserved_qty_for_production_develop ... fix: reserved qty for production issue for partial completion of work…	2020-03-19 09:37:43 +05:30
Deepesh Garg	6b36fae531	Merge pull request #20990 from rohitwaghchaure/fixed_shortage_qty_in_stock_projected_qty_report_develop ... fix: shortage qty in stock projected qty report	2020-03-19 09:33:03 +05:30
Rohit Waghchaure	dd13d0a9a9	fix: reserved qty for production issue for partial completion of work order	2020-03-19 09:29:17 +05:30
Rohit Waghchaure	cd2478a527	fix: shortage qty in stock projected qty report	2020-03-19 09:27:53 +05:30
Nabin Hait	ddc3bb2251	fix: Multiple fixes for travis (#20924) ... * fix: Multiple fixes for travis * fix: Multiple fixes for travis * fix: Run dashboard patch if table already exists * fix: Multiple fixes for travis * fix: deletion of auto-created batch	2020-03-17 17:04:18 +05:30
marination	e1f499ae1b	fix: Pick List Enhancements	2020-03-17 11:47:11 +05:30
Marica	b10adbb161	fix: Item alternative must have similar fields as original item (#20796) ... * fix: Item alternative must have similar fields as orignal item * fix: Using db.get_values and meta instead of get_value and get_doc * fix: Made code more DRY Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-03-17 10:56:59 +05:30
Saqib	1306f5005b	fix: is_pos gets reset on making s_inv from s_ord (#20886) ... * s_inv has is_pos default set as 1	2020-03-16 17:51:00 +05:30
Saqib	de4f6901d6	fix: serial_no_selector showing for non serialized batched item (#20851)	2020-03-16 16:29:10 +05:30
Shivam Mishra	aecf9d6168	Merge branch 'develop' into desk-settings-card	2020-03-12 17:13:03 +05:30
Shivam Mishra	451382e08e	feat: update desk pages	2020-03-12 16:34:34 +05:30
Saqib	6ec4618914	fix: travis (#20903)	2020-03-11 16:04:00 +05:30
Saqib Ansari	706c239cf6	fix: remove enable_allow_cost_center_in_entry_of_bs_account	2020-03-11 15:17:10 +05:30
Saqib Ansari	91b307e7f8	fix: project link not set in accounts other than profilt and loss accounts	2020-03-11 13:59:15 +05:30
Shivam Mishra	1fd1852c6a	Merge branch 'develop' into yet-another-desk	2020-03-10 18:20:27 +05:30
Marica	508ad51d9c	fix: Validate Serial No/Batch No against unserialized Item in Stock Reconciliation (#20858)	2020-03-09 18:13:41 +05:30
Saqib	b978d79573	fix: show uom in print formats instead of stock uom (#20843) ... Co-authored-by: Saqib Ansari <saqibansari@Saqibs-MacBook-Pro.local>	2020-03-06 11:03:46 +05:30
Shivam Mishra	0310366d5a	fix (cleanup): remove incomplete dependencies data	2020-03-05 11:28:40 +05:30
Shivam Mishra	8a8e8d6c5c	feat: added base pages for desk	2020-03-02 16:56:31 +05:30
Marica	ed25ec7ee5	chore: Item Price and Product Bundle Form cleanup (#20772) ... * chore: Item Price and Product Bundle Form cleanup * fix: Trailing comma	2020-03-02 15:51:14 +05:30
Saqib	e9ac3e0d64	feat: link serial no to batch no (#20778) ... * feat: link serial no to batch no * fix: test cases	2020-03-02 15:02:58 +05:30
rohitwaghchaure	b5a670cdb9	fix: serial no material transfer performance issue (#20747)	2020-02-27 18:18:10 +05:30
Lokesh Waingankar	2866617c82	fix: 'Last Purchase Rate' taking wrong on BOM (#20689) ... * fix: 'Last Purchase Rate' taking wrong on BOM. #20228 * fix: Added condition for None purchase order and purchase receipt (#20689) * fix: fetch last purchase rate Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-02-27 13:21:14 +05:30
abhijitkumbharInd	ba8840727a	Create a new item on Material Request showing error Item None not found. #20608 (#20731)	2020-02-26 12:48:36 +05:30
rohitwaghchaure	7229f694ea	fix: rate and amount in material request copying from sales order (#20717)	2020-02-26 11:28:08 +05:30
rohitwaghchaure	1e6788b028	fix: reorder material request not created if doctype has custom mandatory field (#20719)	2020-02-26 11:25:34 +05:30
Andy Zhu	75d9d79fac	fix: missing assign item's expense_account ... As in dict object "ret", missing assign item's expense_account will cause it then fetches the default stock_adjustment_account in 'Company'.	2020-02-26 10:49:48 +13:00
Rucha Mahabal	6071313965	fix: document creation via onboarding slide (#20644) ... * fix: defaults not set in doc created via Onboarding Slide * fix: default company not set in Supplier	2020-02-20 12:57:21 +05:30
Deepesh Garg	23aa5c6332	Merge pull request #20643 from abhijitkumbharInd/develop ... fix: HSN/SAC Error while creating a new item and not selecting the fi…	2020-02-19 19:23:10 +05:30
Deepesh Garg	40546d8af9	Merge pull request #20663 from marination/stock-settings-query ... fix: Set Query on warehouse fields in Stock Settings	2020-02-19 18:57:24 +05:30
marination	120f75026f	fix: Server side validation for Warehouses	2020-02-19 11:17:58 +05:30
marination	bde13b98e0	fix: Set Query on warehouse fields in Stock Settings	2020-02-18 21:35:59 +05:30
Deepesh Garg	15ff6a594b	feat: Inter warehouse stock transfer on valuation rate with taxation (#20083) ... * fix: Validation for target warehouse * feat: Get items on valuation rate in delivery note on Internal transfers * fix: Create Inter company purchase receipt from delivery note * feat: Inter company stock transfer on valuation rate with taxation * fix: Add from warehouse in purchase invoice * fix: Use get_value instead of get_cached_value * fix: Get incoming rate instead of valuation rate * fix: GL entry for from warehouse in purchase receipt * fix: GL Entries fixes in purchase invoice * fix: Address and tax fetching fixes * fix: Add test case for stock transfer via purchase receipt * fix: Code cleanup, added validations and test cases * fix: Validation for supplier warehouse * fix: Test Cases * fix: Change validation condition * fix: Address fixes while creating Purchase Receipt from delivery note * fix: Set taxes while creating Purchase Receipt from Delivery Note * fix: Update set_missing_value function Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-02-18 12:28:41 +05:30
abhijitkumbharIND	0047fcf7ad	fix: HSN/SAC Error while creating a new item and not selecting the field. #20590	2020-02-17 18:12:58 +05:30
Marica	db00270895	feat: Added popup to 'Get Items from Open Material Requests' in Purchase Order (#20371) ... * feat: Added popup to 'Get Items from Open Material Requests' in Purchase Order * fix: Query with filters, UX enhancements and cleanup	2020-02-17 15:58:08 +05:30
Himanshu Mishra	b76d2d4d98	Fix: Syntax error in get_child_warehouses	2020-02-12 13:22:05 +05:30
rohitwaghchaure	490b843ecf	Merge branch 'develop' into fixed_purchase_receipt_time_out_error_develop	2020-02-11 19:56:11 +05:30
rohitwaghchaure	3d98c59585	Merge pull request #20555 from ashish-greycube/fix_actual_qty_for_backflush ... fix: backflush raw material based on - Material Transferred for Manufacture	2020-02-11 19:50:36 +05:30
vishal	998de83d48	fix: filter serial no based on batch no	2020-02-11 12:24:44 +05:30
Rohit Waghchaure	e55a927eee	fix: test cases	2020-02-10 14:39:26 +05:30
ashish-greycube	121636f9bf	fix: backflush raw material based on - Material Transferred for Manufacture	2020-02-10 10:49:50 +05:30
Rohit Waghchaure	f0d27528e3	fix: time out error while submitting the purchase receipt which has more than 100 serial nos	2020-02-07 14:42:33 +05:30
Deepesh Garg	d8e57d3d5a	fix: Unable to submit landed cost voucher (#20493) ... * fix: Unable to submit landed cost voucher * fix: Test case for multiple landed cost voucher against a Purchase receipt * fix: Test Case	2020-02-03 18:53:34 +05:30
Pranav Nachnekar	6c14a08631	fix: disallow quick entry for doctypes with tree view (#20452)	2020-02-03 17:05:26 +05:30
Suraj Shetty	2f67647f7b	Merge branch 'develop' of https://github.com/frappe/erpnext into fix-incorrect-translations	2020-01-29 15:06:50 +05:30
Suraj Shetty	48e9bc3fc9	fix: Incorrect translation syntax	2020-01-29 15:06:18 +05:30
Deepesh Garg	565a810bf7	Merge pull request #20454 from marination/stock-ledger-qty-column ... fix: 'In Qty' and 'Out Qty' columns in Report Stock Ledger	2020-01-29 09:49:55 +05:30
Deepesh Garg	b61b8d7ced	fix: Remove comma	2020-01-29 09:49:26 +05:30
marination	372c5e51d5	fix: 'In Qty' and 'Out Qty' columns in Report Stock Ledger	2020-01-28 16:04:49 +05:30
Deepesh Garg	0c31d62edd	Merge pull request #20447 from Alchez/dev-driver-address-fetch ... fix: only fetch driver address if not set (develop)	2020-01-28 09:20:26 +05:30
rohitwaghchaure	7fda3a12cc	Merge pull request #20445 from rohitwaghchaure/copy_to_warehouse_to_target_warehouse_in_delivery_note_item ... fix: to warehouse not set in the customer warehouse	2020-01-27 19:29:19 +05:30
Rohan Bansal	ce17a546b9	fix: only fetch driver address if not set	2020-01-27 18:08:11 +05:30
Rohit Waghchaure	2dff28498f	fix: to warehouse not set in the customer warehouse	2020-01-27 17:56:25 +05:30
Deepesh Garg	1e77a1374d	Merge pull request #20393 from rohitwaghchaure/unlink_reference_name_from_batch_on_cancel_of_stock_transactions_develop ... fix: unlink references from batch on cancellation of stock transactions	2020-01-23 22:40:26 +05:30
Rohit Waghchaure	8996b7d8a4	delete the auto created batch	2020-01-23 17:44:19 +05:30
Rohit Waghchaure	4f4dbf1996	fix: unlink references from batch on cacnellation of stock transactions	2020-01-23 12:45:45 +05:30
Rohit Waghchaure	0cc4cf2cf5	fix: Zero division error while making finished good entry against the work order	2020-01-21 19:28:08 +05:30
byugandhara	239f0d529e	Fix: Spelling correction in throw message of stock entry(#20337) (#20353)	2020-01-21 15:47:27 +05:30
rohitwaghchaure	6ae61a1693	fix: incorrect number of gl entries issue (#20352)	2020-01-20 17:53:19 +05:30
Marica	7653a8b9fa	fix: 'get_additonal_costs' is not defined (#20344) ... * fix: 'get_additonal_costs' is not defined * fix: Re-added get_items on Work order change.	2020-01-20 15:46:36 +05:30
Nabin Hait	03b116dd01	fix: deprecated fetching item price based on min_qty (#20347)	2020-01-20 15:45:04 +05:30
Nabin Hait	e321fbb0d5	fix: Multiple fixes based on testing on pre-release branch (#20301) ... * fix: Multiple fixes based on testing on pre-release branch * fix: reload hr settings	2020-01-16 13:37:25 +05:30
Vishal Dhayagude	654d785776	fix: Delivery note not able to create sales return (#20264)	2020-01-15 19:28:58 +05:30
Marica	9f6c95549a	fix: Applied query on PO Supplier popup field in Material Request. (#20231)	2020-01-15 19:24:28 +05:30
Rohit Waghchaure	9650c25429	fix: filter issue for the stock and account value comparision report	2020-01-14 12:12:54 +05:30
deepeshgarg007	00746306a3	fix: Item tax template fetching from HSN Code	2020-01-10 15:01:50 +05:30
gavin	12568e4f07	Merge pull request #19514 from gavindsouza/rename-doc-fix ... fix: frappe.rename_doc update	2020-01-09 15:07:05 +05:30
rohitwaghchaure	d4d7d211ea	feat: report to show difference between stock and account value (#20186)	2020-01-09 15:05:05 +05:30
Suraj Shetty	000ac0068b	Merge branch 'develop' into rename-doc-fix	2020-01-09 13:46:08 +05:30
Don-Leopardo	ccdf19314d	fix: min_qty and valid_from for the price selection (#20217)	2020-01-09 12:24:43 +05:30
Marica	c72de6edaa	fix: Added description and title to supplier selection popup in Material Request. (#20179)	2020-01-07 13:06:08 +05:30
Deepesh Garg	ef0d26c161	feat: Validity for Item taxes (#20135) ... * feat: Validity for Item taxes * fix: Trigger for gst hsn code * fix: Sort taxes based on validity * fix: Validation for item tax template and filters based on validity * fix: Add missing semicolon * fix: Validate tax template only if item code available * fix: Do not validate or filter item tax template if no item taxes applied * fix: Consider item group for validating taxes * fix: Test cases for item tax validation * fix: Item tax template filtering fixes * fix: Add missing semicolon * fix: Remove unnecessary query	2020-01-06 15:34:15 +05:30
rohitwaghchaure	055012a7fb	Merge pull request #20170 from nabinhait/inter-company-serial-no-outgoing-rate ... fix: Get outgoing rate of serial no from SLE if serial no already transferred to another company	2020-01-06 12:07:53 +05:30
rohitwaghchaure	fe2afc643e	fix: incorrect valuation rate for finished good entry (#20165)	2020-01-06 11:51:43 +05:30
Marica	159799c238	Merge branch 'develop' into item-min-qty	2020-01-03 12:13:00 +05:30
thefalconx33	7a01367ef1	ux: add description for minimum purchase qty	2020-01-02 19:14:55 +05:30
Nabin Hait	328c4f9b92	fix: Get outgoing rate of serial no from SLE if serial no already transferred to another company	2020-01-02 19:00:47 +05:30
Rohan	938ba3efc4	feat: show item name in Item Price list view (#20156)	2019-12-31 17:21:07 +05:30
Marica	5483f1a27e	fix: Field 'other_charges_calculation' column type changed. (#20141)	2019-12-30 22:20:02 +05:30
rohitwaghchaure	9af557f9d7	fix: incorrect batch fetched for the serialized items (#20119) ... * fix: incorrect batch fetched for the serialized items * Update stock_controller.py Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2019-12-30 13:26:47 +05:30
Ishan Loya	fe0adc8b25	fix: read WIP warehouse from work order (#20131) ... * fix: read wip_warehouse from work order in stock entry even if skip transfer is checked * fix: remove skip_transfer in stock entry Related to #10753	2019-12-30 12:19:08 +05:30
Marica	f4fbdf98d1	fix: Removed unneccesary Duplicate Entry Error. (#20120)	2019-12-27 16:53:05 +05:30
Marica	47ab9850e6	fix: Show both warehouse columns in Stock Entry Grid view. (#20113)	2019-12-27 15:31:07 +05:30
rohitwaghchaure	616431d7c3	fix: incorrect reorder level in stock balance report (#20111)	2019-12-27 12:35:58 +05:30
rohitwaghchaure	a99f926a4b	fix: incorrect validation for scrap items (#20109)	2019-12-27 12:21:15 +05:30
Robin Rosenstock	e6387f9dca	fix to issue #20089	2019-12-26 08:09:47 +00:00
Himanshu	e2ea11c437	fix: remove quote (#20076)	2019-12-25 15:15:35 +05:30
Parth J. Kharwar	8c4cf12c93	Setting preferred driver email in delivery trip (#19832) ... * fix: add driver's preferred contact email in delivery trip * fix: modify driver's preferred email patch and blank field checks * fix: patch file fix * fix: patch changes to improve speed * fix: removal of conflicts Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2019-12-25 15:14:52 +05:30
rohitwaghchaure	6e8a9286c2	fix: multiple stock entry issues for the work order (#18686) ... * fix: multiple stock entry issues for the work order * Update work_order.py * Update work_order.py Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2019-12-24 18:53:32 +05:30
rohitwaghchaure	5c0ea2d7c9	Merge pull request #19708 from Alchez/dev-batch-to-stock-ledger ... feat: drill down on batch transactions (develop)	2019-12-24 15:25:05 +05:30
rohitwaghchaure	08433c2919	fix: supplier email id field not showing in the notification for purchase cycle doctypes (#20071)	2019-12-24 13:03:47 +05:30
Deepesh Garg	55bc26e300	fix: Allow creation of multiple landed cost voucher against a Purchase Document (#20058)	2019-12-24 12:55:01 +05:30
Himanshu	5af4c57ef7	fix: ambihious error (#20068)	2019-12-24 12:31:38 +05:30
Rucha Mahabal	0e83a5754b	fix: remove illustrations from onboarding slides (#19872) ... * fix: remove illustrations from onboarding slides * fix: change Welcome slide's description * fix: justify text in slide	2019-12-23 08:24:46 +05:30
Gavin D'souza	1e4ea466d3	style: update/standardize rename_doc usage	2019-12-19 19:07:29 +05:30
marination	457ca0fe6c	fix: Company None not found in get_valuation_rate	2019-12-19 13:34:29 +05:30
rohitwaghchaure	b500f2ce4c	Merge pull request #19940 from marination/item_manufacturer_table_dev ... fix: Removed 'manufacturers' table from Item Master	2019-12-16 14:44:49 +05:30
marination	5ab823beab	fix: Removed validation from non existent manufacturers table	2019-12-16 12:19:47 +05:30
marination	81990aee9f	fix: Removed 'manufacturers' table from Item Master	2019-12-13 13:18:59 +05:30
Deepesh Garg	57e6bcaf43	Merge pull request #19733 from marination/zero-division-basic-amount ... fix: Division by zero error in Stock Entry	2019-12-13 09:23:44 +05:30
marination	0e33f792d3	fix: Distribute charges based on quantity if Total Basic Amount is Zero.	2019-12-12 16:34:41 +05:30
Rohit Waghchaure	9b0d7b93dd	fix: not able to submit the landed cost voucher	2019-12-12 12:10:25 +05:30
Deepesh Garg	0e10340471	Merge pull request #19899 from rohitwaghchaure/not_able_to_cancel_landed_cost_voucher ... fix: not able to cancel the landed cost voucher	2019-12-11 18:38:23 +05:30
Rohit Waghchaure	37cf096102	fix: not able to cancel the landed cost voucher	2019-12-11 13:50:29 +05:30
Deepesh Garg	6e2c13f4c8	feat(regional): Auto state wise taxation for GST India (#19469) ... * feat(regional): Auto state wise taxation for GST India * fix: Update gst category on addition of GSTIN * fix: Codacy and travis fixes * fix: Travis * fix(test): Update GST category only if GSTIN field available * fix: Test Cases * fix: Do not skip accounts if place of supply is not present * fix: Auto GST taxation for SEZ Party types * fix: Automatic taxation for multi state * fix: Codacy and travis fixes * fix: Auto GST template selection in Sales Order * fix: Move inter state check and source state to tax category * fix: Remove unique check from tax template * fix: Remove unique check from tax template * fix: Address fetching logic in Sales * fix: fecth tax template on company address change * fix: fetch company gstin on address change * fix: company_gstin set value fix * fix: Mutiple fixes and code refactor * fix: Add missing semicolon * fix: Company address fetching in sales invoice * fix: Remove print statement * fix: Import functools * fix: Naming fixes and code cleanup * fix: Iteritems compatibility for python 3	2019-12-10 15:55:05 +05:30
marination	214acc9a42	fix: Changed check condition and added test	2019-12-09 21:38:19 +05:30
Saqib	5998034b02	fix: error message displays asset category as None (#19873) ... * fix: error message displays asset category as None * fix: asset gl_entries doesn't considers asset category's cwip account	2019-12-09 19:07:05 +05:30
Shivam Mishra	9e0b3b29fa	feat: better message for serial number creation (#19863)	2019-12-09 18:21:23 +05:30
Deepesh Garg	da638cd476	fix: NoneType' object has no attribute '__getitem_'_ (#19859)	2019-12-09 11:28:31 +05:30
Rucha Mahabal	690068142b	feat: Continue Slide and New Illustrations for Onboarding Wizard (#19813) ... * feat: added illustrations for onboarding * refactor: change help label for supplier * refactor (breaking): rename Setup Wizard slide to Onboarding Slide * chore: code cleanup for the old doctype Setup Wizard Slide * fix: added a 'Continue' type slide * fix: change text in continue slide * fix: change text for continue slide	2019-12-06 20:58:26 +05:30
Rohan	5161ba787c	Merge branch 'develop' into dev-batch-to-stock-ledger	2019-12-06 14:25:00 +05:30
rohitwaghchaure	cfbf895876	Merge pull request #19498 from marination/stock_entry_bom_fetch ... feat: Provision to fetch items from multiple BOMs in Stock Entry	2019-12-04 21:44:47 +05:30
ronelvcabrera	370cdc0170	feat(Sales/Purchase Order): optional to reference a Blanket Order (#19612)	2019-12-04 16:07:11 +05:30
marination	be88d0f8a3	fix: Custom button conditionally visible in draft condition as well	2019-12-03 18:34:38 +05:30
Anurag Mishra	10017c14f3	feat: HSN Code wise Item Tax (#19478) ... * feat: HSN Code wise Item Tax * feat: enqueued task of updating all items	2019-11-29 17:33:10 +05:30
Saqib	20c31dd579	fix: tax templates from all companies fetching in receipt (#19682) ... * fix: tax templates from all companies fetching in receipt * Update purchase_receipt.js	2019-11-29 16:55:10 +05:30
Suraj Shetty	9d6d95c4a2	fix: valuation of "finished good" item in purchase receipt (#19268) ... * fix: Remove redundant purchase orders and unwanted condition * fix: [WIP] Purchase receipt value * fix: Add raw material cost based on transfered raw material * fix: get_qty_to_be_received * fix: Remove debugger statement * fix: Reset rm_supp_cost before setting subcontracted raw_materials * test: Fix and modify tests for backflush_based_on_stock_entry * fix: Add non stock items to Purchase Receipt from Purchase Order * fix: Ignore valuation rate check for non stock raw material * fix: Rename check all rows * fix: Remove amount from test * test: Fix item rate error * fix: handling of serial nos in backflush * fix: Add serial no. of raw materials * fix: [WIP] Handle Batch nos for purchase reciept backflushed raw material * fix: Raw material batch number selection in purchase receipt * Update test_purchase_order.py	2019-11-29 13:26:52 +05:30
Anurag Mishra	f3b393f5e0	fix: UOM was not fetching in purchase invoice (#19732) ... * fix: UOM was not fetching in purchase invoice * fix: Changes requested Co-authored-by: Marica <maricadsouza221197@gmail.com>	2019-11-28 18:52:16 +05:30
Marica	aff678e376	fix: Changed type of column 'serial_no' in Stock Ledger Entry (#19702)	2019-11-28 18:20:48 +05:30
Marica	f51ccbf5d4	chore: Added Quick Stock Balance to Stock Module (#19726) ... - Also 'Stock Balance Report' button no longer primary button	2019-11-28 16:44:46 +05:30
marination	236140d94c	fix: Division by zero error in Stock Entry	2019-11-28 16:36:24 +05:30
Shivam Mishra	30245a0673	Merge pull request #19677 from ruchamahabal/setup_wizard ... feat: Slides for Onboading Wizard in ERPNext	2019-11-28 14:35:10 +05:30
Rohan Bansal	c7cfc726d7	feat: navigate to stock ledger from batch report	2019-11-27 18:23:31 +05:30
Marica	f0e87f7fdd	fix: get_batch_qty_and_serial_no() requires argument 'stock_qty' (#19693)	2019-11-27 15:49:41 +05:30
Rucha Mahabal	58928e8eae	Merge branch 'develop' into setup_wizard	2019-11-27 11:55:53 +05:30
Rucha Mahabal	e2bb82872c	fix: moved slide json files to respective modules	2019-11-26 18:46:17 +05:30
Rucha Mahabal	3f8c460584	feat: moved slide action functions from onboarding utils to doctypes	2019-11-26 15:22:45 +05:30
rohitwaghchaure	b5991e9264	Merge pull request #19683 from rohitwaghchaure/bom_ux_fixes_version_12 ... fix: BOM UX	2019-11-26 13:15:40 +05:30
Rohit Waghchaure	9326fb78f2	fix: BOM UX	2019-11-25 18:56:18 +05:30
marination	737d8a1e26	fix: Added comments	2019-11-25 09:42:08 +05:30
Saqib	1919af2ff1	Fixed Asset Refactor Review fixes (#19666) ... * fix: fixed asset item creation ux fixes * fix: auto creation of asset ux fixes * fix: [LCV] incorrect condition when checking assets linked with PR * fix: bulk update assets * refac: remove company level cwip enabling * cwip can be enabled only on category level * fix: #19649	2019-11-22 16:32:34 +05:30
Marica	b5c296da9e	fix: Validation Error message on Prepared Report. (#19639) ... Give the user the reason why he has to use filters.	2019-11-22 14:38:58 +05:30
Saqib	290253fdd0	fix: last purchase rate greater than selling price (#19617)	2019-11-22 12:12:29 +05:30
Nabin Hait	046137caa2	fix: Multiple fixes related to landed cost accounting (#19657)	2019-11-22 11:34:50 +05:30
marination	e537cda062	fix: Added conditional check for conversion factor	2019-11-20 12:38:58 +05:30
rohitwaghchaure	a85ddf2fb4	fix: performance issue of sales invoice while save/submit (#19598) ... * fix: performace issue of sales invoice while save/submit * Cached price list data, item group child data, added indexing for blanket order	2019-11-19 18:47:48 +05:30
Deepesh Garg	87c6718d90	fix: Book valuation expense in specified account rather than expense included in valuation account (#19590) ... * fix: Book valuation expense in specified accout rather than expense included in valuation account * fix: Remove undefined variable * fix: Test cases * fix: Test Case	2019-11-18 12:34:30 +05:30
Saqib	d995609ffa	Fixed asset refactor (#19369) ... * refactor: Asset Movement with multiple assets using table * refactor: Create Asset Movement from Asset List & Linking PR/PI with Asset * feat: Auto create asset on Purchase checkbox * refactor: LCV for asset created via PR/PI * refactor: get asset category accounts from item master * refactor: Purchase Receipt for asset purchasing * refactor: Purchase Invoice for asset purchasing * fix: post-refactor delete fixes * refactor: moved asset validation from pr/pi on asset submission * fix: Asset Category should be defined for auto purchasing assets * fix: undo serial_no_update removal (for non asset item) from LCV * fix: remove duplicate calls from item.js * fix: args position of all occurrence of get_asset_category_account() * fix: test cases * fix: landed cost voucher validations * refactor: test case for auto creation of asset * fix: removed invalid assertions * fix: patch errors on travis * fix: codacy fixes * fix: PI Items not fetching details from item * fix: asset movement from list view having default purpose 'Receipt' * chore: msgprint for selecting item code first while creating asset manually * fix: alert messages * minor: asset movement fixes * fix: lcv was made against submitted assets * minor: ux fixes * refac: move specific asset validation to SINV * chore: remove make_purchase_invoice from asset form * make asset movement on asset submission * add PR & PI queries based on item code * refac: not allow last movement cancellation * move asset movement creation on asset submission * asset movement naming series * add tests * fix: code review changes * chore: remove unecessary asset movement updation * refac: setting latest location while making asset movements * Added extra validations * fix: form dashboard make lcv button * fix: auto asset movement creation validation * fix: allow lcv against other items after removing submitted assets * chore: remove unwanted condition * fix: mismatch debit credit on purchase of asset with valuation tax * chore: toggle required field based on movement type * chore: fix lcv error message * fix: travis failing * fix: travis failing test * fix: wrong conditions after merge * fix: cannot cancel assets * fix: travis failing* fix change in deletion of assets * fix: codacy * fix: process cancellation of assets * refac: cancellation of pr only deletes auto created assets * fix: incorrect query	2019-11-18 11:46:55 +05:30
marination	a076bddd83	fix: Show 'Bill of Materials' custom button conditionally	2019-11-15 12:03:06 +05:30
rohitwaghchaure	c74c5d5644	Merge pull request #19583 from rohitwaghchaure/fixed_stock_rec_showing_incorrect_current_qty_and_serial_no ... fix: stock reconciliation showing incorrect current serial no and qty	2019-11-15 10:17:11 +05:30
Rohit Waghchaure	cf55c9c6da	fix: stock reconciliation shwoing incorrect current serial no and qty	2019-11-14 18:22:20 +05:30
rohitwaghchaure	ba8fc21594	fix: merge similar entries for serialized items in stock reconciliation (#19408)	2019-11-13 18:11:58 +05:30
Mangesh-Khairnar	06c8129574	fix(batch): fetch company on splitting the batch (#19558)	2019-11-13 10:51:43 +05:30