brotherton-erpnext

Author	SHA1	Message	Date
bhavesh95863	33f984c7af	fix: can't multiply sequence by non-int of type 'float	2020-08-27 21:49:21 +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
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
Rucha Mahabal	1bd83e69ee	feat: added Installation Note and Warranty Claim links to Customer dashboard (#23183 )	2020-08-27 13:06:52 +05:30
Rucha Mahabal	12f7aeb147	feat: add Maintenance Visit link in Sales Order dashboard	2020-08-25 19:03:35 +05:30
Rucha Mahabal	5bf0a51ed4	feat: add Maintenance Visit link in Customer dashboard	2020-08-25 18:22:06 +05:30
Shivam Mishra	de4ac0c905	chore: remove stray tabs	2020-08-25 17:10:05 +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
Rucha Mahabal	4061186429	fix: POS page link not visible on Desk	2020-08-20 18:01:20 +05:30
Rucha Mahabal	434bab8003	fix: Print Language for Customer not set for Print Receipt in POS	2020-08-19 01:00:59 +05:30
Marica	12c68d0450	Merge branch 'develop' into credit-limit-email	2020-08-18 13:39:03 +05:30
marination	205df14a48	fix: Credit Limit Email not working	2020-08-17 16:23:44 +05:30
michellealva	e69b2e0da1	fix: Remove dependency of Sales Order in Sales Analytics	2020-08-15 10:16:26 +05:30
Anupam Kumar	e447c79f9d	fix: Quotation lost reason options fix (#22814 ) * adding patch and lost reason child tables * fix: conflict resolved	2020-08-13 09:20:36 +05:30
Saqib	c7614174d0	fix: cannot change customer fields if credit exhausted (#22838 ) * fix: cannot change customer fields if credit exhausted * fix: order based on company * fix: sort current limits w.r.t company before compare * fix: CustomerCreditLimit Object is not subscriptable	2020-08-13 09:18:59 +05:30
Saqib Ansari	f1091534cd	fix: [pos] minor bugs	2020-08-10 14:45:58 +05:30
Deepesh Garg	bc8a281f83	fix: Subscripition link in Customer dashboard (#22960 ) Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2020-08-10 11:00:08 +05:30
Mangesh-Khairnar	a53f15ca35	fix: remove mentions of display items in stock (#22963 )	2020-08-09 13:12:47 +05:30
Anupam K	9d82953242	fix: Opportunity Status fix	2020-08-06 23:58:56 +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
Prssanna Desai	1dfd9fd756	fix: check if row['delay'] exists (#22889 )	2020-08-03 14:48:45 +05:30
Wolfram Schmidt	5e438cc853	Update lead_source.json (#22872 ) Allow Lead Source to be renamed. This is usefull for cleaning up data at a later point and allow correcting spelling errors. Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2020-08-03 12:46:50 +05:30
Shivam Mishra	de80553d89	Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui	2020-08-03 12:34:05 +05:30
Marica	cf00ee49ec	fix: PO/SO view title (#22858 )	2020-07-31 15:14:50 +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
Anupam K	5d5f026a0d	fix: Target variance report signs	2020-07-24 02:32:45 +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
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
Shivam Mishra	1358efe896	feat: update icons	2020-07-23 17:02:32 +05:30
Anupam Kumar	3e4b5e5496	fix: item-wise sales history report (#22783 )	2020-07-22 18:17:58 +05:30
Anupam Kumar	93afbe143b	feat: Export Selling Dashboard (#22776 ) * feat:Export Stock Dashboard * Export Selling Dashboard * Export Selling Dashboard	2020-07-22 18:07:39 +05:30
bhavesh95863	eb69859d3e	fix: Quotation list view blank if quotation_to field not set as a standard filter	2020-07-13 23:15:31 +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	a9820cdcf6	fix: Remove every bit of randomness from this test	2020-07-11 19:38:51 +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
Marica	4d5d706a4b	Merge branch 'develop' into error-message	2020-07-07 16:41:39 +05:30
Mitali Deshpande	f642be9727	fix: Changed error message in the Product Bundle	2020-07-07 16:14:01 +05:30
Marica	7860d9e699	Merge branch 'develop' into whitelist-query	2020-07-07 11:53:19 +05:30
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
Khushal Trivedi	49d04f449e	fix: no else condition required since we can decalre it by default (#22537 ) * fix: removing unnecessary else condition on customer form * fix: removing unnecessary else condition on customer form * fix: no else condition required since we can decalre it by default Co-authored-by: Khushal Trivedi <khushalt5@gmail.com>	2020-07-02 14:51:20 +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
Marica	510436931b	fix: Added Missing Trends Reports to Buying/Selling Desk (#22502 ) * fix: Added Missing Trends Reports to Buying/Selling Desk * fix: Move Reports to Other Reports	2020-06-29 19:52:23 +05:30
Mangesh-Khairnar	73edba0e10	fix: handle nonetype issue for packed items (#22493 )	2020-06-29 08:54:53 +05:30
Deepesh Garg	a4b9fc74aa	Merge branch 'develop' into feat_taxjar	2020-06-27 18:51:48 +05:30
Nabin Hait	0ff5af222a	fix: Send email to credit controllers to increase credit limit	2020-06-26 12:46:42 +05:30
vishdha	d3ec1c1d89	feat: Taxjar Integration Added	2020-06-24 16:37:21 +05:30
rohitwaghchaure	c4382abc03	Merge pull request #22410 from kennethsequeira/item_report_date fix: add error prompt for wrong date range	2020-06-24 10:49:21 +05:30
Kenneth Sequeira	f5b7bd9dcb	fix: add error prompt for wrong date range	2020-06-23 16:55:35 +05:30
Marica	3dee5273d6	fix: Update Packed Items via Update Items in SO (#22392 )	2020-06-23 10:33:47 +05:30
Anupam Kumar	71da90034d	fix: resetting lost reason in opportunity and quotation (#22378 )	2020-06-22 18:27:14 +05:30
Afshan	84c6973742	fix: adding json for checked add total row	2020-06-21 17:48:44 +05:30
Afshan	3fbe6e9e4b	fix: test case	2020-06-19 22:51:52 +05:30
Afshan	65f00cea15	fix: Skipping*	2020-06-19 18:19:06 +05:30
Afshan	fbd66574ad	Skiping total row for tree-view reports	2020-06-19 18:17:01 +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
rohitwaghchaure	ec2dec03cc	Merge pull request #22334 from kennethsequeira/item-sale-hist fix: Customer Group label in Item-wise Sales History report	2020-06-19 10:53:09 +05:30
Kenneth Sequeira	766f978858	fix: Customer Group label in Itemwise Sales report	2020-06-18 23:23:54 +05:30
Deepesh Garg	bdb40553c3	Merge pull request #22323 from deepeshgarg007/item_tax_map fix: Do not copy Item Tax template from SO to PO	2020-06-18 17:01:53 +05:30
Deepesh Garg	1ba7708b60	fix: Do not copy Item Tax template from SO to PO	2020-06-18 16:45:16 +05:30
rohitwaghchaure	b7a2f8731f	Merge pull request #22048 from nextchamp-saqib/update-items-permission-fix fix: submitted sales order can be updated with no permission	2020-06-18 15:47:12 +05:30
Chinmay Pai	96100e9507	chore: add standard queries hooks to whitelist (#21939 ) standard queries are used within the search widget, and now require to be whitelisted before they can be executed through the search widget. Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com> Co-authored-by: sahil28297 <37302950+sahil28297@users.noreply.github.com>	2020-06-18 11:58:54 +05:30
Abhishek Balam	a4cd9e2389	use getdate() for comparing dates	2020-06-17 17:13:13 +05:30
marination	8d68ba37bb	Merge branch 'update-items-permission-fix' of https://github.com/nextchamp-saqib/erpnext into update-items-permission-fix	2020-06-15 12:18:16 +05:30
marination	b7e94cc742	fix: Travis	2020-06-15 12:16:30 +05:30
Marica	7dd92f15fa	Merge branch 'develop' into update-items-permission-fix	2020-06-15 11:44:59 +05:30
Abhishek Balam	6c4a24a6c3	cleanup	2020-06-15 11:36:56 +05:30
Abhishek Balam	1a28227daa	fix merge conflict	2020-06-15 10:58:51 +05:30
Rohan Bansal	ccd03bc120	feat: notify credit controller role users with credit limit extension requests	2020-06-12 12:48:54 +05:30
Abhishek Balam	996b306cda	fix territory count	2020-06-12 11:38:07 +05:30
Abhishek Balam	72450d2af3	add revenue if within date range	2020-06-12 11:07:57 +05:30
Abhishek Balam	f596b5950e	indent to tabs	2020-06-12 11:07:28 +05:30
Marica	aeeadee8f8	Merge branch 'develop' into update-items-permission-fix	2020-06-10 15:19:33 +05:30
Shivam Mishra	b84dd9b5f5	fix: dashboard chart does not exist on selling page	2020-06-03 13:24:18 +05:30
Deepesh Garg	fecac677ec	Merge pull request #22075 from abhishekbalam/fix-customer-count fix(Accounts): Customer Count in Customer Acq. Report wrong	2020-06-02 00:09:01 +05:30
Abhishek Balam	192d4c8810	indent to tabs instead of spaces	2020-06-01 23:58:05 +05:30
Abhishek Balam	732f5c1867	fixed customer count logic	2020-06-01 23:51:39 +05:30
Saqib Ansari	a655db6a79	fix: unexpected removal of print hide field	2020-05-29 22:44:59 +05:30
Saqib Ansari	d531a8ab8d	Merge branch 'develop' of https://github.com/frappe/erpnext into update-items-permission-fix	2020-05-29 22:37:13 +05:30
Saqib Ansari	2c3c8aaa2d	fix: submitted sales order can be updated with no permission	2020-05-29 21:55:38 +05:30
Shivam Mishra	6621e22c02	refactor: clean up desk pages (#22004 ) * refactor: clean up desk pages * refactor: update label for CRM	2020-05-28 14:48:50 +05:30
Abhishek Balam	18e7b60acc	feat(Selling): Gross Profit In Quotation (#21795 ) * added valuation rate and gross_profit in quotation item table * modified code to not fetch valuation_rate manually, used set_gross_profit from selling controller	2020-05-26 18:37:02 +05:30
Deepesh Garg	3949b51026	Merge pull request #21785 from anupamvs/sales-order-tax-fix fix: tax id is not fetched when creating sales order from quotation	2020-05-19 21:49:11 +05:30
Anupam K	75e8b1b519	tax id is not fetched in when creating sales order from quoation	2020-05-19 21:39:56 +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	b03072f83f	fix: merge conflict	2020-05-19 11:35:08 +05:30
Nabin Hait	9aae6f4793	feat: accounting dashboard + desk	2020-05-18 18:03:11 +05:30
Marica	c734db5d45	fix: Validate Filters in Sales Funnel. (#21761 ) * fix: Validate Filters in Sales Funnel. * fix: Style fixes	2020-05-18 14:38:57 +05:30
Himanshu	d94a38eb51	fix: make queries show searchfields (#21685 ) * fix: make queries show searchfields * Update erpnext/controllers/queries.py Co-authored-by: Nabin Hait <nabinhait@gmail.com> * Update queries.py * Update erpnext/controllers/queries.py Co-authored-by: Nabin Hait <nabinhait@gmail.com> * Update erpnext/controllers/queries.py Co-authored-by: Nabin Hait <nabinhait@gmail.com> * fix: make fields string for sql Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-05-18 14:26:26 +05:30
rohitwaghchaure	10e24d9249	Merge pull request #21600 from anupamvs/lead-customer-issue fix: adding Email and Phone in Contact child table	2020-05-15 04:43:38 +05:30
Deepesh Garg	12a9328a63	Merge pull request #21668 from abhishekbalam/develop feat(Selling): Territory Wise Treeview In 'Customer Acquisition and Loyalty' Report	2020-05-13 14:26:40 +05:30
Abhishek Balam	411b125906	new parent updating logic, made requested changes	2020-05-12 15:25:35 +05:30
Abhishek Balam	87776c335b	code improvements	2020-05-11 15:18:40 +05:30
Abhishek Balam	500dff63e7	fix: adjusted width of colums to see full column names, also fixes #21556	2020-05-10 14:53:59 +05:30
Abhishek Balam	5ec5584319	In treeview, bold only for root territory, looks cleaner	2020-05-10 00:24:43 +05:30
Abhishek Balam	7cbc902d90	removed validation for root node in territory, codacy recommended changed	2020-05-09 22:35:28 +05:30
Abhishek Balam	b59f2780eb	fix: renamed view types, added default	2020-05-09 22:09:02 +05:30
Abhishek Balam	d543830a59	feat(Selling): Added Territory wise treeview to 'Customer Acquistion and Loyalty' report	2020-05-09 21:56:53 +05:30
Anupam K	be6eb201b7	Appending Email and Phone in Child Table	2020-05-08 17:33:21 +05:30
Deepesh Garg	88e6f72cad	Merge branch 'develop' into sales-report-total-row	2020-05-06 10:48:21 +05:30
Anupam K	d097eaef63	Appending Email and Phone in Child Table	2020-05-05 15:57:49 +05:30
Saqib Ansari	52cc6ad456	fix: test	2020-05-04 20:24:00 +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
Saqib Ansari	ab9bb08c4b	fix: test	2020-05-03 14:53:13 +05:30
Saqib Ansari	826b39559d	fix: review fixes	2020-05-02 19:50:45 +05:30
Saqib Ansari	971170c590	fix: incorrect total in sales analytics for customer/item group	2020-05-02 19:39:03 +05:30
Saqib Ansari	dfa60e0ed8	chore: calculate total row month-wise in sales analytics	2020-04-30 20:06:30 +05:30
Saqib Ansari	10d9974e77	chore: add total row in sales analytics report	2020-04-30 16:28:52 +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
Deepesh Garg	8113294d6e	fix: Remove print	2020-04-29 22:16:47 +05:30
Deepesh Garg	0a6450115f	fix: get_period_list API change fixes	2020-04-29 22:14:45 +05:30
Raffael Meyer	49bb8ccd2e	feat: add Bank Account to dashboards	2020-04-28 18:56:47 +02:00
Marica	299e217668	fix: Blanket Order in SO/PO child tables (#21442 )	2020-04-28 13:00:04 +05:30
Deepesh Garg	24b6055d89	Merge pull request #21427 from ruchamahabal/fix-desk-pages fix(Desk Page): Number of Open Leads not visible on Shortcut Card	2020-04-27 08:41:14 +05:30
rohitwaghchaure	4d754eadc8	Merge branch 'develop' into quo-status-fix	2020-04-27 00:22:43 +05:30
Rucha Mahabal	e34ec70d44	fix(Desk Page): Number of Open Leads not visible on Shortcut Card	2020-04-26 23:40:37 +05:30
rohitwaghchaure	77403abadd	Merge branch 'develop' into social-media-integration-feat	2020-04-25 17:37:24 +05:30
Saqib	8952ac1ab4	fix: custom buttons are hidden if order type of SO is customised (#21397 )	2020-04-25 09:44:21 +05:30
Saqib	63084c6292	Merge branch 'develop' into quo-status-fix	2020-04-23 15:30:31 +05:30
Saqib Ansari	1e4c28e99d	fix: quotation have expired status even if sales order exists	2020-04-23 15:28:47 +05:30
marination	8a30cb2565	chore: Commonify autofilling warehouses in child tables	2020-04-23 00:18:21 +05:30
Shivam Mishra	55baccd63a	fix: specify column width	2020-04-22 11:50:06 +05:30
Deepesh Garg	3cec5cbb0f	fix: Total amount field ordering in transactions (#21313 )	2020-04-18 22:13:48 +05:30
Anupam K	790b9ee8d0	Merge branch 'develop' of https://github.com/frappe/erpnext into social-media-integration-feat	2020-04-18 01:51:47 +05:30
Anupam K	22318b2eb6	Linkedin, Twitter Integration	2020-04-18 01:46:38 +05:30
Deepesh Garg	3c6795a52d	Merge pull request #21305 from deepeshgarg007/partial_loan_repayment_fixes fix: Loan Repayment code clean up and other fixes	2020-04-17 11:16:38 +05:30
Deepesh Garg	bf78ed6947	fix: Loan Repayment code clean up and other fixes	2020-04-16 22:53:47 +05:30
Saqib	14cdb24290	fix: serial and batch selection from delivery note bug fix (#21291 )	2020-04-16 16:21:35 +05:30
Rohan Bansal	a1b747c3f3	fix: show stock UOM in POS	2020-04-14 14:28:56 +05:30
Marica	8636914e9a	fix: Lead Contact with blank first name via Customer (#21247 )	2020-04-14 11:53:09 +05:30
Shivam Mishra	ebcc46d837	feat: updated desk pages (#21138 )	2020-04-10 18:52:05 +05:30
Marica	048de30cb5	Merge branch 'develop' into pick-list-enhance	2020-04-07 14:05:05 +05:30
Marica	f55c9c8d8c	Merge branch 'develop' into po_supplier_skip	2020-04-03 18:35:48 +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
Marica	5d14af52a5	Merge branch 'develop' into po_supplier_skip	2020-04-02 21:17:52 +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
Anupam K	e48bcb30e7	Sum of years not needed.	2020-04-02 01:04:01 +05:30
Poranut Chollavorn	48aa2dd94b	fix(pos): fix pos display item instock	2020-03-31 18:13:55 +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	242a079bcb	Merge branch 'develop' of https://github.com/frappe/erpnext into quotation_blanket_order	2020-03-31 14:18:30 +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
Deepesh Garg	c33412b6ae	feat: Link blanket order and quotation	2020-03-30 22:44:13 +05:30
Deepesh Garg	f144b8b205	Merge branch 'develop' into po_supplier_skip	2020-03-30 13:07:03 +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
Anupam K	85aae7de0b	bug: Item-wise Sales History - Billed amount	2020-03-28 14:13:58 +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
marination	73c8d23a79	fix: UOM fixes in Sales Order,Material Request & Production Plan	2020-03-20 17:52:28 +05:30
Marica	508ed1e121	fix: Missing if condition in Customer Default Bank Account Validation. (#20969 )	2020-03-18 11:28:04 +05:30
marination	e1f499ae1b	fix: Pick List Enhancements	2020-03-17 11:47:11 +05:30
Deepesh Garg	eeb1922e37	fix: Add check to skip SO and DN in customer master	2020-03-17 11:43:34 +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
Shivam Mishra	451382e08e	feat: update desk pages	2020-03-12 16:34:34 +05:30
Shivam Mishra	1fd1852c6a	Merge branch 'develop' into yet-another-desk	2020-03-10 18:20:27 +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
Deepesh Garg	6d604a151b	fix: Validation message	2020-03-04 11:55:10 +05:30
Lokesh Waingankar	d398c73bc5	fix: Removed html tags in pop up message (#20603 )	2020-03-03 19:07:51 +05:30
Shivam Mishra	1f151c1032	refactor: update restrict to domain data	2020-03-02 19:37:12 +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
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
Lokesh Waingankar	efb6482ef6	fix: user is not able to do 'Set as Lost' for Quotation (#20689 )	2020-02-27 19:08:58 +05:30
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	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
Deepesh Garg	cf8e2732c9	Merge pull request #20428 from 0Pranav/territory-sales-pipeline feat: add territory wise sales report	2020-02-06 13:11:07 +05:30
Deepesh Garg	da406d74ef	fix: Remove debug param	2020-02-06 12:55:21 +05:30
Deepesh Garg	a4928f6f5b	fix: Add report link in module view and fix date filter	2020-02-06 12:50:25 +05:30
0Pranav	9d9a3d85d8	fix: filters after rename	2020-02-05 14:17:21 +05:30
Deepesh Garg	9e1fbaf59e	fix: Label and UX fixes while creating payment entry against customer (#20465 ) * fix: Label and UX fixes while creating payment entry against customer * fix: filter	2020-02-03 15:58:50 +05:30
0Pranav	9c4399e1f2	fix: better syntax for checking empty arrays	2020-02-03 14:57:42 +05:30
0Pranav	b1473c3de0	fix: return empty array	2020-01-31 10:43:00 +05:30
0Pranav	75adb808e5	various fixes from review - Rename the report to title case - Added company filter - fixed checks in filter and += operator for total	2020-01-31 10:35:47 +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
Himanshu Warekar	e169d2964c	fix: change fieldtype to Text	2020-01-24 17:40:29 +05:30
KanchanChauhan	a7d1985b5f	fix: Set Quotation expired if not Ordered or Lost (#20354 ) Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>	2020-01-21 12:35:11 +05:30
Himanshu	e3afe8a73c	fix: don't hide primary_address_and_contact_detail (#20322 )	2020-01-16 13:39:29 +05:30
0Pranav	6280609c25	enhancement: add territory wise sales report	2020-01-14 15:53:35 +05:30
Rohit Waghchaure	ecdfc1a15c	fix: allow on submit for the delivery date field	2020-01-13 12:43:26 +05:30
Pranav Nachnekar	1612432f45	fix: parent item should not appear in raw material request dialog (#20216 )	2020-01-09 13:32:15 +05:30
Pranav Nachnekar	971458043d	fix: add new delivery note button in Sales Order (#20199 ) * fix: add new delivery note button in Sales Order * fix: removed debugger Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-01-07 11:29:35 +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
Rucha Mahabal	2d293c585e	fix(Subscription): pass start_date while computing next_schedu… (#20159 )	2019-12-31 19:15:37 +05:30
Javier Wong	5cc7648e9c	[Fix] Allow Print Before Pay in POS (#20151 ) Print Button does not show even when Print Before Pay is enabled in the POS Profile.	2019-12-31 17:07:37 +05:30
Saqib	71649fe141	fix: customer credit limit label (#20152 )	2019-12-31 17:05:34 +05:30
Marica	5483f1a27e	fix: Field 'other_charges_calculation' column type changed. (#20141 )	2019-12-30 22:20:02 +05:30
thefalconx33	2073eeb8fa	fix: don't allow deletion of items which has work order assigned to it	2019-12-27 16:26:03 +05:30
deepeshgarg007	bd1da65098	fix: Update modified date	2019-12-26 18:26:13 +05:30
deepeshgarg007	0b9a98ad43	fix: Add against blanket order field in sales order	2019-12-26 18:15:13 +05:30
Saqib	7519436260	Merge pull request #19876 from rohitwaghchaure/provision_to_select_custom_fields_in_pos feat: provision to select the custom fields in the online POS	2019-12-26 13:40:43 +05:30
Rohit Waghchaure	682273a00b	feat: provision to select the custom fields in the online POS	2019-12-26 11:59:19 +05:30
Saqib	0ad7449ae3	feat: allow adding & deleting of items in submitted SO & PO (#19911 ) * feat: allow adding of items after quotation submission * feat: allow deletion of items from submitted SO & PO * fix: case when items are added and deleted at once * fix: add test cases * For deletion of items while Updating Items after submitting PO & SO	2019-12-24 16:42:30 +05:30
Don-Leopardo	5557b16260	fix: order_type validation restriction (#18096 )	2019-12-24 16:39:34 +05:30
Deepesh Garg	a02bb5170b	Merge pull request #19913 from nextchamp-saqib/cart-address-fix fix: enable adding of address without enabling checkout feature	2019-12-24 14:08:19 +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
Deepesh Garg	57f9b758b7	Merge pull request #19983 from 0Pranav/mapped-doc-for-customer-quotation fix: use open_mapped_doc instead of create_new_doc	2019-12-19 11:59:50 +05:30
deepeshgarg007	aba58ba50e	fix: Spacing after commas	2019-12-19 11:02:37 +05:30
0Pranav	0db86204cf	fix : only set price list if it exists for customer	2019-12-18 16:03:40 +05:30
0Pranav	5150c69ee6	use open_mapped_doc instead of create_new_doc	2019-12-18 12:16:49 +05:30
thefalconx33	e9c9cbd2fe	fix: display serial no selection on adding items to cart	2019-12-16 14:55:16 +05:30
thefalconx33	107989316c	fix: additional notes from Quotations not saved in SO	2019-12-11 18:15:54 +05:30
rohitwaghchaure	c58495dcee	fix: Item-wise Sales History report not working (#19889 )	2019-12-10 21:34:03 +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
Saqib	7e958da6d6	fix: sales order reqd only checks for stock items (#19865 )	2019-12-09 17:23:19 +05:30
Deepesh Garg	babc2d1ea4	fix: Consistency in button positions in Sales Order and Purchase Order (#19833 )	2019-12-09 13:04:44 +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
ronelvcabrera	370cdc0170	feat(Sales/Purchase Order): optional to reference a Blanket Order (#19612 )	2019-12-04 16:07:11 +05:30
Saqib	d635bda29b	fix selling setting label for sales order reqd (#19775 )	2019-12-03 17:05:06 +05:30
Deepesh Garg	b4b90eaaf7	Merge pull request #19762 from Mangesh-Khairnar/fix-pr-creation fix(sales-order): allow payment request creation for so that are not billed	2019-12-03 10:42:01 +05:30
deepeshgarg007	f89b172202	fix: Available stock for packing item report	2019-12-01 21:53:32 +05:30
Mangesh-Khairnar	92b9d7383d	fix: show create payment request for so that are not billed	2019-11-29 14:22:52 +05:30
Marica	bcd02069ea	fix: Validation for Suppliers in SO to PO (#19686 ) - Check if there is a Supplier against atleast one item in Sales Order - Validation message earlier was vague	2019-11-28 18:23:45 +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
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
Deepesh Garg	5558ee8597	Merge pull request #19591 from 0Pranav/FR-ISS-152101 fix: add status "expired" to doctype quotation	2019-11-26 09:08:30 +05:30
deepeshgarg007	53a66ee386	fix: Method name in hooks, test case code clean up	2019-11-25 21:58:15 +05:30
0Pranav	565d3efcdf	fetch updated document in test_quotation	2019-11-25 17:11:12 +05:30
0Pranav	cf3a2f6579	set transaction date to yesterday	2019-11-25 16:26:04 +05:30
0Pranav	032baeac5b	don't submit quotation	2019-11-25 15:15:00 +05:30
0Pranav	754c43f6c3	fix set_expired_status method	2019-11-25 14:27:43 +05:30
0Pranav	e0c9f3c282	fix valid date	2019-11-25 14:14:51 +05:30
0Pranav	a9ff7df2e6	add sql query to set valid_till	2019-11-25 12:55:27 +05:30
Pranav Nachnekar	04e3a506e4	fix: Primary address not being fetched for customer (#19667 ) * fix: priamry address not being fetched * add doctype to filter for customer_primary_address * remove get_customer_primary_address_method	2019-11-25 12:04:00 +05:30
0Pranav	a077795581	fix tests	2019-11-25 12:01:00 +05:30
0Pranav	eefc492ff4	call commit after sql query for schedular job	2019-11-25 10:51:27 +05:30
0Pranav	6c368e2dfb	submit quotation in test	2019-11-22 13:22:12 +05:30
0Pranav	b3354198f1	Fix sql query in set_expired_status	2019-11-22 12:38:43 +05:30
0Pranav	f5112905dc	import make_item method in tests	2019-11-21 13:19:44 +05:30
0Pranav	4a28144941	add tests	2019-11-20 15:53:19 +05:30
0Pranav	5717a265b7	remove: unused imports	2019-11-20 15:31:13 +05:30
rohitwaghchaure	238521c2bd	Merge pull request #19501 from Mangesh-Khairnar/multiple-pos-profile feat: multiple company pos profile	2019-11-19 18:39:06 +05:30
Mangesh-Khairnar	c436d93303	fix: reset pos profile when default doesn't exists	2019-11-19 18:21:53 +05:30
Pranav Nachnekar	e13b769813	use `nowdate` instead of `date.today()` Co-Authored-By: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>	2019-11-19 12:04:30 +00:00
0Pranav	b9460ed22c	switched ORM methods for single SQL query	2019-11-19 10:46:07 +05:30
Mangesh-Khairnar	f69b9a8c47	fix: fetch default pos profile user for the company	2019-11-15 16:54:26 +05:30
0Pranav	53b65ab8ed	Add status expired to doctype quotation	2019-11-15 16:42:32 +05:30
rohitwaghchaure	6424416886	fix: sales order item shwoing incorrect produced qty (#19584 )	2019-11-15 14:18:45 +05:30
0Pranav	f75ea952e3	Added expired status to quotation	2019-11-13 11:03:53 +05:30
Mangesh-Khairnar	2f44480d69	enhancement: Item-wise sales history report (#19500 ) * refactor(item-wise-sales-history): convert query report to script report * refactor: add columns, fetch data * refactor: shift company set func to utils * fix: add filters * fix: minor changes * fix: fetch all the descendants	2019-11-11 10:54:12 +05:30
Diksha	7091a2102c	fix(sales order): rename delivery to delivery note on sales order make button	2019-11-04 12:03:35 +05:30
Mangesh-Khairnar	e3bc213262	feat: multiple company pos profile	2019-11-01 22:35:08 +05:30
Rohan	8728e94dbd	Merge branch 'develop' into develop-company-address-label	2019-10-29 11:26:00 +05:30
Suraj Shetty	83b58352ce	fix: Overwrite default cost center if item has default cost center set. (#19405 )	2019-10-28 12:05:30 +05:30
Rohan	962f4eb96c	Merge branch 'develop' into develop-company-address-label	2019-10-23 15:57:26 +05:30
Nabin Hait	bd6b1806cd	fix: fixed asset register report and made skip-dn field hidden	2019-10-22 14:28:37 +05:30
Deepesh Garg	6208755d54	fix: Unable to add details in quotation and opportunity (#19354 )	2019-10-21 13:29:44 +05:30
deepeshgarg007	737ec6b26e	fix: Travis	2019-10-20 17:36:36 +05:30
Rohan Bansal	83740de636	fix(selling): Add missing label to company address field	2019-10-16 15:16:00 +05:30
Rohit Waghchaure	66072fec5a	fixed conflicts	2019-10-15 14:18:59 +05:30
ashish-greycube	74dc3c99de	feat: coupon_code and referral_sales_partner functionality	2019-10-15 11:44:45 +05:30
deepeshgarg007	683a89a415	fix: Chart fix in Analytics report	2019-10-12 23:02:53 +05:30
Mangesh-Khairnar	4ed9b45fb8	feat(Sales Order): Allow to skip delivery note creation (#19222 ) * feat(sales-order): add option to skip delivery note creation for order type maintenance * fix(sales-order): hide delivery date on setting skip delivery note creation * fix: allow skipping delivery note for all order types * fix: bypass delivery note creation on setting skip delivery note creation * fix: show skip delivery note in list view * fix: check for duplicate project name after submitting prompt * fix: toggle delivery note reqd for skip delivery note * fix: update status based on skip delivery note	2019-10-12 19:33:11 +05:30
Himanshu	eba3a8e802	fix: get contact details (#19281 )	2019-10-11 10:43:24 +05:30
Saqib	d5067b4d73	chore: label changes in retail and stock (#19243 )	2019-10-04 16:24:26 +05:30
Rucha Mahabal	34326470b8	fix: produced_qty field hidden and not updated in sales order item (#19037 ) * fix: produced_qty field hidden and not updated in sales order item * fix: added patch for old sales orders * fix: produced_qty for sales order item linked to multiple work orders * fix: comment * fix: function for updating produced_qty in SO Item * fix: remove frappe.db.commit	2019-09-30 12:15:39 +05:30
Himanshu	25ab1e41df	fix(Contact): mobile_no re-introduced and travis fixes (#19009 ) * fix: mobile_no re-introduced * fix: test cases * fix: set email as primary * fix: add primary email and phone * fix: utils for contact creation * chore: remove = from dict	2019-09-30 10:08:15 +05:30
Saqib	451d1a1744	fix: Bypass credit limit and Project Template field not visible(#19162 ) * Fix: Allow Project Template in Quick Entry * Fix: Label Changes	2019-09-24 19:10:59 +05:30
Deepesh Garg	d9e9d562f8	fix: Travis (develop) (#19140 ) * fix: Travis * fix: Syntax Error	2019-09-24 11:44:52 +05:30
Mangesh-Khairnar	5dcf2c669f	chore: remove unlinked letter head references (#19138 )	2019-09-24 09:53:06 +05:30
rohitwaghchaure	e18f7b91c3	Merge pull request #19127 from rohitwaghchaure/removed_mandatory_property_for_address_field_in_quick_entry_develop fix: removed mandatory property for address field in quick entry	2019-09-23 14:48:27 +05:30
Rohit Waghchaure	1f9a84f165	fix: removed mandatory property for address field in quick entry	2019-09-20 12:18:23 +05:30
Anurag Mishra	c16fb9eb9d	fix: dashboard button not working (#19094 )	2019-09-19 18:12:39 +05:30
rohitwaghchaure	6bbc834f8f	Merge pull request #19112 from rohitwaghchaure/fixed_get_bin_details_and_serial_nos_arugument_passing_issue fix: get_bin_details_and_serial_nos() takes at least 3 arguments (4 g…	2019-09-19 18:01:03 +05:30
Rohit Waghchaure	6daab3ca89	fix: get_bin_details_and_serial_nos() takes at least 3 arguments (4 given)	2019-09-19 17:01:49 +05:30
Marica	d793e39b6d	fix: Customer Credit Balance Report query fix (#19104 )	2019-09-18 19:59:31 +05:30
Himanshu	d51f7af9ab	fix: add contact phone to sales order (#19012 )	2019-09-12 19:19:17 +05:30
Nabin Hait	4ce38059ac	feat: Company wise credit limit	2019-09-06 14:33:10 +05:30
Nabin Hait	b847731482	Merge branch 'feat-customer-credit-limit' of https://github.com/Mangesh-Khairnar/erpnext into Mangesh-Khairnar-feat-customer-credit-limit	2019-09-05 16:47:08 +05:30
Deepesh Garg	cffe577028	fix: Add UOM in anlytics report when viewing based on item (#18902 )	2019-09-05 16:03:15 +05:30
Anurag Mishra	867ac10ffd	fix: handle for product bundle (#18420 ) * fix: handle for product bundle * fix: Requested changes and some general fixes	2019-09-05 15:13:21 +05:30
Andy Zhu	91596f2467	Change the field name for Payment Entry (#18874 ) In the Payment Entry Form, the field name for customer name is 'party' instead of 'party_name'. Need to change the customer_dashboard file accordingly.	2019-09-05 15:01:38 +05:30
Nabin Hait	b03fa8a441	Merge branch 'develop' into feat-customer-credit-limit	2019-09-05 12:34:34 +05:30
Nabin Hait	f4fde51bba	Update customer.py	2019-09-05 12:33:29 +05:30
Nabin Hait	c78c86663d	Update customer_credit_balance.py	2019-09-05 12:24:37 +05:30
Nabin Hait	1ab75db0ac	refactor: Accounts Receivable / Payable report (#18906 )	2019-09-03 16:07:46 +05:30
Mangesh-Khairnar	4bcc221ee3	Merge branch 'develop' of https://github.com/frappe/erpnext into feat-customer-credit-limit	2019-09-02 23:18:56 +05:30
Mangesh-Khairnar	cf901da25d	test: create customer credit limit on change	2019-09-02 23:18:36 +05:30
Himanshu	fffdb6f575	feat(Contacts): Multiple Emails in a Contact (#18675 ) * feat: render multiple addresses * feat: move to newer contacts structure * fix: iterate over valid variable * fix: use primary label instead of bold letters * fix: call popup get contact name from number * fix: make contact structure call popup compatible * fix: query * fix: add city, state and country * fix: display address * fix: get address in single line * fix: review fixes * fix: translation strings * fix: fix query for contacts * fix: remove references of mobile_no	2019-09-02 15:57:45 +05:30
Mangesh-Khairnar	bb3cec1556	test: fetch data from customer credit limit	2019-08-31 14:32:07 +05:30
Mangesh-Khairnar	dbc69da409	fix: minor fixes	2019-08-31 14:28:02 +05:30
Mangesh-Khairnar	e3bb247868	fix: check column in credit limit	2019-08-31 13:16:14 +05:30
Mangesh-Khairnar	f856b3b559	fix: fetch customer group of the customer	2019-08-31 01:40:58 +05:30
Mangesh-Khairnar	89433b4bea	fix: get credit limit	2019-08-30 22:57:51 +05:30
Mangesh-Khairnar	b3e5d11e1d	fix: multiple fixes	2019-08-30 18:18:48 +05:30
Mangesh-Khairnar	c059bc3e36	fix: grid view of customer credit limit	2019-08-29 20:51:31 +05:30
Mangesh-Khairnar	5755d2d32f	fix: customer credit limit report	2019-08-29 19:51:38 +05:30
Mangesh-Khairnar	79525327f0	feat: bypass credit limit check	2019-08-29 19:50:23 +05:30
Mangesh-Khairnar	36b30911a8	feat: customer credit limit	2019-08-29 18:06:23 +05:30
Suraj Shetty	55a2699f4c	fix: Update dashboard of doctypes that are linked with pick list	2019-08-29 09:14:27 +05:30
Suraj Shetty	f455c92d02	fix: Remove Pick List Reference Item use Item locations table instead	2019-08-28 17:44:22 +05:30
Suraj Shetty	8de8a78235	Merge branch 'develop' of github.com:frappe/erpnext into feature-pick-list	2019-08-26 10:51:12 +05:30
Suraj Shetty	2b9e256002	fix: Rename method name	2019-08-26 10:05:01 +05:30
Nabin Hait	d8c262fd5c	fix: Translations of strings (#18825 )	2019-08-23 16:32:58 +05:30
Suraj Shetty	8b4d604cfd	fix: Use purpose field and remove item_base_on field	2019-08-23 11:57:16 +05:30
Deepesh Garg	f3d78dd29c	fix: Duplicate items check in Sales Invoice (#18660 ) * fix: Duplicate items check in sales Invoice * fix: Commonified function for duplicate items check in selling controller * fix: Set valuation rate and transaction date in child tabel	2019-08-23 11:42:35 +05:30
Suraj Shetty	da2a623e38	Merge branch 'develop' of github.com:frappe/erpnext into feature-pick-list	2019-08-21 11:48:27 +05:30
Sahil Khan	5f2c030ddc	Merge branch 'version-12-hotfix' into merge_v12_hotfix_1	2019-08-20 16:22:49 +05:30
Suraj Shetty	1a090432d9	fix: Quantity while creating pick list from work order - Fix get_mapped_doc config to filter items - Fix erroneous condition in get_mapped_doc used for creation of pick_list in sales order Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2019-08-20 12:04:07 +05:30
Suraj Shetty	182f4def00	fix: Delivery note creation from pick list - Changes in serial no and batch no seletion - Changes in warehouse overrwite logic Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2019-08-16 08:16:22 +05:30
Suraj Shetty	e047de854b	Merge branch 'develop' of github.com:frappe/erpnext into feature-pick-list	2019-08-09 11:14:14 +05:30
Suraj Shetty	4b3b358ac6	fix: Show correct label instead of showing undefined (#18559 )	2019-08-02 21:46:38 +05:30
Suraj Shetty	e45102b913	fix: Show correct label instead of showing undefined (#18560 )	2019-08-02 21:46:28 +05:30
Rohan	fc04d334da	Merge branch 'develop' into develop-customer-item-price-report	2019-08-01 17:51:03 +05:30
Suraj Shetty	e06f486aee	fix: Rename methods	2019-08-01 12:54:33 +05:30
Suraj Shetty	fbcc56536b	fix: Rename Pick TIcket -> Pick List	2019-08-01 12:05:20 +05:30
Suraj Shetty	fa9111ebe2	fix: Add and rename some fields - Add ability to create delivery note from pick ticket - Minor fix related to create button	2019-08-01 11:07:14 +05:30
Rohit Waghchaure	40e35048b8	fix: can't compare datetime.date to unicode	2019-07-29 17:14:39 +05:30
Suraj Shetty	64f174fcaa	feat: Get item location from reference items - Add option to get items from multiple sales order - Add some required fiels to Pick TIcket Reference Item	2019-07-26 13:22:05 +05:30
Suraj Shetty	0576ad5ef9	fix: Move pick list creation code to picklist.py file	2019-07-24 15:16:03 +05:30
Suraj Shetty	778b4926bf	fix: Fetch warehouse location from Bin	2019-07-24 11:27:32 +05:30
Rucha Mahabal	d23a95c06e	fix: removed unnecessary fields from Campaign DocType and other fixes in Email Campaign	2019-07-22 12:26:52 +05:30
Rucha Mahabal	a566b4e24a	Merge branch 'develop' into email-campaign	2019-07-19 15:07:56 +05:30
Rohit Waghchaure	9fe6e00a4e	fix: not able to make material request for bundle items from the sales order	2019-07-19 07:54:08 +05:30
Suraj Shetty	06b56adc71	Merge branch 'develop' into develop-customer-item-price-report	2019-07-17 17:29:42 +05:30
Rucha Mahabal	65a627cb5b	fix: module changes for Auto Repeat from Desk to Automation (#18356 )	2019-07-17 13:50:32 +05:30
Deepesh Garg	902e5ab744	Merge branch 'develop' into ac_dim_usability_fixes	2019-07-16 16:17:07 +05:30
deepeshgarg007	8cbc22062b	fix: Remove cost center filter from customer credit balance report	2019-07-15 18:35:19 +05:30
deepeshgarg007	ad4c111d91	fix: Remove cost center filter from customer credit balance report	2019-07-15 18:32:10 +05:30
Nabin Hait	868766ddf0	refactor: Refactored over delivery/receipt/billing fields (#17788 ) * refact: Refactored over delivery/receipt/billing fields * fix: test case	2019-07-15 18:02:58 +05:30
Rucha Mahabal	bbb22ad082	fix: child table naming	2019-07-15 17:52:50 +05:30
sahil28297	7697066cc2	fix(sales_order_list): compare type as well (#18331 ) * fix(sales_order_list): compare type as well * fix(sales_order_list): compare type as well	2019-07-15 11:25:06 +00:00
deepeshgarg007	f7395916c8	fix: Accounting Dimensions in Customer Credit Balance report	2019-07-14 18:44:32 +05:30
deepeshgarg007	a85db66146	fix: Usability fixes in accounting dimensions	2019-07-14 18:15:19 +05:30
Deepesh Garg	f9e4391998	Merge pull request #18038 from fproldan/sales_analytics_with_order_type_develop feat: "Order Type" tree type for Sales Analytics report (develop)	2019-07-12 14:28:16 +05:30
Rucha Mahabal	9e35bff55c	feat: Email Campaign	2019-07-12 13:56:36 +05:30
Suraj Shetty	bc2ff785f1	fix: Restore "allow delivery" condition checks (#18246 ) * fix: Remove `allow_delivery` flag - User was not able to create delivery note because allow_delivery flag was false and it never used to get updated * fix: Restore allow_delivery condition checks	2019-07-11 10:43:40 +05:30
Mangesh-Khairnar	d749f20f63	fix: installation note (#18232 )	2019-07-10 19:29:39 +05:30
Don-Leopardo	93fbba4f40	Merge branch 'develop' into sales_analytics_with_order_type_develop	2019-07-10 10:52:55 -03:00
Himanshu	e7bb54ed76	feat(Issue): Settings to stop SLA tracking (#18112 ) * fix: fix msgprint when creating new issues * fix: use getdate * fix: do not self save * fix: test case * fix: error due to comparing date and str * fix: creation time for replicated issue * feat: sla in support settings * fix: remove sla settings * feat: enable check in sla * fix: throw if sla is disabled * fix: enable sla	2019-07-10 17:15:59 +05:30
Nabin Hait	59c5c3c347	fix: Make material request against SO only for pending qty (#18216 )	2019-07-10 17:05:49 +05:30
Rushabh Mehta	8309fcfbbc	BREAKING CHANGE: Remove anti-pattern "Project Task" (#18059 ) * BREAKING CHANGE: Remove anti-pattern "Project Task" * fix(tests): remove `tasks` from project/test_records.json * fix(tests) * fix(test): test_employee_onboarding.py * fix(tests): test_expense_claim.py * fix(refactor): cleanup project.py validate/update * fix(refactor): cleanup project.py validate/update * fix(test): test_expense_claim * fix(test): test_expense_claim * fix(test): test_expense_claim, try Test Company 4 * Update project.py	2019-07-08 10:39:30 +05:30
rohitwaghchaure	6b2075a115	Merge pull request #18161 from deepeshgarg007/additional_discount fix: Additonal discount not getting set in sales transactions	2019-07-05 18:13:23 +05:30
karthikeyan5	7fc6021ca5	feat(setup): adding selling buying filter in terms and conditions	2019-07-04 22:46:16 +05:30
deepeshgarg007	a9ea49c976	fix: Additonal discount not get set in sales transactions	2019-07-04 15:56:34 +05:30
Anurag Mishra	bdec7fea82	feat: purchase order against sales order (#17975 ) * feat: purchase order against sales order * fix: remove unwanted checks * fix:Related tests	2019-07-04 12:28:01 +05:30
Nabin Hait	34c551d9a5	fix: Missing commits from hotfix branch (#17997 ) * fix: merge conflict * fix: restored missing set_gst_state_and_state_number function * fix: style linting as per codacy * fix: Fixes related to customer/lead merging * fix: merge conflict * fix: Fixes related to customer/lead merging * fix: Assign isue/opportunity to user * fix: Assign isue/opportunity to user * fix: Replaced Invoice type by GST Category * fix: merge conflict * fix: merge conflict * fix: test cases * fix: test cases	2019-07-03 10:34:31 +05:30
Deepesh Garg	fb29ffc90c	fix: Usability fixes to Serial No and batch selector (#18071 ) * fix: Usability fixes to Serial No and batch selector * fix: Codacy * Update sales_common.js	2019-06-28 14:08:08 +05:30
Don-Leopardo	a01d0a5311	Merge branch 'develop' into sales_analytics_with_order_type_develop	2019-06-27 18:09:09 -03:00
Deepesh Garg	ea0574679f	fix: Removed submitted status from Quotation (#18055 ) * fix: Change in list view and status updater * fix: Change status in doctype * fix: Patch for submitted status	2019-06-26 11:05:51 +05:30
Nabin Hait	40d25f4010	fix: Show close button if per_ordered is less than 99.999999 (#18067 )	2019-06-26 10:57:45 +05:30
Aditya Hase	2caaa1b03d	fix(sales-funnel): Remove duplicate code	2019-06-25 17:17:38 +05:30
Aditya Hase	10562b67fc	fix(sales-funnel): Use frappe.Chart() instead of Chart()	2019-06-25 17:07:41 +05:30
Don-Leopardo	54b9fd5bef	Merge branch 'develop' into sales_analytics_with_order_type_develop	2019-06-24 11:29:23 -03:00
NahuelOperto	42fe68d065	feat: order type in trr type filter	2019-06-24 08:29:14 -03:00
Rohit Waghchaure	1777e60dc2	fix: test case for payment terms in quotation	2019-06-24 14:11:06 +05:30
Rushabh Mehta	41721fe1c3	Merge pull request #17390 from ashish-greycube/develop_copy_payment_schedule_from_quot_to_SO fix: copy_payment_schedule_from_quot_to_SO	2019-06-21 09:19:20 +05:30
Deepesh Garg	23deb6f79b	fix: Default cost center fix for delivery note item (#17990 )	2019-06-20 19:11:58 +05:30
Rohit Waghchaure	7efeffa66a	fix: allow edit is enabled in the pos profile still user not able to edit the rates	2019-06-17 16:20:32 +05:30
Rohan Bansal	0426636a32	fix(customer): Improve performance by reducing queries	2019-06-17 12:16:12 +05:30
Rohan Bansal	e3a3306b30	feat(customer): Add report to show item prices per Customer	2019-06-13 14:53:33 +05:30
Rohan Bansal	250734dd24	fix(selling): Remove Totals row for tree-based Sales Analytics	2019-05-30 17:30:50 +05:30
Nabin Hait	275185438a	Merge branch 'develop' into develop_copy_payment_schedule_from_quot_to_SO	2019-05-27 14:00:43 +05:30
Rushabh Mehta	04e89ce808	refactor: deprecate old API	2019-05-22 16:52:36 +05:30
Rushabh Mehta	a02ab2d3d7	Merge pull request #17635 from nabinhait/add-multiple-items-dev feat: Added 'Add Multiple' options in all sales / purchase transactions	2019-05-16 14:57:03 +05:30
Nabin Hait	3fccfaa7ce	feat: Added 'Add Multiple' options in all sales / purchase transactions	2019-05-16 14:54:05 +05:30
Deepesh Garg	0ae1c293d3	fix: Status updater fixes in PO and SO and test coverage for return (#17491 ) * fix: Status updator fixes in sales and purchase cycle * fix: Test cases for return in so and po * fix: Resolve conflicts	2019-05-15 12:23:24 +05:30
Himanshu Warekar	24442af9ae	fix: use list comprehension	2019-05-04 22:35:52 +05:30
Himanshu Warekar	fbed6a12d5	fix: calculate percentage only if sales team exist	2019-05-04 22:35:52 +05:30
Himanshu Warekar	40b99e3347	fix: sales percentage equal to 100	2019-05-04 22:35:52 +05:30
Himanshu Warekar	5ca977a41c	fix: python side validation	2019-05-04 22:35:52 +05:30
Himanshu Warekar	76eddcc29f	fix: validate percentage total	2019-05-04 22:35:52 +05:30
Nabin Hait	3d64a5da5e	Merge pull request #17416 from asbasawaraj/add_status_field_in_campaign feat: Additional fields in campaign	2019-05-02 03:18:22 +05:30
Nabin Hait	c0fdb80486	Merge branch 'develop' into develop_copy_payment_schedule_from_quot_to_SO	2019-05-02 01:00:12 +05:30
Nabin Hait	d539def25d	Update campaign.json	2019-05-02 00:44:29 +05:30
Nabin Hait	9ccdf594c3	Merge pull request #17445 from rmehta/refactor-child-tables fix(item-tables): add missing "item_tax_template" in purchase order detail and reorganize sequence of all child table	2019-05-01 19:31:00 +05:30
Rushabh Mehta	c3aecb1fbd	fix(item-tables): add missing "item_tax_template" in purchase order detail and reorganize sequence of all child table	2019-05-01 18:04:22 +05:30
Nabin Hait	b8103ac077	Merge branch 'develop' into item-discount	2019-05-01 12:23:30 +05:30
Faris Ansari	4b21225cf4	fix: Map item_code to title (#17403 ) When making Project from Sales Order, description was mapped with Task title which can exceed 140 characters easily. Description should be mapped with description as it is html field.	2019-04-29 22:41:48 +05:30
Basawaraj Savalagi	d4585efc6a	feat: Additional fields in campaign	2019-04-29 22:12:50 +05:30
ashish-greycube	4707ad2029	fix: copy_payment_schedule_from_quot_to_SO	2019-04-26 12:14:40 +05:30
deepeshgarg007	4a4ce12eb4	fix: Commonfied code for inter-company-transaction	2019-04-25 14:28:19 +05:30
Nabin Hait	593242fa5c	fix: Calculate rate based on discount on server side only if not rate or pricing rule applied	2019-04-23 13:22:38 +05:30
deepeshgarg007	555f425da1	fix: Test case and styling fixes	2019-04-22 20:24:31 +05:30
deepeshgarg007	c841bd486a	feat: Added validations and mapper to create inter company mapper	2019-04-18 20:10:31 +05:30
deepeshgarg007	90262f84af	feat: Added custom button to make inter company order	2019-04-18 20:09:07 +05:30
deepeshgarg007	100bd29dfd	feat: Updated doctypes for sales and purchase order	2019-04-18 20:08:20 +05:30
Nabin Hait	3a2d6a4043	Merge pull request #17169 from rohitwaghchaure/production_plan_multiple_enhancements feat: Production plan enhancements	2019-04-17 17:31:14 +05:30
Rohit Waghchaure	38238b0cfd	fixed test cases	2019-04-17 15:56:00 +05:30
Rohit Waghchaure	00d73cda50	fix: POS not working if user has access of multiple company	2019-04-16 18:43:16 +05:30
Rohit Waghchaure	34ee41a35e	fix: Pending SO Items For Purchase Request not showing the so quantity correctly if so has duplicate items	2019-04-16 18:26:11 +05:30
Nabin Hait	fa8f13dc98	Merge pull request #17213 from rohitwaghchaure/optimized_code_to_get_items_for_pos fix: POS takes lot of time to load the items data	2019-04-15 10:11:31 +05:30
Rushabh Mehta	4f49ce4124	feat: auto assign lead/opportunity to lead owner, customer account manager	2019-04-12 09:04:17 +05:30
Rohit Waghchaure	2454d89068	Optimized the code to fix slow loading of items in the POS	2019-04-11 19:52:00 +05:30
Mangesh-Khairnar	3ab2a18088	Merge branch 'develop' into so-on-hold	2019-04-11 15:49:06 +05:30
Nabin Hait	65cca62ef9	fixed merge conflict	2019-04-11 12:32:43 +05:30
Nabin Hait	89206e74d0	fixed merge conflict	2019-04-11 12:31:14 +05:30
rohitwaghchaure	4898d1936b	Merge pull request #17200 from Anurag810/pos_running fix: order by idx(v11)	2019-04-11 10:57:05 +05:30
rohitwaghchaure	6cd114b467	Merge pull request #17198 from rohitwaghchaure/fix_auto_assign_payment_entry_to_invoice fix: don't assign the advance payment entries if Allocate Advances Automatically is disabled	2019-04-11 09:57:45 +05:30
Anurag Mishra	9a2ae67f86	fix: order by idx	2019-04-10 17:57:23 +05:30
Anurag Mishra	5ab5f77fd4	fix: order by idx	2019-04-10 17:53:45 +05:30
Rohit Waghchaure	b286fc99b8	fix: don't assign the advance payment entries if Allocate Advances Automatically is disabled	2019-04-10 16:16:30 +05:30
Mangesh-Khairnar	63cf56f406	style: change function call to anonymous function call	2019-04-09 17:47:25 +05:30
Mangesh-Khairnar	b70b048fa2	style: change type comparison for boolean expression	2019-04-09 12:26:52 +05:30
Mangesh-Khairnar	16c4fd6733	Merge branch 'develop' of https://github.com/frappe/erpnext into so-on-hold	2019-04-09 12:13:45 +05:30
rohitwaghchaure	bc02ee23e0	Merge pull request #17078 from rohitwaghchaure/unlinked_advance_payment_on_cancellation_of_order feat: provision to unlink advance payment entry on cancelation of order	2019-04-06 12:30:05 +05:30
Rohit Waghchaure	9835c89e17	Added test cases	2019-04-06 12:29:05 +05:30
rohitwaghchaure	fc471ed63b	Merge pull request #17142 from rohitwaghchaure/incorrect_pos_profile_selected_develop fix: incorrect POS profile selected	2019-04-05 09:59:16 +05:30
Rohit Waghchaure	c2ed03f77a	always set the company from the POS Profile	2019-04-05 09:58:04 +05:30
Rohit Waghchaure	4324f43a06	always set the company from the POS Profile	2019-04-05 09:54:55 +05:30
Rohit Waghchaure	0a4aee0206	fix: POS search items not works properly if item group filter has applied	2019-04-04 16:02:15 +05:30
Rohit Waghchaure	6f3f2185ab	fix: pos takes more time to add an item in the cart	2019-04-01 16:45:47 +05:30
Rohit Waghchaure	e994494e3e	fix: POS qty decrement freezing the screen	2019-04-01 14:29:55 +05:30
Rohit Waghchaure	5fa9a7a1b4	feat: unlink advance payment entry on cancelation of order	2019-04-01 00:40:38 +05:30
Rohit Waghchaure	e540534e42	fix: Pricing rule not working for POS	2019-03-31 17:13:18 +05:30
Rohit Waghchaure	b00c16470d	fix: POS items not loading	2019-03-29 13:47:45 +05:30
Rohit Waghchaure	c7b916ac46	fix: test cases	2019-03-26 12:52:32 +05:30
Rohit Waghchaure	4389cf0c48	feat: provision to make Maintenance Schedule from sales invoice	2019-03-26 12:52:32 +05:30
Rohit Waghchaure	4ae221946b	renamed report	2019-03-26 11:14:06 +05:30
Mangesh-Khairnar	324e06cba0	Merge branch 'develop' of https://github.com/frappe/erpnext into so-on-hold	2019-03-25 18:51:13 +05:30
Rohit Waghchaure	1c1d0bb1c7	feat: commonified item group wise target variance report	2019-03-25 17:56:43 +05:30
Mangesh-Khairnar	b3ec508655	feat: record reason for hold as comment	2019-03-25 17:29:14 +05:30
Mangesh-Khairnar	bcb8b135f2	feat: ask reason for putting sales order on hold	2019-03-25 17:27:16 +05:30
rohitwaghchaure	6fabcdd5b3	Merge pull request #16978 from rohitwaghchaure/sales_partner_wise_reports feat: sales partner reports	2019-03-24 14:52:45 +05:30
Saurabh	3c95387926	Merge branch 'master' into develop	2019-03-20 14:39:49 +05:30
Rohit Waghchaure	65d9435fd5	feat: sales partner reports	2019-03-20 12:05:21 +05:30
Himanshu	f3e5213190	feat(Support): Service Level Agreements (#16828 ) * init SLA * Added more inputs to the forms * set priority of issue * Removed UOM in favor of hours for tracking * updated js to autofill values * Removed unwanted fields * timer functionality * code refactor * parenthesis fix * fixed typo * added new fields * Updated fields * Updated fields for issue doctype * Updated fields for issue doctype * changed doctype structure * added new fields to issue * code refactor * new function to set criticality level * changed dropdown options * set timer for sla * calculation of resolution and response time * stopwatch counter * dashboard changes * renamed sla to support contract * countdown timer section * issue doctype changes * removed unwanted imports * fixed wrong response time and resolution time * update response and resolution time * calculate time to respond and resolve * feature enhancements * probable scheduling bug fix * fixed scheduling issue support sent out of support time * removed issue criticality link from support * Changed day order * skip date validation when support contract is default * removed mandatory field * fix scheduling conditions for now * code refactor * removed duplicate doctypes * fixed day inserted twice in service level * check to not add another default contract * default support contracts * removed commented code * removed unused imports * fix sla for non-listed days * reduced redundant code and optimized it and starting unit tests * added condition check to compute days correctly * renamed doc as per guidelines and added conditions for scheduling * removed per day support timings * added response and resolution time to support contract * scheduling based on hours kinda fix * set sla before_update and finally fixed time scheduling out of support time * DocType Issue removed test_records and rewrote test cases * test cases and codacy fixes * Doctype SLA instead of Support Contract to avoid confusion with Contract * fixed tests failing due to change in options for time period * change naming to Prompt * remove unknown doctype from help_desk * revert unwanted changes to default * refactor get_list for fetching service_level_agreement * change datatypes * fix tests * refactored tests * remove unused imports * code and comments refactor for better understandability * removed and renamed doctype to service days and minor fixes * Refactor test cases for response and resolution time for issue * add validation to check if response time < resolution time * minor fix for checking if current day is start day * calculate time in js rather than python * fix: parenthesis fixing customer dashboard * json changes to rename sections * refactor: alignment * refactor: beautify code * fix: use frm api to get the element * fix: replace '__' with '_' * refactor: remove pointless test	2019-03-19 16:47:56 +05:30
Rohit Waghchaure	8bfe330b37	feat: pricing rule enhancements	2019-03-19 12:44:30 +05:30
Faris Ansari	5f8b358fd4	Website: Product Configurator and Bootstrap 4 (#15965 ) - Refactored Homepage with customisable Hero Section - New Homepage Section to add content on Homepage as cards or using Custom HTML - Products page at "/all-products" with customisable filters - Item Configure dialog to find an Item Variant filtered by attribute values - Contact Us dialog on Item page - Customisable Item page content using the Website Content field	2019-03-19 11:48:32 +05:30
Rohit Waghchaure	5b43e2f31a	code cleanup	2019-03-18 17:00:44 +05:30
Rohit Waghchaure	ace95d5a67	feat: added cost center filter in AR/AP reports	2019-03-18 12:21:00 +05:30
Rohan Bansal	82433845e5	fix(transaction): Add link to payments made by Customer / Supplier in their dashboards	2019-03-14 13:18:55 +05:30
Frappe Bot	7e67a400cd	Merge branch 'master' into develop	2019-03-08 09:39:33 +00:00
Himanshu Warekar	7ab961f798	remove debug code	2019-03-06 23:53:38 +05:30
Himanshu Warekar	59699bf46e	[debug] locally tests passed but travis failed	2019-03-06 23:33:03 +05:30
Himanshu Warekar	4f1737c2dd	fix sales order test for creating work order from sales order	2019-03-06 22:19:15 +05:30
Himanshu Warekar	783331c645	sales_order to work_order item desc fix	2019-03-06 18:44:04 +05:30
Deepesh Garg	e1f72cc010	revert: Address and contact report fix (#16786 ) Reverts #16674 Address and other info are not visible in address and contact report ![screenshot 2019-02-27 at 11 31 38 am](https://user-images.githubusercontent.com/42651287/53469309-6029f500-3a83-11e9-9672-e5e7d14dc470.png)	2019-03-04 12:49:39 +05:30
Mangesh-Khairnar	83f1fbdc4e	test: assert validation error for sales order on hold	2019-03-02 22:24:23 +05:30
Mangesh-Khairnar	3ebeac13e9	feat: add resume funtionality for sales order on hold	2019-03-02 20:48:04 +05:30
Mangesh-Khairnar	602223dd55	feat: add a option of on hold in sales order	2019-03-02 20:48:04 +05:30
Sagar Vora	e0eafb1c2c	Merge branch 'master' into develop	2019-02-26 17:08:59 +05:30
deepeshgarg007	d2d84e3c9d	fix: Company filter fix	2019-02-26 11:52:22 +05:30
Sagar Vora	cc6e51c62d	Merge branch 'master' into develop	2019-02-19 18:09:49 +05:30
Nabin Hait	6bd3098824	Merge pull request #16716 from deepeshgarg007/precision-fix fix: Removed precision from multiple doctypes	2019-02-19 15:03:00 +05:30
deepeshgarg007	de0f59b818	fix: Removed precision from multiple doctypes	2019-02-19 08:40:16 +05:30
rohitwaghchaure	1bcbe9069b	Merge pull request #16610 from jay-parikh/hotfix fix: (POS) Item listing issue in pos after submit for Multi Company POS Profile	2019-02-18 12:43:57 +05:30
Rushabh Mehta	20db65ef77	Merge pull request #16694 from rmehta/refactor-comments fix: refactored comments API. Depends on https://github.com/frappe/frappe/pull/6891	2019-02-18 12:05:35 +05:30
Rushabh Mehta	39c106dd05	fix(test): rename test in test_customer	2019-02-18 11:16:59 +05:30
Frappe Bot	74fd5daeb2	Merge branch 'master' into develop	2019-02-15 10:22:33 +00:00
deepeshgarg007	34f4f24e21	fix: Address and contact report	2019-02-14 17:26:49 +05:30
Deepesh Garg	4d1bc0ca85	fix: Add total row in analytics report (#16648 )	2019-02-13 16:58:46 +05:30
Rushabh Mehta	c8018bdeb1	fix: refactored comments API. Depends on https://github.com/frappe/frappe/pull/6891	2019-02-09 21:10:29 +05:30
Jay Parikh	1906f6da3a	Fix - POS >> Item listing after submit pos >> list all the items which are not restricted to that pos profile #16588	2019-02-08 11:13:09 +00:00
Saif Ur Rehman	1a441b267d	Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12 # Conflicts: # erpnext/patches.txt	2019-02-01 19:17:04 +05:00
Sagar Vora	f97c5dad82	Merge branch 'staging' into develop	2019-01-29 18:39:14 +05:30
Deepesh Garg	a8cc4b105d	Merge branch 'staging-fixes' into pos_issue	2019-01-29 11:29:41 +05:30
Nabin Hait	e8190473f5	Merge branch 'staging-fixes' into unicode	2019-01-29 11:13:04 +05:30
deepeshgarg007	0bee62b460	fix: Made period fields read only and added validation for multiple entries by same user	2019-01-28 12:45:11 +05:30
deepeshgarg007	c2ffcc5e71	feat(POS): Customer wise price list in offline mode and enhancement in POS closing voucher	2019-01-27 16:09:07 +05:30
deepeshgarg007	49cca7ac76	fix: Customer based price_list in online POS	2019-01-25 16:41:01 +05:30
Saif Ur Rehman	37d7b80572	Merge branch 'Item-Tax-Template' of https://saifi0102@github.com/SaiFi0102/erpnext.git into Item-Tax-Template-V12 # Conflicts: # erpnext/patches.txt # erpnext/selling/doctype/sales_order/sales_order.json	2019-01-24 23:41:35 +05:00
Saif Ur Rehman	3d275af67b	Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12 # Conflicts: # erpnext/buying/doctype/supplier/supplier.json # erpnext/patches.txt # erpnext/selling/doctype/customer/customer.json	2019-01-24 23:40:16 +05:00
Saif Ur Rehman	d5c7410ad1	Merge branch 'staging' of https://github.com/frappe/erpnext.git into Item-Tax-Template # Conflicts: # erpnext/buying/doctype/supplier/supplier.json # erpnext/patches.txt # erpnext/selling/doctype/customer/customer.json # erpnext/selling/doctype/sales_order/sales_order.json	2019-01-24 23:34:16 +05:00
Frappe Bot	e415cce1a9	Merge branch 'staging' into develop	2019-01-23 08:19:00 +00:00
Nabin Hait	4ef578e1c4	Merge pull request #16406 from rohitwaghchaure/newchanges_in_tds_reports fix: Multiple fixes in the reports	2019-01-23 12:05:36 +05:30
Aditya Hase	f3c22f342c	fix(unicode): Import unicode_literals in every file	2019-01-22 18:36:10 +05:30
Saif Ur Rehman	74a3370095	Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12 # Conflicts: # erpnext/buying/doctype/purchase_order/purchase_order.json # erpnext/patches.txt # erpnext/selling/doctype/quotation/quotation.json # erpnext/selling/doctype/sales_order/sales_order.json	2019-01-22 16:20:40 +05:00
Sagar Vora	4d1a9b10ed	Merge branch 'staging' into develop	2019-01-22 15:56:39 +05:30
Sagar Vora	ceacacc320	Merge branch 'master' into staging-fixes	2019-01-22 15:37:05 +05:30
Deepesh Garg	f7fe08c487	Merge branch 'develop' into email_digest	2019-01-20 16:53:41 +05:30
Saif Ur Rehman	398f593e5f	Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12 # Conflicts: # erpnext/patches.txt	2019-01-18 17:33:19 +05:00
Nabin Hait	bef2c22d23	Fix: merge conflict	2019-01-18 10:15:47 +05:30
Rohit Waghchaure	fa7ee0b3b6	Added dafult bank account in the customer/supplier	2019-01-17 15:45:27 +05:30
Deepesh Garg	bce62a4bcc	Delete __init__.py	2019-01-16 22:57:45 +05:30
Deepesh Garg	70657d06f4	Delete pending_sales_order.json	2019-01-16 22:57:20 +05:30
Deepesh Garg	b8e0bfc335	Delete pending_quotation.json	2019-01-16 22:56:30 +05:30
Deepesh Garg	9cf9cb0e00	Delete __init__.py	2019-01-16 22:55:48 +05:30
Deepesh Garg	9da018d59c	Delete quotation.json	2019-01-16 22:55:10 +05:30
Deepesh Garg	23b7f0def4	Delete __init__.py	2019-01-16 22:54:17 +05:30
Deepesh Garg	e95a4053cf	Delete sales_order.json	2019-01-16 22:53:53 +05:30
Deepesh Garg	e4303111b4	Delete __init__.py	2019-01-16 22:53:00 +05:30
Nabin Hait	4fd710a392	Merge branch 'staging-fixes' into company_address	2019-01-16 17:51:49 +05:30
Nabin Hait	3dde949419	feat(mr_against_so): Merge same items from different BOMs	2019-01-16 15:59:39 +05:30
Sahil Khan	34766c0c50	BIS issue fixes	2019-01-16 15:59:39 +05:30
Deepesh Garg	7bb7f95aa8	Merge branch 'staging-fixes' into company_address	2019-01-16 11:17:55 +05:30
Nabin Hait	f0571ddf4b	Merge pull request #16393 from diamorafaela/quotation-currency fix: Quotation to Sales Order with different currency	2019-01-16 10:13:44 +05:30
Saurabh	7d630b3e29	Merge branch 'master' into staging-fixes	2019-01-15 19:41:09 +05:30
NahuelOperto	9080221d46	fix: added test cases	2019-01-14 12:12:56 -03:00
Saif Ur Rehman	502f15ba1b	test: test_party_details_tax_category	2019-01-12 19:07:39 +05:00
NahuelOperto	7facc34851	fix: removed filter from method validate	2019-01-11 10:46:38 -03:00
Nabin Hait	c693cd7f10	Merge pull request #16341 from Mangesh-Khairnar/date-range-fix fix: Sales Analytics Period Range	2019-01-10 10:35:31 +05:30
Saif Ur Rehman	8d61794540	Merge branch 'Item-Tax-Template' of https://github.com/SaiFi0102/erpnext.git into Item-Tax-Template-V12 # Conflicts: # erpnext/patches.txt # erpnext/stock/doctype/item/item.json	2019-01-10 04:23:40 +05:00
deepeshgarg007	8621869d24	Created multiple reports and linked them to email digest	2019-01-09 21:56:45 +05:30
Deepesh Garg	9c5e9d79f1	Merge branch 'staging-fixes' into company_address	2019-01-09 17:19:20 +05:30
deepeshgarg007	d29ee97307	Addition of GST fields in Sales Order,Purchase Order,Purchase Receipt	2019-01-09 17:09:11 +05:30
Saurabh	afec3ca89a	Merge branch 'staging' into develop	2019-01-08 17:09:36 +05:30
Saif Ur Rehman	380b4b0926	Merge branch 'staging-fixes' of https://github.com/frappe/erpnext.git into Item-Tax-Template # Conflicts: # erpnext/accounts/doctype/accounts_settings/accounts_settings.json # erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json # erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json # erpnext/accounts/doctype/sales_invoice/sales_invoice.json # erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json # erpnext/buying/doctype/purchase_order/purchase_order.json # erpnext/buying/doctype/purchase_order_item/purchase_order_item.json # erpnext/buying/doctype/supplier/supplier.json # erpnext/buying/doctype/supplier_quotation/supplier_quotation.json # erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json # erpnext/selling/doctype/quotation/quotation.json # erpnext/selling/doctype/quotation_item/quotation_item.json # erpnext/selling/doctype/sales_order/sales_order.json # erpnext/selling/doctype/sales_order_item/sales_order_item.json # erpnext/setup/doctype/item_group/item_group.json # erpnext/stock/doctype/delivery_note/delivery_note.json # erpnext/stock/doctype/delivery_note_item/delivery_note_item.json # erpnext/stock/doctype/item/item.json # erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json	2019-01-08 13:41:46 +05:00
Nabin Hait	c190192d5f	Merge pull request #16277 from deepeshgarg007/loyalty-program-fix fix: Loyalty program issue fix in customer dashboard	2019-01-08 12:15:57 +05:30
Nabin Hait	4216d86dd9	Merge pull request #16296 from deepeshgarg007/update_items_bug fix: Validation while updating items in sales order	2019-01-08 11:54:52 +05:30
Nabin Hait	49ca9dceb2	Merge branch 'staging-fixes' into report-fix	2019-01-08 11:53:06 +05:30
Saif	e5091cbc0f	chore: Updated DocType JSON Files to Clean Up Git Diff of Other PRs (#16356 ) * chore: Updated DocType json files to clean up git diff of other PRs * fix: remove auto-generated file	2019-01-07 18:19:30 +05:30
Saif Ur Rehman	7ea6554f1f	Merge branch 'staging' of https://github.com/frappe/erpnext.git into Item-Tax-Template # Conflicts: # erpnext/selling/doctype/quotation_item/quotation_item.json # erpnext/stock/doctype/item/item.json	2019-01-06 04:43:13 +05:00
Mangesh-Khairnar	e2ea987610	fixed edge cases for yearly, weekly and monthly views	2019-01-05 00:15:31 +05:30
Mangesh-Khairnar	676a106d7a	(refactor) removed unnecessary code	2019-01-05 00:15:31 +05:30
Mangesh-Khairnar	8e47a543f6	(fix) multiple years in yearly view	2019-01-05 00:15:31 +05:30
deepeshgarg007	32f054b901	Added customer group column in item-wise-sales-history report	2019-01-03 22:57:18 +05:30
deepeshgarg007	78ad6c4cb7	Merge branch 'staging-fixes' of https://github.com/frappe/erpnext into loyalty-program-fix	2019-01-01 19:46:08 +05:30
deepeshgarg007	318dc422bc	Updated test Cases for update_child_rate_qty	2019-01-01 18:30:33 +05:30
deepeshgarg007	de1e6fc1c4	Merge branch 'develop' of https://github.com/frappe/erpnext into opportunity-lost-reason	2019-01-01 08:57:18 +05:30
Nabin Hait	cacbdec565	Merge pull request #16283 from rohitwaghchaure/fix_not_able_to_delete_customer [Fix] Not able to delete customer if contact is available	2018-12-31 11:55:24 +05:30
deepeshgarg007	d9a768a88f	feat: Set lost reasons in opportunity and quotation using table multiselect	2018-12-29 19:33:44 +05:30
Saif Ur Rehman	fd531a6b5e	feat: Tax Category based on Address	2018-12-29 01:49:11 +05:00
Suraj Shetty	3de12db2b1	Merge branch 'develop' of github.com:frappe/erpnext into general-ui-fixes	2018-12-27 09:05:25 +05:30
Saif Ur Rehman	677866824a	More work on Tax Category and Item Tax Template	2018-12-27 02:11:07 +05:00
Frappe Bot	9e09b3adbe	Merge branch 'staging' into develop	2018-12-26 12:16:20 +00:00
Frappe Bot	e8c2fdfb8c	Merge branch 'master' into staging-fixes	2018-12-26 11:44:09 +00:00
Rohit Waghchaure	52a692ee08	[Fix] Not able to delete customer if contact is available	2018-12-26 02:34:13 +05:30
deepeshgarg007	12f5cefc12	Loyalty program issue fix in customer dashboard	2018-12-25 16:06:19 +05:30
Suraj Shetty	146be9f6a6	Merge branch 'develop' of github.com:frappe/erpnext into general-ui-fixes	2018-12-24 16:08:43 +05:30
rohitwaghchaure	7ec5e80b70	[Fix] While making sales invoice from delivery note, system not remove the returned qty (#16141 )	2018-12-24 14:55:31 +05:30
Charles-Henri Decultot	052033a76e	[Fix] Pos bugs (#16256 ) * Remove hard-coded values * Fix change pos profile + add campaign * Test case for coveralls * Remove unnecessary method	2018-12-24 14:39:30 +05:30
Mangesh-Khairnar	70c5aa5f5d	[Enhancement] Pending SO Items for Purchase Request Report (#16188 ) * deleted old purchase request query report * [Enhancement] pending so items for purchase request report refactor * comments and format fix * test and minor fixes * test fixes	2018-12-24 14:25:47 +05:30
Shreya Shah	91ddadeefa	fix: add currency to options (#16199 )	2018-12-24 14:25:12 +05:30
Raffael Meyer	ed3561279d	Update README.md (#16224 )	2018-12-24 14:19:51 +05:30
Suraj Shetty	83e3c4c0fa	Fix quote error	2018-12-24 11:11:04 +05:30
Suraj Shetty	b2965001d1	Replace 'Make' with 'Create'	2018-12-23 13:25:58 +05:30
Saif Ur Rehman	8ac261750b	Add and Modified DocTypes for Item Tax Template	2018-12-22 02:51:59 +05:00
Frappe Bot	1b7c583c48	Merge branch 'staging' into develop	2018-12-21 05:46:23 +00:00
deepeshgarg007	1ee19e4167	Analytics report graph fix	2018-12-15 15:36:09 +05:30
Frappe Bot	5b50b2848d	Merge branch 'staging' into develop	2018-12-10 13:08:33 +00:00
RicardoJohann	bc0ef0beca	Add Serial Number button in Delivery Note and Sales Invoice's Packing List (#16080 )	2018-12-10 17:43:03 +05:30
Stavros Anastasiadis	3d82b74ea4	Update Items in Submit state can add new row (#15644 ) * Update Items in Sumbit state can add new row In Sales Order and Purchase Order when docstatus is submitted user can use Update Item btn to add new child Items * Remove unused code line * Remove blocking db save thread line * Remove Company as not standard Field in Purchase Order Item * Minor indentation fix * Add Unit Test, add new row in update_child_qty_rate * Codacy fix	2018-12-10 17:30:55 +05:30
Rohan	39b31ece31	fix(pos): Return empty dict if no results found (#16124 )	2018-12-10 17:16:39 +05:30
Frappe Bot	7c2a5bddb1	Merge branch 'staging' into develop	2018-12-06 09:50:25 +00:00
deepeshgarg007	4c79274054	Fixed patch and deprecated grid reports	2018-11-30 18:01:22 +05:30
deepeshgarg007	37b6a2ca0b	row check bug fix	2018-11-30 16:15:43 +05:30
deepeshgarg007	3c7c4a61be	Test case fix	2018-11-29 14:28:01 +05:30
deepeshgarg007	3eef6411dd	Removed print statement	2018-11-29 13:10:02 +05:30
deepeshgarg007	1a1c013b2a	Analytics report bug fixes and code cleaning	2018-11-29 08:34:47 +05:30
Ameya Shenoy	fe1f532bc0	Merge branch 'staging' into develop	2018-11-28 08:28:37 +00:00
Nabin Hait	72fc1b57be	Merge pull request #16083 from Anurag810/new-fix-branch [fix] delivery note with quantity equal 0 #14211	2018-11-27 13:10:31 +05:30
Nabin Hait	91c811f170	Merge branch 'staging-fixes' into new-fix-branch	2018-11-26 20:23:37 +05:30
deepeshgarg007	05c2989698	removed total from graph	2018-11-26 20:19:57 +05:30
Nabin Hait	d0af0887be	Merge pull request #16051 from SaiFi0102/patch-1 Remove "Test" Letter Head	2018-11-26 19:47:07 +05:30
Anurag Mishra	5b6dd58b3e	fixed ZeroDivisionError in sales_order.py	2018-11-26 17:22:50 +05:30
Anurag Mishra	e657fe84b8	making validation generic for sales order,sales invoice,purchase order etc.	2018-11-26 17:13:10 +05:30
Nabin Hait	48e0e19b03	fix(test): Fixed salary slip and sales analytics test cases	2018-11-26 11:05:28 +05:30
deepeshgarg007	9cdece4ca2	Test case fix and other minor bug fix	2018-11-26 11:05:28 +05:30
Kanchan Chauhan	962397e6f4	Added href links for nextdoc on cancelling the Sales order, makes it easier to navigate	2018-11-22 15:15:06 +05:30
Saif	2a2f2742eb	Remove "Test" Letter Head	2018-11-21 23:29:09 +05:00
Frappe Bot	b5c7b96a73	Merge branch 'staging' into develop	2018-11-13 11:33:31 +00:00
Saif	60ec88bcc8	Added Default Warehouse field that sets all item's warehouse (#15462 ) * -Added field def_warehouse that sets warehouse of all items -Grouped warehouse fields together and put raw materies supplied before items table, it will only show if there are any items supplied * Set def_warehouse in test_sales_order.py * Changed from def_warehouse to set_warehouse * Rest of def_warehouse to set_warehouse	2018-11-13 12:37:53 +05:30
Shreya Shah	89974b221d	[Feature] Create Raw Material Request from Sales Order (#15452 ) * Add new button to Sales Order form - Request for Raw Materials * Modify get_work_order_items function * Commonify functions in Production Plan to make it compatible with new feature * Create and submit Material Request from Sales Order * Link Sales Order with Material Request * Minor * Rename label * Fix Codacy * Modify as per review suggestions - Move dialog to a new function - Move checkboxes below other fields * Minor changes * Check for permissions * Add common checkboxes for all items * Fix codacy * fix: Travis * fix: Use variable to store query result * fix: Add comment before fetching exploded items * refactor: Break into multiple functions * test: Add test case	2018-11-13 11:15:03 +05:30
Zarrar	6922415d1b	[New Feature]Scan Item Barcode label to quick create/update records in items child table (#15731 ) * Update transaction.js * setup barcode scan stock entry controller not inherited from transaction.js, need to call setup barcode scan from transaction.js * fix bug of item_code change always reset qty to 0 when calling frappe.model.set_value(dt,dn,'item_code',xxx), even qty is set, system always reset qty to 0. * Update transaction.js * Update transaction.js * Update transaction.js * Update transaction.js * Update transaction.js * Update transaction.js * clean up barcode logic for transactions * call scan_barcode method for stock entry * separate out logic for searching serial, batch or barcode number * added scan barcode field in transactions doctype * search barcode-serial-batch sequence, code rectify * hide all barcode related field if disabled from settings * remove print statement * Update stock_entry.py	2018-11-13 11:11:32 +05:30
Deepesh Garg	6714214951	Server side script report for sales analytics (#15589 ) * Sales Analytics Report * Codacy issue fixes and name column addition * Minor Fixes * Minor Changes * Codacy Issue Fixes * Codacy Issue Fixes * Bug Fixes * Code cleaning and optimization * Deleted Duplicate code * Indentation Issue Fixes * Added Supplier Condition * Cleaned code and better function naming * Added report link for sales analytics in selling.py * fix(patch): Patch to delete old analytics reports * feat(refactor): Created class and refactored code using object oriented paradigm * Column condition fix * Minor condition fix * Minor fix * parent child map for purchase analytics * Minor Fixes in get_periodic_data * Used dots for filters instead of brackets * Minor Bug fix in get_period_date_ranges * Test Cases for Analytics Report	2018-11-12 16:15:54 +05:30
lasalesi	32ab3970e1	allow creating sales order on the last valid day of a quotation (#15875 )	2018-11-05 16:02:18 +05:30
Zarrar	92a4ff4e81	Merge pull request #15874 from shreyashah115/portal-fixes Add overdue status for sales order	2018-11-01 10:46:08 +05:30
Ameya Shenoy	f3f997f232	Merge branch 'staging' into develop	2018-10-31 13:51:52 +00:00
Ameya Shenoy	961849beb4	Merge branch 'master' into staging-fixes	2018-10-31 13:43:12 +00:00
Shreya Shah	e140845399	Revert "Add overdue status for sales order"	2018-10-31 18:20:28 +05:30
Shreya Shah	b95d7ae41b	Merge pull request #15870 from shreyashah115/portal-fixes Add overdue status for sales order	2018-10-31 18:20:18 +05:30
Shreya Shah	41c5fda196	fix(sms-center): Fix db query (#15774 )	2018-10-31 18:04:30 +05:30
Shreya	e3a7c68d4f	fix(portal): Add overdue status for sales order	2018-10-31 16:00:27 +05:30
Ameya Shenoy	7658bdc00a	Merge branch 'staging' into develop	2018-10-23 08:06:15 +00:00
Ameya Shenoy	ca66c7ba14	Merge branch 'master' into staging-fixes	2018-10-23 08:01:13 +00:00
Ameya Shenoy	3a11f34355	fix(): fetch correct warehouse for item in report Fix 'Sales Person-wise Transaction Summary' Report by fetching the correct Warehouse for the Item fron the respective, Sales Order/Sales Invoice/ Delivery Note	2018-10-22 10:15:07 +00:00
Ameya Shenoy	d1c467bcf5	Merge branch 'staging' into develop	2018-10-17 09:44:39 +00:00
deepeshgarg007	0cbb9b54fa	Deprecating subscriber doctype (#15695 ) * Depricating subscriber doctype * Removed naming series	2018-10-16 14:39:16 +05:30
deepeshgarg007	4bb90add1d	Currency symbol bug fix (#15698 )	2018-10-15 19:07:49 +05:30
deepeshgarg007	7c443264a4	Currency symbol bug fix (#15690 )	2018-10-15 18:22:28 +05:30
Ameya Shenoy	f90af80344	Merge branch 'staging' into develop	2018-10-11 06:58:53 +00:00
deepeshgarg007	1cb1074f6b	Bug Fix (#15640 )	2018-10-10 16:15:30 +05:30
Ameya Shenoy	da10f6ebd8	Merge branch 'staging' into develop	2018-10-04 11:51:30 +00:00
Charles-Henri Decultot	75fa6b3ee8	[Enhancement] Improvement to the sales pipeline (#15524 ) * Additions to sales pipeline * Codacy corrections * Codacy corrections * Codacy corrections * Replace _ with dummy for unused variable * Performance + dates corrections * Itertuples modification * Removing trailing whitespaces * Sales stage doctype * Divide sales stages fixtures in separate functions * Remove duplicate fixtures * Add newline after method * Missing requirement	2018-10-03 10:41:40 +05:30
Sharath C	1c44d93b93	Is frozen and Disabled Columns added to Customer Credit Report (#15560 )	2018-10-03 10:41:11 +05:30
deepeshgarg007	719701f2a4	Enhancement in Budget Variance and other reports (#15455 ) * Enhanced Budget Variance report and added filters and columns in other reports * Update budget_variance_report.js * Changes in budget variance report * Spacing in column names	2018-10-02 12:52:13 +05:30
Charles-Henri Decultot	b2281cc1fd	Lead to customer UX enhancement (#15525 ) * Lead to customer UX enhancement * Market segment * Market Segment to DocType * Specific function for fixtures * Merge issue correction * Doctype merge correction	2018-10-02 11:25:00 +05:30
Saif	90cf2ddc01	Make pricing rule from Supplier and Customer Doc (#15533 ) * Make pricing rule from Supplier and Customer Doc * Make sure the "+" button also works the same way as the "Make" button	2018-09-30 22:16:31 +05:30
Charles-Henri Decultot	4fd7a4e0d7	Lead notes (#15510 ) * Notes field in Lead * Add notes to lead details report	2018-09-30 21:20:55 +05:30
Suraj Shetty	4b404c4f1e	Avoid multiple escapes (#15509 )	2018-09-27 15:39:34 +05:30
Suraj Shetty	6ea3de9521	Fix quote issues (#15497 ) * Fix quotes issues * Remove frappe.db.escape - Handle escape in the update_linked_doctypes method	2018-09-26 18:15:53 +05:30
deepeshgarg007	c3772f1ac4	minor fix (#15503 )	2018-09-26 15:55:43 +05:30
Ameya Shenoy	430c3c88ff	Merge branch 'staging' into develop	2018-09-26 07:32:45 +00:00
deepeshgarg007	86152eb5c8	Sales person Commission Report and more (#15431 ) * Commission For Sales Person * Changes Made * Changes made in sales person dashboard and commission report * Update sales_person_commission_summary.py	2018-09-25 19:08:16 +05:30
Zarrar	b113349f31	minor fix for auto-opt-in for customer (#15483 )	2018-09-24 14:30:07 +05:30
Suraj Shetty	bfc195dd8b	Changes to support refactor in frappe pg-poc branch (#15287 ) * Remove quotes from sql to make it compatible with postgres as well * Fix queries - Replace mysql specifc queries with standard ones * Make repo URL chages to test pg-poc * Add root passowrd to test site config * Fix quotes issue * Remove debug flag from a pricing rule query * Remove python 3.6 version from travis.yml * Fix improper query issue * Fix incorrect query * Fix a query - This fix need to be changed when we will start supporting postgres since date_format is not supported by postgres * Get price list map as dict * Convert price_list_currency_map to dict	2018-09-21 10:20:52 +05:30
Nabin Hait	9fde97cdd2	Fixed merge conflict	2018-09-12 15:45:20 +05:30
rohitwaghchaure	713cfc786f	[enhance] Payment order (#15056 )	2018-09-11 17:40:37 +05:30
Alchez	e52ae4eacb	[Fix] 'To Bill' status even if the amount is zero (#14784 ) * Fix 'To Bill' status even if the invoice amount is zero * Modify fix to only apply on Delivery Note documents	2018-09-06 18:27:06 +05:30
Zarrar	1b37186460	set POS Invoice format only if its enabled (#15326 )	2018-09-06 13:25:52 +05:30
Nabin Hait	ffeff2d385	fix(tests): reset session user as administrator after running tests	2018-09-06 12:45:07 +05:30
Saurabh	1fe1884b73	Merge branch 'master' into develop	2018-09-03 17:00:17 +05:30
Shreya Shah	bb88e964a4	Remove unnecessary code (#15296 )	2018-09-03 13:01:12 +05:30
Nabin Hait	f1a3fbdb6b	minor fixes in dropship	2018-08-31 17:05:20 +05:30
Fisher Yu	2e5c776293	Update sales_order.py 1. filter out the suppliers by which the dropship purchase order already created 2. allow create multi dropship draft purchase orders	2018-08-31 17:05:20 +05:30
Fisher Yu	102bc7f5cf	Update sales_order.js for creating dropship purchase orders, allow the user to leave supplier field empty, it will auto create all dropship purchase orders for multi suppliers assigned to sales order items.	2018-08-31 17:05:20 +05:30
Rushabh Mehta	49f9747385	major(manufacturing): fixes to ux, material requests to purchase order based on default supplier etc (#15267 ) * major(manufacturing): fixes to ux, material requests to purchase order based on default supplier etc * fix: remove debug	2018-08-30 18:50:48 +05:30
Rushabh Mehta	13bcc4e27e	perms: fix default import, export perms	2018-08-29 17:10:27 +05:30
Nabin Hait	a804d6d487	Fixed merge conflict	2018-08-29 13:34:58 +05:30
Shreya Shah	a5add289bb	Refactor Naming Series (#15070 ) * Patch to create Property Setter for existing naming series * Update existing naming series options with new * Add patch link to patches.txt * Update patch * Fix codacy * Fix as per suggestions * Remove old patch for property setter * Improve as per suggested - Modified the naming - Also refactored naming for doctypes having autoname with series - Added a patch to make property setter for autoname * Fix Travis * Rebase with develop	2018-08-28 13:44:48 +05:30
Charles-Henri Decultot	25712f8d65	Sales order correction (#15190 )	2018-08-23 10:51:44 +05:30
Shreya Shah	0631aed3d9	Discount amount field in all transactions' child tables (#15124 ) * Add discount_amount and base_discount_amount in Sales Invoice Item * Add patch for existing documents * Discount amount field in all child tables of Purchase and Selling * Remove console statements	2018-08-14 10:51:48 +05:30
Nabin Hait	9a33bc6417	optimizing transactions by caching	2018-08-09 10:47:09 +05:30
Himanshu Mishra	859d942b22	Cached calls (#15109 ) * [optimize]: bin updates * [optimise]: use frappe.get_cached_value instead of get_value for item * [fix]: change db.get_cached_value to get_cached_value	2018-08-08 18:33:50 +05:30
Rushabh Mehta	708e47aadf	optimize(various)	2018-08-08 16:37:31 +05:30
Meritsystems	1ad8eca4e8	Point of sale will list only items that are in stock based on option "Display Items in stock" in POS Profle. (#14895 ) * Update point_of_sale.py * Update point_of_sale.py Add custom field(Display Items In Stock) to POS Profile Doctype of type Check. * New field " Display Items in Stock" added * Update point_of_sale.py * Update point_of_sale.py ORM used instead of SQL used Bin to find actual quantity balances. * Update point_of_sale.py * Update point_of_sale.py * Update point_of_sale.py * Update point_of_sale.py * Update point_of_sale.py	2018-08-07 14:38:50 +05:30
Ranjith Kurungadam	752fd5a7a0	Tests SO for Serial No based delivery (#15072 ) * fix remove SO from Serial No only when voucher SE * SO tests - delivery by Serial No	2018-08-03 10:39:51 +05:30
KanchanChauhan	e1f0be6da5	Delivery Date Change based on Delivery Date change in child table (#15068 )	2018-08-01 18:11:58 +05:30
Ranjith Kurungadam	d54991d624	Delivery by Serial No (#15030 ) * fields added for delivery by Serial No * SO - validate item for delivery by Serial No * Stock Entry - add Serial No on production, validate reserved consumption * add item by reservation to transaction if delivery by Serial No * SLE - validate reserved Serial No by SO in Delivery Note, Sale Invoice * Sales Order - validate Ensure Delivery by Serial No * Serial No - remove SO ref on cancel	2018-08-01 17:47:07 +05:30
Nabin Hait	e45ec661ea	Additional fields in Item Price (#14540 ) * [IMPROVEMENT] Item Price New Fields and Features * [IMPROVEMENT] Item Price - Item Price insert against Qty, Supplier/Customer, Validup/Validfrom - Stock Setting to accept Default Price List for Purchase or Sales Item - Move Item Section in Item Price * Fetch default Item Price based on Customer as null * test fixes * Code cleanup and fixed the issue of incorrect item price fetched against the customer * Removed min qty from packing_increment calculation * Removed auto_update_price_list_rate from the stock settings * Revert sales_order.json changes * Removed sales, purchase price list from stock settings because this fields are already available in selling, buying settings * Removed unnecessory file * Fixed item price validation code	2018-08-01 17:44:34 +05:30
Zarrar	89c87fd6a6	[Minor] Patch fix (#15041 ) * update modified date * remove extra parameter from function call	2018-07-30 10:57:47 +05:30
Saurabh	d7897f1c53	Resolved merge conflicts	2018-07-18 17:08:16 +05:30
Faris Ansari	9e874af9ba	Query report print (#14935 ) * QueryReport - Only print visible columns in report - Use get_columns_for_print method instead of directly accessing report.columns * Query Report - Replace frappe.query_report_filters_by_name with new API	2018-07-18 09:28:44 +05:30
Rushabh Mehta	69fa808def	[minor] fixes + patch (#14937 )	2018-07-17 18:22:51 +05:30
Shreya Shah	3c9839f832	Defaults in Item Group (#14874 ) * Add Defaults table in Item Group * Fetch defaults from Item group if not found in Item * Add patch * Remove default fields from Item Group * Set query for defaults * Fix Codacy * Modify test records * Modify budget.py and sales_order.py * Remove join from query * Else condition to avoid error if no defaults found * refrain from making item test records before item_group * default cost center fetch correction * Remove tab item group from query	2018-07-17 18:01:44 +05:30
rohitwaghchaure	a76067eea1	[Fix] Per billed showing as 100% in the sales order even if sales return has made against the sales order (#14899 ) * [Fix] Per billed showing as 100% in the sales order even if sales return has made against the sales order * Added test cases	2018-07-17 16:50:50 +05:30
Saurabh	af479c8192	set valid delivery date (#14890 ) * set valid delivery date * calculate delivery date based on diffrence in transation date and delivery date of ref doc	2018-07-17 16:49:32 +05:30
Saurabh	e78a877202	patch fixes (#14936 )	2018-07-17 16:38:11 +05:30
Zarrar	26c9b94cc6	[ Improv ] Loyalty Program more fixes and test case (#14888 ) * remove console statements * set account & cost center for redemption * add test case for single/multi tier & is_return scenario * reset tier when changing loyalty program * make loyalty fields non copy type * fix test case - delete si after every test to avoid interference	2018-07-16 18:11:53 +05:30
Nabin Hait	b2da082798	Fixed logic and tests	2018-07-13 17:02:08 +05:30
Doridel Cahanap	6f06cc27e6	Update Qty and Rate in PO and SO	2018-07-13 17:02:08 +05:30
Zarrar	5899d98077	[ Major ] Loyalty Program Fixes (#14863 ) * fix checking of customer_group & territory of customer in loyalty program * fetch and set applicable loyalty program - in customer.py if found 1 program, set it or show a message to set it manually - in sales invoice, if found 1 program for selected customer with no program set, set it else open a dialog with applicable options * removed disabled field, added from_date & to_date * loyalty program section made collapsible, added redeem check in it * setting loyalty program improvised, manual selection if multiple found * get_query added, amount calculation updated * args passed rectified for expiry_date * get loyalty_points logic improv, redemption_details logic added * improv based on from/to date and other rectification * code rectified based on different scenarios - is_return, cancel, make loyalty points entry improv	2018-07-11 14:35:43 +05:30
Saurabh	db7324890f	Merge branch 'master' into develop	2018-07-09 15:53:51 +05:30
rohitwaghchaure	6be8bea934	Provision to view return entries in Sales Person-wise Transaction Summary (#14830 )	2018-07-08 19:25:13 +05:30
Shreya	9bcb959f81	Print hide loyalty program related fields	2018-07-06 18:17:02 +05:30
Saurabh	1cfcf70905	Resolved merge conflicts	2018-07-06 13:18:44 +05:30
rohitwaghchaure	3f5e80ebe3	Allow bulk edit for the sales invoice item (#14826 )	2018-07-06 12:39:04 +05:30
Manas Solanki	da486eeebd	Loyalty Program (#12631 ) * First Cut for the Loyalty Program * finished the collection part * redmeption for the loyalty point update the loyalty point entry in the FIFO style make the accounting entry knocking the debtors account against the expense account selected in the loyalty program update the outstanding balance in the client side * completed for the desk viewe * wrap up for the desk and shopping cart * pos * fix and test the travis	2018-07-06 12:36:57 +05:30
Mohammed R Abukhamseen	8662a4f677	POS - Translate some text & numpad (#14765 ) * make label & placeholder translatable * numpad translatable * Update point_of_sale.js remove debugger	2018-07-01 16:44:09 +05:30
Himanshu Mishra	7aabef2026	Add configurable frequency in Selling Settings for update of project … (#14670 ) * Add configurable frequency in Selling Settings for update of project and company * remove redundant code * remove redundant code, only trigger calculation if order/invoice is present * removed dangling commas as per common convention in hooks * fix:handling multiple documents * Update selling_settings.json	2018-06-28 23:43:23 +05:30
Nabin Hait	7324815fdb	map payment terms template from SO to SI	2018-06-28 23:12:02 +05:30
Manas Solanki	3ff7f79cc7	Merge pull request #14740 from manassolanki/fix-20 [minor] fix for the args in the frm.call	2018-06-28 20:47:25 +05:30
Manas Solanki	89e7f8b387	[minor] fix for the args in the frm.call	2018-06-28 20:44:53 +05:30
Charles-Henri Decultot	8b22310d66	Allow auto repeat update (#14706 ) * Allow auto repeat update * Allow auto-repeat reference update	2018-06-28 14:27:58 +05:30
Nabin Hait	e2a8120ef8	ignore user permissions for some fields	2018-06-26 15:27:34 +05:30
Manas Solanki	860e169081	Update sales_order.js	2018-06-26 11:45:04 +05:30
Kanchan Chauhan	bddebb52d6	Allow only submitted Blanket Order in PO/SO	2018-06-26 09:31:27 +05:30
rohitwaghchaure	3a595d07d0	[Fix] POS Closing Voucher, on save collected amount becomes zero issue and added test cases (#14649 ) * [Fix] POS Closing Voucher, on save collected amount becomes zero * Added test cases for the POS Closing Voucher	2018-06-25 10:10:29 +05:30
rohitwaghchaure	ae276bcaa1	Don't allow to sale asset item from POS (#14623 )	2018-06-21 13:18:01 +05:30
rohitwaghchaure	79e5b07e62	[Fix] Subscription method (#14604 ) * [Fix] Subscription method path * [Fix] Condition	2018-06-21 12:58:14 +05:30
Zarrar	e25dcd2737	[Minor] Report related fixes (#14620 ) * fix in query incase list is empty * periodicity not found error when called from consolidated financial statements and custom cash flow is activated * unset currency filter to apply default currency or so * python 2 - 3 fix	2018-06-21 10:53:12 +05:30
Saurabh	59798b4e88	resolved merge conflict	2018-06-20 15:23:25 +05:30
Nabin Hait	8eeb5694ba	Fixed qty in item-wise sales history report	2018-06-18 17:41:27 +05:30
Zarrar	e0adb6bbd6	cost_center overridden by company's default fix in SI (#14560 )	2018-06-18 15:49:12 +05:30
Nabin Hait	b2d3c0f040	Update ordered qty in blanket order	2018-06-14 15:56:29 +05:30
Manas Solanki	e5e87f7137	[feature] Blanket Order - Creaete Sales or Purchase order from the blanket order - If there is any blanket order for the customer/supplier rates will be fetched from that order - Manually selecting the Blanket order will change the rates accordingly - Upon submission of the order, the ordered qty will be updated in the Blanket Order	2018-06-14 15:55:38 +05:30
Manas Solanki	2fb63e1724	init the blanket order	2018-06-14 15:55:37 +05:30
Zarrar	14a9c0706b	Merge pull request #14461 from mntechnique/sales_partner_type Partner Type as Link field added in Sales Partner	2018-06-14 12:48:24 +05:30
Zarrar	17089eeac3	[Minor] Fetching and appending items in Stock Reconciliation fix (#14509 ) * minor fix in get_list of items in stock reconciliation * reload doc fails because of backdated modified date * item and item defaults should load prior to shopify refactor * attribute value should't be none or empty, could be zero though * Update item.py	2018-06-14 11:54:18 +05:30
deepak-mnt	b95f60c6f3	minor changes	2018-06-12 16:04:49 +05:30
deepak-mnt	4ec283d775	patch for sales partner type field	2018-06-11 14:53:25 +05:30
Ameya Shenoy	873e28d9b8	Merge branch 'master' into develop	2018-06-06 05:53:19 +00:00
Charles-Henri Decultot	a774f3d7a0	POS closing voucher (#14270 ) * POS closing voucher * Codacy corrections + improvements * Codacy corrections * POS Closing Voucher improvements	2018-06-06 10:22:13 +05:30
Shreya Shah	5103454642	New Report Address and Contacts (#14307 ) * New Report Address and Contacts * Fix codacy * Add links to report in module pages	2018-06-05 10:44:36 +05:30
rohitwaghchaure	ce642d73cb	[Fix] Special character issue while upadting customer group in customer (#14312 )	2018-06-01 15:11:21 +05:30
Saurabh	824e068d0a	typo fix	2018-05-31 18:11:05 +05:30
Saurabh	0eb622f7da	[fix] resolve conflicts	2018-05-31 17:32:17 +05:30
Zarrar	39c0add5a2	query fix sales-person-target-variance-item-group-wise (#14271 )	2018-05-30 11:56:58 +05:30
Nabin Hait	153536bf70	minor test fixes	2018-05-29 10:58:57 +05:30
Zarrar	b9f54ca946	[Enhance] Group same items during printing Delivery Note, Invoices, etc (#14250 ) * add doctypes allowed to group items, average the rate * add check field to group items during print * call common before_print in delivery note * fix precision issue while calculating average	2018-05-28 17:41:09 +05:30
Shreya Shah	e329038aaa	Total Quantity in Sales and Purchase DocTypes (#14114 ) * Add field to all sales and purchase doctypes * Add patch to update existing records * Modify taxes_and_totals.py	2018-05-28 11:49:08 +05:30
Zarrar	c141eb00ee	[Enhance] Department added wherever applicable (#14121 ) * set All Department as default parent_department * add department field in employee_transfer * copied data from options to fetch_from * add department field wherever employee's link field present * empty options field where fetch_from is added	2018-05-23 11:11:36 +05:30
Ameya Shenoy	1cc7500be9	Merge branch 'master' into develop	2018-05-22 09:18:38 +00:00
Nabin Hait	19ce904030	Report added in Selling module	2018-05-21 11:07:04 +05:30
Nabin Hait	2cfc247d88	customers without any sales transactions	2018-05-21 11:03:02 +05:30
Nabin Hait	1bf2576e0e	Merge branch 'erpnext_issue_13818' of https://github.com/asbasawaraj/erpnext into asbasawaraj-erpnext_issue_13818	2018-05-21 10:47:40 +05:30
Basawaraj	6d334b8135	Added Report : Customers Without Any Sales Transactions	2018-05-17 16:54:03 +05:30
Manas Solanki	38667ab8da	return defaults according to the company	2018-05-16 17:00:05 +05:30
Rohit Waghchaure	23942701f1	[Fix] 'PurchaseInvoiceItem' object has no attribute 'company'	2018-05-16 15:41:00 +05:30
rohitwaghchaure	eff678d2d6	Merge pull request #13918 from manassolanki/item-level-defualts [enhancement] add the item defaults in the child-table for multi-company	2018-05-16 14:04:47 +05:30
Manas Solanki	bbd8508783	optimize the patch	2018-05-16 13:00:56 +05:30
Manas Solanki	b16a4ec79e	changes for the default cost center	2018-05-16 13:00:56 +05:30
Rushabh Mehta	0b628386de	[minor] remove in_dialog old property	2018-05-16 12:51:22 +05:30
Shreya Shah	4f40b2dca5	[Fix] Sales Person Reports (#13987 ) * Fix Sales Person Reports - Show quantity and amounts based on the delivered quantities if the Sales Order has been closed and all quantities weren't considered for further transactions. * Fix codacy * Modify as per the review comment	2018-05-16 11:22:59 +05:30
rohitwaghchaure	e48b47fc0c	Production Plan, do not consider the sales orders against which work order has been created (#13800 ) * Production Plan, do not consider the sales orders against which work order has been created * Added test cases	2018-05-16 11:07:55 +05:30
rohitwaghchaure	9a0aea8abc	Merge pull request #14046 from shreyashah115/min-fix [Minor] Fixes for Customer DocType	2018-05-15 16:30:46 +05:30
Shreya	8e386167b8	Set Mandatory from client-side	2018-05-15 16:09:53 +05:30
Shreya	f636503dc1	[minor] Fix customer doctype	2018-05-15 15:57:27 +05:30
Saurabh	62a59301ef	[fix] resolved merge conflicts	2018-05-15 13:02:40 +05:30
Saurabh	2ca83d61ea	Resolve merge conflicts from enterprise_sprint branch	2018-05-14 21:15:46 +05:30
Zlash65	0a50554417	doctype level changes	2018-05-14 11:45:38 +05:30
Faris Ansari	f2b3307136	Remove escaped customer string (#13986 ) - no need to escape strings that are passed to the values parameter of the sql method - this query was failing for inputs like "D'Arby" which have quotes	2018-05-11 21:07:27 +05:30
Zarrar	f2df7f32fa	update subscription to auto_repeat across dashboards (#13956 )	2018-05-08 16:06:36 +05:30
Nabin Hait	fdc67a577f	Merge branch 'multi-company-transations' of https://github.com/shreyashah115/erpnext into shreyashah115-multi-company-transations	2018-05-07 13:12:16 +05:30
Nabin Hait	4bbe5fbefc	Fixes related to auto repeat	2018-05-05 12:32:59 +05:30
KanchanChauhan	f4feedace4	Allow changing of Address after Submit (#13747 )	2018-05-03 19:08:54 +05:30
Suraj Shetty	00cced12a0	Success Action (#13666 ) * success action config for sales invoice * remove "Notification Control" doctype and its usage * add default success action after_install or while migration (patch) * rename for_doctype to ref_doctype * case change * minor fix * Remove unnecessary code * Replace message with translatable message * Fix 'cannot import error'	2018-05-03 19:06:32 +05:30
Zarrar	6f3594b2e4	[Enhance] GL Entry - ability to multiselect party (#13769 ) * change dynamic link to multiselect field and improv * print based fix * refactor changes according to multiselect changes	2018-05-03 19:00:43 +05:30
Prateeksha Singh	a7c6ff8f3e	Merge pull request #13837 from shreyashah115/serial-batch-linking Serial No. and Batch No. linking	2018-05-02 15:11:19 +05:30
Shreya	7946ca216e	Internal Customer check in Customer	2018-05-02 14:34:14 +05:30
Shreya	eb54331d5f	removed color field from sales order and work order	2018-05-01 18:56:06 +05:30
Shreya	a7b2fc9250	color field for calendar in sales order and work order	2018-05-01 18:55:17 +05:30
Nabin Hait	3652a62b55	minor fixes	2018-04-30 19:32:29 +05:30
Shreya	a20157af17	on item, warehouse and batch triggers, fetch serial nos based on batch	2018-04-26 14:39:21 +05:30
Saurabh	2e7a45dbb4	resolved merge conflicts	2018-04-24 11:16:13 +05:30
Rohit Waghchaure	8441dd9184	[Fix] Item with special character not adding in the POS cart	2018-04-19 12:55:06 +05:30
tundebabzy	caae0f4dcc	Merge branch 'develop' into new-subscription	2018-04-17 09:34:04 +01:00
Nabin Hait	642d39098a	Fixed merge conflict	2018-04-13 14:38:57 +05:30
rohitwaghchaure	e72bde5159	Removed expired items from the list of POS items (#13582 )	2018-04-12 13:26:11 +05:30
Nabin Hait	c10e106f8f	Optimization related to large number of items (#13606 )	2018-04-12 13:25:03 +05:30
KanchanChauhan	4691af6348	Get Payment Schedule from Sales Order to Sales Invoice (#13497 )	2018-04-06 11:23:19 +05:30
Suraj Shetty	97d84eb509	remove apply user permission (#13505 )	2018-04-05 12:10:46 +05:30
Rohit Waghchaure	920a3ff0b8	[Fix] POS freeze when rate button pushed	2018-04-04 18:06:19 +05:30
Rohit Waghchaure	5e0cabc538	[Fix] POS not opening	2018-03-30 14:29:18 +05:30
rohitwaghchaure	68ba4fd697	[Fix] Multi-batch selection issue in POS (#13407 )	2018-03-28 12:33:15 +05:30
Nabin Hait	b9c82b9790	Fixed merge conflict	2018-03-27 14:25:27 +05:30
rohitwaghchaure	85f63a3866	[Fix] Showing to bill even if per deliverd in sales order is 99.9996 (#13392 )	2018-03-27 11:31:44 +05:30
rohitwaghchaure	c9a1eb1081	[Fix] Not able to delete row in modal table (#13377 )	2018-03-27 11:26:43 +05:30
Faris Ansari	34dd079a68	Remove unnecessary columns Analytics Reports (#13344 )	2018-03-22 11:12:02 +05:30
Zarrar	13ddc7e188	[ Enhance ] Production to Work Order (#12902 ) * remove occurrences of Production Order * rename from report and jsons * Change Production Order to Work Order * change occurences of production order from other files * resolve minor conflict issues and reports * patch added * codacy fix * updated patches, leftover changes * rename reports, rectify patches	2018-03-20 12:38:43 +05:30
Mark Walker	f572522f25	Copy source project into Purchase Order Item (#13321 )	2018-03-20 12:06:04 +05:30
Nabin Hait	bb5caf8fad	Merge branch 'master' into develop	2018-03-14 13:33:38 +05:30
Nabin Hait	363cedde76	Fixed minor issue	2018-03-14 13:32:14 +05:30
Nabin Hait	d21ad807b5	Merge branch 'master' into develop	2018-03-13 18:13:44 +05:30
Shreya Shah	7acc8cb747	fix else condition (#13295 )	2018-03-13 18:12:19 +05:30
Nabin Hait	3707242770	Fixed merge conflict	2018-03-13 16:15:41 +05:30
Nabin Hait	96f4b22589	Set po nos in DN and SI (#13290 )	2018-03-13 15:46:59 +05:30
tundebabzy	0125f7b130	rename to Subscription and transfer present Subscription records to Auto Repeat in frappe	2018-03-12 13:51:47 +01:00
Nabin Hait	5e63c265db	Fixed merge conflict	2018-03-09 17:34:39 +05:30
Suraj Shetty	f2d28ebd6a	Data import Tool bug fix (#13165 ) * fixes #13064 * commonified naming series checks * test fixes replaced test employee names according to naming series	2018-03-09 12:33:13 +05:30
Shreya Shah	aadd30d194	fetch delivery date on add-row only if item_code exists (#13250 )	2018-03-09 12:19:35 +05:30
Nabin Hait	c43c95e0aa	Fixed merge conflict	2018-03-05 14:54:44 +05:30
Zarrar	2550180a05	remove updating territory for customers on change (#13162 )	2018-03-05 12:32:41 +05:30
Manas Solanki	5fd7b3bb80	Fix status updater (#13033 ) * fix the status updater for multiple sources * patch for updating the status * patch for updating the sales order item * Update update_status_for_multiple_source_in_po.py	2018-03-05 11:28:29 +05:30
Nabin Hait	a645f36b2b	Get valuation rate from historical SLE even if it is zero (#13129 ) * Don't overwrite start and end date comes from payroll entry * Get valuation rate from historical SLE even if it is zero, if records exists * Valid till should be autoset if not any default value * Set status of expense claim based on is_paid check	2018-03-01 10:31:24 +05:30
Achilles Rasquinha	646522886c	self.assertEqual	2018-02-28 21:13:51 +05:30
Achilles Rasquinha	96698c9a77	Use range instead xrange (#13128 ) * Use range instead of xrange * convert float to int	2018-02-28 16:12:51 +05:30
Nabin Hait	3b43c0d160	Update territory and customer_group patch optimization (#13076 ) * Update territory and customer_group patch optimization * Update update_territory_and_customer_group.py	2018-02-27 15:57:14 +05:30
Zarrar	96002c28bd	optimize patch for faster execution (#13068 )	2018-02-27 15:57:01 +05:30
Zarrar	91fc1a8fbe	Update Territory & Customer Group across all transaction (#13004 ) * added method for update query based on changes * patch added * updated function, moved util function	2018-02-27 15:56:38 +05:30
Rohit Waghchaure	3edc101957	[Fix] POS discount issue	2018-02-26 13:25:58 +05:30
tundebabzy	9360f81b94	Validity of Quotation #12858 (#13078 ) * add new setting for default valid_till date * codacy cleanup	2018-02-26 12:23:41 +05:30
Nabin Hait	2572b05b35	Update territory and customer_group patch optimization (#13076 ) * Update territory and customer_group patch optimization * Update update_territory_and_customer_group.py	2018-02-25 10:45:24 +05:30
Zarrar	4a0d27078e	optimize patch for faster execution (#13068 )	2018-02-23 17:41:32 +05:30
Nabin Hait	7570774ebe	Merge branch 'master' into develop	2018-02-23 16:49:43 +05:30
Shreya Shah	d5b2e39f45	improve validation (#13058 )	2018-02-23 16:23:57 +05:30
Nabin Hait	cf72d7f135	Fixed merge conflict	2018-02-22 14:47:26 +05:30
Zarrar	79756c44c9	Update Territory & Customer Group across all transaction (#13004 ) * added method for update query based on changes * patch added * updated function, moved util function	2018-02-22 10:57:49 +05:30
Shreya Shah	8a77a0e1e4	Add total row in all trends reports (#13010 ) * total in sales order trends report * total in all trends reports	2018-02-21 14:46:07 +05:30
rohitwaghchaure	554f2de23d	Code cleanup online POS (#12985 )	2018-02-20 11:18:01 +05:30
Shreya Shah	5448318146	fix total field (#12992 )	2018-02-19 12:44:52 +05:30
Achilles Rasquinha	0bf19a1ac5	Merge pull request #12931 from achillesrasquinha/py3-iteritems Py3 iteritems	2018-02-15 13:49:43 +05:30
Achilles Rasquinha	1697a7aa81	replaced string_types with basestring	2018-02-15 11:39:45 +05:30
Achilles Rasquinha	714c7465fb	Updated Python 3 fixes	2018-02-15 11:31:05 +05:30
Saurabh	2735701aab	resolved merge conflicts	2018-02-14 11:51:09 +05:30
rohitwaghchaure	8e675ebbe2	[Fix] Price list exchange rate is not visible when base currency and price list currency is different (#12898 )	2018-02-13 17:11:06 +05:30
Faris Ansari	5a91989665	Remove total_projected_qty (#12889 )	2018-02-13 16:00:52 +05:30
saurabh-bhosale	ed35a296ab	closes #12872 (#12888 )	2018-02-13 14:40:59 +05:30
saurabh-bhosale	99eb30242d	[Fix] Bug fix in customer_primary_address frappe call (#12880 )	2018-02-13 07:58:47 +05:30
Nabin Hait	662b23ce57	get address display in customer	2018-02-12 19:25:00 +05:30
Nabin Hait	4adcced9ae	Merge branch 'show_address_in_online_pos' of https://github.com/mntechnique/erpnext into mntechnique-show_address_in_online_pos	2018-02-12 19:14:38 +05:30
Nabin Hait	e21e59614f	Fixed merge conflict	2018-02-12 15:59:55 +05:30
rohitwaghchaure	7477899d2e	Formatter, code cleanup (#12852 )	2018-02-12 11:25:58 +05:30
rohitwaghchaure	7e75165826	Merge branch 'develop' into fixes_12829	2018-02-09 12:01:41 +05:30
Saurabh	0f3c4fa7a7	Codacy fix - used classmethod decorator	2018-02-09 11:30:11 +05:30
Saurabh	c29f3c70dc	Merge branch 'develop' of https://github.com/frappe/erpnext into show_address_in_online_pos	2018-02-09 10:51:49 +05:30
Saurabh	b4ab89e1da	[Mod] Code refactored to remove dependency on 'complete_address' field	2018-02-09 10:49:30 +05:30
pawan	735b8c6094	[fix] #12829	2018-02-08 16:20:46 +05:30
Saurabh	ab8c7e616e	resolved merge conflicts	2018-02-08 15:17:15 +05:30
Saurabh	056c1709c6	Fixes #12810	2018-02-08 00:22:53 +05:30
Saurabh	0de0861bb4	Merge branch 'develop' of https://github.com/frappe/erpnext into show_address_in_online_pos	2018-02-08 00:10:49 +05:30
rohitwaghchaure	b553b7a69d	PDC Enhancements (#12462 )	2018-02-07 18:32:51 +05:30
Nabin Hait	c224d34a2c	Merge branch 'master' into develop	2018-02-07 16:07:20 +05:30
Saurabh	e26773d91e	Merge branch 'develop' of https://github.com/frappe/erpnext into show_address_in_online_pos	2018-02-05 17:05:29 +05:30
rohitwaghchaure	a4c40e0fd6	[Fix] After accesing POS page, it does not work when going back from another page (#12763 )	2018-02-05 12:24:06 +05:30
Nabin Hait	2ef1f84041	Fixed merge conflict	2018-02-03 09:14:53 +05:30
Saurabh	70d972d92e	[Mod] Added descriptions to alert about reselecting the option in 'primary_address_and_contact_detail'	2018-02-02 16:18:17 +05:30
rohitwaghchaure	cf6360d825	Merge pull request #12739 from jay-parikh/hotfix Enable/Disable Discount in POS using POS Profile #11748	2018-02-02 13:12:38 +05:30
Jay Parikh	2c95ab3897	Code fix for Enable/Disable Discount in POS using POS Profile #11748	2018-02-01 22:52:58 -08:00
Jay Parikh	171e5af995	Fixed indentation issue in pull # 11748	2018-02-01 21:39:20 -08:00
Jay Parikh	d4359faa31	Enable/Disable Discount in POS using POS Profile #11748	2018-02-01 04:26:24 -08:00
Rohit Waghchaure	d85247cd7a	[Fix] Pay button not working in pos	2018-02-01 17:18:38 +05:30
Saurabh	7c8d508e28	[Mod] Dependant on complete_address field and loads updated mobile_no,address in onload method	2018-02-01 14:40:49 +05:30
Saurabh	f16d45b0a0	Merge branch 'develop' of https://github.com/frappe/erpnext into show_address_in_online_pos Resolved Conflicts:erpnext/selling/doctype/customer/customer.json	2018-02-01 02:05:30 +05:30
Saurabh	9f5c2002ff	[Mod] Removed the Dependency on Frappe PR [Fix] Fixed a possible bug	2018-01-31 17:43:58 +05:30
Nabin Hait	ec2c9ec897	Merge branch 'master' into develop	2018-01-31 15:39:16 +05:30
rohitwaghchaure	2056ea6fb4	Update customer.js	2018-01-31 14:48:53 +05:30
saurabh-bhosale	0c9a99a953	Merge branch 'develop' into show_address_in_online_pos	2018-01-30 17:48:12 +05:30
Nabin Hait	585254456e	Check credit limit while making DN, if bypassed on SO (#12702 )	2018-01-30 12:11:22 +05:30
rohitwaghchaure	ce5b93ca77	[Fix] Allow user to edit rate in online POS (#12701 )	2018-01-30 10:39:46 +05:30
Saurabh	03f6b3e588	resolved merge conflicts	2018-01-29 16:25:33 +05:30
Andy Villiger	567623654b	Resolve issue #10914 - Error when making Sales Invoice (#12656 ) * Resolve issue #10914 An exception was raised when a Sales Order has been created to a Sales Invoice and one of the items had no Item Code. * Update sales_order.py	2018-01-26 11:11:19 +05:30
tundebabzy	f9b5c74871	set batch number only in Sales Invoice and Delivery Note	2018-01-25 19:21:05 +01:00
Saurabh	aaaf5c62b6	[Mod] Minor changes in 'primary_address' field's property	2018-01-25 17:28:57 +05:30
Saurabh	6614d8aa01	Multiple changes: [Mod] Added 'primary_address_and_contact_detail' in toggle_display [Mod] Added a description for 'primary_address_and_contact_detail'	2018-01-25 12:27:00 +05:30
Saurabh	5a2354149c	Merge branch 'develop' of https://github.com/frappe/erpnext into show_address_in_online_pos	2018-01-25 11:56:36 +05:30
Saurabh	cadd31cb0c	[Fix] Solves issue #12588	2018-01-24 16:38:22 +05:30
Saurabh	b665baec72	Used cint instead of int	2018-01-23 18:28:05 +05:30
Saurabh	a5c9fc3705	Removed commented code	2018-01-23 17:36:41 +05:30
Saurabh	cbbee47625	[Fix] Resolved the type issue of 'is_saved' flag variable	2018-01-23 17:23:27 +05:30
Saurabh	a2076a1ff0	Multiple changes: [Mod] Used async-await for asynchronous save in draft mode [Fix] Fixed bug that din't allow to submit a new POS Invoice	2018-01-23 17:23:26 +05:30
Saurabh	c5a6cf3a0e	[Mod] Allows print only when the check value exists and the cart isn't empty	2018-01-23 17:23:26 +05:30
Saurabh	32695a938f	[Mod] Refactored the code for fetching allow_print_before_pay check value	2018-01-23 17:23:26 +05:30
deepak-mnt	d7da89bf5a	[Fix] Resolved issues suggested by Codacy	2018-01-23 17:21:44 +05:30
deepak-mnt	8f3d394485	Minor changes:Removed extra spaces in py code	2018-01-23 17:21:44 +05:30
deepak-mnt	cc813d2286	[Mod] Ensured that a single POS Sales Invoice is created even when its printed(saved) in Draft mode	2018-01-23 17:21:44 +05:30
deepak-mnt	1ccb0cfa2f	[Mod] point_of_sale.js: Allowed print before pay and saved the invoice before print [New] test_point_of_sale.js: Test Cases to check the print before pay functionality in Online POS	2018-01-23 17:21:44 +05:30
deepak-mnt	29abe291c9	Allow draft mode print in online POS	2018-01-23 17:21:44 +05:30
Saurabh	24946ee4e0	Codacy fix	2018-01-20 04:28:35 +05:30
Saurabh	b664488d98	[Fix] Clears off the read-only fields in 'Primary Address and Contact Details' Section on blank link fields	2018-01-20 03:12:45 +05:30
Saurabh	24cae1cad6	Made Primary address field searchable and is displayed in Customer Link field options	2018-01-20 02:47:19 +05:30
Nabin Hait	570e29d5e7	Fixed merge conflict	2018-01-17 18:56:02 +05:30
Faris Ansari	4d4ce3e5cf	Rename enquiry_type to opportunity_type in MultiSelect dialog (#12517 )	2018-01-17 14:40:27 +05:30
Nabin Hait	2bfa1803e9	GL Entry on asset sale (#12514 ) * GL Entry on asset sale * Asset sale test case fixed	2018-01-17 14:39:05 +05:30

... 14 15 16 17 18 ...

3110 Commits