17430 Commits

Author	SHA1	Message	Date
Rohit Waghchaure	7e02e1c3cd	fix: not able to cancel maintenance visit	2019-02-19 22:53:31 +05:30
deepeshgarg007	1b04534095	fix: Removed duplicate fields from BOM Item	2019-02-19 21:36:12 +05:30
deepeshgarg007	942c894f93	fix: fetch item name in item dashboard	2019-02-19 19:51:23 +05:30
Rohit Waghchaure	f4049f9dfd	fix: user progress issue	2019-02-19 19:46:14 +05:30
Rohit Waghchaure	389cd6ad63	fix: stop button not working in material request	2019-02-19 19:18:07 +05:30
Sagar Vora	cc6e51c62d	Merge branch 'master' into develop	2019-02-19 18:09:49 +05:30
Sagar Vora	f5c511c193	bumped to version 11.1.7	2019-02-19 18:14:14 +05:50
Nabin Hait	2c23f98b65	Merge pull request #16721 from nabinhait/ar-ap-fix ... fix: AR/AP report based on account type	2019-02-19 17:45:30 +05:30
Gaurav	3f046136d4	fix(regional,italy): added state code on address, updated patch ... moved state codes to init, rewired patch added logic to autoset state code on address validate handled multiple names for Italy refactored validate_address_italy to validate_address	2019-02-19 17:28:36 +05:30
Nabin Hait	e4f73929c4	fix: AR/AP report based on account type	2019-02-19 17:11:50 +05:30
Nabin Hait	8e9d947527	Merge branch 'hotfix' into fix-item-variant-settings-barcodes	2019-02-19 15:07:46 +05:30
Nabin Hait	21706894af	Merge pull request #16705 from deepeshgarg007/pos-precision ... fix: Fetch precision form system settings in Sales invoice payment(POS)	2019-02-19 15:06:56 +05:30
Nabin Hait	818ead4041	Merge branch 'hotfix' into purchase-qty-fix	2019-02-19 15:06:10 +05:30
Nabin Hait	157526c978	Merge pull request #16711 from rohitwaghchaure/multi_uom_not_working_for_rate_pricing_rule ... fix: multi-uom not working for the pricing rule rate	2019-02-19 15:05:07 +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
Gaurav	2670ad7eb2	mod(regional,italy): adjusted calculation logic for charges ... validation for missing code on mode of payment UOM from settings Replace str with cstr	2019-02-19 13:15:25 +05:30
Gaurav	f1e28e0e8d	mod(regional,italy): Updates to Italian Localization ... fixes: removed cleanup_files from italy/utils removed extract_doc_number from italy/utils added country filter to italian localization patch replaced dict assignment with dot operator in prepare_invoice correcions in e-invoice xml following changes in prepare_invoice added setup_report in patch added section for e-invoicing custom fields in company added Italy in test_company	2019-02-19 10:39:22 +05:30
Gaurav	a4aa80fe05	feature(regional): Italian Localization ... Added setup.py for italy under regional Included fiscal regimes, tax exemption reasons and custom fields Issue #16259	2019-02-19 10:39:10 +05:30
Jigar Tarpara	1ac17ec1c4	Add credit month in validation	2019-02-19 10:21:01 +05:30
deepeshgarg007	de0f59b818	fix: Removed precision from multiple doctypes	2019-02-19 08:40:16 +05:30
Rohit Waghchaure	5821b672ad	fix: multi-uom not working for the pricing rule rate	2019-02-18 20:07:44 +05:30
Nabin Hait	750fe6eaea	fix: get item rate in bom	2019-02-18 18:56:08 +05:30
deepeshgarg007	9a19e06856	fix: Change Received qty to accepted qty and validation for indicators	2019-02-18 18:42:15 +05:30
Rohit Waghchaure	99e7362006	fix: Allow to make material request from draft job card	2019-02-18 18:26:50 +05:30
deepeshgarg007	48a7262fae	fix: Precision issue in POS payment	2019-02-18 15:05:36 +05:30
Anurag Mishra	879e5fd8bb	remove print and codacy	2019-02-18 14:43:55 +05:30
Anurag Mishra	42a106c7ba	Auditors print formats	2019-02-18 14:35:33 +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
Anurag Mishra	61f981ae05	Changes Requested	2019-02-18 11:43:32 +05:30
Rushabh Mehta	f3b33f3ab2	Merge pull request #16611 from karthikeyan5/hotfix-marketplace-features ... feat(marketplace): seller profile page	2019-02-18 11:24:01 +05:30
Rushabh Mehta	1a6668ef3c	Merge pull request #16633 from pratu16x7/explore-2.0 ... feat(modules): Add getting started and help desk, merge settings	2019-02-18 11:20:14 +05:30
Rushabh Mehta	39c106dd05	fix(test): rename test in test_customer	2019-02-18 11:16:59 +05:30
Suraj Shetty	053d6a2ca1	Move reload doc before get query	2019-02-17 11:24:51 +05:30
Suraj Shetty	3a2f342ac1	Ignore duplicate entry	2019-02-16 21:09:24 +05:30
Suraj Shetty	1399fbe986	Move patch	2019-02-16 21:02:34 +05:30
Suraj Shetty	8cbe824c5b	Rerun item_barcode_chidtable_migrate patch	2019-02-16 17:54:15 +05:30
Suraj Shetty	cc0222a28a	Remove unwanted barcode field from item	2019-02-16 17:53:23 +05:30
Rushabh Mehta	7bb9eae685	Merge pull request #16541 from alyf-de/develop ... feat(regional): Germany module with address template	2019-02-16 10:54:28 +05:30
Frappe Bot	74fd5daeb2	Merge branch 'master' into develop	2019-02-15 10:22:33 +00:00
Frappe Bot	acf26c8569	bumped to version 11.1.6	2019-02-15 10:22:32 +00:00
Faris Ansari	8a01342e48	fix: Remove comment	2019-02-15 15:14:38 +05:30
Nabin Hait	09a4df74f0	Merge pull request #16645 from nabinhait/tds-fix ... fix: Ignore tds account while creating tax withholding category	2019-02-15 14:53:30 +05:30
Nabin Hait	eb0627356b	Merge pull request #16650 from nabinhait/general-ledger-fix ... fix: show values in account/party currency based in actual entry, no conversion	2019-02-15 14:53:12 +05:30
Nabin Hait	b5c249583a	Merge pull request #16651 from netchampfaris/fix-barcode-scanning-ux ... fix: Barcode scanning UX	2019-02-15 14:52:42 +05:30
Nabin Hait	b819f104e6	Merge pull request #16653 from nabinhait/item-variants ... fix: Enqueued item variants updation if there are more than 30 variants	2019-02-15 14:51:14 +05:30
Nabin Hait	c45962e3ef	Merge pull request #16675 from deepeshgarg007/purchase-fix ... fix: Purchase order item description fix	2019-02-15 14:50:38 +05:30
Nabin Hait	aa80a223d8	Merge pull request #16674 from deepeshgarg007/address-rep-fix ... fix: Address and contact report	2019-02-15 14:26:16 +05:30
Nabin Hait	8788a5c712	Merge pull request #16676 from nabinhait/get-item-details ... fix: get item details	2019-02-15 14:24:46 +05:30
Nabin Hait	b1cbe221b7	Merge pull request #16677 from nabinhait/total-qty-patch-fix ... fix: Consider parenttype while updating total qty in transactions	2019-02-15 14:24:30 +05:30
Nabin Hait	a0c9c7501b	Update update_total_qty_field.py	2019-02-15 14:24:08 +05:30
Tropicalrambler	3a88bc43dc	fix: typo in salary register report field name (#16670) ... When assigning salary slip field values to row list for salary register, line 22, the field was incorrectly spelled. The correct value in the Salary Slip DocType is `leave_without_pay`, and this change reflects this. Line 27 also reflects this adjustment.	2019-02-15 13:40:44 +05:30
Sagar Vora	379e6a4635	Merge branch 'hotfix' into address-rep-fix	2019-02-15 13:08:42 +05:30
Nabin Hait	4df7679c65	fix: Get outstanding invoices	2019-02-15 13:08:04 +05:30
Sagar Vora	ebdd8a9710	Merge branch 'hotfix' into purchase-fix	2019-02-15 13:04:32 +05:30
Sagar Vora	921f468950	Merge branch 'hotfix' into get-item-details	2019-02-15 13:03:04 +05:30
Nabin Hait	6f7a4d94ce	fix: Consider parenttype while updating total qty in transactions	2019-02-14 19:34:43 +05:30
Nabin Hait	f66c6874ca	Merge pull request #16652 from nabinhait/work-order-fix ... fix: Make work order from production plan considering already ordered qty	2019-02-14 18:50:30 +05:30
Nabin Hait	54f8ed1282	Merge branch 'hotfix' into item-variants	2019-02-14 18:50:11 +05:30
Nabin Hait	c3698e458f	Merge pull request #16666 from nabinhait/deferred-revenue-fix ... fix: errors in deferred revenue booking	2019-02-14 18:49:01 +05:30
Nabin Hait	1c6a1dd5c0	Merge branch 'hotfix' into general-ledger-fix	2019-02-14 18:37:40 +05:30
Nabin Hait	0d1ccc357f	fix: get item details	2019-02-14 18:30:10 +05:30
deepeshgarg007	867ca63750	fix: Purchase order item description fix	2019-02-14 18:10:47 +05:30
Deepesh Garg	20008946a3	Merge branch 'hotfix' into address-rep-fix	2019-02-14 17:37:41 +05:30
Deepesh Garg	4902f7b2a0	fix: Show tasks in timesheet with status as Closed (#16660)	2019-02-14 17:32:52 +05:30
deepeshgarg007	34f4f24e21	fix: Address and contact report	2019-02-14 17:26:49 +05:30
Nabin Hait	29fcb14c42	fix: errors in deferred revenue booking	2019-02-13 17:18:12 +05:30
Deepesh Garg	4d1bc0ca85	fix: Add total row in analytics report (#16648)	2019-02-13 16:58:46 +05:30
Anurag Mishra	4f0fd38209	refractor	2019-02-13 16:46:05 +05:30
Faris Ansari	a748ca69e7	fix: Validate invalid fields in Item Variant Settings ... - Some fields like barcodes cannot be copied in Item Variants - Wrote a patch that deletes the fields if they exist - Also, validate in controller	2019-02-13 13:02:39 +05:30
rohitwaghchaure	a0aaeafae8	Merge pull request #16644 from rohitwaghchaure/fix_work_order_time_log_msg ... fix: validation message for work order	2019-02-13 09:49:25 +05:30
Faris Ansari	795102125c	Merge branch 'hotfix' into fix-barcode-scanning-ux	2019-02-12 18:31:06 +05:30
Nabin Hait	db527bfb24	fix: Enqueued item variants updation if there are more than 30 variants	2019-02-12 18:30:00 +05:30
Nabin Hait	1a3c27bbea	fix: Make work order from production plan considering already ordered qty	2019-02-12 17:38:37 +05:30
Faris Ansari	5631ffca68	fix: Barcode scanning UX	2019-02-12 17:12:48 +05:30
Sagar Vora	551f52fd25	Merge branch 'master' into develop	2019-02-12 16:41:24 +05:30
Nabin Hait	6447069e50	fix: show values in account/party currency based in actual entry, no conversion	2019-02-12 16:41:20 +05:30
Sagar Vora	6837ae3377	bumped to version 11.1.5	2019-02-12 16:54:29 +05:50
karthikeyan5	4324dc6ea8	fix(marketplace): fixing hubmarket server specific error	2019-02-12 15:12:23 +05:30
karthikeyan5	4df6003bd9	feat(marketplace): seller profile page	2019-02-12 15:12:23 +05:30
karthikeyan5	2894f7935a	feat(marketplace): featured Items for sellers	2019-02-12 15:12:23 +05:30
karthikeyan5	88baf53cc1	feat(marketplace): navigation link to seller profile from item page	2019-02-12 15:12:23 +05:30
Nabin Hait	fdefbdb23b	Merge pull request #16609 from nabinhait/multipel_fixes ... Multiple fixes	2019-02-12 13:56:06 +05:30
Prateeksha Singh	426468183f	fix(getting_started): main domain specific masters	2019-02-12 13:08:21 +05:30
Nabin Hait	c46d995480	Merge pull request #16628 from Zlash65/fix-noti-patch ... fix: Notification Control delete	2019-02-12 13:04:45 +05:30
Nabin Hait	e6abee4bd5	Merge pull request #16643 from Zlash65/field-fix ... fix: Fieldtype and Fetch From fixes	2019-02-12 13:04:00 +05:30
Nabin Hait	ca536efe7b	Merge pull request #16640 from nabinhait/pur_reg_fix ... fix: show project even if PI is directly created	2019-02-12 13:01:18 +05:30
Deepesh Garg	da7c20e474	fix: Validate task dates in project (#16586) ... * fix: Validate task dates in project * fix: Test case fix and validation only if date exists * fix: Added dates in error messages	2019-02-12 12:55:50 +05:30
Rohit Waghchaure	e0412a177c	fix: validation message for work order	2019-02-12 11:47:16 +05:30
Zlash65	fc88029d7d	fix: fix item field for clinical procedure template	2019-02-12 11:38:27 +05:30
Zlash65	b614fb1d45	fix: make finance book field as link field and rectify fetch_from	2019-02-12 11:30:58 +05:30
Nabin Hait	afef9c1cc7	fix: Ignore tds account while creating tax withholding category	2019-02-12 11:28:20 +05:30
Zlash65	fd3998cfc9	fix: make branch as link field	2019-02-12 11:27:23 +05:30
Prateeksha Singh	9adad2988d	feat(getting_started): Minimum requirements to setup	2019-02-12 08:37:53 +05:30
Prateeksha Singh	08a6de6b41	fix(modules): shorten descriptions	2019-02-12 07:41:52 +05:30
Nabin Hait	ab50211e18	fix: show project even if PI is directly created	2019-02-11 18:25:18 +05:30
Anurag Mishra	aaa57026ac	Merge branch 'gross-and-net-profit-report' of https://github.com/Anurag810/erpnext into gross-and-net-profit-report	2019-02-11 17:02:59 +05:30
Anurag Mishra	f70d4089bc	fix: codacy	2019-02-11 17:02:20 +05:30
Sagar Vora	4e92414850	Merge branch 'hotfix' into gross-and-net-profit-report	2019-02-11 16:00:28 +05:30
sahil28297	1a7e438fb2	fix(pstch): allow duplicate entries (#16632)	2019-02-11 15:53:04 +05:30
Rohan Bansal	d635f722fc	fix(stock_balance): Make balance qty and value columns more visible	2019-02-11 15:22:01 +05:30
Prateeksha Singh	9d4a183074	fix(modules): Merge Settings into one, Setup --> Settings	2019-02-11 15:14:50 +05:30
rohitwaghchaure	d95c8cfac3	Merge pull request #16621 from netchampfaris/fix-warehouse-currency ... fix: Set company_currency for Warehouse Tree	2019-02-11 14:58:02 +05:30
Prateeksha Singh	01a045a488	feat(modules): Add getting started and help desk	2019-02-11 14:01:04 +05:30
Anurag Mishra	a032f0528e	new report gross-and-net-profit-report	2019-02-11 13:12:44 +05:30
Zlash65	a206f06af9	delete notification control's docctype entry	2019-02-11 12:01:01 +05:30
Nabin Hait	bb6438af5a	Merge pull request #16537 from nabinhait/stock-balance-fix ... fix: Fixed error on stock balance report	2019-02-11 11:00:01 +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
Faris Ansari	453964728d	fix: Set company_currency for Warehouse Tree	2019-02-09 20:27:42 +05:30
Nabin Hait	17e0513270	fix: message if stock reco is enqueued	2019-02-08 16:56:26 +05:30
Nabin Hait	8d4bb3e327	fix: backflush only if transferred item is present in work order	2019-02-08 16:56:26 +05:30
Nabin Hait	450fe309d6	fix: allow updating title of material request	2019-02-08 16:56:26 +05:30
Nabin Hait	e3b0f4f9f6	fix: removed account type filter on employee advance account	2019-02-08 16:56:26 +05:30
Nabin Hait	27af6b377f	fix: defered accounting fixes	2019-02-08 16:56:26 +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
Aditya Hase	e53a6a6723	Merge branch 'develop' into fix-py3	2019-02-08 12:51:05 +05:30
Nabin Hait	208ce5dcea	fix: removed module type for learn	2019-02-08 12:25:30 +05:30
Aditya Hase	13808b4cc9	fix(py3): Convert to float before comparison	2019-02-08 12:03:25 +05:30
Aditya Hase	2a3c39f38a	fix(py3): Convert dict.values() to list for indexing	2019-02-08 12:02:57 +05:30
Aditya Hase	46d7456782	fix(py3): Convert list to filter for indexing	2019-02-08 12:02:14 +05:30
Prateeksha Singh	e31cdb5b85	fix(modules): add ERPNext settings module	2019-02-08 08:06:23 +05:30
Aditya Hase	a86a569787	fix(py3): Convert dict.values() to list for indexing	2019-02-07 22:21:06 +05:30
Aditya Hase	3e954734d0	fix(py3): Convert filter to list for indexing	2019-02-07 22:21:05 +05:30
Aditya Hase	6e1bb60b58	fix(py3): Convert filter to list for indexing	2019-02-07 22:21:05 +05:30
Aditya Hase	e1f867f29f	fix(py3): Explicitly convert to float for comparison	2019-02-07 22:21:05 +05:30
Aditya Hase	d9ce732d3e	fix(py3): Explicitly convert to float for comparison	2019-02-07 22:21:05 +05:30
Aditya Hase	a9f20d801d	Merge pull request #16599 from adityahase/python3-fix ... fix(py3): Use six.text_type instead of unicode	2019-02-07 22:20:41 +05:30
Aditya Hase	691c166a56	fix(py3): Use six.text_type instead of unicode	2019-02-07 20:35:52 +05:30
Aditya Hase	0b1dc32fcb	Merge pull request #16597 from adityahase/python3-fix ... fix(py3): Use range instead of xrange	2019-02-07 18:17:37 +05:30
Aditya Hase	b9dc031e86	fix(py3): Use range instead of xrange	2019-02-07 18:10:30 +05:30
Prateeksha Singh	3423407314	feat(module_links): rearrange links	2019-02-07 09:58:22 +05:30
Prateeksha Singh	9b14d46c1d	purge(modules): remove old desktop icon configs	2019-02-07 09:58:22 +05:30
Prateeksha Singh	063af4ed08	config(modules): Rearrange links	2019-02-07 09:58:22 +05:30
Prateeksha Singh	b5eb16faeb	feat(config): add some onboarding cues	2019-02-07 09:58:22 +05:30
Prateeksha Singh	ce27cffaad	refactor(desk_icon): Remove reference and patches to Desktop Icon	2019-02-07 09:58:21 +05:30
Prateeksha Singh	2c14704398	feat(modules): Add Retail module, update others	2019-02-07 09:57:10 +05:30
Prateeksha Singh	7cd6ebeb6d	feat(explore_page): rearrange links	2019-02-07 09:57:10 +05:30
Raffael Meyer	ff878c0c1d	fix formatting and names	2019-02-07 03:28:27 +01:00
Faris Ansari	504f317434	fix: BOM Stock Calculated Report (#16585) ... - Cast null values to 0 to avoid mathematic errors	2019-02-07 07:15:38 +05:30
Faris Ansari	8ae5dbcac8	fix: Set barcode in Item row after scanning barcode (#16591)	2019-02-07 07:09:49 +05:30
Himanshu	088886e082	Remove illegal character after break (#16589)	2019-02-07 07:09:20 +05:30
Sagar Vora	da1dc7fa52	Merge branch 'master' into develop	2019-02-05 18:40:39 +05:30
Sagar Vora	8aa34a0ce0	bumped to version 11.1.4	2019-02-05 19:00:38 +05:50
karthikeyan5	4cb0a250a0	fix(marketplace): bug in filtering menu_items ... > UX improvment for incomplete feature	2019-02-05 18:07:48 +05:30
Nabin Hait	efff826e15	Merge pull request #16556 from nabinhait/payroll-cost-center ... fix: Don't force fetch cost center from company in payroll entry	2019-02-05 13:32:16 +05:30
Nabin Hait	8a46df5c4b	Removed duplicate fields	2019-02-05 13:31:32 +05:30
Nabin Hait	38b05a1296	fix: Set default cost center in payroll entry	2019-02-05 10:46:41 +05:30
Nabin Hait	294319e71b	fix: Don't force fetch cost center from company in payroll entry	2019-02-05 10:37:41 +05:30
Nabin Hait	ad69e29334	Merge pull request #16548 from nabinhait/stock-balance-item ... fix: Fetch data based on item group filter in item dashboard stock balance report	2019-02-05 10:36:47 +05:30
Nabin Hait	1c288ca4ab	Merge pull request #16558 from deepeshgarg007/production_plan ... fix: Validation while getting raw materials for production in Production Plan	2019-02-05 10:35:16 +05:30
Nabin Hait	fe6f1ad244	Update production_plan.py	2019-02-05 10:34:58 +05:30
Nabin Hait	d4e029665c	Merge pull request #16569 from nabinhait/salary-allow-on-submit ... fix: Allow-on-submit enabled for formula and condition in salary structure	2019-02-05 10:31:24 +05:30
Nabin Hait	b6d2c7eb80	Merge pull request #16570 from saurabh6790/jinja_injection_fix ... fix: access request parameter directly	2019-02-05 10:31:08 +05:30
Nabin Hait	7b93e738ad	Merge pull request #16576 from nabinhait/pay_reco_fix ... fix: Optimising payment reconciliation queries	2019-02-05 10:28:03 +05:30
Nabin Hait	025e780f31	Merge pull request #16575 from rohitwaghchaure/fixed_job_card_not_working ... fix: job card not working if transfer against work order	2019-02-05 10:27:12 +05:30
Nabin Hait	ac18498ca5	fix: Optimising payment reconciliation queries	2019-02-04 21:13:43 +05:30
Rohit Waghchaure	780c6b0d77	fix: job card not working if transfer against work order	2019-02-04 21:04:48 +05:30
Chinmay Pai	125505f2aa	fix(purchase_invoice): fix undefined variable ... fixes issue while creating purchase invoice Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>	2019-02-04 16:30:20 +05:30
Saurabh	bbebceb31a	fix: access request parameter directly	2019-02-04 15:56:23 +05:30
Nabin Hait	ff05ee50e0	fix: Allow-on-submit enabled for formula and condition in salary structure	2019-02-04 14:42:57 +05:30
Deepesh Garg	d442d06947	Update production_plan.py	2019-02-03 12:45:20 +05:30
dgarg007	f667cff5a6	fix: Validation while getting raw materils for production in Production Plan	2019-02-02 21:57:00 +05:30
Saif Ur Rehman	590491779a	Merge branch 'develop' of https://github.com/frappe/erpnext.git into Brand-Item-Defaults-V12 ... # Conflicts: # erpnext/stock/doctype/item/item.py	2019-02-02 02:49:04 +05:00
Saif Ur Rehman	00aaa48779	test(Item): test_item_defaults	2019-02-02 02:43:44 +05: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
Saif Ur Rehman	c8b61007b0	Merge branch 'master' of https://github.com/frappe/erpnext.git into Brand-Item-Defaults ... # Conflicts: # erpnext/setup/doctype/brand/brand.json # erpnext/stock/get_item_details.py	2019-02-01 17:05:46 +05:00
Saurabh	aba611e09f	Merge branch 'hotfix' into project_status_email_fix	2019-02-01 15:01:26 +05:30
Nabin Hait	e1c75a9d55	fix: fixed salary structure assignment patch (#16546) ... * fix: fixed salary structure assignment patch * fix: patch	2019-02-01 12:25:40 +05:30
Nabin Hait	f3f4ce9b87	fix: Fetch data based on item group filter in item dashboard stock balance report	2019-02-01 12:01:19 +05:30
Rohit Waghchaure	a4645b6d17	fix: check open status projects for project status update	2019-02-01 11:37:22 +05:30
Raffael Meyer	fef07eeae2	Merge remote-tracking branch 'upstream/develop' into develop	2019-01-31 22:16:26 +01:00
Sagar Vora	ec5faaeae6	Merge branch 'hotfix' into stock-balance-fix	2019-01-31 18:46:06 +05:30
Nabin Hait	9ea19b8fe1	fix: Fixed error on stock balance report	2019-01-31 15:53:25 +05:30
Sagar Vora	56cbfe4bb0	Merge branch 'master' into develop	2019-01-31 13:34:32 +05:30
Sagar Vora	fea55fc018	bumped to version 11.1.3	2019-01-31 13:53:07 +05:50
Nabin Hait	a85f008f30	Merge pull request #16528 from adityahase/payment-request-usability ... fix(accounts): fetch subscription details only if required fields are populated	2019-01-31 10:27:27 +05:30
Sagar Vora	7ea2497b9a	Fix salary patch (#16531) ... fix: salary structure assignment patch, add .vscode to gitignore	2019-01-31 09:17:29 +05:30
Sagar Vora	76728b87ab	fix: value missing for selling settings - sales_update_frequency (#16530)	2019-01-31 08:19:38 +05:30
Sagar Vora	7a1c40c7c1	Merge branch 'master' into develop	2019-01-30 20:09:45 +05:30
Sagar Vora	664e21acbf	bumped to version 11.1.2	2019-01-30 20:29:45 +05:50
Aditya Hase	245b73b94f	fix(search): Fix possible reflected XSS attack vector (#16522)	2019-01-30 19:56:04 +05:30
Aditya Hase	66833f109b	fix(accounts): fetch subscription details only if required fields are populated	2019-01-30 19:40:40 +05:30
Nabin Hait	78fc158b39	Merge pull request #16527 from nabinhait/bom-fix ... fix: Default value for 'raw materials rate based on' in BOM	2019-01-30 18:35:49 +05:30
Saurabh	429996752d	fix: patch fixes (#16524)	2019-01-30 17:45:48 +05:30
Nabin Hait	16d7b49d73	fix: Default value for 'raw materials rate based on' in BOM	2019-01-30 17:27:08 +05:30
Saurabh	a342138625	Merge branch 'master' into develop	2019-01-30 12:38:58 +05:30
Saurabh	bb2031941e	bumped to version 11.1.1	2019-01-30 13:08:00 +06:00
Saurabh	5c12490709	fix: patch to add guardian role if not exists	2019-01-30 11:52:53 +05:30
rohitwaghchaure	25e63e806c	fix: modified date (#16520)	2019-01-30 11:46:34 +05:30
Sagar Vora	1c44a6a0ba	fix: set version to 11.1.0, remove staging_version	2019-01-29 18:52:50 +05:30
Sagar Vora	f97c5dad82	Merge branch 'staging' into develop	2019-01-29 18:39:14 +05:30
Sagar Vora	1a4cd3b66a	bumped to version 11.1.0	2019-01-29 18:46:34 +05:50
Sagar Vora	606bd37316	fix: change changelog version to 11.1.0	2019-01-29 17:55:46 +05:30
Sagar Vora	b5dda63ddd	fix: change changelog version to 11.1.0	2019-01-29 17:54:47 +05:30
Sagar Vora	51a27b3524	fix: unsaved merge conflict	2019-01-29 17:52:47 +05:30
Sagar Vora	f3cfad7595	Merge branch 'master' into staging-fixes	2019-01-29 17:20:46 +05:30
Sagar Vora	b32d9458b5	bumped to version 10.1.81	2019-01-29 17:30:19 +05:50
Nabin Hait	f8e9734f16	Merge pull request #16514 from sagarvora/changelog ... docs: changelog for v11.0.4	2019-01-29 16:27:07 +05:30
rohitwaghchaure	a95ed44d3d	fix: test case for fiscal year (#16516)	2019-01-29 16:24:53 +05:30
Nabin Hait	9f33c208d7	Update v11_0_4.md	2019-01-29 16:07:07 +05:30
Sagar Vora	7ef69b68f8	Update v11_0_4.md	2019-01-29 15:52:57 +05:30
Nabin Hait	cc41b876fb	Merge pull request #16497 from nabinhait/bom_price ... BOM raw materials price	2019-01-29 14:58:40 +05:30
Sagar Vora	115a252f55	docs: changelog for v11.0.4	2019-01-29 14:40:10 +05:30
Nabin Hait	4e45663297	fix(stock): get item price based on party	2019-01-29 14:02:08 +05:30
Sagar Vora	8f6509fa9a	Merge branch 'staging-fixes' into fiscal_year_should_always_be_for_12_months	2019-01-29 13:04:20 +05:30
Sagar Vora	9520e345bd	fix: better error messages	2019-01-29 13:03:46 +05:30
Nabin Hait	1df9a23e7b	Merge pull request #16513 from rohitwaghchaure/remove_zero_qty_items_on_click_os_pay ... feat: on click of pay button and on focus out of qty field remove the zero qty items from the cart	2019-01-29 13:02:56 +05:30
Rohit Waghchaure	07f75a3e54	feat: on click of pay button and on focus out of qty field remove the zero qty items from the cart	2019-01-29 13:00:18 +05:30
Rohit Waghchaure	a8e743e3c4	fix: fiscal year always be for 12 months	2019-01-29 12:55:04 +05:30
Nabin Hait	6f7cc8b186	Merge pull request #16505 from deepeshgarg007/pos_issue ... feat: Enhancement in POS functionality	2019-01-29 12:51:00 +05:30
Nabin Hait	82421e24f6	Merge branch 'develop' into usregional	2019-01-29 12:14:11 +05:30
Nabin Hait	25cb13c0f8	Merge pull request #16508 from navdeepghai1/salary-slip-net-pay-fixes ... fix(human resources): gross pay calculation issue	2019-01-29 12:08:11 +05:30
Nabin Hait	7fc9825954	Merge pull request #16368 from ESS-LLP/pr_staging_fixes_2 ... feat: List Active Healthcare Practitioner	2019-01-29 11:52:55 +05:30
Nabin Hait	8ba9545b72	Merge pull request #16498 from nabinhait/stock-ledger-report ... fix(stock): Escaping issue in stock ledger report	2019-01-29 11:30:15 +05:30
Deepesh Garg	a8cc4b105d	Merge branch 'staging-fixes' into pos_issue	2019-01-29 11:29:41 +05:30
Nabin Hait	3b8623e207	Merge pull request #16491 from adityahase/ar-fix ... fix(ar-summary): Changes to column list to match recent changes	2019-01-29 11:28:02 +05:30
Nabin Hait	1467962f8a	Merge pull request #16490 from nabinhait/gst_settings_perm ... GST Settings permission and regional taxes creation	2019-01-29 11:27:18 +05:30
Nabin Hait	ff2922cbbb	Merge pull request #16488 from deepeshgarg007/price_list ... fix(sales_invoice): fetch customer price list if available before pos price list	2019-01-29 11:24:22 +05:30
Nabin Hait	7c0fbfab0a	Merge pull request #16482 from pipech/staging-fixes ... fix(Stock Entry): "Select Serial Numbers" dialog won't fill mandatory field	2019-01-29 11:23:05 +05:30
Nabin Hait	3ccc16e4e0	Merge pull request #16449 from scmmishra/remove-foundation ... feat: Deprecated In App Help	2019-01-29 11:20:23 +05:30
Nabin Hait	e8190473f5	Merge branch 'staging-fixes' into unicode	2019-01-29 11:13:04 +05:30
Nabin Hait	1c5d681f65	Merge pull request #16500 from scmmishra/v10-remove-docs ... feat: [v10] Deprecate In App Help	2019-01-29 11:05:25 +05:30
Nabin Hait	8fae0b3017	Merge pull request #16242 from rohitwaghchaure/is_fixed_asset_checkbox_not_copied ... [Fix] Is fixed asset checkbox not checked if user duplicate the existing invoice	2019-01-29 11:03:44 +05:30
Nabin Hait	b44b200e7c	Merge branch 'hotfix' into fix-scorecard	2019-01-29 11:00:07 +05:30
Aditya Hase	9acb885e60	fix(sqli): Avoid SQL Injection with sender param (#16509)	2019-01-29 10:52:37 +05:30
Navdeep Ghai	ec570026e1	Merge branch 'hotfix' into salary-slip-net-pay-fixes	2019-01-29 09:12:37 +04:00
Nabin Hait	385e3bb284	Merge pull request #16446 from Zlash65/jv-fix ... fix(accounts): wrong filters sent to fetch reference name in Journal Entry	2019-01-29 10:41:15 +05:30
navdeepghai1	92bb84aa70	Changed static precision(2) value to system setting currency_precision value	2019-01-28 16:54:58 +04:00
deepeshgarg007	f0cfe98860	fix: Added missing semicolon and removed null from parameter	2019-01-28 17:58:44 +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
Sagar Vora	a1a946fcd6	Merge branch 'hotfix' into fix-scorecard	2019-01-28 12:20:55 +05:30
navdeepghai1	aac404a155	Fixed net_pay calculation issue	2019-01-28 10:42:16 +04:00
Raffael Meyer	1f72b44f12	add german module with address template	2019-01-27 23:32:41 +01:00
deepeshgarg007	4e4b200972	Merge branch 'staging-fixes' of https://github.com/frappe/erpnext into pos_issue	2019-01-27 22:54:34 +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
scmmishra	1b63fa1920	[fix] Formatting issues	2019-01-25 20:45:04 +05:30
scmmishra	e1f5d22a02	[fix] Code formatting, removed trailing spaces	2019-01-25 20:45:04 +05:30
scmmishra	000e216354	[feat] Added docsUrl variable to configure help_links	2019-01-25 20:44:45 +05:30
scmmishra	0be2aa33ac	[fix] Links now redirect to erpnext.com	2019-01-25 20:41:54 +05:30
scmmishra	c6c1628c8a	[feat] Modified help config	2019-01-25 20:41:54 +05:30
Nabin Hait	1187d61b56	fix(stock): Escaping issue in stock ledger report	2019-01-25 17:07:29 +05:30
deepeshgarg007	76556e1a3e	Merge branch 'staging-fixes' of https://github.com/frappe/erpnext into price_list	2019-01-25 16:50:06 +05:30
deepeshgarg007	8c84b7b888	fix: Doctype Name correction	2019-01-25 16:44:45 +05:30
deepeshgarg007	49cca7ac76	fix: Customer based price_list in online POS	2019-01-25 16:41:01 +05:30
Nabin Hait	01ca3e5e36	fix(manufacturing): Get raw materials rate from price list ignoring party	2019-01-25 16:25:15 +05:30
Nabin Hait	3476a457ad	fix: minor	2019-01-25 16:22:36 +05:30
Saif Ur Rehman	392d019bd0	fix(Item Tax Patch): Converted global variables to local	2019-01-25 15:09:43 +05:00
Shivam Mishra	67c338fd51	[fix] Fixed links ... Previous commit missed the links starting with `http://`	2019-01-25 15:17:44 +05:30
scmmishra	f44dfb1582	[fix] Formatting issues	2019-01-25 14:56:30 +05:30
scmmishra	d71de2a23e	[fix] Code formatting, removed trailing spaces	2019-01-25 14:27:23 +05:30
scmmishra	9731a02657	[feat] Added docsUrl variable to configure help_links	2019-01-25 13:14:11 +05:30
scmmishra	3f9b231f31	[fix] Links now redirect to erpnext.com	2019-01-25 12:56:27 +05:30
deepeshgarg007	1f9a6febdd	fix: Assign given price list if POS price list is not available	2019-01-25 11:53:55 +05:30
Nabin Hait	f05d91d317	Merge branch 'develop' into Item-Tax-Template-V12	2019-01-25 11:26:47 +05:30
Nabin Hait	596c1b3489	Merge pull request #16220 from SaiFi0102/Party-Ledger-Summary ... feat: Party Ledger Summary Report	2019-01-25 11:22:55 +05:30
Nabin Hait	ddc65dfb87	fix: delete taxes and charges template while deleting company	2019-01-25 11:04:14 +05:30
Nabin Hait	50e552321b	Merge pull request #16363 from scmmishra/leave-application-naming ... fix: Naming series not reflecting in leave application	2019-01-25 10:34:01 +05:30
Nabin Hait	cce96758fc	Merge pull request #16484 from netchampfaris/add-logging-for-failed-exchange-rate ... chore: Add error logging for failed get_exchange_rate call	2019-01-25 10:33:03 +05:30
Nabin Hait	42462fac9d	Merge pull request #16465 from nabinhait/eway_bill ... fix(accounts): Validate gst accounts defined in GST Settings in eway bill report	2019-01-25 10:00:06 +05:30
Nabin Hait	f1ff5c24ff	Merge pull request #16469 from sagarvora/minor-gstin ... fix(regional): remove duplicate validation for GSTIN	2019-01-25 09:59:45 +05:30
Nabin Hait	05f1c0e1b9	Merge pull request #16470 from netchampfaris/fix-jinja-unicode-formatting ... fix: Don't use .format in jinja templates	2019-01-25 09:57:37 +05:30
Nabin Hait	e21bdf020c	Merge pull request #16472 from deepeshgarg007/cost_center ... fix(cost_center): Bug fix in update_cost_center_number argument name	2019-01-25 09:56:52 +05:30
Nabin Hait	76d93e7220	Merge pull request #16474 from deepeshgarg007/email_digest_fix ... fix: Wrong argument fix in email digest filters	2019-01-25 09:55:47 +05:30
Nabin Hait	a6ab38665d	Merge pull request #16487 from netchampfaris/fix-gst-pos-invoice ... fix: Dont show 0 amount taxes and tax breakup	2019-01-25 09:54:07 +05:30
Nabin Hait	393080ecbe	Merge pull request #16492 from rohitwaghchaure/ascii_code_issue_pos_offline_not_working ... fix: ascii codec while opening offline POS	2019-01-25 09:50:41 +05:30
Nabin Hait	f6459335da	Merge pull request #16493 from rohitwaghchaure/bank_reconcilliation_entry_issue ... fix: bank reconcilliation showing multiple entries against one JV	2019-01-25 09:50:07 +05:30
Nabin Hait	fc9e733d7f	Merge pull request #16483 from surajshetty3416/stock-levels-based-on-permission ... fix: Show stock levels in Item master based on user permissions	2019-01-25 09:48:43 +05:30
Suraj Shetty	1c9dd67f15	Merge branch 'staging-fixes' into add-logging-for-failed-exchange-rate	2019-01-25 09:22:46 +05:30
Rohit Waghchaure	e14cc8f2b6	fix: bank reconcilliation showing multiple entries against one JV	2019-01-25 00:23:41 +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
Rohit Waghchaure	74df01d3d1	fix: ascii code while opening offline POS	2019-01-25 00:03:35 +05:30
rohitwaghchaure	7e4cf62a15	Merge pull request #16370 from rohitwaghchaure/show_outward_entries_in_negative ... Show outward entries in negative for Bank Clearance Summary report	2019-01-24 22:13:40 +05:30
Aditya Hase	a40c43e414	fix(ar-summary): Changes to column list to match recent changes	2019-01-24 19:13:32 +05:30
Nabin Hait	2a1aedfff1	fix(setup): Create regional taxes on creation on company	2019-01-24 17:56:19 +05:30
Nabin Hait	49b41e49ae	fix: Added permissions in GST Settings and added filters for accounts based on company	2019-01-24 17:55:44 +05:30
deepeshgarg007	c48efaba6e	fix(sales_invoice): fetch customer price list if available before pos profile price list	2019-01-24 17:15:38 +05:30
Faris Ansari	d6f837c5e5	fix: Dont show 0 amount taxes and tax breakup	2019-01-24 17:10:33 +05:30
Faris Ansari	badf1c42e0	chore: Add error logging for failed get_exchange_rate call	2019-01-24 16:28:53 +05:30
Suraj Shetty	7a45887fa1	fix typo	2019-01-24 16:26:48 +05:30
Suraj Shetty	dd0496f7aa	Add missed out field field	2019-01-24 16:18:43 +05:30
Suraj Shetty	c165838228	Filter bin list based on warehouses that are accessible to the user	2019-01-24 15:45:46 +05:30
pipeCh	c16c7fffb4	fixed for "Select Serial Numbers" dialog won't fill mandatory field	2019-01-24 15:00:07 +07:00
Suraj Shetty	41b3756df5	fix: patch to replace Project icon with Projects icon (#16374) ... * Delete duplicate projects icon from desktop.py * Fix patch (to replace project to projects)	2019-01-24 10:57:05 +05:30
deepeshgarg007	0c38cf06a5	fix: Wrong argument fix in email digest filters	2019-01-23 19:11:24 +05:30
deepeshgarg007	19ab86a3a7	fix:(cost_center): fix for update cost center number	2019-01-23 17:28:13 +05:30
Sagar Vora	e9778d9556	fix: do not use built-in "input", reload_doc	2019-01-23 17:13:31 +05:30
Sagar Vora	f51661b225	fix: allow operators, make weighting_function mandatory	2019-01-23 16:42:28 +05:30
Faris Ansari	853d3fd1ab	fix: Don't use .format in jinja templates ... - Jinja doesn't allow unicode strings to be formatted in templates	2019-01-23 16:34:22 +05:30
Sagar Vora	9aeabce3d3	fix: trailing whitespace, duplication & more	2019-01-23 16:01:19 +05:30
Sagar Vora	d75095b04c	fix(regional): remove duplicate validation for GSTIN	2019-01-23 14:40:01 +05:30
Sagar Vora	57d7c837aa	fix: supplier scorecard test	2019-01-23 14:26:35 +05:30
Sagar Vora	fb256d68ff	Merge branch 'fix-supplier-scorecard' of /home/snv/Work/master_bench/apps/erpnext into fix-scorecard	2019-01-23 14:13:40 +05:30
Sagar Vora	037d0f8ba6	fix(buying): make supplier scorecard usable	2019-01-23 14:11:25 +05:30
Frappe Bot	e415cce1a9	Merge branch 'staging' into develop	2019-01-23 08:19:00 +00:00
Frappe Bot	2d5bf69dc4	bumped to version 11.0.3-beta.37	2019-01-23 08:12:19 +00:00
Frappe Bot	34121bc81a	Merge branch 'master' into staging-fixes	2019-01-23 08:08:55 +00:00
Frappe Bot	342854f6f2	bumped to version 10.1.80	2019-01-23 08:08:53 +00:00
Nabin Hait	06607fda4e	fix: removed print statement	2019-01-23 12:15:48 +05:30
Nabin Hait	141c543f97	Update journal_entry.js	2019-01-23 12:14:55 +05:30
Nabin Hait	36706c04bb	Merge pull request #16451 from nabinhait/unicode-issue ... fix: Unicode issue in purchase invoice	2019-01-23 12:11:00 +05:30
Nabin Hait	d2e2ca31ac	Merge pull request #16460 from nabinhait/pricing-rule-issue ... fix: Enforce pricing rule based on rate on server side	2019-01-23 12:09:12 +05:30
Nabin Hait	fb8c0bd664	Merge pull request #16464 from adityahase/flakes ... style: Linting fixes	2019-01-23 12:08:57 +05:30
Nabin Hait	5b2922f76c	Merge pull request #16466 from nabinhait/project-nonetype ... fix(projects): None type handling while updating tasks	2019-01-23 12:07:25 +05:30
Nabin Hait	4ef578e1c4	Merge pull request #16406 from rohitwaghchaure/newchanges_in_tds_reports ... fix: Multiple fixes in the reports	2019-01-23 12:05:36 +05:30
Nabin Hait	49e09624d6	fix(projects): None type handling while updating tasks	2019-01-23 10:43:00 +05:30
Nabin Hait	8c2a2c8f60	fix(accounts): Validate gst accounts defined in GST Settings in eway bill report	2019-01-23 10:33:47 +05:30
Aditya Hase	819a16d0f5	fix(dead-code): Remove .py files (#16462)	2019-01-23 07:57:08 +05:30
Aditya Hase	f79937d64b	style: Remove unused imports	2019-01-23 00:28:37 +05:30
Aditya Hase	55a08dee78	style: Remove unusued local variable	2019-01-23 00:28:02 +05:30
Aditya Hase	4b4265f8a7	fix(dead-code): Remove .py files (#16457)	2019-01-22 20:54:21 +05:30
FinByz Tech Pvt. Ltd	237a871f17	fix: NoneType object has no attribute "gstin" (#16458) ... * fix: NoneType object has no attribute "gstin" * fix: handle NoneType values	2019-01-22 20:49:06 +05:30
Nabin Hait	da32916396	fix: Enforce pricing rule based on rate on server side	2019-01-22 19:06:06 +05:30
Aditya Hase	f3c22f342c	fix(unicode): Import unicode_literals in every file	2019-01-22 18:36:10 +05:30
Sagar Vora	c4bda9fac3	Merge branch 'staging' into develop	2019-01-22 18:17:09 +05:30
Sagar Vora	5555b2802f	bumped to version 11.0.3-beta.36	2019-01-22 18:37:09 +05:50
Sagar Vora	c84e3fe21b	Merge branch 'master' into staging-fixes	2019-01-22 18:16:13 +05:30
Sagar Vora	2a9a867f05	bumped to version 10.1.79	2019-01-22 18:35:44 +05:50
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	64d774d178	bumped to version 11.0.3-beta.35	2019-01-22 16:05:56 +05:50
Nabin Hait	a5270e561f	fix: Unicode issue in purchase invoice	2019-01-22 15:43:04 +05:30
Sagar Vora	ceacacc320	Merge branch 'master' into staging-fixes	2019-01-22 15:37:05 +05:30
Sagar Vora	1e61dd024b	bumped to version 10.1.78	2019-01-22 15:53:48 +05:50
Rohit Waghchaure	ddd9136d10	Renamed field and added finance book column in the trial balance simple report	2019-01-22 14:11:57 +05:30
Aditya Hase	d157ae17b7	fix(ar-summary-report): Changes to column list to match recent changes in AR report	2019-01-22 13:37:54 +05:30
Zlash65	270c4c2a87	fix: push party filter only if applicable	2019-01-22 12:47:25 +05:30
Zlash65	c8d632ddff	fix: add set query for payroll entry in JV	2019-01-22 12:46:13 +05:30
Nabin Hait	22923ed663	Merge branch 'staging-fixes' into pr_staging_fixes_2	2019-01-22 10:51:59 +05:30
Nabin Hait	f0ea152022	Merge pull request #16289 from Anurag810/Quality-inspection-fix ... fix: validated quality inspection for delivery note(DN) and purchase receipt(PR)	2019-01-22 10:49:55 +05:30
Nabin Hait	a334ed879f	Update __init__.py	2019-01-22 10:41:50 +05:30
Nabin Hait	9adfd2d7b4	Merge pull request #16419 from rohitwaghchaure/project_update_status_code_and_design_refactoring ... fix: Project update status feature's code and design refactored	2019-01-22 10:02:34 +05:30
Nabin Hait	b9b8d575bc	Merge pull request #16435 from deepeshgarg007/support-fix ... fix(accounts_receivable): Bug fix in accounts receivable report	2019-01-22 09:59:17 +05:30
Nabin Hait	48fa697d54	Merge pull request #16439 from nabinhait/disable-rounded-total ... fix: Disable rounded total field's value honours docfield's default value	2019-01-22 09:58:06 +05:30
Nabin Hait	16bbf09947	Merge pull request #16440 from rohitwaghchaure/not_able_to_submit_work_order ... fix: not able to submit work order	2019-01-22 09:57:49 +05:30
Rohit Waghchaure	de718dacb2	fix: Code cleanup	2019-01-21 19:47:17 +05:30
scmmishra	f2d0be7299	[feat] Modified help config	2019-01-21 19:35:46 +05:30
scmmishra	dd461636e3	[feat] Updated all help_links	2019-01-21 19:35:02 +05:30
Rohit Waghchaure	11ce45077d	[Fix] Not able to submit work order	2019-01-21 19:18:52 +05:30
Nabin Hait	a39f324682	fix: Disable rounded total field's value honours docfield's default value	2019-01-21 18:50:50 +05:30
deepeshgarg007	3565395e7a	Merge branch 'email_digest' of https://github.com/deepeshgarg007/erpnext into email_digest	2019-01-21 15:03:51 +05:30
deepeshgarg007	aab6d0e028	fix(email_digest): Linkes annual income and annual expense to profit and loss statement	2019-01-21 15:01:40 +05:30
deepeshgarg007	ff1078f271	fix(minor): fetch payment terms if voucher nos are available	2019-01-21 09:43:56 +05:30
Tyler Matteson	7928a685c8	Feat: US Regional module, added test, changed address template reference to convention	2019-01-20 09:55:44 -05:00
Deepesh Garg	f7fe08c487	Merge branch 'develop' into email_digest	2019-01-20 16:53:41 +05:30
Tyler Matteson	fdb8e4d427	Merge branch 'usregional' of https://github.com/agritheory/erpnext into usregional	2019-01-19 14:26:41 -05:00
Saif Ur Rehman	31d58eac01	fix(Party Ledger Summary): Added Supplier/Customer Name column	2019-01-19 15:28:53 +05:00
Saif Ur Rehman	55566b7f8e	fix(Party Ledger Summary): Codacy fix	2019-01-19 15:12:08 +05:00
Himanshu	79d4400c16	fix: Offline pos fix (#16424) ... * Offline POS fix * Fixed items search and load items	2019-01-19 14:01:38 +05:30
Saif Ur Rehman	fcaed12a53	Merge branch 'Party-Ledger-Summary' of https://saifi0102@github.com/SaiFi0102/erpnext.git into Party-Ledger-Summary	2019-01-19 13:18:23 +05:00
Aditya Hase	442c85c006	fix(marketplace): Capitalize marketplace factory class to support router changes (#16428)	2019-01-18 21:28:37 +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
Faris Ansari	f523611e12	Merge branch 'hotfix' into leave-application-naming	2019-01-18 14:30:39 +05:30
Rohit Waghchaure	7e71e132a3	Added patch	2019-01-18 11:47:31 +05:30
deepeshgarg007	3c9dd73f91	Added company filters for reports	2019-01-18 11:29:37 +05:30
Nabin Hait	0c44701901	Merge pull request #16375 from deepeshgarg007/company_address ... feat: Company address and GST field addition in sales order, purchase order, purchase receipt	2019-01-18 10:57:57 +05:30
Nabin Hait	bace4d3e6d	Merge pull request #16358 from adityahase/naming-series ... feat(naming): Deferred naming for SLE and GL Entry	2019-01-18 10:55:30 +05:30
Nabin Hait	bef2c22d23	Fix: merge conflict	2019-01-18 10:15:47 +05:30
Nabin Hait	6202d0ed68	fix: NoneType comparison with int error	2019-01-18 09:40:24 +05:30
Nabin Hait	30667c160d	test: Inter company stock transfer for serialised items	2019-01-18 09:36:18 +05:30
Nabin Hait	5a87ac0ad8	fix: Inter company stock transfer for serialised items	2019-01-18 09:36:18 +05:30
Tyler Matteson	53a6492f29	FEAT: US Regional Module with IRS 1099 reporting	2019-01-17 14:04:51 -05:00
Rohit Waghchaure	425dff93d7	fix: Project update status code and design refactored	2019-01-17 19:21:44 +05:30
deepeshgarg007	00f989a916	fix(email_digest): fix in account heads	2019-01-17 17:59:52 +05:30
Rohit Waghchaure	fa7ee0b3b6	Added dafult bank account in the customer/supplier	2019-01-17 15:45:27 +05:30
Rohit Waghchaure	f725816809	Enhance: Added field limit in the Payment Reconciliation to handle large entries	2019-01-17 12:54:14 +05:30
deepeshgarg007	753c5d7514	fix(Codacy): Possible Sql injections	2019-01-17 12:28:56 +05:30
ks093	61c781325d	Fix to show low stock message. ... In case of order being placed with stock quantity more than available, message showing stock available wasn't showing due to tuple unpacking not happening correctly.	2019-01-17 12:16:43 +05:30
ks093	1ed819bb10	Refresh quotation_series field to show series	2019-01-17 12:09:04 +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	59b9d363c9	Delete purchase_order.json	2019-01-16 22:54:45 +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	e6e1f2a46f	Delete __init__.py	2019-01-16 22:53:28 +05:30
Deepesh Garg	e4303111b4	Delete __init__.py	2019-01-16 22:53:00 +05:30
Deepesh Garg	9fb871c040	Delete pending_purchase_order.json	2019-01-16 22:52:27 +05:30
Deepesh Garg	3f5fea97fa	Delete __init__.py	2019-01-16 22:52:07 +05:30
deepeshgarg007	12b409b94a	Merge branch 'develop' of https://github.com/frappe/erpnext into email_digest	2019-01-16 22:33:17 +05:30
deepeshgarg007	f8bbcc56b7	refactor(email_digest): Fixes in email digest links and reports	2019-01-16 22:22:48 +05:30
Nabin Hait	c8ac825f0d	Merge branch 'hotfix' into leave-application-naming	2019-01-16 17:54:35 +05:30
Nabin Hait	873442a55d	Merge branch 'staging-fixes' into Party-Ledger-Summary	2019-01-16 17:52:45 +05:30
Nabin Hait	983d102a19	Merge branch 'staging-fixes' into Quality-inspection-fix	2019-01-16 17:52:30 +05:30
Nabin Hait	cd40d87ebd	Merge branch 'staging-fixes' into pr_staging_fixes_2	2019-01-16 17:52:01 +05:30
Nabin Hait	4fd710a392	Merge branch 'staging-fixes' into company_address	2019-01-16 17:51:49 +05:30
Nabin Hait	28ccaa3c88	Merge branch 'staging-fixes' into Gross-Profit-Return-Fix	2019-01-16 17:49:22 +05:30
Nabin Hait	3dd5f55412	feat(stock-reco): Fetch items in stock reco based on group warehouse	2019-01-16 16:20:05 +05:30
Nabin Hait	78ccbe24a3	fix(test): BOM raw materials rate from price list as per uom	2019-01-16 16:00:25 +05:30
Nabin Hait	158e7dcd8b	fix(bom-uom_issue)Fetch rate in BOM from Price List based on UOM	2019-01-16 16:00:25 +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	693e81db48	more bis fixes	2019-01-16 15:59:39 +05:30
Sahil Khan	34766c0c50	BIS issue fixes	2019-01-16 15:59:39 +05:30
Saif Ur Rehman	fccb1e55ec	fix(Gross Profit Report): corrected fieldnames in return invoice query	2019-01-16 14:36:55 +05:00
Deepesh Garg	7bb7f95aa8	Merge branch 'staging-fixes' into company_address	2019-01-16 11:17:55 +05:30
Nabin Hait	29552c1ec4	Merge pull request #16304 from netchampfaris/fix-item-group-pagination ... fix(website): Pagination in child item groups	2019-01-16 10:31:48 +05:30
Nabin Hait	38703080c9	Merge pull request #16360 from adityahase/demo ... fix(demo): Look for "Total" instead of "'Total'" in report results	2019-01-16 10:23:59 +05:30