brotherton-erpnext

Author	SHA1	Message	Date
Nabin Hait	04870ae23a	fix: Replace newlines with spaces before evaluation of condition and formula (#21165 )	2020-04-08 09:34:46 +05:30
Suraj Shetty	da6806e6bc	fix: Translation strings with trailing spaces (#21192 )	2020-04-08 09:32:41 +05:30
Raffael Meyer	28753268e6	fix(regional): DATEV report: description in header, quote nonnumeric values (#21126 ) * fix description in header, quote nonnumeric values * fix: truncate 'Buchungstext' to 60 chars	2020-04-08 09:26:18 +05:30
Raffael Meyer	385a92d3f2	fix(patch): set_task_status (#21130 ) * fix(patch): set_task_status * remove unnecessary loop, use tabs Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-04-08 09:24:34 +05:30
Saqib	f93dc8dd88	fix: [ux] enforce 'get references from' in payment order (#21175 )	2020-04-08 09:20:17 +05:30
Nabin Hait	b95a794e51	Merge branch 'develop' into healthcare_refactor	2020-04-08 09:08:21 +05:30
Raffael Meyer	9aae0c27c2	feat(regional): a central place for regional address templates (#19862 ) * feat: a central place for regional address templates * set up address templates during install * why don't the tests run? * fix: remove unused variables, fix cwd * fix: .get() dicts contents * fix: choose the right default * fix: fieldname is template, not html * fix: import unittest * fix: remove unnecessary code * fix: ensure country exists * fix: ensure country exists * feat: test updating an existing template * fix(regional): DuplicateEntryError in test_update_address_template * refactor and set 'is_default' * fix codacy * fix: patch gst_fixes * fix: patch update_address_template_for_india Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-04-08 08:56:57 +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
Shivam Mishra	31051679c8	feat: remove unused fields	2020-04-07 18:43:11 +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	40611080da	fix(patch): Fix edge cases for Batch	2020-04-07 17:33:10 +05:30
Rohan Bansal	56827a372c	fix(patch): Reload Batch doctype before update query	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
Saqib Ansari	e9b63e45b9	chore: hide redundant base received amount	2020-04-07 17:22:11 +05:30
Rucha Mahabal	d72d9814e2	Merge branch 'develop' into healthcare_refactor	2020-04-07 16:52:22 +05:30
Rucha Mahabal	9d0ff961bc	fix: patch and tests	2020-04-07 16:43:22 +05:30
Rucha Mahabal	21f5680914	fix: merge conflicts	2020-04-07 16:42:50 +05:30
Deepesh Garg	6c36cddbd3	Merge pull request #21188 from deepeshgarg007/dimension_filter_fix fix: Use separate condition for tree and normal doctype	2020-04-07 15:23:36 +05:30
Deepesh Garg	62e9f83aab	fix: Use separate condition for tree and normal doctype	2020-04-07 15:17:06 +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
Shivam Mishra	65e11a9640	refactor: razorpay subscription for memberships	2020-04-07 14:49:28 +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
marination	39f9dd03a7	fix: Use reload_doc in patch	2020-04-07 14:03:50 +05:30
Deepesh Garg	d14598bc51	Merge pull request #21180 from KanchanChauhan/address-from-lead fix: (minor) Mandatory field missing to create address from lead	2020-04-07 12:22:54 +05:30
Vishal Dhayagude	24e79b14e1	fix(shopping cart): UX Improvements (#21034 ) * fix: nontype error for resolved and moved place order button at bottom left * fix: removed inline style * fix: Request for quotation move to lower right * fix: move buttons Co-authored-by: Naren <patilnarendra3@gmail.com> Co-authored-by: Saqib <nextchamp.saqib@gmail.com>	2020-04-07 12:18:47 +05:30
Deepesh Garg	24a2c9b978	feat: Date range in financial statements (#21020 ) * feat: Date range in financial statements * feat: Add date range filter in consolidated financial statement * fix: Handle API changes in query_report Co-authored-by: Saqib <nextchamp.saqib@gmail.com>	2020-04-07 12:16:25 +05:30
Saqib	30fc621f1e	fix: Create Item tax template only for specific account types (#20931 ) fix: Create Item tax template only for specific account types	2020-04-07 12:12:04 +05:30
Saqib	5bd54f544c	fix(shopping-cart): address is made mandatory to place order (#20923 ) fix(shopping-cart): address is made mandatory to place order	2020-04-07 12:09:59 +05:30
Vishal Dhayagude	8ef0609fc7	fix: Make Sales Invoice paid when it create from shopping cart (#20879 ) Co-authored-by: Saqib <nextchamp.saqib@gmail.com>	2020-04-07 12:07:01 +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
Suraj Shetty	8b55304715	Merge branch 'develop' of https://github.com/frappe/erpnext into new-translations	2020-04-07 11:04:04 +05:30
Deepesh Garg	4461868eff	Merge pull request #21184 from hrwX/update_modified fix: update modified for opportunity	2020-04-07 10:15:41 +05:30
Deepesh Garg	f3c44a97f0	Merge pull request #21100 from nextchamp-saqib/payment-req-status-fix fix: payment request status fixes	2020-04-07 10:13:08 +05:30
Himanshu Warekar	48307513c1	fix: update modified for opportunity	2020-04-07 09:06:03 +05:30
Kanchan Chauhan	4791e313db	fix: Mandatory field missing to create address from lead	2020-04-06 23:56:23 +05:30
marination	e05013ede3	feat: Scan Barcode in Purchase Receipt	2020-04-06 22:13:13 +05:30
Rucha Mahabal	0f23a304bc	fix: added patch for refactored changes	2020-04-06 19:00:17 +05:30
Saqib Ansari	ca3967d52f	feat: (minor) purchase register filters	2020-04-06 18:25:23 +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
Saqib Ansari	b2a84fe478	chore: rename bank reconciliation to bank clearance	2020-04-06 16:32:33 +05:30
marination	642f19d704	fix: Patch fix	2020-04-06 16:01:50 +05:30
Marica	e58d1b1b9f	Merge branch 'develop' into bin-requested-qty	2020-04-06 15:54:51 +05:30
Shivam Mishra	8d6cded07f	feat: added subscription web hook	2020-04-06 15:01:30 +05:30
Shivam Mishra	d92b7ab258	fix: use false explicitly	2020-04-06 14:44:33 +05:30
Shivam Mishra	4b667160a0	feat: added razorpay details to membership	2020-04-06 14:44:17 +05:30
Saqib	046b69d427	Merge branch 'develop' into item_tax_template_fix	2020-04-06 14:32:45 +05:30
Saqib	0f7ef139dc	Merge branch 'develop' into cart-address-update-v13	2020-04-06 14:23:51 +05:30
Deepesh Garg	433e58d131	feat: Add report summary in financial statements (#20876 ) * feat: Add report summary API for Balance Sheet and PL report * fix: Add summary cards in Cash flow report * feat: Add report summary in consolidated financial statements * fix: Remove accumulated values filter from P&L and cashflow report * fix: set company default currency in profit and loss statement if no data Co-authored-by: Prssanna Desai <prssud@gmail.com>	2020-04-06 14:07:20 +05:30
Deepesh Garg	8853850fd8	Merge branch 'develop' into item_tax_template_fix	2020-04-06 13:13:37 +05:30
Deepesh Garg	c01ec7606d	fix: Currency validation for default company accounts (#21094 ) * fix: Currency validation for default company accounts * fix: Improve message	2020-04-06 12:43:07 +05:30
Saqib Ansari	474222074b	fix: tests	2020-04-06 12:40:41 +05:30
Saqib Ansari	4de2416806	fix: change request status on payment entry cancel	2020-04-06 12:34:38 +05:30
Marica	b37f0bb052	Merge pull request #20864 from deepeshgarg007/po_supplier_skip feat: Allow PI creation without PO	2020-04-06 12:15:42 +05:30
Himanshu Warekar	c207c457a5	Merge branch 'develop' of https://github.com/frappe/erpnext into custom_append_to	2020-04-06 11:34:27 +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
Deepesh Garg	1958749382	fix(minor): Minor anti pattern fixes in Exchange rate revaluation doctype (#21147 ) * fix(minor): Minor anti pattern fixes in Exchange rate revaluation doctype * fix: Codacy	2020-04-06 10:21:50 +05:30
rohitwaghchaure	05ac7213b3	fix: allow to make BOM against template item (#21146 ) * fix: allow to make BOM against template item * Update queries.py Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-04-06 10:17:57 +05:30
Nabin Hait	75ef458b34	fix: update attendace from leave application (#21155 )	2020-04-06 10:15:38 +05:30
Deepesh Garg	0268c553a3	Merge pull request #21163 from deepeshgarg007/gst_3b_user_perm fix: User permissions in GSTR 3B report	2020-04-04 21:48:23 +05:30
Deepesh Garg	6c8efdef09	fix: User permissions in GSTR 3B report	2020-04-04 20:05:17 +05:30
Saqib	63bdf5dc74	fix: [ux] credit to & debit to error message (#21132 ) Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-04-03 19:35:55 +05:30
Marica	f55c9c8d8c	Merge branch 'develop' into po_supplier_skip	2020-04-03 18:35:48 +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
Saqib	e2c355f670	Merge branch 'develop' into payment-req-status-fix	2020-04-03 11:29:15 +05:30
Deepesh Garg	fc0bd2a9e4	Merge pull request #21150 from scmmishra/fix-patch-dashboard fix (tests): module import error for Dashboard Chart Field	2020-04-03 11:04:51 +05:30
Shivam Mishra	3251e1304c	fix: lms quiz type error (#21152 )	2020-04-03 10:08:19 +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
Deepesh Garg	0f25a40421	Merge branch 'develop' of https://github.com/frappe/erpnext into quotation_blanket_order	2020-04-02 21:30:53 +05:30
Deepesh Garg	d29dd58e89	fix: Validation	2020-04-02 21:29:59 +05:30
Marica	5d14af52a5	Merge branch 'develop' into po_supplier_skip	2020-04-02 21:17:52 +05:30
Deepesh Garg	13dbc4a415	Merge branch 'develop' into fix-patch-dashboard	2020-04-02 20:24:23 +05:30
Shivam Mishra	03a1e31195	Merge branch 'develop' into fix-patch-dashboard	2020-04-02 20:00:11 +05:30
Shivam Mishra	d9a17a9be1	fix (tests): reload doctype	2020-04-02 19:57:11 +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
Rucha Mahabal	ced978e192	fix: code clean up, performance improvements	2020-04-02 18:45:53 +05:30
Deepesh Garg	872fcb6cae	fix: Travis	2020-04-02 18:11:46 +05:30
marination	686a09620d	fix: Commonified code and added server side validation	2020-04-02 13:51:25 +05:30
rohitwaghchaure	e4fecd725d	Merge pull request #21144 from anupamvs/year-sum-fix Sum of years not needed.	2020-04-02 12:01:17 +05:30
Anupam K	b20dbff726	Sum of years not needed.	2020-04-02 11:37:44 +05:30
Deepesh Garg	625acab057	fix: Add duplicate item validation	2020-04-02 11:18:22 +05:30
Anupam K	e48bcb30e7	Sum of years not needed.	2020-04-02 01:04:01 +05:30
Deepesh Garg	94a505d31c	Merge pull request #21135 from marination/stock-ledger-typo fix: Typo in stock level validation in Stock Ledger	2020-04-01 11:20:32 +05:30
marination	6f0dc8257c	fix: Typo in stock level validation in Stock Ledger	2020-04-01 11:04:14 +05:30
Marica	7ecacb6360	Merge branch 'develop' into item_code_showing_as_mandatory_issue_develop	2020-04-01 10:47:33 +05:30
Deepesh Garg	5dcd2c118e	Merge pull request #21096 from nextchamp-saqib/customer-group-price-list-in-pos fix: customer group price list not fetched in pos	2020-04-01 09:42:13 +05:30
Deepesh Garg	8862be769b	Merge pull request #20809 from ronelvcabrera/billing-contact feat(Contacts): select billing contact for sales invoice	2020-03-31 20:42:26 +05:30
Nabin Hait	9f6bf71b95	Merge branch 'develop' into healthcare_refactor	2020-03-31 20:31:25 +05:30
Nabin Hait	a0018eed63	Merge branch 'develop' into refactor-addiional-salary	2020-03-31 20:30:52 +05:30
Saqib Ansari	9a7851096c	fix: check if selling price exists then set it	2020-03-31 18:48:35 +05:30
Saqib Ansari	8ed7535e8a	fix: travis	2020-03-31 18:44:02 +05:30
Saqib Ansari	0c8a0c9c3a	fix: no server side validations for accounts in asset category	2020-03-31 18:19:31 +05:30
Poranut Chollavorn	48aa2dd94b	fix(pos): fix pos display item instock	2020-03-31 18:13:55 +05:30
rohitwaghchaure	a19aa0431a	Merge pull request #20826 from saurabh6790/lead-address-fixes fix: if mandatory fields are missing do not create address against lead	2020-03-31 17:38:06 +05:30
Deepesh Garg	cf9347d2f5	fix: Undo unneccessary changes	2020-03-31 17:28:43 +05:30
Deepesh Garg	5fd456baa4	Merge branch 'develop' into customer-group-price-list-in-pos	2020-03-31 16:33:41 +05:30
Deepesh Garg	bf884e8b37	Merge pull request #21092 from scmmishra/multiple-option-fix fix: use setup from Supplier Quotation Controller	2020-03-31 16:28:47 +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	d45e0e0b5b	Merge branch 'develop' into billing-contact	2020-03-31 16:06:11 +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
Nabin Hait	95330c850c	Merge branch 'develop' into healthcare_refactor	2020-03-31 15:59:22 +05:30
Saurabh	84b93414d0	fix: typo	2020-03-31 15:58:00 +05:30
Saurabh	6c8d63f3b9	fix: provision to setup new address from lead if address creation break due to mandatory exception	2020-03-31 15:58:00 +05:30
Saurabh	e567563aa1	fix: if mandatory fields are missing do not create address against lead	2020-03-31 15:58:00 +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
Deepesh Garg	bdcc4b47d6	Merge pull request #21061 from anupamvs/customer-doctype-issue fix: Adding proper error message	2020-03-31 15:30:46 +05:30
Raffael Meyer	c19330df63	fix: account groups (#21070 )	2020-03-31 15:28:45 +05:30
rohitwaghchaure	d274923ae1	fix: "Qty To Manufacture" field as non mandatory in job card (#21081 )	2020-03-31 15:28:31 +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	242a079bcb	Merge branch 'develop' of https://github.com/frappe/erpnext into quotation_blanket_order	2020-03-31 14:18:30 +05:30
Deepesh Garg	4d9fe69ba5	fix: Test cases	2020-03-31 14:17:53 +05:30
Deepesh Garg	31ea093283	Merge branch 'develop' into customer-doctype-issue	2020-03-31 13:50:40 +05:30
Anupam Kumar	ee0dec8776	fix: email_to, party_type and party are not set in payment request when order made from portal (#21084 ) Co-authored-by: Anupam K <anupam@Anupams-MacBook-Air.local>	2020-03-31 10:51:09 +05:30
Saqib	bba78f0384	fix: auto created asset message (#21108 ) * fix: auto created asset message * Update erpnext/controllers/buying_controller.py Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-03-31 10:49:44 +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
Andy Zhu	5c54adec28	fix: docfield of sales_order is not fetching route options for new doc (#21123 ) Using the wrong method to get `so` as docfield. frappe.meta changes will not effect the `sales_order` in `frm`.	2020-03-31 10:43:00 +05:30
prafful1234	3fa03df1e3	fix(transaction): Add comment-by from frappe session (#20867 ) Co-authored-by: prafful1234 <prafful@mntechnique.com>	2020-03-31 10:40:42 +05:30
Raffael Meyer	b0ab3981ea	fix(regional): header row in DATEV report (#21113 ) * fix(regional): encoding of DATEV report * feat(regional): filter datev report by voucher type * fix: creation time, coa used, is frozen * add voucher types: Payroll Entry, Bank Reconciliation, Asset, Stock Entry * fix indentation * fix indentation * fix indentation	2020-03-31 10:40:03 +05:30
Ahmad M Abdelrahman	06b3f6f781	Remove Campagin restrection (#21024 ) Lead Source Now is an independent doctype. forcing the user to add Campaign is not valid Solution Show Campaign keeping it optional and keep the user to be free to add or remove data	2020-03-31 10:38:49 +05:30
Deepesh Garg	cc4753977f	Merge branch 'develop' into po_supplier_skip	2020-03-31 10:37:21 +05:30
Shivam Mishra	7806e5a052	feat: changes for desk pages (#21027 ) * feat: rename Chart on Getting Started Page * feat: add dashboard and leaderboard to getting started * feat: remove communication Co-authored-by: Prssanna Desai <prssud@gmail.com> Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>	2020-03-31 10:30:20 +05:30
Deepesh Garg	007548b79c	fix: Bank Account patch (#21124 )	2020-03-31 10:07:51 +05:30
Deepesh Garg	c014c802dd	fix: Remove comments	2020-03-30 22:50:29 +05:30
Deepesh Garg	c33412b6ae	feat: Link blanket order and quotation	2020-03-30 22:44:13 +05:30
Shivam Mishra	3a2c8560ba	feat: update desk page for Non Profits	2020-03-30 18:15:51 +05:30
Shivam Mishra	28fafd0dda	feat: setup subscription API	2020-03-30 18:15:37 +05:30
Shivam Mishra	1281634306	feat: client code to handle razorpay fields	2020-03-30 18:15:22 +05:30
Shivam Mishra	1d6395c5cf	feat: add PAN details field to member for India	2020-03-30 18:14:44 +05:30
Shivam Mishra	e836cdec13	feat: update member and membership doctype	2020-03-30 18:14:10 +05:30
Shivam Mishra	1f20f6348d	feat: added membership settings doctype	2020-03-30 18:13:29 +05:30
Deepesh Garg	f0760dee80	Merge branch 'develop' of https://github.com/frappe/erpnext into customer-doctype-issue	2020-03-30 15:05:34 +05:30
Deepesh Garg	56bc36f9e2	fix: Test cases	2020-03-30 15:05:20 +05:30
Deepesh Garg	f144b8b205	Merge branch 'develop' into po_supplier_skip	2020-03-30 13:07:03 +05:30
Deepesh Garg	647529651d	Merge pull request #21067 from Alchez/dev-add-issue-status-filter feat: add status filter in issue web form (develop)	2020-03-30 12:23:20 +05:30
Deepesh Garg	025762f395	Merge pull request #21119 from rohitwaghchaure/fixed_parent_account_error_while_adding_equity_account_develop fix: not able to add equity account in the chart of accounts	2020-03-30 12:15:01 +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	fe1f754d83	Merge pull request #21110 from nextchamp-saqib/cancel-error-hyperlink chore: hyperlinks in cannot cancel message	2020-03-29 21:53:43 +05:30
Deepesh Garg	e0a4a32460	Merge pull request #21115 from nextchamp-saqib/course-report-perm-fix fix: cannot view report for course doctype - permission problem	2020-03-29 21:51:15 +05:30
Rohit Waghchaure	cdf80eb4ad	fix: not able to add equity account in the chart of accounts	2020-03-29 16:35:10 +05:30
Saqib Ansari	0f6d372182	fix: cannot view report for course doctype - permission problem	2020-03-29 12:52:16 +05:30
Deepesh Garg	f528aef49c	Merge pull request #21089 from scmmishra/print-format-fix fix: total currency formatting in Acc Receivable and Payable	2020-03-28 21:27:56 +05:30
Deepesh Garg	1a2cf5cabe	fix: get_party_gle_currency failing if customer_name or supplier_name is passed	2020-03-28 21:26:16 +05:30
Deepesh Garg	c6b850eacb	fix: Improve message	2020-03-28 21:17:58 +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	b345fe0fe9	chore: hyperlinks in cannot cancel message	2020-03-28 20:11:26 +05:30
Saqib Ansari	ed3553f795	chore: [ux] filter warehouse based on company	2020-03-28 19:12:59 +05:30
Deepesh Garg	b5c6412ed4	Merge pull request #21101 from nextchamp-saqib/gl-entry-currency-fix fix: currency formatting in gl entry dr cr field	2020-03-28 18:56:49 +05:30
Saqib Ansari	c1678203f1	fix: currency formatting in gl entry dr cr field	2020-03-28 16:39:22 +05:30
Saqib Ansari	0ec01d98d6	fix: payment request status fixes	2020-03-28 16:11:23 +05:30
rohitwaghchaure	2d5addafa7	Merge pull request #21099 from anupamvs/item-wise-sales-history-billed-amount-bug bug: Item-wise Sales History - Billed amount	2020-03-28 15:05:41 +05:30
Rohit Waghchaure	e7c4565483	fix: item code showing as mandatory even if the 'Item Naming By' is set as Naming Series in stock settings	2020-03-28 14:59:00 +05:30
Anupam K	85aae7de0b	bug: Item-wise Sales History - Billed amount	2020-03-28 14:13:58 +05:30
Saqib Ansari	8488ef8eb1	fix: customer group price list not fetched in pos	2020-03-28 14:07:09 +05:30
Deepesh Garg	c12a8040ef	Merge branch 'develop' into item_defaults_fix_dev	2020-03-27 21:51:00 +05:30
Deepesh Garg	e86f6d0738	Merge branch 'develop' into print-format-fix	2020-03-27 21:39:16 +05:30
Shivam Mishra	71fb8e8b57	fix: use setup from Supplier Quotation Controller	2020-03-27 20:47:04 +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
Shivam Mishra	cf6a814328	fix: total currency formatting	2020-03-27 19:15:59 +05:30
Deepesh Garg	c5f40d9072	Merge branch 'develop' into sahil28297-patch-1	2020-03-27 18:43:13 +05:30
rohitwaghchaure	0fc8b2af60	Merge pull request #21077 from rohitwaghchaure/default_item_is_not_coming_while_making_new_bom_develop fix: item not showing in popup while making batch	2020-03-27 13:49:23 +05:30
Rohit Waghchaure	a5357c2e27	fix: item not showing in popup while making batch	2020-03-27 12:59:02 +05:30
Deepesh Garg	3a639ea187	Merge branch 'develop' into demo-fixed-asset-fix	2020-03-27 11:31:53 +05:30
Rucha Mahabal	cdf7189c29	fix: remove Expired status from Appointment	2020-03-27 11:30:00 +05:30
Deepesh Garg	88898abe6c	fix: Randomly failing loan repayment test	2020-03-27 10:27:15 +05:30
Rucha Mahabal	197165ff40	fix: codacy	2020-03-26 17:29:50 +05:30
Rohan Bansal	da54719b43	feat: add status filter in issue web form	2020-03-26 16:08:03 +05:30
Rucha Mahabal	42376705ab	fix: don't append year if values have same year in Appointment Analytics	2020-03-26 16:02:53 +05:30
Anupam K	7ca28fdab5	fix: Adding proper error message	2020-03-26 15:54:15 +05:30
marination	815c36a4eb	fix: Updated Bin Requested Qty logic	2020-03-26 15:46:27 +05:30
Rohan	ea182051d3	fix: consumed qty values in work order	2020-03-26 15:32:01 +05:30
Rucha Mahabal	2cec6bd789	fix: check new patient before creating fee validity	2020-03-26 14:38:12 +05:30
Deepesh Garg	d74bcad7af	fix: Added hidden GL column in general ledger (#21021 ) Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-03-26 13:37:40 +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
Raffael Meyer	89cac5af16	fix(regional): encoding of DATEV report (#21059 )	2020-03-26 13:25:58 +05:30
Marica	b856aae651	fix: Project field in Stock Entry Detail should be editable (#20999 )	2020-03-26 13:23:49 +05:30
Saqib	74864b3b61	fix: currency not fetched on quotation creation (#20996 )	2020-03-26 13:20:31 +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
Nabin Hait	1aa8c2ecc4	fix: delete contact email and phone along with contact	2020-03-26 13:15:31 +05:30
Nabin Hait	ced6898fd7	fix: Ignored user permission for parent_company and existing_company field in Company	2020-03-26 12:30:29 +05:30
Deepesh Garg	5fbada75fa	Merge pull request #21038 from anupamvs/error-message-changes fix: add better error message	2020-03-26 11:56:34 +05:30
Deepesh Garg	9062ce5191	fix: Spacing and indentations	2020-03-26 11:56:03 +05:30
Anupam K	9725e43eed	fix: Adding proper error message	2020-03-26 00:17:09 +05:30
Deepesh Garg	bdcfab3a0f	fix: Update patch and bank form cleanup	2020-03-25 21:32:10 +05:30
Deepesh Garg	3cf70a6e79	Merge branch 'develop' of https://github.com/frappe/erpnext into P-Froggy-develop	2020-03-25 21:00:25 +05:30
Anupam K	10b7a51805	Better error message	2020-03-25 18:21:42 +05:30
Deepesh Garg	113c6c86b7	fix: Remove debug	2020-03-25 16:54:17 +05:30
Deepesh Garg	878e4fbcf8	fix: Place of supply validation in GSTR-1 report	2020-03-25 16:52:07 +05:30
Rucha Mahabal	b60979cfaa	fix: show Change Item Code button only if Unit Type is billable	2020-03-25 02:10:33 +05:30
Rucha Mahabal	1900a62c54	fix: Merge branch 'develop' into healthcare_refactor	2020-03-25 02:08:42 +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
Deepesh Garg	da6fb435dd	Merge pull request #21041 from deepeshgarg007/default_dimension_clean_up fix: Default dimension set code cleanup	2020-03-24 15:47:51 +05:30
Deepesh Garg	4e3fbf5a8b	fix: Default dimension set code cleanup	2020-03-24 15:43:21 +05:30
Anupam K	b14085eb0e	Better error message	2020-03-24 12:17:28 +05:30
Rucha Mahabal	60e558a019	test: Patient Medical Record	2020-03-24 11:54:35 +05:30
Rucha Mahabal	aabcee4f8f	test: Healthcare Consultation DocTypes	2020-03-24 11:54:15 +05:30
Anupam K	95e35f9e81	Better error message	2020-03-24 11:52:34 +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
sahil28297	39f02da45a	Merge branch 'develop' into sahil28297-patch-1	2020-03-23 13:03:30 +05:30
Rucha Mahabal	f67afe67ab	test: Healthcare Masters	2020-03-23 12:31:13 +05:30
Rucha Mahabal	4f9a1471e4	fix: tests	2020-03-23 10:40:39 +05:30
Deepesh Garg	96297f73f2	Merge pull request #21025 from deepeshgarg007/dimension_perm fix: Remove quick entry from accounting dimensions	2020-03-22 21:56:34 +05:30
Deepesh Garg	75225316f0	fix: Remove quick entry from accouting dimensions	2020-03-22 21:50:22 +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
Rohan	4464a591ef	fix: allow BOM to use same item as raw material	2020-03-20 18:49:08 +05:30
marination	73c8d23a79	fix: UOM fixes in Sales Order,Material Request & Production Plan	2020-03-20 17:52:28 +05:30
sahil28297	4c3679ba8a	fix: develop version as 12.0.0-dev	2020-03-20 15:38:52 +05:30
sahil28297	fcdc2b1815	fix: develop version as 12.0.0.dev	2020-03-20 15:20:28 +05:30
sahil28297	54cbff9e80	fix: develop version as 12.x.x instead of 12.2.0	2020-03-20 14:23:27 +05:30
Suraj Shetty	3cf0dc966c	fix: Add currency in options of Opportunity Amount - To show currect symbol in list view	2020-03-20 12:51:16 +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
Nabin Hait	2e67c33657	Release testing fixes develop (#20987 ) * fix: Multiple fixes during pre-release testing * fix: Merge conflict	2020-03-19 10:59:32 +05:30
Deepesh Garg	9476170b09	Merge pull request #20994 from rohitwaghchaure/fixed_bom_comparision_issue_develop fix: bom comparison issue	2020-03-19 10:55:14 +05:30
Rohit Waghchaure	d9469137cc	fix: bom comparison issue	2020-03-19 10:07:27 +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
Prssanna Desai	b4909b8fd2	fix: set filters as argument filters if passed (#20975 )	2020-03-18 18:23:38 +05:30
Marica	508ed1e121	fix: Missing if condition in Customer Default Bank Account Validation. (#20969 )	2020-03-18 11:28:04 +05:30
marination	3251dcf672	fix: Added patch to patches.txt	2020-03-18 10:11:23 +05:30
Rucha Mahabal	0eeaad8ce7	fix: create fee validity for new patients only	2020-03-17 20:26:29 +05:30
Rucha Mahabal	2d785b7b09	fix: invoicing logic for appointments	2020-03-17 20:18:16 +05:30
Priyanka Gangar	2602c7ea38	Label changes in account settings develop (#20965 ) * fix: Account setting words switches to US Terminology * created united_states.js * Remove Unwanted Spaces * Remove all changes * Add spaces between arguments Co-authored-by: PriyankaGangar <pinka0925@gmail.com>	2020-03-17 19:39:30 +05:30
Rucha Mahabal	f2574dde37	fix: set fee validity start date and set status as Completed or Pending	2020-03-17 19:28:18 +05:30
Rucha Mahabal	2f2c09bd98	fix: wrong fee validity calculation and payment fields visibility in appointment	2020-03-17 18:10:39 +05:30
Deepesh Garg	745897c354	Merge pull request #20862 from alyf-de/skr04_groups fix(accounts): adjust account groups in SKR04	2020-03-17 17:27:16 +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
rohitwaghchaure	06dc6a527e	fix: bom replace tool issue (#20842 )	2020-03-17 17:01:26 +05:30
Deepesh Garg	ff7bbd2d38	fix: Party Name not visible in statement of accounts (#20913 ) * fix: Party name in Statement Of Accounts * Update general_ledger.html Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-03-17 17:00:06 +05:30
marination	e1f499ae1b	fix: Pick List Enhancements	2020-03-17 11:47:11 +05:30
Deepesh Garg	e7aefc1163	fix: Add check to skip PR in supplier master	2020-03-17 11:44:02 +05:30
Deepesh Garg	eeb1922e37	fix: Add check to skip SO and DN in customer master	2020-03-17 11:43:34 +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
Deepesh Garg	ed0965a572	feat: Nested set filtering for accounting dimension (#20860 ) * feat: Nested set filtering for accounting dimension * fix: Remove print statement	2020-03-17 10:53:24 +05:30
Deepesh Garg	d1bc74d650	Merge pull request #20958 from deepeshgarg007/mode_of_payment_fix fix: Mode of payment not fetcched in Item wise purchase register	2020-03-16 22:43:09 +05:30
Don-Leopardo	2b6a20aab5	fix: sql injection (#20818 )	2020-03-16 22:36:44 +05:30
Deepesh Garg	07116c7922	fix: Mode of payment not fetcched in Item wise purchase register	2020-03-16 22:36:32 +05:30
Frappe PR Bot	b8b5fa6291	feat: Updated translation (#20954 ) Co-authored-by: frappe <frappe@scw-dazzling-elgamal>	2020-03-16 17:59:42 +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
Anurag Mishra	c0b1c372a4	fix: local variable 'benefit_amount' referenced before assignment (#20949 )	2020-03-16 16:53:03 +05:30
Saqib	de4f6901d6	fix: serial_no_selector showing for non serialized batched item (#20851 )	2020-03-16 16:29:10 +05:30
Deepesh Garg	0a74261a94	Merge pull request #20920 from deepeshgarg007/c_form_fix fix: Get invoice details only if invoice is selected	2020-03-16 15:56:32 +05:30
Deepesh Garg	d190cc0198	Merge pull request #20835 from Thunderbottom/welcome-email-fix fix: use ERPNext in welcome email when default company is not set	2020-03-16 15:54:53 +05:30
Prssanna Desai	e71153cbee	fix: fix options of currency fieldtype in Expense Taxes and Charges (#20901 )	2020-03-16 15:52:25 +05:30
Raffael Meyer	1433436670	fix(accounts): add account_type and tax_rate to some VAT accounts (#20940 ) * Add account_type and tax rate to some VAT accounts * fix indentation	2020-03-16 15:45:05 +05:30
Himanshu Warekar	841be6713b	Merge branch 'develop' of https://github.com/frappe/erpnext into custom_append_to	2020-03-13 19:40:00 +05:30
Anurag Mishra	3ced42f302	feat: reverse linking and multiple additonal salaries in salary slip	2020-03-13 19:14:56 +05:30
Rucha Mahabal	cd31996b81	fix: check fee validity in a single function	2020-03-13 15:39:31 +05:30
Deepesh Garg	0b7acc0fd6	fix: Create Item tax template only for specific account types	2020-03-13 11:51:14 +05:30
Rucha Mahabal	200cb34ecf	Merge branch 'develop' into healthcare_refactor	2020-03-12 19:44:27 +05:30
Shivam Mishra	c06ba54f1e	refactor: remove website (#20927 )	2020-03-12 18:04:42 +05:30
Rucha Mahabal	05853efeb7	feat: Healthcare Domain Workspace with chart and shortcuts	2020-03-12 17:44:46 +05:30
Shivam Mishra	aecf9d6168	Merge branch 'develop' into desk-settings-card	2020-03-12 17:13:03 +05:30
Shivam Mishra	f241054c6c	feat: extended settings page	2020-03-12 16:38:59 +05:30
Shivam Mishra	05d74bbcf9	feat: added loan management page	2020-03-12 16:38:49 +05:30
Shivam Mishra	451382e08e	feat: update desk pages	2020-03-12 16:34:34 +05:30
Myuddin khatri	b9631a501f	fix(shopping-cart): setting billing and shipping address setting billing and shipping address	2020-03-12 16:21:38 +05:30
Myuddin khatri	4635ff9368	fix(shopping-cart): address is made mandatory to place order	2020-03-12 14:45:08 +05:30
Ronel Cabrera	fcb54762a1	feat(Contacts): select billing contact for sales invoice	2020-03-12 16:58:59 +08:00
Rucha Mahabal	72993d6828	Merge branch 'develop' into healthcare_refactor	2020-03-12 12:52:38 +05:30
Rucha Mahabal	06d1b047e0	refactor: Healthcare Module Page	2020-03-12 12:16:23 +05:30
Chinmay D. Pai	86636212c3	fix: remove make_purchase_invoice from demo script currently demo fails with the following error: frappe@bf54a9834cfe:/workspace/development/frappe-bench$ bench --site test1.localhost execute erpnext.demo.demo.make Traceback (most recent call last): File "/usr/lib/python3.7/runpy.py", line 193, in _run_module_as_main "__main__", mod_spec) File "/usr/lib/python3.7/runpy.py", line 85, in _run_code exec(code, run_globals) File "/workspace/development/frappe-bench/apps/frappe/frappe/utils/bench_helper.py", line 97, in <module> main() File "/workspace/development/frappe-bench/apps/frappe/frappe/utils/bench_helper.py", line 18, in main click.Group(commands=commands)(prog_name='bench') File "/workspace/development/frappe-bench/env/lib/python3.7/site-packages/click/core.py", line 764, in __call__ return self.main(args, kwargs) File "/workspace/development/frappe-bench/env/lib/python3.7/site-packages/click/core.py", line 717, in main rv = self.invoke(ctx) File "/workspace/development/frappe-bench/env/lib/python3.7/site-packages/click/core.py", line 1137, in invoke return _process_result(sub_ctx.command.invoke(sub_ctx)) File "/workspace/development/frappe-bench/env/lib/python3.7/site-packages/click/core.py", line 1137, in invoke return _process_result(sub_ctx.command.invoke(sub_ctx)) File "/workspace/development/frappe-bench/env/lib/python3.7/site-packages/click/core.py", line 956, in invoke return ctx.invoke(self.callback, ctx.params) File "/workspace/development/frappe-bench/env/lib/python3.7/site-packages/click/core.py", line 555, in invoke return callback(args, *kwargs) File "/workspace/development/frappe-bench/env/lib/python3.7/site-packages/click/decorators.py", line 17, in new_func return f(get_current_context(), args, *kwargs) File "/workspace/development/frappe-bench/apps/frappe/frappe/commands/__init__.py", line 25, in _func ret = f(frappe._dict(ctx.obj), args, *kwargs) File "/workspace/development/frappe-bench/apps/frappe/frappe/commands/utils.py", line 145, in execute ret = frappe.get_attr(method)(args, **kwargs) File "/workspace/development/frappe-bench/apps/frappe/frappe/__init__.py", line 1042, in get_attr return getattr(get_module(modulename), methodname) File "/workspace/development/frappe-bench/apps/frappe/frappe/__init__.py", line 823, in get_module return importlib.import_module(modulename) File "/workspace/development/frappe-bench/env/lib/python3.7/importlib/__init__.py", line 127, in import_module return _bootstrap._gcd_import(name[level:], package, level) File "<frozen importlib._bootstrap>", line 1006, in _gcd_import File "<frozen importlib._bootstrap>", line 983, in _find_and_load File "<frozen importlib._bootstrap>", line 967, in _find_and_load_unlocked File "<frozen importlib._bootstrap>", line 677, in _load_unlocked File "<frozen importlib._bootstrap_external>", line 728, in exec_module File "<frozen importlib._bootstrap>", line 219, in _call_with_frames_removed File "/workspace/development/frappe-bench/apps/erpnext/erpnext/demo/demo.py", line 6, in <module> from erpnext.demo.user import hr, sales, purchase, manufacturing, stock, accounts, projects, fixed_asset File "/workspace/development/frappe-bench/apps/erpnext/erpnext/demo/user/fixed_asset.py", line 9, in <module> from erpnext.assets.doctype.asset.asset import make_purchase_invoice, make_sales_invoice ImportError: cannot import name 'make_purchase_invoice' from 'erpnext.assets.doctype.asset.asset' (/workspace/development/frappe-bench/apps/erpnext/erpnext/assets/doctype/asset/asset.py) Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>	2020-03-11 16:20:07 +05:30
Saqib	6ec4618914	fix: travis (#20903 )	2020-03-11 16:04:00 +05:30
Prssanna Desai	4fd61c3f83	fix: parameters un get function for accounts dashboard (#20847 )	2020-03-11 12:37:56 +05:30
Suraj Shetty	edc31d51da	chore: Add CSV imported translations	2020-03-10 20:51:01 +05:30
Suraj Shetty	45ce5b07b4	Merge branch 'develop' of https://github.com/frappe/erpnext into new-translations	2020-03-10 18:22:36 +05:30
Suraj Shetty	b868c379a7	chore: Update translations	2020-03-10 18:21:33 +05:30
Shivam Mishra	1fd1852c6a	Merge branch 'develop' into yet-another-desk	2020-03-10 18:20:27 +05:30
Deepesh Garg	4b20e852ea	fix: Get invoice details only if invoice is selected	2020-03-10 10:36:05 +05:30
Deepesh Garg	9f28a3124c	Merge pull request #20890 from deepeshgarg007/itemised_purchase_register fix: HSN code not visible in GST Itemised Purchase register	2020-03-10 10:05:31 +05:30
Rucha Mahabal	c4b2dceb01	feat: Fee Validity status (Ongoing, Expired, Completed)	2020-03-09 23:57:00 +05:30
Deepesh Garg	74d4e9e4ea	Merge pull request #20884 from deepeshgarg007/first_row_dimension fix: Acccounting Dimension disappearing in first row after refresh	2020-03-09 22:47:25 +05:30
Deepesh Garg	5e58666091	fix: HSN code not visible in GST Itemised Purchase register	2020-03-09 22:38:41 +05:30
Saqib	f866ed9679	fix: [pos] customer group filter resets on syncing offline invoices (#20873 )	2020-03-09 18:30:47 +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
Marica	4528badfcf	fix: ModuleNotFoundError on Turkey Company setup (#20853 )	2020-03-09 18:07:43 +05:30
Rucha Mahabal	27512c86ae	refactor: Healthcare utils	2020-03-09 17:29:23 +05:30
Deepesh Garg	8d72b14776	fix: Acccounting Dimension disappearing in first row after refresh	2020-03-09 08:06:07 +05:30
Raffael Meyer	f669f30c08	add missing equity accounts	2020-03-06 16:17:06 +01:00
Deepesh Garg	1943fb0de4	feat: Allow PI creation without PO	2020-03-06 18:50:11 +05:30
Raffael Meyer	7b7513ab2b	adjust groups	2020-03-06 12:32:49 +01:00
Anurag Mishra	d319feee9e	fix: reverse linking	2020-03-06 15:01:10 +05:30
Anurag Mishra	1663f66e6d	test: Recurring Additional salary	2020-03-06 15:00:41 +05:30
Anurag Mishra	885ab5dc66	fix: requested changes	2020-03-06 15:00:40 +05:30
Anurag Mishra	2d7fcab2c9	feat: Recurring Addtional Salary	2020-03-06 14:59:56 +05:30
Anurag Mishra	943457abd3	fix: reverse linking for employee advance	2020-03-06 13:37:24 +05:30
Rucha Mahabal	b754faa59c	fix: merge branch healthcare_refactor	2020-03-06 13:23:40 +05:30
Rucha Mahabal	e8bbdd5e84	fix: Lab Test Template data import failing in Lab Test Item creation	2020-03-06 13:18:56 +05:30
Rucha Mahabal	ac4199f2d7	fix (Lab Test): None TypeError in Patient Medical Record	2020-03-06 12:22:55 +05:30
Rucha Mahabal	11117810c5	fix (Vital Signs): Patient Medical Record not found	2020-03-06 12:21:18 +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
Marica	fc96c1a2d6	fix: update_child_qty_rate() missing argument (#20838 )	2020-03-06 10:57:59 +05:30
Anurag Mishra	59a0bce3a9	feat: Repay advance from salary	2020-03-05 16:13:52 +05:30
Shivam Mishra	0310366d5a	fix (cleanup): remove incomplete dependencies data	2020-03-05 11:28:40 +05:30
Chinmay D. Pai	612e58dca8	fix: use ERPNext in welcome email when default company is not set Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>	2020-03-05 10:08:43 +05:30
Deepesh Garg	6dc335d898	Merge pull request #20824 from scmmishra/report-options feat: update profit and loss for new report summary API	2020-03-04 16:07:31 +05:30
Deepesh Garg	a75cf35bb7	Merge pull request #20755 from lokesh-indictrans/develop fix: user is not able to do 'Set as Lost' for Quotation (#20603)	2020-03-04 11:56:52 +05:30
Deepesh Garg	6d604a151b	fix: Validation message	2020-03-04 11:55:10 +05:30
Deepesh Garg	a245a3a47f	fix: HSN code no visible in GST itemised sales register	2020-03-04 10:23:49 +05:30
Lokesh Waingankar	d398c73bc5	fix: Removed html tags in pop up message (#20603 )	2020-03-03 19:07:51 +05:30
Lokesh Waingankar	6795422204	Merge branch 'develop' of https://github.com/frappe/erpnext into develop	2020-03-03 12:12:56 +05:30
Rucha Mahabal	5eb42409c7	Merge branch 'develop' into healthcare_refactor	2020-03-03 09:22:11 +05:30
Rucha Mahabal	33fec1df54	feat: Patient Registration Web Form	2020-03-03 01:13:58 +05:30
Rucha Mahabal	77e84dfc35	fix: remove deprecated Appointment Analytics Tree Grid Report	2020-03-03 00:25:50 +05:30
Rucha Mahabal	5a92b3fc99	feat: set chart for Appointment Analytics	2020-03-03 00:24:43 +05:30
Rucha Mahabal	85aab34421	feat: Patient Appointment Analytics Script Report	2020-03-02 23:14:30 +05:30
Shivam Mishra	1f151c1032	refactor: update restrict to domain data	2020-03-02 19:37:12 +05:30
Anurag Mishra	cf04b3c680	fix: added standard filters (#20807 )	2020-03-02 19:25:01 +05:30
Deepesh Garg	12aa35aa43	fix: Label and UX fixes in AP/AP reports (#20803 )	2020-03-02 19:10:29 +05:30
Priyanka Gangar	ca05c83796	fix: fetch sales person name (#20805 ) * fix: fetch sales person name * Update sales_person.js Co-authored-by: pinka0925 <44537026+pinka0925@users.noreply.github.com> Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-03-02 19:06:06 +05:30
Deepesh Garg	cd96be9993	fix: Excel support and UX fixes for chart of accounts importer (#20703 ) * fix: Excel support and UX fixes for chart of accounts importer * fix: Linting Errors * fix: Blank chart preview * fix: Added template types for download * fix: Description on template selection * fix: Linting fixes * fix: Move logic for download template to dialog	2020-03-02 18:57:21 +05:30
Deepesh Garg	cc2771baa7	fix: Total amount not displayed in Journal Entry (#20794 ) * fix: Total amount not displayed in Journal Entry * fix: Update paid_to_received field * fix: set total amount Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-03-02 18:09:19 +05:30
Saurabh	19df2ffbd8	[bug][fix]: set status to object instead of variable (#20790 )	2020-03-02 17:50:05 +05:30
Lokesh Waingankar	38242bc21f	Merge branch 'develop' of https://github.com/frappe/erpnext into develop	2020-03-02 17:45:59 +05:30
Shivam Mishra	3f59af3ef1	feat: added base config for domains	2020-03-02 17:25:18 +05:30
Shivam Mishra	8a8e8d6c5c	feat: added base pages for desk	2020-03-02 16:56:31 +05:30
Frappe PR Bot	eb2f79b16e	feat: Updated translation (#20784 )	2020-03-02 16:52:42 +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	ff52d16fb3	chore: control reposting of future gl entries with flags (#20774 )	2020-03-02 15:19:18 +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
Saqib	7b8c3dee3d	fix: reconciled entries showing in bank reco (#20787 )	2020-03-02 15:01:06 +05:30
Rucha Mahabal	9565e62e3a	refactor: Clinical Procedure code	2020-03-02 12:11:38 +05:30
Rucha Mahabal	75626d63aa	fix: set consumable entries on client side and not on validate	2020-03-02 11:35:59 +05:30
Rucha Mahabal	5ec7b55c3c	fix: consumable total amount not set in Clinical Procedure	2020-03-02 10:17:15 +05:30
P-Froggy	f1014bb978	Merge branch 'develop' of https://github.com/P-Froggy/erpnext into develop	2020-03-02 00:21:12 +01:00
P-Froggy	313efe9b32	fix: add missing semicolon	2020-03-02 00:21:08 +01:00
P-Froggy	3bf04154b1	Merge branch 'develop' into develop	2020-03-02 00:18:23 +01:00
Deepesh Garg	09188e4a21	fix: Remove fetch from loan_application.json	2020-03-01 22:16:27 +05:30
Rucha Mahabal	7c5947f041	fix: Batch not getting fetched in Clinical Procedure Item	2020-03-01 14:46:34 +05:30
Deepesh Garg	0c7b60aa99	Merge pull request #20768 from marination/buying-dashboard chore: Rearranged Buying Module Dashboard	2020-02-29 17:33:51 +05:30
radhikag	86ecaa59ca	fix : Student Admission accepting end date less than start date. #20625	2020-02-29 12:47:03 +05:30
Deepesh Garg	2090d113e5	Merge pull request #20781 from deepeshgarg007/loan_shortfall_enhance fix: Add loan to value ratio in loan security type	2020-02-29 09:01:27 +05:30
Deepesh Garg	eee7f77d47	fix: Add loan to value ratio in loan security type	2020-02-29 08:58:15 +05:30
P-Froggy	f9b3e4be78	Merge branch 'develop' of https://github.com/P-Froggy/erpnext into develop	2020-02-28 20:46:41 +01:00
P-Froggy	266e689c4f	fix: Show swift number and branch code in quick entry of bank doctype	2020-02-28 20:46:36 +01:00
P-Froggy	393a626834	fix: Allow only bank accounts of the respective party in payment entry	2020-02-28 20:45:48 +01:00
Rucha Mahabal	d244ac9c3a	fix: status inconsistencies in Clinical Procedure	2020-02-28 19:25:26 +05:30
Rucha Mahabal	0ed4cabb5d	fix: make Clinical Procedure submittable	2020-02-28 19:24:38 +05:30
P-Froggy	55d10f77f9	fix: Add linked bank accounts to supplier dashboard	2020-02-28 13:14:11 +01:00
Rucha Mahabal	d76908d757	fix: Clinical Procedure Template code refactor	2020-02-28 13:30:43 +05:30
marination	24f4683999	chore: Rearranged Buying Module Dashboard	2020-02-28 12:58:41 +05:30
Deepesh Garg	5707c9a731	fix: Item Wise report query fix (#20760 )	2020-02-28 12:28:54 +05:30
Karthikeyan S	0db423ed5f	fix(auto attendance): bug in marking absent (#20759 ) This bug was introduces in the commit `bd6e8b9cec` i.e. The mark_absent function was renamed to mark_attendance, but there is a miss match in the order of the parameters.	2020-02-28 12:27:21 +05:30
Saqib	8cf841ce60	fix: wrong calculation of depreciation eliminated for a period (#20502 )	2020-02-27 19:09:34 +05:30
Lokesh Waingankar	b252f5851d	Merge branch 'develop' of https://github.com/frappe/erpnext into develop	2020-02-27 19:09:14 +05:30
Lokesh Waingankar	efb6482ef6	fix: user is not able to do 'Set as Lost' for Quotation (#20689 )	2020-02-27 19:08:58 +05:30
Shivam Mishra	d20e36f3fd	feat: ignore permission when deleting linked emails (#20751 ) * feat: ignore permission when deleting linked emails * fix: uncommented important snippet	2020-02-27 19:07:58 +05:30
Saqib	fb35a54bee	perf: improve gl entry submission (#20676 ) * perf: improve gl entry submission * perf: add indexes * fix: replace *kwargs with args * fix: syntax error * fix: remove cypress * fix: travis * chore: remove purchase invoice from status updater * fix: set_staus args Co-Authored-By: Nabin Hait <nabinhait@gmail.com> * fix: only update status for invoices & fees Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-02-27 18:32:19 +05:30
Anurag Mishra	d42a4a6234	fix: deductions calculation based on gross pay (#20727 ) * fix: deductions calculation based on gross pay * test: salary structure deduction based on gross pay Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-02-27 18:31:18 +05:30
rohitwaghchaure	b5a670cdb9	fix: serial no material transfer performance issue (#20747 )	2020-02-27 18:18:10 +05:30
Rucha Mahabal	8c5725c799	fix: change item_code from Link to Data to avoid item not found error	2020-02-27 17:18:52 +05:30
Deepesh Garg	d8d453d7d4	Merge pull request #20748 from deepeshgarg007/bank_reco_jv fix: Journal Entry not being fetched in Bank Reconciliation	2020-02-27 16:18:27 +05:30
Deepesh Garg	f444f451ac	fix: Remove debug statement	2020-02-27 16:04:01 +05:30
Deepesh Garg	50b3472eba	fix: Journal Entry not being fetched in Bank Reconciliation	2020-02-27 16:01:47 +05:30
Rucha Mahabal	61203b8701	fix: disabled Procedure Template shown as enabled in List View	2020-02-27 13:47:54 +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
Rucha Mahabal	99321cd538	fix: conflicts	2020-02-27 13:16:53 +05:30
Rucha Mahabal	e29d5c1d5b	fix: Schedule Admission button not visible	2020-02-27 12:57:38 +05:30
Saqib	dd374ff77b	fix: only update items if rate or qty changed (#20742 )	2020-02-27 12:51:31 +05:30
Rohan	d40a5d92c2	fix: sort Issues chronologically (#20741 )	2020-02-26 18:54:14 +05:30
Marica	62ba320f5b	fix: Lock stock ledger entries that are being reposted. (#20737 ) - If stock ledger entries are being reposted, don't let any other transaction apply itself on the same.	2020-02-26 18:51:13 +05:30
Deepesh Garg	fe18b92b61	fix: Mandatory bank account error fix (#20733 ) * fix: Mandatory bank account error fix * fix: SQL condition	2020-02-26 17:17:02 +05:30
Rucha Mahabal	a61bf44328	feat: capture symptoms, diagnosis in Table Multiselect instead of Small Text	2020-02-26 17:11:19 +05:30
Deepesh Garg	c88a7f8317	fix: User permission for Loan repayment doctype	2020-02-26 16:49:58 +05:30
Rucha Mahabal	22351adac5	refactor: Patient Encounter	2020-02-26 16:05:43 +05:30
Anurag Mishra	773e7debb9	fix: validated leave allocation (#20636 ) * fix: validated leave allocation * fix: changes requested * Update erpnext/hr/doctype/leave_encashment/leave_encashment.py Co-Authored-By: Nabin Hait <nabinhait@gmail.com> Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-02-26 14:50:57 +05:30
Nabin Hait	2bd6ac56c6	Merge branch 'develop' into develop	2020-02-26 13:21:38 +05:30
Deepesh Garg	9f4b46050f	Merge pull request #20732 from deepeshgarg007/loan_security_pledge_api fix: API fix for loan security pledge creation	2020-02-26 12:59:13 +05:30
Deepesh Garg	b5c5bdd671	fix: API fix for loan security pledge creation	2020-02-26 12:57:05 +05:30
rohitwaghchaure	aa3ba41e83	fix: same free item not working for pricing rule (#20712 )	2020-02-26 12:51:46 +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
Deepesh Garg	5a2f22258a	Merge pull request #20592 from byugandhara/develop fix: Changes done to get valid customer and employee list on payment entry form(#20498)	2020-02-26 12:17:47 +05:30
abhijitkumbharInd	12bc43e495	fix: Education \| Quiz accepting duplicate question #20622 (#20708 )	2020-02-26 12:04:41 +05:30
sharmatripti	08fa7590ef	fix: Employee field should be filtered based on department on doctype Instructor (#20705 ) * Fix: Filtered Employee based on Department on Instructor doctype (#20598) * Fix: Syntax error (#20598) * Fix: Syntax error (#20598) * Fix: Syntax error (#20598) * Fix: Syntax error (#20598) * fix : Filtered Employee based on Department on Instructor doctype (#20704)	2020-02-26 12:02:37 +05:30
Rucha Mahabal	63d987f345	fix: fields fetched incosistently from appointment and patient	2020-02-26 11:59:37 +05:30
RJPvT	10aab65338	fix: smaller then instead of bigger then :-( dumb mistake vdevelop #20693 (#20702 )	2020-02-26 11:59:10 +05:30
Saqib	3957ac1408	perf: search for customer's return invoices then filter out gl_entries (#20709 ) Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-02-26 11:36:55 +05:30
rohitwaghchaure	7229f694ea	fix: rate and amount in material request copying from sales order (#20717 )	2020-02-26 11:28:08 +05:30
Mangesh-Khairnar	99d89d6cb8	fix(HR): show correct closing leave balance (#20723 )	2020-02-26 11:26:07 +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

... 6 7 8 9 10 ...

22087 Commits