Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
36,120 Commits 3 Branches 0 Tags 1 GiB
5e88b14a01
Commit Graph

36120 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Afshan
ab052599c0 fix: allow to cancel loan with cancelled replayment entry 2021-04-28 20:21:04 +05:30
gavin
3b1ae4eb90
Merge pull request #25501 from ankush/remove_frappe_dep 
chore: remove frappe from requirements.txt
 2021-04-28 17:38:35 +05:30
Ankush Menat
64a38f52cf
chore: remove frappe from requirements.txt 
Due to recent changes in pip dependency resolver, in some random cases
pip thinks frappe is not installed and tries to fetch it from pypi,
which results in errors like #25496

Until a better solution is available, frappe should not be part
of requirements.txt
 2021-04-28 16:56:10 +05:30
Raffael Meyer
d75b4c37a3
Merge branch 'develop' into feature/check-field-subscription-invoice 2021-04-28 12:38:49 +02:00
Raffael Meyer
a949480acf
fix: add translation to make semgrep pass 2021-04-28 12:38:23 +02:00
Saqib Ansari
44b07e4ef5 refactor: remove extra fields 2021-04-28 15:11:57 +05:30
Saqib Ansari
da5b55c4f5 fix: test 2021-04-28 14:55:33 +05:30
Saqib Ansari
3f7ec95af8 Merge branch 'develop' of https://github.com/frappe/erpnext into payment-term-amount-display-currency-fix 2021-04-28 14:45:27 +05:30
Saqib Ansari
aa4f750d8c fix: test 2021-04-28 14:42:49 +05:30
Saqib Ansari
3f53b87379 Merge branch 'develop' of https://github.com/frappe/erpnext into round-off-diff-allowance 2021-04-28 14:34:51 +05:30
Mohammad Hasnain Mohsin Rajan
c9187b00af
fix: change coveralls version (#25499) 2021-04-28 13:32:27 +05:30
Nabin Hait
f085c89994 Merge branch 'version-13-hotfix' into version-13 2021-04-27 20:08:01 +05:30
Nabin Hait
b7fea12cdf Merge branch 'version-13' into develop 2021-04-27 20:08:01 +05:30
Nabin Hait
3e5c6424ed bumped to version 13.1.1 2021-04-27 20:28:01 +05:50
Rucha Mahabal
a86a51f020 fix(HR): Permission error while adding weekly holidays (#25450) 2021-04-27 20:01:49 +05:30
Saqib
7b3dd3585b fix: unexpected keyword argument 'merge_logs' (#25489) 
* fix: unexpected keyword arguement 'merge_logs'

* fix: reference error

* fix: test
 2021-04-27 20:01:08 +05:30
Saqib
ad4365eb0e
fix: unexpected keyword argument 'merge_logs' (#25489) 
* fix: unexpected keyword arguement 'merge_logs'

* fix: reference error

* fix: test
 2021-04-27 20:00:21 +05:30
Deepesh Garg
8a1e5e189c fix: Ageing errors in PSOA 2021-04-27 16:57:34 +05:30
barredterra
5b9d3f15a2 docs: replace whitespace indent in docstring with tabs 2021-04-27 12:34:10 +02:00
Raffael Meyer
b2be91e731
Merge branch 'develop' into datev_fixes 2021-04-27 12:21:14 +02:00
rohitwaghchaure
b9078a0c86
Merge pull request #25126 from rohitwaghchaure/purchase-invoice-to-purchase-receipt-develop 
feat: purchase receipt creation from purchase invoice
 2021-04-27 09:56:28 +05:30
Deepesh Garg
ebc6c51abe
Merge pull request #25384 from deepeshgarg007/psoa_fixes 
fix: Updated filters for process statement of accounts
 2021-04-26 22:58:42 +05:30
Afshan
df06e49e0c
feat: enable custom field search on POS (#25421) 
* feat: multi lingual item search in POS

* fix: limit the options for selection and broken down funtion for geting condition
 2021-04-26 22:48:13 +05:30
Anurag Mishra
7f1b2de74d
feat: Employee Referral (#24997) 
* feat: Employee referal design and status sync

* feat: create job Applicant and linked Document

* feat: Added list view indicator

* chore: formatted file

* feat: Addedd Employee Referral form Dashboard

* feat: pay compensation via additional salary

* test: Employee Rreferral

* Update erpnext/hr/doctype/employee_advance/employee_advance.js

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>

* fix: changes requested

* fix: changes requested

* fix: sider

* fix: translation

* fix: test

* feat: added to Dashboard

* fix: changes

* chore: clean-up Employee Referral form

- fix labels

- fix full name field

- fix failing test

- set title for Employee Referral form

- set fields in List View and Standard Filter

* feat: option to add a resume link

- copy resume and resume link from Employee Referral to Job Applicant

* fix: multiple fixes

- confirm before rejecting employee referral

- set primary actions for custom buttons

- Validations for additional salary against employee referrals with status as accepted only

- fix list view indicators

- code formatting style

* feat: Add field to track Referral Bonus Payment Status

- fix visibility of additional salary button

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-04-26 22:23:48 +05:30
Nabin Hait
2ddca77243 Merge branch 'develop' into version-13-pre-release 2021-04-26 21:12:07 +05:30
Saqib
b643776c53
feat(e-invoicing): auto calculate distance for e-way bill generations (#25480) 2021-04-26 17:12:20 +05:30
Rucha Mahabal
1608658700
Merge pull request #25209 from NagariaHussain/employee-util-report 
feat: Employee Hours Utilization Report
 2021-04-26 17:04:35 +05:30
Saqib
34ce4edf29
fix: cannot scan spacebar character in pos (#25479) 2021-04-26 16:38:57 +05:30
Rucha Mahabal
d5ca9474ce fix: add employee name in report data 2021-04-26 16:10:06 +05:30
Rucha Mahabal
926a9aed58
Merge branch 'develop' into employee-util-report 2021-04-26 16:03:39 +05:30
Rucha Mahabal
7a84d76489 fix: tests 2021-04-26 16:03:10 +05:30
Ankush Menat
9178d95cca
fix: can not create item variants (#25433) 
* fix: item_code assigned to function returning None

* fix: ignore has_variants and attributes in variant

* fix: patch to remove has_variants and attributes

* chore: fix whitespace in translation
 2021-04-26 15:37:17 +05:30
Jannat Patel
616f1d3624
fix: issue in project custom status (#25452) 2021-04-26 15:35:49 +05:30
Sagar Vora
71342320ce
fix(Italy): multiple fixes in import supplier invoice (#25466) 
* fix(Italy): remove incorrect method, use defined variable

* fix: show attach section after save; use db_set
 2021-04-26 15:32:28 +05:30
Ankush Menat
c2de4f6b35
chore: update snyk (#25477) 2021-04-26 15:28:17 +05:30
Deepesh Garg
4c8d15b487
fix: Incorrect GL Entry validation (#25474) 
* fix: Incorrect GL Entry validation

* fix: Add validation for party accounts

* fix: Scrub labels

* fix: Translation
 2021-04-26 15:24:34 +05:30
Deepesh Garg
ab7664e595
Merge pull request #25444 from deepeshgarg007/gstr_backward_compatiability 
fix: Backward compatibility for GSTR-1 report
 2021-04-26 15:09:55 +05:30
Deepesh Garg
0b9aa58b81 Merge branch 'develop' of https://github.com/frappe/erpnext into psoa_fixes 2021-04-26 14:51:20 +05:30
Deepesh Garg
968ec110f3 fix: Linting and translation issues 2021-04-26 14:51:00 +05:30
Deepesh Garg
cac3fd3a24
Merge pull request #25460 from Anuja-pawar/fix_allocated_amt_in_PE 
fix: to update Allocated amount after Paid Amount is changed in PE
 2021-04-26 13:29:17 +05:30
Rucha Mahabal
4716ebea5a feat: Add % Utilization (Billed Only) 
- Added billed utilization metric in report summary
 2021-04-26 11:40:26 +05:30
Anuja Pawar
fee9a56d4e
Merge branch 'develop' into fix_allocated_amt_in_PE 2021-04-26 11:36:10 +05:30
Anuja P
802518b8ac Merge branch 'fix_allocated_amt_in_PE' of https://github.com/Anuja-pawar/erpnext into fix_allocated_amt_in_PE 2021-04-26 11:34:33 +05:30
Anuja P
f74d8d2e16 fix: suggested changes 2021-04-26 11:31:51 +05:30
Rucha Mahabal
2a1a472371 chore: clean-up 
- set default date filters for last month instead of year

- added abbreviations for columns to use them in the metrics labels
 2021-04-26 11:18:32 +05:30
Shadrak Gurupnor
b9d4719285
fix: circular loop in project task (#25454) 
* fix: circular loop in project task
 2021-04-26 11:14:07 +05:30
Rucha Mahabal
0decc2b66a fix: validate Standard Working Hours 
- use standard working hours in metrics calculation
 2021-04-26 11:00:54 +05:30
Rucha Mahabal
b7a7e1b11a
Merge branch 'develop' into employee-util-report 2021-04-26 10:25:42 +05:30
Rucha Mahabal
9d6520d4a7
Merge pull request #24944 from pateljannat/profitability-report 
feat: Project Profitability Report
 2021-04-26 10:02:36 +05:30
Rucha Mahabal
e939da982e
Merge branch 'develop' into profitability-report 2021-04-26 09:17:12 +05:30