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,286 Commits 402 Branches 1,702 Tags
258efd5949b35dcc7a67b1eb2e1d6de332c1ca12
Commit Graph

37286 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Suraj Shetty
258efd5949 Merge pull request #27311 from surajshetty3416/fix-remove-all-import-version-13-hotfix 2021-09-02 13:22:14 +05:30
Suraj Shetty
6751290988 fix: Use remove_all from file_manager 2021-09-02 13:20:34 +05:30
Devin Slauenwhite
e10fede1ae fix: track salary slip ytd gross salary. (#27215) 
* fix: track salary slip ytd gross salary.

* fix: ytd gross salary unique label

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
Co-authored-by: Jannat Patel <31363128+pateljannat@users.noreply.github.com>
 2021-09-02 09:40:28 +05:30
Anupam Kumar
6d7ecb9290 Merge pull request #27291 from anupamvs/comany-name-field-issue 
fix: mapping for company name lead->contact
 2021-09-02 09:33:00 +05:30
Frappe PR Bot
cf4ff46c1e fix: Org Chart fixes (#27290) (#27305) 
* fix(org chart): multiple root nodes not expanding on clicking Expand All

* fix: unstable filter inserts duplicate nodes

(cherry picked from commit f828d853e3)

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-09-01 23:53:23 +05:30
Ankush Menat
9d0b5f1a0d Merge pull request #27299 from ankush/strict_linting_v13 
chore: cleanup linting errors and introduce strict linting checks
 2021-09-01 21:16:47 +05:30
Ankush Menat
5a9750c144 Merge pull request #27296 from frappe-pr-bot/backport/version-13-hotfix/27278 
fix: production plan UX and validation message
 2021-09-01 20:38:16 +05:30
Ankush Menat
4069f6c9ac fix: remove duplicate code 2021-09-01 20:27:30 +05:30
Ankush Menat
4fe475b93d chore: ignore whitespace changes in blame 2021-09-01 20:24:30 +05:30
Ankush Menat
f0bcb753fb chore: whitespace trimming 2021-09-01 20:23:48 +05:30
Ankush Menat
77aef302e4 ci: add strict config for flake8 2021-09-01 20:22:00 +05:30
Ankush Menat
b92310eb35 ci: add pre-commit config 2021-09-01 20:21:52 +05:30
Ankush Menat
9ad5de2e57 fix: remove unused format from query 
doctype is not used in query and parent alone is enough to identify
packed items.
 2021-09-01 20:21:21 +05:30
Ankush Menat
187c3f9630 fix: invalid escape sequences in regex 2021-09-01 20:20:32 +05:30
Ankush Menat
1c63cbb1e4 fix: remove duplicate imports 2021-09-01 20:18:45 +05:30
Ankush Menat
0519b59aa9 fix: undefined variables 2021-09-01 20:16:38 +05:30
Ankush Menat
81391ed54f refactor: itemgetter instead of assigned lambda 2021-09-01 20:16:31 +05:30
Ankush Menat
8746466412 chore: correct indentation 2021-09-01 20:16:24 +05:30
Ankush Menat
76f1ed624a fix: remove bare excepts 2021-09-01 20:15:54 +05:30
rohitwaghchaure
71e1615925 fix: production plan UX and validation message (#27278) 
(cherry picked from commit 2a8cd05b44)
 2021-09-01 13:49:52 +00:00
Marica
331ec13012 Merge pull request #27294 from frappe-pr-bot/backport/version-13-hotfix/27293 
fix: Zero division error while fetching unconsumed materials
 2021-09-01 19:11:26 +05:30
Marica
d382c3c101 fix: Zero division error while fetching unconsumed materials (#27293) 
`

(cherry picked from commit 9506c14d35)
 2021-09-01 13:20:16 +00:00
Ganga Manoj
c4bda6374b fix: calculate first_response_time based on working hours (#26520) 2021-09-01 18:25:36 +05:30
Anupam
5518900af9 fix: mapping for company name lead->contact 2021-09-01 17:45:46 +05:30
Anuja Pawar
d81e837667 refactor: payment reconciliation tool (#27284) 2021-09-01 15:20:37 +05:30
Frappe PR Bot
1f1841d232 ci(semgrep): add translation checks for report labels (#27280) (#27286) 
* ci(semgrep): add translation checks for report labels

* refactor: shift report tests to it's own yml

path can't be applied on a test id basis

* ci: ignore regional report in translation checks

[skip ci]

(cherry picked from commit 72ece75b11)

Co-authored-by: Alan <2.alan.tom@gmail.com>
 2021-09-01 14:27:00 +05:30
Frappe PR Bot
883e1394ba fix: translate labels (#27282) (#27283) 
[skip ci]

(cherry picked from commit 9dc0843cbd)

Co-authored-by: Alan <2.alan.tom@gmail.com>
 2021-09-01 13:00:48 +05:30
Frappe PR Bot
0f00bcda34 fix: Healthcare Service Unit fixes (#27273) (#27275) 
* fix: validate service unit setup against practitioner schedule

* fix: service unit properties getting overwritten

(cherry picked from commit ef76f62bc1)

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-08-31 21:18:34 +05:30
Frappe PR Bot
1063d85569 fix: Correct company address not getting copied from Purchase Order to Invoice (#27217) (#27235) 
* fix: Correct company adderess not getting copied from Purchase Order to Invoice

* fix: Linting issues

(cherry picked from commit fd467e6d32)

Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
 2021-08-31 20:11:21 +05:30
Frappe PR Bot
1b338d678a fix: revert "refactor: simplify initialize_previous_data" (#27270) (#27272) 
This reverts commit 2f5624e588.

(cherry picked from commit c1d986a0c6)

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-08-31 19:46:25 +05:30
Frappe PR Bot
d5d193b015 Revert "fix: add child item groups into the filters (#26997)" (#27266) (#27269) 
This reverts commit c60d5523bc.

(cherry picked from commit 763450dcf8)

Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
 2021-08-31 19:12:24 +05:30
Frappe PR Bot
891bccf2c1 fix(minor): Incorrect unallocated amount on type receive (#27262) (#27264) 
(cherry picked from commit c37cec9b9d)

Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2021-08-31 18:53:49 +05:30
Sun Howwrongbum
63cf012c24 fix: pos payment methods not setting rounded_total (#27251) 2021-08-31 18:26:20 +05:30
skjbulcher
a1e5a64a66 fix: payment terms on Sales Order when Invoice Portion field is empty 2021-08-31 18:24:12 +05:30
Frappe PR Bot
2dc2dac56a fix: email digest original_user issue (#27191) (#27256) 
(cherry picked from commit 48f2e5ac1d)

Co-authored-by: Jannat Patel <31363128+pateljannat@users.noreply.github.com>
 2021-08-31 18:08:33 +05:30
Raffael Meyer
366eb86fdf feat: color and leave type in leave application calendar (#27246) 
* feat: color and leave type in leave application calendar

* fix: sider + use cstring
 2021-08-31 17:00:44 +05:30
Alan
c1354047a3 fix: pass labels through translation function (#27254) 2021-08-31 15:16:50 +05:30
Frappe PR Bot
45059571f0 fix(payroll): Fixed issue with accessing last salary slip for new employee (#27247) (#27253) 
(cherry picked from commit 88d849320f)

Co-authored-by: Chillar Anand <anand21nanda@gmail.com>
 2021-08-31 14:46:37 +05:30
Frappe PR Bot
a3c12939ed fix(test): first check for org chart always fails (#27250) 
* fix(test): first check for org chart always fails (#27249)

(cherry picked from commit 52dd326f22)

# Conflicts:
#	cypress/integration/test_organizational_chart_desktop.js

* fix: conflict

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-08-31 14:13:23 +05:30
Frappe PR Bot
fb8c917b97 fix: LTV ratio comparison (#27207) (#27212) 
(cherry picked from commit f5cdbf161d)

Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2021-08-31 11:46:12 +05:30
Frappe PR Bot
aa04051416 fix: patches were breaking during migration (#27213) 
* fix: patches were breaking during migration (#27200)

* fix: patches were breaking during migrating

* fix: patches were breaking during migration

(cherry picked from commit 7433757489)

# Conflicts:
#	erpnext/patches.txt

* fix: resolve conflicts

Co-authored-by: Shadrak Gurupnor <30501401+shadrak98@users.noreply.github.com>
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-08-30 18:51:10 +05:30
Frappe PR Bot
076e8e9da0 fix: Stock Ageing report issues for serialized items (#27228) (#27239) 
* fix: incorrect calculation in get_range_age

* fix: remove serial numbers not in stock from fifo_queue

* refactor: make serial_no condition explicit

* refactor: reduce code duplication


Co-authored-by: Dany Robert <rtdany10@gmail.com>
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>

(cherry picked from commit 5fd04101d4)
 2021-08-30 18:35:52 +05:30
Frappe PR Bot
a0cf396712 fix: expense claim reimbursed amount update (#27204) (#27229) 
(cherry picked from commit 9cb642238f)

Co-authored-by: Subin Tom <36098155+nemesis189@users.noreply.github.com>
 2021-08-30 17:54:57 +05:30
Marica
3d87d9f1d3 feat: (consistency) Add Primary Address and Contact section in Supplier (#27232) 
* feat: (consistency) Add Primary Address and Contact section in Supplier

- The same is present in customer and is inconsistent with supplier
- Helps quickly create primary address and contact via quick entry

* fix: Popup stale build and data consistency

- Include `supplier_quick_entry.js` in erpnext.bundle.js
- Create primary supplier address on update
- Set newly created address (quick entry)  in Supplier and Customer
- Clear address set in supplier and customer on delete (dependency)

* fix: Indentation and removed f-strings

- Sider: fixed indentation in js
- Dont use f-strings in queries
 2021-08-30 16:56:31 +05:30
Frappe PR Bot
b2d3b8a5ff fix: replace cur_frm with frm (bp #27210) 
(cherry picked from commit 327071cb90)

Co-authored-by: François de Ryckel <f.deryckel@gmail.com>
 2021-08-30 15:46:28 +05:30
Frappe PR Bot
dc948cab3e ci: use node action instead of apt (#27226) 
* ci: use node action instead of apt (#27220)

(cherry picked from commit e5e00700e5)

* ci: keep python version 3.6 for v13

* ci: use node v12

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-08-30 12:32:43 +05:30
Saqib
085585cbe2 fix: remove non-existent method call in hooks (#27223) 2021-08-30 11:44:26 +05:30
Frappe PR Bot
ee76032fca fix: patches were breaking while migrating (#27206) 
* fix: patches were breaking while migrating (#27195)

* fix: patches were breaking while migrating

* fix: Removed duplicate function

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
(cherry picked from commit 17e0fa7a8b)

# Conflicts:
#	erpnext/patches.txt

* fix: resolve conflicts

Co-authored-by: Shadrak Gurupnor <30501401+shadrak98@users.noreply.github.com>
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-08-28 14:54:14 +05:30
Frappe PR Bot
1e97f87c5b feat(healthcare): Added Treatment Plan Template feature (#27185) 
* feat(healthcare): Added Treatment Plan Template feature (#26557)

* feat: Added doctypes for treatment plan template

* feat: Added child doctype

* feat: Added validations for patient age

* chore: Clean up treatment plan template

* fix: Limit plan items to templates

* Added multiselectdialogbox for treatment plan template

* Add template name as autoname

* Clean up code

* Cleanup lint issues

* Clean up code

* Added tests for tpt filters

* Added test records

* Fix order of fields

* Added tests for care plan template

* Added age property for patient

* Clean up code

* Clean up list view

* Clean up code

* Fix lint issues

* Clean up test records

* Code cleanup

no-docs

* chore: Code cleanup

* chore: Use ORM instead of raw sql

* fix: Make treatment plan item fields mandatory

* fix: Added healthcare roles in permissions rules

* fix: Added filters for symptoms, diagnosis

* fix: Show applicable treatment plans button only if patient is present

* fix: Fix key error issues

* fix: Fix issues with filters in plan templates

* chore: Fix age filters

* refactor: appending treatment plan items

* fix: treatment plan test

Co-authored-by: Jannat Patel <31363128+pateljannat@users.noreply.github.com>
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
(cherry picked from commit f1b77360ee)

# Conflicts:
#	erpnext/healthcare/doctype/patient/patient.py

* chore: Fix merge conflicts

Co-authored-by: Chillar Anand <anand21nanda@gmail.com>
 2021-08-27 16:18:34 +05:30
Frappe PR Bot
c4a845d29b fix: period closing voucher tests (#27198) (#27199) 
(cherry picked from commit 987746592c)

Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
 2021-08-27 16:15:57 +05:30