nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-19 09:35:03 +00:00
Code Issues Packages Projects Releases Wiki Activity
37,248 Commits 402 Branches 1,702 Tags
dc6a8863e97cfbf614afe74c0185cc34ca086ea9
Commit Graph

37248 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marica
dc6a8863e9 Merge branch 'version-13-hotfix' into e-commerce-refactor 2021-08-25 14:35:06 +05:30
marination
c1f6898f1a refactor: Cache Item Reviews and other review feedback 
- `get_doc` -> `get_values` and `db.sql` -> `db.delete` in Wishlist Item deletion
- cache first page of Item Reviews and burst cache on addition and deletion of reviews
- Update redisearch docs link in E Commerce Settings
- Removed unused cint import
- Broke setting attribute context into smaller functions and code cleanup
- Minor recommended items padding tweak
- Item reviews form dict now uses website item as key
- Customer reviews rendered from UI style consistency
- Stock status consistency in listing and full page
- Handle no price in variant dialog for matched item
 2021-08-25 14:34:13 +05:30
Frappe PR Bot
fcb17f047d fix: validate party and party type only if both available (#27002) (#27133) 
* fix: validate party and party type only if both available

* fix: indentation

(cherry picked from commit 8366b6322e)

Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
 2021-08-25 12:49:04 +05:30
Marica
688fe4192c Merge pull request #27118 from 18alantom/fix-scrap-items-updation-bp 
fix: update scrap table item details; typo (backport #27052)
 2021-08-25 12:36:14 +05:30
rohitwaghchaure
2b875bbf52 Merge pull request #27127 from rohitwaghchaure/v13-fixed-stock-ledger-report-with-included-uom 
fix: stock ledger report not working if include uom selected in filter
 2021-08-25 01:24:53 +05:30
Rohit Waghchaure
1810b73113 fix: stock ledger report not working if include uom selected in filter 2021-08-25 01:24:02 +05:30
rohitwaghchaure
2ea108ae92 Merge pull request #27126 from rohitwaghchaure/fixed-donot-overrride-batch-no-v13 
fix: selected batch no changed on updation of qty
 2021-08-25 01:23:10 +05:30
Rohit Waghchaure
2f71b740fd fix: selected batch no changed on updation of qty 2021-08-25 01:22:04 +05:30
Frappe PR Bot
5b411dc1f6 fix: Updated timestamp for pos invoice json (#27110) (#27123) 
Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
(cherry picked from commit fbc5977248)

Co-authored-by: Subin Tom <36098155+nemesis189@users.noreply.github.com>
 2021-08-24 23:18:35 +05:30
Frappe PR Bot
f13ae4de0b fix: broken URL in supplier portal (#26823) (#27122) 
* fix: broken URL

The quotations are supplier quotations, not sales quotation.

* fix: remove erpnext from path

(cherry picked from commit c7bad657b1)

Co-authored-by: Dany Robert <rtdany10@gmail.com>
 2021-08-24 22:28:29 +05:30
Frappe PR Bot
b3ffa0eb57 fix(minor): Update GSTR-1 json version (#27074) (#27121) 
(cherry picked from commit c30fb04e96)

Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2021-08-24 22:28:07 +05:30
Anuja Pawar
8220117500 feat(regional): South Africa VAT Audit Report (#27017) 
* feat: SA VAT Report

* fix: added party column and fixed permissions

Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2021-08-24 22:02:05 +05:30
Deepesh Garg
74073ddc85 fix: Ignore due date validations if payment terms are copied from orders/receipts (#27120) 2021-08-24 21:56:49 +05:30
Frappe PR Bot
8474961b79 perf: reduce number of queries to validate selling price (#26225) (#27119) 
* perf: reduce number of queries to validate selling price

* fix: improved flow and formatting

* fix: improve condition and use of `as_dict`

Co-authored-by: Sagar Vora <sagar@resilient.tech>
(cherry picked from commit 7c957d72b3)

Co-authored-by: Pruthvi Patel <pruthvipatel145@gmail.com>
 2021-08-24 21:51:53 +05:30
Nabin Hait
487952a04e Merge branch 'version-13-hotfix' into fix-scrap-items-updation-bp 2021-08-24 21:08:14 +05:30
Frappe PR Bot
c7508a034a feat: allow draft pos invoices even if no stock available (#27078) (#27106) 
(cherry picked from commit f47cbae5e0)

Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
 2021-08-24 20:51:30 +05:30
18alantom
38898d33c6 fix: update scrap table item details; typo 2021-08-24 20:39:51 +05:30
Frappe PR Bot
0bf9d1b29f fix: pos invoice test (#27116) 2021-08-24 19:48:05 +05:30
Frappe PR Bot
a7cdba24bc feat: coupon code discount in pos invoice (#27103) 2021-08-24 19:47:40 +05:30
Saqib
f84740e6e4 fix: incorrect gl entry on period closing involving finance books (#27104) 2021-08-24 19:46:35 +05:30
Mohammad Hussain Nagaria
24b2a31581 feat: Employee reminders (#25735) 
* feat: Add reminders section to HR Settings

* refactor: Extract generic function for getting Employees

* feat: Employee Work Anniversary Reminder

* feat: Daily Holiday Reminder

* fix: Unnecessary params and replace [] with .get()

* test: Daily Holiday Reminders

* test: is_holiday basic tests

* refactor: Move employee reminders code to separate module

* feat: Add advance reminder to HR settings

* feat: Advance Holiday Reminders

* refactor: get_holidays_for_employee

* feat: Email holiday reminders in advance + tests

* fix: Remove unused import

* refactor: HR Setting Reminder Section

* refactor: Remove Daily Holiday Reminders feat

* feat: Reminder miss warning

* fix: Failing test and function name change

* chore: Add patch for field rename

* chore: Rename frequency label

* fix: Failing patch test

* fix: sider and removed description of fields

* fix: email alignment

Co-authored-by: pateljannat <pateljannat2308@gmail.com>
Co-authored-by: Jannat Patel <31363128+pateljannat@users.noreply.github.com>
 2021-08-24 19:43:43 +05:30
Anupam Kumar
f7e0edecc9 refactor: social media post fixes (#24664) 
* fix: social media post fixes

* feat: post metrics and some fixes

* fix: sider issues

* fix: sider issue

* fix: reverting optional chaning statements

* fix: sider issues

* fix: review chnages

* fix: text trigger check

* fix: sider issue
 2021-08-24 19:15:56 +05:30
Frappe PR Bot
d55d200b47 fix: calculation of gross profit percentage in Gross Profit Report (#27108) 2021-08-24 18:58:56 +05:30
Frappe PR Bot
c8092b7e7a fix: correct price list rate value in return si (#27105) 2021-08-24 18:41:16 +05:30
Syed Mujeer Hashmi
1604b6cc63 fix: Allow backdated discharge for inpatient (#25124) 
* fix: Allow backdated discharge for inpatient

The system is not flexible enough to allow backdated patient discharge.

Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in>

* fix: Sider issues and test cases related to this patch

Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in>

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
Co-authored-by: Jannat Patel <31363128+pateljannat@users.noreply.github.com>
 2021-08-24 18:35:59 +05:30
Rucha Mahabal
27fad29ad6 refactor: Healthcare Redesign Changes (#27100) 
* chore: reorder workspace cards

* fix: Patient Progress Page UI

* feat: redesign Patient History

* fix: redesign patient history card

* fix: filter style

* fix: sider

* fix: patient history and patient progress links

* fix: change percentage/donut charts to bar charts

-percentage charts broken in redesign

* fix(style): patient progress heatmap

* chore: semgrep and translation fixes

* fix: patient progress page card views

* fix: tests
 2021-08-24 17:54:28 +05:30
Deepesh Garg
0476accf26 fix: Payment Reconciliation link in Accounting Workspace (#27085) 2021-08-24 16:27:10 +05:30
marination
341d9b4b6d chore: Remove Home Page is Products and Sider fixes 
- Removed `Home Page is Products` checkbox in E Comm Settings. Can be manually set in Website Settings
- Removed hooks trigger to reset home page as products
- Sider: duplicate color attribute, shift `return` to next line, over-indentation
 2021-08-24 13:52:46 +05:30
Sagar Vora
925a4a28e2 Merge pull request #27092 from frappe-pr-bot/backport/version-13-hotfix/27008 
refactor: use `read_only_depends_on` instead of code
 2021-08-24 13:33:19 +05:30
Afshan
ac0800511d fix: resolved conflicts 2021-08-24 12:59:07 +05:30
Afshan
d360819384 Merge branch 'version-13-hotfix' into backport/version-13-hotfix/27008 2021-08-24 12:53:13 +05:30
Marica
ff6cda8547 Merge pull request #27096 from frappe-pr-bot/backport/version-13-hotfix/27043 
fix(ux): keep stock entry title & purpose in sync
 2021-08-24 12:46:31 +05:30
rohitwaghchaure
60c06d3194 Merge pull request #26455 from noahjacob/supplier_defaults_v13hf 
feat: fetching details from supplier/customer groups
 2021-08-24 12:31:01 +05:30
rohitwaghchaure
5320f3e5ea Merge branch 'version-13-hotfix' into supplier_defaults_v13hf 2021-08-24 12:28:16 +05:30
Ankush Menat
cc7ed1573a fix(ux): keep stock entry title & purpose in sync (#27043) 
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
(cherry picked from commit c09d8a2809)
 2021-08-24 06:55:25 +00:00
Marica
b932b3f252 Merge pull request #27093 from frappe-pr-bot/backport/version-13-hotfix/27014 
fix: stock analytics report date range issues and add company filter
 2021-08-24 12:21:43 +05:30
Frappe PR Bot
1e3a6a8a98 fix: discard empty rows from update items (#27021) (#27095) 
(cherry picked from commit 6de7b8ea93)

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-08-24 12:20:51 +05:30
Ankush Menat
0a23328151 fix: stock analytics report date range issues and add company filter (#27014) 
* test: tests for correct get_period_date_ranges

* fix: stock analytics report date range issues

- Upon selecting second half of month with Monthly filter, data from
  that period was missing.
- Solution: "round down" the date as per expected frequency.

* chore: drop py2 and fix misleading docstring

* test: fix test to avoid FY clash

* feat: add company filter in stock analytics report

[skip ci]

Co-authored-by: Marica <maricadsouza221197@gmail.com>
(cherry picked from commit 0dff0beaba)
 2021-08-24 06:47:49 +00:00
Pruthvi Patel
f08d7410be refactor: use read_only_depends_on instead of code (#27008) 
(cherry picked from commit 332ac105b5)

# Conflicts:
#	erpnext/accounts/doctype/pos_invoice/pos_invoice.js
#	erpnext/accounts/doctype/sales_invoice/sales_invoice.js
 2021-08-24 06:38:39 +00:00
marination
280f615ded Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into e-commerce-refactor 2021-08-24 11:48:13 +05:30
Nabin Hait
352157c9fc Merge pull request #27005 from frappe/addl_salary_fix-v13 
fix: Additional salary processing
 2021-08-24 10:35:51 +05:30
Deepesh Garg
85f582b145 Merge pull request #26725 from deepeshgarg007/payment_entry_validations_and_trigger 
fix: Multiple fixes in payment entry
 2021-08-23 18:03:11 +05:30
Frappe PR Bot
3d047b83fd fix: Eway bill test update to check ver 1.0.0421 (#27083) (#27084) 2021-08-23 15:43:30 +05:30
Frappe PR Bot
6814509f07 fix: eway bill version changed to 1.0.0421 (#27077) 2021-08-23 15:43:06 +05:30
Saqib
dbca11071e refactor: scan barcode field scanning (#26990) (#27076) 2021-08-23 11:23:46 +05:30
Deepesh Garg
dd688db54c Merge pull request #27072 from frappe-pr-bot/backport/version-13-hotfix/27069 
feat: Column for total amount due in Accounts Receivable/Payable Summary
 2021-08-22 23:15:58 +05:30
Deepesh Garg
be57dee57a Merge pull request #27068 from frappe-pr-bot/backport/version-13-hotfix/26975 
fix: Consolidated balance sheet showing incorrect values
 2021-08-22 18:14:15 +05:30
Deepesh Garg
67dbb2bd7f feat: Column for total amount due in Accounts Receivable/Payable Summary (#27069) 
(cherry picked from commit 496bff5136)
 2021-08-22 12:41:50 +00:00
Deepesh Garg
571178ffbe fix: Revert commit 46372fe 2021-08-22 18:02:51 +05:30
Deepesh Garg
9542da80c5 test: Update test cases 2021-08-21 19:36:38 +05:30