20462 Commits

Author	SHA1	Message	Date
EconCode	07ae3abf34	fix: unregistering url wrong formated string ... Fixed the formated string for unregistering webhooks. String should look like: "/admin/api/2019-04/webhooks/#{webhook_id}.json" Taken from shopify api documentation - deleting webhooks: https://help.shopify.com/en/api/reference/events/webhook?api[version]=2019-04#destroy-2019-04	2019-10-26 16:31:29 +02:00
Sahil Khan	ce5200d700	bumped to version 12.1.7	2019-10-26 19:56:06 +05:30
Jai Chavan	9f483c1fa9	fix: Spelling of Variance	2019-10-26 18:45:01 +05:30
Suraj Shetty	8f67ef8a75	fix: Add patch to replace accounting with accounts in home_settings	2019-10-25 18:55:57 +05:30
Deepesh Garg	09a6868ccd	Merge pull request #19390 from 0Pranav/patch-1 ... fix: setting incorrect field for party bank account	2019-10-25 12:24:39 +05:30
Ashish Shah	e1f95c0529	fix: allow_items_not_in_stock should be evaluated (#19398)	2019-10-25 12:16:11 +05:30
0Pranav	8c1b88f156	Merge branch 'develop' of https://github.com/frappe/erpnext into develop	2019-10-25 11:45:03 +05:30
Aditya Hase	7bdc612013	chore: Update module name (#19404)	2019-10-24 18:01:58 +05:30
Mangesh-Khairnar	233c0bc779	fix: sync delivery note status in both list view and form view	2019-10-24 15:46:12 +05:30
rohitwaghchaure	5d0362669d	Merge pull request #19386 from rohitwaghchaure/while_making_return_entry_not_able_to_select_null_batch ... fix: not able to select the zero qty batch while making the sales ret…	2019-10-23 18:35:58 +05:30
Rohan	962f4eb96c	Merge branch 'develop' into develop-company-address-label	2019-10-23 15:57:26 +05:30
Pranav Nachnekar	d5166861de	fix:setting incorrect field for party bank account ... Previously  Corrected 	2019-10-23 07:46:00 +00:00
Deepesh Garg	d9e27b727f	Merge branch 'develop' into item_row_link_issue	2019-10-23 12:20:19 +05:30
Deepesh Garg	275f3f8b91	Merge pull request #19320 from deepeshgarg007/demo-fixes ... fix: Demo Script fixes	2019-10-23 12:17:08 +05:30
Deepesh Garg	3f96306986	Merge pull request #19375 from khushalti/develop ... fix: date validation, setting up default company, customer/supplier manadatory property on Blanket Order	2019-10-23 12:11:13 +05:30
rohitwaghchaure	5ff377e2bb	fix: product link not working in website (#19373)	2019-10-23 11:09:21 +05:30
deepeshgarg007	799f8d4f93	Merge branch 'develop' of https://github.com/frappe/erpnext into demo-fixes	2019-10-23 08:47:11 +05:30
Deepesh Garg	36c97c3128	Merge pull request #19385 from ruchamahabal/fix_moduleview ... fix: custom doctypes and reports not visible in Accounts module view	2019-10-22 17:34:38 +05:30
Deepesh Garg	453ad3c155	Merge branch 'develop' into develop	2019-10-22 17:30:13 +05:30
Shivam Mishra	85c028b60d	Merge branch 'develop' into revert-19265-issue_fix	2019-10-22 17:26:54 +05:30
Rohan	ee5f0f7c30	Merge branch 'develop' into dev-work-order-bugs	2019-10-22 17:12:00 +05:30
Rohan	8522fdc99c	Merge branch 'develop' into dev-serial-no-statuses	2019-10-22 17:11:30 +05:30
Nabin Hait	bd6b1806cd	fix: fixed asset register report and made skip-dn field hidden	2019-10-22 14:28:37 +05:30
Rohit Waghchaure	d8ddd1e2ec	fix: not able to select the zero qty batch while making the sales return entry	2019-10-22 14:05:13 +05:30
Rucha Mahabal	b5bd3f3abf	fix: custom doctypes and reports not visible in Accounts module view	2019-10-22 13:38:36 +05:30
Nabin Hait	bebbc6371b	fix: Validation message in work order	2019-10-22 12:35:28 +05:30
0Pranav	d583e412c9	Add generic 'Appointment' doctype	2019-10-22 12:33:09 +05:30
Saurabh	bdc899857c	Fix: Shopify payload operations logging (#19366) ... * fix: payload logging for shopify * fix: remove print statements	2019-10-22 12:31:56 +05:30
Anurag Mishra	b7e9e2a1a5	fix: if naming if item-code and index both are same (#19371)	2019-10-22 11:47:03 +05:30
Anurag Mishra	eaff541349	fix: query (#19376)	2019-10-22 11:46:17 +05:30
Deepesh Garg	a324be86d2	Merge branch 'develop' into develop	2019-10-21 21:23:23 +05:30
Khushal Trivedi	e22ca23b81	fix: fix: date validation, setting up default conpany, customer/supplier manadatory property on Blanket Order	2019-10-21 18:17:42 +05:30
gavin	ed8e3b3786	fix: link field country in shopping cart (#19370)	2019-10-21 18:12:29 +05:30
Khushal Trivedi	ad71307a5e	fix: date validation, setting up default conpany, customer/supplier manadatory property on Blanket Order	2019-10-21 17:46:35 +05:30
Khushal Trivedi	ce5c2d8682	Merge branch 'develop' of https://github.com/frappe/erpnext into develop	2019-10-21 17:36:19 +05:30
Khushal Trivedi	cdebd400ec	[Fix] - changed codacy changers suggested	2019-10-21 16:29:16 +05:30
Saurabh	48eff90d1f	fix: Don't show make jv button if equity or liability account and asset account not specified (#19350)	2019-10-21 16:03:28 +05:30
Deepesh Garg	c58d7d8a98	Merge pull request #19363 from rohitwaghchaure/stock_balance_report_not_working_for_stock_recon ... fix: stock balance report not working if actual qty is zero	2019-10-21 15:52:40 +05:30
Deepesh Garg	fbae893f07	Merge pull request #19306 from nabinhait/required_date_fix ... fix: Always set required date based on min date on item table	2019-10-21 15:25:23 +05:30
Rohit Waghchaure	432b03572a	fix: stock balance report not working if actual qty is zero	2019-10-21 13:42:54 +05:30
Abdulla P I	4f4e490d53	fix(HR):adding is_compensatory as default in setup (#19307)	2019-10-21 13:42:17 +05:30
Nabin Hait	dfc10bb5ae	fix: Fixed consumed qty based on Stock Ledger Entry (#19305) ... * fix: Fixed consumed qty based on Stock Ledger Entry * Update itemwise_recommended_reorder_level.py	2019-10-21 13:41:42 +05:30
Nabin Hait	dd893254be	Update buying_controller.py	2019-10-21 13:40:00 +05:30
Nabin Hait	f2d37a7280	fix: Removed inter-company account filter for inter-company journal entry (#19308)	2019-10-21 13:36:47 +05:30
Nabin Hait	8232bd01d6	fix: Positive qty in sales return print (#19310)	2019-10-21 13:36:26 +05:30
Nabin Hait	49a46f08de	fix: Set gross profit in SO item on updating rate after submission (#19311)	2019-10-21 13:35:43 +05:30
Frappe PR Bot	75c5c89909	feat: Updated translation (#19329)	2019-10-21 13:34:14 +05:30
Mangesh-Khairnar	cdf15222e1	fix: half day leave (#19323)	2019-10-21 13:33:46 +05:30
Deepesh Garg	6208755d54	fix: Unable to add details in quotation and opportunity (#19354)	2019-10-21 13:29:44 +05:30
Deepesh Garg	4821f38d25	fix: Item Price changes are not persistent after updating cost on submitted BOM (#19356)	2019-10-21 13:27:40 +05:30
rohitwaghchaure	717ad388be	Merge pull request #19319 from deepeshgarg007/asset-fixes-1 ... fix: Value after depreciation fixes in asset	2019-10-21 12:16:16 +05:30
Deepesh Garg	721c381df3	Merge branch 'develop' into develop	2019-10-20 18:15:58 +05:30
deepeshgarg007	737ec6b26e	fix: Travis	2019-10-20 17:36:36 +05:30
Mohamud Amin Ali	871193eb62	fix: removed annotations altogether for bmi	2019-10-20 11:50:15 +03:00
Mohamud Amin Ali	02279dff31	fix: appropriate annotations in BMI	2019-10-20 10:46:45 +03:00
Mohamud Amin Ali	43b22b4473	fix: a more legible chart for vitals	2019-10-20 10:34:39 +03:00
Deepesh Garg	c8d9a5305b	Merge branch 'develop' into revert-19265-issue_fix	2019-10-20 12:18:34 +05:30
Deepesh Garg	06ace23a32	Merge pull request #18200 from alyf-de/datev_report_headers ... feat(regional): enable automatic processing of DATEV reports	2019-10-19 22:56:59 +05:30
mudux	0d7359a826	fix: Vitals chart not diplaying	2019-10-19 11:10:42 +03:00
deepeshgarg007	55eff16760	fix: Value after depreciation fixes in asset, ... Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>	2019-10-19 12:16:25 +05:30
Deepesh Garg	dcb9c2031b	Merge branch 'develop' into datev_report_headers	2019-10-19 11:34:57 +05:30
Khushal Trivedi	d02b026a4d	Merge branch 'develop' of https://github.com/frappe/erpnext into develop	2019-10-18 17:04:26 +05:30
Khushal Trivedi	8750caa8e3	[Fix] - if its not multi company set it by default on BO	2019-10-18 17:01:16 +05:30
Rohan Bansal	83740de636	fix(selling): Add missing label to company address field	2019-10-16 15:16:00 +05:30
Rohan	d389ee457c	Merge branch 'develop' into dev-work-order-bugs	2019-10-16 15:08:58 +05:30
Rohan	a77f534f7c	Merge branch 'develop' into dev-serial-no-statuses	2019-10-16 15:08:57 +05:30
Khushal Trivedi	5f4b6d267c	[Fix] - making customer/supplier field manadatory on order type condition on BO	2019-10-16 13:40:58 +05:30
Khushal Trivedi	7084f07dab	[Fix] - making customer/supplier field manadatory on order type condition on BO	2019-10-16 13:40:33 +05:30
Khushal Trivedi	1675181e49	[Fix] - making customer/supplier field manadatory on order type condition on BO	2019-10-16 12:02:56 +05:30
Khushal Trivedi	01f8a4966a	[Fix] - making customer/supplier field manadatory on order type condition	2019-10-16 11:40:27 +05:30
ashish-greycube	c41e44d964	fix: relative link in href	2019-10-16 10:38:31 +05:30
ashish-greycube	a32618dff4	add coupon code on selling card of desk	2019-10-16 10:26:25 +05:30
Shivam Mishra	8aa0a280b2	Revert "fix: Allow disabled links in issue doctype (#19265)" ... This reverts commit 29a5756f87.	2019-10-15 19:17:20 +05:30
deepeshgarg007	3db65ef7e8	fix: Demo Script	2019-10-15 19:16:45 +05:30
joelios	441720df75	fix: linking of time_log to timesheet from project (frappe/erpnext #19315 )	2019-10-15 15:42:51 +02:00
Kenneth Sequeira	c269c68727	fix: allow read-only on new address form (#19304)	2019-10-15 16:34:55 +05:30
Khushal Trivedi	e2bb950012	[fix] - from date cannot be greater than to date on blanket order	2019-10-15 15:03:13 +05:30
Rohit Waghchaure	a20fb650fe	code cleanup	2019-10-15 14:42:09 +05:30
Sagar Gharge	f935e37925	[Fix] restricted duplicate guardians on student doctype (#19194)	2019-10-15 14:38:04 +05:30
Rohit Waghchaure	66072fec5a	fixed conflicts	2019-10-15 14:18:59 +05:30
Nabin Hait	19070621af	tests: added tests for PO scheduled date	2019-10-15 14:11:40 +05:30
Nabin Hait	a113861b0c	fix: Always set required date based on min date on item table	2019-10-15 12:43:27 +05:30
ashish-greycube	cf24191fe5	feat: affiliate sales partner referral code and coupon code	2019-10-15 11:44:45 +05:30
ashish-greycube	74dc3c99de	feat: coupon_code and referral_sales_partner functionality	2019-10-15 11:44:45 +05:30
rohitwaghchaure	0bb99c15e5	fix: while submitting landed cost voucher user getting negative stock error (#19269)	2019-10-14 15:18:36 +05:30
Vijaya Raghavan	adc1529567	fixed typo ... fixes type in filter parameter	2019-10-13 21:41:02 +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
rohitwaghchaure	86870b0aa6	fix: production plan not showing grand total against sales order (#19283)	2019-10-12 16:49:38 +05:30
rohitwaghchaure	a0c162c2d6	fix: project has not set in the sub assembly work order from production plan (#19284)	2019-10-12 16:48:57 +05:30
Anurag Mishra	8e937e9640	fix: packed items child table reset on amending docs (#19157)	2019-10-11 11:50:38 +05:30
Saqib	66762380ed	fixes: internal issues (#19201) ... * fix: Delivery Trip now has editable start address. * fix: default party type not set in Journal Entry * fix: maintainence visit purpose table not fetching item name * fix: maintainence visit purpose table not fetching item name	2019-10-11 11:09:10 +05:30
Mangesh-Khairnar	1d781f13b2	fix: fetch allocated amount for individual invoice (#19259)	2019-10-11 11:06:11 +05:30
Deepesh Garg	29a5756f87	fix: Allow disabled links in issue doctype (#19265) ... * fix: Allow disabled links in issue doctype * fix: Remove unwanted attribute	2019-10-11 11:04:48 +05:30
rohitwaghchaure	285344eb0e	fix: over-bill error while making debit note against purchase return e… (#19270) ... * fix: overbill error while making debit note against purchase return entry * Update accounts_controller.py	2019-10-11 11:02:11 +05:30
Marica	f067447d9c	fix: Margin and Discount percentage set correctly via 'Update Items' (#19276)	2019-10-11 10:47:09 +05:30
sahil28297	39d9cbc43d	fix(patch): use db_insert instead of save to escape validations (#19279)	2019-10-11 10:43:50 +05:30
Deepesh Garg	2d064ee67a	fix: Remove bold property from disable checkbox (#19280)	2019-10-11 10:43:38 +05:30
Himanshu	eba3a8e802	fix: get contact details (#19281)	2019-10-11 10:43:24 +05:30
Deepesh Garg	0fde204074	Merge pull request #19278 from Mangesh-Khairnar/fix-fixed-asset-register-name ... fix: change category name from in store to in location	2019-10-11 09:14:46 +05:30
Kenneth Sequeira	a54b7542f1	fix: sales invoice labels (#19267)	2019-10-10 18:50:39 +05:30
Rohan	d8cbbc7d65	Merge branch 'develop' into dev-work-order-bugs	2019-10-10 17:47:31 +05:30
Rohan	6c8fe5ae02	Merge branch 'develop' into dev-serial-no-statuses	2019-10-10 17:47:30 +05:30
Mangesh-Khairnar	9cf818d347	fix: change category name from in store to in location	2019-10-10 14:28:52 +05:30
Suraj Shetty	a6e53410b0	Merge branch 'develop' into not_able_to_use_webhook	2019-10-10 14:22:48 +05:30
Rohit Waghchaure	4494d46020	fix: name 'link_link_doctype' is not defined	2019-10-10 14:17:06 +05:30
rohitwaghchaure	95161a0df4	Merge pull request #19266 from rohitwaghchaure/fixed_imponibileimporto_for_the_previous_row_total_develop ... fix: ImponibileImporto not getting calculated properly	2019-10-09 18:16:26 +05:30
Marica	ccad0a4cf9	feat: Stock Quick Balance (#19123) ... * feat: Stock Quick Balance It will display the stock balance and stock value given the date and warehouse Item code can be fed or barcode can be scanned to retrieve the values * fix: Codacy fixes * fix: Renamed to Quick Stock Balance and minor fixes Refactored code , combined functions to make it DRY Added permissions for Stock User and Manager Added more context to naming	2019-10-09 15:24:58 +05:30
Rohit Waghchaure	c10064ae2c	fix: ImponibileImporto not getting calculated properly	2019-10-09 13:50:16 +05:30
Faris Ansari	38ac7f7350	Enhancements to Supplier Portal (#19221) ... * fix: Add Purchase Order to portal * fix: Create Customer or Supplier on first login Based on default role set in Portal Settings, a Customer or Supplier will be created when the user logs in for the first time. * fix: Styling for transaction_row * fix: Styling for RFQ page * fix: Add Purchase Invoice route - Make Purchase Invoice from PO * fix: minor - Admissions for Student role - Remove print statement	2019-10-09 11:41:33 +05:30
Deepesh Garg	a00c98bea7	Merge pull request #19260 from Anurag810/Trends-Fixes ... fix: Query Condition On Billing date filters in Purchase invoice trends Report.	2019-10-07 17:40:24 +05:30
Mangesh-Khairnar	d5e9cd72df	Merge branch 'develop' into lwp_half_day_fix	2019-10-07 16:08:30 +05:30
Mangesh-Khairnar	75397b441f	style(salary-slip): fixed formatting	2019-10-07 16:08:15 +05:30
Anurag Mishra	fe5890b828	fix: Query Condition On Billing date filters	2019-10-07 14:27:07 +05:30
Deepesh Garg	817443c5dd	Merge pull request #19253 from Thunderbottom/e-invoice-disc-fix ... chore: check if discount_percentage exists	2019-10-06 23:47:52 +05:30
rohitwaghchaure	16b8e7c432	Merge pull request #19248 from rohitwaghchaure/not_able_to_submit_work_order_v12 ... fix: not able to submit the work order	2019-10-05 23:29:44 +05:30
Chinmay D. Pai	01aca675ef	chore: check if discount_percentage exists ... fixes TypeError: '>' not supported between instances of 'NoneType' and 'float' Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>	2019-10-05 10:18:21 +05:30
Rohit Waghchaure	484e1fb218	fix: not able to submit the work order	2019-10-04 17:58:21 +05:30
sahil28297	2caf32d421	fix(patch): Reload Leave Type (#19240)	2019-10-04 16:24:53 +05:30
Saqib	d5067b4d73	chore: label changes in retail and stock (#19243)	2019-10-04 16:24:26 +05:30
Deepesh Garg	41a6548acb	fix: Label and dependes on fixes in Bank Account (#19245)	2019-10-04 16:22:00 +05:30
Shivam Mishra	ba2faecdc7	fix: null check for valuation rate (#19195) ... * fix: null check for valuatiomn rate * fix: add rate for item in test records * refactor: use flt instead of throwing error * Revert "fix: add rate for item in test records" This reverts commit f8cebe65f5fe32382aba842f765d263511cbb082.	2019-10-04 11:58:04 +05:30
Deepesh Garg	8b741cfefb	Merge pull request #19228 from Mangesh-Khairnar/fix-stock-ageing-report ... fix(stock-ageing): filter none values from the fifo queue	2019-10-04 09:00:13 +05:30
Deepesh Garg	894604201b	Merge pull request #19242 from thefalconx33/git-issues ... fix: ‘EmployeeAdvance’ object has no attribute ‘conversion_rate’	2019-10-03 22:39:04 +05:30
Mangesh-Khairnar	9351313186	Merge branch 'develop' of https://github.com/frappe/erpnext into fix-stock-ageing-report	2019-10-03 19:21:17 +05:30
Mangesh-Khairnar	ea70c6f696	fix: dynamically filter fifo queue	2019-10-03 19:19:42 +05:30
thefalconx33	4723da0251	fix: #19239	2019-10-03 13:06:43 +05:30
rohitwaghchaure	f4245a2d9c	minor: show BOM related operations (#19237)	2019-10-03 11:41:36 +05:30
gavin	be8f6f0d65	fix: report ~ lead conversion time (#19232)	2019-10-03 11:36:04 +05:30
Frappe PR Bot	045ca33692	feat: Updated translation (#19227)	2019-10-03 11:15:41 +05:30
Himanshu	c18b54fc08	Merge branch 'develop' into global_search_modules	2019-10-02 16:39:38 +05:30
Sahil Khan	c5a6e9da15	Merge branch 'develop' into version-12	2019-10-02 16:36:54 +05:30
Sahil Khan	80ed98c87a	bumped to version 12.1.6	2019-10-02 16:56:54 +05:50
Himanshu	2985cffc52	Merge branch 'develop' into global_search_modules	2019-10-02 16:36:19 +05:30
Himanshu Warekar	2935751f75	Merge branch 'global_search_modules' of https://github.com/hrwx/erpnext into global_search_modules	2019-10-02 16:34:19 +05:30
Himanshu Warekar	23c916c0d6	fix: global search dict in hooks	2019-10-02 16:32:53 +05:30
Saurabh	039679cad1	Merge branch 'develop' into shopify	2019-09-30 19:08:44 +05:30
Chinmay Pai	5dfc74c851	fix(amazon-mws): python3 compatibility changes (#19210) ... Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>	2019-09-30 16:59:58 +05:30
Chinmay Pai	9d26c69c4a	fix(amazon-mws): python3 compatibility changes (#19209) ... Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>	2019-09-30 16:59:42 +05:30
DeeMysterio	20194c4cc5	rename return/invoice to Purchase return/invoice (#19212)	2019-09-30 16:59:15 +05:30
Rohan	d463c346fe	fix: set no-copy on some contract fields (#19208)	2019-09-30 16:37:29 +05:30
Nabin Hait	25e043766a	fix: Get leave approvers in Employee leave balance report (#19211)	2019-09-30 16:36:23 +05:30
Mangesh-Khairnar	905573700b	feat(report): fixed asset register (#19164) ... * feat(report): fixed asset register * fix: fetch supplier and check for asset status * fix: fetch vendor name from purchase invoice * style(fixed-asset-register): use conventional column name * Update fixed_asset_register.py	2019-09-30 16:10:46 +05:30
Himanshu	37f4316df0	Update setup_wizard.py	2019-09-30 16:02:24 +05:30
Marica	de15cc1387	fix: Work order dialog box 'Select Quantity' on clicking 'Finish' (#19136) ... The dialog box fetched 0 as Quantity to Manufacture and Max Quantity on finishing a Work Order	2019-09-30 15:36:33 +05:30
rohitwaghchaure	8d889ef80e	fix: update the pending qty in production plan on completion of work order (#19180)	2019-09-30 15:22:12 +05:30
Deepesh Garg	b54f0fb388	fix: Party column empty in accounts receivable/ payable summary (#19205)	2019-09-30 15:19:56 +05:30
Suraj Shetty	1da81d8755	Merge pull request #19206 from hrwX/disp_mobile_no ... fix: Show primary mobile no	2019-09-30 15:18:01 +05:30
Suraj Shetty	b093ea1f0a	feat: Remove Leaderboard from ERPNext (#19156) ... feat: remove Leaderboard from ERPNext	2019-09-30 15:17:26 +05:30
rohitwaghchaure	ed1cc18ab5	fix: stock ledger report not showing data if the UOM filter has selected (#19179)	2019-09-30 15:15:52 +05:30
Marica	147af15268	fix: Added 'Manual' % Complete Method in Project (#19175) ... Added additional '% Complete Method' in Project so that Project can be set to 'Completed' irrespective of presence of Tasks	2019-09-30 15:11:15 +05:30
prssanna	1f512b36c5	fix(patch): set app_type as private	2019-09-30 14:57:21 +05:30
hrwx	ebc0e1ca8a	fix: remove return statement	2019-09-30 14:56:39 +05:30
hrwx	bf09fbe6b9	fix: sku	2019-09-30 14:56:39 +05:30
hrwx	5c036d9aaf	fix: permissions	2019-09-30 14:56:39 +05:30
hrwx	5aa8743024	changes	2019-09-30 14:56:39 +05:30
prssanna	c6b7695ab5	fix: default private app type	2019-09-30 14:56:39 +05:30
prssanna	c8ad8bb7aa	fix: default private app type	2019-09-30 14:56:39 +05:30
prssanna	09f4e0b19c	fix: default private app type	2019-09-30 14:56:39 +05:30
prssanna	a9aac02b90	fix: default private app type	2019-09-30 14:56:39 +05:30
prssanna	e64bdcd12b	fix: default private app type	2019-09-30 14:56:39 +05:30
prssanna	f380b215b2	fix: shopify integration	2019-09-30 14:56:39 +05:30
Himanshu	201bcaf2ca	fix(Company): Do not set default account if left blank (#19131) ... * chore: use dict to set_default_account * fix: dont override expense account if left empty * fix: set accounts only if new company * chore: fix alignment * fix: test cases	2019-09-30 14:56:08 +05:30
Himanshu	7d6f52f4ab	fix: add system user perm in patient (#19133)	2019-09-30 14:40:56 +05:30
Mangesh-Khairnar	d8763d7d65	fix: allow rename/merge in opportunity (#19202)	2019-09-30 14:39:46 +05:30
Himanshu Warekar	46831c4c20	fix: show mobile no	2019-09-30 14:34:56 +05:30
Himanshu	32b587b3a0	Merge branch 'develop' into global_search_modules	2019-09-30 13:44:42 +05:30
Himanshu Warekar	21abc3aa50	fix: add doctypes for modules	2019-09-30 13:40:02 +05:30
Suraj Shetty	4c3f0b94a4	Merge branch 'develop' into leaderboard	2019-09-30 13:11:19 +05:30
Suraj Shetty	fcb6edf571	Merge branch 'leaderboard' of github.com:prssanna/erpnext into leaderboard	2019-09-30 13:09:53 +05:30
Suraj Shetty	d23c9987ed	style: Fix Codacy	2019-09-30 13:09:12 +05:30
Rohan	60b852bb12	Merge branch 'develop' into dev-work-order-bugs	2019-09-30 13:08:12 +05:30
Rohan	c86cdd609e	Merge branch 'develop' into dev-serial-no-statuses	2019-09-30 13:08:10 +05:30
Deepesh Garg	91aa671a23	Merge pull request #19137 from marination/invoice-discounting ... fix: Outstanding Amount field of Discounted Invoices Table in Invoice Discounting	2019-09-30 12:43:09 +05:30
Suraj Shetty	6bd4509923	Merge branch 'develop' into leaderboard	2019-09-30 12:35:39 +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
Suraj Shetty	38794c0ca1	Merge branch 'develop' into leaderboard	2019-09-30 11:54:28 +05:30
prssanna	b874922404	fix: whitelist leaderboard functions	2019-09-30 11:12:10 +05:30
Deepesh Garg	296bf9ef42	chore: Add standard chart of accounts template for El Salvador (#19151) ... * chore: Add standard chart of accounts template for El Salvador * fix: Renane template file	2019-09-30 11:02:49 +05:30
Deepesh Garg	7b1b3f0fa8	fix: Allow alternative item in stock entry while transfering material to subcontractor (#19189)	2019-09-30 11:01:05 +05:30
Rucha Mahabal	3564ac7c88	fix: don't create debit/credit note automatically (#19185)	2019-09-30 10:59:28 +05:30
DeeMysterio	5ef26b42a8	feat(delivery note): make the delivery trip plus button fetch data from delivery note (#19046)	2019-09-30 10:57:32 +05:30
Roland	6edce82aef	do not require address in webshop (#19096) ... fix: #17559 - in webshop adding address should not be mandatory e.g. for online service goods, button to add address remains available	2019-09-30 10:56:22 +05:30
Rohan	e19e16fbf1	fix: remove internal fields from print (#19101)	2019-09-30 10:54:01 +05:30
Nabin Hait	2a10b02c68	Merge branch 'develop' into invoice-discounting	2019-09-30 10:10:50 +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
Mangesh-Khairnar	77f22635f2	fix(stock-ageing): filter none values from the fifo queue	2019-09-27 17:50:52 +05:30
prssanna	119c976ad1	fix: missing comma	2019-09-27 16:28:08 +05:30
prssanna	8f7ed71e9e	fix: add df to leaderboard config	2019-09-27 15:09:40 +05:30
Himanshu	83b0b2adec	feat(Global Search): Add fixtures for global search (#19049)	2019-09-27 00:59:48 +05:30
Mangesh-Khairnar	a01ebe0a54	Merge branch 'develop' into rename-job-applicant	2019-09-26 18:41:28 +05:30
Nabin Hait	001edb4464	refactor: Reposting utility of Stock ledger (#19155)	2019-09-26 16:44:35 +05:30
sahil28297	a9ff4f6688	fix(Report): Sales Register	2019-09-26 13:58:00 +05:30
prssanna	d095acdad5	fix: use orm for queries	2019-09-26 13:41:24 +05:30
Shivam Mishra	8781dc8ca3	fix: footer link redirect to landing pages (#19181)	2019-09-26 12:53:52 +05:30
Mangesh-Khairnar	f82ea857a0	feat(job-applicant): allow rename/merge with existing	2019-09-26 12:29:41 +05:30
Marica	54becbb33a	fix: Codacy fix(whitespaces)	2019-09-26 11:24:34 +05:30
marination	a877115ff4	fix: Minor changes ... Added value in fetch from and removed client side code	2019-09-26 11:08:39 +05:30
marination	e7f67592a8	fix: Made outstanding amount field read only and added validation ... Made the field editable so that outstanding amount can be adjusted	2019-09-26 10:58:02 +05:30
marination	ed004018d6	fix: Outstanding Amount field of Discounted Invoices Table in Invoice Discounting ... It wrongly fetched grand total from sales invoice instead of outstanding amount.	2019-09-26 10:58:02 +05:30
Deepesh Garg	d138633c5b	Merge pull request #19163 from thefalconx33/small-fixes ... fix: Supplier field not getting populated in serial no on creation of asset	2019-09-25 22:09:41 +05:30
Marica	23d7b09389	fix: Item Rate within Update Items in Sales order (#19172) ... Blocked negative discount percentage, which affected the item rate every time Update Items action was taken	2019-09-25 17:17:36 +05:30
Rucha Mahabal	132323462c	fix(Report): Sales Register (#19166)	2019-09-25 16:03:45 +05:30
Nabin Hait	2064dfc5a9	fix: Handling payments against credit/debit notes and party currency (#19154)	2019-09-24 19:52:33 +05:30
Mangesh-Khairnar	1e6e1dd451	enhancement(tds-monthly-payable): remove zero value transaction (#19141)	2019-09-24 19:46:06 +05:30
Rucha Mahabal	c6b548b5b2	fix(Stock): item variant description (#19134)	2019-09-24 19:17:13 +05:30
gavin	fed5788c50	fix: patch fix (#19147)	2019-09-24 19:15:29 +05:30
Rucha Mahabal	824376a045	fix(Journal Entry): Opening Entry not fetching accounts (#19148)	2019-09-24 19:13:55 +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
thefalconx33	c15cc8fc28	fix: #18624	2019-09-24 18:49:16 +05:30
Sahil Khan	946f68f7f0	bumped to version 12.1.5	2019-09-24 18:36:53 +05:50
Vijaya Raghavan	e9affd97ac	LWP for half day in multi day leave	2019-09-24 17:04:32 +05:30
prssanna	3f1444e410	fix: get leaderboards using hooks	2019-09-24 13:51:22 +05:30
prssanna	3bd15d3aaa	feat: remove leaderboard from erpnext	2019-09-24 13:06:31 +05:30
Rohan	a51a304cf0	Merge branch 'develop' into dev-work-order-bugs	2019-09-24 11:53:00 +05:30
Nabin Hait	786d7bd3d4	Merge branch 'develop' into dev-serial-no-statuses	2019-09-24 11:50:33 +05:30
Deepesh Garg	d9e9d562f8	fix: Travis (develop) (#19140) ... * fix: Travis * fix: Syntax Error	2019-09-24 11:44:52 +05:30
Deepesh Garg	2e7419d78f	fix: Do not validate warehouse in case of Repack (#19050)	2019-09-24 10:05:42 +05:30
Himanshu	fdad33309b	fix: get correct warehouse for product bundle (#19130)	2019-09-24 10:03:34 +05:30
Anurag Mishra	5a61880e6a	fix: provided delete permission (#19143)	2019-09-24 09:54:54 +05:30
Mangesh-Khairnar	5dcf2c669f	chore: remove unlinked letter head references (#19138)	2019-09-24 09:53:06 +05:30
rohitwaghchaure	8dd4699f10	feat: Allow to make landed cost voucher against the asset item (#19121)	2019-09-23 15:03:52 +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
Anurag Mishra	2c60f6419e	feat: missmatching amount in GST Sales report and itemised sales report (#19116)	2019-09-20 23:00:09 +05:30
Suraj Shetty	462d9cb331	feat: "Purchase Order items to be Received or Billed" report (#19091) ... * feat: Init "Purchase Order items to be received or billed" report * fix: Rename report * fix: Column name	2019-09-20 18:30:22 +05:30
Mangesh-Khairnar	a44e8afe71	feat: add bank account in payroll entry (#19021) ... * fix(journal-entry): change fieldname from bank account no to bank account * fix: add payroll entry in bank dashboard * fix: fetch account from bank account * fix: minor changes * patch: check for bank account no column before updating * fix: use rename field function	2019-09-20 18:19:47 +05:30
Sahil Khan	0c665e5638	bumped to version 12.1.4	2019-09-20 15:37:21 +05:50
Rohit Waghchaure	1f9a84f165	fix: removed mandatory property for address field in quick entry	2019-09-20 12:18:23 +05:30
rohitwaghchaure	30f3354a7a	Merge pull request #19114 from marination/report-fix ... fix: Report 'Payment Period based On Invoice Date'	2019-09-19 19:01:05 +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
marination	8590112faa	fix: Report 'Payment Period based On Invoice Date'	2019-09-19 17:48:23 +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
Rucha Mahabal	51eabfe352	fix: subcontracting material transfer dialog in Purchase Order (#19111) ... * fix: subcontracting material transfer dialog in Purchase Order * fix: dialog title	2019-09-19 16:57:03 +05:30
Mangesh-Khairnar	68a4c70b72	Merge branch 'develop' into attendance_template_fix	2019-09-19 13:34:39 +05:30
Suraj Shetty	28d182af15	fix: Permission issue in Total Stock Summary report (#19110) ... Data in "Total Stock Summary" report were not getting filtered based on applied user permissions because some link fields had wrong options	2019-09-19 11:13:22 +05:30
Rohan	8a097c8627	fix: only set times if job card is filled (#19107)	2019-09-18 20:05:49 +05:30
Rucha Mahabal	1ba83427e5	fix: asset maintenance TypeError during date comparisons (#19098)	2019-09-18 20:04:15 +05:30
Marica	d793e39b6d	fix: Customer Credit Balance Report query fix (#19104)	2019-09-18 19:59:31 +05:30
Rohan	b9c1dad2e6	Merge branch 'develop' into dev-serial-no-statuses	2019-09-18 13:24:28 +05:30
Rucha Mahabal	aeaf416d6d	fix: upload attendance template not marking attendance	2019-09-18 13:11:30 +05:30
rohitwaghchaure	780fb8a4e5	fix: set stock adjustment account for the raw materials instead of COGS (#19090)	2019-09-17 18:46:49 +05:30
rohitwaghchaure	d019d28bc9	fix: Customer Ledger Summary report not working on python 3 (#19092)	2019-09-17 18:45:59 +05:30
Sahil Khan	4f96ec1b6c	bumped to version 12.1.3	2019-09-17 17:31:14 +05:50
sahil28297	c1930fa64d	Merge branch 'develop' into fix_indentation	2019-09-17 17:08:16 +05:30
kaviya	9e4f674fb9	fix: indentation error in stock ageing ... fixes https://travis-ci.com/frappe/erpnext/jobs/235815591#L1720	2019-09-17 16:02:11 +05:30
Suraj Shetty	627a3dcd6d	feat: Default energy point rules (#19003) ... * feat: Add default energy point rules during install * fix: Add completed_by field to task doctype * fix: Rule data * fix: Add default rules for opportunity * fix: Add a patch to create default energy point rules * fix: Default success action message * fix: Use .items() instead of .iteritems() * fix: Add "create_default_energy_points" patch entry * fix: Reload Energy Point Rule to fix patch * fix: Import frappe	2019-09-17 15:54:41 +05:30
Suraj Shetty	af2eac4334	fix: Create error log if something goes wrong while call log creation (#19055) ... * fix: Create error log if something goes wrong while call log creation - For better debbugging * fix: Rollback if any error occurs during call log creation	2019-09-17 15:53:23 +05:30
Suraj Shetty	7563bdf6f8	Merge branch 'develop' into fix-exotel-call-log	2019-09-17 13:28:59 +05:30
rohitwaghchaure	ad5fc07652	Merge pull request #19084 from rohitwaghchaure/offline_pos_currency_conversion_issue_for_v11 ... fix: plc conversion issue for offline pos	2019-09-17 13:24:41 +05:30