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

33769 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepesh Garg
f57089532a
Merge pull request #24252 from deepeshgarg007/partial_security_unpledge 
fix: Partial loan security unpledging
 2020-12-30 21:37:52 +05:30
Mohammad Hasnain Mohsin Rajan
11176852eb
Merge branch 'develop' into bugfix_typo_update 2020-12-30 20:59:38 +05:30
Deepesh Garg
9716216632 fix: check for string types 2020-12-30 20:33:35 +05:30
Deepesh Garg
a60707873c fix: Partial loan security unpledging 2020-12-30 20:24:15 +05:30
Karthikeyan S
aa44c754de
fix(GST E Invoice): update live URLs for adaequare GSP (#24248) 2020-12-30 19:22:37 +05:30
Deepesh Garg
5891b48cf6
Merge pull request #24176 from GangaManoj/Year-to-Date 
feat: Add year_to_date field (cumulative salary for a fiscal year)
 2020-12-30 16:53:47 +05:30
rohitwaghchaure
bb0fd33ac5
Merge pull request #24169 from Anurag810/payroll-entry-fixes 
fix: allow addition and removal of employee in payroll Entry
 2020-12-30 16:50:02 +05:30
Deepesh Garg
66dcaf3ab2 fix: Salary structure assignment in tests 2020-12-30 15:47:22 +05:30
Saqib
f946bbd032
fix: minor e-invoicing issues (#24239) 
* fix: invoice value set to zero if rounded total disabled

* fix: unit rate & gross amount calculation

* fix: e-invoice-setup patch

* chore: no need to re-run the patch

* fix: item value & invoice value calculations
 2020-12-30 14:43:42 +05:30
Deepesh Garg
97d055dfc3 fix: Test Case 2020-12-30 14:06:13 +05:30
Anurag Mishra
b7631af741
Merge branch 'develop' into payroll-entry-fixes 2020-12-30 13:22:13 +05:30
Deepesh Garg
8b7ebe5044 fix: Test Case cleanup and fixes 2020-12-30 12:45:46 +05:30
Deepesh Garg
20133bd1df fix: Remove comments 2020-12-29 22:19:12 +05:30
Deepesh Garg
7e4eacba8d Merge branch 'develop' of https://github.com/frappe/erpnext into Year-to-Date 2020-12-29 22:13:55 +05:30
Deepesh Garg
353f8f4d85 fix: Add test case for YTD 2020-12-29 22:13:40 +05:30
Anurag Mishra
15af7a4afc
Merge pull request #24226 from AfshanKhan/asset-report 
fix: asset depreciation ledger
 2020-12-29 18:58:56 +05:30
Deepesh Garg
60b77f9865 Merge branch 'develop' of https://github.com/frappe/erpnext into Year-to-Date 2020-12-29 18:26:32 +05:30
rohitwaghchaure
b09ddc4672
Merge pull request #24233 from rohitwaghchaure/back-dates-allow-field-issue 
fix: option name for the field 'Role Allowed to Create/Edit Back-dated Transactions'
 2020-12-29 17:52:43 +05:30
Raffael Meyer
a3462f6b0c
Merge branch 'develop' into validate_regional_germany 2020-12-29 11:58:57 +01:00
Rohit Waghchaure
81285204dc fix: option name for the field 'Role Allowed to Create/Edit Back-dated Transactions' 2020-12-29 16:25:45 +05:30
rohitwaghchaure
25bc9851f0
Merge pull request #24220 from rohitwaghchaure/fixed-finished-product-qty 
fix: finished good produced qty validation
 2020-12-29 13:41:03 +05:30
Anurag Mishra
5af8d2b883
Merge branch 'develop' into payroll-entry-fixes 2020-12-29 13:09:42 +05:30
Afshan
91e3c07d77 fix: assest depreciation ledger 2020-12-28 19:42:46 +05:30
marination
a69e81a151 chore: Made 'Parameter' a link field in QI and QI Template 
- Added doctype Quality Inspection Parameter
- Made 'Parameter' a link field in QI and QI Template
- Added patch to create Quality Inspection Parameter records for every parameter in the system
 2020-12-28 18:07:22 +05:30
marination
29a03bd5a1 feat: Add 'Manual Inspection' checkbox 
- fix merge conflict in js file
- Dont auto set status if manual inspection is checked
- Added 'Manual Inspection' checkbox in QI readings table
 2020-12-28 16:59:13 +05:30
Deepesh Garg
b75f198648
Merge pull request #24223 from frappe/revert-24087-batch-wise-pricing 
Revert "feat: Batch wise item selling pricing"
 2020-12-28 15:42:42 +05:30
rohitwaghchaure
527b7e16e5
Revert "feat: Batch wise item selling pricing" 2020-12-28 15:29:30 +05:30
Marica
62f9cc6c5a
Merge branch 'develop' into qi-ux 2020-12-28 15:09:15 +05:30
rohitwaghchaure
72e8ec5eee
Merge pull request #24087 from deepeshgarg007/batch-wise-pricing 
feat: Batch wise item selling pricing
 2020-12-28 14:37:33 +05:30
Rohit Waghchaure
40d2c6a0cc fix: finished good produced qty validation 2020-12-28 14:08:45 +05:30
Rucha Mahabal
e1b9707ec1
Merge pull request #24152 from ruchamahabal/fix-therapy-type-filter 
fix: filter Therapy Types and Therapy Plan in Patient Appointment
 2020-12-28 11:36:34 +05:30
Deepesh Garg
d3814b2676 Merge branch develop into batch-wise-pricing 2020-12-28 10:48:29 +05:30
Deepesh Garg
d4fc451c2a
Merge pull request #24191 from nextchamp-saqib/accounting-entries-for-asset 
fix: accounting entries of asset when submitting purchase receipt
 2020-12-26 19:14:32 +05:30
Saqib
60a1d25196
fix: cancelling of asset value adjustement (#24193) 2020-12-26 13:01:49 +05:30
rohitwaghchaure
9f1e1f6c23
Merge pull request #24207 from rohitwaghchaure/fixed-serial-no-return-issue 
fix: partial serial no return issue
 2020-12-26 12:12:04 +05:30
Nabin Hait
0788df412c fix: Removed permissions from UAE VAT Settings 2020-12-25 20:54:01 +05:30
Nabin Hait
b99c77b753
Reposting fixes (#24202) 
* fix: finished item validation and rate

* fix: Check if stock and account balance in sync after reposting

* fix: validate stock accounts in journal entry

* fix: validate expense against budget
 2020-12-25 18:12:35 +05:30
hasnain2808@gmail.com
46d5f4c7f1 refactor(analytics report): linting 2020-12-25 16:34:43 +05:30
rohitwaghchaure
fa0a075e95
Merge pull request #24196 from scmmishra/fix-file-url-employee 
fix: use file_url to save file and not file name
 2020-12-25 16:22:15 +05:30
rohitwaghchaure
ebcd4c454e
Merge pull request #24209 from rohitwaghchaure/added-shipment-link-in-delivery-note 
fix: added shipment link in delivery note dashboard
 2020-12-25 16:07:35 +05:30
Rohit Waghchaure
dab1ab990d fix: partial serial no return issue 2020-12-25 15:25:16 +05:30
rohitwaghchaure
de10d7dcf2
Update shipment.py 2020-12-25 15:15:55 +05:30
Rohit Waghchaure
5bcc6c6b15 fix: added shipment link in delivery note dashboard 2020-12-25 15:02:53 +05:30
Saqib
6d74f5b59b
feat: GST E Invoicing (#23455) 
* feat: init e-invoice settings

* feat: read public key file

* feat: rsa encryption with public key

* feat: save token and sek from auth request

* chore: handle error response

* feat: AES decryption of SEK with appkey

* feat: decrypt json data with SEK

* feat: make e invoice from erpnext sales invoice

* feat: generate IRN

* feat: decode signed json and QR code

* chore: validations

* feat: cancel IRN

* feat: complete e-invoice schema

* chore: move e-invoice settings to regional

* chore: split einvoice settings and operations

* chore: rename schema to template & js cleanup

* feat: make IRN field on regional setup

* feat: Generate & Cancel IRN from Sales Invoice

* chore: minor fixes

* fix: item discount

* chore: show irn cancelled check after cancellation

* fix: hide cancel irn dialog on error

* fix: public key is required on validate

* fix: cannot find attached key file

* fix: validation if e invoicing is disabled

* fix: do not show generate irn for invalid supply type

* fix: update irn_cancelled after cancelling irn

* chore: show irn field for proper gst_category

* feat: e-way bill details in e-invoice

* fix: save e-way bill no on irn generation

* chore: no copy on e invoice custom fields

* feat: cancel e-way bill before cancelling IRN

* feat: manual download / upload json

* chore: group e-invoicing actions

* fix: fn name

* chore: save signed invoice and qrcode after uplaoding irn

* fix: fetch token if not valid

* chore: move einvoicing stuff to seperate folder

* feat: QRCode Image and E-Invoice Print Format

* fix: bug

* fix: invalid syntax

* chore: code cleanup

* chore: clean up e invoice actions

* fix: download & upload e-invoice

* fix: print format

* fix: validations

* fix: add permissions on regional setup

* feat: add patch

* fix: validate document name

* fix: return date

* fix: credit note einvoice

* fix: validations

* fix: error logging

* fix: e_invoice module not found

* fix: add missing package

* fix: rename e_invoice_utils.py

* fix: einvoice field validation

* fix: patch

* fix: invoice totals calculation

* fix: other charges calculation

* chore: improve document name validation message

* fix: qr code image string

* feat: initialize GSP connector

* chore: remove unwanted fields

* fix: qr code generation

* feat: fetch and cache GSTIN details

* feat: generate & cancel IRN

* feat: cancel eway bill

* chore: remove unwanted fuctions

* chore: clean up einvoice actions

* fix: attach qrcode on irn generation

* fix: generate & cancel IRN

* fix: show/hide eway bill fields

* fix: valiations

* feat: generate eway bill from IRN

* chore: remove unwanted imports

* chore: error logging

* feat: header & footer in GST E Invoice

* chore: remove test pincode

* fix: invalid syntax

* feat: cess non advolem on einvoice item

* chore: remove fetch token from e invocie settings

* fix: imports

* fix: error handling

* feat: update timeline on einvoice actions

* fix: qrcode image size

* fix: exclude intra company transactions

* fix: eway bill test

* fix: ewaybill mandatory conditions

* chore: add tests

* fix: returning condition

* feat: log e-invocing requests

* chore: add ack date and ack no field for print formats

* fix: sider issues

* feat: show e-invoice preview before IRN generation

* fix: use as_list for error message

* fix: minor ux issues

* fix: dialog is undefined

* fix: error handling

* feat: add docs link to e invoice settings

* feat: multiple gstins for e invoicing

* fix: uncomment test condition

* fix: remove test pincode

* fix: cannot cancel irn without submitting sales invoice

* chore: code cleanup

* fix: sider issues

* fix: e invoice request log permissions

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-12-25 10:26:43 +05:30
rohitwaghchaure
4e9361f74b
Merge pull request #24204 from rohitwaghchaure/pricing-rule-not-working-margin 
fix: multiple pricing rule with margin type as Percentage is not working
 2020-12-25 09:33:39 +05:30
Rohit Waghchaure
aea62da544 fix: multiple pricing rule with margin type not working 2020-12-24 22:44:31 +05:30
rohitwaghchaure
b9352b729a
Merge pull request #24063 from rohitwaghchaure/fixed-job-card-cacncel-flow-develop 
fix: don't cancel job card if manufacturing entry has made
 2020-12-24 17:46:45 +05:30
rohitwaghchaure
630258f493
Merge pull request #24164 from rohitwaghchaure/do-not-manufacture-same-serial-no-two-develop 
fix: do not manufacture same serial no multiple times
 2020-12-24 17:46:26 +05:30
Rucha Mahabal
d013d94e8d
Merge branch 'develop' into fix-therapy-type-filter 2020-12-24 17:44:25 +05:30
Rohit Waghchaure
304100db3b fix: don't cancel job card if manufacturing entry has made 2020-12-24 16:36:37 +05:30