Commit Graph

32383 Commits

Author SHA1 Message Date
Shivam Mishra
a6cb27cb8e chore: trigger build 2020-08-28 13:10:46 +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
prssanna
a324e9bd12 fix: remove text-muted and small class fromtree items 2020-08-27 19:26:14 +05:30
Suraj Shetty
a49af09705 fix: Primary button icon 2020-08-27 18:57:43 +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
Rushabh Mehta
3ef1490d73
Merge pull request #23150 from rmehta/fix-patch
fix(patch): fix patches for tests
2020-08-26 16:28:28 +05:30
Rushabh Mehta
73f648473f fix(minor): update_start_end_date_for_old_shift_assignment.py 2020-08-26 14:51:37 +05:30
Rushabh Mehta
a163d8bc84 fix(minor): rename_lost_reason_detail 2020-08-26 14:51:37 +05:30
Rushabh Mehta
544d18327c fix(patch): quotation_lost_reason_detail 2020-08-26 14:51:37 +05:30
Rushabh Mehta
38fad58834 fix(patch) 2020-08-26 14:51:37 +05:30
rohitwaghchaure
fe0ecc2ff7
Merge pull request #23144 from anupamvs/product-image
fix: Homepage Featured Product image fetch issue
2020-08-26 13:05:50 +05:30
rohitwaghchaure
5f4b5f3f46
Merge pull request #23151 from ruchamahabal/fix-conversion-factor
fix: conversion factor for BOM exploded item rate
2020-08-26 13:01:13 +05:30
rohitwaghchaure
e950dcb32e
Merge pull request #23166 from bhavesh95863/patch-8
fix: set company filter in condition
2020-08-26 12:57:06 +05:30
bhavesh95863
d888a59bd1
fix: set company filter in condition 2020-08-26 12:44:20 +05:30
Michelle Alva
7a927cefbd
fix: Social Media Status hidden in Mobie View (#23158) 2020-08-26 10:32:26 +05:30
Deepesh Garg
b4a992e6a3
Merge pull request #23156 from ruchamahabal/add-maintenance-visit-link
feat: add Maintenance Visit link in Customer and Sales Order dashboards
2020-08-25 21:04:00 +05:30
Anupam Kumar
91461a0016
fix: heading is hidden in the mobile view (#23145) 2020-08-25 21:01:17 +05:30
Michelle Alva
258b256dc6
fix: Add Delivery Note link in Sales Invoice Dashboard (#23161) 2020-08-25 20:37:39 +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
Rucha Mahabal
d43d1408cf fix: conversion factor for BOM exploded item rate 2020-08-25 17:13:05 +05:30
rohitwaghchaure
47a4436010
Merge pull request #23137 from rmehta/pricing-rule-encoding
fix(hot): Pricing Rule encoding fixed
2020-08-25 16:10:29 +05:30
Anupam K
42092cc377 fix: Homepage Featured Product image fetch issue 2020-08-25 15:29:18 +05:30
Rushabh Mehta
ee921052c0 fix(minor): test dependencies 2020-08-25 14:35:49 +05:30
Rushabh Mehta
b5b8f9e72d fix(minor): import 2020-08-25 14:14:23 +05:30
Rushabh Mehta
8ad0fa48bf fix(minor): circular imports? 2020-08-25 12:24:31 +05:30
Rushabh Mehta
ff5d19609f fix(hot): Pricing Rule encoding fixed 2020-08-25 11:59:57 +05:30
Deepesh Garg
f6b4eb27ab
Merge pull request #23034 from gwhitney/dims_in_gl_report
fix(General Ledger): include Accounting Dimension columns in report
2020-08-24 22:11:50 +05:30
Deepesh Garg
07ee7a5bd6
Merge branch 'develop' into dims_in_gl_report 2020-08-24 20:23:19 +05:30
Marica
de5b2be345
Merge pull request #22844 from anupamvs/crm-reports
refactor: Crm reports cleanup
2020-08-24 20:15:42 +05:30
Marica
3e966d6889
Merge branch 'develop' into crm-reports 2020-08-24 19:42:18 +05:30
Shivam Mishra
7556517a4f
feat: validate if removed item attributes exist in variants (#22911)
* feat: validate if removed item attributes exist in variants

* Update erpnext/stock/doctype/item/item.py

Co-authored-by: Marica <maricadsouza221197@gmail.com>

* Update erpnext/stock/doctype/item/item.py

Co-authored-by: Marica <maricadsouza221197@gmail.com>

* refactor: smaller loop

Co-authored-by: marination <maricadsouza221197@gmail.com>

* feat: don't run validation for new entries

Co-authored-by: Marica <maricadsouza221197@gmail.com>

* fix: use tuple as is

Co-authored-by: Marica <maricadsouza221197@gmail.com>

* refactor: error description

Co-authored-by: Marica <maricadsouza221197@gmail.com>

* refactor: remove unused variable

Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-08-24 19:37:09 +05:30
Anupam K
64e84643fb lost opportunity 2020-08-24 18:01:28 +05:30
rohitwaghchaure
cf4268e21a
Merge pull request #23116 from nabinhait/subcontracted-pr-gle
fix: GLE for subcontracted PR is fg item rate is zero
2020-08-24 16:07:32 +05:30
rohitwaghchaure
554e2c2eb7
Merge pull request #23120 from deepeshgarg007/sle_cancel
fix: Reverse SLE not created for fraction qty or qty less than 1
2020-08-24 13:25:12 +05:30
rohitwaghchaure
7d8d26bbea
Merge pull request #23106 from ruchamahabal/add-pos-page
fix: POS page link not visible on Desk
2020-08-24 12:22:18 +05:30
Deepesh Garg
8331a38ace fix: Test Case for qty less than 1 2020-08-23 21:23:26 +05:30
Deepesh Garg
cb0bc2dcaf fix: Negative SLE not created for fraction qty or qty less than 1 2020-08-23 20:43:50 +05:30
Suraj Shetty
99dfb9556d refactor: Simplify code 2020-08-23 16:56:46 +05:30
Suraj Shetty
314551ceb2 refactor: Use right css clas name 2020-08-23 16:36:56 +05:30
Suraj Shetty
a43e760703 fix: Item dashboard style 2020-08-23 16:36:28 +05:30
Suraj Shetty
ecc7eedd10 fix: Update erpnext logo 2020-08-23 16:35:39 +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
Nabin Hait
337ee0a4bf test: Test case for GLE in subcontracted PR if FG item rate is zero 2020-08-22 20:02:27 +05:30
Nabin Hait
df175cc8fc fix: GLE for subcontracted PR is fg item rate is zero 2020-08-22 19:17:18 +05:30
Nabin Hait
111183d080
fix: Installation failed due to global variable (#23114) 2020-08-22 12:31:06 +05:30
Saurabh
66ff5e5e77
Merge pull request #22990 from saurabh6790/erpnext-before-install-flag-1
fix: check setup complete flag instead setup page
2020-08-21 11:55:38 +05:30
Nabin Hait
1ba62c9732
fix:Validate Job offer against vacancies (#23109) 2020-08-20 19:39:10 +05:30