Ankush Menat
1bdf9c4161
fix: patch for purchase receipt status
2021-04-01 11:58:34 +05:30
marination
7665a85039
fix: Run Patches to updated Reserved, Requested and Ordered Qty
2021-03-31 21:03:55 +05:30
Saqib
0586b7db79
feat: discount configuration on early payments ( #24586 )
...
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-03-31 15:03:53 +05:30
Prssanna Desai
3da2df55f4
Merge branch 'develop' into help-links-fix
2021-03-26 15:35:17 +05:30
Mohammad Hasnain Mohsin Rajan
52701dcbbc
fix: patch regional fields for old companies ( #24988 )
2021-03-25 12:56:33 +05:30
prssanna
194dd12882
fix: re-execute add_standard_navbar_items patch
...
- check that same items aren't appended again
2021-03-24 16:45:32 +05:30
Syed Mujeer Hashmi
f114da2f67
refactor: Make Discharge Schedule Date as Datetime ( #24940 )
...
* refactor: Make Discharge Schedule Date as Datetime
Like Admitted Datetime make discharge date as discharge datetime.
Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in>
* fix: Add patch for renaming discharge_date to discharge_datetime
Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in>
* fix: quote style
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-03-23 17:48:25 +05:30
Rushabh Mehta
45735b35c4
fix(minor): login: set as Login to ERPNext
2021-03-16 12:22:31 +05:30
Nabin Hait
6e3668dc30
fix: merge conflict
2021-03-11 16:14:27 +05:30
Rucha Mahabal
be2c1fca7b
feat(Non Profit): 80G Certificates and Donations ( #24657 )
...
* feat: 80G Certificates
* feat: add non-profit custom fields for India
* feat: 80G Certificate print format for memberships
* feat: Donation doctype and API endpoint to capture donations via razorpay
* chore: Rename Membership Settings to Non Profit Settings
* chore: clean up Non Profit Settings
- Rename fields, better labels
- patch for renaming
* feat: Webhook secret generation for Razorpay donations in Non-Profit Settings
* feat: Payment Entry for donations
- added Donor as Party Type
- setting for automating payment entries for donations created via web form
* fix: linter and sider issues
* fix: translation syntax
* feat: PAN Details custom field for Indian donors
* feat: 80G certificates for Donations with Print Format
* fix: sider
* feat: validations for donor and donation
- create donor for website user from donations
- validate donor email
* feat: extract member name from subscription notes
* test: Donation
* test: Tax Exemption 80G Certificate
* chore: styling fixes
* fix: tests
* fix: sider
* feat: extract PAN number from additional subscription notes
* feat: Add creation user field in Non Profit Settings
fix: Payment Entry not generating for memberships and donations
* feat: update desk page
* fix: tests
2021-03-11 13:19:44 +05:30
Mohammad Hasnain Mohsin Rajan
07f40596bc
feat(Bank Reconciliation): Redesign ( #24273 )
...
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-02-22 22:19:47 +05:30
Saqib
14472f6bab
fix(regional): vehicle no is mandatory for ewaybill generation ( #24679 )
...
* fix: vehicle no required for e-invoice
* fix: ewaybill generation dialog condition
2021-02-22 19:27:23 +05:30
rohitwaghchaure
d60ff83b6f
fix: added patch to fix incorrect stock qty and account value ( #24628 )
2021-02-16 09:12:27 +05:30
Ankush Menat
57c3d373a7
fix(India): Add GST state code for Ladakh
2021-02-15 15:03:50 +05:30
Suraj Shetty
54a253616a
Merge pull request #24508 from frappe/rebrand-ui
2021-02-02 09:07:35 +05:30
Marica
fb016edb7a
chore: Use sql to set naming series in older projects ( #24512 )
...
* chore: Use sql to set naming series in older projects
* fix: Remove unncessary db.commit()
2021-02-01 20:05:29 +05:30
Suraj Shetty
0a8939e1c1
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2021-01-29 08:56:22 +05:30
Saqib
675a8330a4
refactor: POS Invoice merging and cancellation ( #24351 )
...
* feat: pos invoice merging with background jobs
* fix: invoice threshold for queueing job
* refactor: cancellation flow of point of sale
* feat: tests for cancellation of pos closing
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2021-01-28 18:42:43 +05:30
Saqib
ac9e6ff704
fix(pos): multiple pos fixes and additions ( #24227 )
...
* fix: make custom fields in pos invoice similar to sales invoice
* feat: allow/disallow rate & discount change
* fix: any pos profile can be selected while creating pos opening
* fix: cannot add item to cart
* fix: validate phone payment only if payment request exists
* fix: replace pos payment method patch
* chore: rearrange item & customer group filter
* fix: allow/disallow invoice level discount
* fix: updating qty of item with uom having space char
* fix: move configuration checbox to config section
* fix: invalid item rate trigger
* fix: cannot remove item from draft invoices
* fix: customer currency not set in pos invoice
* fix: duplicate item error message
* fix: sales uom not fetched in pos invoice
* fix: cannot add taxes to pos invoice for uae region
* fix: cannot merge pos invoice into credit note
* fix: tax calculation while merging pos invoices
* feat: delete draft orders from order list
* fix: merging of pos invoice with pricing rules
2021-01-28 17:58:55 +05:30
Marica
ec4f42d4a9
Merge branch 'develop' into project-naming-series-patch
2021-01-25 11:29:23 +05:30
marination
c908deea61
fix: Patch to Add Naming Series to old projects
2021-01-22 16:10:01 +05:30
Rucha Mahabal
7201498801
Merge branch 'develop' into patient-history-enhancements
2021-01-22 09:04:37 +05:30
Rucha Mahabal
bd02a42904
Merge branch 'develop' into membership-enhancements-2
2021-01-20 12:49:37 +05:30
Suraj Shetty
c858bb8122
fix: Rename patch
2021-01-19 10:47:50 +05:30
Suraj Shetty
bbc6bfd3c3
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2021-01-19 09:34:06 +05:30
Rucha Mahabal
751719ea0d
Merge branch 'develop' into patient-history-enhancements
2021-01-14 14:08:50 +05:30
Rushabh Mehta
b6c7ba2eea
fix(minor): Rename loan workspace to loan management for naming
2021-01-12 11:34:11 +05:30
Jannat Patel
8a07de9ee0
Merge branch 'develop' into project-template-and-tasks
2021-01-11 10:57:09 +05:30
Jannat Patel
a586b0ba17
Merge branch 'develop' into project-template-and-tasks
2021-01-07 13:01:02 +05:30
Marica
ba6e50b15e
Merge branch 'develop' into qi-ux
2021-01-05 15:15:10 +05:30
Anurag Mishra
b864b09d40
Merge branch 'develop' into gratuity
2021-01-05 14:47:38 +05:30
Marica
099162814c
Merge branch 'develop' into qi-ux
2021-01-05 09:27:40 +05:30
Afshan
0da201c6a5
fix: set company in leave allocation and leave ledger entry
2021-01-04 19:04:05 +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
Anurag Mishra
dfe8f7601b
Merge branch 'develop' into gratuity
2020-12-29 13:27:03 +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
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
Anurag Mishra
f63df91186
patch: to create standard Gratuity Rule for india and UAE
2020-12-23 18:07:53 +05:30
Rucha Mahabal
7574a14d57
fix: Remove patch for setting next date in Subscription ( #24158 )
2020-12-22 12:32:36 +05:30
Jannat Patel
28098d6f93
Merge branch 'develop' into project-template-and-tasks
2020-12-16 20:09:27 +05:30
Rucha Mahabal
21168eab7f
fix: Remove patch for setting next date in Subscription ( #24158 )
2020-12-16 19:39:34 +05:30
pateljannat
87b477a311
feat: patch for project template tasks
2020-12-16 13:37:21 +05:30
Rucha Mahabal
02ebc9a11e
Merge branch 'develop' into patient-history-enhancements
2020-12-16 12:51:45 +05:30
Rushabh Mehta
fec8dba16c
fix(merge): merge develop
2020-12-08 16:23:09 +05:30
Walstan Baptista
0baebbdafe
fix: added Purchase Order to Global Search ( #24055 )
2020-12-08 09:43:29 +05:30
rohitwaghchaure
0a672b69e6
Merge pull request #22859 from marination/pr-dn-return
...
feat: Return tracking in PR/DN
2020-12-06 22:43:34 +05:30
Saurabh
2e27f074c3
feat: reload doctype number card link
2020-12-01 18:08:04 +05:30
Rucha Mahabal
288853d8f0
Merge branch 'develop' into patient-history-enhancements
2020-12-01 13:44:16 +05:30
Afshan
ccf5dc66e2
feat: multi-currency payroll ( #23519 )
...
* feat: multi-currency payroll
* fix: refactor and added conditions
* fix: uncommented code
* style: removed comments
* fix: missing argument
* style: styling changes
* fix: test cases
* Update asset_value_adjustment.py
* patch: update columns
* style: formating
* style: formatting
* fix: 1st review
* fix: refactor
* Revert "fix: refactor"
This reverts commit eca0e17d11a192d60f249b2af992971c625aec46.
reverting to previous state
* Revert "fix: 1st review"
This reverts commit 7eac48b102157df4353598f73b2ea97308af436a.
reverting before 1st review
* fix: 2nd review changes
* fix: test cases
* fix: added call to fetch exchange rate
* fix: remove unnecessary code
* fix: refactor
* fix: refactor patch
* fix: refactor
* fix: refactor
* fix: clear test data
* fix: slider
* feat: multi-currency payroll
* fix: refactor and added conditions
* fix: uncommented code
* style: removed comments
* fix: missing argument
* style: styling changes
* fix: test cases
* patch: update columns
* Update asset_value_adjustment.py
* style: formating
* style: formatting
* fix: 1st review
* fix: refactor
* Revert "fix: refactor"
This reverts commit eca0e17d11a192d60f249b2af992971c625aec46.
reverting to previous state
* Revert "fix: 1st review"
This reverts commit 7eac48b102157df4353598f73b2ea97308af436a.
reverting before 1st review
* fix: 2nd review changes
* fix: test cases
* fix: added call to fetch exchange rate
* fix: remove unnecessary code
* fix: refactor
* fix: refactor patch
* fix: refactor
* fix: refactor
* fix: clear test data
* fix: slider
* feat: Added company field in leave encashment and employee benefit
* refactor: Refactored multi-currency payroll patch
* fix: currency column in salary register
* refactor: Refactored code for making bank and return entry against employee advance
* fix: minor cleanup
* fix: fixed translation
* fix: removed salary component type
* fix: fixed sider issues
* fix: translation and slider
* style: formatted msg
* fix: fixed slider
* fix: travis
* fix: refactor
* fix: slider
* fix: slider
* fix: slider
* fix: travis
* fix: patch
* fix: patch
* fix: travis
* fix: travis
* fix: travis
* fix: travis
* fix: travis
* fix: travis
* fix: re-run travis
* fix: rerun travis
* fix: rerun travis
* fix: rerun travis
* fix: travis rerun
* fix: increased throttle_user_limit from 60 to 100
* fix: patch
* fix: patch
* fix: assign payroll payable account as default payroll payable account in SSA
* fix: removed debugger
* fix: slider
Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-12-01 09:11:05 +05:30
Rucha Mahabal
7a69a3367c
Merge branch 'develop' into patient-history-enhancements
2020-11-30 14:16:46 +05:30
