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

36143 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepesh Garg
8aa57953ee
Merge pull request #25490 from deepeshgarg007/psoa_fixes_v2 
fix: Ageing errors in PSOA
 2021-04-30 13:07:00 +05:30
Deepesh Garg
cd9fa61659
Merge pull request #25521 from ernestoruiz89/patch-4 
fix: Make strings translatable
 2021-04-30 12:58:26 +05:30
Deepesh Garg
26920b439a
Merge pull request #25394 from meike289/feature/check-field-subscription-invoice 
feat: new check field in subscriptions for (not) submitting invoices
 2021-04-30 12:32:45 +05:30
Deepesh Garg
0dc411951e
Merge pull request #25438 from nextchamp-saqib/round-off-diff-allowance 
fix: ignore fraction difference while making round off gl entry
 2021-04-30 11:11:21 +05:30
Deepesh Garg
1ec53c1cf2
Merge pull request #25518 from nextchamp-saqib/payment-term-amount-currency-fix-v13 
fix: payment amount showing in foreign currency
 2021-04-30 11:09:58 +05:30
Deepesh Garg
338a006e28
Merge pull request #25515 from Anuja-pawar/fix_PE_allocated_amt 
fix: update Allocated amount after Paid Amount is changed in PE
 2021-04-30 11:08:51 +05:30
Vignesh S
7783a56c08
fix: List invoices in Payment Reconciliation Payment 
Invoices are not listed in the Payment Reconciliation Payment table due to a typo in the code
 2021-04-29 22:39:42 +05:30
Ernesto Ruiz
76e1e68cf4
fix: Make strings translatable 
Make strings translatable
 2021-04-29 08:24:56 -06:00
Saqib Ansari
3e83542360 fix: sider issues 2021-04-29 18:12:47 +05:30
Saqib
2bde1baa38 fix: remove print statement 2021-04-29 18:12:42 +05:30
Saqib Ansari
6dd1c5cf92 refactor: remove extra fields 2021-04-29 18:12:36 +05:30
Saqib Ansari
3a5ecb7587 fix: test 2021-04-29 18:12:32 +05:30
Saqib Ansari
973afeac3c feat: set dynamic labels for payment schedule fields 2021-04-29 18:12:27 +05:30
Saqib Ansari
a91eebf6aa feat: base payment amount in payment schedule 2021-04-29 18:12:23 +05:30
Saqib Ansari
e70d9c925c fix: payment amount showing in foreign currency 2021-04-29 18:12:17 +05:30
Anuja Pawar
07fb98b91d
Merge branch 'develop' into fix_PE_allocated_amt 2021-04-29 17:17:21 +05:30
Anuja P
dd1e7624bf fix: changing paid amount should change allocated amount 2021-04-29 17:00:59 +05:30
Deepesh Garg
7bf25b4cef
Merge pull request #25292 from nextchamp-saqib/payment-term-amount-display-currency-fix 
fix: payment amount showing in foreign currency
 2021-04-29 16:33:01 +05:30
Mohammad Hasnain Mohsin Rajan
0dc00219e8
fix: coveralls different services for different events (#25513) 2021-04-29 15:21:16 +05:30
Saqib Ansari
6fb417590f fix: sider issues 2021-04-29 14:05:20 +05:30
Deepesh Garg
3386d4948e
Merge pull request #25507 from AfshanKhan/fix-cancel-loan 
fix: allow to cancel loan with cancelled repayment entry
 2021-04-29 12:31:52 +05:30
Saqib
83e3820575
fix: remove print statement 2021-04-29 12:21:56 +05:30
Noah Jacob
dc086dd52f
fix: item stock levels displaying inconsistently (#25506) 
* fix: fixed stock levels dashboard not displaying after any interactions

* fix: minor translation fix
 2021-04-29 11:03:27 +05:30
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