Commit Graph

35742 Commits

Author SHA1 Message Date
Hussain Nagaria
8a25523ad7 chore: Redisearch warning in search settings 2021-05-28 06:36:16 +05:30
Hussain Nagaria
6799eb98db feat: Add fallback when redisearch not loaded 2021-05-28 06:25:49 +05:30
Hussain Nagaria
50d7989e50 chore: Redisearch module load tracking 2021-05-26 22:43:22 +05:30
Hussain Nagaria
9499db8cd9 feat: Add decorator for redisearch 2021-05-26 20:26:34 +05:30
Hussain Nagaria
7a278208c8 chores: Add function params and remove unused imports 2021-05-11 13:00:41 +05:30
Hussain Nagaria
1ebb1b822c feat: Show Recent Searches 2021-05-05 16:04:22 +05:30
Hussain Nagaria
b52d283739 feat: Show brand line in search results 2021-05-05 13:47:43 +05:30
Hussain Nagaria
4356ffbfe8 feat: Add brand line display setting 2021-05-05 13:09:46 +05:30
Hussain Nagaria
eb955c7e99 chore: Add placeholder image 2021-05-04 11:08:45 +05:30
Hussain Nagaria
28c2f5d832 chore: Add query clean-up 2021-05-03 05:47:38 +05:30
Hussain Nagaria
a6deace37c refactor: Use global redis connection 2021-04-29 20:48:27 +05:30
Hussain Nagaria
58d08ee307 chore: Make it a little beautiful 2021-04-29 20:01:31 +05:30
Hussain Nagaria
d22951b014 feat: Add Category autocomplete with config in settings 2021-04-26 11:15:20 +05:30
Hussain Nagaria
c376b67725 feat: Make search index fields configurable
- Move indexing logic to separate file
- Add more validation logic for 'search index fields' field
2021-04-26 07:02:52 +05:30
Hussain Nagaria
fdcfa41a6f feat: Add search fields field 2021-04-23 20:00:47 +05:30
Hussain Nagaria
4a0136b524 feat: Basic Query + Autocomplete 2021-04-22 14:21:29 +05:30
Hussain Nagaria
cc402a5d0c feat: Add basic autocomplete using redisearch 2021-04-21 13:52:23 +05:30
marination
8bc90a65e4 feat: Discount Filters
- Discount filters in filters section
- Code cleanup
2021-04-20 21:54:52 +05:30
marination
94d0149756 Merge branch 'develop' of https://github.com/frappe/erpnext into e-commerce-refactor 2021-04-19 13:06:16 +05:30
Jannat Patel
119b27b97f feat: Delayed Tasks Summary (#25024)
* feat: delayed deliverables summary

* fix: sider

* fix: renamed to delayed tasks

* fix: renamed test

* fix: test

* fix: sider

* fix: dates, validations and chart

* fix: space and column width

* feat: Sort tasks by descending order of delay

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-04-19 12:46:14 +05:30
Alan
ac8a467b0a fix: exclude spurious Stock Entry Types from 'consumed' calculation (#25352)
* fix: exclude spurious 'Stock Entry Type's from 'consumed' calculation

* fix: filter using purpose, make requested changes

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
2021-04-19 12:38:25 +05:30
Ankush Menat
6c88ab07c7 fix: commit leave_allocation change to db (#25382) 2021-04-19 11:51:46 +05:30
Afshan
9c9907cf8e fix: available employee for selection (#25377)
* fix: available employee for selection

* fix: available employee for selection

fix: available employee for selection
2021-04-19 11:48:28 +05:30
Marica
e8bc912ffc perf: Fetching exchange rate on every line item slows down PO (#25345)
* fix: Dont fetch exchange rates for each line item once fetched at parent
`

* perf: Use price list conversion rate from parent

- If price list conversion rate exists in args already from earlier call, use that
- `get_price_list_currency_and_exchange_rate` wont be called for each child row

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-04-19 11:05:21 +05:30
Jannat Patel
dcdd3bebbe feat: Timer in LMS Quiz (#24246)
* feat: new fields in quiz doctypes

* feat: timer in lms quiz

* fix: variable initialisation

* fix: context, exception fix

* fix:sider

* fix:sider

* fix: indentation

* fix: timer

* fix: sider

* fix: return value and format

* fix: show time taken only after all attempts are over

* fix: sider

Co-authored-by: pateljannat <jannatpatel@MacBook-Air.local>
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2021-04-19 10:36:40 +05:30
Ankush Menat
7eac4a250d fix: functions using mutable defaults (#25370) 2021-04-19 10:33:39 +05:30
Saqib
e782531529 fix: Apply single transaction threshold on net_total instead of supplier credit amount (#25243)
* fix: Apply single transaction threshold on net_total instead of supplier credit amount

* fix: Apply single transaction threshold on net_total instead of supplier credit amount

* fix: test

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-04-19 10:15:51 +05:30
Deepesh Garg
1e0d22a38f Merge pull request #24805 from alyf-de/improve_taxes_setup
refactor: Setup Taxes and Charges
2021-04-19 09:12:47 +05:30
Raffael Meyer
9ee6e4feb8 Merge branch 'develop' into improve_taxes_setup 2021-04-18 18:34:41 +02:00
barredterra
d397bb1b74 Merge branch 'improve_taxes_setup' of https://github.com/alyf-de/erpnext into improve_taxes_setup 2021-04-18 18:34:02 +02:00
barredterra
80d44cada4 fix: remove is_default from country wise tax 2021-04-18 18:33:34 +02:00
rohitwaghchaure
4ed5d994a4 Merge pull request #25374 from ankush/shipment_status_update
fix: commit  changes to shipment status in database
2021-04-18 17:56:22 +05:30
Ankush Menat
c28fcba779 ci(semgrep): add correctness rule for on_cancel
Changes done to doctype object in `on_submit` are not commited to
database. Add rule to catch similar bugs.
2021-04-18 13:22:19 +05:30
Ankush Menat
e972ceb798 fix: patch for updating shipment status 2021-04-18 13:22:19 +05:30
Ankush Menat
9229ee1745 fix: update shipment status in database
Caught by semgrep rule:
https://github.com/frappe/erpnext/blob/develop/.github/helper/semgrep_rules/frappe_correctness.yml#L4
2021-04-18 13:22:19 +05:30
rohitwaghchaure
72e3a81878 Merge pull request #25375 from ankush/minor_semgrep_fixes
fix: remove duplicate keys from dictionaries
2021-04-18 13:04:00 +05:30
Raffael Meyer
ef4c494b2b Merge branch 'develop' into improve_taxes_setup 2021-04-17 19:38:36 +02:00
barredterra
476fff149b Merge branch 'develop' into improve_taxes_setup 2021-04-17 18:41:31 +02:00
Ankush Menat
ad6a2657ae chore: minor translation fixes 2021-04-17 16:56:09 +05:30
Ankush Menat
dedf2c1b61 fix: remove duplicate keys from dictionaries 2021-04-17 16:56:08 +05:30
Saqib
75e13f7bb6 fix(e-invoicing): add company validation for e-invoicing (#25348)
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-04-17 15:38:47 +05:30
Saqib
18c7815a1b fix: presentation currency in statement of accounts (#25367) 2021-04-17 15:37:40 +05:30
rohitwaghchaure
fbc0d16d8b Merge pull request #25372 from ankush/eq_assignment_fix
fix: equality check instead of assignment in cart
2021-04-17 13:43:54 +05:30
rohitwaghchaure
1254af502b Merge pull request #25362 from anupamvs/disable_rounded_total
feat: added Disable Rounded Total in sales transactions
2021-04-17 13:30:24 +05:30
Ankush Menat
d6be154ac2 fix: implicit string concatenation (#25371)
* fix: implicit string concatenations

* chore: rerun healthcare patch for company fields
2021-04-16 22:08:44 +05:30
Ankush Menat
67e647232c ci(semgrep): Add semgrep testing (#24871)
Adds semgrep testing in CI.

Refer to:
- https://github.com/frappe/frappe/pull/12524
- https://github.com/frappe/frappe/pull/12577
2021-04-16 21:44:49 +05:30
Ankush Menat
adf974810d fix: equality check instead of assignment in cart 2021-04-16 21:15:50 +05:30
Nabin Hait
eeece59a17 Merge branch 'develop' into disable_rounded_total 2021-04-16 18:44:17 +05:30
Marica
ede339f80b fix: Serial No not updated correctly via Inter Company Stock Transfer (#25006)
* fix: Serial No not updated correctly via Inter Company Stock Transfer

* chore: Added More Test Cases for inter company Serial Transfer

* fix: Test for serial no duplication

- fixed serial no test
- made errors more meaningful on serial no validation

* fix: Stock Reco Test

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2021-04-16 18:42:54 +05:30
Jannat Patel
b1aad63a99 fix: leave policy in leave allocation (#25334)
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-04-16 16:08:22 +05:30