Commit Graph

28759 Commits

Author SHA1 Message Date
Suraj Shetty
1cf7270049 fix: Add picklist dashboard config 2019-08-28 12:40:58 +05:30
Suraj Shetty
be0ae7a430 fix: Doctype changes
- Check no copy for work order series field
- Add dashboard
- Set naming_series for pick list
2019-08-28 12:40:26 +05:30
Shivam Mishra
0aeccbf4b2
feat: added dashboard fixtures (#18812)
* feat: add dashboard charts fixture

* fix: remove return statement

* feat: added patch for creating default dashboards

* chore: renamed dashboard charts

* feat: add add_dashboard function to install fixtures

* fix: reload doctype issue in patches

* fix (travis): reloaded dashboard chart source

* fix (travis): reloaded dashboard chart source

* fix (travis): reloaded dashboard doctype

* fix (travis): reloaded dashboard chart link doctype
2019-08-28 11:39:45 +05:30
Suraj Shetty
8f32ac0edd fix: Batch selection logic 2019-08-28 10:16:20 +05:30
Himanshu Warekar
a5b78f3c0d fix: get address in single line 2019-08-28 00:04:05 +05:30
Mangesh-Khairnar
671c20ec56
Merge branch 'develop' into patch-1 2019-08-27 22:42:35 +05:30
Mangesh-Khairnar
17d3de1821 fix: process allocation expiry 2019-08-27 22:37:12 +05:30
mbhavesh95863
cfec328c74
Same report 2 times in list 2019-08-27 19:17:19 +05:30
Suraj Shetty
c5e0838890 fix: Import get_conversion factor method 2019-08-27 12:14:17 +05:30
Suraj Shetty
974ac3e6ad fix: Update item detail for items without reference 2019-08-27 10:17:16 +05:30
Suraj Shetty
dc675b1eb0 fix: Re-order stock qty field 2019-08-27 08:06:22 +05:30
Himanshu Warekar
9057239c3c fix: display address 2019-08-26 22:40:54 +05:30
Suraj Shetty
d6be8989e4 fix: Remove "Material Issue" purpose from pick list
- Because in material issue we already define source warehouse
2019-08-26 22:11:49 +05:30
Faris Ansari
8ac2a2f0c4 fix: Set default Parent Item Group 2019-08-26 13:00:17 +05:30
Himanshu Warekar
1c538b9b43 Merge branch 'develop' of https://github.com/frappe/erpnext into contacts-ref 2019-08-26 12:51:51 +05:30
Himanshu Warekar
ba6fe6cde5 Merge branch 'contacts-ref' of https://github.com/hrwx/erpnext into contacts-ref 2019-08-26 12:49:45 +05:30
Himanshu Warekar
7243e774c2 fix: add city, state and country 2019-08-26 12:49:20 +05:30
Shivam Mishra
db3bb793e9 feat: added domain info on footer (#18839) 2019-08-26 11:29:18 +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
Mangesh-Khairnar
5dd1b50802 fix: update show in website on disabling item (#18831) 2019-08-26 10:27:25 +05:30
Suraj Shetty
00f9930fbf style: Remove leftout print statements 2019-08-26 10:09:07 +05:30
Suraj Shetty
457da47dba fix: set for_qty instead of pick_list 2019-08-26 10:05:35 +05:30
Suraj Shetty
2b9e256002 fix: Rename method name 2019-08-26 10:05:01 +05:30
Suraj Shetty
a1aa85712b
Merge branch 'develop' into fix-timesheet-creation 2019-08-26 10:01:45 +05:30
Suraj Shetty
05f243590d fix: Show option to create pick list or work order 2019-08-26 09:29:31 +05:30
Suraj Shetty
94d7096c8c fix: Show create button only if target doc does not exists 2019-08-26 08:40:02 +05:30
Suraj Shetty
ecc801d3d8 fix: Add pick list field to delivery note 2019-08-26 08:39:11 +05:30
Suraj Shetty
be9f4ea487 fix: Add button to create pick list from material request 2019-08-26 08:38:37 +05:30
Suraj Shetty
a1dc152695 fix: Move get items location button below items table 2019-08-26 06:57:43 +05:30
Suraj Shetty
9209570937 feat: Add option to create pick list from material request 2019-08-26 06:33:27 +05:30
Nabin Hait
d8c262fd5c
fix: Translations of strings (#18825) 2019-08-23 16:32:58 +05:30
Mangesh-Khairnar
fe579c2efd fix: show a descriptive message on submission of duplicate account (#18486)
* fix: show a descriptive message on submission of duplicate account

* Update account.py
2019-08-23 16:31:20 +05:30
Mangesh-Khairnar
d94a389dd3 chore: remove unwanted code (#18645) 2019-08-23 16:31:09 +05:30
Deepesh Garg
98b86ecbc2
Merge branch 'develop' into supplier_items 2019-08-23 15:41:30 +05:30
Himanshu
dc0fb08ec7
Merge branch 'develop' into contacts-ref 2019-08-23 15:03:03 +05:30
Tufan Kaynak
a7ab51c5ba Update vehicle_expenses.py (#18768) 2019-08-23 12:50:52 +05:30
deepeshgarg007
59432418c6 fix: Consider multiple stock entry against a purchase order 2019-08-23 12:45:48 +05:30
Nabin Hait
6e7b9b5cb7
Update sales_invoice.py 2019-08-23 12:27:05 +05:30
Suraj Shetty
8b4d604cfd fix: Use purpose field and remove item_base_on field 2019-08-23 11:57:16 +05:30
Suraj Shetty
4affe4b939
Merge branch 'develop' into fix-timesheet-creation 2019-08-23 11:51:59 +05:30
Michelle Alva
c890401fec fix: added payroll period in HR module (#18543) 2019-08-23 11:50:48 +05:30
Suraj Shetty
7f94a58bf1
Merge branch 'develop' into fix-timesheet-creation 2019-08-23 11:46:01 +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
KanchanChauhan
23b5f4ec99 fix: Leave Application status filter (#18770)
When we click on Status Open in list view it throws an error.


After fix, it filters the results on Open status
2019-08-23 11:40:09 +05:30
Nabin Hait
bdfd69a2fe
Merge branch 'develop' into contacts-ref 2019-08-23 11:34:42 +05:30
Harshit
56d03a456b fix: add contract to CRM module (#18817) 2019-08-23 11:34:25 +05:30
Michelle Alva
680e098b87 fix(dash): Added Tax exemption category and sub category in Employee Tax and Benefits (#18545)
section
2019-08-23 11:32:43 +05:30
Anurag Mishra
db88476f8b feat: refactor invoice_discounting (#18629)
* feat: refactor invoice_discountig

* Update invoice_discounting.py

* Update invoice_discounting.js
2019-08-23 11:27:00 +05:30
rohitwaghchaure
88ee7d8dbe fix: POS Sync Issue (#18807) 2019-08-23 11:13:58 +05:30
Suraj Shetty
6689ed543a
Merge branch 'develop' into fix-paid-amount 2019-08-23 10:42:23 +05:30