Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
33,920 Commits 3 Branches 0 Tags 1 GiB
fc01a838b5
Commit Graph

695 Commits

Author SHA1 Message Date
Walstan Baptista
0baebbdafe
fix: added Purchase Order to Global Search (#24055) 2020-12-08 09:43:29 +05:30
Leela vadlamudi
a3845a95ed
feat: Introducing telephony module (#24032) 2020-12-01 13:04:53 +05:30
Anurag Mishra
755b773616
feat: Leave policy assignment (#23112) 
* feat: Leave Policy Assignment

* feat: linking with leave allocation and valiations

* style: removed old code from leave period

* feat: Bulk Leave policy Assignment and grant Leaves

* fix: overlap validation

* feat: earned leaves based on joining date

* feat: automatic grant leave based on leave policy

* patch: create leave policy assignment based on employee current leave policy

* fix: dependent test cases

* test: Leave policy assignment

* fix: some enhancement

* style: break large function into small function

* fix:requested Changes

* fix(patch): Handled old Leave allocatioln

* fix:codacy

* fix: travis and sider,codacy

* fix: codacy

* fix: codacy

* fix: requested changes and sider

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-11-25 16:05:17 +05:30
Deepesh Garg
d07447aa5f
fix: Validation for duplicate Tax Category (#23978) 
* fix: Validation for duplicate Tax Category

* Update utils.py

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-11-24 08:09:17 +05:30
Deepesh Garg
f0187f6db2
Merge pull request #23447 from hasnain2808/UAE-VAT-Format 
feat: UAE VAT 201 Report
 2020-11-18 15:15:00 +05:30
Deepesh Garg
37dc369af9
feat: Sync old shopify orders (#23841) 
* feat: Sync old shopify orders

* fix: Old orders syncing by date

* fix: Remove unnecessary code

* fix: Remove unintentional changes

Co-authored-by: Saurabh <saurabh@erpnext.com>
 2020-11-13 16:53:35 +05:30
Rushabh Mehta
780b6b466b fix(hooks): include js/css with full path 2020-11-11 11:44:28 +05:30
Mohammad Hasnain Mohsin Rajan
6e9e6d2491
Merge branch 'develop' into UAE-VAT-Format 2020-10-28 21:06:11 +05:30
Rucha Mahabal
4887b69946
feat: Inpatient Medication Order and Entry (#23473) 
* feat: Inpatient Medication Order

* feat: Inpatient Medication Entry

* feat: update medication orders on medication entry submission

* feat: added custom fields for medication references in Stock Entry

* feat: make stock entry if update stock is checked in IPMOE

* fix: handle cancel event for Inpatient Medication Entry

* fix(ux): add link and progress bar to dashboard

* refactor(ux): Adding Medication Orders without linking to Patient Encounter

* fix: make medication entry child table read only

* fix: filter stock items during manual medication order creation

* fix: codacy

* chore: tests for Inpatient Medication Order

* chore: tests for Inpatient Medication Entry

* fix: code clean-up

* fix: filter for inpatients in IPMO

* fix: add datetime validations for IPME filters

* fix: do not hardcode stock entry type

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-10-23 20:33:30 +05:30
Mohammad Hasnain
75ccb62d46 Merge branch 'develop' into UAE-VAT-Format 2020-10-20 09:40:44 +05:30
Faris Ansari
22bcad9dc7 fix: Cleanup code 2020-10-16 15:28:12 +05:30
Abhishek Balam
6e9e7b4c7a fix: serverside validation overrides 2020-10-14 19:31:37 +05:30
Abhishek Balam
346ca568b7 fix: set company link in address when is_your_company_address is set 2020-10-14 18:11:04 +05:30
Mohammad Hasnain Mohsin Rajan
abf628c95d Merge branch 'develop' into UAE-VAT-Format 2020-10-14 00:26:57 +05:30
Mohammad Hasnain
ac451b3a54 feat(UAE VAT 21): Move standard rated expense from Sales invoice to Purchase invoice 2020-10-11 01:40:22 +05:30
Mohammad Hasnain
fc2ace1a31 Merge branch 'develop' into UAE-VAT-Format 2020-10-10 22:06:06 +05:30
Raffael Meyer
2acfc2a034
Merge branch 'develop' into validate_regional_germany 2020-10-06 16:53:52 +02:00
Faris Ansari
db8764a520
Merge pull request #23201 from alyf-de/website_theme_scss 
fix: style for website theme
 2020-09-30 18:26:58 +05:30
barredterra
81ad90c1d4 feat: validate sales invoice for germany 2020-09-29 11:54:57 +02:00
hasnain2808
23c8966e81 Merge branch 'develop' into UAE-VAT-Format 2020-09-28 20:06:02 +05:30
Anupam
77cf53201a feat: open lead status on next contact date 2020-09-28 18:38:41 +05:30
hasnain2808
3ef11b1d64 feat(UAE VAT 21): Add region fields for UAE VAT 21 2020-09-24 13:21:23 +05:30
Raffael Meyer
8b78bf19bd
Merge branch 'develop' into website_theme_scss 2020-09-23 11:38:59 +02:00
barredterra
60bfbbc5af fix: use path istead of hook 2020-09-11 16:05:10 +02:00
Gavin D'souza
71ac399369 fix: Commonified function and updated scheduler events 
Co-authored-by: marination <maricadsouza221197@gmail.com>
 2020-09-10 13:58:48 +05:30
hasnain2808
7b7a8e1309 feat: RCM for UAE VAT 2020-09-09 20:54:30 +05:30
Marica
54ab426c1c
Merge branch 'develop' into youtube-analytics 2020-09-07 18:54:11 +05:30
marination
06ee0ea00b feat: Added Scheduler Job to auto update statistics 
- Added frequency in Video Settings
- Cron job to check half hourly job
- Hourly job to run job based on frequency
- Patch to set youtube id in video for ease in computing
 2020-09-07 18:49:06 +05:30
barredterra
a162248f32 fix: use hook for website theme scss 2020-08-28 15:16:39 +02:00
Abhishek Balam
ee5b9c7691
feat(Accounting): Process Statement Of Accounts (#22901) 
* feat: Process Statement Of Accounts initial commit

* fix: add jinja supported inputs for subject and body in email settings

* feat: utils support in template, tested autoemail, fixed issues
 2020-08-11 16:23:47 +05:30
KanchanChauhan
2826fd3c20
feat: Dunning (#22559) 
* feat: Dunning

* fix: Replaces spaces with tab

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-07-23 15:45:03 +05:30
rohitwaghchaure
eb2a42d9e1
Merge pull request #22589 from deepeshgarg007/rcm_fix 
fix: Do not add GST tax amount in grand total for reverse charge invoices
 2020-07-14 13:42:48 +05:30
Deepesh Garg
3c004ad798 fix(GST): Do not add tax amount in grand total for reverse charge invoices 2020-07-02 21:18:29 +05:30
Sahil Khan
ad4eb649a2 chore: set develop version as 13.x.x 2020-06-30 17:54:41 +05:30
vishdha
d3ec1c1d89 feat: Taxjar Integration Added 2020-06-24 16:37:21 +05:30
Prssanna Desai
82ddef58c0
feat: date filter for fiscal year (#21880) 
* feat: date filter for fiscal year

* fix: rename fieldtypes to valid_for_fieldtypes

* Update utils.py

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-06-18 18:18:41 +05:30
Deepesh Garg
24f9a80e7d fix(India): Reverse charge mechanism for GST 2020-06-03 10:59:37 +05:30
Deepesh Garg
de03d2cba4 fix: Method in hooks for proccesing deferred revenue 2020-06-01 11:30:34 +05:30
Marica
c1a890a739
Merge branch 'develop' into quoted-item-report 2020-05-07 17:45:32 +05:30
Rohan Bansal
76825ab2bd fix: update lead if contact details are changed 2020-04-28 16:13:53 +05:30
rohitwaghchaure
77403abadd
Merge branch 'develop' into social-media-integration-feat 2020-04-25 17:37:24 +05:30
Ahmad
454b1cf48d
Hook Fix in the scheduler events (#21410) 2020-04-25 14:51:24 +05:30
Anupam K
790b9ee8d0 Merge branch 'develop' of https://github.com/frappe/erpnext into social-media-integration-feat 2020-04-18 01:51:47 +05:30
Anupam K
22318b2eb6 Linkedin, Twitter Integration 2020-04-18 01:46:38 +05:30
marination
1bab1539b1 Merge branch 'develop' of https://github.com/frappe/erpnext into quoted-item-report 2020-04-15 12:16:31 +05:30
marination
8179804405 refactor: Quoted Item Comparison Report 
- Refactored Report View
- Added Chart
- Added 'valid_till' date in Supplier Quotation
- Added patch to set valid_till and daily job to set expiry status
 2020-04-14 23:05:11 +05:30
Himanshu
b84333f26e
fix: move to hooks (#21205) 2020-04-14 13:02:03 +05:30
Rushabh Mehta
4c0484b60e
Merge pull request #20811 from ruchamahabal/healthcare_refactor 
refactor: Healthcare Module
 2020-04-13 17:16:02 +05:30
Deepesh Garg
03166fab56 Merge branch 'develop' of https://github.com/frappe/erpnext into employee_loan_fixes 2020-04-13 13:20:02 +05:30
Deepesh Garg
af27d61bee fix: Employee loan test case and other fixes 2020-04-13 12:29:00 +05:30